Add build-tools package for the command and build tool plugins

For backward compat, build-tools package isn't added to FloatingPanel project file as a local package. Because it breaks builds on Xcode 14.2 or earlier according to the swift version. I confirmed this behavior was improved on Xcode 15 beta. But so far we need to add the build-tools package into the project file manually as a local package to work the build tool plugin.
Turn NeverForceUnwrap & NeverUseForceTry on
2023-06-10 10:09:32 +09:00 · 2023-06-10 10:02:02 +09:00 · 2023-06-10 10:02:02 +09:00 · 2023-06-10 10:01:46 +09:00 · 2023-06-06 11:35:49 +09:00 · 2023-06-03 12:26:57 +09:00
38 changed files with 1845 additions and 1713 deletions
@@ -0,0 +1,21 @@
+version: 2.1
+
+jobs:
+  test-ios14_5-iPhone_12_Pro:
+    macos:
+      xcode: 13.4.1
+    steps:
+      - checkout
+      - run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 12 Pro'
+  test-ios13_7-iPhone_11_Pro:
+    macos:
+      xcode: 12.5.1
+    steps:
+      - checkout
+      - run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro'
+
+workflows:
+  test: 
+    jobs:
+      - test-ios14_5-iPhone_12_Pro
+      - test-ios13_7-iPhone_11_Pro
@@ -9,6 +9,34 @@ on:
      - '*'

 jobs:
+  lint:
+    runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+      SWIFT_FORMAT: build-tools/.build/release/swift-format
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - xcode: "14.3"
+            runsOn: macos-13
+    steps:
+      - uses: actions/checkout@v3
+      - name: Cache swift-format
+        id: cache_swift-format
+        uses: actions/cache@v3
+        env:
+          cache-name: cache_swift-format
+        with:
+          path: ${{ env.SWIFT_FORMAT }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('build-tools/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('build-tools/Package.resolved') }}
+      - name: Run swift-format
+        run: |
+          [[ -f $SWIFT_FORMAT ]] || xcrun swift build --package-path "build-tools" -c release
+          $SWIFT_FORMAT lint --configuration .swift-format -s -r Sources Tests
+
  build:
    runs-on: ${{ matrix.runsOn }}
    env:
@@ -17,11 +45,14 @@ jobs:
      fail-fast: false
      matrix:
        include:
+          - swift: "5.8"
+            xcode: "14.3"
+            runsOn: macos-13
          - swift: "5.7"
            xcode: "14.1"
            runsOn: macos-12
          - swift: "5.6"
-            xcode: "13.3.1"
+            xcode: "13.4.1"
            runsOn: macos-12
          - swift: "5.5"
            xcode: "13.2.1"
@@ -31,15 +62,12 @@ jobs:
            runsOn: macos-11
          - swift: "5.3"
            xcode: "12.4"
-            runsOn: macos-10.15
+            runsOn: macos-11
          - swift: "5.2"
            xcode: "11.7"
-            runsOn: macos-10.15
-          - swift: "5.1"
-            xcode: "11.3.1"
-            runsOn: macos-10.15
+            runsOn: macos-11
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Building in Swift ${{ matrix.swift }}
        run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=${{ matrix.swift }} clean build

@@ -55,30 +83,15 @@ jobs:
            xcode: "14.1"
            sim: "iPhone 14 Pro"
            runsOn: macos-12
-          - os: "15.4"
-            xcode: "13.3.1"
+          - os: "15.5"
+            xcode: "13.4.1"
            sim: "iPhone 13 Pro"
            runsOn: macos-12
-          - os: "15.2"
-            xcode: "13.2.1"
-            sim: "iPhone 13 Pro"
-            runsOn: macos-11
-          - os: "14.5"
-            xcode: "12.5.1"
-            sim: "iPhone 12 Pro"
-            runsOn: macos-11
-          - os: "14.4"
-            xcode: "12.4"
-            sim: "iPhone 12 Pro"
-            runsOn: macos-10.15
-          - os: "13.7"
-            xcode: "11.7"
-            sim: "iPhone 11 Pro"
-            runsOn: macos-10.15
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Testing in iOS ${{ matrix.os }}
      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=${{ matrix.os }},name=${{ matrix.sim }}'
+    timeout-minutes: 20

  example:
    runs-on: macos-12
@@ -89,10 +102,11 @@ jobs:
      matrix:
        include:
          - example: "Maps"
+          - example: "Maps-SwiftUI"
          - example: "Stocks"
          - example: "Samples"
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Building ${{ matrix.example }}
      run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme ${{ matrix.example }} -sdk iphonesimulator clean build

@@ -111,21 +125,21 @@ jobs:
          - target: "x86_64-apple-ios16.1-simulator"
          - target: "arm64-apple-ios16.1-simulator"
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: "Swift Package Manager build"
      run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "${{ matrix.target }}"

  carthage:
    runs-on: macos-11
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: "Carthage build"
      run: carthage build --use-xcframeworks --no-skip-current

  cocoapods:
    runs-on: macos-12
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: "CocoaPods: pod lib lint"
      run: pod lib lint --allow-warnings
    - name: "CocoaPods: pod spec lint"
@@ -0,0 +1,56 @@
+{
+  "fileScopedDeclarationPrivacy" : {
+    "accessLevel" : "private"
+  },
+  "indentation" : {
+    "spaces" : 4
+  },
+  "indentConditionalCompilationBlocks" : false,
+  "indentSwitchCaseLabels" : false,
+  "lineBreakAroundMultilineExpressionChainComponents" : false,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : false,
+  "lineBreakBeforeEachGenericRequirement" : false,
+  "lineLength" : 240,
+  "maximumBlankLines" : 1,
+  "prioritizeKeepingFunctionOutputTogether" : false,
+  "respectsExistingLineBreaks" : true,
+  "rules" : {
+    "AllPublicDeclarationsHaveDocumentation" : false,
+    "AlwaysUseLowerCamelCase" : false,
+    "AmbiguousTrailingClosureOverload" : true,
+    "BeginDocumentationCommentWithOneLineSummary" : false,
+    "DoNotUseSemicolons" : true,
+    "DontRepeatTypeInStaticProperties" : true,
+    "FileScopedDeclarationPrivacy" : true,
+    "FullyIndirectEnum" : true,
+    "GroupNumericLiterals" : true,
+    "IdentifiersMustBeASCII" : true,
+    "NeverForceUnwrap" : true,
+    "NeverUseForceTry" : true,
+    "NeverUseImplicitlyUnwrappedOptionals" : false,
+    "NoAccessLevelOnExtensionDeclaration" : true,
+    "NoBlockComments" : true,
+    "NoCasesWithOnlyFallthrough" : true,
+    "NoEmptyTrailingClosureParentheses" : true,
+    "NoLabelsInCasePatterns" : true,
+    "NoLeadingUnderscores" : false,
+    "NoParensAroundConditions" : true,
+    "NoVoidReturnOnFunctionSignature" : true,
+    "OneCasePerLine" : true,
+    "OneVariableDeclarationPerLine" : true,
+    "OnlyOneTrailingClosureArgument" : true,
+    "OrderedImports" : true,
+    "ReturnVoidInsteadOfEmptyTuple" : true,
+    "UseEarlyExits" : false,
+    "UseLetInEveryBoundCaseVariable" : true,
+    "UseShorthandTypeNames" : true,
+    "UseSingleLinePropertyGetter" : true,
+    "UseSynthesizedInitializer" : true,
+    "UseTripleSlashForDocumentationComments" : true,
+    "UseWhereClausesInForLoops" : false,
+    "ValidateDocumentationComments" : false
+  },
+  "tabWidth" : 8,
+  "version" : 1
+}
@@ -24,8 +24,6 @@
 		545DB9F321511E6300CA77B8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 545DB9F121511E6300CA77B8 /* Main.storyboard */; };
 		545DB9F521511E6400CA77B8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 545DB9F421511E6400CA77B8 /* Assets.xcassets */; };
 		545DB9F821511E6400CA77B8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 545DB9F621511E6400CA77B8 /* LaunchScreen.storyboard */; };
-		545DBA0321511E6400CA77B8 /* SampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DBA0221511E6400CA77B8 /* SampleTests.swift */; };
-		545DBA0E21511E6400CA77B8 /* SampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DBA0D21511E6400CA77B8 /* SampleUITests.swift */; };
 		546341A125C6415100CA0596 /* UseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 546341A025C6415100CA0596 /* UseCase.swift */; };
 		546341AC25C6426500CA0596 /* CustomState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 546341AB25C6426500CA0596 /* CustomState.swift */; };
 		549D23CB233C7779008EF4D7 /* FloatingPanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23CA233C7779008EF4D7 /* FloatingPanel.framework */; };
@@ -37,23 +35,6 @@
 		5D82A6AD28D1843C006A44BA /* libswiftCoreGraphics.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D82A6AC28D18438006A44BA /* libswiftCoreGraphics.tbd */; };
 /* End PBXBuildFile section */

-/* Begin PBXContainerItemProxy section */
-		545DB9FF21511E6400CA77B8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 545DB9E221511E6300CA77B8 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 545DB9E921511E6300CA77B8;
-			remoteInfo = FloatingModalSample;
-		};
-		545DBA0A21511E6400CA77B8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 545DB9E221511E6300CA77B8 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 545DB9E921511E6300CA77B8;
-			remoteInfo = FloatingModalSample;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		549D23CD233C7779008EF4D7 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -88,12 +69,6 @@
 		545DB9F421511E6400CA77B8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		545DB9F721511E6400CA77B8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		545DB9F921511E6400CA77B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		545DB9FE21511E6400CA77B8 /* SamplesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SamplesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		545DBA0221511E6400CA77B8 /* SampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleTests.swift; sourceTree = "<group>"; };
-		545DBA0421511E6400CA77B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		545DBA0921511E6400CA77B8 /* SamplesUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SamplesUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		545DBA0D21511E6400CA77B8 /* SampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleUITests.swift; sourceTree = "<group>"; };
-		545DBA0F21511E6400CA77B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		546341A025C6415100CA0596 /* UseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UseCase.swift; sourceTree = "<group>"; };
 		546341AB25C6426500CA0596 /* CustomState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomState.swift; sourceTree = "<group>"; };
 		549D23CA233C7779008EF4D7 /* FloatingPanel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FloatingPanel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -114,20 +89,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		545DB9FB21511E6400CA77B8 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		545DBA0621511E6400CA77B8 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
@@ -154,8 +115,6 @@
 			children = (
 				549D23CA233C7779008EF4D7 /* FloatingPanel.framework */,
 				545DB9EC21511E6300CA77B8 /* Sources */,
-				545DBA0121511E6400CA77B8 /* Tests */,
-				545DBA0C21511E6400CA77B8 /* UITests */,
 				545DB9EB21511E6300CA77B8 /* Products */,
 				5D82A6AB28D18438006A44BA /* Frameworks */,
 			);
@@ -165,8 +124,6 @@
 			isa = PBXGroup;
 			children = (
 				545DB9EA21511E6300CA77B8 /* Samples.app */,
-				545DB9FE21511E6400CA77B8 /* SamplesTests.xctest */,
-				545DBA0921511E6400CA77B8 /* SamplesUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -190,24 +147,6 @@
 			path = Sources;
 			sourceTree = "<group>";
 		};
-		545DBA0121511E6400CA77B8 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				545DBA0221511E6400CA77B8 /* SampleTests.swift */,
-				545DBA0421511E6400CA77B8 /* Info.plist */,
-			);
-			path = Tests;
-			sourceTree = "<group>";
-		};
-		545DBA0C21511E6400CA77B8 /* UITests */ = {
-			isa = PBXGroup;
-			children = (
-				545DBA0D21511E6400CA77B8 /* SampleUITests.swift */,
-				545DBA0F21511E6400CA77B8 /* Info.plist */,
-			);
-			path = UITests;
-			sourceTree = "<group>";
-		};
 		546341AA25C6421000CA0596 /* UseCases */ = {
 			isa = PBXGroup;
 			children = (
@@ -247,42 +186,6 @@
 			productReference = 545DB9EA21511E6300CA77B8 /* Samples.app */;
 			productType = "com.apple.product-type.application";
 		};
-		545DB9FD21511E6400CA77B8 /* SamplesTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 545DBA1521511E6400CA77B8 /* Build configuration list for PBXNativeTarget "SamplesTests" */;
-			buildPhases = (
-				545DB9FA21511E6400CA77B8 /* Sources */,
-				545DB9FB21511E6400CA77B8 /* Frameworks */,
-				545DB9FC21511E6400CA77B8 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				545DBA0021511E6400CA77B8 /* PBXTargetDependency */,
-			);
-			name = SamplesTests;
-			productName = FloatingModalSampleTests;
-			productReference = 545DB9FE21511E6400CA77B8 /* SamplesTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		545DBA0821511E6400CA77B8 /* SamplesUITests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 545DBA1821511E6400CA77B8 /* Build configuration list for PBXNativeTarget "SamplesUITests" */;
-			buildPhases = (
-				545DBA0521511E6400CA77B8 /* Sources */,
-				545DBA0621511E6400CA77B8 /* Frameworks */,
-				545DBA0721511E6400CA77B8 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				545DBA0B21511E6400CA77B8 /* PBXTargetDependency */,
-			);
-			name = SamplesUITests;
-			productName = FloatingModalSampleUITests;
-			productReference = 545DBA0921511E6400CA77B8 /* SamplesUITests.xctest */;
-			productType = "com.apple.product-type.bundle.ui-testing";
-		};
 /* End PBXNativeTarget section */

 /* Begin PBXProject section */
@@ -296,14 +199,6 @@
 					545DB9E921511E6300CA77B8 = {
 						CreatedOnToolsVersion = 10.0;
 					};
-					545DB9FD21511E6400CA77B8 = {
-						CreatedOnToolsVersion = 10.0;
-						TestTargetID = 545DB9E921511E6300CA77B8;
-					};
-					545DBA0821511E6400CA77B8 = {
-						CreatedOnToolsVersion = 10.0;
-						TestTargetID = 545DB9E921511E6300CA77B8;
-					};
 				};
 			};
 			buildConfigurationList = 545DB9E521511E6300CA77B8 /* Build configuration list for PBXProject "Samples" */;
@@ -320,8 +215,6 @@
 			projectRoot = "";
 			targets = (
 				545DB9E921511E6300CA77B8 /* Samples */,
-				545DB9FD21511E6400CA77B8 /* SamplesTests */,
-				545DBA0821511E6400CA77B8 /* SamplesUITests */,
 			);
 		};
 /* End PBXProject section */
@@ -337,20 +230,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		545DB9FC21511E6400CA77B8 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		545DBA0721511E6400CA77B8 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -381,37 +260,8 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		545DB9FA21511E6400CA77B8 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				545DBA0321511E6400CA77B8 /* SampleTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		545DBA0521511E6400CA77B8 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				545DBA0E21511E6400CA77B8 /* SampleUITests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */

-/* Begin PBXTargetDependency section */
-		545DBA0021511E6400CA77B8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 545DB9E921511E6300CA77B8 /* Samples */;
-			targetProxy = 545DB9FF21511E6400CA77B8 /* PBXContainerItemProxy */;
-		};
-		545DBA0B21511E6400CA77B8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 545DB9E921511E6300CA77B8 /* Samples */;
-			targetProxy = 545DBA0A21511E6400CA77B8 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		545DB9F121511E6300CA77B8 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -596,90 +446,6 @@
 			};
 			name = Release;
 		};
-		545DBA1621511E6400CA77B8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = Tests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalSampleTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Samples.app/Samples";
-			};
-			name = Debug;
-		};
-		545DBA1721511E6400CA77B8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				INFOPLIST_FILE = Tests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalSampleTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Samples.app/Samples";
-			};
-			name = Release;
-		};
-		545DBA1921511E6400CA77B8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = J3D7L9FHSS;
-				INFOPLIST_FILE = UITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalSampleUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = FloatingModalSample;
-			};
-			name = Debug;
-		};
-		545DBA1A21511E6400CA77B8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = J3D7L9FHSS;
-				INFOPLIST_FILE = UITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalSampleUITests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = FloatingModalSample;
-			};
-			name = Release;
-		};
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
@@ -701,24 +467,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		545DBA1521511E6400CA77B8 /* Build configuration list for PBXNativeTarget "SamplesTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				545DBA1621511E6400CA77B8 /* Debug */,
-				545DBA1721511E6400CA77B8 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		545DBA1821511E6400CA77B8 /* Build configuration list for PBXNativeTarget "SamplesUITests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				545DBA1921511E6400CA77B8 /* Debug */,
-				545DBA1A21511E6400CA77B8 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 545DB9E221511E6300CA77B8 /* Project object */;
@@ -87,7 +87,7 @@
            <objects>
                <viewController storyboardIdentifier="SettingsViewController" id="C1X-9Z-TyQ" customClass="SettingsViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="af9-Zr-Ppc">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="197"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="197.5"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="n93-ZL-fmC">
@@ -598,7 +598,7 @@
                                </constraints>
                            </view>
                            <view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kva-Z7-0qY" customClass="OnSafeAreaView" customModule="Samples" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="48" width="375" height="730"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="778"/>
                                <color key="backgroundColor" red="0.0078431372550000003" green="0.72156862749999995" blue="0.45882352939999999" alpha="1" colorSpace="calibratedRGB"/>
                            </view>
                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="noi-1a-5bZ" customClass="CloseButton" customModule="Samples" customModuleProvider="target">
@@ -660,9 +660,9 @@
                        <color key="backgroundColor" red="1" green="0.83234566450000003" blue="0.47320586440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <gestureRecognizers/>
                        <constraints>
+                            <constraint firstItem="Kva-Z7-0qY" firstAttribute="top" secondItem="g7l-kO-y7q" secondAttribute="top" id="A4b-Le-m4I"/>
                            <constraint firstItem="noi-1a-5bZ" firstAttribute="top" secondItem="aOK-7l-cA6" secondAttribute="top" priority="750" id="EQy-cr-F2Y"/>
                            <constraint firstItem="tP3-oJ-4EB" firstAttribute="centerX" secondItem="aOK-7l-cA6" secondAttribute="centerX" id="EsD-Vf-dNZ"/>
-                            <constraint firstItem="Kva-Z7-0qY" firstAttribute="top" secondItem="aOK-7l-cA6" secondAttribute="top" id="Fff-HL-4mo"/>
                            <constraint firstItem="8yw-OC-Ubk" firstAttribute="bottom" secondItem="g7l-kO-y7q" secondAttribute="bottom" priority="750" id="JOL-wC-w74"/>
                            <constraint firstItem="8yw-OC-Ubk" firstAttribute="leading" secondItem="aOK-7l-cA6" secondAttribute="leading" id="RiJ-Hb-OOZ"/>
                            <constraint firstItem="8yw-OC-Ubk" firstAttribute="trailing" secondItem="aOK-7l-cA6" secondAttribute="trailing" id="Sof-yL-mwK"/>
@@ -18,7 +18,7 @@ class DebugTableViewController: InspectableViewController {
        stackView.axis = .vertical
        stackView.distribution = .fillEqually
        stackView.alignment = .trailing
-        stackView.spacing = 10.0
+        stackView.spacing = 4
        return stackView
    }()
    private lazy var reorderButton: UIButton = {
@@ -28,40 +28,48 @@ class DebugTableViewController: InspectableViewController {
        button.addTarget(self, action: #selector(reorderItems), for: .touchUpInside)
        return button
    }()
-    private lazy var trackingSwitchWrapper: UIStackView = {
-        let stackView = UIStackView()
-        stackView.axis = .horizontal
-        stackView.distribution = .fillProportionally
-        stackView.alignment = .center
-        stackView.spacing = 8.0
-        stackView.addArrangedSubview(trackingLabel)
-        stackView.addArrangedSubview(trackingSwitch)
-        return stackView
+    private lazy var trackingButton: UIButton = {
+        let button = UIButton()
+        button.setTitle(Menu.trackScrolling.rawValue, for: .normal)
+        button.setTitleColor(view.tintColor, for: .normal)
+        button.addTarget(self, action: #selector(toggleTrackingScroll), for: .touchUpInside)
+        return button
    }()
-    private lazy var trackingLabel: UILabel = {
-        let label = UILabel()
-        label.text = "Tracking"
-        label.font = UIFont.systemFont(ofSize: 17.0, weight: .regular)
-        return label
-    }()
-    private lazy var trackingSwitch: UISwitch = {
-        let trackingSwitch = UISwitch()
-        trackingSwitch.isOn = true
-        trackingSwitch.addTarget(self, action: #selector(turnTrackingOn), for: .touchUpInside)
-        return trackingSwitch
+    private lazy var followingButton: UIButton = {
+        let button = UIButton()
+        button.setTitleColor(view.tintColor, for: .normal)
+        button.addTarget(self, action: #selector(toggleFollowingScroll), for: .touchUpInside)
+        return button
    }()

    // MARK: - Properties

    var kvoObservers: [NSKeyValueObservation] = []
+
+    private var fpc: FloatingPanelController? { parent as? FloatingPanelController }
    private lazy var items: [String] = {
        let items = (0..<100).map { "Items \($0)" }
        return Command.replace(items: items)
    }()
    private var itemHeight: CGFloat = 66.0

+    // MARK: Flags
+    private var tracksScrollView: Bool = false {
+        didSet {
+            let title = "\(Menu.trackScrolling.rawValue): \(tracksScrollView ? "on" : "off")"
+            trackingButton.setTitle(title, for: .normal)
+        }
+    }
+    private var followsScrollViewBouncing: Bool = false {
+        didSet {
+            let title = "\(Menu.followScrolling.rawValue): \(followsScrollViewBouncing ? "on" : "off")"
+            followingButton.setTitle(title, for: .normal)
+        }
+    }
+
    enum Menu: String, CaseIterable {
-        case turnOffTracking = "Tracking"
+        case trackScrolling = "Tracking"
+        case followScrolling = "Following"
        case reorder = "Reorder"
    }

@@ -136,13 +144,19 @@ class DebugTableViewController: InspectableViewController {
            switch menu {
            case .reorder:
                buttonStackView.addArrangedSubview(reorderButton)
-            case .turnOffTracking:
-                buttonStackView.addArrangedSubview(trackingSwitchWrapper)
+            case .trackScrolling:
+                buttonStackView.addArrangedSubview(trackingButton)
+            case .followScrolling:
+                buttonStackView.addArrangedSubview(followingButton)
            }
        }
+        // Set titles
+        tracksScrollView = true
+        followsScrollViewBouncing = false
    }

    // MARK: - Menu
+
    @objc
    private func reorderItems() {
        if reorderButton.titleLabel?.text == Menu.reorder.rawValue {
@@ -155,15 +169,21 @@ class DebugTableViewController: InspectableViewController {
    }

    @objc
-    private func turnTrackingOn(_ sender: UISwitch) {
-        guard let fpc = self.parent as? FloatingPanelController else { return }
-        if sender.isOn {
+    private func toggleTrackingScroll() {
+        tracksScrollView.toggle()
+        guard let fpc = fpc else { return }
+        if tracksScrollView {
            fpc.track(scrollView: tableView)
        } else {
            fpc.untrack(scrollView: tableView)
        }
    }

+    @objc
+    private func toggleFollowingScroll() {
+        followsScrollViewBouncing.toggle()
+    }
+
    // MARK: - Actions

    private func execute(command: Command, sourceView: UIView) {
@@ -250,6 +270,9 @@ extension DebugTableViewController: UITableViewDataSource {

 extension DebugTableViewController: UITableViewDelegate {
    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if followsScrollViewBouncing {
+            fpc?.followScrollViewBouncing()
+        }
        print("TableView --- ", scrollView.contentOffset, scrollView.contentInset)
    }

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
@@ -1,28 +0,0 @@
-// Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
-
-import XCTest
-@testable import FloatingPanelSample
-
-class SampleTests: XCTestCase {
-
-    override func setUp() {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-
-}
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
@@ -1,28 +0,0 @@
-// Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
-
-import XCTest
-
-class SampleUITests: XCTestCase {
-
-    override func setUp() {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-
-        // In UI tests it is usually best to stop immediately when a failure occurs.
-        continueAfterFailure = false
-
-        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
-        XCUIApplication().launch()
-
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testExample() {
-        // Use recording to get started writing UI tests.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-
-}
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|

  s.name                = "FloatingPanel"
-  s.version             = "2.6.0"
+  s.version             = "2.6.2"
  s.summary             = "FloatingPanel is a clean and easy-to-use UI component of a floating panel interface."
  s.description         = <<-DESC
 FloatingPanel is a clean and easy-to-use UI component for a new interface introduced in Apple Maps, Shortcuts and Stocks app.
@@ -17,8 +17,6 @@
 		545DB9E021511AC100CA77B8 /* Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DB9DF21511AC100CA77B8 /* Controller.swift */; };
 		545DBA2B2152383100CA77B8 /* GrabberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DBA2A2152383100CA77B8 /* GrabberView.swift */; };
 		546055BF2333C4740069F400 /* TestSupports.swift in Sources */ = {isa = PBXBuildFile; fileRef = 542753C722C49A8F00D17955 /* TestSupports.swift */; };
-		5469F4A224B003EF00537F8A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5469F49F24B003EF00537F8A /* LaunchScreen.storyboard */; };
-		5469F4A324B003EF00537F8A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5469F4A024B003EF00537F8A /* AppDelegate.swift */; };
 		5469F4AE24B30D7E00537F8A /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5469F4AD24B30D7E00537F8A /* State.swift */; };
 		5469F4B024B30E1500537F8A /* LayoutAnchoring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5469F4AF24B30E1500537F8A /* LayoutAnchoring.swift */; };
 		5469F4B224B30F1100537F8A /* Position.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5469F4B124B30F1100537F8A /* Position.swift */; };
@@ -45,13 +43,6 @@
 			remoteGlobalIDString = 545DB9C02151169500CA77B8;
 			remoteInfo = FloatingModalController;
 		};
-		54E740DC218AFE9F005C1A34 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 545DB9B82151169500CA77B8 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 54E740C9218AFD67005C1A34;
-			remoteInfo = TestingHost;
-		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
@@ -68,9 +59,6 @@
 		545DB9D12151169500CA77B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		545DB9DF21511AC100CA77B8 /* Controller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Controller.swift; sourceTree = "<group>"; };
 		545DBA2A2152383100CA77B8 /* GrabberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrabberView.swift; sourceTree = "<group>"; };
-		5469F49F24B003EF00537F8A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
-		5469F4A024B003EF00537F8A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		5469F4A124B003EF00537F8A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5469F4AD24B30D7E00537F8A /* State.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = State.swift; sourceTree = "<group>"; };
 		5469F4AF24B30E1500537F8A /* LayoutAnchoring.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutAnchoring.swift; sourceTree = "<group>"; };
 		5469F4B124B30F1100537F8A /* Position.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Position.swift; sourceTree = "<group>"; };
@@ -86,7 +74,6 @@
 		54CFBFC4215CD09C006B5735 /* Core.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Core.swift; sourceTree = "<group>"; };
 		54DBA3DB262E938500D75969 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		54E3992627141F5100A8F9ED /* FloatingPanel.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = FloatingPanel.docc; sourceTree = "<group>"; };
-		54E740CA218AFD67005C1A34 /* FloatingPanelTesting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FloatingPanelTesting.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D82A6B428D18461006A44BA /* libswiftCoreGraphics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreGraphics.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/usr/lib/swift/libswiftCoreGraphics.tbd; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */

@@ -107,13 +94,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		54E740C7218AFD67005C1A34 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
@@ -132,7 +112,6 @@
 			children = (
 				545DB9C12151169500CA77B8 /* FloatingPanel.framework */,
 				545DB9CA2151169500CA77B8 /* FloatingPanelTests.xctest */,
-				54E740CA218AFD67005C1A34 /* FloatingPanelTesting.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -165,7 +144,6 @@
 		545DB9CE2151169500CA77B8 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				5469F49E24B003EF00537F8A /* TestingApp */,
 				54A6B6B022968B530077F348 /* CoreTests.swift */,
 				545DB9CF2151169500CA77B8 /* ControllerTests.swift */,
 				542753C522C49A6E00D17955 /* LayoutTests.swift */,
@@ -178,16 +156,6 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		5469F49E24B003EF00537F8A /* TestingApp */ = {
-			isa = PBXGroup;
-			children = (
-				5469F49F24B003EF00537F8A /* LaunchScreen.storyboard */,
-				5469F4A024B003EF00537F8A /* AppDelegate.swift */,
-				5469F4A124B003EF00537F8A /* Info.plist */,
-			);
-			path = TestingApp;
-			sourceTree = "<group>";
-		};
 		5D82A6B328D18460006A44BA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -222,6 +190,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				54B58FC929EB95880009567E /* PBXTargetDependency */,
 			);
 			name = FloatingPanel;
 			productName = FloatingModalController;
@@ -240,30 +209,12 @@
 			);
 			dependencies = (
 				545DB9CD2151169500CA77B8 /* PBXTargetDependency */,
-				54E740DD218AFE9F005C1A34 /* PBXTargetDependency */,
 			);
 			name = FloatingPanelTests;
 			productName = FloatingModalControllerTests;
 			productReference = 545DB9CA2151169500CA77B8 /* FloatingPanelTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		54E740C9218AFD67005C1A34 /* TestingApp */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 54E740D9218AFD6A005C1A34 /* Build configuration list for PBXNativeTarget "TestingApp" */;
-			buildPhases = (
-				54E740C6218AFD67005C1A34 /* Sources */,
-				54E740C7218AFD67005C1A34 /* Frameworks */,
-				54E740C8218AFD67005C1A34 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = TestingApp;
-			productName = TestingHost;
-			productReference = 54E740CA218AFD67005C1A34 /* FloatingPanelTesting.app */;
-			productType = "com.apple.product-type.application";
-		};
 /* End PBXNativeTarget section */

 /* Begin PBXProject section */
@@ -280,10 +231,6 @@
 					};
 					545DB9C92151169500CA77B8 = {
 						CreatedOnToolsVersion = 10.0;
-						TestTargetID = 54E740C9218AFD67005C1A34;
-					};
-					54E740C9218AFD67005C1A34 = {
-						CreatedOnToolsVersion = 10.1;
 					};
 				};
 			};
@@ -296,13 +243,14 @@
 				Base,
 			);
 			mainGroup = 545DB9B72151169500CA77B8;
+			packageReferences = (
+			);
 			productRefGroup = 545DB9C22151169500CA77B8 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				545DB9C02151169500CA77B8 /* FloatingPanel */,
 				545DB9C92151169500CA77B8 /* FloatingPanelTests */,
-				54E740C9218AFD67005C1A34 /* TestingApp */,
 			);
 		};
 /* End PBXProject section */
@@ -322,14 +270,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		54E740C8218AFD67005C1A34 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5469F4A224B003EF00537F8A /* LaunchScreen.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -370,14 +310,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		54E740C6218AFD67005C1A34 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5469F4A324B003EF00537F8A /* AppDelegate.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXTargetDependency section */
@@ -386,10 +318,9 @@
 			target = 545DB9C02151169500CA77B8 /* FloatingPanel */;
 			targetProxy = 545DB9CC2151169500CA77B8 /* PBXContainerItemProxy */;
 		};
-		54E740DD218AFE9F005C1A34 /* PBXTargetDependency */ = {
+		54B58FC929EB95880009567E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 54E740C9218AFD67005C1A34 /* TestingApp */;
-			targetProxy = 54E740DC218AFE9F005C1A34 /* PBXContainerItemProxy */;
+			productRef = 54B58FC829EB95880009567E /* SwiftFormatBuildTool */;
 		};
 /* End PBXTargetDependency section */

@@ -593,11 +524,10 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalControllerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FloatingPanelTesting.app/FloatingPanelTesting";
 			};
 			name = Debug;
 		};
@@ -614,47 +544,10 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalControllerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FloatingPanelTesting.app/FloatingPanelTesting";
-			};
-			name = Release;
-		};
-		54E740DA218AFD6A005C1A34 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = Tests/TestingApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTesting;
-				PRODUCT_NAME = FloatingPanelTesting;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		54E740DB218AFD6A005C1A34 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = Tests/TestingApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTesting;
-				PRODUCT_NAME = FloatingPanelTesting;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -767,25 +660,10 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingModalControllerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FloatingPanelTesting.app/FloatingPanelTesting";
-			};
-			name = Test;
-		};
-		54E8AC6A2286CFB6000C5A12 /* Test */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = Tests/TestingApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTesting;
-				PRODUCT_NAME = FloatingPanelTesting;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Test;
 		};
@@ -822,17 +700,14 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		54E740D9218AFD6A005C1A34 /* Build configuration list for PBXNativeTarget "TestingApp" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				54E740DA218AFD6A005C1A34 /* Debug */,
-				54E740DB218AFD6A005C1A34 /* Release */,
-				54E8AC6A2286CFB6000C5A12 /* Test */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		54B58FC829EB95880009567E /* SwiftFormatBuildTool */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = "plugin:SwiftFormatBuildTool";
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 545DB9B82151169500CA77B8 /* Project object */;
 }
@@ -1,15 +1,15 @@
-[![Build Status](https://travis-ci.org/SCENEE/FloatingPanel.svg?branch=master)](https://travis-ci.org/SCENEE/FloatingPanel)
-[![Version](https://img.shields.io/cocoapods/v/FloatingPanel.svg)](https://cocoapods.org/pods/FloatingPanel)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Swift 5](https://img.shields.io/badge/swift-5-orange.svg?style=flat)](https://swift.org/)
 [![Platform](https://img.shields.io/cocoapods/p/FloatingPanel.svg)](https://cocoapods.org/pods/FloatingPanel)
-[![Swift 5](https://img.shields.io/badge/Swift-5-orange.svg?style=flat)](https://swift.org/)
+[![Version](https://img.shields.io/cocoapods/v/FloatingPanel.svg)](https://cocoapods.org/pods/FloatingPanel)
+![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/scenee/FloatingPanel/ci.yml?branch=master)
+[![Carthage compatible](https://img.shields.io/badge/carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

 # FloatingPanel

-FloatingPanel is a simple and easy-to-use UI component for a new interface introduced in Apple Maps, Shortcuts and Stocks app.
-The new interface displays the related contents and utilities in parallel as a user wants.
+FloatingPanel is a simple and easy-to-use UI component designed for a user interface featured in Apple Maps, Shortcuts and Stocks app.
+The user interface displays related content and utilities alongside the main content.

-📝[Here](https://docs.scenee.com/documentation/floatingpanel) is the API references for the latest version powered by [DocC](https://developer.apple.com/documentation/docc).
+Please see also [the API reference](https://floatingpanel.github.io/2.6.2/documentation/floatingpanel/) for more details, powered by [DocC](https://developer.apple.com/documentation/docc).

 ![Maps](https://github.com/SCENEE/FloatingPanel/blob/master/assets/maps.gif)
 ![Stocks](https://github.com/SCENEE/FloatingPanel/blob/master/assets/stocks.gif)
@@ -75,14 +75,14 @@ The new interface displays the related contents and utilities in parallel as a u
 - [x] Removal interaction
 - [x] Multi panel support
 - [x] Modal presentation
- [x] 4 positioning support(top, left, bottom, right)
+- [x] Support for 4 positions (top, left, bottom, right)
 - [x] 1 or more magnetic anchors(full, half, tip and more)
 - [x] Layout support for all trait environments(i.e. Landscape orientation)
 - [x] Common UI elements: surface, backdrop and grabber handle
- [x] Free from common issues of Auto Layout and gesture handling
+- [x] Free from common Auto Layout and gesture handling issues
 - [x] Compatible with Objective-C

-Examples are here.
+Examples can be found here:

 - [Examples/Maps](https://github.com/SCENEE/FloatingPanel/tree/master/Examples/Maps) like Apple Maps.app.
 - [Examples/Stocks](https://github.com/SCENEE/FloatingPanel/tree/master/Examples/Stocks) like Apple Stocks.app.
@@ -91,11 +91,11 @@ Examples are here.

 ## Requirements

-FloatingPanel is written in Swift 5.0+. Compatible with iOS 11.0+.
+FloatingPanel is written in Swift 5.0+ and compatible with iOS 11.0+. 

-The deployment is still iOS 10, but it is recommended to use this library on iOS 11+.
+While it still supports iOS 10, it is recommended to use this library on iOS 11+.

-:pencil2: You would like to use Swift 4.0. Please use FloatingPanel v1. 
+:pencil2: If you'd like to use Swift 4.0, please use FloatingPanel v1.

 ## Installation

@@ -12,43 +12,43 @@ public protocol FloatingPanelBehavior {
    /// When this value is between 0.978 and 1.0, it uses a underdamped spring system with a damping ratio computed by
    /// this value. You shouldn't return less than 0.979 because the system is overdamped. If the pan gesture's velocity
    /// is less than 300, this value is ignored and a panel applies a critically damped system.
-    @objc optional
-    var springDecelerationRate: CGFloat { get }
+    @objc
+    optional var springDecelerationRate: CGFloat { get }

    /// A floating-point value that determines the approximate time until a panel stops to an anchor after the user lifts their finger.
-    @objc optional
-    var springResponseTime: CGFloat { get }
+    @objc
+    optional var springResponseTime: CGFloat { get }

    /// Returns a deceleration rate to calculate a target position projected a dragging momentum.
    ///
    /// The default implementation of this method returns the normal deceleration rate of UIScrollView.
-    @objc optional
-    var momentumProjectionRate: CGFloat { get }
+    @objc
+    optional var momentumProjectionRate: CGFloat { get }

    /// Asks the behavior if a panel should project a momentum of a user interaction to move the proposed position.
    ///
    /// The default implementation of this method returns true. This method is called for a layout to support all positions(tip, half and full).
    /// Therefore, `proposedTargetPosition` can only be `FloatingPanelState.tip` or `FloatingPanelState.full`.
-    @objc optional
-    func shouldProjectMomentum(_ fpc: FloatingPanelController, to proposedTargetPosition: FloatingPanelState) -> Bool
+    @objc
+    optional func shouldProjectMomentum(_ fpc: FloatingPanelController, to proposedTargetPosition: FloatingPanelState) -> Bool

    /// Returns the progress to redirect to the previous position.
    ///
    /// The progress is represented by a floating-point value between 0.0 and 1.0, inclusive, where 1.0 indicates a panel is impossible to move to the next position. The default value is 0.5. Values less than 0.0 and greater than 1.0 are pinned to those limits.
-    @objc optional
-    func redirectionalProgress(_ fpc: FloatingPanelController, from: FloatingPanelState, to: FloatingPanelState) -> CGFloat
+    @objc
+    optional func redirectionalProgress(_ fpc: FloatingPanelController, from: FloatingPanelState, to: FloatingPanelState) -> CGFloat

    /// Asks the behavior whether the rubber band effect is enabled in moving over a given edge of the surface view.
    ///
    /// This method allows a panel to activate the rubber band effect to a given edge of the surface view. By default, the effect is disabled.
-    @objc optional
-    func allowsRubberBanding(for edge: UIRectEdge) -> Bool
-    
+    @objc
+    optional func allowsRubberBanding(for edge: UIRectEdge) -> Bool
+
    /// Returns the velocity threshold for the default interactive removal gesture.
    ///
    /// In case ``FloatingPanel/FloatingPanelControllerDelegate/floatingPanel(_:shouldRemoveAt:with:)`` is implemented, this value will not be used. The default value of ``FloatingPanelDefaultBehavior`` is 5.5
-    @objc optional
-    var removalInteractionVelocityThreshold: CGFloat { get }
+    @objc
+    optional var removalInteractionVelocityThreshold: CGFloat { get }
 }

 /// The default behavior object for a panel
@@ -76,7 +76,7 @@ open class FloatingPanelDefaultBehavior: FloatingPanelBehavior {
    open func allowsRubberBanding(for edge: UIRectEdge) -> Bool {
        return false
    }
-    
+
    open var removalInteractionVelocityThreshold: CGFloat = 5.5
 }

@@ -100,13 +100,13 @@ class BehaviorAdapter {
    var momentumProjectionRate: CGFloat {
        behavior.momentumProjectionRate ?? FloatingPanelDefaultBehavior().momentumProjectionRate
    }
-    
+
    var removalInteractionVelocityThreshold: CGFloat {
        behavior.removalInteractionVelocityThreshold ?? FloatingPanelDefaultBehavior().removalInteractionVelocityThreshold
    }

    func redirectionalProgress(from: FloatingPanelState, to: FloatingPanelState) -> CGFloat {
-        behavior.redirectionalProgress?(vc, from: from, to: to) ?? FloatingPanelDefaultBehavior().redirectionalProgress(vc,from: from, to: to)
+        behavior.redirectionalProgress?(vc, from: from, to: to) ?? FloatingPanelDefaultBehavior().redirectionalProgress(vc, from: from, to: to)
    }

    func shouldProjectMomentum(to: FloatingPanelState) -> Bool {
@@ -121,6 +121,6 @@ class BehaviorAdapter {
 extension FloatingPanelController {
    var _behavior: FloatingPanelBehavior {
        get { floatingPanel.behaviorAdapter.behavior }
-        set { floatingPanel.behaviorAdapter.behavior = newValue}
+        set { floatingPanel.behaviorAdapter.behavior = newValue }
    }
 }
@@ -7,78 +7,76 @@ import UIKit
 /// dragging, attracting a panel, layout of a panel and the content, and transition animations.
@objc public protocol FloatingPanelControllerDelegate {
    /// Returns a FloatingPanelLayout object. If you use the default one, you can use a `FloatingPanelBottomLayout` object.
-    @objc(floatingPanel:layoutForTraitCollection:) optional
-    func floatingPanel(_ fpc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout
+    @objc(floatingPanel:layoutForTraitCollection:)
+    optional func floatingPanel(_ fpc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout

    /// Returns a FloatingPanelLayout object. If you use the default one, you can use a `FloatingPanelBottomLayout` object.
-    @objc(floatingPanel:layoutForSize:) optional
-    func floatingPanel(_ fpc: FloatingPanelController, layoutFor size: CGSize) -> FloatingPanelLayout
+    @objc(floatingPanel:layoutForSize:)
+    optional func floatingPanel(_ fpc: FloatingPanelController, layoutFor size: CGSize) -> FloatingPanelLayout

    /// Returns a UIViewPropertyAnimator object to add/present the  panel to a position.
    ///
    /// Default is the spring animation with 0.25 secs.
-    @objc(floatingPanel:animatorForPresentingToState:) optional
-    func floatingPanel(_ fpc: FloatingPanelController, animatorForPresentingTo state: FloatingPanelState) -> UIViewPropertyAnimator
+    @objc(floatingPanel:animatorForPresentingToState:)
+    optional func floatingPanel(_ fpc: FloatingPanelController, animatorForPresentingTo state: FloatingPanelState) -> UIViewPropertyAnimator

    /// Returns a UIViewPropertyAnimator object to remove/dismiss a panel from a position.
    ///
    /// Default is the spring animator with 0.25 secs.
-    @objc(floatingPanel:animatorForDismissingWithVelocity:) optional
-    func floatingPanel(_ fpc: FloatingPanelController, animatorForDismissingWith velocity: CGVector) -> UIViewPropertyAnimator
+    @objc(floatingPanel:animatorForDismissingWithVelocity:)
+    optional func floatingPanel(_ fpc: FloatingPanelController, animatorForDismissingWith velocity: CGVector) -> UIViewPropertyAnimator

    /// Called when a panel has changed to a new state.
    ///
    /// This can be called inside an animation block for presenting, dismissing a panel or moving a panel with your
    /// animation. So any view properties set inside this function will be automatically animated alongside a panel.
-    @objc optional
-    func floatingPanelDidChangeState(_ fpc: FloatingPanelController)
+    @objc
+    optional func floatingPanelDidChangeState(_ fpc: FloatingPanelController)

    /// Asks the delegate if dragging should begin by the pan gesture recognizer.
-    @objc optional
-    func floatingPanelShouldBeginDragging(_ fpc: FloatingPanelController) -> Bool
+    @objc
+    optional func floatingPanelShouldBeginDragging(_ fpc: FloatingPanelController) -> Bool

    /// Called while the user drags the surface or the surface moves to a state anchor.
-    @objc optional
-    func floatingPanelDidMove(_ fpc: FloatingPanelController)
+    @objc
+    optional func floatingPanelDidMove(_ fpc: FloatingPanelController)

    /// Called on start of dragging (may require some time and or distance to move)
-    @objc optional
-    func floatingPanelWillBeginDragging(_ fpc: FloatingPanelController)
+    @objc
+    optional func floatingPanelWillBeginDragging(_ fpc: FloatingPanelController)

    /// Called on finger up if the user dragged. velocity is in points/second.
-    @objc optional
-    func floatingPanelWillEndDragging(_ fpc: FloatingPanelController, withVelocity velocity: CGPoint, targetState: UnsafeMutablePointer<FloatingPanelState>)
+    @objc
+    optional func floatingPanelWillEndDragging(_ fpc: FloatingPanelController, withVelocity velocity: CGPoint, targetState: UnsafeMutablePointer<FloatingPanelState>)

    /// Called on finger up if the user dragged.
    ///
    /// If `attract` is true, it will continue moving afterwards to a nearby state anchor.
-    @objc optional
-    func floatingPanelDidEndDragging(_ fpc: FloatingPanelController, willAttract attract: Bool)
+    @objc
+    optional func floatingPanelDidEndDragging(_ fpc: FloatingPanelController, willAttract attract: Bool)

    /// Called when it is about to be attracted to a state anchor.
-    @objc optional
-    func floatingPanelWillBeginAttracting(_ fpc: FloatingPanelController, to state: FloatingPanelState) // called on finger up as a panel are moving
+    @objc
+    optional func floatingPanelWillBeginAttracting(_ fpc: FloatingPanelController, to state: FloatingPanelState)  // called on finger up as a panel are moving

    /// Called when attracting it is completed.
-    @objc optional
-    func floatingPanelDidEndAttracting(_ fpc: FloatingPanelController) // called when a panel stops
+    @objc
+    optional func floatingPanelDidEndAttracting(_ fpc: FloatingPanelController)  // called when a panel stops

    /// Asks the delegate whether a panel should be removed when dragging ended at the specified location
    ///
    /// This delegate method is called only where ``FloatingPanel/FloatingPanelController/isRemovalInteractionEnabled``  is `true`.
    /// The velocity vector is calculated from the distance to a point of the hidden state and the pan gesture's velocity.
    @objc(floatingPanel:shouldRemoveAtLocation:withVelocity:)
-    optional
-    func floatingPanel(_ fpc: FloatingPanelController, shouldRemoveAt location: CGPoint, with velocity: CGVector) -> Bool
+    optional func floatingPanel(_ fpc: FloatingPanelController, shouldRemoveAt location: CGPoint, with velocity: CGVector) -> Bool

    /// Called on start to remove its view controller from the parent view controller.
    @objc(floatingPanelWillRemove:)
-    optional
-    func floatingPanelWillRemove(_ fpc: FloatingPanelController)
+    optional func floatingPanelWillRemove(_ fpc: FloatingPanelController)

    /// Called when a panel is removed from the parent view controller.
-    @objc optional
-    func floatingPanelDidRemove(_ fpc: FloatingPanelController)
+    @objc
+    optional func floatingPanelDidRemove(_ fpc: FloatingPanelController)

    /// Asks the delegate for a content offset of the tracking scroll view to be pinned when a panel moves
    ///
@@ -88,8 +86,7 @@ import UIKit
    ///
    /// This method will not be called if the controller doesn't track any scroll view.
    @objc(floatingPanel:contentOffsetForPinningScrollView:)
-    optional
-    func floatingPanel(_ fpc: FloatingPanelController, contentOffsetForPinning trackingScrollView: UIScrollView) -> CGPoint
+    optional func floatingPanel(_ fpc: FloatingPanelController, contentOffsetForPinning trackingScrollView: UIScrollView) -> CGPoint
 }

 ///
@@ -114,9 +111,9 @@ open class FloatingPanelController: UIViewController {
    }

    /// The delegate of a panel controller object.
-    @objc 
-    public weak var delegate: FloatingPanelControllerDelegate?{
-        didSet{
+    @objc
+    public weak var delegate: FloatingPanelControllerDelegate? {
+        didSet {
            didUpdateDelegate()
        }
    }
@@ -193,7 +190,7 @@ open class FloatingPanelController: UIViewController {
    /// The behavior for determining the adjusted content offsets.
    ///
    /// This property specifies how the content area of the tracking scroll view is modified using ``adjustedContentInsets``. The default value of this property is FloatingPanelController.ContentInsetAdjustmentBehavior.always.
-    @objc 
+    @objc
    public var contentInsetAdjustmentBehavior: ContentInsetAdjustmentBehavior = .always

    /// A Boolean value that determines whether the removal interaction is enabled.
@@ -228,7 +225,7 @@ open class FloatingPanelController: UIViewController {
    private var _contentViewController: UIViewController?

    private(set) var floatingPanel: Core!
-    private var preSafeAreaInsets: UIEdgeInsets = .zero // Capture the latest one
+    private var preSafeAreaInsets: UIEdgeInsets = .zero  // Capture the latest one
    private var safeAreaInsetsObservation: NSKeyValueObservation?
    private let modalTransition = ModalTransition()

@@ -267,7 +264,7 @@ open class FloatingPanelController: UIViewController {
        floatingPanel = Core(self, layout: initialLayout, behavior: initialBehavior)
    }

-    private func didUpdateDelegate(){
+    private func didUpdateDelegate() {
        if let layout = delegate?.floatingPanel?(self, layoutFor: traitCollection) {
            _layout = layout
        }
@@ -373,7 +370,7 @@ open class FloatingPanelController: UIViewController {
    private func update(safeAreaInsets: UIEdgeInsets) {
        guard
            preSafeAreaInsets != safeAreaInsets
-            else { return }
+        else { return }

        log.debug("Update safeAreaInsets", safeAreaInsets)

@@ -441,6 +438,12 @@ open class FloatingPanelController: UIViewController {
                // Use `self.view.safeAreaInsets` because `change.newValue` can be nil in particular case when
                // is reported in https://github.com/SCENEE/FloatingPanel/issues/330
                guard let self = self, change.oldValue != self.view.safeAreaInsets else { return }
+
+                // Sometimes the bounding rectangle of the controlled view becomes invalid when the screen is rotated.
+                // This results in its safeAreaInsets change. In that case, `self.update(safeAreaInsets:)` leads
+                // an unsatisfied constraints error. So this method should not be called with those bounds.
+                guard self.view.bounds.height > 0 && self.view.bounds.width > 0 else { return }
+
                self.update(safeAreaInsets: self.view.safeAreaInsets)
            }
        } else {
@@ -448,17 +451,21 @@ open class FloatingPanelController: UIViewController {
            // Instead, update(safeAreaInsets:) is called at `viewDidLayoutSubviews()`
        }

-        move(to: floatingPanel.layoutAdapter.initialState,
-             animated: animated,
-             completion: completion)
+        move(
+            to: floatingPanel.layoutAdapter.initialState,
+            animated: animated,
+            completion: completion
+        )
    }

    /// Hides the surface view to the hidden position
    @objc(hide:completion:)
    public func hide(animated: Bool = false, completion: (() -> Void)? = nil) {
-        move(to: .hidden,
-             animated: animated,
-             completion: completion)
+        move(
+            to: .hidden,
+            animated: animated,
+            completion: completion
+        )
    }

    /// Adds the view managed by the controller as a child of the specified view controller.
@@ -487,14 +494,14 @@ open class FloatingPanelController: UIViewController {

        parent.addChild(self)

-        view.frame = parent.view.bounds // Needed for a correct safe area configuration
+        view.frame = parent.view.bounds  // Needed for a correct safe area configuration
        view.translatesAutoresizingMaskIntoConstraints = false
        NSLayoutConstraint.activate([
            self.view.topAnchor.constraint(equalTo: parent.view.topAnchor, constant: 0.0),
            self.view.leftAnchor.constraint(equalTo: parent.view.leftAnchor, constant: 0.0),
            self.view.rightAnchor.constraint(equalTo: parent.view.rightAnchor, constant: 0.0),
            self.view.bottomAnchor.constraint(equalTo: parent.view.bottomAnchor, constant: 0.0),
-            ])
+        ])

        show(animated: animated) { [weak self] in
            guard let self = self else { return }
@@ -589,6 +596,16 @@ open class FloatingPanelController: UIViewController {
        }
    }

+    /// [Experimental] Allows the panel to move as its tracking scroll view bounces.
+    ///
+    /// This method must be called in the delegate method, `UIScrollViewDelegate.scrollViewDidScroll(_:)`,
+    /// of its tracking scroll view. This method only supports a bottom positioned panel for now.
+    ///
+    /// - TODO: Support top, left and right positioned panels.
+    public func followScrollViewBouncing() {
+        floatingPanel.followScrollViewBouncing()
+    }
+
    /// Cancel tracking the specify scroll view.
    ///
    @objc(untrackScrollView:)
@@ -658,48 +675,55 @@ extension FloatingPanelController {
        if let animator = delegate?.floatingPanel?(self, animatorForPresentingTo: to) {
            return animator
        }
-        let timingParameters = UISpringTimingParameters(decelerationRate: UIScrollView.DecelerationRate.fast.rawValue,
-                                                       frequencyResponse: 0.25)
-        return UIViewPropertyAnimator(duration: 0.0,
-                                      timingParameters: timingParameters)
+        let timingParameters = UISpringTimingParameters(
+            decelerationRate: UIScrollView.DecelerationRate.fast.rawValue,
+            frequencyResponse: 0.25)
+        return UIViewPropertyAnimator(
+            duration: 0.0,
+            timingParameters: timingParameters
+        )
    }

    func animatorForDismissing(with velocity: CGVector) -> UIViewPropertyAnimator {
        if let animator = delegate?.floatingPanel?(self, animatorForDismissingWith: velocity) {
            return animator
        }
-        let timingParameters = UISpringTimingParameters(decelerationRate: UIScrollView.DecelerationRate.fast.rawValue,
-                                                       frequencyResponse: 0.25,
-                                                       initialVelocity: velocity)
-        return UIViewPropertyAnimator(duration: 0.0,
-                                      timingParameters: timingParameters)
+        let timingParameters = UISpringTimingParameters(
+            decelerationRate: UIScrollView.DecelerationRate.fast.rawValue,
+            frequencyResponse: 0.25,
+            initialVelocity: velocity)
+        return UIViewPropertyAnimator(
+            duration: 0.0,
+            timingParameters: timingParameters
+        )
    }
 }

+// MARK: - Swizzling
+
+private var originalDismissImp: IMP?
+private typealias __dismissFunction = @convention(c) (AnyObject, Selector, Bool, (() -> Void)?) -> Void
 extension FloatingPanelController {
    private static let dismissSwizzling: Void = {
-        let aClass: AnyClass! = UIViewController.self //object_getClass(vc)
-        if let imp = class_getMethodImplementation(aClass, #selector(dismiss(animated:completion:))),
-            let originalAltMethod = class_getInstanceMethod(aClass, #selector(fp_original_dismiss(animated:completion:))) {
-            method_setImplementation(originalAltMethod, imp)
-        }
-        let originalMethod = class_getInstanceMethod(aClass, #selector(dismiss(animated:completion:)))
-        let swizzledMethod = class_getInstanceMethod(aClass, #selector(fp_dismiss(animated:completion:)))
-        if let originalMethod = originalMethod, let swizzledMethod = swizzledMethod {
-            method_exchangeImplementations(originalMethod, swizzledMethod)
+        let aClass: AnyClass! = UIViewController.self  //object_getClass(vc)
+        if let originalMethod = class_getInstanceMethod(aClass, #selector(dismiss(animated:completion:))),
+            let swizzledImp = class_getMethodImplementation(aClass, #selector(__swizzled_dismiss(animated:completion:)))
+        {
+            originalDismissImp = method_setImplementation(originalMethod, swizzledImp)
        }
    }()
 }

-public extension UIViewController {
-    @objc func fp_original_dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
-        // Implementation will be replaced by IMP of self.dismiss(animated:completion:)
-    }
-    @objc func fp_dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
+extension UIViewController {
+    @objc
+    fileprivate func __swizzled_dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
+        let dismissImp = unsafeBitCast(originalDismissImp, to: __dismissFunction.self)
+        let sel = #selector(UIViewController.dismiss(animated:completion:))
+
        // Call dismiss(animated:completion:) to a content view controller
        if let fpc = parent as? FloatingPanelController {
            if fpc.presentingViewController != nil {
-                self.fp_original_dismiss(animated: flag, completion: completion)
+                dismissImp(self, sel, flag, completion)
            } else {
                fpc.removePanelFromParent(animated: flag, completion: completion)
            }
@@ -709,7 +733,7 @@ public extension UIViewController {
        if let fpc = self as? FloatingPanelController {
            // When a panel is presented modally and it's not a child view controller of the presented view controller.
            if fpc.presentingViewController != nil, fpc.parent == nil {
-                self.fp_original_dismiss(animated: flag, completion: completion)
+                dismissImp(self, sel, flag, completion)
            } else {
                fpc.removePanelFromParent(animated: flag, completion: completion)
            }
@@ -717,6 +741,6 @@ public extension UIViewController {
        }

        // For other view controllers
-        self.fp_original_dismiss(animated: flag, completion: completion)
+        dismissImp(self, sel, flag, completion)
    }
 }
@@ -20,13 +20,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            if let cur = scrollView {
                if oldValue == nil {
                    initialScrollOffset = cur.contentOffset
-                    scrollBounce = cur.bounces
                    scrollIndictorVisible = cur.showsVerticalScrollIndicator
                }
            } else {
                if let pre = oldValue {
                    pre.isDirectionalLockEnabled = false
-                    pre.bounces = scrollBounce
                    pre.showsVerticalScrollIndicator = scrollIndictorVisible
                }
            }
@@ -45,7 +43,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    let panGestureRecognizer: FloatingPanelPanGestureRecognizer
    var isRemovalInteractionEnabled: Bool = false

-    fileprivate var isSuspended: Bool = false // Prevent a memory leak in the modal transition
+    fileprivate var isSuspended: Bool = false  // Prevent a memory leak in the modal transition
    fileprivate var transitionAnimator: UIViewPropertyAnimator?
    fileprivate var moveAnimator: NumericSpringAnimator?

@@ -64,7 +62,6 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    // Scroll handling
    private var initialScrollOffset: CGPoint = .zero
    private var stopScrollDeceleration: Bool = false
-    private var scrollBounce = false
    private var scrollIndictorVisible = false

    // MARK: - Interface
@@ -151,7 +148,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                return
            }

-            let shouldDoubleLayout = from == .hidden
+            let shouldDoubleLayout =
+                from == .hidden
                && surfaceView.hasStackView()
                && layoutAdapter.isIntrinsicAnchor(state: to)

@@ -231,7 +229,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    }

    func getBackdropAlpha(at cur: CGFloat, with translation: CGFloat) -> CGFloat {
-        /* log.debug("currentY: \(currentY) translation: \(translation)") */
+        // log.debug("currentY: \(currentY) translation: \(translation)")
        let forwardY = (translation >= 0)

        let segment = layoutAdapter.segment(at: cur, forward: forwardY)
@@ -251,30 +249,32 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        if pre == next {
            return preAlpha
        }
-        return preAlpha + max(min(1.0, 1.0 - (next - cur) / (next - pre) ), 0.0) * (nextAlpha - preAlpha)
+        return preAlpha + max(min(1.0, 1.0 - (next - cur) / (next - pre)), 0.0) * (nextAlpha - preAlpha)
    }

    // MARK: - UIGestureRecognizerDelegate

-    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer,
-                                  shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    public func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer
+    ) -> Bool {
        if let result = panGestureRecognizer.delegateProxy?.gestureRecognizer?(gestureRecognizer, shouldRecognizeSimultaneouslyWith: otherGestureRecognizer) {
            return result
        }

        guard gestureRecognizer == panGestureRecognizer else { return false }

-        /* log.debug("shouldRecognizeSimultaneouslyWith", otherGestureRecognizer) */
+        // log.debug("shouldRecognizeSimultaneouslyWith", otherGestureRecognizer)

        switch otherGestureRecognizer {
        case is FloatingPanelPanGestureRecognizer:
            // All visible panels' pan gesture should be recognized simultaneously.
            return true
        case is UIPanGestureRecognizer,
-             is UISwipeGestureRecognizer,
-             is UIRotationGestureRecognizer,
-             is UIScreenEdgePanGestureRecognizer,
-             is UIPinchGestureRecognizer:
+            is UISwipeGestureRecognizer,
+            is UIRotationGestureRecognizer,
+            is UIScreenEdgePanGestureRecognizer,
+            is UIPinchGestureRecognizer:
            if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
                return true
            }
@@ -300,8 +300,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                return true
            }
        }
-        if #available(iOS 11.0, *),
-            otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
+        if #available(iOS 11.0, *), otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
            // The dismiss gesture of a sheet modal should not begin until the pan gesture fails.
            return true
        }
@@ -331,7 +330,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            // On short contents scroll, `_UISwipeActionPanGestureRecognizer` blocks
            // the panel's pan gesture if not returns false
            if let scrollGestureRecognizers = scrollView.gestureRecognizers,
-                scrollGestureRecognizers.contains(otherGestureRecognizer) {
+                scrollGestureRecognizers.contains(otherGestureRecognizer)
+            {
                switch otherGestureRecognizer {
                case scrollView.panGestureRecognizer:
                    if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
@@ -353,12 +353,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            }
            return true
        case is UIPanGestureRecognizer,
-             is UISwipeGestureRecognizer,
-             is UIRotationGestureRecognizer,
-             is UIScreenEdgePanGestureRecognizer,
-             is UIPinchGestureRecognizer:
-            if #available(iOS 11.0, *),
-                otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
+            is UISwipeGestureRecognizer,
+            is UIRotationGestureRecognizer,
+            is UIScreenEdgePanGestureRecognizer,
+            is UIPinchGestureRecognizer:
+            if #available(iOS 11.0, *), otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
                // Should begin the pan gesture without waiting the dismiss gesture of a sheet modal.
                return false
            }
@@ -388,19 +387,21 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            let velocity = value(of: panGesture.velocity(in: panGesture.view))
            let location = panGesture.location(in: surfaceView)

-            let belowEdgeMost = 0 > layoutAdapter.offsetFromMostExpandedAnchor + (1.0 / surfaceView.fp_displayScale)
+            let insideMostExpandedAnchor = 0 > layoutAdapter.offsetFromMostExpandedAnchor + (1.0 / surfaceView.fp_displayScale)

-            log.debug("""
+            log.debug(
+                """
                scroll gesture(\(state):\(panGesture.state)) -- \
-                belowTop = \(belowEdgeMost), \
+                inside expanded anchor = \(insideMostExpandedAnchor), \
                interactionInProgress = \(interactionInProgress), \
                scroll offset = \(value(of: scrollView.contentOffset)), \
                location = \(value(of: location)), velocity = \(velocity)
-                """)
+                """
+            )

            let offsetDiff = value(of: scrollView.contentOffset - contentOffsetForPinning(of: scrollView))

-            if belowEdgeMost {
+            if insideMostExpandedAnchor {
                // Scroll offset pinning
                if state == layoutAdapter.mostExpandedState {
                    if interactionInProgress {
@@ -482,19 +483,22 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                }
            }
        case panGestureRecognizer:
-            let translation = panGesture.translation(in: panGestureRecognizer.view!.superview)
+            let translation = panGesture.translation(in: panGesture.view?.superview)
            let velocity = panGesture.velocity(in: panGesture.view)
            let location = panGesture.location(in: panGesture.view)

-            log.debug("""
+            log.debug(
+                """
                panel gesture(\(state):\(panGesture.state)) -- \
                translation =  \(value(of: translation)), \
                location = \(value(of: location)), \
                velocity = \(value(of: velocity))
-                """)
+                """
+            )

            if interactionInProgress == false, isAttracting == false,
-                let vc = ownerVC, vc.delegate?.floatingPanelShouldBeginDragging?(vc) == false {
+                let vc = ownerVC, vc.delegate?.floatingPanelShouldBeginDragging?(vc) == false
+            {
                return
            }

@@ -521,9 +525,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                    // Workaround: Prevent stopping the surface view b/w anchors if the pan gesture
                    // doesn't pass through .changed state after an interruptible animator is interrupted.
                    let diff = translation - .leastNonzeroMagnitude
-                    layoutAdapter.updateInteractiveEdgeConstraint(diff: value(of: diff),
-                                                                  scrollingContent: true,
-                                                                  allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:))
+                    layoutAdapter.updateInteractiveEdgeConstraint(
+                        diff: value(of: diff),
+                        scrollingContent: true,
+                        allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:)
+                    )
                }
                panningEnd(with: translation, velocity: velocity)
            default:
@@ -576,7 +582,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {

        guard
            state == layoutAdapter.mostExpandedState,  // When not top most(i.e. .full), don't scroll.
-            interactionInProgress == false,        // When interaction already in progress, don't scroll.
+            interactionInProgress == false,  // When interaction already in progress, don't scroll.
            0 == layoutAdapter.offsetFromMostExpandedAnchor
        else {
            return false
@@ -594,8 +600,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {

        let scrollViewFrame = scrollView.convert(scrollView.bounds, to: surfaceView)
        guard
-            scrollViewFrame.contains(initialLocation), // When the initial point not in scrollView, don't scroll.
-            !surfaceView.grabberAreaContains(point)        // When point within grabber area, don't scroll.
+            scrollViewFrame.contains(initialLocation),  // When the initial point not in scrollView, don't scroll.
+            !surfaceView.grabberAreaContains(point)  // When point within grabber area, don't scroll.
        else {
            return false
        }
@@ -605,14 +611,14 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        // after a panel moves from half/tip to full.
        switch layoutAdapter.position {
        case .top, .left:
-            if  offset < 0.0 {
+            if offset < 0.0 {
                return true
            }
            if velocity >= 0 {
                return true
            }
        case .bottom, .right:
-            if  offset > 0.0 {
+            if offset > 0.0 {
                return true
            }
            if velocity <= 0 {
@@ -652,15 +658,17 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        let diff = value(of: translation - initialTranslation)
        let next = pre + diff

-        layoutAdapter.updateInteractiveEdgeConstraint(diff: diff,
-                                                      scrollingContent: shouldScrollingContentInMoving(from: pre, to: next),
-                                                      allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:))
+        layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: diff,
+            scrollingContent: shouldScrollingContentInMoving(from: pre, to: next),
+            allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:)
+        )

        let cur = value(of: layoutAdapter.surfaceLocation)

        backdropView.alpha = getBackdropAlpha(at: cur, with: value(of: translation))

-        guard (pre != cur) else { return }
+        guard pre != cur else { return }

        if let vc = ownerVC {
            vc.delegate?.floatingPanelDidMove?(vc)
@@ -675,23 +683,19 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        if let scrollView = scrollView, scrollView.panGestureRecognizer.state == .changed {
            switch layoutAdapter.position {
            case .top:
-                if pre > .zero, pre < next,
-                    scrollView.contentSize.height > scrollView.bounds.height || scrollView.alwaysBounceVertical {
+                if pre > .zero, pre < next, scrollView.contentSize.height > scrollView.bounds.height || scrollView.alwaysBounceVertical {
                    return true
                }
            case .left:
-                if pre > .zero, pre < next,
-                    scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
+                if pre > .zero, pre < next, scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
                    return true
                }
            case .bottom:
-                if pre > .zero, pre > next,
-                    scrollView.contentSize.height > scrollView.bounds.height || scrollView.alwaysBounceVertical {
+                if pre > .zero, pre > next, scrollView.contentSize.height > scrollView.bounds.height || scrollView.alwaysBounceVertical {
                    return true
                }
            case .right:
-                if pre > .zero, pre > next,
-                    scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
+                if pre > .zero, pre > next, scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
                    return true
                }
            }
@@ -707,11 +711,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            return
        }

-        stopScrollDeceleration = (0 > layoutAdapter.offsetFromMostExpandedAnchor + (1.0 / surfaceView.fp_displayScale)) // Projecting the dragging to the scroll dragging or not
+        stopScrollDeceleration = (0 > layoutAdapter.offsetFromMostExpandedAnchor + (1.0 / surfaceView.fp_displayScale))  // Projecting the dragging to the scroll dragging or not
        if stopScrollDeceleration {
            DispatchQueue.main.async { [weak self] in
                guard let self = self else { return }
-                
+
                self.stopScrolling(at: self.initialScrollOffset)
            }
        }
@@ -726,9 +730,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            let distToHidden = CGFloat(abs(currentPos - layoutAdapter.position(for: .hidden)))
            switch layoutAdapter.position {
            case .top, .bottom:
-                removalVector = (distToHidden != 0) ? CGVector(dx: 0.0, dy: velocity.y/distToHidden) : .zero
+                removalVector = (distToHidden != 0) ? CGVector(dx: 0.0, dy: velocity.y / distToHidden) : .zero
            case .left, .right:
-                removalVector = (distToHidden != 0) ? CGVector(dx: velocity.x/distToHidden, dy: 0.0) : .zero
+                removalVector = (distToHidden != 0) ? CGVector(dx: velocity.x / distToHidden, dy: 0.0) : .zero
            }
            if shouldRemove(with: removalVector) {
                ownerVC?.remove()
@@ -764,8 +768,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        startAttraction(to: targetPosition, with: velocity)

        // Workaround: Reset `self.scrollView.isScrollEnabled`
-        if let scrollView = scrollView, targetPosition != layoutAdapter.mostExpandedState,
-            let isScrollEnabled = isScrollEnabled {
+        if let scrollView = scrollView, targetPosition != layoutAdapter.mostExpandedState, let isScrollEnabled = isScrollEnabled {
            scrollView.isScrollEnabled = isScrollEnabled
        }
    }
@@ -791,7 +794,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    }

    private func startInteraction(with translation: CGPoint, at location: CGPoint) {
-        /* Don't lock a scroll view to show a scroll indicator after hitting the top */
+        // Don't lock a scroll view to show a scroll indicator after hitting the top
        log.debug("startInteraction  -- translation = \(value(of: translation)), location = \(value(of: location))")
        guard interactionInProgress == false else { return }

@@ -890,21 +893,25 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            decelerationRate: behaviorAdapter.springDecelerationRate,
            responseTime: behaviorAdapter.springResponseTime,
            update: { [weak self] data in
-                guard let self = self,
-                      let ownerVC = self.ownerVC // Ensure the owner vc is existing for `layoutAdapter.surfaceLocation`
+                guard
+                    let self = self,
+                    let ownerVC = self.ownerVC  // Ensure the owner vc is existing for `layoutAdapter.surfaceLocation`
                else { return }
                animationConstraint.constant = data.value
                let current = self.value(of: self.layoutAdapter.surfaceLocation)
                let translation = data.value - initialData.value
                self.backdropView.alpha = self.getBackdropAlpha(at: current, with: translation)
                ownerVC.notifyDidMove()
-        },
+            },
            completion: { [weak self] in
-                guard let self = self,
-                      self.ownerVC != nil else { return }
+                guard
+                    let self = self,
+                    self.ownerVC != nil
+                else { return }
                self.updateLayout(to: targetPosition)
                completion()
-        })
+            }
+        )
        moveAnimator?.startAnimation()
        state = targetPosition
    }
@@ -923,11 +930,13 @@ class Core: NSObject, UIGestureRecognizerDelegate {

        stopScrollDeceleration = false

-        log.debug("""
+        log.debug(
+            """
            finishAnimation -- state = \(state) \
            surface location = \(layoutAdapter.surfaceLocation) \
            edge most position = \(layoutAdapter.surfaceLocation(for: layoutAdapter.mostExpandedState))
-            """)
+            """
+        )
        if finished, state == layoutAdapter.mostExpandedState, abs(layoutAdapter.offsetFromMostExpandedAnchor) <= 1.0 {
            unlockScrollView()
        }
@@ -957,7 +966,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {

        let sortedPositions = layoutAdapter.sortedAnchorStatesByCoordinate

-        guard sortedPositions.count > 1 else {
+        guard
+            sortedPositions.count > 1,
+            let firstPosition = sortedPositions.first,
+            let lastPosition = sortedPositions.last
+        else {
            return state
        }

@@ -975,13 +988,13 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        var fromPos: FloatingPanelState
        var toPos: FloatingPanelState

-        let (lowerPos, upperPos) = (segment.lower ?? sortedPositions.first!, segment.upper ?? sortedPositions.last!)
+        let (lowerPos, upperPos) = (segment.lower ?? firstPosition, segment.upper ?? lastPosition)
        (fromPos, toPos) = forwardY ? (lowerPos, upperPos) : (upperPos, lowerPos)

        if behaviorAdapter.shouldProjectMomentum(to: toPos) == false {
            log.debug("targetPosition -- negate projection: distance = \(distance)")
            let segment = layoutAdapter.segment(at: currentY, forward: forwardY)
-            var (lowerPos, upperPos) = (segment.lower ?? sortedPositions.first!, segment.upper ?? sortedPositions.last!)
+            var (lowerPos, upperPos) = (segment.lower ?? firstPosition, segment.upper ?? lastPosition)
            // Equate the segment out of {top,bottom} most state to the {top,bottom} most segment
            if lowerPos == upperPos {
                if forwardY {
@@ -1008,6 +1021,22 @@ class Core: NSObject, UIGestureRecognizerDelegate {

    // MARK: - ScrollView handling

+    func followScrollViewBouncing() {
+        guard let scrollView = scrollView else {
+            return
+        }
+        let contentOffset = scrollView.contentOffset.y
+        guard contentOffset < 0, layoutAdapter.position == .bottom, state == layoutAdapter.mostExpandedState else {
+            if surfaceView.transform != .identity {
+                surfaceView.transform = .identity
+                scrollView.transform = .identity
+            }
+            return
+        }
+        surfaceView.transform = CGAffineTransform(translationX: 0, y: -contentOffset)
+        scrollView.transform = CGAffineTransform(translationX: 0, y: contentOffset)
+    }
+
    private func lockScrollView() {
        guard let scrollView = scrollView else { return }

@@ -1017,11 +1046,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        }
        log.debug("lock scroll view")

-        scrollBounce = scrollView.bounces
        scrollIndictorVisible = scrollView.showsVerticalScrollIndicator

+        // Must not modify the UIScrollView.bounces property here. If you reset it to unlock the tracking scroll view,
+        // UIScrollView may unexpectedly alter the scroll offset when dealing with small scrollable content.
        scrollView.isDirectionalLockEnabled = true
-        scrollView.bounces = false
        scrollView.showsVerticalScrollIndicator = false
    }

@@ -1030,7 +1059,6 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        log.debug("unlock scroll view")

        scrollView.isDirectionalLockEnabled = false
-        scrollView.bounces = scrollBounce
        scrollView.showsVerticalScrollIndicator = scrollIndictorVisible
    }

@@ -1105,9 +1133,11 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
        }
        set {
            guard newValue is Core else {
-                let exception = NSException(name: .invalidArgumentException,
-                                            reason: "FloatingPanelController's built-in pan gesture recognizer must have its controller as its delegate. Use 'delegateProxy' property.",
-                                            userInfo: nil)
+                let exception = NSException(
+                    name: .invalidArgumentException,
+                    reason: "FloatingPanelController's built-in pan gesture recognizer must have its controller as its delegate. Use 'delegateProxy' property.",
+                    userInfo: nil
+                )
                exception.raise()
                return
            }
@@ -1120,7 +1150,7 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
    /// If an object adopting `UIGestureRecognizerDelegate` is set, the delegate methods are proxied to it.
    public weak var delegateProxy: UIGestureRecognizerDelegate? {
        didSet {
-            self.delegate = floatingPanel // Update the cached IMP
+            self.delegate = floatingPanel  // Update the cached IMP
        }
    }
 }
@@ -1136,13 +1166,13 @@ private class NumericSpringAnimator: NSObject {
    private class UnfairLock {
        var unfairLock = os_unfair_lock()
        func lock() {
-            os_unfair_lock_lock(&unfairLock);
+            os_unfair_lock_lock(&unfairLock)
        }
        func tryLock() -> Bool {
-            return os_unfair_lock_trylock(&unfairLock);
+            return os_unfair_lock_trylock(&unfairLock)
        }
        func unlock() {
-            os_unfair_lock_unlock(&unfairLock);
+            os_unfair_lock_unlock(&unfairLock)
        }
    }

@@ -1162,21 +1192,23 @@ private class NumericSpringAnimator: NSObject {
    private let update: ((_ data: Data) -> Void)
    private let completion: (() -> Void)

-    init(initialData: Data,
-         target: CGFloat,
-         displayScale: CGFloat,
-         decelerationRate: CGFloat,
-         responseTime: CGFloat,
-         update: @escaping ((_ data: Data) -> Void),
-         completion: @escaping (() -> Void)) {
+    init(
+        initialData: Data,
+        target: CGFloat,
+        displayScale: CGFloat,
+        decelerationRate: CGFloat,
+        responseTime: CGFloat,
+        update: @escaping ((_ data: Data) -> Void),
+        completion: @escaping (() -> Void)
+    ) {

        self.data = initialData
        self.target = target
        self.displayScale = displayScale

-        let frequency = 1 / responseTime // oscillation frequency
-        let duration: CGFloat = 0.001 // millisecond
-        self.zeta = abs(initialData.velocity) > 300 ? CoreGraphics.log(decelerationRate) / (-2.0 * .pi * frequency * duration)  : 1.0
+        let frequency = 1 / responseTime  // oscillation frequency
+        let duration: CGFloat = 0.001  // millisecond
+        self.zeta = abs(initialData.velocity) > 300 ? CoreGraphics.log(decelerationRate) / (-2.0 * .pi * frequency * duration) : 1.0
        self.omega = 2.0 * .pi * frequency

        self.update = update
@@ -1184,7 +1216,7 @@ private class NumericSpringAnimator: NSObject {
    }

    @discardableResult
-    func startAnimation() -> Bool{
+    func startAnimation() -> Bool {
        lock.lock()
        defer { lock.unlock() }

@@ -1220,29 +1252,28 @@ private class NumericSpringAnimator: NSObject {
        let pre = data.value
        var cur = pre
        var velocity = data.velocity
-        spring(x: &cur,
-               v: &velocity,
-               xt: target,
-               zeta: zeta,
-               omega: omega,
-               h: CGFloat(displayLink.targetTimestamp - displayLink.timestamp))
+        spring(
+            x: &cur,
+            v: &velocity,
+            xt: target,
+            zeta: zeta,
+            omega: omega,
+            h: CGFloat(displayLink.targetTimestamp - displayLink.timestamp)
+        )
        data = Data(value: cur, velocity: velocity)
        update(data)
-        if abs(target - data.value) <= (1 / displayScale),
-           abs(pre - data.value) / (1 / displayScale) <= 1 {
+        if abs(target - data.value) <= (1 / displayScale), abs(pre - data.value) / (1 / displayScale) <= 1 {
            stopAnimation(false)
        }
    }

-    /**
-     - Parameters:
-     - x: value
-     - v: velocity
-     - xt: target value
-     - zeta: damping ratio
-     - omega: angular frequency
-     - h: time step
-     */
+    /// - Parameters:
+    ///     - x: value
+    ///     - v: velocity
+    ///     - xt: target value
+    ///     - zeta: damping ratio
+    ///     - omega: angular frequency
+    ///     - h: time step
    private func spring(x: inout CGFloat, v: inout CGFloat, xt: CGFloat, zeta: CGFloat, omega: CGFloat, h: CGFloat) {
        let f = 1.0 + 2.0 * h * zeta * omega
        let h2 = pow(h, 2)
@@ -52,12 +52,14 @@ private class CustomLayoutGuide: LayoutGuideProvider {
    let rightAnchor: NSLayoutXAxisAnchor
    let widthAnchor: NSLayoutDimension
    let heightAnchor: NSLayoutDimension
-    init(topAnchor: NSLayoutYAxisAnchor,
-         leftAnchor: NSLayoutXAxisAnchor,
-         bottomAnchor: NSLayoutYAxisAnchor,
-         rightAnchor: NSLayoutXAxisAnchor,
-         widthAnchor: NSLayoutDimension,
-         heightAnchor: NSLayoutDimension) {
+    init(
+        topAnchor: NSLayoutYAxisAnchor,
+        leftAnchor: NSLayoutXAxisAnchor,
+        bottomAnchor: NSLayoutYAxisAnchor,
+        rightAnchor: NSLayoutXAxisAnchor,
+        widthAnchor: NSLayoutDimension,
+        heightAnchor: NSLayoutDimension
+    ) {
        self.topAnchor = topAnchor
        self.leftAnchor = leftAnchor
        self.bottomAnchor = bottomAnchor
@@ -72,23 +74,27 @@ extension UIViewController {
        if #available(iOS 11.0, *) {
            return view.safeAreaInsets
        } else {
-            return UIEdgeInsets(top: topLayoutGuide.length,
-                                left: 0.0,
-                                bottom: bottomLayoutGuide.length,
-                                right: 0.0)
+            return UIEdgeInsets(
+                top: topLayoutGuide.length,
+                left: 0.0,
+                bottom: bottomLayoutGuide.length,
+                right: 0.0
+            )
        }
    }

    var fp_safeAreaLayoutGuide: LayoutGuideProvider {
        if #available(iOS 11.0, *) {
-            return view!.safeAreaLayoutGuide
+            return view?.safeAreaLayoutGuide ?? view
        } else {
-            return CustomLayoutGuide(topAnchor: topLayoutGuide.bottomAnchor,
-                                     leftAnchor: view.leftAnchor,
-                                     bottomAnchor: bottomLayoutGuide.topAnchor,
-                                     rightAnchor: view.rightAnchor,
-                                     widthAnchor: view.widthAnchor,
-                                     heightAnchor: topLayoutGuide.bottomAnchor.anchorWithOffset(to: bottomLayoutGuide.topAnchor))
+            return CustomLayoutGuide(
+                topAnchor: topLayoutGuide.bottomAnchor,
+                leftAnchor: view.leftAnchor,
+                bottomAnchor: bottomLayoutGuide.topAnchor,
+                rightAnchor: view.rightAnchor,
+                widthAnchor: view.widthAnchor,
+                heightAnchor: topLayoutGuide.bottomAnchor.anchorWithOffset(to: bottomLayoutGuide.topAnchor)
+            )
        }
    }
 }
@@ -133,9 +139,14 @@ extension UIView {
    }

    static func performWithLinear(startTime: Double = 0.0, relativeDuration: Double = 1.0, _ animations: @escaping (() -> Void)) {
-        UIView.animateKeyframes(withDuration: 0.0, delay: 0.0, options: [.calculationModeCubic], animations: {
-            UIView.addKeyframe(withRelativeStartTime: startTime, relativeDuration: relativeDuration, animations: animations)
-        }, completion: nil)
+        UIView.animateKeyframes(
+            withDuration: 0.0,
+            delay: 0.0,
+            options: [.calculationModeCubic],
+            animations: {
+                UIView.addKeyframe(withRelativeStartTime: startTime, relativeDuration: relativeDuration, animations: animations)
+            },
+            completion: nil)
    }
 }

@@ -157,7 +168,7 @@ extension UIGestureRecognizer.State: CustomDebugStringConvertible {

 extension UIScrollView {
    var isLocked: Bool {
-        return !showsVerticalScrollIndicator && !bounces &&  isDirectionalLockEnabled
+        return !showsVerticalScrollIndicator && isDirectionalLockEnabled
    }
    var fp_contentInset: UIEdgeInsets {
        if #available(iOS 11.0, *) {
@@ -167,8 +178,10 @@ extension UIScrollView {
        }
    }
    var fp_contentOffsetMax: CGPoint {
-        return CGPoint(x: max((contentSize.width + fp_contentInset.right) - bounds.width, 0.0),
-                       y: max((contentSize.height + fp_contentInset.bottom) - bounds.height, 0.0))
+        return CGPoint(
+            x: max((contentSize.width + fp_contentInset.right) - bounds.width, 0.0),
+            y: max((contentSize.height + fp_contentInset.bottom) - bounds.height, 0.0)
+        )
    }
 }

@@ -208,7 +221,7 @@ extension UIEdgeInsets {

 extension UIBezierPath {
    static func path(roundedRect rect: CGRect, appearance: SurfaceAppearance) -> UIBezierPath {
-        let cornerRadius = appearance.cornerRadius;
+        let cornerRadius = appearance.cornerRadius
        if #available(iOS 13.0, *) {
            if appearance.cornerCurve == .circular {
                let path = UIBezierPath()
@@ -218,45 +231,61 @@ extension UIBezierPath {

                path.addLine(to: CGPoint(x: rect.maxX - cornerRadius, y: rect.minY))
                if cornerRadius > 0 {
-                    path .addArc(withCenter: CGPoint(x: rect.maxX - cornerRadius,
-                                                     y: rect.minY + cornerRadius),
-                                 radius: cornerRadius,
-                                 startAngle: -0.5 * .pi,
-                                 endAngle: 0,
-                                 clockwise: true)
+                    path.addArc(
+                        withCenter: CGPoint(
+                            x: rect.maxX - cornerRadius,
+                            y: rect.minY + cornerRadius
+                        ),
+                        radius: cornerRadius,
+                        startAngle: -0.5 * .pi,
+                        endAngle: 0,
+                        clockwise: true
+                    )
                }

                path.addLine(to: CGPoint(x: rect.maxX, y: rect.maxY - cornerRadius))

                if cornerRadius > 0 {
-                    path.addArc(withCenter: CGPoint(x: rect.maxX - cornerRadius,
-                                                    y: rect.maxY - cornerRadius),
-                                radius: cornerRadius,
-                                startAngle: 0,
-                                endAngle: .pi * 0.5,
-                                clockwise: true)
+                    path.addArc(
+                        withCenter: CGPoint(
+                            x: rect.maxX - cornerRadius,
+                            y: rect.maxY - cornerRadius
+                        ),
+                        radius: cornerRadius,
+                        startAngle: 0,
+                        endAngle: .pi * 0.5,
+                        clockwise: true
+                    )
                }

                path.addLine(to: CGPoint(x: rect.minX + cornerRadius, y: rect.maxY))

                if cornerRadius > 0 {
-                    path.addArc(withCenter: CGPoint(x: rect.minX + cornerRadius,
-                                                    y: rect.maxY - cornerRadius),
-                                radius: cornerRadius,
-                                startAngle: .pi * 0.5,
-                                endAngle: .pi,
-                                clockwise: true)
+                    path.addArc(
+                        withCenter: CGPoint(
+                            x: rect.minX + cornerRadius,
+                            y: rect.maxY - cornerRadius
+                        ),
+                        radius: cornerRadius,
+                        startAngle: .pi * 0.5,
+                        endAngle: .pi,
+                        clockwise: true
+                    )
                }

                path.addLine(to: CGPoint(x: rect.minX, y: rect.minY + cornerRadius))

                if cornerRadius > 0 {
-                    path.addArc(withCenter: CGPoint(x: rect.minX + cornerRadius,
-                                                    y: rect.minY + cornerRadius),
-                                radius: cornerRadius,
-                                startAngle: .pi,
-                                endAngle: .pi * 1.5,
-                                clockwise: true)
+                    path.addArc(
+                        withCenter: CGPoint(
+                            x: rect.minX + cornerRadius,
+                            y: rect.minY + cornerRadius
+                        ),
+                        radius: cornerRadius,
+                        startAngle: .pi,
+                        endAngle: .pi * 1.5,
+                        clockwise: true
+                    )
                }

                path.addLine(to: start)
@@ -266,9 +295,13 @@ extension UIBezierPath {
                return path
            }
        }
-        return UIBezierPath(roundedRect: rect,
-                            byRoundingCorners: [.allCorners],
-                            cornerRadii: CGSize(width: cornerRadius,
-                                                height: cornerRadius))
+        return UIBezierPath(
+            roundedRect: rect,
+            byRoundingCorners: [.allCorners],
+            cornerRadii: CGSize(
+                width: cornerRadius,
+                height: cornerRadius
+            )
+        )
    }
 }
@@ -1,11 +1,12 @@
 # ``FloatingPanel``

-The new interface displays the related contents and utilities in parallel as a user wants.
+Create a user interface to display the related content and utilities alongside the main content.

 ## Overview

-FloatingPanel is a simple and easy-to-use UI component for a new interface introduced in Apple Maps, Shortcuts and Stocks app.
-The new interface displays the related contents and utilities in parallel as a user wants.
+
+FloatingPanel is a simple and easy-to-use UI component designed for a user interface featured in the Apple Maps, Shortcuts and Stocks app.
+The user interface displays related content and utilities alongside the main content.


 ## Topics
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0</string>
+	<string>2.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
@@ -30,7 +30,7 @@ open class FloatingPanelBottomLayout: NSObject, FloatingPanelLayout {
        return .half
    }

-    open var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
+    open var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
        return [
            .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .top, referenceGuide: .safeArea),
            .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
@@ -153,36 +153,42 @@ class LayoutAdapter {
    var adjustedContentInsets: UIEdgeInsets {
        switch position {
        case .top:
-            return UIEdgeInsets(top: safeAreaInsets.top,
-                                left: 0.0,
-                                bottom: 0.0,
-                                right: 0.0)
+            return UIEdgeInsets(
+                top: safeAreaInsets.top,
+                left: 0.0,
+                bottom: 0.0,
+                right: 0.0
+            )
        case .left:
-            return UIEdgeInsets(top: 0.0,
-                                left: safeAreaInsets.left,
-                                bottom: 0.0,
-                                right: 0.0)
+            return UIEdgeInsets(
+                top: 0.0,
+                left: safeAreaInsets.left,
+                bottom: 0.0,
+                right: 0.0
+            )
        case .bottom:
-            return UIEdgeInsets(top: 0.0,
-                                left: 0.0,
-                                bottom: safeAreaInsets.bottom,
-                                right: 0.0)
+            return UIEdgeInsets(
+                top: 0.0,
+                left: 0.0,
+                bottom: safeAreaInsets.bottom,
+                right: 0.0
+            )
        case .right:
-            return UIEdgeInsets(top: 0.0,
-                                left: 0.0,
-                                bottom: 0.0,
-                                right: safeAreaInsets.right)
+            return UIEdgeInsets(
+                top: 0.0,
+                left: 0.0,
+                bottom: 0.0,
+                right: safeAreaInsets.right
+            )
        }
    }

-    /*
-    Returns a constraint based value in the interaction and animation.
-
-    So that it doesn't need to call `surfaceView.layoutIfNeeded()`
-    after every interaction and animation update. It has an effect on
-    the smooth interaction because the content view doesn't need to update
-    its layout frequently.
-    */
+    /// Returns a constraint based value in the interaction and animation.
+    ///
+    /// So that it doesn't need to call `surfaceView.layoutIfNeeded()`
+    /// after every interaction and animation update. It has an effect on
+    /// the smooth interaction because the content view doesn't need to update
+    /// its layout frequently.
    var surfaceLocation: CGPoint {
        get {
            var pos: CGFloat
@@ -433,10 +439,10 @@ class LayoutAdapter {
        }
        let backdropConstraints = [
            backdropView.topAnchor.constraint(equalTo: vc.view.topAnchor, constant: 0.0),
-            backdropView.leftAnchor.constraint(equalTo: vc.view.leftAnchor,constant: 0.0),
+            backdropView.leftAnchor.constraint(equalTo: vc.view.leftAnchor, constant: 0.0),
            backdropView.rightAnchor.constraint(equalTo: vc.view.rightAnchor, constant: 0.0),
            backdropView.bottomAnchor.constraint(equalTo: vc.view.bottomAnchor, constant: 0.0),
-            ]
+        ]

        fixedConstraints = surfaceConstraints + backdropConstraints

@@ -471,7 +477,10 @@ class LayoutAdapter {
        for state in layout.anchors.keys {
            stateConstraints[state] = layout.anchors[state]?
                .layoutConstraints(vc, for: position)
-                .map{ $0.identifier = "FloatingPanel-\(state)-constraint"; return $0 }
+                .map {
+                    $0.identifier = "FloatingPanel-\(state)-constraint"
+                    return $0
+                }
        }
        let hiddenAnchor = layout.anchors[.hidden] ?? self.hiddenAnchor
        offConstraints = hiddenAnchor.layoutConstraints(vc, for: position)
@@ -549,8 +558,10 @@ class LayoutAdapter {
        case .top:
            switch referenceEdge(of: anchor) {
            case .top:
-                animationConstraint = surfaceView.bottomAnchor.constraint(equalTo: layoutGuideProvider.topAnchor,
-                                                                          constant: currentY)
+                animationConstraint = surfaceView.bottomAnchor.constraint(
+                    equalTo: layoutGuideProvider.topAnchor,
+                    constant: currentY
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant -= safeAreaInsets.top
                    targetY -= safeAreaInsets.top
@@ -558,8 +569,10 @@ class LayoutAdapter {
            case .bottom:
                let baseHeight = vc.view.bounds.height
                targetY = -(baseHeight - targetY)
-                animationConstraint = surfaceView.bottomAnchor.constraint(equalTo: layoutGuideProvider.bottomAnchor,
-                                                                          constant: -(baseHeight - currentY))
+                animationConstraint = surfaceView.bottomAnchor.constraint(
+                    equalTo: layoutGuideProvider.bottomAnchor,
+                    constant: -(baseHeight - currentY)
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant += safeAreaInsets.bottom
                    targetY += safeAreaInsets.bottom
@@ -571,16 +584,20 @@ class LayoutAdapter {
        case .left:
            switch referenceEdge(of: anchor) {
            case .left:
-                animationConstraint = surfaceView.rightAnchor.constraint(equalTo: layoutGuideProvider.leftAnchor,
-                                                                          constant: currentY)
+                animationConstraint = surfaceView.rightAnchor.constraint(
+                    equalTo: layoutGuideProvider.leftAnchor,
+                    constant: currentY
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant -= safeAreaInsets.right
                    targetY -= safeAreaInsets.right
                }
            case .right:
                targetY = -(baseHeight - targetY)
-                animationConstraint = surfaceView.rightAnchor.constraint(equalTo: layoutGuideProvider.rightAnchor,
-                                                                          constant: -(baseHeight - currentY))
+                animationConstraint = surfaceView.rightAnchor.constraint(
+                    equalTo: layoutGuideProvider.rightAnchor,
+                    constant: -(baseHeight - currentY)
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant += safeAreaInsets.left
                    targetY += safeAreaInsets.left
@@ -591,16 +608,20 @@ class LayoutAdapter {
        case .bottom:
            switch referenceEdge(of: anchor) {
            case .top:
-                animationConstraint = surfaceView.topAnchor.constraint(equalTo: layoutGuideProvider.topAnchor,
-                                                                       constant: currentY)
+                animationConstraint = surfaceView.topAnchor.constraint(
+                    equalTo: layoutGuideProvider.topAnchor,
+                    constant: currentY
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant -= safeAreaInsets.top
                    targetY -= safeAreaInsets.top
                }
            case .bottom:
                targetY = -(baseHeight - targetY)
-                animationConstraint = surfaceView.topAnchor.constraint(equalTo: layoutGuideProvider.bottomAnchor,
-                                                                       constant: -(baseHeight - currentY))
+                animationConstraint = surfaceView.topAnchor.constraint(
+                    equalTo: layoutGuideProvider.bottomAnchor,
+                    constant: -(baseHeight - currentY)
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant += safeAreaInsets.bottom
                    targetY += safeAreaInsets.bottom
@@ -612,16 +633,20 @@ class LayoutAdapter {
        case .right:
            switch referenceEdge(of: anchor) {
            case .left:
-                animationConstraint = surfaceView.leftAnchor.constraint(equalTo: layoutGuideProvider.leftAnchor,
-                                                                         constant: currentY)
+                animationConstraint = surfaceView.leftAnchor.constraint(
+                    equalTo: layoutGuideProvider.leftAnchor,
+                    constant: currentY
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant -= safeAreaInsets.left
                    targetY -= safeAreaInsets.left
                }
            case .right:
                targetY = -(baseHeight - targetY)
-                animationConstraint = surfaceView.leftAnchor.constraint(equalTo: layoutGuideProvider.rightAnchor,
-                                                                         constant: -(baseHeight - currentY))
+                animationConstraint = surfaceView.leftAnchor.constraint(
+                    equalTo: layoutGuideProvider.rightAnchor,
+                    constant: -(baseHeight - currentY)
+                )
                if anchor.referenceGuide == .safeArea {
                    animationConstraint.constant += safeAreaInsets.right
                    targetY += safeAreaInsets.right
@@ -647,7 +672,7 @@ class LayoutAdapter {
    // The method is separated from prepareLayout(to:) for the rotation support
    // It must be called in FloatingPanelController.traitCollectionDidChange(_:)
    func updateStaticConstraint() {
-        NSLayoutConstraint.deactivate([staticConstraint, contentBoundingConstraint].compactMap{ $0 })
+        NSLayoutConstraint.deactivate([staticConstraint, contentBoundingConstraint].compactMap { $0 })
        staticConstraint = nil
        contentBoundingConstraint = nil

@@ -656,7 +681,10 @@ class LayoutAdapter {
            return
        }

-        let anchor = layout.anchors[self.mostExpandedState]!
+        guard let anchor = layout.anchors[mostExpandedState] else {
+            return
+        }
+
        let surfaceAnchor = position.mainDimensionAnchor(surfaceView)
        switch anchor {
        case let anchor as FloatingPanelIntrinsicLayoutAnchor:
@@ -675,11 +703,15 @@ class LayoutAdapter {
            let baseAnchor = position.mainDimensionAnchor(anchor.contentLayoutGuide)
            if let boundingLayoutGuide = anchor.contentBoundingGuide.layoutGuide(vc) {
                if anchor.isAbsolute {
-                    contentBoundingConstraint = baseAnchor.constraint(lessThanOrEqualTo: position.mainDimensionAnchor(boundingLayoutGuide),
-                                                               constant: anchor.offset)
+                    contentBoundingConstraint = baseAnchor.constraint(
+                        lessThanOrEqualTo: position.mainDimensionAnchor(boundingLayoutGuide),
+                        constant: anchor.offset
+                    )
                } else {
-                    contentBoundingConstraint = baseAnchor.constraint(lessThanOrEqualTo: position.mainDimensionAnchor(boundingLayoutGuide),
-                                                               multiplier: anchor.offset)
+                    contentBoundingConstraint = baseAnchor.constraint(
+                        lessThanOrEqualTo: position.mainDimensionAnchor(boundingLayoutGuide),
+                        multiplier: anchor.offset
+                    )
                }
                staticConstraint = surfaceAnchor.constraint(lessThanOrEqualTo: baseAnchor, constant: constant)
            } else {
@@ -691,8 +723,10 @@ class LayoutAdapter {
                staticConstraint = surfaceAnchor.constraint(equalToConstant: position(for: self.mostCoordinateState))
            case .bottom, .right:
                let rootViewAnchor = position.mainDimensionAnchor(vc.view)
-                staticConstraint = rootViewAnchor.constraint(equalTo: surfaceAnchor,
-                                                             constant: position(for: self.leastCoordinateState))
+                staticConstraint = rootViewAnchor.constraint(
+                    equalTo: surfaceAnchor,
+                    constant: position(for: self.leastCoordinateState)
+                )
            }
        }

@@ -703,7 +737,7 @@ class LayoutAdapter {
            staticConstraint?.identifier = "FloatingPanel-static-width"
        }

-        NSLayoutConstraint.activate([staticConstraint, contentBoundingConstraint].compactMap{ $0 })
+        NSLayoutConstraint.activate([staticConstraint, contentBoundingConstraint].compactMap { $0 })

        surfaceView.containerOverflow = position.mainDimension(vc.view.bounds.size)
    }
@@ -806,9 +840,12 @@ class LayoutAdapter {
    fileprivate func checkLayout() {
        // Verify layout configurations
        assert(anchorStates.count > 0)
-        assert(validStates.contains(layout.initialState),
-               "Does not include an initial state (\(layout.initialState)) in (\(validStates))")
-        /* This assertion does not work in a device rotating
+        assert(
+            validStates.contains(layout.initialState),
+            "Does not include an initial state (\(layout.initialState)) in (\(validStates))"
+        )
+        /**
+         // This assertion does not work in a device rotating
         let statePosOrder = activeStates.sorted(by: { position(for: $0) < position(for: $1) })
         assert(sortedDirectionalStates == statePosOrder,
               "Check your layout anchors because the state order(\(statePosOrder)) must be (\(sortedDirectionalStates))).")
@@ -3,13 +3,15 @@
 import UIKit

 /// An interface for implementing custom layout anchor objects.
-@objc public protocol FloatingPanelLayoutAnchoring {
+@objc
+public protocol FloatingPanelLayoutAnchoring {
    var referenceGuide: FloatingPanelLayoutReferenceGuide { get }
    func layoutConstraints(_ fpc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint]
 }

 /// An object that defines how to settles a panel with insets from an edge of a reference rectangle.
-@objc final public class FloatingPanelLayoutAnchor: NSObject, FloatingPanelLayoutAnchoring /*, NSCopying */ {
+@objc
+public final class FloatingPanelLayoutAnchor: NSObject, FloatingPanelLayoutAnchoring {

    /// Returns a layout anchor with the specified inset by an absolute value, edge and reference guide for a panel.
    ///
@@ -50,8 +52,8 @@ import UIKit
    @objc let referenceEdge: FloatingPanelReferenceEdge
 }

-public extension FloatingPanelLayoutAnchor {
-    func layoutConstraints(_ vc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint] {
+extension FloatingPanelLayoutAnchor {
+    public func layoutConstraints(_ vc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint] {
        let layoutGuide = referenceGuide.layoutGuide(vc: vc)
        switch position {
        case .top:
@@ -72,7 +74,7 @@ public extension FloatingPanelLayoutAnchor {
                return [edgeAnchor.constraint(equalTo: layoutGuide.topAnchor, constant: inset)]
            }
            let offsetAnchor = layoutGuide.topAnchor.anchorWithOffset(to: edgeAnchor)
-            return [offsetAnchor.constraint(equalTo:layoutGuide.heightAnchor, multiplier: inset)]
+            return [offsetAnchor.constraint(equalTo: layoutGuide.heightAnchor, multiplier: inset)]
        case .bottom:
            if isAbsolute {
                return [layoutGuide.bottomAnchor.constraint(equalTo: edgeAnchor, constant: inset)]
@@ -105,7 +107,8 @@ public extension FloatingPanelLayoutAnchor {
 }

 /// An object that defines how to settles a panel with the intrinsic size for a content.
-@objc final public class FloatingPanelIntrinsicLayoutAnchor: NSObject, FloatingPanelLayoutAnchoring /*, NSCopying */ {
+@objc
+public final class FloatingPanelIntrinsicLayoutAnchor: NSObject, FloatingPanelLayoutAnchoring {

    /// Returns a layout anchor with the specified offset by an absolute value and reference guide for a panel.
    ///
@@ -141,8 +144,8 @@ public extension FloatingPanelLayoutAnchor {
    @objc public let referenceGuide: FloatingPanelLayoutReferenceGuide
 }

-public extension FloatingPanelIntrinsicLayoutAnchor {
-    func layoutConstraints(_ vc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint] {
+extension FloatingPanelIntrinsicLayoutAnchor {
+    public func layoutConstraints(_ vc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint] {
        let surfaceIntrinsicLength = position.mainDimension(vc.surfaceView.intrinsicContentSize)
        let constant = isAbsolute ? surfaceIntrinsicLength - offset : surfaceIntrinsicLength * (1 - offset)
        let layoutGuide = referenceGuide.layoutGuide(vc: vc)
@@ -160,7 +163,8 @@ public extension FloatingPanelIntrinsicLayoutAnchor {
 }

 /// An object that defines how to settles a panel with a layout guide of a content view.
-@objc final public class FloatingPanelAdaptiveLayoutAnchor: NSObject, FloatingPanelLayoutAnchoring /*, NSCopying */ {
+@objc
+public final class FloatingPanelAdaptiveLayoutAnchor: NSObject, FloatingPanelLayoutAnchoring {

    /// Returns a layout anchor with the specified offset by an absolute value to display a panel with its intrinsic content size.
    ///
@@ -222,8 +226,8 @@ public extension FloatingPanelIntrinsicLayoutAnchor {
    @objc public let contentBoundingGuide: FloatingPanelLayoutContentBoundingGuide
 }

-public extension FloatingPanelAdaptiveLayoutAnchor {
-    func layoutConstraints(_ vc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint] {
+extension FloatingPanelAdaptiveLayoutAnchor {
+    public func layoutConstraints(_ vc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint] {
        var constraints = [NSLayoutConstraint]()

        let layoutGuide = referenceGuide.layoutGuide(vc: vc)
@@ -80,21 +80,21 @@ struct Logger {
        }
    }

-    func debug(_ log: Any, _ arguments: Any..., tag: String = "", function: String = #function, file: String  = #file, line: UInt = #line) {
+    func debug(_ log: Any, _ arguments: Any..., tag: String = "", function: String = #function, file: String = #file, line: UInt = #line) {
        #if __FP_LOG
        self.log(.debug, log, arguments, tag: tag, function: getPrettyFunction(function, file), line: line)
        #endif
    }

-    func info(_ log: Any, _ arguments: Any..., tag: String = "",  function: String = #function, file: String  = #file, line: UInt = #line) {
+    func info(_ log: Any, _ arguments: Any..., tag: String = "", function: String = #function, file: String = #file, line: UInt = #line) {
        self.log(.info, log, arguments, tag: tag, function: getPrettyFunction(function, file), line: line)
    }

-    func warning(_ log: Any, _ arguments: Any..., function: String = #function, file: String  = #file, line: UInt = #line) {
+    func warning(_ log: Any, _ arguments: Any..., function: String = #function, file: String = #file, line: UInt = #line) {
        self.log(.warning, log, arguments, tag: "", function: getPrettyFunction(function, file), line: line)
    }

-    func error(_ log: Any, _ arguments: Any..., function: String = #function, file: String  = #file, line: UInt = #line) {
+    func error(_ log: Any, _ arguments: Any..., function: String = #function, file: String = #file, line: UInt = #line) {
        self.log(.error, log, arguments, tag: "", function: getPrettyFunction(function, file), line: line)
    }
 }
@@ -81,9 +81,11 @@ public class SurfaceView: UIView {
    public let grabberHandle = GrabberView()

    /// Offset of the grabber handle from the interactive edge.
-    public var grabberHandlePadding: CGFloat = 6.0 { didSet {
-        setNeedsUpdateConstraints()
-    } }
+    public var grabberHandlePadding: CGFloat = 6.0 {
+        didSet {
+            setNeedsUpdateConstraints()
+        }
+    }

    /// The offset from the move edge to prevent the content scroll
    public var grabberAreaOffset: CGFloat = 36.0
@@ -91,9 +93,11 @@ public class SurfaceView: UIView {
    /// The grabber handle size
    ///
    /// On left/right positioned panel the width dimension is used as the height of ``grabberHandle``, and vice versa.
-    public var grabberHandleSize: CGSize = CGSize(width: 36.0, height: 5.0) { didSet {
-        setNeedsUpdateConstraints()
-    } }
+    public var grabberHandleSize: CGSize = CGSize(width: 36.0, height: 5.0) {
+        didSet {
+            setNeedsUpdateConstraints()
+        }
+    }

    /// The content view to be assigned a view of the content view controller of `FloatingPanelController`
    public weak var contentView: UIView?
@@ -108,19 +112,26 @@ public class SurfaceView: UIView {

    public override var backgroundColor: UIColor? {
        get { return appearance.backgroundColor }
-        set { appearance.backgroundColor = newValue; setNeedsLayout() }
+        set {
+            appearance.backgroundColor = newValue
+            setNeedsLayout()
+        }
    }

    /// The appearance settings for a surface view.
-    public var appearance = SurfaceAppearance() { didSet {
-        shadowLayers = appearance.shadows.map { _ in CAShapeLayer() }
-        setNeedsLayout()
-    }}
+    public var appearance = SurfaceAppearance() {
+        didSet {
+            shadowLayers = appearance.shadows.map { _ in CAShapeLayer() }
+            setNeedsLayout()
+        }
+    }

    /// The margins to use when laying out the container view wrapping content.
-    public var containerMargins: UIEdgeInsets = .zero { didSet {
-        setNeedsUpdateConstraints()
-    } }
+    public var containerMargins: UIEdgeInsets = .zero {
+        didSet {
+            setNeedsUpdateConstraints()
+        }
+    }

    /// The view that displays an actual surface shape.
    ///
@@ -130,7 +141,7 @@ public class SurfaceView: UIView {
    /// content view.
    public let containerView: UIView = UIView()

-    var containerOverflow: CGFloat = 0.0 { // Must not call setNeedsLayout()
+    var containerOverflow: CGFloat = 0.0 {  // Must not call setNeedsLayout()
        didSet {
            // Calling setNeedsUpdateConstraints() is necessary to fix a layout break
            // when the contentMode is changed after laying out a panel, for instance,
@@ -142,10 +153,12 @@ public class SurfaceView: UIView {
    var position: FloatingPanelPosition = .bottom {
        didSet {
            guard position != oldValue else { return }
-            NSLayoutConstraint.deactivate([grabberHandleEdgePaddingConstraint,
-                                           grabberHandleCenterConstraint,
-                                           grabberHandleWidthConstraint,
-                                           grabberHandleHeightConstraint])
+            NSLayoutConstraint.deactivate([
+                grabberHandleEdgePaddingConstraint,
+                grabberHandleCenterConstraint,
+                grabberHandleWidthConstraint,
+                grabberHandleHeightConstraint,
+            ])
            switch position {
            case .top:
                grabberHandleEdgePaddingConstraint = grabberHandle.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -grabberHandlePadding)
@@ -168,10 +181,12 @@ public class SurfaceView: UIView {
                grabberHandleWidthConstraint = grabberHandle.widthAnchor.constraint(equalToConstant: grabberHandleSize.height)
                grabberHandleHeightConstraint = grabberHandle.heightAnchor.constraint(equalToConstant: grabberHandleSize.width)
            }
-            NSLayoutConstraint.activate([grabberHandleEdgePaddingConstraint,
-                                         grabberHandleCenterConstraint,
-                                         grabberHandleWidthConstraint,
-                                         grabberHandleHeightConstraint])
+            NSLayoutConstraint.activate([
+                grabberHandleEdgePaddingConstraint,
+                grabberHandleCenterConstraint,
+                grabberHandleWidthConstraint,
+                grabberHandleHeightConstraint,
+            ])
            setNeedsUpdateConstraints()
        }
    }
@@ -179,17 +194,25 @@ public class SurfaceView: UIView {
    var grabberAreaFrame: CGRect {
        switch position {
        case .top:
-            return CGRect(origin: .init(x: bounds.minX, y: bounds.maxY - grabberAreaOffset),
-                          size: .init(width: bounds.width, height: grabberAreaOffset))
+            return CGRect(
+                origin: .init(x: bounds.minX, y: bounds.maxY - grabberAreaOffset),
+                size: .init(width: bounds.width, height: grabberAreaOffset)
+            )
        case .left:
-            return CGRect(origin: .init(x: bounds.maxX - grabberAreaOffset, y: bounds.minY),
-                          size: .init(width: grabberAreaOffset, height: bounds.height))
+            return CGRect(
+                origin: .init(x: bounds.maxX - grabberAreaOffset, y: bounds.minY),
+                size: .init(width: grabberAreaOffset, height: bounds.height)
+            )
        case .bottom:
-            return CGRect(origin: CGPoint(x: bounds.minX, y: bounds.minY),
-                          size: CGSize(width: bounds.width, height: grabberAreaOffset))
+            return CGRect(
+                origin: CGPoint(x: bounds.minX, y: bounds.minY),
+                size: CGSize(width: bounds.width, height: grabberAreaOffset)
+            )
        case .right:
-            return CGRect(origin: .init(x: bounds.minX, y: bounds.minY),
-                          size: .init(width: grabberAreaOffset, height: bounds.height))
+            return CGRect(
+                origin: .init(x: bounds.minX, y: bounds.minY),
+                size: .init(width: grabberAreaOffset, height: bounds.height)
+            )
        }
    }

@@ -209,7 +232,7 @@ public class SurfaceView: UIView {

    private lazy var grabberHandleWidthConstraint = grabberHandle.widthAnchor.constraint(equalToConstant: grabberHandleSize.width)
    private lazy var grabberHandleHeightConstraint = grabberHandle.heightAnchor.constraint(equalToConstant: grabberHandleSize.height)
-    private lazy var grabberHandleCenterConstraint =  grabberHandle.centerXAnchor.constraint(equalTo: centerXAnchor)
+    private lazy var grabberHandleCenterConstraint = grabberHandle.centerXAnchor.constraint(equalTo: centerXAnchor)
    private lazy var grabberHandleEdgePaddingConstraint = grabberHandle.topAnchor.constraint(equalTo: topAnchor, constant: grabberHandlePadding)

    private var shadowLayers: [CALayer] = [] {
@@ -243,27 +266,31 @@ public class SurfaceView: UIView {

        addSubview(containerView)
        containerView.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            containerViewTopConstraint,
-            containerViewLeftConstraint,
-            containerViewBottomConstraint,
-            containerViewRightConstraint,
-        ].map {
-            $0.identifier = "FloatingPanel-surface-container"
-            return $0;
-        })
+        NSLayoutConstraint.activate(
+            [
+                containerViewTopConstraint,
+                containerViewLeftConstraint,
+                containerViewBottomConstraint,
+                containerViewRightConstraint,
+            ].map {
+                $0.identifier = "FloatingPanel-surface-container"
+                return $0
+            }
+        )

        addSubview(grabberHandle)
        grabberHandle.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            grabberHandleEdgePaddingConstraint,
-            grabberHandleCenterConstraint,
-            grabberHandleWidthConstraint,
-            grabberHandleHeightConstraint,
-        ].map {
-            $0.identifier = "FloatingPanel-surface-grabber"
-            return $0;
-        })
+        NSLayoutConstraint.activate(
+            [
+                grabberHandleEdgePaddingConstraint,
+                grabberHandleCenterConstraint,
+                grabberHandleWidthConstraint,
+                grabberHandleHeightConstraint,
+            ].map {
+                $0.identifier = "FloatingPanel-surface-grabber"
+                return $0
+            }
+        )

        shadowLayers = appearance.shadows.map { _ in CALayer() }
    }
@@ -311,7 +338,7 @@ public class SurfaceView: UIView {
        case .left, .right:
            grabberHandleWidthConstraint.constant = grabberHandleSize.height
            grabberHandleHeightConstraint.constant = grabberHandleSize.width
-       }
+        }

        super.updateConstraints()
    }
@@ -332,8 +359,10 @@ public class SurfaceView: UIView {
    public override var intrinsicContentSize: CGSize {
        let fittingSize = UIView.layoutFittingCompressedSize
        let contentSize = contentView?.systemLayoutSizeFitting(fittingSize) ?? .zero
-        return CGSize(width: containerMargins.horizontalInset + contentPadding.horizontalInset + contentSize.width,
-                      height: containerMargins.verticalInset + contentPadding.verticalInset + contentSize.height)
+        return CGSize(
+            width: containerMargins.horizontalInset + contentPadding.horizontalInset + contentSize.width,
+            height: containerMargins.verticalInset + contentPadding.verticalInset + contentSize.height
+        )
    }

    private func updateShadow() {
@@ -348,8 +377,10 @@ public class SurfaceView: UIView {

            let spread = shadow.spread
            let shadowRect = containerView.frame.insetBy(dx: -spread, dy: -spread)
-            let shadowPath = UIBezierPath.path(roundedRect: shadowRect,
-                                               appearance: appearance)
+            let shadowPath = UIBezierPath.path(
+                roundedRect: shadowRect,
+                appearance: appearance
+            )
            shadowLayer.shadowPath = shadowPath.cgPath
            shadowLayer.shadowColor = shadow.color.cgColor
            shadowLayer.shadowOffset = shadow.offset
@@ -358,11 +389,19 @@ public class SurfaceView: UIView {
            shadowLayer.shadowOpacity = shadow.opacity

            let mask = CAShapeLayer()
-            let path = UIBezierPath.path(roundedRect: containerView.frame,
-                                         appearance: appearance)
+            let path = UIBezierPath.path(
+                roundedRect: containerView.frame,
+                appearance: appearance
+            )
            let size = window?.bounds.size ?? CGSize(width: 1000.0, height: 1000.0)
-            path.append(UIBezierPath(rect: layer.bounds.insetBy(dx: -size.width,
-                                                                dy: -size.height)))
+            path.append(
+                UIBezierPath(
+                    rect: layer.bounds.insetBy(
+                        dx: -size.width,
+                        dy: -size.height
+                    )
+                )
+            )
            mask.fillRule = .evenOdd
            mask.path = path.cgPath
            if #available(iOS 13.0, *) {
@@ -383,8 +422,10 @@ public class SurfaceView: UIView {
        containerView.layer.masksToBounds = true
        if position.inset(containerMargins) != 0 {
            if #available(iOS 11, *) {
-                containerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner,
-                                                     .layerMinXMaxYCorner, .layerMaxXMaxYCorner]
+                containerView.layer.maskedCorners = [
+                    .layerMinXMinYCorner, .layerMaxXMinYCorner,
+                    .layerMinXMaxYCorner, .layerMaxXMaxYCorner,
+                ]
            }
            return
        }
@@ -416,28 +457,33 @@ public class SurfaceView: UIView {
    func set(contentView: UIView, mode: FloatingPanelController.ContentMode) {
        containerView.addSubview(contentView)
        self.contentView = contentView
-        /* contentView.frame = bounds */ // MUST NOT: Because the top safe area inset of a content VC will be incorrect.
+        /**
+         // MUST NOT: Because the top safe area inset of a content VC will be incorrect.
+         contentView.frame = bounds
+         */
        contentView.translatesAutoresizingMaskIntoConstraints = false
        let topConstraint = contentView.topAnchor.constraint(equalTo: topAnchor, constant: containerMargins.top + contentPadding.top)
        let leftConstraint = contentView.leftAnchor.constraint(equalTo: leftAnchor, constant: containerMargins.left + contentPadding.left)
        let rightConstraint = rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: containerMargins.right + contentPadding.right)
        let bottomConstraint = bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: containerMargins.bottom + contentPadding.bottom)
-        NSLayoutConstraint.activate([
-            topConstraint,
-            leftConstraint,
-            rightConstraint,
-            bottomConstraint,
-        ].map {
-            switch mode {
-            case .static:
-                $0.priority = .required
-            // The reason why this priority is set to .required - 1 is #359, which fixed #294.
-            case .fitToBounds:
-                $0.priority = .required - 1
+        NSLayoutConstraint.activate(
+            [
+                topConstraint,
+                leftConstraint,
+                rightConstraint,
+                bottomConstraint,
+            ].map {
+                switch mode {
+                case .static:
+                    $0.priority = .required
+                // The reason why this priority is set to .required - 1 is #359, which fixed #294.
+                case .fitToBounds:
+                    $0.priority = .required - 1
+                }
+                $0.identifier = "FloatingPanel-surface-content"
+                return $0
            }
-            $0.identifier = "FloatingPanel-surface-content"
-            return $0
-        })
+        )
        self.contentViewTopConstraint = topConstraint
        self.contentViewLeftConstraint = leftConstraint
        self.contentViewRightConstraint = rightConstraint
@@ -3,9 +3,11 @@
 import UIKit

 class ModalTransition: NSObject, UIViewControllerTransitioningDelegate {
-    func animationController(forPresented presented: UIViewController,
-                             presenting: UIViewController,
-                             source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+    func animationController(
+        forPresented presented: UIViewController,
+        presenting: UIViewController,
+        source: UIViewController
+    ) -> UIViewControllerAnimatedTransitioning? {
        return ModalPresentTransition()
    }

@@ -52,11 +54,11 @@ class PresentationController: UIPresentationController {
             view is added unnecessarily.
             */
            fpc.presentedViewController == nil
-            else { return }
+        else { return }

-        /*
-         * Layout the views managed by `FloatingPanelController` here for the
-         * sake of the presentation and dismissal modally from the controller.
+        /**
+         Layout the views managed by `FloatingPanelController` here for the
+         sake of the presentation and dismissal modally from the controller.
         */
        addFloatingPanel()

@@ -72,7 +74,7 @@ class PresentationController: UIPresentationController {
        guard
            let containerView = self.containerView,
            let fpc = presentedViewController as? FloatingPanelController
-            else { fatalError() }
+        else { fatalError() }

        containerView.addSubview(fpc.view)
        fpc.view.frame = containerView.bounds
@@ -84,7 +86,7 @@ class ModalPresentTransition: NSObject, UIViewControllerAnimatedTransitioning {
    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
        guard
            let fpc = transitionContext?.viewController(forKey: .to) as? FloatingPanelController
-        else { fatalError()}
+        else { fatalError() }

        let animator = fpc.animatorForPresenting(to: fpc.layout.initialState)
        return TimeInterval(animator.duration)
@@ -119,7 +121,7 @@ class ModalDismissTransition: NSObject, UIViewControllerAnimatedTransitioning {
    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
        guard
            let fpc = transitionContext?.viewController(forKey: .from) as? FloatingPanelController
-        else { fatalError()}
+        else { fatalError() }

        let animator = fpc.animatorForDismissing(with: .zero)
        return TimeInterval(animator.duration)
@@ -139,11 +141,13 @@ class ModalDismissTransition: NSObject, UIViewControllerAnimatedTransitioning {
            fpc?.suspendTransitionAnimator(false)
            transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
        }
-        return fpc.transitionAnimator!
+        guard let transitionAnimator = fpc.transitionAnimator else {
+            fatalError("Something wrong happened in Core.move(from:to:animated:completion)")
+        }
+        return transitionAnimator
    }

    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
        self.interruptibleAnimator(using: transitionContext).startAnimation()
    }
 }
-
@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import XCTest
+
@testable import FloatingPanel

 class ControllerTests: XCTestCase {
@@ -9,8 +10,8 @@ class ControllerTests: XCTestCase {

    func test_warningRetainCycle() {
        let exp = expectation(description: "Warning retain cycle")
-        exp.expectedFulfillmentCount = 2 // For layout & behavior logs
-        log.hook = {(log, level) in
+        exp.expectedFulfillmentCount = 2  // For layout & behavior logs
+        log.hook = { (log, level) in
            if log.contains("A memory leak will occur by a retain cycle because") {
                XCTAssert(level == .warning)
                exp.fulfill()
@@ -22,7 +23,10 @@ class ControllerTests: XCTestCase {
    }

    func test_addPanel() {
-        guard let rootVC = UIApplication.shared.keyWindow?.rootViewController else { fatalError() }
+        let rootVC = UIViewController()
+        rootVC.loadViewIfNeeded()
+        rootVC.view.bounds = .init(origin: .zero, size: .init(width: 390, height: 844))
+
        let fpc = FloatingPanelController()
        fpc.addPanel(toParent: rootVC)
        XCTAssertEqual(fpc.surfaceLocation.y, fpc.surfaceLocation(for: .half).y)
@@ -42,8 +46,7 @@ class ControllerTests: XCTestCase {
        }
        let myDelegate = MyDelegate()
        let fpc = FloatingPanelController(delegate: myDelegate)
-        let traitCollection = UITraitCollection(traitsFrom: [fpc.traitCollection,
-                                                             UITraitCollection(userInterfaceStyle: .dark)])
+        let traitCollection = UITraitCollection(traitsFrom: [fpc.traitCollection, UITraitCollection(userInterfaceStyle: .dark)])
        XCTAssertEqual(traitCollection.userInterfaceStyle, .dark)
    }

@@ -56,7 +59,7 @@ class ControllerTests: XCTestCase {

        fpc.hide()
        XCTAssertEqual(delegate.position, .hidden)
-        
+
        fpc.move(to: .full, animated: false)
        XCTAssertEqual(fpc.state, .full)
        XCTAssertEqual(delegate.position, .full)
@@ -189,18 +192,18 @@ class ControllerTests: XCTestCase {
        XCTAssertEqual(delegate.position, .hidden)
        XCTAssertEqual(fpc.surfaceLocation.y, fpc.surfaceLocation(for: .hidden).y)
    }
-    
+
    func test_moveWithNearbyPosition() {
        let delegate = FloatingPanelTestDelegate()
        let fpc = FloatingPanelController(delegate: delegate)
        XCTAssertEqual(delegate.position, .hidden)
        fpc.showForTest()
-        
+
        XCTAssertEqual(fpc.nearbyState, .half)
-        
+
        fpc.hide()
        XCTAssertEqual(fpc.nearbyState, .tip)
-        
+
        fpc.move(to: .full, animated: false)
        XCTAssertEqual(fpc.nearbyState, .full)
        XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.surfaceLocation(for: .full).y)
@@ -336,15 +339,21 @@ private class MyZombieViewController: UIViewController, FloatingPanelLayout, Flo
        return .half
    }

-    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: UIScreen.main.bounds.height == 667.0 ? 18.0 : 16.0,
-                                             edge: .top,
-                                             referenceGuide: .superview),
-            .half: FloatingPanelLayoutAnchor(absoluteInset: 250.0,
-                                             edge: .bottom,
-                                             referenceGuide: .superview),
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 60.0,
-                                            edge: .bottom,
-                                            referenceGuide: .superview),
+    let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(
+            absoluteInset: UIScreen.main.bounds.height == 667.0 ? 18.0 : 16.0,
+            edge: .top,
+            referenceGuide: .superview
+        ),
+        .half: FloatingPanelLayoutAnchor(
+            absoluteInset: 250.0,
+            edge: .bottom,
+            referenceGuide: .superview
+        ),
+        .tip: FloatingPanelLayoutAnchor(
+            absoluteInset: 60.0,
+            edge: .bottom,
+            referenceGuide: .superview
+        ),
    ]
 }
@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import XCTest
+
@testable import FloatingPanel

 class CoreTests: XCTestCase {
@@ -12,27 +13,22 @@ class CoreTests: XCTestCase {

        let contentVC1 = UITableViewController(nibName: nil, bundle: nil)
        XCTAssertEqual(contentVC1.tableView.showsVerticalScrollIndicator, true)
-        XCTAssertEqual(contentVC1.tableView.bounces, true)
        fpc.set(contentViewController: contentVC1)
        fpc.track(scrollView: contentVC1.tableView)
        fpc.showForTest()

        XCTAssertEqual(fpc.state, .half)
        XCTAssertEqual(contentVC1.tableView.showsVerticalScrollIndicator, false)
-        XCTAssertEqual(contentVC1.tableView.bounces, false)

        fpc.move(to: .full, animated: false)
        XCTAssertEqual(contentVC1.tableView.showsVerticalScrollIndicator, true)
-        XCTAssertEqual(contentVC1.tableView.bounces, true)

        fpc.move(to: .tip, animated: false)
        XCTAssertEqual(contentVC1.tableView.showsVerticalScrollIndicator, false)
-        XCTAssertEqual(contentVC1.tableView.bounces, false)

        let exp1 = expectation(description: "move to full with animation")
        fpc.move(to: .full, animated: true) {
            XCTAssertEqual(contentVC1.tableView.showsVerticalScrollIndicator, true)
-            XCTAssertEqual(contentVC1.tableView.bounces, true)
            exp1.fulfill()
        }
        wait(for: [exp1], timeout: 1.0)
@@ -40,7 +36,6 @@ class CoreTests: XCTestCase {
        let exp2 = expectation(description: "move to tip with animation")
        fpc.move(to: .tip, animated: false) {
            XCTAssertEqual(contentVC1.tableView.showsVerticalScrollIndicator, false)
-            XCTAssertEqual(contentVC1.tableView.bounces, false)
            exp2.fulfill()
        }
        wait(for: [exp2], timeout: 1.0)
@@ -48,20 +43,18 @@ class CoreTests: XCTestCase {
        // Reset the content vc
        let contentVC2 = UITableViewController(nibName: nil, bundle: nil)
        XCTAssertEqual(contentVC2.tableView.showsVerticalScrollIndicator, true)
-        XCTAssertEqual(contentVC2.tableView.bounces, true)
        fpc.set(contentViewController: contentVC2)
        fpc.track(scrollView: contentVC2.tableView)
        fpc.show(animated: false, completion: nil)
        XCTAssertEqual(fpc.state, .half)
        XCTAssertEqual(contentVC2.tableView.showsVerticalScrollIndicator, false)
-        XCTAssertEqual(contentVC2.tableView.bounces, false)
    }

    func test_getBackdropAlpha_1positions() {
        class FloatingPanelLayout1Positions: FloatingPanelLayout {
            let initialState: FloatingPanelState = .full
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] =
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] =
                [.full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview)]
        }

@@ -81,9 +74,9 @@ class CoreTests: XCTestCase {
    func test_getBackdropAlpha_1positionsWithInitialHidden() {
        class FloatingPanelLayout2Positions: FloatingPanelTestLayout {
            override var initialState: FloatingPanelState { .hidden }
-            override var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
+            override var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
                return [
-                    .full: FloatingPanelLayoutAnchor(absoluteInset: fullInset, edge: .top, referenceGuide: referenceGuide),
+                    .full: FloatingPanelLayoutAnchor(absoluteInset: fullInset, edge: .top, referenceGuide: referenceGuide)
                ]
            }
        }
@@ -96,7 +89,7 @@ class CoreTests: XCTestCase {
        let fullPos = fpc.surfaceLocation(for: .full).y
        let hiddenPos = fpc.surfaceLocation(for: .hidden).y

-        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: fullPos - 100.0, with:  -100.0), 0.3)
+        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: fullPos - 100.0, with: -100.0), 0.3)
        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: fullPos, with: 0.0), 0.3)
        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: hiddenPos, with: 100.0), 0.0)
    }
@@ -105,7 +98,7 @@ class CoreTests: XCTestCase {
        class FloatingPanelLayout2Positions: FloatingPanelLayout {
            let initialState: FloatingPanelState = .half
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
                .full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview),
                .half: FloatingPanelLayoutAnchor(absoluteInset: 250.0, edge: .bottom, referenceGuide: .superview),
            ]
@@ -135,7 +128,7 @@ class CoreTests: XCTestCase {
    func test_getBackdropAlpha_2positionsWithHidden() {
        class FloatingPanelLayout2Positions: FloatingPanelTestLayout {
            override var initialState: FloatingPanelState { .hidden }
-            override var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
+            override var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
                return [
                    .full: FloatingPanelLayoutAnchor(absoluteInset: fullInset, edge: .top, referenceGuide: referenceGuide),
                    .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: referenceGuide),
@@ -151,7 +144,7 @@ class CoreTests: XCTestCase {
        let fullPos = fpc.surfaceLocation(for: .full).y
        let hiddenPos = fpc.surfaceLocation(for: .hidden).y

-        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: fullPos - 100.0, with:  -100.0), 0.3)
+        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: fullPos - 100.0, with: -100.0), 0.3)
        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: fullPos, with: 0.0), 0.3)
        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: hiddenPos, with: 100.0), 0.0)
    }
@@ -182,7 +175,6 @@ class CoreTests: XCTestCase {
        XCTAssertEqual(fpc.floatingPanel.getBackdropAlpha(at: halfPos, with: -1 * distance2), 0.0)
    }

-
    func test_updateBackdropAlpha() {
        class BackdropTestLayout: FloatingPanelTestLayout {
            override var initialState: FloatingPanelState { .hidden }
@@ -254,7 +246,7 @@ class CoreTests: XCTestCase {
        fpc.move(to: .full, animated: false)
        XCTAssertEqual(_floor(fpc.backdropView.alpha), 0.3)
        fpc.willTransition(to: UITraitCollection(horizontalSizeClass: .regular), with: MockTransitionCoordinator())
-        XCTAssertEqual(fpc.backdropView.alpha, 0.0) // Must update the alpha by BackdropTestLayout2 in TestDelegate.
+        XCTAssertEqual(fpc.backdropView.alpha, 0.0)  // Must update the alpha by BackdropTestLayout2 in TestDelegate.

        // Test a view size change of FloatingPanelController.view

@@ -265,7 +257,7 @@ class CoreTests: XCTestCase {

        delegate.layout = BackdropTestLayout2()
        fpc.viewWillTransition(to: CGSize.zero, with: MockTransitionCoordinator())
-        XCTAssertEqual(fpc.backdropView.alpha, 0.0) // Must update the alpha by BackdropTestLayout2 in TestDelegate.
+        XCTAssertEqual(fpc.backdropView.alpha, 0.0)  // Must update the alpha by BackdropTestLayout2 in TestDelegate.
    }

    func test_initial_surface_position() {
@@ -273,8 +265,9 @@ class CoreTests: XCTestCase {
            class Layout: FloatingPanelLayout {
                let initialState: FloatingPanelState = .full
                let position: FloatingPanelPosition = .top
-                let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring]
-                    = [.full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .bottom, referenceGuide: .superview)]
+                let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+                    .full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .bottom, referenceGuide: .superview)
+                ]
            }
            func floatingPanel(_ fpc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout {
                Layout()
@@ -296,8 +289,9 @@ class CoreTests: XCTestCase {
        class FloatingPanelLayout1Positions: FloatingPanelLayout {
            let initialState: FloatingPanelState = .full
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring]
-                = [.full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview)]
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+                .full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview)
+            ]
        }

        let delegate = FloatingPanelTestDelegate()
@@ -309,22 +303,25 @@ class CoreTests: XCTestCase {
        let fullPos = fpc.surfaceLocation(for: .full).y

        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .full), // redirect
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .full),  // redirect
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+            ]
+        )
    }

    func test_targetPosition_2positions() {
        class FloatingPanelLayout2Positions: FloatingPanelLayout {
            let initialState: FloatingPanelState = .half
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
                .full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview),
                .half: FloatingPanelLayoutAnchor(absoluteInset: 250.0, edge: .bottom, referenceGuide: .superview),
            ]
@@ -340,46 +337,52 @@ class CoreTests: XCTestCase {
        let halfPos = fpc.surfaceLocation(for: .half).y

        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .half), // project to half
-            (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half), // project to half
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .half), // redirect
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full), // project to full
-            ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .half),  // project to half
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half),  // project to half
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .half),  // redirect
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+            ]
+        )
        fpc.move(to: .half, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .half), // project to half
-            (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half), // project to half
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .half), // redirect
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full), // project to full
-            ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .half),  // project to half
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half),  // project to half
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .half),  // redirect
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+            ]
+        )
    }

    func test_targetPosition_2positionsWithHidden() {
        class FloatingPanelLayout2Positions: FloatingPanelLayout {
            let initialState: FloatingPanelState = .hidden
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
                .full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview),
                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview),
            ]
@@ -395,38 +398,42 @@ class CoreTests: XCTestCase {
        let hiddenPos = fpc.surfaceLocation(for: .hidden).y

        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .hidden), // project to hidden
-            (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .hidden), // project to hidden
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, hiddenPos - 10.0, CGPoint(x: 0.0, y: -100.0), .hidden), // redirect
-            (#line, hiddenPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
-            (#line, hiddenPos, CGPoint(x: 0.0, y: -100.0), .hidden),
-            (#line, hiddenPos, CGPoint(x: 0.0, y: 0.0), .hidden),
-            (#line, hiddenPos, CGPoint(x: 0.0, y: 100.0), .hidden),
-            (#line, hiddenPos, CGPoint(x: 0.0, y: 1000.0), .hidden), // redirect
-            (#line, hiddenPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full), // project to full
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .hidden),  // project to hidden
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .hidden),  // project to hidden
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, hiddenPos - 10.0, CGPoint(x: 0.0, y: -100.0), .hidden),  // redirect
+                (#line, hiddenPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+                (#line, hiddenPos, CGPoint(x: 0.0, y: -100.0), .hidden),
+                (#line, hiddenPos, CGPoint(x: 0.0, y: 0.0), .hidden),
+                (#line, hiddenPos, CGPoint(x: 0.0, y: 100.0), .hidden),
+                (#line, hiddenPos, CGPoint(x: 0.0, y: 1000.0), .hidden),  // redirect
+                (#line, hiddenPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
            ])
        fpc.move(to: .hidden, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .hidden), // project to hidden
-            (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .hidden), // project to hidden
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, hiddenPos - 10.0, CGPoint(x: 0.0, y: -100.0), .hidden), // redirect
-            (#line, hiddenPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
-            (#line, hiddenPos, CGPoint(x: 0.0, y: -100.0), .hidden),
-            (#line, hiddenPos, CGPoint(x: 0.0, y: 0.0), .hidden),
-            (#line, hiddenPos, CGPoint(x: 0.0, y: 100.0), .hidden),
-            (#line, hiddenPos, CGPoint(x: 0.0, y: 1000.0), .hidden), // redirect
-            (#line, hiddenPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full), // project to full
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 1000.0), .hidden),  // project to hidden
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .hidden),  // project to hidden
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, hiddenPos - 10.0, CGPoint(x: 0.0, y: -100.0), .hidden),  // redirect
+                (#line, hiddenPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+                (#line, hiddenPos, CGPoint(x: 0.0, y: -100.0), .hidden),
+                (#line, hiddenPos, CGPoint(x: 0.0, y: 0.0), .hidden),
+                (#line, hiddenPos, CGPoint(x: 0.0, y: 100.0), .hidden),
+                (#line, hiddenPos, CGPoint(x: 0.0, y: 1000.0), .hidden),  // redirect
+                (#line, hiddenPos + 10.0, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
            ])
    }

@@ -442,36 +449,38 @@ class CoreTests: XCTestCase {
        let tipPos = fpc.surfaceLocation(for: .tip).y
        // From .full
        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: -100.0), .full), // far from topMostState
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 0.0), .full), // far from topMostState
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 100.0), .full), // far from topMostState
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to tip at half
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 500.0), .half), // project to half
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half), // block projecting to tip at half
-            (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to tip at half
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full), //project to full
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip), // project to tip
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirect
-            (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip), // redirect
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -500.0), .half), // project to half
-            (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 100.0), .tip),
-            (#line, tipPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to full at half
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: -100.0), .tip), // far from bottomMostState
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 0.0), .tip), // far from bottomMostState
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 100.0), .tip), // far from bottomMostState
-        ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: -100.0), .full),  // far from topMostState
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 0.0), .full),  // far from topMostState
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 100.0), .full),  // far from topMostState
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 500.0), .half),  // project to half
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),  //project to full
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),  // project to tip
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirect
+                (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip),  // redirect
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -500.0), .half),  // project to half
+                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 100.0), .tip),
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to full at half
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: -100.0), .tip),  // far from bottomMostState
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 0.0), .tip),  // far from bottomMostState
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 100.0), .tip),  // far from bottomMostState
+            ])
    }

    func test_targetPosition_3positionsFromFull_bottomEdge() {
@@ -486,36 +495,38 @@ class CoreTests: XCTestCase {
        let tipPos = fpc.surfaceLocation(for: .tip).y
        // From .full
        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, tipPos - 500.0, CGPoint(x: 0.0, y: -100.0), .tip), // far from topMostState
-            (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 0.0), .tip), // far from topMostState
-            (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 100.0), .tip), // far from topMostState
-            (#line, tipPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 500.0), .half), // project to half
-            (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to full at half
-            (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 100.0), .tip), // redirect
-            (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .tip), //project to tip
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .full), // project to full
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirect
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: -100.0), .full), // redirect
-            (#line, fullPos, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to tip at half
-            (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .half), // block projecting to tip at half
-            (#line, fullPos, CGPoint(x: 0.0, y: -500.0), .half), // project to half
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to tip at half
-            (#line, fullPos + 500.0, CGPoint(x: 0.0, y: -100.0), .full), // far from bottomMostState
-            (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 0.0), .full), // far from bottomMostState
-            (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 100.0), .full), // far from bottomMostState
-        ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: -100.0), .tip),  // far from topMostState
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 0.0), .tip),  // far from topMostState
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 100.0), .tip),  // far from topMostState
+                (#line, tipPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 500.0), .half),  // project to half
+                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to full at half
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 100.0), .tip),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .tip),  //project to tip
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .full),  // project to full
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirect
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: -100.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -500.0), .half),  // project to half
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: -100.0), .full),  // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 0.0), .full),  // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 100.0), .full),  // far from bottomMostState
+            ])
    }

    func test_targetPosition_3positionsFromHalf() {
@@ -530,34 +541,36 @@ class CoreTests: XCTestCase {
        let tipPos = fpc.surfaceLocation(for: .tip).y
        // From .half
        fpc.move(to: .half, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: -100.0), .full), // far from topMostState
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 0.0), .full), // far from topMostState
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 100.0), .full), // far from topMostState
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 500.0), .half), // project to half
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half), // block projecting to tip at half
-            (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to tip at half
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),// project to full
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip), // project to tip
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirect
-            (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip), // redirect
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -500.0), .half), // project to half
-            (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 100.0), .tip),
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: -100.0), .tip), // far from bottomMostState
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 0.0), .tip), // far from bottomMostState
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 100.0), .tip), // far from bottomMostState
-        ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: -100.0), .full),  // far from topMostState
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 0.0), .full),  // far from topMostState
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 100.0), .full),  // far from topMostState
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 500.0), .half),  // project to half
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),  // project to full
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),  // project to tip
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirect
+                (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip),  // redirect
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -500.0), .half),  // project to half
+                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 100.0), .tip),
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: -100.0), .tip),  // far from bottomMostState
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 0.0), .tip),  // far from bottomMostState
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 100.0), .tip),  // far from bottomMostState
+            ])
    }

    func test_targetPosition_3positionsFromHalf_bottomEdge() {
@@ -565,40 +578,42 @@ class CoreTests: XCTestCase {
        let fpc = FloatingPanelController(delegate: delegate)
        fpc.layout = FloatingPanelLayout3PositionsBottomEdge()

-            fpc.showForTest()
+        fpc.showForTest()

-            let fullPos = fpc.surfaceLocation(for: .full).y
-            let halfPos = fpc.surfaceLocation(for: .half).y
-            let tipPos = fpc.surfaceLocation(for: .tip).y
-            // From .half
-            fpc.move(to: .half, animated: false)
-            assertTargetPosition(fpc.floatingPanel, with: [
-                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: -100.0), .tip), // far from topMostState
-                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 0.0), .tip), // far from topMostState
-                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 100.0), .tip), // far from topMostState
+        let fullPos = fpc.surfaceLocation(for: .full).y
+        let halfPos = fpc.surfaceLocation(for: .half).y
+        let tipPos = fpc.surfaceLocation(for: .tip).y
+        // From .half
+        fpc.move(to: .half, animated: false)
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: -100.0), .tip),  // far from topMostState
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 0.0), .tip),  // far from topMostState
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 100.0), .tip),  // far from topMostState
                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-                (#line, tipPos, CGPoint(x: 0.0, y: 500.0), .half), // project to half
-                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .half), // block projecting to full at half
-                (#line, tipPos, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to full at half
-                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 100.0), .tip), // redirect
-                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .tip),// project to tip
+                (#line, tipPos, CGPoint(x: 0.0, y: 500.0), .half),  // project to half
+                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to full at half
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 100.0), .tip),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .tip),  // project to tip
                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .full), // project to full
-                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirect
-                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: -100.0), .full), // redirect
-                (#line, fullPos, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to tip at half
-                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .half), // block projecting to tip at half
-                (#line, fullPos, CGPoint(x: 0.0, y: -500.0), .half), // project to half
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .full),  // project to full
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirect
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: -100.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -500.0), .half),  // project to half
                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: -100.0), .full), // far from bottomMostState
-                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 0.0), .full), // far from bottomMostState
-                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 100.0), .full), // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: -100.0), .full),  // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 0.0), .full),  // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 100.0), .full),  // far from bottomMostState
            ])
    }

@@ -615,34 +630,36 @@ class CoreTests: XCTestCase {

        // From .tip
        fpc.move(to: .tip, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: -100.0), .full), // far from topMostState
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 0.0), .full), // far from topMostState
-            (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 100.0), .full), // far from topMostState
-            (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
-            (#line, fullPos, CGPoint(x: 0.0, y: 500.0), .half), // project to half
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half), // block projecting to tip at half
-            (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to tip at half
-            (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full), // redirect
-            (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-            (#line, halfPos, CGPoint(x: 0.0, y: -3000.0), .full), // project to full
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip), // project to tip
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirect
-            (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip), // redirect
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half), // block projecting to full at half
-            (#line, tipPos, CGPoint(x: 0.0, y: -500.0), .half), // project to half
-            (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 100.0), .tip),
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: -100.0), .tip), // far from bottomMostState
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 0.0), .tip), // far from bottomMostState
-            (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 100.0), .tip), // far from bottomMostState
-        ])
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: -100.0), .full),  // far from topMostState
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 0.0), .full),  // far from topMostState
+                (#line, fullPos - 500.0, CGPoint(x: 0.0, y: 100.0), .full),  // far from topMostState
+                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
+                (#line, fullPos, CGPoint(x: 0.0, y: 500.0), .half),  // project to half
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .half),  // block projecting to tip at half
+                (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to tip at half
+                (#line, fullPos + 10.0, CGPoint(x: 0.0, y: 100.0), .full),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -3000.0), .full),  // project to full
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),  // project to tip
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirect
+                (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip),  // redirect
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half),  // block projecting to full at half
+                (#line, tipPos, CGPoint(x: 0.0, y: -500.0), .half),  // project to half
+                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 100.0), .tip),
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: -100.0), .tip),  // far from bottomMostState
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 0.0), .tip),  // far from bottomMostState
+                (#line, tipPos + 500.0, CGPoint(x: 0.0, y: 100.0), .tip),  // far from bottomMostState
+            ])
    }

    func test_targetPosition_3positionsFromTip_bottomEdge() {
@@ -652,39 +669,41 @@ class CoreTests: XCTestCase {

        fpc.showForTest()

-            let fullPos = fpc.surfaceLocation(for: .full).y
-            let halfPos = fpc.surfaceLocation(for: .half).y
-            let tipPos = fpc.surfaceLocation(for: .tip).y
+        let fullPos = fpc.surfaceLocation(for: .full).y
+        let halfPos = fpc.surfaceLocation(for: .half).y
+        let tipPos = fpc.surfaceLocation(for: .tip).y

-            // From .tip
-            fpc.move(to: .tip, animated: false)
-            assertTargetPosition(fpc.floatingPanel, with: [
-                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: -100.0), .tip), // far from topMostState
-                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 0.0), .tip), // far from topMostState
-                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 100.0), .tip), // far from topMostState
+        // From .tip
+        fpc.move(to: .tip, animated: false)
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: -100.0), .tip),  // far from topMostState
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 0.0), .tip),  // far from topMostState
+                (#line, tipPos - 500.0, CGPoint(x: 0.0, y: 100.0), .tip),  // far from topMostState
                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-                (#line, tipPos, CGPoint(x: 0.0, y: 500.0), .half), // project to half
-                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .half), // block projecting to tip at half
-                (#line, tipPos, CGPoint(x: 0.0, y: 3000.0), .half), // block projecting to tip at half
-                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 100.0), .tip), // redirect
-                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half), // redirect
-                (#line, halfPos, CGPoint(x: 0.0, y: -3000.0), .tip), // project to full
+                (#line, tipPos, CGPoint(x: 0.0, y: 500.0), .half),  // project to half
+                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .half),  // block projecting to tip at half
+                (#line, tipPos, CGPoint(x: 0.0, y: 3000.0), .half),  // block projecting to tip at half
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 100.0), .tip),  // redirect
+                (#line, halfPos - 10.0, CGPoint(x: 0.0, y: -100.0), .half),  // redirect
+                (#line, halfPos, CGPoint(x: 0.0, y: -3000.0), .tip),  // project to full
                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
                (#line, halfPos, CGPoint(x: 0.0, y: 100.0), .half),
-                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .full), // project to tip
-                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirect
-                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: -100.0), .full), // redirect
-                (#line, fullPos, CGPoint(x: 0.0, y: -3000.0), .half), // block projecting to full at half
-                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .half), // block projecting to full at half
-                (#line, fullPos, CGPoint(x: 0.0, y: -500.0), .half), // project to half
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .full),  // project to tip
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirect
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: -100.0), .full),  // redirect
+                (#line, fullPos, CGPoint(x: 0.0, y: -3000.0), .half),  // block projecting to full at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -1000.0), .half),  // block projecting to full at half
+                (#line, fullPos, CGPoint(x: 0.0, y: -500.0), .half),  // project to half
                (#line, fullPos, CGPoint(x: 0.0, y: -100.0), .full),
                (#line, fullPos, CGPoint(x: 0.0, y: 0.0), .full),
                (#line, fullPos, CGPoint(x: 0.0, y: 100.0), .full),
-                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: -100.0), .full), // far from bottomMostState
-                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 0.0), .full), // far from bottomMostState
-                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 100.0), .full), // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: -100.0), .full),  // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 0.0), .full),  // far from bottomMostState
+                (#line, fullPos + 500.0, CGPoint(x: 0.0, y: 100.0), .full),  // far from bottomMostState
            ])
    }

@@ -702,37 +721,43 @@ class CoreTests: XCTestCase {

        // From .full
        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .tip),
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .tip),
-            (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .tip),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .full),
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .full),
-            (#line, tipPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .full),
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .tip),
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .tip),
+                (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .tip),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .full),
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .full),
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .full),
            ])

        // From .half
        fpc.move(to: .tip, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .tip),
-            (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .full),
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .full),
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .tip),
+                (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .full),
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .full),
            ])

        // From .tip
        fpc.move(to: .tip, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .tip),
-            (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .tip),
-            (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .tip),
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),
-            (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .full),
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .full),
-            (#line, tipPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .full),
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fullPos - 10.0, CGPoint(x: 0.0, y: 3000.0), .tip),
+                (#line, fullPos, CGPoint(x: 0.0, y: 1000.0), .tip),
+                (#line, fullPos, CGPoint(x: 0.0, y: 3000.0), .tip),
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .tip),
+                (#line, halfPos, CGPoint(x: 0.0, y: -1000.0), .full),
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .full),
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .full),
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: -3000.0), .full),
            ])
    }

@@ -740,7 +765,7 @@ class CoreTests: XCTestCase {
        class FloatingPanelLayout3PositionsWithHidden: FloatingPanelLayout {
            let initialState: FloatingPanelState = .hidden
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
                .full: FloatingPanelLayoutAnchor(absoluteInset: 20.0, edge: .top, referenceGuide: .superview),
                .half: FloatingPanelLayoutAnchor(absoluteInset: 250.0, edge: .bottom, referenceGuide: .superview),
                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview),
@@ -754,15 +779,19 @@ class CoreTests: XCTestCase {
        XCTAssertEqual(fpc.state, .hidden)

        fpc.move(to: .full, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: 1000.0), .half),
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: 1000.0), .half)
            ])
        fpc.move(to: .half, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: -1000.0), .full),
-            (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: 1000.0), .hidden),
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: -1000.0), .full),
+                (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, fpc.surfaceView.frame.minY, CGPoint(x: 0.0, y: 1000.0), .hidden),
            ])
    }

@@ -770,7 +799,7 @@ class CoreTests: XCTestCase {
        class FloatingPanelLayout3Positions: FloatingPanelLayout {
            let initialState: FloatingPanelState = .hidden
            let position: FloatingPanelPosition = .bottom
-            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
                .half: FloatingPanelLayoutAnchor(absoluteInset: 250.0, edge: .bottom, referenceGuide: .superview),
                .tip: FloatingPanelLayoutAnchor(absoluteInset: 60.0, edge: .bottom, referenceGuide: .superview),
                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview),
@@ -790,27 +819,31 @@ class CoreTests: XCTestCase {
        //let hiddenPos = fpc.surfaceLocation(for: .hidden)

        fpc.move(to: .half, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
-            (#line, halfPos, CGPoint(x: 0.0, y: 385.0), .tip), // projection
-            (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .hidden), // projection
-            (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half), // redirection
-            (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip), // redirection
-            (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half), //projection
-            (#line, tipPos, CGPoint(x: 0.0, y: -10.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 10.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .hidden), //projection
-            (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 10.0), .tip), // redirection
-            (#line, tipPos - 10.0, CGPoint(x: 0.0, y: 10.0), .tip), // redirection
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, halfPos, CGPoint(x: 0.0, y: -100.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 0.0), .half),
+                (#line, halfPos, CGPoint(x: 0.0, y: 385.0), .tip),  // projection
+                (#line, halfPos, CGPoint(x: 0.0, y: 1000.0), .hidden),  // projection
+                (#line, halfPos + 10.0, CGPoint(x: 0.0, y: 100.0), .half),  // redirection
+                (#line, tipPos - 10.0, CGPoint(x: 0.0, y: -100.0), .tip),  // redirection
+                (#line, tipPos, CGPoint(x: 0.0, y: -3000.0), .half),  //projection
+                (#line, tipPos, CGPoint(x: 0.0, y: -10.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 10.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .hidden),  //projection
+                (#line, tipPos + 10.0, CGPoint(x: 0.0, y: 10.0), .tip),  // redirection
+                (#line, tipPos - 10.0, CGPoint(x: 0.0, y: 10.0), .tip),  // redirection
            ])
        fpc.move(to: .tip, animated: false)
-        assertTargetPosition(fpc.floatingPanel, with: [
-            (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half),
-            (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
-            (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .hidden),
+        assertTargetPosition(
+            fpc.floatingPanel,
+            with: [
+                (#line, tipPos, CGPoint(x: 0.0, y: -100.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: -1000.0), .half),
+                (#line, tipPos, CGPoint(x: 0.0, y: 0.0), .tip),
+                (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .hidden),
            ])
    }

@@ -834,7 +867,7 @@ private class FloatingPanelLayout3PositionsBottomEdge: FloatingPanelTop2BottomTe
    }
 }

-private typealias TestParameter = (UInt, CGFloat,  CGPoint, FloatingPanelState)
+private typealias TestParameter = (UInt, CGFloat, CGPoint, FloatingPanelState)
 private func assertTargetPosition(_ floatingPanel: Core, with params: [TestParameter]) {
    params.forEach { (line, pos, velocity, result) in
        floatingPanel.surfaceView.frame.origin.y = pos
@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import XCTest
+
@testable import FloatingPanel

 class ExtensionTests: XCTestCase {
@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import XCTest
+
@testable import FloatingPanel

 class LayoutTests: XCTestCase {
@@ -20,7 +21,7 @@ class LayoutTests: XCTestCase {
            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
                .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .top, referenceGuide: .safeArea),
                .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview)
+                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview),
            ]
            let initialState: FloatingPanelState = .hidden
            let position: FloatingPanelPosition = .bottom
@@ -44,7 +45,7 @@ class LayoutTests: XCTestCase {

    func test_layoutSegment_3position() {
        class FloatingPanelLayout3Positions: FloatingPanelTestLayout {
-            override var initialState: FloatingPanelState  { .half }
+            override var initialState: FloatingPanelState { .half }
        }

        fpc.layout = FloatingPanelLayout3Positions()
@@ -56,25 +57,29 @@ class LayoutTests: XCTestCase {
        let minPos = CGFloat.leastNormalMagnitude
        let maxPos = CGFloat.greatestFiniteMagnitude

-        assertLayoutSegment(fpc.floatingPanel, with: [
-            (#line, pos: minPos, forwardY: true, lower: nil, upper: .full),
-            (#line, pos: minPos, forwardY: false, lower: nil, upper: .full),
-            (#line, pos: fullPos, forwardY: true, lower: .full, upper: .half),
-            (#line, pos: fullPos, forwardY: false, lower: nil,  upper: .full),
-            (#line, pos: halfPos, forwardY: true, lower: .half, upper: .tip),
-            (#line, pos: halfPos, forwardY: false, lower: .full,  upper: .half),
-            (#line, pos: tipPos, forwardY: true, lower: .tip, upper: nil),
-            (#line, pos: tipPos, forwardY: false, lower: .half,  upper: .tip),
-            (#line, pos: maxPos, forwardY: true, lower: .tip, upper: nil),
-            (#line, pos: maxPos, forwardY: false, lower: .tip, upper: nil),
-            ])
+        assertLayoutSegment(
+            fpc.floatingPanel,
+            with: [
+                (#line, pos: minPos, forwardY: true, lower: nil, upper: .full),
+                (#line, pos: minPos, forwardY: false, lower: nil, upper: .full),
+                (#line, pos: fullPos, forwardY: true, lower: .full, upper: .half),
+                (#line, pos: fullPos, forwardY: false, lower: nil, upper: .full),
+                (#line, pos: halfPos, forwardY: true, lower: .half, upper: .tip),
+                (#line, pos: halfPos, forwardY: false, lower: .full, upper: .half),
+                (#line, pos: tipPos, forwardY: true, lower: .tip, upper: nil),
+                (#line, pos: tipPos, forwardY: false, lower: .half, upper: .tip),
+                (#line, pos: maxPos, forwardY: true, lower: .tip, upper: nil),
+                (#line, pos: maxPos, forwardY: false, lower: .tip, upper: nil),
+            ]
+        )
    }

    func test_layoutSegment_2positions() {
        class FloatingPanelLayout2Positions: FloatingPanelTestLayout {
-            override var initialState: FloatingPanelState  { .half }
-            override var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring]
-                { super.anchors.filter { (key, _) in key != .tip } }
+            override var initialState: FloatingPanelState { .half }
+            override var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
+                super.anchors.filter { (key, _) in key != .tip }
+            }
        }

        fpc.layout = FloatingPanelLayout2Positions()
@@ -85,23 +90,27 @@ class LayoutTests: XCTestCase {
        let minPos = CGFloat.leastNormalMagnitude
        let maxPos = CGFloat.greatestFiniteMagnitude

-        assertLayoutSegment(fpc.floatingPanel, with: [
-            (#line, pos: minPos, forwardY: true, lower: nil, upper: .full),
-            (#line, pos: minPos, forwardY: false, lower: nil, upper: .full),
-            (#line, pos: fullPos, forwardY: true, lower: .full, upper: .half),
-            (#line, pos: fullPos, forwardY: false, lower: nil,  upper: .full),
-            (#line, pos: halfPos, forwardY: true, lower: .half, upper: nil),
-            (#line, pos: halfPos, forwardY: false, lower: .full,  upper: .half),
-            (#line, pos: maxPos, forwardY: true, lower: .half, upper: nil),
-            (#line, pos: maxPos, forwardY: false, lower: .half, upper: nil),
-            ])
+        assertLayoutSegment(
+            fpc.floatingPanel,
+            with: [
+                (#line, pos: minPos, forwardY: true, lower: nil, upper: .full),
+                (#line, pos: minPos, forwardY: false, lower: nil, upper: .full),
+                (#line, pos: fullPos, forwardY: true, lower: .full, upper: .half),
+                (#line, pos: fullPos, forwardY: false, lower: nil, upper: .full),
+                (#line, pos: halfPos, forwardY: true, lower: .half, upper: nil),
+                (#line, pos: halfPos, forwardY: false, lower: .full, upper: .half),
+                (#line, pos: maxPos, forwardY: true, lower: .half, upper: nil),
+                (#line, pos: maxPos, forwardY: false, lower: .half, upper: nil),
+            ]
+        )
    }

    func test_layoutSegment_1positions() {
        class FloatingPanelLayout1Positions: FloatingPanelTestLayout {
-            override var initialState: FloatingPanelState  { .full }
-            override var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring]
-                { super.anchors.filter { (key, _) in key == .full } }
+            override var initialState: FloatingPanelState { .full }
+            override var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
+                super.anchors.filter { (key, _) in key == .full }
+            }
        }

        fpc.layout = FloatingPanelLayout1Positions()
@@ -111,14 +120,17 @@ class LayoutTests: XCTestCase {
        let minPos = CGFloat.leastNormalMagnitude
        let maxPos = CGFloat.greatestFiniteMagnitude

-        assertLayoutSegment(fpc.floatingPanel, with: [
-            (#line, pos: minPos, forwardY: true, lower: nil, upper: .full),
-            (#line, pos: minPos, forwardY: false, lower: nil, upper: .full),
-            (#line, pos: fullPos, forwardY: true, lower: .full, upper: nil),
-            (#line, pos: fullPos, forwardY: false, lower: nil,  upper: .full),
-            (#line, pos: maxPos, forwardY: true, lower: .full, upper: nil),
-            (#line, pos: maxPos, forwardY: false, lower: .full, upper: nil),
-            ])
+        assertLayoutSegment(
+            fpc.floatingPanel,
+            with: [
+                (#line, pos: minPos, forwardY: true, lower: nil, upper: .full),
+                (#line, pos: minPos, forwardY: false, lower: nil, upper: .full),
+                (#line, pos: fullPos, forwardY: true, lower: .full, upper: nil),
+                (#line, pos: fullPos, forwardY: false, lower: nil, upper: .full),
+                (#line, pos: maxPos, forwardY: true, lower: .full, upper: nil),
+                (#line, pos: maxPos, forwardY: false, lower: .full, upper: nil),
+            ]
+        )
    }

    func test_updateInteractiveEdgeConstraint() {
@@ -126,40 +138,50 @@ class LayoutTests: XCTestCase {
        fpc.move(to: .full, animated: false)

        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.state)
-        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.state) // Should be ignore
+        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.state)  // Should be ignore

        let fullPos = fpc.surfaceLocation(for: .full).y
        let tipPos = fpc.surfaceLocation(for: .tip).y

        var next: CGFloat

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: -100.0,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos + 100.0)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: tipPos - fullPos,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: tipPos - fullPos,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, tipPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: tipPos - fullPos + 100.0,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: tipPos - fullPos + 100.0,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, tipPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: tipPos - fullPos + 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: tipPos - fullPos + 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, tipPos + 100.0)

@@ -171,11 +193,10 @@ class LayoutTests: XCTestCase {
        fpc.showForTest()
        fpc.move(to: .tip, animated: false)
        XCTAssertEqual(fpc.surfaceView.frame, CGRect(x: 0.0, y: -667.0 + 60.0, width: 375.0, height: 667))
-        XCTAssertEqual(fpc.surfaceView.containerView.frame, CGRect(x: 0.0, y: -667.0,
-                                                                   width: 375.0, height: 667 * 2.0))
+        XCTAssertEqual(fpc.surfaceView.containerView.frame, CGRect(x: 0.0, y: -667.0, width: 375.0, height: 667 * 2.0))

        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.state)
-        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.state) // Should be ignore
+        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.state)  // Should be ignore

        XCTAssertEqual(fpc.floatingPanel.layoutAdapter.interactionConstraint?.constant, 60.0)

@@ -185,33 +206,43 @@ class LayoutTests: XCTestCase {
        var pre: CGFloat
        var next: CGFloat
        pre = fpc.surfaceLocation.y
-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: -100.0,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, pre)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, tipPos + 100.0)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: fullPos - tipPos,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: fullPos - tipPos,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: fullPos - tipPos + 100,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: fullPos - tipPos + 100,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: fullPos - tipPos + 100,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: fullPos - tipPos + 100,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos + 100.0)

@@ -238,21 +269,27 @@ class LayoutTests: XCTestCase {

        var next: CGFloat

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: -100.0,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: -100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos - 100.0)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: hiddenPos - fullPos + 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: hiddenPos - fullPos + 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, hiddenPos + 100.0)

@@ -279,21 +316,27 @@ class LayoutTests: XCTestCase {

        var next: CGFloat

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: 100.0,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: 100.0,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos + 100.0)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: hiddenPos - fullPos + 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: hiddenPos - fullPos + 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, hiddenPos + 100.0)

@@ -317,21 +360,27 @@ class LayoutTests: XCTestCase {
        let tipPos = fpc.surfaceLocation(for: .tip).y

        var next: CGFloat
-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        scrollingContent: true,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: -100.0,
+            scrollingContent: true,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: -100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, fullPos - 100)

-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: tipPos - fullPos + 100.0,
-                                                                        scrollingContent: false,
-                                                                        allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:))
+        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(
+            diff: tipPos - fullPos + 100.0,
+            scrollingContent: false,
+            allowsRubberBanding: fpc.floatingPanel.behaviorAdapter.allowsRubberBanding(for:)
+        )
        next = fpc.surfaceLocation.y
        XCTAssertEqual(next, tipPos + 100)

@@ -366,7 +415,7 @@ class LayoutTests: XCTestCase {
        XCTAssertEqual(fpc.layout.anchors.filter({ $0.value.referenceGuide != .safeArea }).count, 0)
        XCTAssertEqual(fpc.surfaceLocation(for: .full).y, myLayout.fullInset + fpc.fp_safeAreaInsets.top)
        XCTAssertEqual(fpc.surfaceLocation(for: .half).y, bounds.height - myLayout.halfInset + fpc.fp_safeAreaInsets.bottom)
-        XCTAssertEqual(fpc.surfaceLocation(for: .tip).y, bounds.height - myLayout.tipInset +  fpc.fp_safeAreaInsets.bottom)
+        XCTAssertEqual(fpc.surfaceLocation(for: .tip).y, bounds.height - myLayout.tipInset + fpc.fp_safeAreaInsets.bottom)
        XCTAssertEqual(fpc.surfaceLocation(for: .hidden).y, bounds.height + 100.0)
    }

@@ -375,7 +424,7 @@ class LayoutTests: XCTestCase {
        fpc.loadViewIfNeeded()
        fpc.view.frame = CGRect(x: 0, y: 0, width: 375, height: 667)

-        class MyFloatingPanelFullLayout: FloatingPanelTop2BottomTestLayout { }
+        class MyFloatingPanelFullLayout: FloatingPanelTop2BottomTestLayout {}
        class MyFloatingPanelSafeAreaLayout: FloatingPanelTop2BottomTestLayout {
            override var referenceGuide: FloatingPanelLayoutReferenceGuide {
                return .safeArea
@@ -389,10 +438,9 @@ class LayoutTests: XCTestCase {
        XCTAssertEqual(fpc.layout.anchors.filter({ $0.value.referenceGuide != .superview }).count, 0)
        XCTAssertEqual(fpc.surfaceLocation(for: .full).y, bounds.height - myLayout.fullInset)
        XCTAssertEqual(fpc.surfaceLocation(for: .half).y, myLayout.halfInset)
-        XCTAssertEqual(fpc.surfaceLocation(for: .tip).y,  myLayout.tipInset)
+        XCTAssertEqual(fpc.surfaceLocation(for: .tip).y, myLayout.tipInset)
        XCTAssertEqual(fpc.surfaceLocation(for: .hidden).y, -100.0)

-
        fpc.layout = MyFloatingPanelSafeAreaLayout()

        XCTAssertEqual(fpc.layout.anchors.filter({ $0.value.referenceGuide != .safeArea }).count, 0)
@@ -410,61 +458,93 @@ class LayoutTests: XCTestCase {

        for prop in [
            // from top edge
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .superview),
-             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .superview),
-             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .safeArea),
+                result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
+                result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .superview),
+                result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .superview),
+                result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
            // from bottom edge
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .superview),
-             result: (#line, constant: 0.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .superview),
-             result: (#line, constant: 100.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
-            ] {
-                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
-                XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
-                XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
-                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, constant: 0.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, constant: 100.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .superview),
+                result: (#line, constant: 0.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .superview),
+                result: (#line, constant: 100.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)
+            ),
+        ] {
+            let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
+            XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
+            XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
+            XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }

        // fractional
        for prop in [
            // from top edge
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .superview),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .superview),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .safeArea),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .safeArea),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .superview),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .superview),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)
+            ),

            // from bottom edge
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .superview),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)),
-            ] {
-                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
-                XCTAssertEqual(c.multiplier, CGFloat(prop.result.multiplier), line: UInt(prop.result.0))
-                XCTAssertTrue(c.firstAnchor is NSLayoutAnchor<NSLayoutDimension>, line: UInt(prop.result.0))
-                // On iOS 10, `c.secondAnchor` can't be equal object to `prop.result.secondAnchor`
-                // because there is no safe area  on iOS 10 and `fp_safeAreaLayoutGuide` emulates it.
-                if #available(iOS 11, *) {
-                    XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
-                }
-                print(c)
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .superview),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)
+            ),
+        ] {
+            let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
+            XCTAssertEqual(c.multiplier, CGFloat(prop.result.multiplier), line: UInt(prop.result.0))
+            XCTAssertTrue(c.firstAnchor is NSLayoutAnchor<NSLayoutDimension>, line: UInt(prop.result.0))
+            // On iOS 10, `c.secondAnchor` can't be equal object to `prop.result.secondAnchor`
+            // because there is no safe area  on iOS 10 and `fp_safeAreaLayoutGuide` emulates it.
+            if #available(iOS 11, *) {
+                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
+            }
+            print(c)
        }
    }
    func test_layoutAnchor_bottomPosition() {
@@ -476,62 +556,94 @@ class LayoutTests: XCTestCase {

        for prop in [
            // from top edge
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .superview),
-             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .superview),
-             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.topAnchor)),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .safeArea),
+                result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
+                result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .superview),
+                result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .superview),
+                result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.topAnchor)
+            ),

            // from bottom edge
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .superview),
-             result: (#line, constant: 0.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .superview),
-             result: (#line, constant: 100.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
-            ] {
-                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
-                XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
-                XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
-                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, constant: 0.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, constant: 100.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .superview),
+                result: (#line, constant: 0.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .superview),
+                result: (#line, constant: 100.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)
+            ),
+        ] {
+            let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
+            XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
+            XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
+            XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }

        // fractional
        for prop in [
            // from top edge
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .superview),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .superview),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .safeArea),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .safeArea),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .superview),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .superview),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)
+            ),

            // from bottom edge
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .superview),
-             result: (#line, multiplier: 1.0, secondAnchor: nil)),
-            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)),
-            ] {
-                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
-                XCTAssertEqual(c.multiplier, CGFloat(prop.result.multiplier), line: UInt(prop.result.0))
-                XCTAssertTrue(c.firstAnchor is NSLayoutAnchor<NSLayoutDimension>, line: UInt(prop.result.0))
-                // On iOS 10, `c.secondAnchor` can't be equal object to `prop.result.secondAnchor`
-                // because there is no safe area  on iOS 10 and `fp_safeAreaLayoutGuide` emulates it.
-                if #available(iOS 11, *) {
-                    XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
-                }
-                print(c)
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .superview),
+                result: (#line, multiplier: 1.0, secondAnchor: nil)
+            ),
+            (
+                anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
+                result: (#line, multiplier: 0.5, secondAnchor: fpc.view.heightAnchor)
+            ),
+        ] {
+            let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
+            XCTAssertEqual(c.multiplier, CGFloat(prop.result.multiplier), line: UInt(prop.result.0))
+            XCTAssertTrue(c.firstAnchor is NSLayoutAnchor<NSLayoutDimension>, line: UInt(prop.result.0))
+            // On iOS 10, `c.secondAnchor` can't be equal object to `prop.result.secondAnchor`
+            // because there is no safe area  on iOS 10 and `fp_safeAreaLayoutGuide` emulates it.
+            if #available(iOS 11, *) {
+                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
+            }
+            print(c)
        }
    }

@@ -556,32 +668,52 @@ class LayoutTests: XCTestCase {
        fpc.set(contentViewController: contentVC)

        for prop in [
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .safeArea),
-             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .safeArea),
-             result: (#line, constant: 420 - 42, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .superview),
-             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .superview),
-             result: (#line, constant: 420 - 42, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .safeArea),
+                result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .safeArea),
+                result: (#line, constant: 420 - 42, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .superview),
+                result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .superview),
+                result: (#line, constant: 420 - 42, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),

-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
-             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
-             result: (#line, constant: 210, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .safeArea),
-             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .superview),
-             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .superview),
-             result: (#line, constant: 210, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .superview),
-             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
-            ] {
-                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
-                XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
-                XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
-                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
+                result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
+                result: (#line, constant: 210, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .safeArea),
+                result: (#line, constant: 0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .superview),
+                result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .superview),
+                result: (#line, constant: 210, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .superview),
+                result: (#line, constant: 0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)
+            ),
+        ] {
+            let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
+            XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
+            XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
+            XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }
    }

@@ -606,32 +738,52 @@ class LayoutTests: XCTestCase {
        fpc.set(contentViewController: contentVC)

        for prop in [
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .safeArea),
-             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .safeArea),
-             result: (#line, constant: -420 + 42, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .superview),
-             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .superview),
-             result: (#line, constant: -420 + 42, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .safeArea),
+                result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .safeArea),
+                result: (#line, constant: -420 + 42, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .superview),
+                result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 42.0, referenceGuide: .superview),
+                result: (#line, constant: -420 + 42, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)
+            ),

-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
-             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
-             result: (#line, constant: -210, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .safeArea),
-             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .superview),
-             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .superview),
-             result: (#line, constant: -210, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)),
-            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .superview),
-             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)),
-            ] {
-                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
-                XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
-                XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
-                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
+                result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
+                result: (#line, constant: -210, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .safeArea),
+                result: (#line, constant: 0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .superview),
+                result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .superview),
+                result: (#line, constant: -210, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)
+            ),
+            (
+                anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .superview),
+                result: (#line, constant: 0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)
+            ),
+        ] {
+            let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
+            XCTAssertEqual(c.constant, CGFloat(prop.result.constant), line: UInt(prop.result.0))
+            XCTAssertEqual(c.firstAnchor, prop.result.firstAnchor, line: UInt(prop.result.0))
+            XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }
    }
 }
@@ -1,23 +1,24 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import XCTest
+
@testable import FloatingPanel

 class StateTests: XCTestCase {
-    override func setUp() { }
-    override func tearDown() { }
+    override func setUp() {}
+    override func tearDown() {}

    func test_nextAndPre() {
        var positions: [FloatingPanelState]
        positions = [.full, .half, .tip, .hidden]
-        XCTAssertEqual(FloatingPanelState.full.next(in: positions),  .half)
-        XCTAssertEqual(FloatingPanelState.full.pre(in: positions),  .full)
+        XCTAssertEqual(FloatingPanelState.full.next(in: positions), .half)
+        XCTAssertEqual(FloatingPanelState.full.pre(in: positions), .full)
        XCTAssertEqual(FloatingPanelState.hidden.next(in: positions), .hidden)
        XCTAssertEqual(FloatingPanelState.hidden.pre(in: positions), .tip)

        positions = [.full, .hidden]
-        XCTAssertEqual(FloatingPanelState.full.next(in: positions),  .hidden)
-        XCTAssertEqual(FloatingPanelState.full.pre(in: positions),  .full)
+        XCTAssertEqual(FloatingPanelState.full.next(in: positions), .hidden)
+        XCTAssertEqual(FloatingPanelState.full.pre(in: positions), .full)
        XCTAssertEqual(FloatingPanelState.hidden.next(in: positions), .hidden)
        XCTAssertEqual(FloatingPanelState.hidden.pre(in: positions), .full)
    }
@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import XCTest
+
@testable import FloatingPanel

 class SurfaceViewTests: XCTestCase {
@@ -68,12 +69,14 @@ class SurfaceViewTests: XCTestCase {

            switch position {
            case .top:
-                XCTAssertEqual(surface.containerView.frame,
-                               CGRect(x: 0.0, y: -height, width: 320.0, height: 480.0 * 3),
-                               line: line)
-                XCTAssertEqual(surface.convert(surface.contentView?.frame ?? .zero, from: surface.containerView),
-                               surface.bounds,
-                               line: line)
+                XCTAssertEqual(
+                    surface.containerView.frame,
+                    CGRect(x: 0.0, y: -height, width: 320.0, height: 480.0 * 3),
+                    line: line)
+                XCTAssertEqual(
+                    surface.convert(surface.contentView?.frame ?? .zero, from: surface.containerView),
+                    surface.bounds,
+                    line: line)
            case .bottom:
                XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds, line: line)
            default:
@@ -82,14 +85,13 @@ class SurfaceViewTests: XCTestCase {
        }
    }

-
    func test_surfaceView_grabberHandle() {
        XCTContext.runActivity(named: "Bottom sheet") { _ in
            let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
            XCTAssertNil(surface.contentView)
            surface.layoutIfNeeded()

-            XCTAssertEqual(surface.grabberHandle.frame.minY,  6.0)
+            XCTAssertEqual(surface.grabberHandle.frame.minY, 6.0)
            XCTAssertEqual(surface.grabberHandle.frame.width, surface.grabberHandleSize.width)
            XCTAssertEqual(surface.grabberHandle.frame.height, surface.grabberHandleSize.height)

@@ -97,7 +99,7 @@ class SurfaceViewTests: XCTestCase {
            surface.grabberHandleSize = CGSize(width: 44.0, height: 12.0)
            surface.setNeedsLayout()
            surface.layoutIfNeeded()
-            XCTAssertEqual(surface.grabberHandle.frame.minY,  surface.grabberHandlePadding)
+            XCTAssertEqual(surface.grabberHandle.frame.minY, surface.grabberHandlePadding)
            XCTAssertEqual(surface.grabberHandle.frame.width, surface.grabberHandleSize.width)
            XCTAssertEqual(surface.grabberHandle.frame.height, surface.grabberHandleSize.height)
        }
@@ -115,7 +117,7 @@ class SurfaceViewTests: XCTestCase {
            surface.grabberHandlePadding = 10.0
            surface.setNeedsLayout()
            surface.layoutIfNeeded()
-            XCTAssertEqual(surface.grabberHandle.frame.maxY,  surface.bounds.maxY - surface.grabberHandlePadding)
+            XCTAssertEqual(surface.grabberHandle.frame.maxY, surface.bounds.maxY - surface.grabberHandlePadding)
        }
    }

@@ -204,7 +206,7 @@ class SurfaceViewTests: XCTestCase {
        XCTAssert(surface.containerView.layer.cornerRadius == 0.0)
        XCTAssert(surface.containerView.layer.masksToBounds == false)

-        surface.containerView.layer.cornerRadius = 12.0 // Don't change it directly
+        surface.containerView.layer.cornerRadius = 12.0  // Don't change it directly
        XCTAssert(surface.containerView.layer.cornerRadius == 12.0)
        XCTAssertFalse(surface.containerView.layer.masksToBounds == true)

@@ -231,49 +233,65 @@ class SurfaceViewTests: XCTestCase {

    func test_surfaceView_grabberArea() {
        let sv = SurfaceView()
-        sv.bounds  = .init(x: 0, y: 0, width: 375, height: 500)
+        sv.bounds = .init(x: 0, y: 0, width: 375, height: 500)
        sv.grabberAreaOffset = 44.0
        // Top
        do {
            sv.position = .top
-            XCTAssertEqual(sv.grabberAreaFrame,
-                           .init(x: 0,
-                                 y: sv.bounds.height - sv.grabberAreaOffset,
-                                 width: sv.bounds.width,
-                                 height: sv.grabberAreaOffset))
+            XCTAssertEqual(
+                sv.grabberAreaFrame,
+                .init(
+                    x: 0,
+                    y: sv.bounds.height - sv.grabberAreaOffset,
+                    width: sv.bounds.width,
+                    height: sv.grabberAreaOffset
+                )
+            )
        }
        // Bottom
        do {
            sv.position = .bottom
-            XCTAssertEqual(sv.grabberAreaFrame,
-                           .init(x: 0,
-                                 y: 0,
-                                 width: sv.bounds.width,
-                                 height: sv.grabberAreaOffset))
+            XCTAssertEqual(
+                sv.grabberAreaFrame,
+                .init(
+                    x: 0,
+                    y: 0,
+                    width: sv.bounds.width,
+                    height: sv.grabberAreaOffset
+                )
+            )
        }
        // Left
        do {
            sv.position = .left
-            XCTAssertEqual(sv.grabberAreaFrame,
-                           .init(x: sv.bounds.width - sv.grabberAreaOffset,
-                                 y: 0,
-                                 width: sv.grabberAreaOffset,
-                                 height: sv.bounds.height))
+            XCTAssertEqual(
+                sv.grabberAreaFrame,
+                .init(
+                    x: sv.bounds.width - sv.grabberAreaOffset,
+                    y: 0,
+                    width: sv.grabberAreaOffset,
+                    height: sv.bounds.height
+                )
+            )
        }
        // Right
        do {
            sv.position = .right
-            XCTAssertEqual(sv.grabberAreaFrame,
-                           .init(x: 0,
-                                 y: 0,
-                                 width: sv.grabberAreaOffset,
-                                 height: sv.bounds.height))
+            XCTAssertEqual(
+                sv.grabberAreaFrame,
+                .init(
+                    x: 0,
+                    y: 0,
+                    width: sv.grabberAreaOffset,
+                    height: sv.bounds.height
+                )
+            )
        }
    }

    func test_surfaceView_grabberAreaDetection() {
        let sv = SurfaceView()
-        sv.bounds  = .init(x: 0, y: 0, width: 375, height: 500)
+        sv.bounds = .init(x: 0, y: 0, width: 375, height: 500)
        // Top
        do {
            sv.position = .top
@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import Foundation
+
@testable import FloatingPanel

 func waitRunLoop(secs: TimeInterval = 0) {
@@ -40,7 +41,7 @@ class FloatingPanelTestLayout: FloatingPanelLayout {
    var referenceGuide: FloatingPanelLayoutReferenceGuide {
        return .superview
    }
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
+    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
        return [
            .full: FloatingPanelLayoutAnchor(absoluteInset: fullInset, edge: .top, referenceGuide: referenceGuide),
            .half: FloatingPanelLayoutAnchor(absoluteInset: halfInset, edge: .bottom, referenceGuide: referenceGuide),
@@ -63,7 +64,7 @@ class FloatingPanelTop2BottomTestLayout: FloatingPanelLayout {
    var referenceGuide: FloatingPanelLayoutReferenceGuide {
        return .superview
    }
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
+    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
        return [
            .full: FloatingPanelLayoutAnchor(absoluteInset: fullInset, edge: .bottom, referenceGuide: referenceGuide),
            .half: FloatingPanelLayoutAnchor(absoluteInset: halfInset, edge: .top, referenceGuide: referenceGuide),
@@ -98,4 +99,3 @@ class MockTransitionCoordinator: NSObject, UIViewControllerTransitionCoordinator
    var containerView: UIView { UIView() }
    var targetTransform: CGAffineTransform = .identity
 }
-
@@ -1,19 +0,0 @@
-// Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
-
-import UIKit
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-    var window: UIWindow?
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
-        let rootVC = UIViewController(nibName: nil, bundle: nil)
-        rootVC.view.backgroundColor = .gray
-
-        let window = UIWindow()
-        window.rootViewController = rootVC
-        window.makeKeyAndVisible()
-        self.window = window
-
-        return true
-    }
-}
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2019 scenee. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
-                                <rect key="frame" x="0.0" y="626.5" width="375" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TestingApp" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
-                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
-                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
-                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>
@@ -0,0 +1,50 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "state" : {
+        "revision" : "9f39744e025c7d377987f30b03770805dcb0bcd1",
+        "version" : "1.1.4"
+      }
+    },
+    {
+      "identity" : "swift-format",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-format.git",
+      "state" : {
+        "branch" : "508.0.1",
+        "revision" : "fbfe1869527923dd9f9b2edac148baccfce0dce7"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax.git",
+      "state" : {
+        "revision" : "cd793adf5680e138bf2bcbaacc292490175d0dcd",
+        "version" : "508.0.0"
+      }
+    },
+    {
+      "identity" : "swift-system",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-system.git",
+      "state" : {
+        "revision" : "836bc4557b74fe6d2660218d56e3ce96aff76574",
+        "version" : "1.1.1"
+      }
+    },
+    {
+      "identity" : "swift-tools-support-core",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-tools-support-core.git",
+      "state" : {
+        "revision" : "93784c59434dbca8e8a9e4b700d0d6d94551da6a",
+        "version" : "0.5.2"
+      }
+    }
+  ],
+  "version" : 2
+}
@@ -0,0 +1,37 @@
+// swift-tools-version: 5.8
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "build-tools",
+    platforms: [.macOS(.v12)],
+    products: [
+        .plugin(name: "SwiftFormatCommand", targets: ["SwiftFormatCommand"]),
+        .plugin(name: "SwiftFormatBuildTool", targets: ["SwiftFormatBuildTool"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-format.git", branch: "508.0.1")
+    ],
+    targets: [
+        .plugin(
+            name: "SwiftFormatCommand",
+            capability: .command(
+                intent: .sourceCodeFormatting(),
+                permissions: [
+                    .writeToPackageDirectory(reason: "")
+                ]
+            ),
+            dependencies: [
+                .product(name: "swift-format", package: "swift-format")
+            ]
+        ),
+        .plugin(
+            name: "SwiftFormatBuildTool",
+            capability: .buildTool(),
+            dependencies: [
+                .product(name: "swift-format", package: "swift-format")
+            ]
+        ),
+    ]
+)
@@ -0,0 +1,52 @@
+import Foundation
+import PackagePlugin
+
+@main
+struct SwiftFormatBuildTool: BuildToolPlugin {
+    func createBuildCommands(context: PluginContext, target: Target) async throws -> [Command] {
+        debugPrint("BuildToolPlugin -> \(context.package.directory)")
+        let configFile = context.package.directory.appending(".swift-format")
+        return [
+            .prebuildCommand(
+                displayName: "Run swift-format",
+                executable: try context.tool(named: "swift-format").path,
+                arguments: [
+                    "lint",
+                    "--configuration",
+                    configFile.string,
+                    "-r",
+                    "\(context.pluginWorkDirectory.string)",
+                ],
+                outputFilesDirectory: context.package.directory
+            )
+        ]
+    }
+}
+
+#if canImport(XcodeProjectPlugin)
+import XcodeProjectPlugin
+extension SwiftFormatBuildTool: XcodeBuildToolPlugin {
+    func createBuildCommands(context: XcodePluginContext, target: XcodeTarget) throws -> [Command] {
+        debugPrint("XcodeBuildToolPlugin -> \(context.xcodeProject.directory.string)")
+        let configFile = context.xcodeProject.directory.appending(".swift-format")
+        let sourceFiles = context.xcodeProject.directory.appending("Sources")
+        let testFiles = context.xcodeProject.directory.appending("Tests")
+        return [
+            .buildCommand(
+                displayName: "Run swift-format(xcode)",
+                executable: try context.tool(named: "swift-format").path,
+                arguments: [
+                    "lint",
+                    "--configuration",
+                    configFile.string,
+                    "-r",
+                    "\(sourceFiles.string)",
+                    "\(testFiles.string)",
+                ],
+                inputFiles: [],
+                outputFiles: []
+            )
+        ]
+    }
+}
+#endif
@@ -0,0 +1,72 @@
+import Foundation
+import PackagePlugin
+
+@main
+struct SwiftFormatCommand: CommandPlugin {
+    func performCommand(context: PluginContext, arguments: [String]) async throws {
+        debugPrint("CommandPlugin start: \(context)")
+
+        let swiftFormatTool = try context.tool(named: "swift-format")
+        debugPrint("XcodeCommandPlugin: swift-format: \(swiftFormatTool.path)")
+
+        let configFile = context.package.directory.appending(".swift-format")
+        debugPrint("CommandPlugin using config: \(configFile)")
+
+        var argExtractor = ArgumentExtractor(arguments)
+        let targetNames = argExtractor.extractOption(named: "target")
+        let targetsToFormat = try context.package.targets(named: targetNames)
+
+        let sourceCodeTargets = targetsToFormat.compactMap { $0 as? SourceModuleTarget }
+
+        try runCommand(swiftFormatTool, configFile: configFile, filePaths: sourceCodeTargets.map(\.directory))
+    }
+
+    func runCommand(_ swiftFormatTool: PackagePlugin.PluginContext.Tool, configFile: Path, filePaths: [Path]) throws {
+        // Invoke `swift-format` on the target directory, passing a configuration
+        // file from the package directory.
+        let swiftFormatExec = URL(fileURLWithPath: swiftFormatTool.path.string)
+        let swiftFormatArgs =
+            [
+                "--configuration",
+                "\(configFile.string)",
+                "--in-place",
+                "--recursive",
+            ] + filePaths.map(\.string)
+        let process = try Process.run(swiftFormatExec, arguments: swiftFormatArgs)
+        process.waitUntilExit()
+
+        debugPrint("result: \(process.terminationStatus)")
+
+        if process.terminationReason == .exit && process.terminationStatus == 0 {
+            print("success.")
+        } else {
+            let problem = "\(process.terminationReason):\(process.terminationStatus)"
+            Diagnostics.error("failed: \(problem)")
+        }
+    }
+}
+
+#if canImport(XcodeProjectPlugin)
+import XcodeProjectPlugin
+extension SwiftFormatCommand: XcodeCommandPlugin {
+    func performCommand(context: XcodeProjectPlugin.XcodePluginContext, arguments: [String]) throws {
+        debugPrint("start")
+
+        let swiftFormatTool = try context.tool(named: "swift-format")
+        debugPrint("swift-format executable = \(swiftFormatTool.path)")
+
+        let configFile = context.xcodeProject.directory.appending(".swift-format")
+        debugPrint("config file  = \(swiftFormatTool.path)")
+
+        var argExtractor = ArgumentExtractor(arguments)
+        let targetNames = argExtractor.extractOption(named: "target")
+        let xcodeTargets = context.xcodeProject.targets.filter { targetNames.contains($0.product?.name ?? "") }
+
+        let filePaths = xcodeTargets.flatMap(\.inputFiles).filter { $0.type == .source }.map(\.path)
+
+        debugPrint("files to format = \(filePaths.map(\.lastComponent))")
+
+        try runCommand(swiftFormatTool, configFile: configFile, filePaths: filePaths)
+    }
+}
+#endif
Author	SHA1	Message	Date
Shin Yamamoto	ac675d505b	Add build-tools package for the command and build tool plugins For backward compat, build-tools package isn't added to FloatingPanel project file as a local package. Because it breaks builds on Xcode 14.2 or earlier according to the swift version. I confirmed this behavior was improved on Xcode 15 beta. But so far we need to add the build-tools package into the project file manually as a local package to work the build tool plugin.	2023-06-10 10:09:32 +09:00
Shin Yamamoto	53bb530537	Turn NeverForceUnwrap & NeverUseForceTry on	2023-06-10 10:02:02 +09:00
Shin Yamamoto	d6d8834423	Fix swift-format's errors and warnings	2023-06-10 10:02:02 +09:00
Shin Yamamoto	7b88703e43	ci: add Xcode 14.3 / Swift 5.8 build	2023-06-10 10:01:46 +09:00
Shin Yamamoto	c40e66ef3d	Fix a trivial bug on Samples app	2023-06-06 11:35:49 +09:00
Shin Yamamoto	53fb131d0e	Update the swizzling way in FloatingPanelController	2023-06-03 12:26:57 +09:00
Shin Yamamoto	37969f6cb3	Merge pull request #588 from scenee/release/2.6.2 Release v2.6.2	2023-06-03 10:40:57 +09:00
Shin Yamamoto	a0ba3af012	Version 2.6.2	2023-06-03 10:23:03 +09:00
Shin Yamamoto	6082dba6a7	ci: add circleci config for testing on ios13/14	2023-06-03 10:12:13 +09:00
Shin Yamamoto	43327e8123	ci: add timeout-minutes	2023-06-03 10:12:13 +09:00
Shin Yamamoto	0a5bc19d0f	Remove the host app for the unit testing	2023-06-03 10:12:13 +09:00
Shin Yamamoto	dd52e1eaee	Revise an illegible variable name	2023-04-16 10:14:54 +09:00
Shin Yamamoto	22aa055843	Revise the short descriptions	2023-04-16 10:09:39 +09:00
Shin Yamamoto	448fc5cbb4	Stop changing UIScrollView.bounces when locking or unlocking a scroll view (#584 ) UIScrollView would unexpectedly change its scroll offset after updating the bounces property when dealing with small scrollable content. This fixes issue #524, "Scrolling jumps when tableView content is small".	2023-04-08 10:30:11 +09:00
Shin Yamamoto	b4fe3b408c	Remove unused testing targets in the Samples project	2023-04-08 10:11:41 +09:00
Shin Yamamoto	6ecc7924ba	Update badges in README	2023-04-06 21:50:49 +09:00
Shin Yamamoto	0b82902233	Update README for the API documentation on GitHub Pages	2023-03-25 11:57:24 +09:00
Shin Yamamoto	597dbd4145	Revise some sentences in README	2023-03-25 11:04:55 +09:00
Shin Yamamoto	1ee949ff1b	Merge pull request #583 from scenee/release/2.6.1 Release 2.6.1	2023-03-04 10:46:11 +09:00
Shin Yamamoto	2a29cb5b3e	Version 2.6.1	2023-03-04 09:43:23 +09:00
Shin Yamamoto	208ab665da	ci: add Maps-SwiftUI example build	2023-03-04 09:42:40 +09:00
Shin Yamamoto	3e20314cfa	Update DebugTableViewController with followScrollViewBouncing() API	2023-03-02 21:53:24 +09:00
Shin Yamamoto	5b8e9a54d9	Update trackingScrollViewDidScroll() with doc comments	2023-03-02 21:53:24 +09:00
Vlad	d3c30b35d9	track scroll view bouncing (#525 )	2023-02-25 11:11:50 +09:00
Shin Yamamoto	8bb3795931	Take care of an invalid bounding rectangle of PassthroughView in a screen rotation	2023-02-25 10:51:19 +09:00
Shin Yamamoto	9383cd001d	ci: replace iOS 15 envs on testing Because testing on iOS 15.4 is buggy.	2023-02-18 12:15:26 +09:00
Shin Yamamoto	6d5f770066	ci: replace macos-10.15 with macos-11 macos-10.15 will be completely removed by 2023-03-31. https://github.com/actions/runner-images/issues/5583#issuecomment-1426004850	2023-02-18 11:54:19 +09:00
Shin Yamamoto	ce2cafed5b	Workaround: fix a laggy animation in Samples app The AutoLayout rendering engine has been changed since iOS 16. As a result, "Show Detail Panel" in Samples.apps has a laggy animation when pulling it down to the bottom of the screen. The issue hadn't occurred until iOS 15. "On Safe Area View" causes this issue. I could fix it by removing the constraint of its view to the top of the safe area. As a workaround, I've replaced its top constraint with one of a constraint to the top of the superview.	2023-02-18 11:46:41 +09:00
Shin Yamamoto	68352218ac	ci: upgrade actions/checkout to suppress Node.js 12 warnings	2023-02-18 11:10:35 +09:00
Shin Yamamoto	e3736e4214	Merge pull request #582 from scenee/release/2.6.0 Release 2.6.0	2023-02-18 11:06:19 +09:00