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.

.circleci/config.yml

@@ -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

.github/workflows/ci.yml

@@ -9,95 +9,137 @@ 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: macOS-11
+    runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+    strategy:
+      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.4.1"
+            runsOn: macos-12
+          - swift: "5.5"
+            xcode: "13.2.1"
+            runsOn: macos-11
+          - swift: "5.4"
+            xcode: "12.5.1"
+            runsOn: macos-11
+          - swift: "5.3"
+            xcode: "12.4"
+            runsOn: macos-11
+          - swift: "5.2"
+            xcode: "11.7"
+            runsOn: macos-11
     steps:
-    - uses: actions/checkout@v1
-    - name: "Swift 5.4"
-      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.4 clean build
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
-    - name: "Swift 5.5"
-      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.5 clean build
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+      - uses: actions/checkout@v3
+      - name: Building in Swift ${{ matrix.swift }}
+        run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=${{ matrix.swift }} clean build
 
-  build_compat:
-    runs-on: macOS-10.15
+  test:
+    runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: "16.1"
+            xcode: "14.1"
+            sim: "iPhone 14 Pro"
+            runsOn: macos-12
+          - os: "15.5"
+            xcode: "13.4.1"
+            sim: "iPhone 13 Pro"
+            runsOn: macos-12
     steps:
-    - uses: actions/checkout@v1
-    - name: "Swift 5.1"
-      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.1 clean build
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
-    - name: "Swift 5.2"
-      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.2 clean build
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
-    - name: "Swift 5.3"
-      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.3 clean build
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-
-  testing:
-    runs-on: macOS-11
-    steps:
-    - uses: actions/checkout@v1
-    - name: "Testing in iOS 14.5"
-      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 12 Pro'
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
-    - name: "Testing in iOS 15.0"
-      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13 Pro'
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
-
-  testing_compat:
-    runs-on: macOS-10.15
-    steps:
-    - uses: actions/checkout@v1
-    - name: "Testing in iOS 13.7"
-      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro'
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
-    - name: "Testing in iOS 14.4"
-      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.4,name=iPhone 12 Pro'
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+    - 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-11
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - example: "Maps"
+          - example: "Maps-SwiftUI"
+          - example: "Stocks"
+          - example: "Samples"
     steps:
-    - uses: actions/checkout@v1
-    - name: "Build Maps"
-      run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme Maps -sdk iphonesimulator clean build
-    - name: "Build Stocks"
-      run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme Stocks -sdk iphonesimulator clean build
-    - name: "Build Samples"
-      run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme Samples -sdk iphonesimulator clean build
+    - uses: actions/checkout@v3
+    - name: Building ${{ matrix.example }}
+      run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme ${{ matrix.example }} -sdk iphonesimulator clean build
 
   swiftpm:
-    runs-on: macOS-11
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # 15.7
+          - target: "x86_64-apple-ios15.7-simulator"
+          - target: "arm64-apple-ios15.7-simulator"
+          # 16.1
+          - target: "x86_64-apple-ios16.1-simulator"
+          - target: "arm64-apple-ios16.1-simulator"
     steps:
-    - uses: actions/checkout@v1
-    - name: "Swift Package build"
-      run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios14.3-simulator"
+    - 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
+    runs-on: macos-11
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: "Carthage build"
       run: carthage build --use-xcframeworks --no-skip-current
 
   cocoapods:
-    runs-on: macOS-11
+    runs-on: macos-12
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: "CocoaPods: pod lib lint"
       run: pod lib lint --allow-warnings
     - name: "CocoaPods: pod spec lint"

.swift-format

@@ -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
+}

.swiftformat

@@ -1,3 +0,0 @@
---header "// Copyright 2018-Present Shin Yamamoto. All rights reserved. MIT license."
---disable andOperator,anyObjectProtocol,blankLinesAroundMark,blankLinesAtEndOfScope,blankLinesAtStartOfScope,blankLinesBetweenScopes,braces,consecutiveBlankLines,consecutiveSpaces,duplicateImports,elseOnSameLine,emptyBraces,hoistPatternLet,indent,isEmpty,leadingDelimiters,linebreakAtEndOfFile,linebreaks,numberFormatting,redundantBackticks,redundantBreak,redundantExtensionACL,redundantFileprivate,redundantGet,redundantInit,redundantLet,redundantLetError,redundantNilInit,redundantObjc,redundantParens,redundantPattern,redundantRawValues,redundantReturn,redundantSelf,redundantVoidReturnType,semicolons,sortedImports,spaceAroundBraces,spaceAroundBrackets,spaceAroundComments,spaceAroundGenerics,spaceAroundOperators,spaceAroundParens,spaceInsideBraces,spaceInsideBrackets,spaceInsideComments,spaceInsideGenerics,spaceInsideParens,specifiers,strongOutlets,strongifiedSelf,todos,trailingClosures,trailingCommas,trailingSpace,typeSugar,unusedArguments,void,wrapArguments,yodaConditions
-

Examples/Maps-SwiftUI/Maps-SwiftUI.xcodeproj/project.pbxproj

@@ -364,7 +364,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.scenee.Maps-SwiftUI";
+				PRODUCT_BUNDLE_IDENTIFIER = "example.Maps-SwiftUI";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -391,7 +391,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.scenee.Maps-SwiftUI";
+				PRODUCT_BUNDLE_IDENTIFIER = "exmaple.Maps-SwiftUI";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

Examples/Maps-SwiftUI/Maps/FloatingPanel/FloatingPanelView.swift

@@ -96,8 +96,20 @@ struct FloatingPanelView<Content: View, FloatingPanelContent: View>: UIViewContr
                 ignoresKeyboard: true
             )
             hostingViewController.view.backgroundColor = nil
-            fpc.set(contentViewController: hostingViewController)
-            fpc.addPanel(toParent: parentViewController, at: 1, animated: false)
+            let contentViewController = UIViewController()
+            contentViewController.view.addSubview(hostingViewController.view)
+            fpc.set(contentViewController: contentViewController)
+            fpc.addPanel(toParent: parentViewController, animated: false)
+
+            hostingViewController.view.translatesAutoresizingMaskIntoConstraints = false
+            let bottomConstraint = hostingViewController.view.bottomAnchor.constraint(equalTo: contentViewController.view.bottomAnchor)
+            bottomConstraint.priority = .defaultHigh
+            NSLayoutConstraint.activate([
+                hostingViewController.view.topAnchor.constraint(equalTo: contentViewController.view.topAnchor),
+                hostingViewController.view.leadingAnchor.constraint(equalTo: contentViewController.view.leadingAnchor),
+                hostingViewController.view.trailingAnchor.constraint(equalTo: contentViewController.view.trailingAnchor),
+                bottomConstraint
+            ])
         }
 
         func updateIfNeeded() {

Examples/Maps-SwiftUI/Maps/SearchPanelPhoneDelegate.swift

@@ -1,6 +1,7 @@
 // Copyright 2021 the FloatingPanel authors. All rights reserved. MIT license.
 
 import FloatingPanel
+import UIKit
 
 final class SearchPanelPhoneDelegate: FloatingPanelControllerDelegate {
     func floatingPanelWillBeginDragging(_ vc: FloatingPanelController) {

Examples/Maps/Maps.xcodeproj/project.pbxproj

@@ -12,12 +12,13 @@
 		549D23D2233C77D5008EF4D7 /* FloatingPanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23D1233C77D5008EF4D7 /* FloatingPanel.framework */; };
 		549D23D3233C77D5008EF4D7 /* FloatingPanel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23D1233C77D5008EF4D7 /* FloatingPanel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		54B5112A216C3D840033A6F3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B51129216C3D840033A6F3 /* AppDelegate.swift */; };
-		54B5112C216C3D840033A6F3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B5112B216C3D840033A6F3 /* ViewController.swift */; };
+		54B5112C216C3D840033A6F3 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B5112B216C3D840033A6F3 /* MainViewController.swift */; };
 		54B5112F216C3D840033A6F3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 54B5112D216C3D840033A6F3 /* Main.storyboard */; };
 		54B51131216C3D860033A6F3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54B51130216C3D860033A6F3 /* Assets.xcassets */; };
 		54B51134216C3D860033A6F3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 54B51132216C3D860033A6F3 /* LaunchScreen.storyboard */; };
 		54E26CB624A989090066C720 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E26CB524A989090066C720 /* Utils.swift */; };
 		54E26CB824A98E310066C720 /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E26CB724A98E310066C720 /* DetailViewController.swift */; };
+		5D82A6A728D18422006A44BA /* libswiftCoreGraphics.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D82A6A628D1841E006A44BA /* libswiftCoreGraphics.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -40,13 +41,14 @@
 		549D23D1233C77D5008EF4D7 /* FloatingPanel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FloatingPanel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		54B51126216C3D840033A6F3 /* Maps.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Maps.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		54B51129216C3D840033A6F3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		54B5112B216C3D840033A6F3 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		54B5112B216C3D840033A6F3 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		54B5112E216C3D840033A6F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		54B51130216C3D860033A6F3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		54B51133216C3D860033A6F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		54B51135216C3D860033A6F3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		54E26CB524A989090066C720 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 		54E26CB724A98E310066C720 /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
+		5D82A6A628D1841E006A44BA /* libswiftCoreGraphics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreGraphics.tbd; path = usr/lib/swift/libswiftCoreGraphics.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -55,6 +57,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				543844BD23D2BE2000D5EDE4 /* MapKit.framework in Frameworks */,
+				5D82A6A728D18422006A44BA /* libswiftCoreGraphics.tbd in Frameworks */,
 				549D23D2233C77D5008EF4D7 /* FloatingPanel.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -65,6 +68,7 @@
 		543844BB23D2BE1F00D5EDE4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				5D82A6A628D1841E006A44BA /* libswiftCoreGraphics.tbd */,
 				543844BC23D2BE2000D5EDE4 /* MapKit.framework */,
 			);
 			name = Frameworks;
@@ -91,14 +95,14 @@
 		54B51128216C3D840033A6F3 /* Maps */ = {
 			isa = PBXGroup;
 			children = (
+				54B51130216C3D860033A6F3 /* Assets.xcassets */,
+				54B51132216C3D860033A6F3 /* LaunchScreen.storyboard */,
+				54B5112D216C3D840033A6F3 /* Main.storyboard */,
 				54B51129216C3D840033A6F3 /* AppDelegate.swift */,
-				54B5112B216C3D840033A6F3 /* ViewController.swift */,
+				54B5112B216C3D840033A6F3 /* MainViewController.swift */,
 				549A5F58244673FE0025F312 /* SearchViewController.swift */,
 				54E26CB724A98E310066C720 /* DetailViewController.swift */,
 				54E26CB524A989090066C720 /* Utils.swift */,
-				54B5112D216C3D840033A6F3 /* Main.storyboard */,
-				54B51130216C3D860033A6F3 /* Assets.xcassets */,
-				54B51132216C3D860033A6F3 /* LaunchScreen.storyboard */,
 				54B51135216C3D860033A6F3 /* Info.plist */,
 			);
 			path = Maps;
@@ -132,7 +136,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = scenee;
 				TargetAttributes = {
 					54B51125216C3D840033A6F3 = {
@@ -177,7 +181,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				549A5F59244673FE0025F312 /* SearchViewController.swift in Sources */,
-				54B5112C216C3D840033A6F3 /* ViewController.swift in Sources */,
+				54B5112C216C3D840033A6F3 /* MainViewController.swift in Sources */,
 				54E26CB824A98E310066C720 /* DetailViewController.swift in Sources */,
 				54B5112A216C3D840033A6F3 /* AppDelegate.swift in Sources */,
 				54E26CB624A989090066C720 /* Utils.swift in Sources */,
@@ -232,6 +236,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -293,6 +298,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -334,7 +340,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.Maps;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.Maps;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -353,7 +363,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.Maps;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.Maps;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

Examples/Maps/Maps.xcodeproj/xcshareddata/xcschemes/Maps.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Maps.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -63,8 +61,6 @@
             ReferencedContainer = "container:Maps.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Examples/Maps/Maps/AppDelegate.swift

@@ -5,9 +5,5 @@ import UIKit
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        return true
-    }
 }
 

Examples/Maps/Maps/Base.lproj/Main.storyboard

@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina5_9" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
         <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-->
+        <!--Main View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="MainViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="5Jw-n2-Cpw">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                             </mapView>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d9i-3g-8Ja">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="0.0"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="lMa-xa-AVV">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="0.0"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 </view>
                                 <blurEffect style="prominent"/>
@@ -54,31 +52,31 @@
             <objects>
                 <viewController storyboardIdentifier="SearchViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0S1-Lk-JgE" customClass="SearchViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ncl-E9-yRn">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ye3-uU-bq3">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ED1-gT-FBj">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="Zcj-SE-gb8">
-                                            <rect key="frame" x="0.0" y="6" width="375" height="56"/>
+                                            <rect key="frame" x="0.0" y="6" width="600" height="51"/>
                                             <textInputTraits key="textInputTraits"/>
                                         </searchBar>
                                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="D7r-re-InH">
-                                            <rect key="frame" x="0.0" y="66" width="375" height="746"/>
+                                            <rect key="frame" x="0.0" y="61" width="600" height="539"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <view key="tableHeaderView" contentMode="scaleToFill" id="u28-LY-hIh" customClass="SearchHeaderView" customModule="Maps" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="375" height="116"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="600" height="116"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="era-8w-yA1">
-                                                        <rect key="frame" x="24" y="10.666666666666664" width="327" height="97.333333333333343"/>
+                                                        <rect key="frame" x="24" y="10.5" width="552" height="97.5"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="auI-1v-Yfk">
-                                                                <rect key="frame" x="0.0" y="0.0" width="60" height="97.333333333333329"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="60" height="97.5"/>
                                                                 <subviews>
                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="food" translatesAutoresizingMaskIntoConstraints="NO" id="ErN-bC-qTx">
                                                                         <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -88,7 +86,7 @@
                                                                         </constraints>
                                                                     </imageView>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Food &amp; Drinks" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nx2-fW-xAm">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
@@ -96,7 +94,7 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="0vd-sD-XKv">
-                                                                <rect key="frame" x="89" y="0.0" width="60" height="97.333333333333329"/>
+                                                                <rect key="frame" x="164" y="0.0" width="60" height="97.5"/>
                                                                 <subviews>
                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shopping" translatesAutoresizingMaskIntoConstraints="NO" id="xcm-St-HAo">
                                                                         <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -106,7 +104,7 @@
                                                                         </constraints>
                                                                     </imageView>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H7q-q2-ga5">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
                                                                         <string key="text">Shopping
 </string>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -116,7 +114,7 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="Jd8-YL-b5s">
-                                                                <rect key="frame" x="178" y="0.0" width="60" height="97.333333333333329"/>
+                                                                <rect key="frame" x="328" y="0.0" width="60" height="97.5"/>
                                                                 <subviews>
                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fun" translatesAutoresizingMaskIntoConstraints="NO" id="bMJ-Jn-Gi8">
                                                                         <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -126,7 +124,7 @@
                                                                         </constraints>
                                                                     </imageView>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kKh-45-FZ2">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
                                                                         <string key="text">Fun
 </string>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -136,7 +134,7 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="dTL-e1-Arz">
-                                                                <rect key="frame" x="267" y="0.0" width="60" height="97.333333333333329"/>
+                                                                <rect key="frame" x="492" y="0.0" width="60" height="97.5"/>
                                                                 <subviews>
                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="travel" translatesAutoresizingMaskIntoConstraints="NO" id="8h3-fo-pC3">
                                                                         <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -146,7 +144,7 @@
                                                                         </constraints>
                                                                     </imageView>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WBT-Vj-7QA">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
                                                                         <string key="text">Travel
 </string>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -168,10 +166,10 @@
                                             </view>
                                             <prototypes>
                                                 <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" rowHeight="70" id="LzC-B9-Adb" customClass="SearchCell" customModule="Maps" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="144" width="375" height="70"/>
+                                                    <rect key="frame" x="0.0" y="160.5" width="600" height="70"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LzC-B9-Adb" id="evr-60-laS">
-                                                        <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="like" translatesAutoresizingMaskIntoConstraints="NO" id="GEk-yE-lLq">
@@ -183,16 +181,16 @@
                                                                 </constraints>
                                                             </imageView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Gfl-Oy-rsy">
-                                                                <rect key="frame" x="57" y="12" width="303" height="46"/>
+                                                                <rect key="frame" x="57" y="12" width="528" height="46"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" tag="1" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Favorites" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Spf-8L-Ne6">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="303" height="22"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="528" height="22"/>
                                                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 Places" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gyo-3V-7U8">
-                                                                        <rect key="frame" x="0.0" y="24" width="303" height="22"/>
+                                                                        <rect key="frame" x="0.0" y="24" width="528" height="22"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                         <color key="textColor" red="0.57647058819999997" green="0.57647058819999997" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
@@ -257,18 +255,18 @@
             <objects>
                 <viewController storyboardIdentifier="DetailViewController" id="Tp2-MF-IFz" customClass="DetailViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="FmO-AT-4Y7">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c3d-2e-0b1">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="9fL-a5-0LS">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="kP7-56-wlG">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </tableView>
                                     </subviews>

Examples/Maps/Maps/MainViewController.swift

@@ -4,7 +4,7 @@ import UIKit
 import MapKit
 import FloatingPanel
 
-class ViewController: UIViewController {
+class MainViewController: UIViewController {
     typealias PanelDelegate = FloatingPanelControllerDelegate & UIGestureRecognizerDelegate
 
     // Search Panel
@@ -22,7 +22,9 @@ class ViewController: UIViewController {
         storyboard?.instantiateViewController(withIdentifier: "DetailViewController") as! DetailViewController
 
     @IBOutlet weak var mapView: MKMapView!
+}
 
+extension MainViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         fpc.contentMode = .fitToBounds
@@ -40,7 +42,7 @@ class ViewController: UIViewController {
             layoutPanelForPhone()
         }
 
-        setupMapView()
+        setUpMapView()
         setUpSearchView()
     }
 
@@ -53,9 +55,11 @@ class ViewController: UIViewController {
 
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
-        teardownMapView()
+        tearDownMapView()
     }
+}
 
+extension MainViewController {
     func layoutPanelForPad() {
         fpc.behavior = SearchPaneliPadBehavior()
         fpc.panGestureRecognizer.delegateProxy = fpcDelegate
@@ -76,15 +80,14 @@ class ViewController: UIViewController {
             self.didMove(toParent: self)
         }
 
-        fpc.setAppearanceForPad()
-        detailFpc.setAppearanceForPad()
+        [fpc, detailFpc].forEach { $0.setAppearanceForPad() }
     }
 
     func layoutPanelForPhone() {
         fpc.track(scrollView: searchVC.tableView) // Only track the table view on iPhone
         fpc.addPanel(toParent: self, animated: true)
-        fpc.setAppearanceForPhone()
-        detailFpc.setAppearanceForPhone()
+
+        [fpc, detailFpc].forEach { $0.setAppearanceForPhone()}
     }
 }
 
@@ -116,7 +119,7 @@ extension FloatingPanelController {
 
 // MARK: - UISearchBarDelegate
 
-extension ViewController: UISearchBarDelegate {
+extension MainViewController: UISearchBarDelegate {
     func activate(searchBar: UISearchBar) {
         searchBar.showsCancelButton = true
         searchVC.showHeader(animated: true)
@@ -147,9 +150,9 @@ extension ViewController: UISearchBarDelegate {
 // MARK: - iPhone
 
 class SearchPanelPhoneDelegate: NSObject, FloatingPanelControllerDelegate, UIGestureRecognizerDelegate {
-    unowned let owner: ViewController
+    unowned let owner: MainViewController
 
-    init(owner: ViewController) {
+    init(owner: MainViewController) {
         self.owner = owner
     }
 
@@ -201,25 +204,16 @@ class SearchPanelPhoneDelegate: NSObject, FloatingPanelControllerDelegate, UIGes
         if targetState.pointee != .full {
             owner.searchVC.hideHeader(animated: true)
         }
-        if targetState.pointee == .tip {
-            vc.contentMode = .static
-        }
-    }
-
-    func floatingPanelDidEndAttracting(_ fpc: FloatingPanelController) {
-        fpc.contentMode = .fitToBounds
     }
 }
 
 class SearchPanelLandscapeLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition  = .bottom
     let initialState: FloatingPanelState = .tip
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
+    ]
     func prepareLayout(surfaceView: UIView, in view: UIView) -> [NSLayoutConstraint] {
         if #available(iOS 11.0, *) {
             return [
@@ -239,20 +233,18 @@ class SearchPanelLandscapeLayout: FloatingPanelLayout {
 }
 
 class DetailPanelPhoneDelegate: NSObject, FloatingPanelControllerDelegate, UIGestureRecognizerDelegate {
-    unowned let owner: ViewController
+    unowned let owner: MainViewController
 
-    init(owner: ViewController) {
+    init(owner: MainViewController) {
         self.owner = owner
     }
 }
 
 class DetailPanelPhoneLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition  = .bottom
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
+    ]
     let initialState: FloatingPanelState = .full
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.0
@@ -262,9 +254,9 @@ class DetailPanelPhoneLayout: FloatingPanelLayout {
 // MARK: - iPad
 
 class SearchPanelPadDelegate: NSObject, FloatingPanelControllerDelegate, UIGestureRecognizerDelegate {
-    unowned let owner: ViewController
+    unowned let owner: MainViewController
 
-    init(owner: ViewController) {
+    init(owner: MainViewController) {
         self.owner = owner
     }
 
@@ -301,13 +293,11 @@ class SearchPanelPadDelegate: NSObject, FloatingPanelControllerDelegate, UIGestu
 class SearchPanelPadLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition  = .top
     let initialState: FloatingPanelState = .tip
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 80.0, edge: .top, referenceGuide: .superview),
-            .half: FloatingPanelLayoutAnchor(absoluteInset: 200.0, edge: .top, referenceGuide: .superview),
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 60.0, edge: .bottom, referenceGuide: .superview),
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 80.0, edge: .top, referenceGuide: .superview),
+        .half: FloatingPanelLayoutAnchor(absoluteInset: 200.0, edge: .top, referenceGuide: .superview),
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 60.0, edge: .bottom, referenceGuide: .superview),
+    ]
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.0
     }
@@ -335,9 +325,9 @@ class SearchPaneliPadBehavior: FloatingPanelBehavior {
 }
 
 class DetailPanelPadDelegate: NSObject, FloatingPanelControllerDelegate, UIGestureRecognizerDelegate {
-    unowned let owner: ViewController
+    unowned let owner: MainViewController
 
-    init(owner: ViewController) {
+    init(owner: MainViewController) {
         self.owner = owner
     }
 
@@ -361,11 +351,9 @@ class DetailPanelPadDelegate: NSObject, FloatingPanelControllerDelegate, UIGestu
 
 class DetailPanelPadLeftLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition  = .left
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 375, edge: .left, referenceGuide: .superview)
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 375, edge: .left, referenceGuide: .superview)
+    ]
     let initialState: FloatingPanelState = .full
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.0
@@ -374,11 +362,9 @@ class DetailPanelPadLeftLayout: FloatingPanelLayout {
 
 class DetailPanelPadRightLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition  = .right
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 375, edge: .right, referenceGuide: .superview)
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 375, edge: .right, referenceGuide: .superview)
+    ]
     let initialState: FloatingPanelState = .full
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.0
@@ -387,8 +373,8 @@ class DetailPanelPadRightLayout: FloatingPanelLayout {
 
 // MARK: - MKMapViewDelegate
 
-extension ViewController: MKMapViewDelegate {
-    func setupMapView() {
+extension MainViewController: MKMapViewDelegate {
+    func setUpMapView() {
         let center = CLLocationCoordinate2D(latitude: 37.623198015869235,
                                             longitude: -122.43066818432008)
         let span = MKCoordinateSpan(latitudeDelta: 0.4425100023575723,
@@ -400,7 +386,7 @@ extension ViewController: MKMapViewDelegate {
         mapView.delegate = self
     }
 
-    func teardownMapView() {
+    func tearDownMapView() {
         // Prevent a crash
         mapView.delegate = nil
         mapView = nil

Examples/Maps/Maps/SearchViewController.swift

@@ -4,7 +4,7 @@ import UIKit
 
 // MARK: - UITableViewDelegate
 
-extension ViewController: UITableViewDelegate {
+extension MainViewController: UITableViewDelegate {
     func setUpSearchView() {
         searchVC.loadViewIfNeeded()
         searchVC.tableView.delegate = self

Examples/Samples/Samples.xcodeproj/project.pbxproj

@@ -18,40 +18,23 @@
 		5442E24A25FC53C100A26F43 /* DebugTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5442E24925FC53C100A26F43 /* DebugTextViewController.swift */; };
 		5442E25225FC541700A26F43 /* NestedScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5442E25125FC541700A26F43 /* NestedScrollViewController.swift */; };
 		54496C59263A7E5A0031E0C8 /* UseCaseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54496C58263A7E5A0031E0C8 /* UseCaseController.swift */; };
+		544BC56826CC918200D0A436 /* AdaptiveLayoutTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 544BC56726CC918200D0A436 /* AdaptiveLayoutTestViewController.swift */; };
 		545DB9EE21511E6300CA77B8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DB9ED21511E6300CA77B8 /* AppDelegate.swift */; };
 		545DB9F021511E6300CA77B8 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DB9EF21511E6300CA77B8 /* MainViewController.swift */; };
 		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 */; };
 		549D23CC233C7779008EF4D7 /* FloatingPanel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23CA233C7779008EF4D7 /* FloatingPanel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		54B51116216AFE5F0033A6F3 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B51115216AFE5F0033A6F3 /* Extensions.swift */; };
-		54CDC5D8215BBE23007D205C /* Components.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CDC5D7215BBE23007D205C /* Components.swift */; };
-		54EAD35B263A75EB006A36EA /* Layouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EAD35A263A75EB006A36EA /* Layouts.swift */; };
+		54CDC5D8215BBE23007D205C /* SupplementaryViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CDC5D7215BBE23007D205C /* SupplementaryViews.swift */; };
+		54EAD35B263A75EB006A36EA /* PanelLayouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EAD35A263A75EB006A36EA /* PanelLayouts.swift */; };
 		54EAD365263A765F006A36EA /* PagePanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EAD364263A765F006A36EA /* PagePanelController.swift */; };
+		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;
@@ -78,6 +61,7 @@
 		5442E24925FC53C100A26F43 /* DebugTextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugTextViewController.swift; sourceTree = "<group>"; };
 		5442E25125FC541700A26F43 /* NestedScrollViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NestedScrollViewController.swift; sourceTree = "<group>"; };
 		54496C58263A7E5A0031E0C8 /* UseCaseController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UseCaseController.swift; sourceTree = "<group>"; };
+		544BC56726CC918200D0A436 /* AdaptiveLayoutTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveLayoutTestViewController.swift; sourceTree = "<group>"; };
 		545DB9EA21511E6300CA77B8 /* Samples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Samples.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		545DB9ED21511E6300CA77B8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		545DB9EF21511E6300CA77B8 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
@@ -85,19 +69,14 @@
 		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; };
 		54B51115216AFE5F0033A6F3 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
-		54CDC5D7215BBE23007D205C /* Components.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Components.swift; sourceTree = "<group>"; };
-		54EAD35A263A75EB006A36EA /* Layouts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Layouts.swift; sourceTree = "<group>"; };
+		54CDC5D7215BBE23007D205C /* SupplementaryViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupplementaryViews.swift; sourceTree = "<group>"; };
+		54EAD35A263A75EB006A36EA /* PanelLayouts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanelLayouts.swift; sourceTree = "<group>"; };
 		54EAD364263A765F006A36EA /* PagePanelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagePanelController.swift; sourceTree = "<group>"; };
+		5D82A6AC28D18438006A44BA /* libswiftCoreGraphics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreGraphics.tbd; path = usr/lib/swift/libswiftCoreGraphics.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -105,28 +84,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5D82A6AD28D1843C006A44BA /* libswiftCoreGraphics.tbd in Frameworks */,
 				549D23CB233C7779008EF4D7 /* FloatingPanel.framework in Frameworks */,
 			);
 			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 */
-		5442E22225FC519700A26F43 /* ViewControllers */ = {
+		5442E22225FC519700A26F43 /* ContentViewControllers */ = {
 			isa = PBXGroup;
 			children = (
 				5442E23F25FC533800A26F43 /* DebugTableViewController.swift */,
@@ -139,8 +105,9 @@
 				5442E22725FC51E200A26F43 /* MultiPanelController.swift */,
 				5442E22B25FC521F00A26F43 /* SettingsViewController.swift */,
 				5442E22F25FC525200A26F43 /* TabBarViewController.swift */,
+				544BC56726CC918200D0A436 /* AdaptiveLayoutTestViewController.swift */,
 			);
-			path = ViewControllers;
+			path = ContentViewControllers;
 			sourceTree = "<group>";
 		};
 		545DB9E121511E6300CA77B8 = {
@@ -148,9 +115,8 @@
 			children = (
 				549D23CA233C7779008EF4D7 /* FloatingPanel.framework */,
 				545DB9EC21511E6300CA77B8 /* Sources */,
-				545DBA0121511E6400CA77B8 /* Tests */,
-				545DBA0C21511E6400CA77B8 /* UITests */,
 				545DB9EB21511E6300CA77B8 /* Products */,
+				5D82A6AB28D18438006A44BA /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -158,8 +124,6 @@
 			isa = PBXGroup;
 			children = (
 				545DB9EA21511E6300CA77B8 /* Samples.app */,
-				545DB9FE21511E6400CA77B8 /* SamplesTests.xctest */,
-				545DBA0921511E6400CA77B8 /* SamplesUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -172,45 +136,35 @@
 				545DB9F121511E6300CA77B8 /* Main.storyboard */,
 				545DB9ED21511E6300CA77B8 /* AppDelegate.swift */,
 				545DB9EF21511E6300CA77B8 /* MainViewController.swift */,
-				54496C58263A7E5A0031E0C8 /* UseCaseController.swift */,
 				546341AA25C6421000CA0596 /* UseCases */,
-				5442E22225FC519700A26F43 /* ViewControllers */,
-				54EAD35A263A75EB006A36EA /* Layouts.swift */,
+				5442E22225FC519700A26F43 /* ContentViewControllers */,
+				54EAD35A263A75EB006A36EA /* PanelLayouts.swift */,
+				546341AB25C6426500CA0596 /* CustomState.swift */,
+				54CDC5D7215BBE23007D205C /* SupplementaryViews.swift */,
 				54B51115216AFE5F0033A6F3 /* Extensions.swift */,
-				54CDC5D7215BBE23007D205C /* Components.swift */,
 				545DB9F921511E6400CA77B8 /* Info.plist */,
 			);
 			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 = (
 				546341A025C6415100CA0596 /* UseCase.swift */,
-				546341AB25C6426500CA0596 /* CustomState.swift */,
+				54496C58263A7E5A0031E0C8 /* UseCaseController.swift */,
 				54EAD364263A765F006A36EA /* PagePanelController.swift */,
 			);
 			path = UseCases;
 			sourceTree = "<group>";
 		};
+		5D82A6AB28D18438006A44BA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5D82A6AC28D18438006A44BA /* libswiftCoreGraphics.tbd */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -218,7 +172,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 545DBA1221511E6400CA77B8 /* Build configuration list for PBXNativeTarget "Samples" */;
 			buildPhases = (
-				54D7209621D4DB970054A255 /* ShellScript */,
 				545DB9E621511E6300CA77B8 /* Sources */,
 				545DB9E721511E6300CA77B8 /* Frameworks */,
 				545DB9E821511E6300CA77B8 /* Resources */,
@@ -233,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 */
@@ -276,20 +193,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = scenee;
 				TargetAttributes = {
 					545DB9E921511E6300CA77B8 = {
 						CreatedOnToolsVersion = 10.0;
 					};
-					545DB9FD21511E6400CA77B8 = {
-						CreatedOnToolsVersion = 10.0;
-						TestTargetID = 545DB9E921511E6300CA77B8;
-					};
-					545DBA0821511E6400CA77B8 = {
-						CreatedOnToolsVersion = 10.0;
-						TestTargetID = 545DB9E921511E6300CA77B8;
-					};
 				};
 			};
 			buildConfigurationList = 545DB9E521511E6300CA77B8 /* Build configuration list for PBXProject "Samples" */;
@@ -306,8 +215,6 @@
 			projectRoot = "";
 			targets = (
 				545DB9E921511E6300CA77B8 /* Samples */,
-				545DB9FD21511E6400CA77B8 /* SamplesTests */,
-				545DBA0821511E6400CA77B8 /* SamplesUITests */,
 			);
 		};
 /* End PBXProject section */
@@ -323,42 +230,8 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		545DB9FC21511E6400CA77B8 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		545DBA0721511E6400CA77B8 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		54D7209621D4DB970054A255 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $(git rev-parse --abbrev-ref HEAD)($(git rev-parse --short HEAD))\" \"$SRCROOT/$INFOPLIST_FILE\"\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		545DB9E621511E6300CA77B8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -366,8 +239,9 @@
 			files = (
 				5442E23425FC528400A26F43 /* DetailViewController.swift in Sources */,
 				54496C59263A7E5A0031E0C8 /* UseCaseController.swift in Sources */,
-				54CDC5D8215BBE23007D205C /* Components.swift in Sources */,
+				54CDC5D8215BBE23007D205C /* SupplementaryViews.swift in Sources */,
 				54B51116216AFE5F0033A6F3 /* Extensions.swift in Sources */,
+				544BC56826CC918200D0A436 /* AdaptiveLayoutTestViewController.swift in Sources */,
 				5442E24A25FC53C100A26F43 /* DebugTextViewController.swift in Sources */,
 				546341AC25C6426500CA0596 /* CustomState.swift in Sources */,
 				5442E23A25FC52CD00A26F43 /* ModalViewController.swift in Sources */,
@@ -379,44 +253,15 @@
 				545DB9F021511E6300CA77B8 /* MainViewController.swift in Sources */,
 				545DB9EE21511E6300CA77B8 /* AppDelegate.swift in Sources */,
 				5442E23025FC525200A26F43 /* TabBarViewController.swift in Sources */,
-				54EAD35B263A75EB006A36EA /* Layouts.swift in Sources */,
+				54EAD35B263A75EB006A36EA /* PanelLayouts.swift in Sources */,
 				54EAD365263A765F006A36EA /* PagePanelController.swift in Sources */,
 				5442E24425FC538200A26F43 /* InspectorViewController.swift in Sources */,
 				5442E22C25FC521F00A26F43 /* SettingsViewController.swift in Sources */,
 			);
 			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;
@@ -463,6 +308,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -524,6 +370,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -560,12 +407,16 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelSample;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.Samples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -579,102 +430,22 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelSample;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.Samples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			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 */
@@ -696,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 */;

Examples/Samples/Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Samples.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Samples.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Examples/Samples/Sources/Base.lproj/Main.storyboard

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RoN-h0-uBD">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RoN-h0-uBD">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -13,7 +15,7 @@
             <objects>
                 <navigationController storyboardIdentifier="RootNavigationController" id="RoN-h0-uBD" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="hNW-5m-Omi">
-                        <rect key="frame" x="0.0" y="44" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="48" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -29,22 +31,22 @@
             <objects>
                 <viewController id="jF4-A0-Eq6" customClass="MainViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Smh-Bd-AAc">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="7IS-PU-x0P">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="M0G-C8-hAO" style="IBUITableViewCellStyleDefault" id="ySY-oA-g81">
-                                        <rect key="frame" x="0.0" y="28" width="600" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ySY-oA-g81" id="sXB-nH-2g2">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="M0G-C8-hAO">
-                                                    <rect key="frame" x="16" y="0.0" width="568" height="43.5"/>
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -85,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.33000000000001"/>
+                        <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">
@@ -123,7 +125,7 @@
                                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="js8-Qv-lUC">
                                                         <rect key="frame" x="262" y="0.5" width="51" height="31"/>
                                                         <connections>
-                                                            <action selector="toggleLargeTitle:" destination="C1X-9Z-TyQ" eventType="valueChanged" id="FJS-Ty-mCY"/>
+                                                            <action selector="toggleLargeTitle:" destination="C1X-9Z-TyQ" eventType="valueChanged" id="CxM-wn-r09"/>
                                                         </connections>
                                                     </switch>
                                                 </subviews>
@@ -140,7 +142,7 @@
                                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="s6b-j9-8Kw">
                                                         <rect key="frame" x="262" y="0.5" width="51" height="31"/>
                                                         <connections>
-                                                            <action selector="toggleTranslucent:" destination="C1X-9Z-TyQ" eventType="valueChanged" id="nL4-3L-9hh"/>
+                                                            <action selector="toggleTranslucent:" destination="C1X-9Z-TyQ" eventType="valueChanged" id="w7r-AV-RqX"/>
                                                         </connections>
                                                     </switch>
                                                 </subviews>
@@ -161,8 +163,8 @@
                     </view>
                     <size key="freeformSize" width="375" height="197.33000000000001"/>
                     <connections>
-                        <outlet property="largeTitlesSwicth" destination="js8-Qv-lUC" id="FOm-6k-ffi"/>
-                        <outlet property="translucentSwicth" destination="s6b-j9-8Kw" id="jmf-WH-bzZ"/>
+                        <outlet property="largeTitlesSwitch" destination="js8-Qv-lUC" id="szl-pU-uRE"/>
+                        <outlet property="translucentSwitch" destination="s6b-j9-8Kw" id="8yK-Du-jkM"/>
                         <outlet property="versionLabel" destination="WmC-Tq-NDN" id="Woh-kK-U0m"/>
                     </connections>
                 </viewController>
@@ -175,11 +177,11 @@
             <objects>
                 <viewController id="RpE-lI-27a" customClass="TabBarContentViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="JER-jz-KSq">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IvG-yp-yzI">
-                                <rect key="frame" x="20" y="0.0" width="39" height="30"/>
+                                <rect key="frame" x="20" y="48" width="39" height="30"/>
                                 <state key="normal" title="Close"/>
                                 <connections>
                                     <action selector="closeWithSender:" destination="RpE-lI-27a" eventType="touchUpInside" id="hj3-Xv-6Gq"/>
@@ -206,11 +208,11 @@
             <objects>
                 <viewController id="pOk-Zm-vD9" customClass="TabBarContentViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="85d-ub-G8k">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NbG-e8-HdI">
-                                <rect key="frame" x="20" y="0.0" width="39" height="30"/>
+                                <rect key="frame" x="20" y="48" width="39" height="30"/>
                                 <state key="normal" title="Close"/>
                                 <connections>
                                     <action selector="closeWithSender:" destination="pOk-Zm-vD9" eventType="touchUpInside" id="111-PD-Pop"/>
@@ -237,11 +239,11 @@
             <objects>
                 <viewController id="lto-Zc-Vtp" customClass="TabBarContentViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ji9-Ez-N7i">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eFN-tN-4Ct">
-                                <rect key="frame" x="20" y="0.0" width="39" height="30"/>
+                                <rect key="frame" x="20" y="48" width="39" height="30"/>
                                 <state key="normal" title="Close"/>
                                 <connections>
                                     <action selector="closeWithSender:" destination="bYI-y3-Rzb" eventType="touchUpInside" id="YL4-GP-ZEZ"/>
@@ -381,22 +383,22 @@
             <objects>
                 <viewController storyboardIdentifier="ModalViewController" id="bYI-y3-Rzb" customClass="ModalViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="qwo-GK-p1U">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="778"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="720"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vut-mK-Y4t" customClass="SafeAreaView" customModule="Samples" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="758" width="375" height="0.0"/>
+                                <rect key="frame" x="0.0" y="720" width="375" height="0.0"/>
                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sbF-Az-7sy">
-                                <rect key="frame" x="20" y="0.0" width="39" height="30"/>
+                                <rect key="frame" x="20" y="48" width="39" height="30"/>
                                 <state key="normal" title="Close"/>
                                 <connections>
                                     <action selector="closeWithSender:" destination="bYI-y3-Rzb" eventType="touchUpInside" id="MSC-ch-YJK"/>
                                 </connections>
                             </button>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="44" translatesAutoresizingMaskIntoConstraints="NO" id="9p4-06-y2T">
-                                <rect key="frame" x="134.5" y="88" width="106" height="326"/>
+                                <rect key="frame" x="134.5" y="136" width="106" height="326"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i9x-x5-n1q">
                                         <rect key="frame" x="0.0" y="0.0" width="80" height="30"/>
@@ -600,7 +602,7 @@
                                 <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">
-                                <rect key="frame" x="319" y="0.0" width="44" height="44"/>
+                                <rect key="frame" x="319" y="48" width="44" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="0jg-5D-A1F"/>
                                     <constraint firstAttribute="width" constant="44" id="1Cq-PA-wgW"/>
@@ -610,7 +612,7 @@
                                 </connections>
                             </button>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="qux-uG-4o2">
-                                <rect key="frame" x="8" y="8" width="148" height="31"/>
+                                <rect key="frame" x="8" y="56" width="148" height="31"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="fitToBounds" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7lq-d3-PKi">
                                         <rect key="frame" x="0.0" y="5.5" width="91" height="20.5"/>
@@ -658,19 +660,19 @@
                         <color key="backgroundColor" red="1" green="0.83234566450000003" blue="0.47320586440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <gestureRecognizers/>
                         <constraints>
-                            <constraint firstItem="noi-1a-5bZ" firstAttribute="top" secondItem="aOK-7l-cA6" secondAttribute="top" id="EQy-cr-F2Y"/>
+                            <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" id="JOL-wC-w74"/>
+                            <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"/>
-                            <constraint firstItem="tP3-oJ-4EB" firstAttribute="top" secondItem="g7l-kO-y7q" secondAttribute="top" constant="88" id="Zhb-Ss-epe"/>
+                            <constraint firstItem="tP3-oJ-4EB" firstAttribute="top" secondItem="g7l-kO-y7q" secondAttribute="top" priority="750" constant="88" id="Zhb-Ss-epe"/>
                             <constraint firstItem="Kva-Z7-0qY" firstAttribute="trailing" secondItem="aOK-7l-cA6" secondAttribute="trailing" id="kkp-Yo-FQW"/>
                             <constraint firstItem="aOK-7l-cA6" firstAttribute="trailing" secondItem="noi-1a-5bZ" secondAttribute="trailing" constant="12" id="lv9-Nf-HNB"/>
                             <constraint firstItem="qux-uG-4o2" firstAttribute="top" secondItem="aOK-7l-cA6" secondAttribute="top" constant="8" id="naa-cf-ZIc"/>
                             <constraint firstItem="Kva-Z7-0qY" firstAttribute="leading" secondItem="aOK-7l-cA6" secondAttribute="leading" id="oVC-i1-TwS"/>
-                            <constraint firstItem="aOK-7l-cA6" firstAttribute="bottom" secondItem="Kva-Z7-0qY" secondAttribute="bottom" id="rW2-mF-5DR"/>
-                            <constraint firstItem="8yw-OC-Ubk" firstAttribute="top" relation="greaterThanOrEqual" secondItem="tP3-oJ-4EB" secondAttribute="bottom" constant="88" id="vKQ-h9-uKt"/>
+                            <constraint firstItem="aOK-7l-cA6" firstAttribute="bottom" secondItem="Kva-Z7-0qY" secondAttribute="bottom" priority="750" id="rW2-mF-5DR"/>
+                            <constraint firstItem="8yw-OC-Ubk" firstAttribute="top" relation="greaterThanOrEqual" secondItem="tP3-oJ-4EB" secondAttribute="bottom" priority="750" constant="88" id="vKQ-h9-uKt"/>
                             <constraint firstItem="qux-uG-4o2" firstAttribute="leading" secondItem="g7l-kO-y7q" secondAttribute="leading" constant="8" id="zXb-R9-bMO"/>
                         </constraints>
                         <connections>
@@ -780,7 +782,57 @@ Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
             </objects>
             <point key="canvasLocation" x="-1" y="734"/>
         </scene>
+        <!--Adaptive Layout Test View Controller-->
+        <scene sceneID="rDI-lU-wEx">
+            <objects>
+                <viewController storyboardIdentifier="AdaptiveLayoutTestViewController" id="5nC-6E-bXf" customClass="AdaptiveLayoutTestViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="jXL-Ss-NCJ">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="778"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="W7W-ET-Wco" customClass="IntrinsicTableView" customModule="Samples" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="778"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="Cell" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Mqi-zK-WA7">
+                                        <rect key="frame" x="0.0" y="50" width="375" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mqi-zK-WA7" id="X46-Fp-6Hr">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="5nC-6E-bXf" id="RHg-aY-HNW"/>
+                                    <outlet property="delegate" destination="5nC-6E-bXf" id="0YX-fh-bB8"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="ZfG-sd-dcQ"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="W7W-ET-Wco" firstAttribute="trailing" secondItem="ZfG-sd-dcQ" secondAttribute="trailing" id="3kP-rg-7c6"/>
+                            <constraint firstAttribute="bottom" secondItem="W7W-ET-Wco" secondAttribute="bottom" id="FdS-X9-D1D"/>
+                            <constraint firstItem="W7W-ET-Wco" firstAttribute="leading" secondItem="ZfG-sd-dcQ" secondAttribute="leading" id="HXa-oO-jag"/>
+                            <constraint firstItem="W7W-ET-Wco" firstAttribute="top" secondItem="jXL-Ss-NCJ" secondAttribute="top" id="gMX-Wq-7G8"/>
+                        </constraints>
+                    </view>
+                    <size key="freeformSize" width="375" height="778"/>
+                    <connections>
+                        <outlet property="tableView" destination="W7W-ET-Wco" id="N54-Fv-2Jq"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="7hJ-XW-9az" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4005" y="734"/>
+        </scene>
     </scenes>
+    <designables>
+        <designable name="noi-1a-5bZ">
+            <size key="intrinsicContentSize" width="30" height="30"/>
+        </designable>
+    </designables>
     <inferredMetricsTieBreakers>
         <segue reference="r1P-2i-NDe"/>
     </inferredMetricsTieBreakers>
@@ -796,7 +848,7 @@ Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
             <color red="0.68627450980392157" green="0.32156862745098042" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemTealColor">
-            <color red="0.35294117647058826" green="0.78431372549019607" blue="0.98039215686274506" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18823529411764706" green="0.69019607843137254" blue="0.7803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

Examples/Samples/Sources/ContentViewControllers/AdaptiveLayoutTestViewController.swift

@@ -0,0 +1,89 @@
+// Copyright 2018-Present Shin Yamamoto. All rights reserved. MIT license.
+
+import UIKit
+import FloatingPanel
+
+final class AdaptiveLayoutTestViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
+    class PanelLayout: FloatingPanelLayout {
+        let position: FloatingPanelPosition = .bottom
+        let initialState: FloatingPanelState = .full
+
+        private unowned var targetGuide: UILayoutGuide
+
+        init(targetGuide: UILayoutGuide) {
+            self.targetGuide = targetGuide
+        }
+
+        var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
+            return [
+                .full: FloatingPanelAdaptiveLayoutAnchor(
+                    absoluteOffset: 0.0,
+                    contentLayout: targetGuide,
+                    referenceGuide: .superview,
+                    contentBoundingGuide: .safeArea
+                ),
+                .half: FloatingPanelAdaptiveLayoutAnchor(
+                    fractionalOffset: 0.5,
+                    contentLayout: targetGuide,
+                    referenceGuide: .superview,
+                    contentBoundingGuide: .safeArea
+                ),
+            ]
+        }
+    }
+
+    @IBOutlet weak var tableView: IntrinsicTableView!
+    private let cellID = "Cell"
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        tableView.rowHeight = UITableView.automaticDimension
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: cellID)
+    }
+
+    // MARK: - UITableViewDataSource
+
+    func numberOfSections(in tableView: UITableView) -> Int {
+        1
+    }
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        50
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: cellID, for: indexPath)
+        cell.textLabel?.text = "\(indexPath.row)"
+        return cell
+    }
+
+    // MARK: - UITableViewDelegate
+
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerView = UIView()
+        headerView.backgroundColor = .orange
+        return headerView
+    }
+
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        44.0
+    }
+
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        40
+    }
+}
+
+class IntrinsicTableView: UITableView {
+
+    override var contentSize:CGSize {
+        didSet {
+            invalidateIntrinsicContentSize()
+        }
+    }
+
+    override var intrinsicContentSize: CGSize {
+        layoutIfNeeded()
+        return CGSize(width: UIView.noIntrinsicMetric, height: contentSize.height)
+    }
+}

Examples/Samples/Sources/ContentViewControllers/DebugTableViewController.swift

@@ -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,39 +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"
     }
 
@@ -135,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 {
@@ -154,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) {
@@ -249,6 +270,9 @@ extension DebugTableViewController: UITableViewDataSource {
 
 extension DebugTableViewController: UITableViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if followsScrollViewBouncing {
+            fpc?.followScrollViewBouncing()
+        }
         print("TableView --- ", scrollView.contentOffset, scrollView.contentInset)
     }
 

Examples/Samples/Sources/ContentViewControllers/ImageViewController.swift

@@ -5,29 +5,25 @@ import FloatingPanel
 
 final class ImageViewController: UIViewController {
     class PanelLayout: FloatingPanelLayout {
-        weak var targetGuide: UILayoutGuide?
-        init(targetGuide: UILayoutGuide?) {
+        private unowned var targetGuide: UILayoutGuide
+        init(targetGuide: UILayoutGuide) {
             self.targetGuide = targetGuide
         }
         let position: FloatingPanelPosition = .bottom
         let initialState: FloatingPanelState = .full
         var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-            if #available(iOS 11.0, *), let targetGuide = targetGuide {
-                return [
-                    .full: FloatingPanelAdaptiveLayoutAnchor(absoluteOffset: 0,
-                                                             contentLayout: targetGuide,
-                                                             referenceGuide: .superview),
-                    .half: FloatingPanelAdaptiveLayoutAnchor(fractionalOffset: 0.5,
-                                                             contentLayout: targetGuide,
-                                                             referenceGuide: .superview)
-                ]
-            } else {
-                return [
-                    .full: FloatingPanelLayoutAnchor(absoluteInset: 500,
-                                                     edge: .bottom,
-                                                     referenceGuide: .superview)
-                ]
-            }
+            return [
+                .full: FloatingPanelAdaptiveLayoutAnchor(
+                    absoluteOffset: 0,
+                    contentLayout: targetGuide,
+                    referenceGuide: .superview
+                ),
+                .half: FloatingPanelAdaptiveLayoutAnchor(
+                    fractionalOffset: 0.5,
+                    contentLayout: targetGuide,
+                    referenceGuide: .superview
+                )
+            ]
         }
     }
 

Examples/Samples/Sources/ContentViewControllers/ModalViewController.swift

@@ -56,7 +56,6 @@ final class ModalViewController: UIViewController, FloatingPanelControllerDelega
     @IBAction func updateLayout(_ sender: Any) {
         isNewlayout = !isNewlayout
         UIView.animate(withDuration: 0.5) {
-            self.fpc.layout = (self.isNewlayout) ? ModalSecondLayout() : FloatingPanelBottomLayout()
             self.fpc.invalidateLayout()
         }
     }
@@ -66,14 +65,12 @@ final class ModalViewController: UIViewController, FloatingPanelControllerDelega
     }
 
     class ModalSecondLayout: FloatingPanelLayout {
-        var position: FloatingPanelPosition = .bottom
-        var initialState: FloatingPanelState { .half }
-        var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-            return [
-                .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
-                .half: FloatingPanelLayoutAnchor(absoluteInset: 262, edge: .top, referenceGuide: .safeArea),
-                .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .safeArea)
-            ]
-        }
+        let position: FloatingPanelPosition = .bottom
+        let initialState: FloatingPanelState = .half
+        let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
+            .half: FloatingPanelLayoutAnchor(absoluteInset: 262, edge: .top, referenceGuide: .safeArea),
+            .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .safeArea)
+        ]
     }
 }

Examples/Samples/Sources/ContentViewControllers/MultiPanelController.swift

@@ -57,11 +57,9 @@ final class MultiPanelController: FloatingPanelController, FloatingPanelControll
     private final class FirstViewLayout: FloatingPanelLayout {
         let position: FloatingPanelPosition = .bottom
         let initialState: FloatingPanelState = .full
-        var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-            return [
-                .full: FloatingPanelLayoutAnchor(absoluteInset: 40.0, edge: .top, referenceGuide: .superview)
-            ]
-        }
+        let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+            .full: FloatingPanelLayoutAnchor(absoluteInset: 40.0, edge: .top, referenceGuide: .superview)
+        ]
     }
 }
 

Examples/Samples/Sources/ContentViewControllers/SettingsViewController.swift

@@ -4,8 +4,8 @@ import UIKit
 import FloatingPanel
 
 final class SettingsViewController: InspectableViewController {
-    @IBOutlet weak var largeTitlesSwicth: UISwitch!
-    @IBOutlet weak var translucentSwicth: UISwitch!
+    @IBOutlet weak var largeTitlesSwitch: UISwitch!
+    @IBOutlet weak var translucentSwitch: UISwitch!
     @IBOutlet weak var versionLabel: UILabel!
 
     override func viewDidLoad() {
@@ -16,12 +16,12 @@ final class SettingsViewController: InspectableViewController {
         super.viewDidLayoutSubviews()
         if #available(iOS 11.0, *) {
             let prefersLargeTitles = navigationController!.navigationBar.prefersLargeTitles
-            largeTitlesSwicth.setOn(prefersLargeTitles, animated: false)
+            largeTitlesSwitch.setOn(prefersLargeTitles, animated: false)
         } else {
-            largeTitlesSwicth.isEnabled = false
+            largeTitlesSwitch.isEnabled = false
         }
         let isTranslucent = navigationController!.navigationBar.isTranslucent
-        translucentSwicth.setOn(isTranslucent, animated: false)
+        translucentSwitch.setOn(isTranslucent, animated: false)
     }
 
     @IBAction func toggleLargeTitle(_ sender: UISwitch) {
@@ -30,7 +30,19 @@ final class SettingsViewController: InspectableViewController {
         }
     }
     @IBAction func toggleTranslucent(_ sender: UISwitch) {
-        navigationController?.navigationBar.isTranslucent = sender.isOn
+        // White non-translucent navigation bar, supports dark appearance
+        if #available(iOS 15, *) {
+            let appearance = UINavigationBarAppearance()
+            if sender.isOn {
+                appearance.configureWithTransparentBackground()
+            } else {
+                appearance.configureWithOpaqueBackground()
+            }
+            navigationController?.navigationBar.standardAppearance = appearance
+            navigationController?.navigationBar.scrollEdgeAppearance = appearance
+        } else {
+            navigationController?.navigationBar.isTranslucent = sender.isOn
+        }
     }
 }
 

Examples/Samples/Sources/ContentViewControllers/TabBarViewController.swift

@@ -195,14 +195,12 @@ class OneTabBarPanelLayout: FloatingPanelLayout {
 }
 
 class TwoTabBarPanelLayout: FloatingPanelLayout {
-    var initialState: FloatingPanelState { .half }
-    var position: FloatingPanelPosition { .bottom }
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
-            .half: FloatingPanelLayoutAnchor(absoluteInset: 261.0, edge: .bottom, referenceGuide: .safeArea)
-        ]
-    }
+    let initialState: FloatingPanelState = .half
+    let position: FloatingPanelPosition = .bottom
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
+        .half: FloatingPanelLayoutAnchor(absoluteInset: 261.0, edge: .bottom, referenceGuide: .safeArea)
+    ]
 }
 
 class TwoTabBarPanelBehavior: FloatingPanelBehavior {

Examples/Samples/Sources/Extensions.swift

@@ -2,6 +2,20 @@
 
 import UIKit
 
+extension UIView {
+    func makeBoundsLayoutGuide() -> UILayoutGuide {
+        let guide = UILayoutGuide()
+        addLayoutGuide(guide)
+        NSLayoutConstraint.activate([
+            guide.topAnchor.constraint(equalTo: topAnchor),
+            guide.leftAnchor.constraint(equalTo: leftAnchor),
+            guide.bottomAnchor.constraint(equalTo: bottomAnchor),
+            guide.rightAnchor.constraint(equalTo: rightAnchor),
+        ])
+        return guide
+    }
+}
+
 protocol LayoutGuideProvider {
     var topAnchor: NSLayoutYAxisAnchor { get }
     var bottomAnchor: NSLayoutYAxisAnchor { get }

Examples/Samples/Sources/MainViewController.swift

@@ -6,9 +6,10 @@ import FloatingPanel
 final class MainViewController: UIViewController {
     @IBOutlet weak var tableView: UITableView!
     private var observations: [NSKeyValueObservation] = []
-
     private lazy var useCaseController = UseCaseController(mainVC: self)
+}
 
+extension MainViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         tableView.dataSource = self
@@ -21,8 +22,6 @@ final class MainViewController: UIViewController {
             navigationItem.searchController = searchController
             navigationItem.hidesSearchBarWhenScrolling = false
             navigationItem.largeTitleDisplayMode = .automatic
-        } else {
-            // Fallback on earlier versions
         }
         var insets = UIEdgeInsets.zero
         insets.bottom += 69.0
@@ -47,8 +46,9 @@ final class MainViewController: UIViewController {
         super.viewWillDisappear(animated)
         observations.removeAll()
     }
+}
 
-    // MARK:- Actions
+extension MainViewController {
     @IBAction func showDebugMenu(_ sender: UIBarButtonItem) {
         useCaseController.setUpSettingsPanel(for: self)
     }

Examples/Samples/Sources/PanelLayouts.swift

@@ -23,14 +23,11 @@ extension MainViewController: FloatingPanelLayout {
 class TopPositionedPanelLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .top
     let initialState: FloatingPanelState = .full
-
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 88.0, edge: .bottom, referenceGuide: .safeArea),
-            .half: FloatingPanelLayoutAnchor(absoluteInset: 216.0, edge: .top, referenceGuide: .safeArea),
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .top, referenceGuide: .safeArea)
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 88.0, edge: .bottom, referenceGuide: .safeArea),
+        .half: FloatingPanelLayoutAnchor(absoluteInset: 216.0, edge: .top, referenceGuide: .safeArea),
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .top, referenceGuide: .safeArea)
+    ]
 }
 
 class IntrinsicPanelLayout: FloatingPanelBottomLayout {
@@ -45,13 +42,10 @@ class IntrinsicPanelLayout: FloatingPanelBottomLayout {
 class RemovablePanelLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .half
-
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
             .full: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
             .half: FloatingPanelLayoutAnchor(absoluteInset: 130.0, edge: .bottom, referenceGuide: .safeArea)
-        ]
-    }
+    ]
 
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.3
@@ -61,13 +55,10 @@ class RemovablePanelLayout: FloatingPanelLayout {
 class RemovablePanelLandscapeLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .full
-
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
-            .half: FloatingPanelLayoutAnchor(absoluteInset: 216.0, edge: .bottom, referenceGuide: .safeArea)
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
+        .half: FloatingPanelLayoutAnchor(absoluteInset: 216.0, edge: .bottom, referenceGuide: .safeArea)
+    ]
 
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.3
@@ -77,12 +68,9 @@ class RemovablePanelLandscapeLayout: FloatingPanelLayout {
 class ModalPanelLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .full
-
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0.0, referenceGuide: .safeArea),
+    ]
 
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.3

Examples/Samples/Sources/SupplementaryViews.swift

@@ -4,6 +4,9 @@ import UIKit
 
 @IBDesignable
 final class CloseButton: UIButton {
+    override var isHighlighted: Bool { didSet { setNeedsDisplay() } }
+    override var isSelected: Bool { didSet { setNeedsDisplay() } }
+
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         render()
@@ -17,14 +20,11 @@ final class CloseButton: UIButton {
         self.backgroundColor = .clear
     }
 
-    func p(_ p: CGFloat) -> CGFloat {
-        return p * (2.0 / 3.0)
-    }
-
-    override var isHighlighted: Bool { didSet { setNeedsDisplay() } }
-    override var isSelected: Bool { didSet { setNeedsDisplay() } }
-
     override func draw(_ rect: CGRect) {
+        func p(_ p: CGFloat) -> CGFloat {
+            return p * (2.0 / 3.0)
+        }
+
         guard let context = UIGraphicsGetCurrentContext() else { return }
 
         context.setLineWidth(p(1.0))

Examples/Samples/Sources/UseCases/PagePanelController.swift

@@ -4,14 +4,10 @@ import UIKit
 import FloatingPanel
 
 final class PagePanelController: NSObject {
-    lazy var pages = [UIColor.blue, .red, .green].compactMap({ (color) -> UIViewController in
-        let page = FloatingPanelController(delegate: self)
-        page.view.backgroundColor = color
-        page.panGestureRecognizer.delegateProxy = self
-        page.show()
-        return page
-    })
+    var pages: [UIViewController] = []
+}
 
+extension PagePanelController {
     func makePageViewControllerForContent() -> UIPageViewController {
         pages = [DebugTableViewController(), DebugTableViewController(), DebugTableViewController()]
         let pageVC = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [:])
@@ -22,6 +18,13 @@ final class PagePanelController: NSObject {
     }
 
     func makePageViewController(for vc: MainViewController) -> UIPageViewController {
+        pages = [UIColor.blue, .red, .green].compactMap({ (color) -> UIViewController in
+            let page = FloatingPanelController(delegate: self)
+            page.view.backgroundColor = color
+            page.panGestureRecognizer.delegateProxy = self
+            page.show()
+            return page
+        })
         let pageVC = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [:])
         let closeButton = UIButton(type: .custom)
         pageVC.view.addSubview(closeButton)

Examples/Samples/Sources/UseCases/UseCase.swift

@@ -1,6 +1,6 @@
 // Copyright 2018-Present Shin Yamamoto. All rights reserved. MIT license.
 
-import Foundation
+import UIKit
 
 enum UseCase: Int, CaseIterable {
     case trackingTableView
@@ -23,7 +23,9 @@ enum UseCase: Int, CaseIterable {
     case showAdaptivePanel
     case showAdaptivePanelWithCustomGuide
     case showCustomStatePanel
+}
 
+extension UseCase {
     var name: String {
         switch self {
         case .trackingTableView: return "Scroll tracking(TableView)"
@@ -48,31 +50,46 @@ enum UseCase: Int, CaseIterable {
         case .showCustomStatePanel: return "Show Panel with Custom state"
         }
     }
+}
 
-    var storyboardID: String? {
+extension UseCase {
+    private enum Content {
+        case storyboard(String)
+        case viewController(UIViewController)
+    }
+
+    private var content: Content {
         switch self {
-        case .trackingTableView: return nil
-        case .trackingTextView: return "ConsoleViewController" // Storyboard only
-        case .showDetail: return String(describing: DetailViewController.self)
-        case .showModal: return String(describing: ModalViewController.self)
-        case .showMultiPanelModal: return nil
-        case .showPanelInSheetModal: return nil
-        case .showPanelModal: return nil
-        case .showTabBar: return String(describing: TabBarViewController.self)
-        case .showPageView: return nil
-        case .showPageContentView: return nil
-        case .showNestedScrollView: return String(describing: NestedScrollViewController.self)
-        case .showRemovablePanel: return String(describing: DetailViewController.self)
-        case .showIntrinsicView: return "IntrinsicViewController" // Storyboard only
-        case .showContentInset: return nil
-        case .showContainerMargins: return nil
-        case .showNavigationController: return "RootNavigationController" // Storyboard only
-        case .showTopPositionedPanel: return nil
-        case .showAdaptivePanel,
-             .showAdaptivePanelWithCustomGuide:
-            return String(describing: ImageViewController.self)
-        case .showCustomStatePanel:
-            return nil
+        case .trackingTableView: return .viewController(DebugTableViewController())
+        case .trackingTextView: return .storyboard("ConsoleViewController") // Storyboard only
+        case .showDetail: return .storyboard(String(describing: DetailViewController.self))
+        case .showModal: return .storyboard(String(describing: ModalViewController.self))
+        case .showMultiPanelModal: return .viewController(DebugTableViewController())
+        case .showPanelInSheetModal: return .viewController(DebugTableViewController())
+        case .showPanelModal: return .viewController(DebugTableViewController())
+        case .showTabBar: return .storyboard(String(describing: TabBarViewController.self))
+        case .showPageView: return .viewController(DebugTableViewController())
+        case .showPageContentView: return .viewController(DebugTableViewController())
+        case .showNestedScrollView: return .storyboard(String(describing: NestedScrollViewController.self))
+        case .showRemovablePanel: return .storyboard(String(describing: DetailViewController.self))
+        case .showIntrinsicView: return .storyboard("IntrinsicViewController") // Storyboard only
+        case .showContentInset: return .viewController(DebugTableViewController())
+        case .showContainerMargins: return .viewController(DebugTableViewController())
+        case .showNavigationController: return .storyboard("RootNavigationController") // Storyboard only
+        case .showTopPositionedPanel: return .viewController(DebugTableViewController())
+        case .showAdaptivePanel: return .storyboard(String(describing: ImageViewController.self))
+        case .showAdaptivePanelWithCustomGuide: return .storyboard(String(describing: AdaptiveLayoutTestViewController.self))
+        case .showCustomStatePanel: return .viewController(DebugTableViewController())
+        }
+    }
+
+    func makeContentViewController(with storyboard: UIStoryboard) -> UIViewController {
+        switch content {
+        case .storyboard(let id):
+            return storyboard.instantiateViewController(withIdentifier: id)
+        case .viewController(let vc):
+            vc.loadViewIfNeeded()
+            return vc
         }
     }
 }

Examples/Samples/Sources/UseCases/UseCaseController.swift

@@ -5,48 +5,83 @@ import FloatingPanel
 
 final class UseCaseController: NSObject {
     unowned let mainVC: MainViewController
-    private(set) var useCase: UseCase = .trackingTableView
+    private(set) var useCase: UseCase
 
-    fileprivate var mainPanelVC: FloatingPanelController!
+    private var mainPanelVC: FloatingPanelController!
     private var detailPanelVC: FloatingPanelController!
     private var settingsPanelVC: FloatingPanelController!
-
     private lazy var pagePanelController = PagePanelController()
 
-    private var mainPanelObserves: [NSKeyValueObservation] = []
-
     init(mainVC: MainViewController) {
         self.mainVC = mainVC
+        self.useCase = .trackingTableView
     }
+}
 
+extension UseCaseController {
     func set(useCase: UseCase) {
         self.useCase = useCase
 
         let contentVC = useCase.makeContentViewController(with: mainVC.storyboard!)
 
-        detailPanelVC?.removePanelFromParent(animated: true, completion: nil)
-        detailPanelVC = nil
+        if let fpc = detailPanelVC {
+            fpc.removePanelFromParent(animated: true, completion: nil)
+            self.detailPanelVC = nil
+        }
 
         switch useCase {
+        case .trackingTableView:
+            let fpc = FloatingPanelController()
+            fpc.delegate = self
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
+
+            let tapGesture = UITapGestureRecognizer(target: self, action: #selector(UseCaseController.handleSurface(tapGesture:)))
+            tapGesture.cancelsTouchesInView = false
+            tapGesture.numberOfTapsRequired = 2
+            // Prevents a delay to response a tap in menus of DebugTableViewController.
+            tapGesture.delaysTouchesEnded = false
+            fpc.surfaceView.addGestureRecognizer(tapGesture)
+
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            addMain(panel: fpc)
+
+        case .trackingTextView:
+            let fpc = FloatingPanelController()
+            fpc.delegate = self
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            addMain(panel: fpc)
+
         case .showDetail:
-            detailPanelVC?.removePanelFromParent(animated: false)
-
             // Initialize FloatingPanelController
-            detailPanelVC = FloatingPanelController()
-            detailPanelVC.delegate = self
-
-            let appearance = SurfaceAppearance()
-            appearance.cornerRadius = 6.0
-            detailPanelVC.surfaceView.appearance = appearance
-
+            let fpc = FloatingPanelController()
+            fpc.delegate = self
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
             // Set a content view controller
-            detailPanelVC.set(contentViewController: contentVC)
-
-            detailPanelVC.contentMode = .fitToBounds
+            fpc.set(contentViewController: contentVC)
+            fpc.contentMode = .fitToBounds
             (contentVC as? DetailViewController)?.intrinsicHeightConstraint.isActive = false
 
+            detailPanelVC = fpc
             //  Add FloatingPanel to self.view
-            detailPanelVC.addPanel(toParent: mainVC, animated: true)
+            fpc.addPanel(toParent: mainVC, animated: true)
+
         case .showModal, .showTabBar:
             let modalVC = contentVC
             modalVC.modalPresentationStyle = .fullScreen
@@ -57,8 +92,50 @@ final class UseCaseController: NSObject {
             mainVC.present(pageVC, animated: true, completion: nil)
 
         case .showPageContentView:
+            let fpc = FloatingPanelController()
+            fpc.delegate = self
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
             let pageVC = pagePanelController.makePageViewControllerForContent()
-            self.addMainPanel(with: pageVC)
+            if let page = (fpc.contentViewController as? UIPageViewController)?.viewControllers?.first {
+                fpc.track(scrollView: (page as! DebugTableViewController).tableView)
+            }
+            fpc.set(contentViewController: pageVC)
+            addMain(panel: fpc)
+
+        case .showRemovablePanel, .showIntrinsicView:
+            let fpc = FloatingPanelController()
+            fpc.isRemovalInteractionEnabled = true
+            fpc.backdropView.dismissalTapGestureRecognizer.isEnabled = true
+            fpc.delegate = self
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            addMain(panel: fpc)
+
+        case .showNestedScrollView:
+            let fpc = FloatingPanelController()
+            fpc.panGestureRecognizer.delegateProxy = self
+            fpc.delegate = self
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            addMain(panel: fpc)
+
         case .showPanelModal:
             let fpc = FloatingPanelController()
             let contentVC = mainVC.storyboard!.instantiateViewController(withIdentifier: "DetailViewController")
@@ -96,6 +173,7 @@ final class UseCaseController: NSObject {
             mvc.view.backgroundColor = UIColor(displayP3Red: 2/255, green: 184/255, blue: 117/255, alpha: 1.0)
             fpc.addPanel(toParent: mvc)
             mainVC.present(mvc, animated: true, completion: nil)
+
         case .showContentInset:
             let contentViewController = UIViewController()
             contentViewController.view.backgroundColor = .green
@@ -110,7 +188,6 @@ final class UseCaseController: NSObject {
 
         case .showContainerMargins:
             let fpc = FloatingPanelController()
-
             let appearance = SurfaceAppearance()
             appearance.cornerRadius = 38.5
             fpc.surfaceView.appearance = appearance
@@ -126,81 +203,61 @@ final class UseCaseController: NSObject {
             fpc.delegate = self
             fpc.isRemovalInteractionEnabled = true
             mainVC.present(fpc, animated: true, completion: nil)
-        default:
-            self.addMainPanel(with: contentVC)
-        }
-    }
 
-    private func addMainPanel(with contentVC: UIViewController) {
-        mainPanelObserves.removeAll()
+        case .showNavigationController:
+            let fpc = FloatingPanelController()
+            fpc.contentInsetAdjustmentBehavior = .never
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            addMain(panel: fpc)
 
-        let oldMainPanelVC = mainPanelVC
+        case .showTopPositionedPanel: // For debug
+            let fpc = FloatingPanelController(delegate: self)
+            let contentVC = UIViewController()
+            contentVC.view.backgroundColor = .red
+            fpc.set(contentViewController: contentVC)
+            addMain(panel: fpc)
 
-        mainPanelVC = FloatingPanelController()
-        mainPanelVC.delegate = self
-        mainPanelVC.contentInsetAdjustmentBehavior = .always
-
-        let appearance = SurfaceAppearance()
-        appearance.cornerRadius = 6.0
-        mainPanelVC.surfaceView.appearance = appearance
-
-        set(contentViewController: contentVC)
-
-        useCase.setUpInteraction(for: self)
-
-        //  Add FloatingPanel to self.view
-        if let oldMainPanelVC = oldMainPanelVC {
-            oldMainPanelVC.removePanelFromParent(animated: true, completion: {
-                self.mainPanelVC.addPanel(toParent: self.mainVC, animated: true)
-            })
-        } else {
-            mainPanelVC.addPanel(toParent: mainVC, animated: true)
-        }
-    }
-
-    private func set(contentViewController contentVC: UIViewController) {
-        mainPanelVC.set(contentViewController: contentVC)
-        // Track a scroll view
-        switch contentVC {
-        case let consoleVC as DebugTextViewController:
-            mainPanelVC.track(scrollView: consoleVC.textView)
-
-        case let contentVC as DebugTableViewController:
-            let ob = contentVC.tableView.observe(\.isEditing) { (tableView, _) in
-                self.mainPanelVC.panGestureRecognizer.isEnabled = !tableView.isEditing
-            }
-            mainPanelObserves.append(ob)
-            mainPanelVC.track(scrollView: contentVC.tableView)
-        case let contentVC as NestedScrollViewController:
-            mainPanelVC.track(scrollView: contentVC.scrollView)
-        case let navVC as UINavigationController:
-            if let rootVC = (navVC.topViewController as? MainViewController) {
-                rootVC.loadViewIfNeeded()
-                mainPanelVC.track(scrollView: rootVC.tableView)
-            }
-        case let contentVC as ImageViewController:
-            if #available(iOS 11.0, *) {
+        case .showAdaptivePanel:
+            let fpc = FloatingPanelController()
+            fpc.isRemovalInteractionEnabled = true
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            if case let contentVC as ImageViewController = contentVC {
                 let mode: ImageViewController.Mode = (useCase == .showAdaptivePanelWithCustomGuide) ? .withHeaderFooter : .onlyImage
                 let layoutGuide = contentVC.layoutGuideFor(mode: mode)
-                mainPanelVC.layout = ImageViewController.PanelLayout(targetGuide: layoutGuide)
-            } else {
-                mainPanelVC.layout = ImageViewController.PanelLayout(targetGuide: nil)
+                fpc.layout = ImageViewController.PanelLayout(targetGuide: layoutGuide)
             }
-            mainPanelVC.delegate = nil
-            mainPanelVC.isRemovalInteractionEnabled = true
-            mainPanelVC.track(scrollView: contentVC.scrollView)
-        default:
-            break
-        }
-    }
+            addMain(panel: fpc)
 
-    @objc
-    fileprivate func handleSurface(tapGesture: UITapGestureRecognizer) {
-        switch mainPanelVC.state {
-        case .full:
-            mainPanelVC.move(to: .half, animated: true)
-        default:
-            mainPanelVC.move(to: .full, animated: true)
+        case .showAdaptivePanelWithCustomGuide:
+            let fpc = FloatingPanelController()
+            fpc.isRemovalInteractionEnabled = true
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
+
+
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            fpc.layout = AdaptiveLayoutTestViewController.PanelLayout(targetGuide: contentVC.view.makeBoundsLayoutGuide())
+            addMain(panel: fpc)
+
+        case .showCustomStatePanel:
+            let fpc = FloatingPanelController()
+            fpc.delegate = self
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.surfaceView.appearance = {
+                let appearance = SurfaceAppearance()
+                appearance.cornerRadius = 6.0
+                return appearance
+            }()
+            fpc.set(contentViewController: contentVC)
+            fpc.ext_trackScrollView(in: contentVC)
+            addMain(panel: fpc)
         }
     }
 
@@ -225,6 +282,28 @@ final class UseCaseController: NSObject {
         //  Add FloatingPanel to self.view
         settingsPanelVC.addPanel(toParent: mainVC, animated: true)
     }
+
+    private func addMain(panel fpc: FloatingPanelController) {
+        let oldMainPanelVC = mainPanelVC
+        mainPanelVC = fpc
+        if let oldMainPanelVC = oldMainPanelVC {
+            oldMainPanelVC.removePanelFromParent(animated: true, completion: {
+                self.mainPanelVC.addPanel(toParent: self.mainVC, animated: true)
+            })
+        } else {
+            mainPanelVC.addPanel(toParent: mainVC, animated: true)
+        }
+    }
+
+    @objc
+    private func handleSurface(tapGesture: UITapGestureRecognizer) {
+        switch mainPanelVC.state {
+        case .full:
+            mainPanelVC.move(to: .half, animated: true)
+        default:
+            mainPanelVC.move(to: .full, animated: true)
+        }
+    }
 }
 
 extension UseCaseController: FloatingPanelControllerDelegate {
@@ -274,54 +353,45 @@ extension UseCaseController: FloatingPanelControllerDelegate {
 
 extension UseCaseController: UIGestureRecognizerDelegate {
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        switch useCase {
-        case .showNestedScrollView:
+        if case .showNestedScrollView = useCase {
             return true
-        default:
+        } else {
             return false
         }
     }
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return false
+         false
     }
 }
 
-extension UseCase {
-    func makeContentViewController(with storyboard: UIStoryboard) -> UIViewController {
-        guard let storyboardID = self.storyboardID else { return DebugTableViewController() }
-        return storyboard.instantiateViewController(withIdentifier: storyboardID)
-    }
+private extension FloatingPanelController {
+    func ext_trackScrollView(in contentVC: UIViewController) {
+        switch contentVC {
+        case let consoleVC as DebugTextViewController:
+            track(scrollView: consoleVC.textView)
 
-    func setUpInteraction(for useCaseController: UseCaseController) {
-        let mainVC = useCaseController.mainVC
-        let mainPanelVC = useCaseController.mainPanelVC!
-
-        // Enable tap-to-hide and removal interaction
-        switch self {
-        case .trackingTableView:
-            let tapGesture = UITapGestureRecognizer(target: useCaseController, action: #selector(UseCaseController.handleSurface(tapGesture:)))
-            tapGesture.cancelsTouchesInView = false
-            tapGesture.numberOfTapsRequired = 2
-            // Prevents a delay to response a tap in menus of DebugTableViewController.
-            tapGesture.delaysTouchesEnded = false
-            mainPanelVC.surfaceView.addGestureRecognizer(tapGesture)
-        case .showNestedScrollView:
-            mainPanelVC.panGestureRecognizer.delegateProxy = useCaseController
-        case .showPageContentView:
-            if let page = (mainPanelVC.contentViewController as? UIPageViewController)?.viewControllers?.first {
-                mainPanelVC.track(scrollView: (page as! DebugTableViewController).tableView)
+        case let contentVC as DebugTableViewController:
+            let ob = contentVC.tableView.observe(\.isEditing) { [weak self] (tableView, _) in
+                self?.panGestureRecognizer.isEnabled = !tableView.isEditing
             }
-        case .showRemovablePanel, .showIntrinsicView:
-            mainPanelVC.isRemovalInteractionEnabled = true
-            mainPanelVC.backdropView.dismissalTapGestureRecognizer.isEnabled = true
-        case .showNavigationController:
-            mainPanelVC.contentInsetAdjustmentBehavior = .never
-        case .showTopPositionedPanel: // For debug
-            let contentVC = UIViewController()
-            contentVC.view.backgroundColor = .red
-            mainPanelVC.set(contentViewController: contentVC)
-            mainPanelVC.addPanel(toParent: mainVC, animated: true)
-            return
+            contentVC.kvoObservers.append(ob)
+            track(scrollView: contentVC.tableView)
+
+        case let contentVC as NestedScrollViewController:
+            track(scrollView: contentVC.scrollView)
+
+        case let navVC as UINavigationController:
+            if let rootVC = (navVC.topViewController as? MainViewController) {
+                rootVC.loadViewIfNeeded()
+                track(scrollView: rootVC.tableView)
+            }
+
+        case let contentVC as ImageViewController:
+            track(scrollView: contentVC.scrollView)
+
+        case let contentVC as AdaptiveLayoutTestViewController:
+            track(scrollView: contentVC.tableView)
+
         default:
             break
         }

Examples/Samples/Tests/Info.plist

@@ -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>

Examples/Samples/Tests/SampleTests.swift

@@ -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.
-        }
-    }
-
-}

Examples/Samples/UITests/Info.plist

@@ -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>

Examples/Samples/UITests/SampleUITests.swift

@@ -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.
-    }
-
-}

Examples/SamplesObjC/SamplesObjC.xcodeproj/project.pbxproj

@@ -8,13 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		545BA70621BA3214007F7846 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 545BA70521BA3214007F7846 /* AppDelegate.m */; };
-		545BA70921BA3214007F7846 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 545BA70821BA3214007F7846 /* ViewController.m */; };
+		545BA70921BA3214007F7846 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 545BA70821BA3214007F7846 /* MainViewController.m */; };
 		545BA70C21BA3214007F7846 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 545BA70A21BA3214007F7846 /* Main.storyboard */; };
 		545BA70E21BA3217007F7846 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 545BA70D21BA3217007F7846 /* Assets.xcassets */; };
 		545BA71121BA3217007F7846 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 545BA70F21BA3217007F7846 /* LaunchScreen.storyboard */; };
 		545BA71421BA3217007F7846 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 545BA71321BA3217007F7846 /* main.m */; };
 		545BA72621BA3BAF007F7846 /* FloatingPanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 545BA72521BA3BAF007F7846 /* FloatingPanel.framework */; };
 		545BA72721BA3BAF007F7846 /* FloatingPanel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 545BA72521BA3BAF007F7846 /* FloatingPanel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		5D82A6B028D18447006A44BA /* libswiftCoreGraphics.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D82A6AF28D18443006A44BA /* libswiftCoreGraphics.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -35,8 +36,8 @@
 		545BA70121BA3214007F7846 /* SamplesObjC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SamplesObjC.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		545BA70421BA3214007F7846 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		545BA70521BA3214007F7846 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		545BA70721BA3214007F7846 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		545BA70821BA3214007F7846 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		545BA70721BA3214007F7846 /* MainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
+		545BA70821BA3214007F7846 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
 		545BA70B21BA3214007F7846 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		545BA70D21BA3217007F7846 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		545BA71021BA3217007F7846 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -44,6 +45,7 @@
 		545BA71321BA3217007F7846 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		545BA72221BA3867007F7846 /* SamplesObjC-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SamplesObjC-Bridging-Header.h"; sourceTree = "<group>"; };
 		545BA72521BA3BAF007F7846 /* FloatingPanel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FloatingPanel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		5D82A6AF28D18443006A44BA /* libswiftCoreGraphics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreGraphics.tbd; path = usr/lib/swift/libswiftCoreGraphics.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -51,6 +53,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5D82A6B028D18447006A44BA /* libswiftCoreGraphics.tbd in Frameworks */,
 				545BA72621BA3BAF007F7846 /* FloatingPanel.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -64,6 +67,7 @@
 				545BA72521BA3BAF007F7846 /* FloatingPanel.framework */,
 				545BA70321BA3214007F7846 /* SamplesObjC */,
 				545BA70221BA3214007F7846 /* Products */,
+				5D82A6AE28D18443006A44BA /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -78,13 +82,13 @@
 		545BA70321BA3214007F7846 /* SamplesObjC */ = {
 			isa = PBXGroup;
 			children = (
-				545BA70421BA3214007F7846 /* AppDelegate.h */,
-				545BA70521BA3214007F7846 /* AppDelegate.m */,
-				545BA70721BA3214007F7846 /* ViewController.h */,
-				545BA70821BA3214007F7846 /* ViewController.m */,
-				545BA70A21BA3214007F7846 /* Main.storyboard */,
 				545BA70D21BA3217007F7846 /* Assets.xcassets */,
 				545BA70F21BA3217007F7846 /* LaunchScreen.storyboard */,
+				545BA70A21BA3214007F7846 /* Main.storyboard */,
+				545BA70421BA3214007F7846 /* AppDelegate.h */,
+				545BA70521BA3214007F7846 /* AppDelegate.m */,
+				545BA70721BA3214007F7846 /* MainViewController.h */,
+				545BA70821BA3214007F7846 /* MainViewController.m */,
 				545BA71221BA3217007F7846 /* Info.plist */,
 				545BA71321BA3217007F7846 /* main.m */,
 				545BA72221BA3867007F7846 /* SamplesObjC-Bridging-Header.h */,
@@ -92,6 +96,14 @@
 			path = SamplesObjC;
 			sourceTree = "<group>";
 		};
+		5D82A6AE28D18443006A44BA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5D82A6AF28D18443006A44BA /* libswiftCoreGraphics.tbd */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -119,7 +131,7 @@
 		545BA6F921BA3214007F7846 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1110;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "Shin Yamamoto";
 				TargetAttributes = {
 					545BA70021BA3214007F7846 = {
@@ -164,7 +176,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				545BA70921BA3214007F7846 /* ViewController.m in Sources */,
+				545BA70921BA3214007F7846 /* MainViewController.m in Sources */,
 				545BA71421BA3217007F7846 /* main.m in Sources */,
 				545BA70621BA3214007F7846 /* AppDelegate.m in Sources */,
 			);
@@ -218,6 +230,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -277,6 +290,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -318,7 +332,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.SamplesObjC;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.SamplesObjC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SamplesObjC/SamplesObjC-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -340,7 +358,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.SamplesObjC;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.SamplesObjC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SamplesObjC/SamplesObjC-Bridging-Header.h";
 				SWIFT_VERSION = 4.2;

Examples/SamplesObjC/SamplesObjC.xcodeproj/xcshareddata/xcschemes/SamplesObjC.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Examples/SamplesObjC/SamplesObjC/Base.lproj/Main.storyboard

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
         <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-->
+        <!--Main View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="MainViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

Examples/SamplesObjC/SamplesObjC/MainViewController.h

@@ -3,7 +3,7 @@
 #import <UIKit/UIKit.h>
 @import FloatingPanel;
 
-@interface ViewController : UIViewController
+@interface MainViewController : UIViewController
 @end
 
 @interface MyFloatingPanelLayout : NSObject <FloatingPanelLayout>

Examples/SamplesObjC/SamplesObjC/MainViewController.m

@@ -1,6 +1,6 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
 
-#import "ViewController.h"
+#import "MainViewController.h"
 @import FloatingPanel;
 
 // Defining a custom FloatingPanelState
@@ -19,17 +19,16 @@ static FloatingPanelState *_lastQuart;
 }
 @end
 
-@interface ViewController()<FloatingPanelControllerDelegate>
+@interface MainViewController()<FloatingPanelControllerDelegate>
 @end
 
-@implementation ViewController
+@implementation MainViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
 
     FloatingPanelController *fpc = [[FloatingPanelController alloc] init];
     [fpc setContentViewController:nil];
-    [fpc trackScrollView:nil];
     [fpc setDelegate:self];
 
     [fpc setLayout: [MyFloatingPanelLayout new]];

Examples/Stocks/Stocks.xcodeproj/project.pbxproj

@@ -8,12 +8,13 @@
 
 /* Begin PBXBuildFile section */
 		548DF95421705BE00041922A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 548DF95321705BE00041922A /* AppDelegate.swift */; };
-		548DF95621705BE00041922A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 548DF95521705BE00041922A /* ViewController.swift */; };
+		548DF95621705BE00041922A /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 548DF95521705BE00041922A /* MainViewController.swift */; };
 		548DF95921705BE00041922A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 548DF95721705BE00041922A /* Main.storyboard */; };
 		548DF95B21705BE10041922A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 548DF95A21705BE10041922A /* Assets.xcassets */; };
 		548DF95E21705BE10041922A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 548DF95C21705BE10041922A /* LaunchScreen.storyboard */; };
 		549D23CF233C77CF008EF4D7 /* FloatingPanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23CE233C77CF008EF4D7 /* FloatingPanel.framework */; };
 		549D23D0233C77CF008EF4D7 /* FloatingPanel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23CE233C77CF008EF4D7 /* FloatingPanel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		5D82A6AA28D18432006A44BA /* libswiftCoreGraphics.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D82A6A928D1842B006A44BA /* libswiftCoreGraphics.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -33,12 +34,13 @@
 /* Begin PBXFileReference section */
 		548DF95021705BE00041922A /* Stocks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Stocks.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		548DF95321705BE00041922A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		548DF95521705BE00041922A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		548DF95521705BE00041922A /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		548DF95821705BE00041922A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		548DF95A21705BE10041922A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		548DF95D21705BE10041922A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		548DF95F21705BE10041922A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		549D23CE233C77CF008EF4D7 /* FloatingPanel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FloatingPanel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		5D82A6A928D1842B006A44BA /* libswiftCoreGraphics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreGraphics.tbd; path = usr/lib/swift/libswiftCoreGraphics.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -46,6 +48,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5D82A6AA28D18432006A44BA /* libswiftCoreGraphics.tbd in Frameworks */,
 				549D23CF233C77CF008EF4D7 /* FloatingPanel.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -59,6 +62,7 @@
 				549D23CE233C77CF008EF4D7 /* FloatingPanel.framework */,
 				548DF95221705BE00041922A /* Stocks */,
 				548DF95121705BE00041922A /* Products */,
+				5D82A6A828D1842A006A44BA /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -73,16 +77,24 @@
 		548DF95221705BE00041922A /* Stocks */ = {
 			isa = PBXGroup;
 			children = (
-				548DF95321705BE00041922A /* AppDelegate.swift */,
-				548DF95521705BE00041922A /* ViewController.swift */,
-				548DF95721705BE00041922A /* Main.storyboard */,
 				548DF95A21705BE10041922A /* Assets.xcassets */,
 				548DF95C21705BE10041922A /* LaunchScreen.storyboard */,
+				548DF95721705BE00041922A /* Main.storyboard */,
+				548DF95321705BE00041922A /* AppDelegate.swift */,
+				548DF95521705BE00041922A /* MainViewController.swift */,
 				548DF95F21705BE10041922A /* Info.plist */,
 			);
 			path = Stocks;
 			sourceTree = "<group>";
 		};
+		5D82A6A828D1842A006A44BA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5D82A6A928D1842B006A44BA /* libswiftCoreGraphics.tbd */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -111,7 +123,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = scenee;
 				TargetAttributes = {
 					548DF94F21705BE00041922A = {
@@ -155,7 +167,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				548DF95621705BE00041922A /* ViewController.swift in Sources */,
+				548DF95621705BE00041922A /* MainViewController.swift in Sources */,
 				548DF95421705BE00041922A /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -208,6 +220,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -269,6 +282,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -310,7 +324,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.Stocks;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.Stocks;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -329,7 +347,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.Stocks;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SDKROOT)/usr/lib/swift",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = example.Stocks;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

Examples/Stocks/Stocks.xcodeproj/xcshareddata/xcschemes/Stocks.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Stocks.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Stocks.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Examples/Stocks/Stocks/Base.lproj/Main.storyboard

@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
         <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-->
+        <!--Main View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Stocks" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="MainViewController" customModule="Stocks" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uop-sw-I6p">
-                                <rect key="frame" x="0.0" y="85" width="375" height="537.5"/>
+                                <rect key="frame" x="0.0" y="65" width="600" height="490.5"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="625" image="stocks_list" translatesAutoresizingMaskIntoConstraints="NO" id="XJR-iK-fem">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="625"/>
@@ -34,10 +30,10 @@
                                 </constraints>
                             </scrollView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dFl-81-6ok">
-                                <rect key="frame" x="0.0" y="622.5" width="375" height="44.5"/>
+                                <rect key="frame" x="0.0" y="555.5" width="600" height="44.5"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="yahoo_bottom_bar" translatesAutoresizingMaskIntoConstraints="NO" id="NKr-gS-mpx">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="44.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="600" height="44.5"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44.5" id="B5t-ZF-qUj"/>
@@ -53,10 +49,10 @@
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="-8" translatesAutoresizingMaskIntoConstraints="NO" id="f7r-Al-pIN">
-                                <rect key="frame" x="16" y="20" width="153.5" height="57"/>
+                                <rect key="frame" x="16" y="0.0" width="153.5" height="57"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="STOCKS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PCG-Wl-fXa">
-                                        <rect key="frame" x="0.0" y="0.0" width="111.5" height="32.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="111" height="32.5"/>
                                         <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="27"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -70,6 +66,7 @@
                                 </subviews>
                             </stackView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" red="0.11764924973249435" green="0.11764311045408249" blue="0.11764728277921677" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                         <constraints>
                             <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="dFl-81-6ok" secondAttribute="trailing" id="20i-yz-AaQ"/>
@@ -83,7 +80,6 @@
                             <constraint firstItem="dFl-81-6ok" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="nlX-Ab-1aI"/>
                             <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="NKr-gS-mpx" secondAttribute="bottom" id="yeu-NH-Pmp"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
                     <connections>
                         <outlet property="bottomToolView" destination="dFl-81-6ok" id="NXn-af-lFv"/>
@@ -122,6 +118,7 @@
                                 </constraints>
                             </scrollView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="INo-op-FLO"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="h7M-7T-4k4" secondAttribute="bottom" id="2b8-Wo-tm0"/>
@@ -129,7 +126,6 @@
                             <constraint firstItem="h7M-7T-4k4" firstAttribute="trailing" secondItem="INo-op-FLO" secondAttribute="trailing" id="WTc-1l-3Ha"/>
                             <constraint firstItem="h7M-7T-4k4" firstAttribute="leading" secondItem="INo-op-FLO" secondAttribute="leading" id="na8-TO-WiG"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="INo-op-FLO"/>
                     </view>
                     <size key="freeformSize" width="375" height="600"/>
                     <connections>

Examples/Stocks/Stocks/MainViewController.swift

@@ -3,7 +3,7 @@
 import UIKit
 import FloatingPanel
 
-class ViewController: UIViewController, FloatingPanelControllerDelegate {
+class MainViewController: UIViewController, FloatingPanelControllerDelegate {
     @IBOutlet var topBannerView: UIImageView!
     @IBOutlet weak var labelStackView: UIStackView!
     @IBOutlet weak var bottomToolView: UIView!
@@ -101,14 +101,12 @@ class FloatingPanelStocksLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .tip
 
-    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 56.0, edge: .top, referenceGuide: .safeArea),
-            .half: FloatingPanelLayoutAnchor(absoluteInset: 262.0, edge: .bottom, referenceGuide: .safeArea),
-             /* Visible + ToolView */
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 85.0 + 44.0, edge: .bottom, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 56.0, edge: .top, referenceGuide: .safeArea),
+        .half: FloatingPanelLayoutAnchor(absoluteInset: 262.0, edge: .bottom, referenceGuide: .safeArea),
+         /* Visible + ToolView */
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 85.0 + 44.0, edge: .bottom, referenceGuide: .safeArea),
+    ]
 
     func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
         return 0.0

FloatingPanel.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name                = "FloatingPanel"
-  s.version             = "2.5.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.
@@ -14,7 +14,7 @@ The new interface displays the related contents and utilities in parallel as a u
   s.platform            = :ios, "10.0"
   s.source              = { :git => "https://github.com/SCENEE/FloatingPanel.git", :tag => s.version.to_s }
   s.source_files        = "Sources/*.swift"
-  s.swift_versions      = ['5.1', '5.2', '5.3']
+  s.swift_version       = '5.0'
 
   s.framework           = "UIKit"
 

FloatingPanel.xcodeproj/project.pbxproj

@@ -17,12 +17,10 @@
 		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 */; };
-		5469F4B424B30F3500537F8A /* LayoutReferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5469F4B324B30F3500537F8A /* LayoutReferences.swift */; };
+		5469F4B424B30F3500537F8A /* LayoutProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5469F4B324B30F3500537F8A /* LayoutProperties.swift */; };
 		549C371F2361E15E007D8058 /* ExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 549C371E2361E15D007D8058 /* ExtensionTests.swift */; };
 		549E944522CF295D0050AECF /* StateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 549E944422CF295D0050AECF /* StateTests.swift */; };
 		54A6B6B122968B530077F348 /* CoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54A6B6B022968B530077F348 /* CoreTests.swift */; };
@@ -33,6 +31,8 @@
 		54CFBFC3215CD045006B5735 /* Layout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CFBFC2215CD045006B5735 /* Layout.swift */; };
 		54CFBFC5215CD09C006B5735 /* Core.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CFBFC4215CD09C006B5735 /* Core.swift */; };
 		54DBA3DC262E938500D75969 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DBA3DB262E938500D75969 /* Extensions.swift */; };
+		54E3992727141F5100A8F9ED /* FloatingPanel.docc in Sources */ = {isa = PBXBuildFile; fileRef = 54E3992627141F5100A8F9ED /* FloatingPanel.docc */; };
+		5D82A6B528D18464006A44BA /* libswiftCoreGraphics.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D82A6B428D18461006A44BA /* libswiftCoreGraphics.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -43,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 */
@@ -66,13 +59,10 @@
 		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>"; };
-		5469F4B324B30F3500537F8A /* LayoutReferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutReferences.swift; sourceTree = "<group>"; };
+		5469F4B324B30F3500537F8A /* LayoutProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutProperties.swift; sourceTree = "<group>"; };
 		549C371E2361E15D007D8058 /* ExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionTests.swift; sourceTree = "<group>"; };
 		549E944422CF295D0050AECF /* StateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateTests.swift; sourceTree = "<group>"; };
 		54A6B6B022968B530077F348 /* CoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreTests.swift; sourceTree = "<group>"; };
@@ -83,7 +73,8 @@
 		54CFBFC2215CD045006B5735 /* Layout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Layout.swift; sourceTree = "<group>"; };
 		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>"; };
-		54E740CA218AFD67005C1A34 /* FloatingPanelTesting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FloatingPanelTesting.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		54E3992627141F5100A8F9ED /* FloatingPanel.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = FloatingPanel.docc; sourceTree = "<group>"; };
+		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 */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -91,6 +82,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5D82A6B528D18464006A44BA /* libswiftCoreGraphics.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -102,13 +94,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		54E740C7218AFD67005C1A34 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -118,6 +103,7 @@
 				545DB9C32151169500CA77B8 /* Sources */,
 				545DB9CE2151169500CA77B8 /* Tests */,
 				545DB9C22151169500CA77B8 /* Products */,
+				5D82A6B328D18460006A44BA /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -126,7 +112,6 @@
 			children = (
 				545DB9C12151169500CA77B8 /* FloatingPanel.framework */,
 				545DB9CA2151169500CA77B8 /* FloatingPanelTests.xctest */,
-				54E740CA218AFD67005C1A34 /* FloatingPanelTesting.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -139,7 +124,7 @@
 				5469F4B124B30F1100537F8A /* Position.swift */,
 				54CFBFC4215CD09C006B5735 /* Core.swift */,
 				54CFBFC2215CD045006B5735 /* Layout.swift */,
-				5469F4B324B30F3500537F8A /* LayoutReferences.swift */,
+				5469F4B324B30F3500537F8A /* LayoutProperties.swift */,
 				5469F4AF24B30E1500537F8A /* LayoutAnchoring.swift */,
 				5450EEE321646DF500135936 /* Behavior.swift */,
 				54352E9721A521CA00CBCA08 /* PassthroughView.swift */,
@@ -151,6 +136,7 @@
 				54ABD7AE216CCFF7002E6C13 /* Logger.swift */,
 				545DB9C42151169500CA77B8 /* FloatingPanel.h */,
 				545DB9C52151169500CA77B8 /* Info.plist */,
+				54E3992627141F5100A8F9ED /* FloatingPanel.docc */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -158,7 +144,6 @@
 		545DB9CE2151169500CA77B8 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				5469F49E24B003EF00537F8A /* TestingApp */,
 				54A6B6B022968B530077F348 /* CoreTests.swift */,
 				545DB9CF2151169500CA77B8 /* ControllerTests.swift */,
 				542753C522C49A6E00D17955 /* LayoutTests.swift */,
@@ -171,14 +156,12 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		5469F49E24B003EF00537F8A /* TestingApp */ = {
+		5D82A6B328D18460006A44BA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				5469F49F24B003EF00537F8A /* LaunchScreen.storyboard */,
-				5469F4A024B003EF00537F8A /* AppDelegate.swift */,
-				5469F4A124B003EF00537F8A /* Info.plist */,
+				5D82A6B428D18461006A44BA /* libswiftCoreGraphics.tbd */,
 			);
-			path = TestingApp;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -207,6 +190,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				54B58FC929EB95880009567E /* PBXTargetDependency */,
 			);
 			name = FloatingPanel;
 			productName = FloatingModalController;
@@ -225,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 */
@@ -256,7 +222,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = scenee;
 				TargetAttributes = {
 					545DB9C02151169500CA77B8 = {
@@ -265,10 +231,6 @@
 					};
 					545DB9C92151169500CA77B8 = {
 						CreatedOnToolsVersion = 10.0;
-						TestTargetID = 54E740C9218AFD67005C1A34;
-					};
-					54E740C9218AFD67005C1A34 = {
-						CreatedOnToolsVersion = 10.1;
 					};
 				};
 			};
@@ -281,13 +243,14 @@
 				Base,
 			);
 			mainGroup = 545DB9B72151169500CA77B8;
+			packageReferences = (
+			);
 			productRefGroup = 545DB9C22151169500CA77B8 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				545DB9C02151169500CA77B8 /* FloatingPanel */,
 				545DB9C92151169500CA77B8 /* FloatingPanelTests */,
-				54E740C9218AFD67005C1A34 /* TestingApp */,
 			);
 		};
 /* End PBXProject section */
@@ -307,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 */
@@ -326,7 +281,7 @@
 				5469F4B024B30E1500537F8A /* LayoutAnchoring.swift in Sources */,
 				54CDC5D3215B6D5A007D205C /* SurfaceView.swift in Sources */,
 				54CFBFC3215CD045006B5735 /* Layout.swift in Sources */,
-				5469F4B424B30F3500537F8A /* LayoutReferences.swift in Sources */,
+				5469F4B424B30F3500537F8A /* LayoutProperties.swift in Sources */,
 				54CDC5D5215B6D8D007D205C /* BackdropView.swift in Sources */,
 				54352E9821A521CA00CBCA08 /* PassthroughView.swift in Sources */,
 				54CFBFC5215CD09C006B5735 /* Core.swift in Sources */,
@@ -335,6 +290,7 @@
 				54DBA3DC262E938500D75969 /* Extensions.swift in Sources */,
 				5450EEE421646DF500135936 /* Behavior.swift in Sources */,
 				545DBA2B2152383100CA77B8 /* GrabberView.swift in Sources */,
+				54E3992727141F5100A8F9ED /* FloatingPanel.docc in Sources */,
 				54352E9621A51A2500CBCA08 /* Transitioning.swift in Sources */,
 				5469F4AE24B30D7E00537F8A /* State.swift in Sources */,
 			);
@@ -354,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 */
@@ -370,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 */
 
@@ -404,6 +351,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -469,6 +417,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -575,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;
 		};
@@ -596,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;
 		};
@@ -666,6 +577,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -748,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;
 		};
@@ -803,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 */;
 }

FloatingPanel.xcodeproj/xcshareddata/xcschemes/FloatingPanel.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "545DB9C02151169500CA77B8"
+            BuildableName = "FloatingPanel.framework"
+            BlueprintName = "FloatingPanel"
+            ReferencedContainer = "container:FloatingPanel.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -41,17 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "545DB9C02151169500CA77B8"
-            BuildableName = "FloatingPanel.framework"
-            BlueprintName = "FloatingPanel"
-            ReferencedContainer = "container:FloatingPanel.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:FloatingPanel.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

README.md

@@ -1,13 +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.
+
+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)
@@ -73,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.
@@ -89,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
 
@@ -267,13 +269,11 @@ class ViewController: UIViewController, FloatingPanelControllerDelegate {
 class MyFloatingPanelLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .tip
-    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
-            .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
+        .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .safeArea),
+    ]
 }
 ```
 
@@ -288,6 +288,8 @@ fpc.layout = MyPanelLayout()
 fpc.invalidateLayout() // If needed
 ```
 
+Note: If you already set the `delegate` property of your `FloatingPanelController` instance, `invalidateLayout()` overrides the layout object of `FloatingPanelController` with one returned by the delegate object.
+
 2. Returns an appropriate layout object in one of 2 `floatingPanel(_:layoutFor:)` delegates.
 
 ```swift
@@ -317,12 +319,11 @@ class ViewController: UIViewController, FloatingPanelControllerDelegate {
 class LandscapePanelLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .tip
-    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
+    ]
+    
     func prepareLayout(surfaceView: UIView, in view: UIView) -> [NSLayoutConstraint] {
         return [
             surfaceView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 8.0),
@@ -341,12 +342,10 @@ class LandscapePanelLayout: FloatingPanelLayout {
 class IntrinsicPanelLayout: FloatingPanelLayout {
     let position: FloatingPanelPosition = .bottom
     let initialState: FloatingPanelState = .full
-    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0, referenceGuide: .safeArea),
-            .half: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
-        ]
-    }
+    let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelIntrinsicLayoutAnchor(absoluteOffset: 0, referenceGuide: .safeArea),
+        .half: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
+    ]
     ...
 }
 ```
@@ -360,14 +359,11 @@ Use `.superview` reference guide in your anchors.
 ```swift
 class MyFullScreenLayout: FloatingPanelLayout {
     ...
-    var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] {
-        return [
-            .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .superview),
-            .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
-            .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .superview),
-        ]
-
-    }
+    let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .superview),
+        .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .superview),
+    ]
 }
 ```
 

Sources/BackdropView.swift

@@ -7,5 +7,19 @@ import UIKit
 public class BackdropView: UIView {
 
     /// The gesture recognizer for tap gestures to dismiss a panel.
-    @objc public var dismissalTapGestureRecognizer: UITapGestureRecognizer!
+    ///
+    /// By default, this gesture recognizer is disabled as following the default behavior of iOS modalities.
+    /// To dismiss a panel by tap gestures on the backdrop, `dismissalTapGestureRecognizer.isEnabled` is set to true.
+    @objc public var dismissalTapGestureRecognizer: UITapGestureRecognizer
+
+    init() {
+        dismissalTapGestureRecognizer = UITapGestureRecognizer()
+        dismissalTapGestureRecognizer.isEnabled = false
+        super.init(frame: .zero)
+        addGestureRecognizer(dismissalTapGestureRecognizer)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
 }

Sources/Behavior.swift

@@ -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:shouldRemoveAt:with` is implemented, this value will not be used. The default value of `FloatingPanelDefaultBehavior` is 5.5
-    @objc optional
-    var removalInteractionVelocityThreshold: CGFloat { get }
+    /// 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 }
 }
 
 /// 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 }
     }
 }

Sources/Controller.swift

@@ -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 when the user drags the surface or the surface is attracted to a state anchor.
-    @objc optional
-    func floatingPanelDidMove(_ fpc: FloatingPanelController) // any surface frame changes in dragging
+    /// Called while the user drags the surface or the surface moves to a state anchor.
+    @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 `FloatingPanelController.isRemovalInteractionEnabled` is `true`.
+    /// 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()
         }
     }
@@ -157,7 +154,10 @@ open class FloatingPanelController: UIViewController {
         return floatingPanel.isAttracting
     }
 
-    /// The layout object managed by the controller
+    /// The layout object that the controller manages
+    ///
+    /// You need to call ``invalidateLayout()`` if you want to apply a new layout object into the panel
+    /// immediately.
     @objc
     public var layout: FloatingPanelLayout {
         get { _layout }
@@ -169,7 +169,7 @@ open class FloatingPanelController: UIViewController {
         }
     }
 
-    /// The behavior object managed by the controller
+    /// The behavior object that the controller manages
     @objc
     public var behavior: FloatingPanelBehavior {
         get { _behavior }
@@ -189,8 +189,8 @@ 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 
+    /// 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
     public var contentInsetAdjustmentBehavior: ContentInsetAdjustmentBehavior = .always
 
     /// A Boolean value that determines whether the removal interaction is enabled.
@@ -225,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()
 
@@ -264,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
         }
@@ -313,7 +313,7 @@ open class FloatingPanelController: UIViewController {
         // Change a layout for the new view size
         if let newLayout = self.delegate?.floatingPanel?(self, layoutFor: size) {
             layout = newLayout
-            activateLayout(forceLayout: false)
+            activateLayout(forceLayout: true)
         }
 
         if view.translatesAutoresizingMaskIntoConstraints {
@@ -332,7 +332,7 @@ open class FloatingPanelController: UIViewController {
         // Change a layout for the new trait collection
         if let newLayout = self.delegate?.floatingPanel?(self, layoutFor: newCollection) {
             self.layout = newLayout
-            activateLayout(forceLayout: false)
+            activateLayout(forceLayout: true)
         }
     }
 
@@ -370,7 +370,7 @@ open class FloatingPanelController: UIViewController {
     private func update(safeAreaInsets: UIEdgeInsets) {
         guard
             preSafeAreaInsets != safeAreaInsets
-            else { return }
+        else { return }
 
         log.debug("Update safeAreaInsets", safeAreaInsets)
 
@@ -398,8 +398,10 @@ open class FloatingPanelController: UIViewController {
     }
 
     private func activateLayout(forceLayout: Bool = false) {
-        floatingPanel.activateLayout(forceLayout: forceLayout,
-                                     contentInsetAdjustmentBehavior: contentInsetAdjustmentBehavior)
+        floatingPanel.activateLayout(
+            forceLayout: forceLayout,
+            contentInsetAdjustmentBehavior: contentInsetAdjustmentBehavior
+        )
     }
 
     func remove() {
@@ -436,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 {
@@ -443,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.
@@ -482,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 }
@@ -548,7 +560,7 @@ open class FloatingPanelController: UIViewController {
             addChild(vc)
 
             let surfaceView = floatingPanel.surfaceView
-            surfaceView.set(contentView: vc.view)
+            surfaceView.set(contentView: vc.view, mode: contentMode)
 
             vc.didMove(toParent: self)
         }
@@ -584,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:)
@@ -603,15 +625,19 @@ open class FloatingPanelController: UIViewController {
 
     // MARK: - Utilities
 
-    /// Updates the layout object from the delegate and lays out the views managed
-    /// by the controller immediately.
+    /// Invalidates all layout information of the panel and apply the ``layout`` property into it immediately.
     ///
-    /// This method updates the `FloatingPanelLayout` object from the delegate and
-    /// then it calls `layoutIfNeeded()` of the root view to force the view
-    /// to update the layout immediately. It can be called in an
-    /// animation block.
+    /// This lays out subviews of the view that the controller manages with the ``layout`` property by
+    /// calling the view's `layoutIfNeeded()`. Thus this method can be called in an animation block to
+    /// animate the panel's changes.
+    ///
+    /// If the controller has a delegate object, this will lay them out using the layout object returned by
+    /// `floatingPanel(_:layoutFor:)` delegate method for the current `UITraitCollection`.
     @objc
     public func invalidateLayout() {
+        if let newLayout = self.delegate?.floatingPanel?(self, layoutFor: traitCollection) {
+            layout = newLayout
+        }
         activateLayout(forceLayout: true)
     }
 
@@ -649,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)
             }
@@ -700,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)
             }
@@ -708,6 +741,6 @@ public extension UIViewController {
         }
 
         // For other view controllers
-        self.fp_original_dismiss(animated: flag, completion: completion)
+        dismissImp(self, sel, flag, completion)
     }
 }

Sources/Core.swift

@@ -17,6 +17,17 @@ class Core: NSObject, UIGestureRecognizerDelegate {
         didSet {
             oldValue?.panGestureRecognizer.removeTarget(self, action: nil)
             scrollView?.panGestureRecognizer.addTarget(self, action: #selector(handle(panGesture:)))
+            if let cur = scrollView {
+                if oldValue == nil {
+                    initialScrollOffset = cur.contentOffset
+                    scrollIndictorVisible = cur.showsVerticalScrollIndicator
+                }
+            } else {
+                if let pre = oldValue {
+                    pre.isDirectionalLockEnabled = false
+                    pre.showsVerticalScrollIndicator = scrollIndictorVisible
+                }
+            }
         }
     }
 
@@ -32,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?
 
@@ -51,11 +62,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
     // Scroll handling
     private var initialScrollOffset: CGPoint = .zero
     private var stopScrollDeceleration: Bool = false
-    private var scrollBounce = false
     private var scrollIndictorVisible = false
-    private var grabberAreaFrame: CGRect {
-        return surfaceView.grabberAreaFrame
-    }
 
     // MARK: - Interface
 
@@ -63,6 +70,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
         ownerVC = vc
 
         surfaceView = SurfaceView()
+        surfaceView.position = layout.position
         surfaceView.backgroundColor = .white
 
         backdropView = BackdropView()
@@ -85,11 +93,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
         panGestureRecognizer.addTarget(self, action: #selector(handle(panGesture:)))
         panGestureRecognizer.delegate = self
 
-        // Set tap-to-dismiss in the backdrop view
-        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleBackdrop(tapGesture:)))
-        tapGesture.isEnabled = false
-        backdropView.dismissalTapGestureRecognizer = tapGesture
-        backdropView.addGestureRecognizer(tapGesture)
+        // Set the tap-to-dismiss action of the backdrop view.
+        // It's disabled by default. See also BackdropView.dismissalTapGestureRecognizer.
+        backdropView.dismissalTapGestureRecognizer.addTarget(self, action: #selector(handleBackdrop(tapGesture:)))
     }
 
     deinit {
@@ -142,7 +148,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                 return
             }
 
-            let shouldDoubleLayout = from == .hidden
+            let shouldDoubleLayout =
+                from == .hidden
                 && surfaceView.hasStackView()
                 && layoutAdapter.isIntrinsicAnchor(state: to)
 
@@ -186,8 +193,10 @@ class Core: NSObject, UIGestureRecognizerDelegate {
 
     // MARK: - Layout update
 
-    func activateLayout(forceLayout: Bool = false,
-                        contentInsetAdjustmentBehavior: FloatingPanelController.ContentInsetAdjustmentBehavior) {
+    func activateLayout(
+        forceLayout: Bool = false,
+        contentInsetAdjustmentBehavior: FloatingPanelController.ContentInsetAdjustmentBehavior
+    ) {
         layoutAdapter.prepareLayout()
 
         // preserve the current content offset if contentInsetAdjustmentBehavior is `.always`
@@ -197,7 +206,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
         }
 
         layoutAdapter.updateStaticConstraint()
-        layoutAdapter.activateLayout(for: state, forceLayout: true)
+        layoutAdapter.activateLayout(for: state, forceLayout: forceLayout)
 
         // Update the backdrop alpha only when called in `Controller.show(animated:completion:)`
         // Because that prevents a backdrop flicking just before presenting a panel(#466).
@@ -220,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)
@@ -240,31 +249,33 @@ 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:
-            if grabberAreaFrame.contains(gestureRecognizer.location(in: gestureRecognizer.view)) {
+            is UISwipeGestureRecognizer,
+            is UIRotationGestureRecognizer,
+            is UIScreenEdgePanGestureRecognizer,
+            is UIPinchGestureRecognizer:
+            if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
                 return true
             }
             // all gestures of the tracking scroll view should be recognized in parallel
@@ -289,13 +300,12 @@ 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
         }
 
-        if grabberAreaFrame.contains(gestureRecognizer.location(in: gestureRecognizer.view)) {
+        if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
             return true
         }
 
@@ -320,10 +330,11 @@ 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 grabberAreaFrame.contains(gestureRecognizer.location(in: gestureRecognizer.view)) {
+                    if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
                         return false
                     }
                     return allowScrollPanGesture(for: scrollView)
@@ -342,16 +353,15 @@ 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
             }
-            if grabberAreaFrame.contains(gestureRecognizer.location(in: gestureRecognizer.view)) {
+            if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
                 return false
             }
             // Do not begin the pan gesture until these gestures fail
@@ -377,26 +387,28 @@ 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 {
                         log.debug("settle offset --", value(of: initialScrollOffset))
                         stopScrolling(at: initialScrollOffset)
                     } else {
-                        if grabberAreaFrame.contains(location) {
+                        if surfaceView.grabberAreaContains(location) {
                             // Preserve the current content offset in moving from full.
                             stopScrolling(at: initialScrollOffset)
                         }
@@ -439,7 +451,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                     }
                     if state == layoutAdapter.mostExpandedState {
                         // Adjust a small gap of the scroll offset just after swiping down starts in the grabber area.
-                        if grabberAreaFrame.contains(location), grabberAreaFrame.contains(initialLocation) {
+                        if surfaceView.grabberAreaContains(location), surfaceView.grabberAreaContains(initialLocation) {
                             stopScrolling(at: initialScrollOffset)
                         }
                     }
@@ -464,26 +476,29 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                             }
                         }
                         // Adjust a small gap of the scroll offset just before swiping down starts in the grabber area,
-                        if grabberAreaFrame.contains(location), grabberAreaFrame.contains(initialLocation) {
+                        if surfaceView.grabberAreaContains(location), surfaceView.grabberAreaContains(initialLocation) {
                             stopScrolling(at: initialScrollOffset)
                         }
                     }
                 }
             }
         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
             }
 
@@ -510,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),
-                                                                  overflow: true,
-                                                                  allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:))
+                    layoutAdapter.updateInteractiveEdgeConstraint(
+                        diff: value(of: diff),
+                        scrollingContent: true,
+                        allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:)
+                    )
                 }
                 panningEnd(with: translation, velocity: velocity)
             default:
@@ -565,26 +582,26 @@ 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
         }
 
         // When the current point is within grabber area but the initial point is not, do scroll.
-        if grabberAreaFrame.contains(point), !grabberAreaFrame.contains(initialLocation) {
+        if surfaceView.grabberAreaContains(point), !surfaceView.grabberAreaContains(initialLocation) {
             return true
         }
 
         // When the initial point is within grabber area and the current point is out of surface, don't scroll.
-        if grabberAreaFrame.contains(initialLocation), !surfaceView.frame.contains(point) {
+        if surfaceView.grabberAreaContains(initialLocation), !surfaceView.frame.contains(point) {
             return false
         }
 
         let scrollViewFrame = scrollView.convert(scrollView.bounds, to: surfaceView)
         guard
-            scrollViewFrame.contains(initialLocation), // When the initial point not in scrollView, don't scroll.
-            !grabberAreaFrame.contains(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
         }
@@ -594,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 {
@@ -627,7 +644,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
 
         guard let scrollView = scrollView else { return }
         if state == layoutAdapter.mostExpandedState {
-            if grabberAreaFrame.contains(location) {
+            if surfaceView.grabberAreaContains(location) {
                 initialScrollOffset = scrollView.contentOffset
             }
         } else {
@@ -640,49 +657,50 @@ class Core: NSObject, UIGestureRecognizerDelegate {
         let pre = value(of: layoutAdapter.surfaceLocation)
         let diff = value(of: translation - initialTranslation)
         let next = pre + diff
-        let overflow = shouldOverflow(from: pre, to: next)
 
-        layoutAdapter.updateInteractiveEdgeConstraint(diff: diff,
-                                                      overflow: overflow,
-                                                      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)
         }
     }
 
-    private func shouldOverflow(from pre: CGFloat, to next: CGFloat) -> Bool {
+    private func shouldScrollingContentInMoving(from pre: CGFloat, to next: CGFloat) -> Bool {
+        // Don't allow scrolling if the initial panning location is in the grabber area.
+        if surfaceView.grabberAreaContains(initialLocation) {
+            return false
+        }
         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 {
-                    return false
+                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 {
-                    return false
+                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 {
-                    return false
+                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 {
-                    return false
+                if pre > .zero, pre > next, scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
+                    return true
                 }
             }
         }
-        return true
+        return false
     }
 
     private func panningEnd(with translation: CGPoint, velocity: CGPoint) {
@@ -693,7 +711,7 @@ 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 }
@@ -712,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()
@@ -750,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
         }
     }
@@ -777,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 }
 
@@ -785,19 +802,24 @@ class Core: NSObject, UIGestureRecognizerDelegate {
 
         initialSurfaceLocation = layoutAdapter.surfaceLocation
         if state == layoutAdapter.mostExpandedState, let scrollView = scrollView {
-            if grabberAreaFrame.contains(location) {
+            if surfaceView.grabberAreaContains(location) {
                 initialScrollOffset = scrollView.contentOffset
             } else {
-                initialScrollOffset = contentOffsetForPinning(of: scrollView)
-                let offsetDiff = scrollView.contentOffset - contentOffsetForPinning(of: scrollView)
+                let pinningOffset = contentOffsetForPinning(of: scrollView)
+
+                // `scrollView.contentOffset` can be a value in [-30, 0) at this time by `allowScrollPanGesture(for:)`.
+                // Therefore the initial scroll offset must be reset to the pinning offset. Otherwise, the following
+                // `Fit the surface bounds` logic don't working and also the scroll content offset can be invalid.
+                initialScrollOffset = pinningOffset
+
+                // Fit the surface bounds to a scroll offset content by startInteraction(at:offset:)
+                let offsetDiff = scrollView.contentOffset - pinningOffset
                 switch layoutAdapter.position {
                 case .top, .left:
-                    // Fit the surface bounds to a scroll offset content by startInteraction(at:offset:)
                     if value(of: offsetDiff) > 0 {
                         offset = -offsetDiff
                     }
                 case .bottom, .right:
-                    // Fit the surface bounds to a scroll offset content by startInteraction(at:offset:)
                     if value(of: offsetDiff) < 0 {
                         offset = -offsetDiff
                     }
@@ -871,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
     }
@@ -904,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()
         }
@@ -938,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
         }
 
@@ -956,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 {
@@ -989,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 }
 
@@ -998,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
     }
 
@@ -1011,7 +1059,6 @@ class Core: NSObject, UIGestureRecognizerDelegate {
         log.debug("unlock scroll view")
 
         scrollView.isDirectionalLockEnabled = false
-        scrollView.bounces = scrollBounce
         scrollView.showsVerticalScrollIndicator = scrollIndictorVisible
     }
 
@@ -1086,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
             }
@@ -1101,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
         }
     }
 }
@@ -1117,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)
         }
     }
 
@@ -1143,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
@@ -1165,7 +1216,7 @@ private class NumericSpringAnimator: NSObject {
     }
 
     @discardableResult
-    func startAnimation() -> Bool{
+    func startAnimation() -> Bool {
         lock.lock()
         defer { lock.unlock() }
 
@@ -1201,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)

Sources/Extensions.swift

@@ -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
+            )
+        )
     }
 }

Sources/FloatingPanel.docc/FloatingPanel.md

@@ -0,0 +1,53 @@
+# ``FloatingPanel``
+
+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 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
+
+### Essentials
+
+- ``FloatingPanelController``
+- ``FloatingPanelControllerDelegate``
+
+### Views
+
+- ``SurfaceView``
+- ``SurfaceAppearance``
+- ``BackdropView``
+- ``GrabberView``
+
+### Gestures
+
+- ``FloatingPanelPanGestureRecognizer``
+
+### Layouts and Anchors
+
+- ``FloatingPanelLayout``
+- ``FloatingPanelBottomLayout``
+- ``FloatingPanelLayoutAnchoring``
+- ``FloatingPanelLayoutAnchor``
+- ``FloatingPanelAdaptiveLayoutAnchor``
+- ``FloatingPanelIntrinsicLayoutAnchor``
+
+### States
+
+- ``FloatingPanelState``
+
+### Positions
+
+- ``FloatingPanelPosition``
+- ``FloatingPanelReferenceEdge``
+- ``FloatingPanelLayoutReferenceGuide``
+- ``FloatingPanelLayoutContentBoundingGuide``
+
+### Behaviors
+
+- ``FloatingPanelBehavior``
+- ``FloatingPanelDefaultBehavior``

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Sources/Layout.swift

@@ -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),
@@ -92,6 +92,9 @@ class LayoutAdapter {
 
     private var staticConstraint: NSLayoutConstraint?
 
+    /// A layout constraint to limit the content size in ``FloatingPanelAdaptiveLayoutAnchor``.
+    private var contentBoundingConstraint: NSLayoutConstraint?
+
     private var anchorStates: Set<FloatingPanelState> {
         return Set(layout.anchors.keys)
     }
@@ -150,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
@@ -330,12 +339,27 @@ class LayoutAdapter {
                 if anchor.referenceGuide == .safeArea {
                     referenceBoundsLength += position.inset(safeAreaInsets)
                 }
-                return dimension - diff
+                let maxPosition: CGFloat = {
+                    if let maxBounds = anchor.contentBoundingGuide.maxBounds(vc) {
+                        return layout.position.mainLocation(maxBounds.origin)
+                            + layout.position.mainDimension(maxBounds.size)
+                    } else {
+                        return .infinity
+                    }
+                }()
+                return min(dimension - diff, maxPosition)
             case .bottom, .right:
                 if anchor.referenceGuide == .safeArea {
                     referenceBoundsLength -= position.inset(safeAreaInsets)
                 }
-                return referenceBoundsLength - dimension + diff
+                let minPosition: CGFloat = {
+                    if let maxBounds = anchor.contentBoundingGuide.maxBounds(vc) {
+                        return layout.position.mainLocation(maxBounds.origin)
+                    } else {
+                        return -(.infinity)
+                    }
+                }()
+                return max(referenceBoundsLength - dimension + diff, minPosition)
             }
         case let anchor as FloatingPanelLayoutAnchor:
             let referenceBounds = anchor.referenceGuide == .safeArea ? bounds.inset(by: safeAreaInsets) : bounds
@@ -415,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
 
@@ -453,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)
@@ -531,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
@@ -540,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
@@ -553,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
@@ -573,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
@@ -594,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
@@ -629,15 +672,19 @@ class LayoutAdapter {
     // The method is separated from prepareLayout(to:) for the rotation support
     // It must be called in FloatingPanelController.traitCollectionDidChange(_:)
     func updateStaticConstraint() {
-        NSLayoutConstraint.deactivate(constraint: staticConstraint)
+        NSLayoutConstraint.deactivate([staticConstraint, contentBoundingConstraint].compactMap { $0 })
         staticConstraint = nil
+        contentBoundingConstraint = nil
 
         if vc.contentMode == .fitToBounds {
             surfaceView.containerOverflow = 0
             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:
@@ -654,15 +701,32 @@ class LayoutAdapter {
                 constant = 0.0
             }
             let baseAnchor = position.mainDimensionAnchor(anchor.contentLayoutGuide)
-            staticConstraint = surfaceAnchor.constraint(equalTo: baseAnchor, constant: constant)
+            if let boundingLayoutGuide = anchor.contentBoundingGuide.layoutGuide(vc) {
+                if anchor.isAbsolute {
+                    contentBoundingConstraint = baseAnchor.constraint(
+                        lessThanOrEqualTo: position.mainDimensionAnchor(boundingLayoutGuide),
+                        constant: anchor.offset
+                    )
+                } else {
+                    contentBoundingConstraint = baseAnchor.constraint(
+                        lessThanOrEqualTo: position.mainDimensionAnchor(boundingLayoutGuide),
+                        multiplier: anchor.offset
+                    )
+                }
+                staticConstraint = surfaceAnchor.constraint(lessThanOrEqualTo: baseAnchor, constant: constant)
+            } else {
+                staticConstraint = surfaceAnchor.constraint(equalTo: baseAnchor, constant: constant)
+            }
         default:
             switch position {
             case .top, .left:
                 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)
+                )
             }
         }
 
@@ -673,12 +737,12 @@ class LayoutAdapter {
             staticConstraint?.identifier = "FloatingPanel-static-width"
         }
 
-        NSLayoutConstraint.activate(constraint: staticConstraint)
+        NSLayoutConstraint.activate([staticConstraint, contentBoundingConstraint].compactMap { $0 })
 
         surfaceView.containerOverflow = position.mainDimension(vc.view.bounds.size)
     }
 
-    func updateInteractiveEdgeConstraint(diff: CGFloat, overflow: Bool, allowsRubberBanding: (UIRectEdge) -> Bool) {
+    func updateInteractiveEdgeConstraint(diff: CGFloat, scrollingContent: Bool, allowsRubberBanding: (UIRectEdge) -> Bool) {
         defer {
             log.debug("update surface location = \(surfaceLocation)")
         }
@@ -701,7 +765,7 @@ class LayoutAdapter {
             const = maxConst + rubberBandEffect(for: buffer, base: base)
         }
 
-        if overflow == false {
+        if scrollingContent {
             const = min(max(const, minConst), maxConst)
         }
 
@@ -776,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))).")

Sources/LayoutAnchoring.swift

@@ -3,18 +3,25 @@
 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.
     ///
     /// The inset is an amount to inset a panel from an edge of the reference guide.  The edge refers to a panel
     /// positioning.
+    ///
+    /// - Parameters:
+    ///     - absoluteOffset: An absolute offset to attach the panel from the edge.
+    ///     - edge: Specify the edge of ``FloatingPanelController``'s view. This is the staring point of the offset.
+    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
     @objc public init(absoluteInset: CGFloat, edge: FloatingPanelReferenceEdge, referenceGuide: FloatingPanelLayoutReferenceGuide) {
         self.inset = absoluteInset
         self.referenceGuide = referenceGuide
@@ -27,6 +34,11 @@ import UIKit
     /// The inset is an amount to inset a panel from the edge of the specified reference guide. The value is
     /// a floating-point number in the range 0.0 to 1.0, where 0.0 represents zero distance from the edge and
     /// 1.0 represents a distance to the opposite edge.
+    ///
+    /// - Parameters:
+    ///     - fractionalOffset: A fractional value of the size of ``FloatingPanelController``'s view to attach the panel from the edge.
+    ///     - edge: Specify the edge of ``FloatingPanelController``'s view. This is the staring point of the offset.
+    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
     @objc public init(fractionalInset: CGFloat, edge: FloatingPanelReferenceEdge, referenceGuide: FloatingPanelLayoutReferenceGuide) {
         self.inset = fractionalInset
         self.referenceGuide = referenceGuide
@@ -40,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:
@@ -49,7 +61,7 @@ public extension FloatingPanelLayoutAnchor {
         case .left:
             return layoutConstraints(layoutGuide, for: vc.surfaceView.rightAnchor)
         case .bottom:
-            return layoutConstraints(layoutGuide, for:  vc.surfaceView.topAnchor)
+            return layoutConstraints(layoutGuide, for: vc.surfaceView.topAnchor)
         case .right:
             return layoutConstraints(layoutGuide, for: vc.surfaceView.leftAnchor)
         }
@@ -62,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)]
@@ -95,12 +107,17 @@ 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.
     ///
     /// The offset is an amount to offset a position of panel that displays the entire content from an edge of
     /// the reference guide.  The edge refers to a panel positioning.
+    ///
+    /// - Parameters:
+    ///     - absoluteOffset: An absolute offset from the content size in the main dimension(i.e. y axis for a bottom panel) to attach the panel.
+    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
     @objc public init(absoluteOffset offset: CGFloat, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
         self.offset = offset
         self.referenceGuide = referenceGuide
@@ -111,6 +128,10 @@ public extension FloatingPanelLayoutAnchor {
     ///
     /// The offset value is a floating-point number in the range 0.0 to 1.0, where 0.0 represents the full content
     /// is displayed and 0.5 represents the half of content is displayed.
+    ///
+    /// - Parameters:
+    ///     - fractionalOffset: A fractional offset of the content size in the main dimension(i.e. y axis for a bottom panel) to attach the panel.
+    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
     @objc public init(fractionalOffset offset: CGFloat, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
         self.offset = offset
         self.referenceGuide = referenceGuide
@@ -123,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)
@@ -142,39 +163,75 @@ 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, layout guide to display content and reference guide for a panel.
+    /// Returns a layout anchor with the specified offset by an absolute value to display a panel with its intrinsic content size.
     ///
     /// The offset is an amount to offset a position of panel that displays the entire content of the specified guide from an edge of
     /// the reference guide.  The edge refers to a panel positioning.
-    @objc public init(absoluteOffset offset: CGFloat, contentLayout: UILayoutGuide, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
+    ///
+    ///  ``contentBoundingGuide`` restricts the content size which a panel displays. For example, given ``referenceGuide`` is `.superview` and ``contentBoundingGuide`` is `.safeArea` for a bottom positioned panel, the panel content is laid out inside the superview of the view of FloatingPanelController(not its safe area), but its content size is limited to its safe area size. Normally both of ``referenceGuide`` and ``contentBoundingGuide`` are specified with the same rectangle area.
+    ///
+    /// - Parameters:
+    ///     - absoluteOffset: An absolute offset from the content size in the main dimension(i.e. y axis for a bottom panel) to attach the panel.
+    ///     - contentLayout: The content layout guide to calculate the content size in the panel.
+    ///     - referenceGuide: The rectangular area to lay out the content of a panel. If it's set to `.safeArea`, the panel content displays inside the safe area of its ``FloatingPanelController``'s view. This argument doesn't limit its content size.
+    ///     - contentBoundingGuide: The rectangular area to restrict the content size of a panel in the main dimension(i.e. y axis is the main dimension for a bottom panel).
+    ///
+    /// - Warning: If ``contentBoundingGuide`` is set to none, the panel may expand out of the screen size, depending on the intrinsic size of its content.
+    @objc public init(
+        absoluteOffset offset: CGFloat,
+        contentLayout: UILayoutGuide,
+        referenceGuide: FloatingPanelLayoutReferenceGuide,
+        contentBoundingGuide: FloatingPanelLayoutContentBoundingGuide = .none
+    ) {
         self.offset = offset
         self.contentLayoutGuide = contentLayout
         self.referenceGuide = referenceGuide
+        self.contentBoundingGuide = contentBoundingGuide
         self.isAbsolute = true
-
     }
 
-    /// Returns a layout anchor with the specified offset by a fractional value, layout guide to display content and reference guide for a panel.
+    /// Returns a layout anchor with the specified offset by a fractional value to display a panel with its intrinsic content size.
     ///
     /// The offset value is a floating-point number in the range 0.0 to 1.0, where 0.0 represents the full content
     /// is displayed and 0.5 represents the half of content is displayed.
-    @objc public init(fractionalOffset offset: CGFloat, contentLayout: UILayoutGuide, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
+    ///
+    ///  ``contentBoundingGuide`` restricts the content size which a panel displays. For example, given ``referenceGuide`` is `.superview` and ``contentBoundingGuide`` is `.safeArea` for a bottom positioned panel, the panel content is laid out inside the superview of the view of FloatingPanelController(not its safe area), but its content size is limited to its safe area size. Normally both of ``referenceGuide`` and ``contentBoundingGuide`` are specified with the same rectangle area.
+    ///
+    /// - Parameters:
+    ///     - fractionalOffset: A fractional offset of the content size in the main dimension(i.e. y axis for a bottom panel) to attach the panel.
+    ///     - contentLayout: The content layout guide to calculate the content size in the panel.
+    ///     - referenceGuide: The rectangular area to lay out the content of a panel. If it's set to `.safeArea`, the panel content displays inside the safe area of its ``FloatingPanelController``'s view. This argument doesn't limit its content size.
+    ///     - contentBoundingGuide: The rectangular area to restrict the content size of a panel in the main dimension(i.e. y axis is the main dimension for a bottom panel).
+    ///
+    /// - Warning: If ``contentBoundingGuide`` is set to none, the panel may expand out of the screen size, depending on the intrinsic size of its content.
+    @objc public init(
+        fractionalOffset offset: CGFloat,
+        contentLayout: UILayoutGuide,
+        referenceGuide: FloatingPanelLayoutReferenceGuide,
+        contentBoundingGuide: FloatingPanelLayoutContentBoundingGuide = .none
+    ) {
         self.offset = offset
         self.contentLayoutGuide = contentLayout
         self.referenceGuide = referenceGuide
+        self.contentBoundingGuide = contentBoundingGuide
         self.isAbsolute = false
     }
-    fileprivate let offset: CGFloat
-    fileprivate let isAbsolute: Bool
+    let offset: CGFloat
+    let isAbsolute: Bool
     let contentLayoutGuide: UILayoutGuide
     @objc public let referenceGuide: FloatingPanelLayoutReferenceGuide
+    @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)
+        let offsetConstraint: NSLayoutConstraint
         let offsetAnchor: NSLayoutDimension
         switch position {
         case .top:
@@ -187,10 +244,13 @@ public extension FloatingPanelAdaptiveLayoutAnchor {
             offsetAnchor = vc.surfaceView.leftAnchor.anchorWithOffset(to: layoutGuide.rightAnchor)
         }
         if isAbsolute {
-            return [offsetAnchor.constraint(equalTo: position.mainDimensionAnchor(contentLayoutGuide), constant: -offset)]
+            offsetConstraint = offsetAnchor.constraint(equalTo: position.mainDimensionAnchor(contentLayoutGuide), constant: -offset)
         } else {
-            return [offsetAnchor.constraint(equalTo: position.mainDimensionAnchor(contentLayoutGuide), multiplier: (1 - offset))]
+            offsetConstraint = offsetAnchor.constraint(equalTo: position.mainDimensionAnchor(contentLayoutGuide), multiplier: (1 - offset))
         }
+        constraints.append(offsetConstraint)
+
+        return constraints
     }
 }
 

Sources/LayoutProperties.swift

@@ -27,7 +27,7 @@ extension FloatingPanelReferenceEdge {
     }
 }
 
-/// Constants that specify a layout guide to lay out a panel.
+/// A representation to specify a rectangular area to lay out a panel.
 @objc public enum FloatingPanelLayoutReferenceGuide: Int {
     case superview = 0
     case safeArea = 1
@@ -43,3 +43,34 @@ extension FloatingPanelLayoutReferenceGuide {
         }
     }
 }
+
+/// A representation to specify a bounding box which limit the content size of a panel.
+@objc public enum FloatingPanelLayoutContentBoundingGuide: Int {
+    case none = 0
+    case superview = 1
+    case safeArea = 2
+}
+
+extension FloatingPanelLayoutContentBoundingGuide {
+    func layoutGuide(_ fpc: FloatingPanelController) -> LayoutGuideProvider? {
+        switch self {
+        case .superview:
+            return fpc.view
+        case .safeArea:
+            return fpc.fp_safeAreaLayoutGuide
+        case .none:
+            return nil
+        }
+    }
+    func maxBounds(_ fpc: FloatingPanelController) -> CGRect? {
+        switch self {
+        case .superview:
+            return fpc.view.bounds
+        case .safeArea:
+            return fpc.view.bounds.inset(by: fpc.fp_safeAreaInsets)
+        case .none:
+            return nil
+        }
+    }
+
+}

Sources/Logger.swift

@@ -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)
     }
 }

Sources/SurfaceView.swift

@@ -54,7 +54,12 @@ public class SurfaceAppearance: NSObject {
     ///
     /// Defaults to `.circular`.
     @available(iOS 13.0, *)
-    public lazy var cornerCurve: CALayerCornerCurve = .circular
+    public var cornerCurve: CALayerCornerCurve {
+        get { _cornerCurve ?? .circular }
+        set { _cornerCurve = newValue }
+    }
+
+    private var _cornerCurve: CALayerCornerCurve?
 
     /// An array of shadows used to create drop shadows underneath a surface view.
     public var shadows: [Shadow] = [Shadow()]
@@ -76,19 +81,23 @@ 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
 
     /// 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()
-    } }
+    /// 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()
+        }
+    }
 
     /// The content view to be assigned a view of the content view controller of `FloatingPanelController`
     public weak var contentView: UIView?
@@ -103,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.
     ///
@@ -125,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,
@@ -137,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)
@@ -163,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()
         }
     }
@@ -174,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)
+            )
         }
     }
 
@@ -204,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] = [] {
@@ -238,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() }
     }
@@ -306,7 +338,7 @@ public class SurfaceView: UIView {
         case .left, .right:
             grabberHandleWidthConstraint.constant = grabberHandleSize.height
             grabberHandleHeightConstraint.constant = grabberHandleSize.width
-       }
+        }
 
         super.updateConstraints()
     }
@@ -327,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() {
@@ -343,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
@@ -353,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, *) {
@@ -378,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
         }
@@ -408,26 +454,36 @@ public class SurfaceView: UIView {
         containerView.layer.borderWidth = appearance.borderWidth
     }
 
-    func set(contentView: 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 {
-            $0.priority = .required - 1;
-            $0.identifier = "FloatingPanel-surface-content"
-            return $0;
-        })
+        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
+            }
+        )
         self.contentViewTopConstraint = topConstraint
         self.contentViewLeftConstraint = leftConstraint
         self.contentViewRightConstraint = rightConstraint
@@ -437,4 +493,22 @@ public class SurfaceView: UIView {
     func hasStackView() -> Bool {
         return contentView?.subviews.reduce(false) { $0 || ($1 is UIStackView) } ?? false
     }
+
+    func grabberAreaContains(_ location: CGPoint) -> Bool {
+        // Sometimes a dragging finger's location is out of surface frame.
+        let cappedLocation: CGPoint
+        // Because the maximum width / height is out of bounds in CGRect.contains(_:)
+        let adjustment = 1 / fp_displayScale
+        switch position {
+        case .top:
+            cappedLocation = CGPoint(x: location.x, y: min(location.y, bounds.height - adjustment))
+        case .left:
+            cappedLocation = CGPoint(x: min(location.x, bounds.width - adjustment), y: location.y)
+        case .bottom:
+            cappedLocation = CGPoint(x: location.x, y: max(location.y, 0))
+        case .right:
+            cappedLocation = CGPoint(x: max(location.x, 0), y: location.y)
+        }
+        return grabberAreaFrame.contains(cappedLocation)
+    }
 }

Sources/Transitioning.swift

@@ -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)
@@ -104,7 +106,10 @@ class ModalPresentTransition: NSObject, UIViewControllerAnimatedTransitioning {
             fpc?.suspendTransitionAnimator(false)
             transitionContext.completeTransition(!transitionContext.transitionWasCancelled)
         }
-        return fpc.transitionAnimator!
+        guard let transitionAnimator = fpc.transitionAnimator else {
+            fatalError("The panel state must be `hidden` but it is `\(fpc.state)`")
+        }
+        return transitionAnimator
     }
 
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
@@ -116,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)
@@ -136,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()
     }
 }
-

Tests/ControllerTests.swift

@@ -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,17 +339,21 @@ private class MyZombieViewController: UIViewController, FloatingPanelLayout, Flo
         return .half
     }
 
-    var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-        return [
-            .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
+        ),
+    ]
 }

Tests/ExtensionTests.swift

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

Tests/LayoutTests.swift

@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
 
 import XCTest
+
 @testable import FloatingPanel
 
 class LayoutTests: XCTestCase {
@@ -17,23 +18,19 @@ class LayoutTests: XCTestCase {
         XCTAssertEqual(fpc.floatingPanel.layoutAdapter.leastExpandedState, .tip)
 
         class FloatingPanelLayoutWithHidden: FloatingPanelLayout {
-            var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
-                return [
-                    .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)
-                ]
-            }
+            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),
+            ]
             let initialState: FloatingPanelState = .hidden
             let position: FloatingPanelPosition = .bottom
         }
         class FloatingPanelLayout2Positions: FloatingPanelLayout {
-            var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
-                return [
-                    .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-                    .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
-                ]
-            }
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+                .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
+                .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
+            ]
             let initialState: FloatingPanelState = .tip
             let position: FloatingPanelPosition = .bottom
         }
@@ -48,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()
@@ -60,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()
@@ -89,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()
@@ -115,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() {
@@ -130,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,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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)
 
@@ -175,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)
 
@@ -189,33 +206,43 @@ class LayoutTests: XCTestCase {
         var pre: CGFloat
         var next: CGFloat
         pre = fpc.surfaceLocation.y
-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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)
 
@@ -224,12 +251,10 @@ class LayoutTests: XCTestCase {
 
     func test_updateInteractiveEdgeConstraintWithHidden() {
         class FloatingPanelLayout2Positions: FloatingPanelLayout {
-            var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
-                return [
-                    .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .bottom, referenceGuide: .safeArea),
-                    .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview),
-                ]
-            }
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+                .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .bottom, referenceGuide: .safeArea),
+                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .bottom, referenceGuide: .superview),
+            ]
             let initialState: FloatingPanelState = .hidden
             let position: FloatingPanelPosition = .bottom
         }
@@ -244,21 +269,27 @@ class LayoutTests: XCTestCase {
 
         var next: CGFloat
 
-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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)
 
@@ -267,12 +298,10 @@ class LayoutTests: XCTestCase {
 
     func test_updateInteractiveEdgeConstraintWithHidden_bottomEdge() {
         class FloatingPanelLayout2Positions: FloatingPanelLayout {
-            var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
-                [
-                    .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .bottom, referenceGuide: .safeArea),
-                    .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .top, referenceGuide: .superview),
-                ]
-            }
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+                .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .bottom, referenceGuide: .safeArea),
+                .hidden: FloatingPanelLayoutAnchor(absoluteInset: 0, edge: .top, referenceGuide: .superview),
+            ]
             let initialState: FloatingPanelState = .hidden
             let position: FloatingPanelPosition = .top
         }
@@ -287,21 +316,27 @@ class LayoutTests: XCTestCase {
 
         var next: CGFloat
 
-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: 100.0,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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)
 
@@ -310,12 +345,10 @@ class LayoutTests: XCTestCase {
 
     func test_updateInteractiveTopConstraintWithMinusInsets() {
         class FloatingPanelLayoutMinusInsets: FloatingPanelLayout {
-            var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
-                [
-                    .full: FloatingPanelLayoutAnchor(absoluteInset: -200, edge: .top, referenceGuide: .safeArea),
-                    .tip: FloatingPanelLayoutAnchor(absoluteInset: -200, edge: .bottom, referenceGuide: .safeArea),
-                ]
-            }
+            let anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] = [
+                .full: FloatingPanelLayoutAnchor(absoluteInset: -200, edge: .top, referenceGuide: .safeArea),
+                .tip: FloatingPanelLayoutAnchor(absoluteInset: -200, edge: .bottom, referenceGuide: .safeArea),
+            ]
             let initialState: FloatingPanelState = .full
             let position: FloatingPanelPosition = .bottom
         }
@@ -327,21 +360,27 @@ class LayoutTests: XCTestCase {
         let tipPos = fpc.surfaceLocation(for: .tip).y
 
         var next: CGFloat
-        fpc.floatingPanel.layoutAdapter.updateInteractiveEdgeConstraint(diff: -100.0,
-                                                                        overflow: false,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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,
-                                                                        overflow: true,
-                                                                        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)
 
@@ -376,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)
     }
 
@@ -385,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
@@ -399,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)
@@ -420,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() {
@@ -486,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)
         }
     }
 
@@ -566,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))
         }
     }
 
@@ -616,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))
         }
     }
 }

Tests/StateTests.swift

@@ -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)
     }

Tests/SurfaceViewTests.swift

@@ -1,6 +1,7 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
 
 import XCTest
+
 @testable import FloatingPanel
 
 class SurfaceViewTests: XCTestCase {
@@ -48,46 +49,49 @@ class SurfaceViewTests: XCTestCase {
     }
 
     func test_surfaceView_contentView() {
-        XCTContext.runActivity(named: "Bottom sheet") { _ in
+        for (position, mode, line) in [
+            (.top, .static, #line),
+            (.top, .fitToBounds, #line),
+            (.bottom, .static, #line),
+            (.bottom, .fitToBounds, #line),
+        ] as [(FloatingPanelPosition, FloatingPanelController.ContentMode, UInt)] {
             let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
+            surface.position = position
             surface.layoutIfNeeded()
 
             let contentView = UIView()
-            surface.set(contentView: contentView)
+            surface.set(contentView: contentView, mode: mode)
 
             let height = surface.bounds.height * 2
             surface.containerOverflow = height
             surface.setNeedsLayout()
             surface.layoutIfNeeded()
-            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds)
-        }
 
-        XCTContext.runActivity(named: "Top sheet") { _ in
-            let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
-            surface.position = .top
-            surface.layoutIfNeeded()
-
-            let contentView = UIView()
-            surface.set(contentView: contentView)
-
-            let height = surface.bounds.height * 2
-            surface.containerOverflow = height
-            surface.setNeedsLayout()
-            surface.layoutIfNeeded()
-            XCTAssertEqual(surface.containerView.frame, CGRect(x: 0.0, y: -height, width: 320.0, height: 480.0 * 3))
-            XCTAssertEqual(surface.convert(surface.contentView?.frame ?? .zero, from: surface.containerView),
-                           surface.bounds)
+            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)
+            case .bottom:
+                XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds, line: line)
+            default:
+                break
+            }
         }
     }
 
-
     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)
 
@@ -95,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)
         }
@@ -113,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)
         }
     }
 
@@ -140,46 +144,45 @@ class SurfaceViewTests: XCTestCase {
     }
 
     func test_surfaceView_contentInsets() {
-        XCTContext.runActivity(named: "Top sheet") { _ in
+        for (position, mode, line) in [
+            (.top, .static, #line),
+            (.top, .fitToBounds, #line),
+            (.bottom, .static, #line),
+            (.bottom, .fitToBounds, #line),
+        ] as [(FloatingPanelPosition, FloatingPanelController.ContentMode, UInt)] {
             let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
-            surface.position = .top
+            surface.position = position
             let contentView = UIView()
-            surface.set(contentView: contentView)
+            surface.set(contentView: contentView, mode: mode)
             surface.layoutIfNeeded()
-            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds)
+            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds, line: line)
             surface.contentPadding = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
             surface.setNeedsLayout()
             surface.layoutIfNeeded()
-            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds.inset(by: surface.contentPadding))
-        }
-        XCTContext.runActivity(named: "Bottom sheet") { _ in
-            let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
-            let contentView = UIView()
-            surface.set(contentView: contentView)
-            surface.layoutIfNeeded()
-            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds)
-            surface.contentPadding = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
-            surface.setNeedsLayout()
-            surface.layoutIfNeeded()
-            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds.inset(by: surface.contentPadding))
+            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds.inset(by: surface.contentPadding), line: line)
         }
     }
 
     func test_surfaceView_containerMargins_and_contentInsets() {
-        let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
-        let contentView = UIView()
-        surface.set(contentView: contentView)
-        surface.layoutIfNeeded()
-        XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds)
-        surface.containerMargins = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
-        surface.contentPadding = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
-        surface.setNeedsLayout()
-        surface.layoutIfNeeded()
-        XCTAssertEqual(surface.containerView.frame, surface.bounds.inset(by: surface.containerMargins))
-        XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.containerView.bounds.inset(by: surface.contentPadding))
+        for (mode, line) in [
+            (.static, #line),
+            (.fitToBounds, #line),
+        ] as [(FloatingPanelController.ContentMode, UInt)] {
+            let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
+            let contentView = UIView()
+            surface.set(contentView: contentView, mode: mode)
+            surface.layoutIfNeeded()
+            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.bounds, line: line)
+            surface.containerMargins = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
+            surface.contentPadding = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
+            surface.setNeedsLayout()
+            surface.layoutIfNeeded()
+            XCTAssertEqual(surface.containerView.frame, surface.bounds.inset(by: surface.containerMargins), line: line)
+            XCTAssertEqual(surface.contentView?.frame ?? .zero, surface.containerView.bounds.inset(by: surface.contentPadding), line: line)
+        }
     }
 
-    func test_surfaceView_cornderRaduis() {
+    func test_surfaceView_cornerRadius() {
         let surface = SurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
         XCTAssert(surface.containerView.layer.cornerRadius == 0.0)
         XCTAssert(surface.containerView.layer.masksToBounds == false)
@@ -203,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)
 
@@ -227,4 +230,104 @@ class SurfaceViewTests: XCTestCase {
         XCTAssert(surface.containerView.layer.borderColor == UIColor.red.cgColor)
         XCTAssert(surface.containerView.layer.borderWidth == 3.0)
     }
+
+    func test_surfaceView_grabberArea() {
+        let sv = SurfaceView()
+        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
+                )
+            )
+        }
+        // Bottom
+        do {
+            sv.position = .bottom
+            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
+                )
+            )
+        }
+        // Right
+        do {
+            sv.position = .right
+            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)
+        // Top
+        do {
+            sv.position = .top
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: 0, y: sv.bounds.height)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width / 2, y: sv.bounds.height)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width / 2, y: sv.bounds.height + 2)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: -2, y: sv.bounds.height)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: -2, y: -2)))
+        }
+        // Bottom
+        do {
+            sv.position = .bottom
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: 0, y: 0)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width / 2, y: 0)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width / 2, y: -2)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: -2, y: 0)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: -2, y: -2)))
+        }
+        // Left
+        do {
+            sv.position = .left
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width, y: 0)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width, y: sv.bounds.height / 2)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: sv.bounds.width + 2, y: sv.bounds.height / 2)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: sv.bounds.width, y: -2)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: -2, y: -2)))
+        }
+        // Right
+        do {
+            sv.position = .right
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: 0, y: 0)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: 0, y: sv.bounds.height / 2)))
+            XCTAssertTrue(sv.grabberAreaContains(.init(x: -2, y: sv.bounds.height / 2)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: 0, y: -2)))
+            XCTAssertFalse(sv.grabberAreaContains(.init(x: -2, y: -2)))
+        }
+    }
+
 }

Tests/TestSupports.swift

@@ -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),
@@ -77,3 +78,24 @@ class FloatingPanelProjectableBehavior: FloatingPanelBehavior {
         return true
     }
 }
+
+class MockTransitionCoordinator: NSObject, UIViewControllerTransitionCoordinator {
+    func animate(alongsideTransition animation: ((UIViewControllerTransitionCoordinatorContext) -> Void)?, completion: ((UIViewControllerTransitionCoordinatorContext) -> Void)? = nil) -> Bool { true }
+    func animateAlongsideTransition(in view: UIView?, animation: ((UIViewControllerTransitionCoordinatorContext) -> Void)?, completion: ((UIViewControllerTransitionCoordinatorContext) -> Void)? = nil) -> Bool { true }
+    func notifyWhenInteractionEnds(_ handler: @escaping (UIViewControllerTransitionCoordinatorContext) -> Void) {}
+    func notifyWhenInteractionChanges(_ handler: @escaping (UIViewControllerTransitionCoordinatorContext) -> Void) {}
+    var isAnimated: Bool = false
+    var presentationStyle: UIModalPresentationStyle = .fullScreen
+    var initiallyInteractive: Bool = false
+    var isInterruptible: Bool = false
+    var isInteractive: Bool = false
+    var isCancelled: Bool = false
+    var transitionDuration: TimeInterval = 0.25
+    var percentComplete: CGFloat = 0
+    var completionVelocity: CGFloat = 0
+    var completionCurve: UIView.AnimationCurve = .easeInOut
+    func viewController(forKey key: UITransitionContextViewControllerKey) -> UIViewController? { nil }
+    func view(forKey key: UITransitionContextViewKey) -> UIView? { nil }
+    var containerView: UIView { UIView() }
+    var targetTransform: CGAffineTransform = .identity
+}

Tests/TestingApp/AppDelegate.swift

@@ -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
-    }
-}

Tests/TestingApp/Info.plist

@@ -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>

Tests/TestingApp/LaunchScreen.storyboard

@@ -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>

build-tools/Package.resolved

@@ -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
+}

build-tools/Package.swift

@@ -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")
+            ]
+        ),
+    ]
+)

build-tools/Plugins/SwiftFormatBuildTool/plugin.swift

@@ -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

build-tools/Plugins/SwiftFormatCommand/plugin.swift

@@ -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