Release 1.7.5

Fix the panel behavior in a sheet modal (#358 )
* Add "Show Panel in Sheet Modal" sample * Fix the behavior in a sheet modal
2020-06-03 22:33:02 +09:00 · 2020-06-03 22:31:30 +09:00 · 2020-05-30 10:11:12 +09:00 · 2020-05-30 09:44:58 +09:00 · 2020-05-23 09:07:01 +09:00 · 2020-05-23 08:12:01 +09:00
23 changed files with 1015 additions and 275 deletions
@@ -2,7 +2,7 @@
 >
 > Please remove this line and everything above it before submitting.

-### Short description
+### Description

 ### Expected behavior

@@ -12,16 +12,29 @@

 **Code example that reproduces the issue**

+
+**How do you display panel(s)?**
+
+* Add as child view controllers
+* Present modally
+
+**How many panels do you displays?**
+
+* 1 
+* 2+
+
 ### Environment

 **Library version**

 **Installation method**

- [ ] CocoaPods
- [ ] Carthage
- [ ] Git submodules
-
+* CocoaPods
+* Carthage
+* Swift Package Manager
+ 
 **iOS version(s)**

+
 **Xcode version**
+
@@ -30,6 +30,9 @@ xcuserdata/
 *.dSYM.zip
 *.dSYM

+## Swift Package Manager Specific
+.swiftpm/
+
 ## Playgrounds
 timeline.xctimeline
 playground.xcworkspace
@@ -22,7 +22,7 @@ jobs:
    osx_image: xcode10
    name: "Swift 4.2"
  - script: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.0 clean build
-    osx_image: xcode10.2
+    osx_image: xcode10.3
    name: "Swift 5.0"
  - script: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.1 SUPPORTS_MACCATALYST=NO clean build
    # SUPPORTS_MACCATALYST=NO because Xcode 11 runs on macOS 10.14 in Travis CI
@@ -30,29 +30,32 @@ jobs:
    name: "Swift 5.1"

  - stage: "Tests"
-    osx_image: xcode10.2
+    osx_image: xcode10.3
    script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=10.3.1,name=iPhone SE'
    name: "iPhone SE (iOS 10.3)"
  - script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=11.4,name=iPhone 7'
-    osx_image: xcode10.2
+    osx_image: xcode10.3
    name: "iPhone 7 (iOS 11.4)"
  - script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=12.2,name=iPhone X'
-    osx_image: xcode10.2
+    osx_image: xcode10.3
    name: "iPhone X (iOS 12.2)"
+  - script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=13.0,name=iPhone 11'
+    osx_image: xcode11
+    name: "iPhone X (iOS 13.0)"

  - stage: Build examples
-    osx_image: xcode10.2
+    osx_image: xcode11
    script: xcodebuild -scheme Maps -sdk iphonesimulator clean build
    name: "Maps"
  - script: xcodebuild -scheme Stocks -sdk iphonesimulator clean build
-    osx_image: xcode10.2
+    osx_image: xcode11
    name: "Stocks"
  - script: xcodebuild -scheme Samples -sdk iphonesimulator clean build
-    osx_image: xcode10.2
+    osx_image: xcode11
    name: "Samples"

  - stage: Carthage
-    osx_image: xcode10.2
+    osx_image: xcode11
    before_install:
    - brew update
    - brew outdated carthage || brew upgrade carthage
@@ -60,7 +63,9 @@ jobs:
    - carthage build --no-skip-current

  - stage: CocoaPods
-    osx_image: xcode10.2
+    osx_image: xcode11
+    before_install: 
+    - gem install cocoapods
    script:
    - pod spec lint --allow-warnings
    - pod lib lint --allow-warnings
@@ -7,6 +7,7 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		543844BD23D2BE2000D5EDE4 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 543844BC23D2BE2000D5EDE4 /* MapKit.framework */; };
 		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 */; };
@@ -31,6 +32,7 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
+		543844BC23D2BE2000D5EDE4 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
 		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>"; };
@@ -46,6 +48,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				543844BD23D2BE2000D5EDE4 /* MapKit.framework in Frameworks */,
 				549D23D2233C77D5008EF4D7 /* FloatingPanel.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -53,12 +56,21 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		543844BB23D2BE1F00D5EDE4 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				543844BC23D2BE2000D5EDE4 /* MapKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		54B5111D216C3D840033A6F3 = {
 			isa = PBXGroup;
 			children = (
 				549D23D1233C77D5008EF4D7 /* FloatingPanel.framework */,
 				54B51128216C3D840033A6F3 /* Maps */,
 				54B51127216C3D840033A6F3 /* Products */,
+				543844BB23D2BE1F00D5EDE4 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -107,6 +107,7 @@ class ViewController: UIViewController, MKMapViewDelegate, UISearchBarDelegate,
            let progress = max(0.0, min((tipY  - y) / 44.0, 1.0))
            self.searchVC.tableView.alpha = progress
        }
+        debugPrint("NearbyPosition : ",vc.nearbyPosition)
    }

    func floatingPanelWillBeginDragging(_ vc: FloatingPanelController) {
@@ -177,7 +178,7 @@ class SearchPanelViewController: UIViewController, UITableViewDataSource, UITabl
    }

    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 2
+        return 100
    }

    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -188,12 +189,10 @@ class SearchPanelViewController: UIViewController, UITableViewDataSource, UITabl
                cell.iconImageView.image = UIImage(named: "mark")
                cell.titleLabel.text = "Marked Location"
                cell.subTitleLabel.text = "Golden Gate Bridge, San Francisco"
-            case 1:
+            default:
                cell.iconImageView.image = UIImage(named: "like")
                cell.titleLabel.text = "Favorites"
                cell.subTitleLabel.text = "0 Places"
-            default:
-                break
            }
        }
        return cell
@@ -275,12 +274,12 @@ class SearchHeaderView: UIView {

 extension UISearchBar {
    func setSearchText(fontSize: CGFloat) {
-        #if swift(>=5.1) // Xcode 11 or later
+        if #available(iOS 13, *) {
            let font = searchTextField.font
            searchTextField.font = font?.withSize(fontSize)
-        #else
+        } else {
            let textField = value(forKey: "_searchField") as! UITextField
            textField.font = textField.font?.withSize(fontSize)
-        #endif
+        }
    }
 }
@@ -294,7 +294,7 @@
 			);
 			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";
+			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 */

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RoN-h0-uBD">
-    <device id="retina5_9" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RoN-h0-uBD">
+    <device id="retina5_9" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
@@ -13,7 +11,7 @@
        <!--Navigation Controller-->
        <scene sceneID="Cjh-iX-VQw">
            <objects>
-                <navigationController id="RoN-h0-uBD" sceneMemberID="viewController">
+                <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"/>
                        <autoresizingMask key="autoresizingMask"/>
@@ -537,6 +535,23 @@
                                    <action selector="closeWithSender:" destination="YC8-ae-15L" eventType="touchUpInside" id="Z2v-19-S5k"/>
                                </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="52" width="148.33333333333334" 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.3333333333333357" width="91.333333333333329" height="20.333333333333332"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0MA-lV-KjS">
+                                        <rect key="frame" x="99.333333333333329" y="0.0" width="50.999999999999986" height="31"/>
+                                        <connections>
+                                            <action selector="modeChanged:" destination="YC8-ae-15L" eventType="valueChanged" id="IQ8-u2-Rib"/>
+                                        </connections>
+                                    </switch>
+                                </subviews>
+                            </stackView>
                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="22" translatesAutoresizingMaskIntoConstraints="NO" id="tP3-oJ-4EB">
                                <rect key="frame" x="130.66666666666666" y="132" width="114" height="134"/>
                                <subviews>
@@ -577,9 +592,11 @@
                            <constraint firstItem="tP3-oJ-4EB" firstAttribute="top" secondItem="aOK-7l-cA6" secondAttribute="top" 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="qux-uG-4o2" firstAttribute="leading" secondItem="g7l-kO-y7q" secondAttribute="leading" constant="8" id="zXb-R9-bMO"/>
                        </constraints>
                        <viewLayoutGuide key="safeArea" id="aOK-7l-cA6"/>
                        <connections>
@@ -591,6 +608,8 @@
                    <size key="freeformSize" width="375" height="778"/>
                    <connections>
                        <outlet property="closeButton" destination="noi-1a-5bZ" id="eWQ-ha-8y7"/>
+                        <outlet property="intrinsicHeightConstraint" destination="vKQ-h9-uKt" id="QpA-WD-b17"/>
+                        <outlet property="modeChangeView" destination="qux-uG-4o2" id="1Nq-fE-dXw"/>
                        <segue destination="bYI-y3-Rzb" kind="show" identifier="ShowSegue" id="r1P-2i-NDe"/>
                    </connections>
                </viewController>
@@ -611,7 +630,7 @@
                    </connections>
                </pongPressGestureRecognizer>
            </objects>
-            <point key="canvasLocation" x="655" y="734"/>
+            <point key="canvasLocation" x="653.60000000000002" y="733.74384236453204"/>
        </scene>
        <!--Debug Text View Controller-->
        <scene sceneID="Bkq-O7-q4A">
@@ -17,13 +17,18 @@ class SampleListViewController: UIViewController {
        case trackingTextView
        case showDetail
        case showModal
-        case showFloatingPanelModal
+        case showPanelModal
+        case showMultiPanelModal
+        case showPanelInSheetModal
        case showTabBar
        case showPageView
+        case showPageContentView
        case showNestedScrollView
        case showRemovablePanel
        case showIntrinsicView
        case showContentInset
+        case showContainerMargins
+        case showNavigationController

        var name: String {
            switch self {
@@ -31,13 +36,18 @@ class SampleListViewController: UIViewController {
            case .trackingTextView: return "Scroll tracking(TextView)"
            case .showDetail: return "Show Detail Panel"
            case .showModal: return "Show Modal"
-            case .showFloatingPanelModal: return "Show Floating Panel Modal"
+            case .showPanelModal: return "Show Panel Modal"
+            case .showMultiPanelModal: return "Show Multi Panel Modal"
+            case .showPanelInSheetModal: return "Show Panel in Sheet Modal"
            case .showTabBar: return "Show Tab Bar"
            case .showPageView: return "Show Page View"
+            case .showPageContentView: return "Show Page Content View"
            case .showNestedScrollView: return "Show Nested ScrollView"
            case .showRemovablePanel: return "Show Removable Panel"
            case .showIntrinsicView: return "Show Intrinsic View"
            case .showContentInset: return "Show with ContentInset"
+            case .showContainerMargins: return "Show with ContainerMargins"
+            case .showNavigationController: return "Show Navigation Controller"
            }
        }

@@ -47,13 +57,18 @@ class SampleListViewController: UIViewController {
            case .trackingTextView: return "ConsoleViewController"
            case .showDetail: return "DetailViewController"
            case .showModal: return "ModalViewController"
-            case .showFloatingPanelModal: return nil
+            case .showMultiPanelModal: return nil
+            case .showPanelInSheetModal: return nil
+            case .showPanelModal: return nil
            case .showTabBar: return "TabBarViewController"
            case .showPageView: return nil
+            case .showPageContentView: return nil
            case .showNestedScrollView: return "NestedScrollViewController"
            case .showRemovablePanel: return "DetailViewController"
            case .showIntrinsicView: return "IntrinsicViewController"
            case .showContentInset: return nil
+            case .showContainerMargins: return nil
+            case .showNavigationController: return "RootNavigationController"
            }
        }
    }
@@ -67,24 +82,14 @@ class SampleListViewController: UIViewController {
    var mainPanelObserves: [NSKeyValueObservation] = []
    var settingsObserves: [NSKeyValueObservation] = []

-    lazy var pages: [UIViewController] = {
-        let page1 = FloatingPanelController(delegate: self)
-        page1.view.backgroundColor = .blue
-        page1.show()
-        let page2 = FloatingPanelController(delegate: self)
-        page2.view.backgroundColor = .red
-        page2.show()
-        let page3 = FloatingPanelController(delegate: self)
-        page3.view.backgroundColor = .green
-        page3.show()
-        return [page1, page2, page3]
-    }()
+    var pages: [UIViewController] = []

    override func viewDidLoad() {
        super.viewDidLoad()
        tableView.dataSource = self
        tableView.delegate = self
        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "Cell")
+        automaticallyAdjustsScrollViewInsets = false

        let searchController = UISearchController(searchResultsController: nil)
        if #available(iOS 11.0, *) {
@@ -97,11 +102,14 @@ class SampleListViewController: UIViewController {

        let contentVC = DebugTableViewController()
        addMainPanel(with: contentVC)
+
+        var insets = UIEdgeInsets.zero
+        insets.bottom += 69.0
+        tableView.contentInset = insets
    }

    override func viewDidAppear(_ animated: Bool) {
        super.viewDidAppear(animated)
-
        if #available(iOS 11.0, *) {
            if let observation = navigationController?.navigationBar.observe(\.prefersLargeTitles, changeHandler: { (bar, _) in
                self.tableView.reloadData()
@@ -119,15 +127,15 @@ class SampleListViewController: UIViewController {
    func addMainPanel(with contentVC: UIViewController) {
        mainPanelObserves.removeAll()

-        // Initialize FloatingPanelController
+        let oldMainPanelVC = mainPanelVC
+
        mainPanelVC = FloatingPanelController()
        mainPanelVC.delegate = self
+        mainPanelVC.contentInsetAdjustmentBehavior = .always

-        // Initialize FloatingPanelController and add the view
        mainPanelVC.surfaceView.cornerRadius = 6.0
        mainPanelVC.surfaceView.shadowHidden = false

-        // Set a content view controller
        mainPanelVC.set(contentViewController: contentVC)

        // Enable tap-to-hide and removal interaction
@@ -137,11 +145,17 @@ class SampleListViewController: UIViewController {
            tapGesture.cancelsTouchesInView = false
            tapGesture.numberOfTapsRequired = 2
            mainPanelVC.surfaceView.addGestureRecognizer(tapGesture)
+        case .showPageContentView:
+            if let page = (mainPanelVC.contentViewController as? UIPageViewController)?.viewControllers?.first {
+                mainPanelVC.track(scrollView: (page as! DebugTableViewController).tableView)
+            }
        case .showRemovablePanel, .showIntrinsicView:
            mainPanelVC.isRemovalInteractionEnabled = true

            let backdropTapGesture = UITapGestureRecognizer(target: self, action: #selector(handleBackdrop(tapGesture:)))
            mainPanelVC.backdropView.addGestureRecognizer(backdropTapGesture)
+        case .showNavigationController:
+            mainPanelVC.contentInsetAdjustmentBehavior = .never
        default:
            break
        }
@@ -159,12 +173,23 @@ class SampleListViewController: UIViewController {
            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? SampleListViewController) {
+                rootVC.loadViewIfNeeded()
+                mainPanelVC.track(scrollView: rootVC.tableView)
+            }
        default:
            break
        }

        //  Add FloatingPanel to self.view
-        mainPanelVC.addPanel(toParent: self, belowView: nil, animated: true)
+        if let oldMainPanelVC = oldMainPanelVC {
+            oldMainPanelVC.removePanelFromParent(animated: true, completion: {
+                self.mainPanelVC.addPanel(toParent: self, belowView: nil, animated: true)
+            })
+        } else {
+            mainPanelVC.addPanel(toParent: self, belowView: nil, animated: true)
+        }
    }

    @objc
@@ -251,6 +276,8 @@ extension SampleListViewController: UITableViewDelegate {
        }()

        self.currentMenu = menu
+        detailPanelVC?.removePanelFromParent(animated: true, completion: nil)
+        detailPanelVC = nil

        switch menu {
        case .showDetail:
@@ -258,6 +285,7 @@ extension SampleListViewController: UITableViewDelegate {

            // Initialize FloatingPanelController
            detailPanelVC = FloatingPanelController()
+            detailPanelVC.delegate = self

            // Initialize FloatingPanelController and add the view
            detailPanelVC.surfaceView.cornerRadius = 6.0
@@ -266,6 +294,9 @@ extension SampleListViewController: UITableViewDelegate {
            // Set a content view controller
            detailPanelVC.set(contentViewController: contentVC)

+            detailPanelVC.contentMode = .fitToBounds
+            (contentVC as? DetailViewController)?.intrinsicHeightConstraint.priority = .defaultLow
+
            //  Add FloatingPanel to self.view
            detailPanelVC.addPanel(toParent: self, belowView: nil, animated: true)
        case .showModal, .showTabBar:
@@ -274,6 +305,13 @@ extension SampleListViewController: UITableViewDelegate {
            present(modalVC, animated: true, completion: nil)

        case .showPageView:
+            pages = [UIColor.blue, .red, .green].compactMap({ (color) -> UIViewController in
+                let page = FloatingPanelController(delegate: self)
+                page.view.backgroundColor = color
+                page.show()
+                return page
+            })
+
            let pageVC = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [:])
            let closeButton = UIButton(type: .custom)
            pageVC.view.addSubview(closeButton)
@@ -289,9 +327,18 @@ extension SampleListViewController: UITableViewDelegate {
            pageVC.modalPresentationStyle = .fullScreen
            present(pageVC, animated: true, completion: nil)

-        case .showFloatingPanelModal:
+        case .showPageContentView:
+            pages = [DebugTableViewController(), DebugTableViewController(), DebugTableViewController()]
+            let pageVC = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [:])
+            pageVC.dataSource = self
+            pageVC.delegate = self
+            pageVC.setViewControllers([pages[0]], direction: .forward, animated: false, completion: nil)
+            self.addMainPanel(with: pageVC)
+        case .showPanelModal:
            let fpc = FloatingPanelController()
            let contentVC = self.storyboard!.instantiateViewController(withIdentifier: "DetailViewController")
+            contentVC.loadViewIfNeeded()
+            (contentVC as? DetailViewController)?.modeChangeView.isHidden = true
            fpc.set(contentViewController: contentVC)
            fpc.delegate = self

@@ -301,11 +348,29 @@ extension SampleListViewController: UITableViewDelegate {
            fpc.isRemovalInteractionEnabled = true

            self.present(fpc, animated: true, completion: nil)
-            
+
+        case .showMultiPanelModal:
+            let fpc = MultiPanelController()
+            self.present(fpc, animated: true, completion: nil)
+
+        case .showPanelInSheetModal:
+            let fpc = FloatingPanelController()
+            let contentVC = UIViewController()
+            fpc.set(contentViewController: contentVC)
+            fpc.delegate = self
+
+            fpc.surfaceView.cornerRadius = 38.5
+            fpc.surfaceView.shadowHidden = false
+            fpc.isRemovalInteractionEnabled = true
+
+            let mvc = UIViewController()
+            mvc.view.backgroundColor = UIColor(displayP3Red: 2/255, green: 184/255, blue: 117/255, alpha: 1.0)
+            fpc.addPanel(toParent: mvc)
+            self.present(mvc, animated: true, completion: nil)
        case .showContentInset:
            let contentViewController = UIViewController()
            contentViewController.view.backgroundColor = .green
-            
+
            let fpc = FloatingPanelController()
            fpc.set(contentViewController: contentViewController)
            fpc.surfaceView.contentInsets = .init(top: 20, left: 20, bottom: 20, right: 20)
@@ -313,11 +378,23 @@ extension SampleListViewController: UITableViewDelegate {
            fpc.delegate = self
            fpc.isRemovalInteractionEnabled = true
            self.present(fpc, animated: true, completion: nil)
-        default:
-            detailPanelVC?.removePanelFromParent(animated: true, completion: nil)
-            mainPanelVC?.removePanelFromParent(animated: true) {
-                self.addMainPanel(with: contentVC)
+
+        case .showContainerMargins:
+            let fpc = FloatingPanelController()
+            fpc.surfaceView.cornerRadius = 38.5
+            fpc.surfaceView.backgroundColor = .red
+            fpc.surfaceView.containerMargins = .init(top: 24.0, left: 8.0, bottom: layoutInsets.bottom, right: 8.0)
+            #if swift(>=5.1) // Actually Xcode 11 or later
+            if #available(iOS 13.0, *) {
+                fpc.surfaceView.layer.cornerCurve = .continuous
            }
+            #endif
+
+            fpc.delegate = self
+            fpc.isRemovalInteractionEnabled = true
+            self.present(fpc, animated: true, completion: nil)
+        default:
+            self.addMainPanel(with: contentVC)
        }
    }

@@ -327,6 +404,14 @@ extension SampleListViewController: UITableViewDelegate {
 }

 extension SampleListViewController: FloatingPanelControllerDelegate {
+    func floatingPanel(_ vc: FloatingPanelController, contentOffsetForPinning trackedScrollView: UIScrollView) -> CGPoint {
+        if currentMenu == .showNavigationController, #available(iOSApplicationExtension 11.0, *) {
+            // 148.0 is the SafeArea's top value for a navigation bar with a large title.
+            return CGPoint(x: 0.0, y: 0.0 - trackedScrollView.contentInset.top - 148.0)
+        }
+        return CGPoint(x: 0.0, y: 0.0 - trackedScrollView.contentInset.top)
+    }
+
    func floatingPanel(_ vc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout? {
        if vc == settingsPanelVC {
            return IntrinsicPanelLayout()
@@ -337,7 +422,7 @@ extension SampleListViewController: FloatingPanelControllerDelegate {
            return newCollection.verticalSizeClass == .compact ? RemovablePanelLandscapeLayout() :  RemovablePanelLayout()
        case .showIntrinsicView:
            return IntrinsicPanelLayout()
-        case .showFloatingPanelModal:
+        case .showPanelModal:
            if vc != mainPanelVC && vc != detailPanelVC {
                return ModalPanelLayout()
            }
@@ -407,6 +492,14 @@ extension SampleListViewController: UIPageViewControllerDataSource {
        return pages[index - 1]
    }
 }
+extension SampleListViewController: UIPageViewControllerDelegate {
+    // For showPageContent
+    func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
+        if completed, let page = pageViewController.viewControllers?.first {
+            (pageViewController.parent as! FloatingPanelController).track(scrollView: (page as! DebugTableViewController).tableView)
+        }
+    }
+}

 class IntrinsicPanelLayout: FloatingPanelIntrinsicLayout { }

@@ -587,7 +680,8 @@ class InspectableViewController: UIViewController {
 }

 class DebugTableViewController: InspectableViewController {
-    weak var tableView: UITableView!
+    lazy var tableView = UITableView(frame: .zero, style: .plain)
+    lazy var buttonStackView = UIStackView()
    var items: [String] = []
    var itemHeight: CGFloat = 66.0

@@ -601,8 +695,6 @@ class DebugTableViewController: InspectableViewController {
    override func viewDidLoad() {
        super.viewDidLoad()

-        let tableView = UITableView(frame: .zero,
-                                    style: .plain)
        view.addSubview(tableView)
        tableView.translatesAutoresizingMaskIntoConstraints = false
        NSLayoutConstraint.activate([
@@ -613,18 +705,17 @@ class DebugTableViewController: InspectableViewController {
            ])
        tableView.dataSource = self
        tableView.delegate = self
-        self.tableView = tableView
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "Cell")

-        let stackView = UIStackView()
-        view.addSubview(stackView)
-        stackView.axis = .vertical
-        stackView.distribution = .fillEqually
-        stackView.alignment = .trailing
-        stackView.spacing = 10.0
-        stackView.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(buttonStackView)
+        buttonStackView.axis = .vertical
+        buttonStackView.distribution = .fillEqually
+        buttonStackView.alignment = .trailing
+        buttonStackView.spacing = 10.0
+        buttonStackView.translatesAutoresizingMaskIntoConstraints = false
        NSLayoutConstraint.activate([
-            stackView.topAnchor.constraint(equalTo: view.topAnchor, constant: 22.0),
-            stackView.rightAnchor.constraint(equalTo: view.rightAnchor, constant: -22.0),
+            buttonStackView.topAnchor.constraint(equalTo: view.topAnchor, constant: 22.0),
+            buttonStackView.rightAnchor.constraint(equalTo: view.rightAnchor, constant: -22.0),
            ])

        for menu in Menu.allCases {
@@ -640,13 +731,12 @@ class DebugTableViewController: InspectableViewController {
                button.addTarget(self, action: #selector(reorderItems), for: .touchUpInside)
                reorderButton = button
            }
-            stackView.addArrangedSubview(button)
+            buttonStackView.addArrangedSubview(button)
        }

        for i in 0...100 {
            items.append("Items \(i)")
        }
-        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "Cell")
    }

    @objc func animateScroll() {
@@ -750,6 +840,8 @@ extension DebugTableViewController: UITableViewDelegate {
 }

 class DetailViewController: InspectableViewController {
+    @IBOutlet weak var modeChangeView: UIStackView!
+    @IBOutlet weak var intrinsicHeightConstraint: NSLayoutConstraint!
    @IBOutlet weak var closeButton: UIButton!
    @IBAction func close(sender: UIButton) {
        // (self.parent as? FloatingPanelController)?.removePanelFromParent(animated: true, completion: nil)
@@ -766,6 +858,10 @@ class DetailViewController: InspectableViewController {
            break
        }
    }
+    @IBAction func modeChanged(_ sender: Any) {
+        guard let fpc = parent as? FloatingPanelController else { return }
+        fpc.contentMode = (fpc.contentMode == .static) ? .fitToBounds : .static
+    }

    @IBAction func tapped(_ sender: Any) {
        print("Detail panel is tapped!")
@@ -786,8 +882,7 @@ class ModalViewController: UIViewController, FloatingPanelControllerDelegate {

    var isNewlayout: Bool = false

-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
+    override func viewDidLoad() {
        // Initialize FloatingPanelController
        fpc = FloatingPanelController()
        fpc.delegate = self
@@ -807,8 +902,8 @@ class ModalViewController: UIViewController, FloatingPanelControllerDelegate {
        fpc.addPanel(toParent: self, belowView: safeAreaView)
    }

-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
        //  Remove FloatingPanel from a view
        fpc.removePanelFromParent(animated: false)
    }
@@ -869,20 +964,15 @@ class TabBarContentViewController: UIViewController {
            }
        }
    }
-    var fpc: FloatingPanelController!
+    lazy var fpc = FloatingPanelController()
    var consoleVC: DebugTextViewController!

    var threeLayout: ThreeTabBarPanelLayout!
    var tab3Mode: Tab3Mode = .changeAutoLayout
    var switcherLabel: UILabel!

-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        // Initialize FloatingPanelController
-        fpc = FloatingPanelController()
+    override func viewDidLoad() {
        fpc.delegate = self
-
-        // Initialize FloatingPanelController and add the view
        fpc.surfaceView.cornerRadius = 6.0
        fpc.surfaceView.shadowHidden = false

@@ -932,12 +1022,6 @@ class TabBarContentViewController: UIViewController {
        fpc.updateLayout()
    }

-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        //  Remove FloatingPanel from a view
-        fpc.removePanelFromParent(animated: false)
-    }
-
    // MARK: - Action

    @IBAction func close(sender: UIButton) {
@@ -1135,8 +1219,8 @@ class TwoTabBarPanelLayout: FloatingPanelLayout {
 }

 class TwoTabBarPanelBehavior: FloatingPanelBehavior {
-    func allowsRubberBanding(for edge: UIRectEdge) -> Bool {
-        return (edge == .bottom || edge == .top)
+    func allowsRubberBanding(for edges: UIRectEdge) -> Bool {
+        return [UIRectEdge.top, UIRectEdge.bottom].contains(edges)
    }
 }

@@ -1215,3 +1299,72 @@ class SettingsViewController: InspectableViewController {
        navigationController?.navigationBar.isTranslucent = sender.isOn
    }
 }
+
+// MARK -: Multi Panel
+
+import WebKit
+final class MultiPanelController: FloatingPanelController, FloatingPanelControllerDelegate {
+
+    private final class FirstPanelContentViewController: UIViewController {
+
+        lazy var webView: WKWebView = WKWebView()
+
+        override func viewDidLoad() {
+            super.viewDidLoad()
+            view.addSubview(webView)
+            webView.frame = view.bounds
+            webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+            webView.load(URLRequest(url: URL(string: "https://www.apple.com")!))
+
+            let vc = MultiSecondPanelController()
+            vc.setUpContent()
+            vc.addPanel(toParent: self)
+        }
+    }
+
+    private final class MultiSecondPanelController: FloatingPanelController {
+
+        private final class SecondPanelContentViewController: DebugTableViewController {}
+
+        func setUpContent() {
+            contentInsetAdjustmentBehavior = .never
+            let vc = SecondPanelContentViewController()
+            vc.loadViewIfNeeded()
+            vc.title = "Second Panel"
+            vc.buttonStackView.isHidden = true
+            let navigationController = UINavigationController(rootViewController: vc)
+            navigationController.navigationBar.barTintColor = .white
+            navigationController.navigationBar.titleTextAttributes = [
+                .foregroundColor: UIColor.black
+            ]
+            set(contentViewController: navigationController)
+            self.track(scrollView: vc.tableView)
+            surfaceView.containerMargins = .init(top: 24.0, left: 0.0, bottom: layoutInsets.bottom, right: 0.0)
+        }
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        delegate = self
+        isRemovalInteractionEnabled = true
+
+        let vc = FirstPanelContentViewController()
+        set(contentViewController: vc)
+        track(scrollView: vc.webView.scrollView)
+    }
+
+    private final class FirstViewLayout: FloatingPanelLayout {
+        let initialPosition: FloatingPanelPosition = .full
+        let supportedPositions: Set<FloatingPanelPosition> = [.full]
+        func insetFor(position: FloatingPanelPosition) -> CGFloat? {
+            switch position {
+            case .full: return 40.0
+            default: return nil
+            }
+        }
+    }
+
+    func floatingPanel(_ vc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout? {
+        return FirstViewLayout()
+    }
+}
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|

  s.name                = "FloatingPanel"
-  s.version             = "1.6.6"
+  s.version             = "1.7.5"
  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.
@@ -13,7 +13,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 => "v#{s.version}" }
  s.source_files        = "Framework/Sources/*.swift"
-  s.swift_version       = "4.0"
+  s.swift_versions      = ["4.0", "4.2", "5.0"]

  s.framework           = "UIKit"

@@ -26,7 +26,7 @@
 		54CDC5D3215B6D5A007D205C /* FloatingPanelSurfaceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CDC5D2215B6D5A007D205C /* FloatingPanelSurfaceView.swift */; };
 		54CDC5D5215B6D8D007D205C /* FloatingPanelBackdropView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CDC5D4215B6D8D007D205C /* FloatingPanelBackdropView.swift */; };
 		54CFBFC3215CD045006B5735 /* FloatingPanelLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CFBFC2215CD045006B5735 /* FloatingPanelLayout.swift */; };
-		54CFBFC5215CD09C006B5735 /* FloatingPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CFBFC4215CD09C006B5735 /* FloatingPanel.swift */; };
+		54CFBFC5215CD09C006B5735 /* FloatingPanelCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CFBFC4215CD09C006B5735 /* FloatingPanelCore.swift */; };
 		54E740CD218AFD67005C1A34 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E740CC218AFD67005C1A34 /* AppDelegate.swift */; };
 /* End PBXBuildFile section */

@@ -70,7 +70,7 @@
 		54CDC5D2215B6D5A007D205C /* FloatingPanelSurfaceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPanelSurfaceView.swift; sourceTree = "<group>"; };
 		54CDC5D4215B6D8D007D205C /* FloatingPanelBackdropView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPanelBackdropView.swift; sourceTree = "<group>"; };
 		54CFBFC2215CD045006B5735 /* FloatingPanelLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPanelLayout.swift; sourceTree = "<group>"; };
-		54CFBFC4215CD09C006B5735 /* FloatingPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPanel.swift; sourceTree = "<group>"; };
+		54CFBFC4215CD09C006B5735 /* FloatingPanelCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPanelCore.swift; sourceTree = "<group>"; };
 		54E740CA218AFD67005C1A34 /* FloatingPanelTesting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FloatingPanelTesting.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		54E740CC218AFD67005C1A34 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		54E740D8218AFD6A005C1A34 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -129,7 +129,7 @@
 				545DB9C42151169500CA77B8 /* FloatingPanel.h */,
 				545DB9DF21511AC100CA77B8 /* FloatingPanelController.swift */,
 				54352E9521A51A2500CBCA08 /* FloatingPanelTransitioning.swift */,
-				54CFBFC4215CD09C006B5735 /* FloatingPanel.swift */,
+				54CFBFC4215CD09C006B5735 /* FloatingPanelCore.swift */,
 				54CFBFC2215CD045006B5735 /* FloatingPanelLayout.swift */,
 				5450EEE321646DF500135936 /* FloatingPanelBehavior.swift */,
 				54352E9721A521CA00CBCA08 /* FloatingPanelView.swift */,
@@ -311,7 +311,7 @@
 				54CFBFC3215CD045006B5735 /* FloatingPanelLayout.swift in Sources */,
 				54CDC5D5215B6D8D007D205C /* FloatingPanelBackdropView.swift in Sources */,
 				54352E9821A521CA00CBCA08 /* FloatingPanelView.swift in Sources */,
-				54CFBFC5215CD09C006B5735 /* FloatingPanel.swift in Sources */,
+				54CFBFC5215CD09C006B5735 /* FloatingPanelCore.swift in Sources */,
 				54ABD7AF216CCFF7002E6C13 /* Logger.swift in Sources */,
 				545DB9E021511AC100CA77B8 /* FloatingPanelController.swift in Sources */,
 				5450EEE421646DF500135936 /* FloatingPanelBehavior.swift in Sources */,
@@ -484,6 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
@@ -514,6 +515,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
@@ -6,4 +6,6 @@
 import UIKit

 /// A view that presents a backdrop interface behind a floating panel.
-public class FloatingPanelBackdropView: UIView { }
+public class FloatingPanelBackdropView: UIView {
+    public var dismissalTapGestureRecognizer: UITapGestureRecognizer!
+}
@@ -37,6 +37,15 @@ public protocol FloatingPanelControllerDelegate: class {
    ///
    /// By default, any tap and long gesture recognizers are allowed to recognize gestures simultaneously.
    func floatingPanel(_ vc: FloatingPanelController, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool
+
+    /// Asks the delegate for a content offset of the tracked scroll view to be pinned when a floating panel moves
+    ///
+    /// If you do not implement this method, the controller uses a value of the content offset plus the content insets
+    /// of the tracked scroll view. Your implementation of this method can return a value for a navigation bar with a large
+    /// title, for example.
+    ///
+    /// This method will not be called if the controller doesn't track any scroll view.
+    func floatingPanel(_ vc: FloatingPanelController, contentOffsetForPinning trackedScrollView: UIScrollView) -> CGPoint
 }

 public extension FloatingPanelControllerDelegate {
@@ -62,6 +71,9 @@ public extension FloatingPanelControllerDelegate {
    func floatingPanel(_ vc: FloatingPanelController, shouldRecognizeSimultaneouslyWith gestureRecognizer: UIGestureRecognizer) -> Bool {
        return false
    }
+    func floatingPanel(_ vc: FloatingPanelController, contentOffsetForPinning trackedScrollView: UIScrollView) -> CGPoint {
+        return CGPoint(x: 0.0, y: 0.0 - trackedScrollView.contentInset.top)
+    }
 }


@@ -116,6 +128,14 @@ open class FloatingPanelController: UIViewController {
        case never
    }

+    /// A flag used to determine how the controller object lays out the content view when the surface position changes.
+    public enum ContentMode: Int {
+        /// The option to fix the content to keep the height of the top most position.
+        case `static`
+        /// The option to scale the content to fit the bounds of the root view by changing the surface position.
+        case fitToBounds
+    }
+
    /// The delegate of the floating panel controller object.
    public weak var delegate: FloatingPanelControllerDelegate?{
        didSet{
@@ -179,9 +199,23 @@ open class FloatingPanelController: UIViewController {
        set { set(contentViewController: newValue) }
        get { return _contentViewController }
    }
+    
+    /// The NearbyPosition determines that finger's nearby position.
+    public var nearbyPosition: FloatingPanelPosition {
+        let currentY = surfaceView.frame.minY
+        return floatingPanel.targetPosition(from: currentY, with: .zero)
+    }
+    
+    public var contentMode: ContentMode = .static {
+        didSet {
+            guard position != .hidden else { return }
+            activateLayout()
+        }
+    }
+
    private var _contentViewController: UIViewController?

-    private(set) var floatingPanel: FloatingPanel!
+    private(set) var floatingPanel: FloatingPanelCore!
    private var preSafeAreaInsets: UIEdgeInsets = .zero // Capture the latest one
    private var safeAreaInsetsObservation: NSKeyValueObservation?
    private let modalTransition = FloatingPanelModalTransition()
@@ -204,7 +238,7 @@ open class FloatingPanelController: UIViewController {
        modalPresentationStyle = .custom
        transitioningDelegate = modalTransition

-        floatingPanel = FloatingPanel(self,
+        floatingPanel = FloatingPanelCore(self,
                                      layout: fetchLayout(for: self.traitCollection),
                                      behavior: fetchBehavior(for: self.traitCollection))
    }
@@ -213,7 +247,7 @@ open class FloatingPanelController: UIViewController {
        floatingPanel.layoutAdapter.layout = fetchLayout(for: traitCollection)
        floatingPanel.behavior = fetchBehavior(for: self.traitCollection)
    }
-    
+
    // MARK:- Overrides

    /// Creates the view that the controller manages.
@@ -263,6 +297,41 @@ open class FloatingPanelController: UIViewController {
        safeAreaInsetsObservation = nil
    }

+    // MARK:- Child view controller to consult
+    #if swift(>=4.2)
+    open override var childForStatusBarStyle: UIViewController? {
+        return contentViewController
+    }
+
+    open override var childForStatusBarHidden: UIViewController? {
+        return contentViewController
+    }
+
+    open override var childForScreenEdgesDeferringSystemGestures: UIViewController? {
+        return contentViewController
+    }
+
+    open override var childForHomeIndicatorAutoHidden: UIViewController? {
+        return contentViewController
+    }
+    #else
+    open override var childViewControllerForStatusBarStyle: UIViewController? {
+        return contentViewController
+    }
+
+    open override var childViewControllerForStatusBarHidden: UIViewController? {
+        return contentViewController
+    }
+
+    open override func childViewControllerForScreenEdgesDeferringSystemGestures() -> UIViewController? {
+        return contentViewController
+    }
+
+    open override func childViewControllerForHomeIndicatorAutoHidden() -> UIViewController? {
+        return contentViewController
+    }
+    #endif
+
    // MARK:- Internals
    func prepare(for newCollection: UITraitCollection) {
        guard newCollection.shouldUpdateLayout(from: traitCollection) else { return }
@@ -302,7 +371,6 @@ open class FloatingPanelController: UIViewController {
        switch contentInsetAdjustmentBehavior {
        case .always:
            scrollView?.contentInset = adjustedContentInsets
-            scrollView?.scrollIndicatorInsets = adjustedContentInsets
        default:
            break
        }
@@ -310,7 +378,6 @@ open class FloatingPanelController: UIViewController {

    private func reloadLayout(for traitCollection: UITraitCollection) {
        floatingPanel.layoutAdapter.layout = fetchLayout(for: traitCollection)
-        floatingPanel.layoutAdapter.prepareLayout(in: self)

        if let parent = self.parent {
            if let layout = layout as? UIViewController, layout == parent {
@@ -323,13 +390,20 @@ open class FloatingPanelController: UIViewController {
    }

    private func activateLayout() {
-        // preserve the current content offset
-        let contentOffset = scrollView?.contentOffset
+        floatingPanel.layoutAdapter.prepareLayout(in: self)
+
+        // preserve the current content offset if contentInsetAdjustmentBehavior is `.always`
+        var contentOffset: CGPoint?
+        if contentInsetAdjustmentBehavior == .always {
+            contentOffset = scrollView?.contentOffset
+        }

        floatingPanel.layoutAdapter.updateHeight()
        floatingPanel.layoutAdapter.activateLayout(of: floatingPanel.state)

-        scrollView?.contentOffset = contentOffset ?? .zero
+        if let contentOffset = contentOffset {
+            scrollView?.contentOffset = contentOffset
+        }
    }

    // MARK: - Container view controller interface
@@ -347,9 +421,11 @@ open class FloatingPanelController: UIViewController {
            // inset's update expectedly.
            // 2. The safe area top inset can be variable on the large title navigation bar(iOS11+).
            // That's why it needs the observation to keep `adjustedContentInsets` correct.
-            safeAreaInsetsObservation = self.observe(\.view.safeAreaInsets, options: [.initial, .new, .old]) { [weak self] (vc, change) in
-                guard change.oldValue != change.newValue else { return }
-                self?.update(safeAreaInsets: vc.layoutInsets)
+            safeAreaInsetsObservation = self.view.observe(\.safeAreaInsets, options: [.initial, .new, .old]) { [weak self] (_, change) in
+                // Use `self.view.safeAreaInsets` becauese `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 }
+                self.update(safeAreaInsets: self.view.safeAreaInsets)
            }
        } else {
            // KVOs for topLayoutGuide & bottomLayoutGuide are not effective.
@@ -408,9 +484,9 @@ open class FloatingPanelController: UIViewController {
        show(animated: animated) { [weak self] in
            guard let `self` = self else { return }
            #if swift(>=4.2)
-            self.didMove(toParent: self)
+            self.didMove(toParent: parent)
            #else
-            self.didMove(toParentViewController: self)
+            self.didMove(toParentViewController: parent)
            #endif
        }
    }
@@ -594,7 +670,8 @@ public extension UIViewController {
        }
        // Call dismiss(animated:completion:) to FloatingPanelController directly
        if let fpc = self as? FloatingPanelController {
-            if fpc.presentingViewController != nil {
+            // 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)
            } else {
                fpc.removePanelFromParent(animated: flag, completion: completion)
@@ -8,7 +8,7 @@ import UIKit.UIGestureRecognizerSubclass // For Xcode 9.4.1
 ///
 /// FloatingPanel presentation model
 ///
-class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
+class FloatingPanelCore: NSObject, UIGestureRecognizerDelegate {
    // MUST be a weak reference to prevent UI freeze on the presentation modally
    weak var viewcontroller: FloatingPanelController?

@@ -81,10 +81,15 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
        super.init()

        panGestureRecognizer.floatingPanel = self
-
        surfaceView.addGestureRecognizer(panGestureRecognizer)
        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)
    }

    func move(to: FloatingPanelPosition, animated: Bool, completion: (() -> Void)? = nil) {
@@ -92,7 +97,7 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
    }

    private func move(from: FloatingPanelPosition, to: FloatingPanelPosition, animated: Bool, completion: (() -> Void)? = nil) {
-        assert(layoutAdapter.isValid(to), "Can't move to '\(to)' position because it's not valid in the layout")
+        assert(layoutAdapter.validPositions.contains(to), "Can't move to '\(to)' position because it's not valid in the layout")
        guard let vc = viewcontroller else {
            completion?()
            return
@@ -146,7 +151,8 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
    // MARK: - Layout update

    private func updateLayout(to target: FloatingPanelPosition) {
-        self.layoutAdapter.activateLayout(of: target)
+        self.layoutAdapter.activateFixedLayout()
+        self.layoutAdapter.activateInteractiveLayout(of: target)
    }

    func getBackdropAlpha(at currentY: CGFloat, with translation: CGPoint) -> CGFloat {
@@ -185,6 +191,9 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
        }

        switch otherGestureRecognizer {
+        case is FloatingPanelPanGestureRecognizer:
+            // All visiable panels' pan gesture should be recognized simultaneously.
+            return true
        case is UIPanGestureRecognizer,
             is UISwipeGestureRecognizer,
             is UIRotationGestureRecognizer,
@@ -196,13 +205,27 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
        default:
            // Should recognize tap/long press gestures in parallel when the surface view is at an anchor position.
            let surfaceFrame = surfaceView.layer.presentation()?.frame ?? surfaceView.frame
-            return surfaceFrame.minY == layoutAdapter.positionY(for: state)
+            let surfaceY = surfaceFrame.minY
+            let adapterY = layoutAdapter.positionY(for: state)
+
+            return abs(surfaceY - adapterY) < (1.0 / surfaceView.traitCollection.displayScale)
        }
    }

    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        guard gestureRecognizer == panGestureRecognizer else { return false }
        /* log.debug("shouldBeRequiredToFailBy", otherGestureRecognizer) */
+        if otherGestureRecognizer is FloatingPanelPanGestureRecognizer {
+            // If this panel is the farthest descendant of visiable panels,
+            // its ancestors' pan gesture must wait for its pan gesture to fail
+            if let view = otherGestureRecognizer.view, surfaceView.isDescendant(of: view) {
+                return true
+            }
+        }
+        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
+        }
        return false
    }

@@ -223,7 +246,15 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
            // the panel's pan gesture if not returns false
            if let scrollGestureRecognizers = scrollView.gestureRecognizers,
                scrollGestureRecognizers.contains(otherGestureRecognizer) {
-                return false
+                switch otherGestureRecognizer {
+                case scrollView.panGestureRecognizer:
+                    if grabberAreaFrame.contains(gestureRecognizer.location(in: gestureRecognizer.view)) {
+                        return false
+                    }
+                    return allowScrollPanGesture(for: scrollView)
+                default:
+                    return false
+                }
            }
        }

@@ -233,11 +264,23 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
        }

        switch otherGestureRecognizer {
+        case is FloatingPanelPanGestureRecognizer:
+            // If this panel is the farthest descendant of visiable panels,
+            // its pan gesture does not require its ancestors' pan gesture to fail
+            if let view = otherGestureRecognizer.view, surfaceView.isDescendant(of: view) {
+                return false
+            }
+            return true
        case is UIPanGestureRecognizer,
             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
+            }
            // Do not begin the pan gesture until these gestures fail
            return true
        default:
@@ -255,6 +298,14 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
    }

    // MARK: - Gesture handling
+
+    @objc func handleBackdrop(tapGesture: UITapGestureRecognizer) {
+        viewcontroller?.dismiss(animated: true) { [weak self] in
+            guard let vc = self?.viewcontroller else { return }
+            vc.delegate?.floatingPanelDidEndRemove(vc)
+        }
+    }
+
    @objc func handle(panGesture: UIPanGestureRecognizer) {
        let velocity = panGesture.velocity(in: panGesture.view)

@@ -264,15 +315,16 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {

            let location = panGesture.location(in: surfaceView)

-            let belowTop = surfaceView.presentationFrame.minY > layoutAdapter.topY
-            let offset = scrollView.contentOffset.y - scrollView.contentOffsetZero.y
-
+            let surfaceMinY = surfaceView.presentationFrame.minY
+            let adapterTopY = layoutAdapter.topY
+            let belowTop = surfaceMinY > (adapterTopY + (1.0 / surfaceView.traitCollection.displayScale))
            log.debug("scroll gesture(\(state):\(panGesture.state)) --",
                "belowTop = \(belowTop),",
                "interactionInProgress = \(interactionInProgress),",
-                "scroll offset = \(offset),",
+                "scroll offset = \(scrollView.contentOffset.y),",
                "location = \(location.y), velocity = \(velocity.y)")

+            let offset = scrollView.contentOffset.y - contentOrigin(of: scrollView).y

            if belowTop {
                // Scroll offset pinning
@@ -315,11 +367,11 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
                } else {
                    if state == layoutAdapter.topMostState {
                        // Hide a scroll indicator just before starting an interaction by swiping a panel down.
-                        if offset < 0, velocity.y > 0 {
+                        if velocity.y > 0, !allowScrollPanGesture(for: scrollView) {
                            lockScrollView()
                        }
                        // Show a scroll indicator when an animation is interrupted at the top and content is scrolled up
-                        if offset > 0, velocity.y < 0 {
+                        if velocity.y < 0, allowScrollPanGesture(for: scrollView) {
                            unlockScrollView()
                        }

@@ -355,7 +407,7 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
                    }
                    animator.finishAnimation(at: .current)
                } else {
-                    self.animator = nil
+                    self.endAnimation(false) // Must call it manually
                }
            }

@@ -422,14 +474,15 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
            return true
        }

+        let scrollViewFrame = scrollView.convert(scrollView.bounds, to: surfaceView)
        guard
-            scrollView.frame.contains(initialLocation), // When initialLocation not in scrollView, don't scroll.
+            scrollViewFrame.contains(initialLocation), // When initialLocation not in scrollView, don't scroll.
            !grabberAreaFrame.contains(point)           // When point within grabber area, don't scroll.
        else {
            return false
        }

-        let offset = scrollView.contentOffset.y - scrollView.contentOffsetZero.y
+        let offset = scrollView.contentOffset.y - contentOrigin(of: scrollView).y
        // The zero offset must be excluded because the offset is usually zero
        // after a panel moves from half/tip to full.
        if  offset > 0.0 {
@@ -500,6 +553,8 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
    // from the full position because SafeArea is global in a screen.
    private func preserveContentVCLayoutIfNeeded() {
        guard let vc = viewcontroller else { return }
+        guard vc.contentMode != .fitToBounds else { return }
+
        // Must include topY
        if (surfaceView.frame.minY <= layoutAdapter.topY) {
            if !disabledBottomAutoLayout {
@@ -548,7 +603,7 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
            return
        }

-        stopScrollDeceleration = (surfaceView.frame.minY > layoutAdapter.topY) // Projecting the dragging to the scroll dragging or not
+        stopScrollDeceleration = surfaceView.frame.minY > (layoutAdapter.topY + (1.0 / surfaceView.traitCollection.displayScale)) // Projecting the dragging to the scroll dragging or not
        if stopScrollDeceleration {
            DispatchQueue.main.async { [weak self] in
                guard let `self` = self else { return }
@@ -575,19 +630,22 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
            }
        }

-        if let vc = viewcontroller {
-            vc.delegate?.floatingPanelDidEndDragging(vc, withVelocity: velocity, targetPosition: targetPosition)
-        }
-
        if scrollView != nil, !stopScrollDeceleration,
            surfaceView.frame.minY == layoutAdapter.topY,
            targetPosition == layoutAdapter.topMostState {
            self.state = targetPosition
            self.updateLayout(to: targetPosition)
            self.unlockScrollView()
+            if let vc = viewcontroller {
+                vc.delegate?.floatingPanelDidEndDragging(vc, withVelocity: .zero, targetPosition: targetPosition)
+            }
            return
        }

+        if let vc = viewcontroller {
+            vc.delegate?.floatingPanelDidEndDragging(vc, withVelocity: velocity, targetPosition: targetPosition)
+        }
+
        // Workaround: Disable a tracking scroll to prevent bouncing a scroll content in a panel animating
        let isScrollEnabled = scrollView?.isScrollEnabled
        if let scrollView = scrollView, targetPosition != .full {
@@ -653,9 +711,12 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
            if grabberAreaFrame.contains(location) {
                initialScrollOffset = scrollView.contentOffset
            } else {
+                initialScrollOffset = contentOrigin(of: scrollView)
                // Fit the surface bounds to a scroll offset content by startInteraction(at:offset:)
-                offset = CGPoint(x: -scrollView.contentOffset.x, y: -scrollView.contentOffset.y)
-                initialScrollOffset = scrollView.contentOffsetZero
+                let scrollOffsetY = (scrollView.contentOffset.y - contentOrigin(of: scrollView).y)
+                if scrollOffsetY < 0 {
+                    offset = CGPoint(x: -scrollView.contentOffset.x, y: -scrollOffsetY)
+                }
            }
            log.debug("initial scroll offset --", initialScrollOffset)
        }
@@ -704,26 +765,38 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {

        vc.delegate?.floatingPanelWillBeginDecelerating(vc)

-        let velocityVector = (distance != 0) ? CGVector(dx: 0, dy: abs(velocity.y)/distance) : .zero
+        let velocityVector = (distance != 0) ? CGVector(dx: 0, dy: velocity.y / distance) : .zero
        let animator = behavior.interactionAnimator(vc, to: targetPosition, with: velocityVector)
        animator.addAnimations { [weak self] in
-            guard let `self` = self else { return }
+            guard let `self` = self, let vc = self.viewcontroller else { return }
            self.state = targetPosition
-            self.updateLayout(to: targetPosition)
+            if animator.isInterruptible {
+                switch vc.contentMode {
+                case .fitToBounds:
+                    UIView.performWithLinear(startTime: 0.0, relativeDuration: 0.75) {
+                        self.layoutAdapter.activateFixedLayout()
+                        self.surfaceView.superview!.layoutIfNeeded()
+                    }
+                case .static:
+                    self.layoutAdapter.activateFixedLayout()
+                }
+            } else {
+                self.layoutAdapter.activateFixedLayout()
+            }
+            self.layoutAdapter.activateInteractiveLayout(of: targetPosition)
        }
        animator.addCompletion { [weak self] pos in
            // Prevent calling `finishAnimation(at:)` by the old animator whose `isInterruptive` is false
            // when a new animator has been started after the old one is interrupted.
            guard let `self` = self, self.animator == animator else { return }
-            self.finishAnimation(at: targetPosition)
+            log.debug("finishAnimation to \(targetPosition)")
+            self.endAnimation(pos == .end)
        }
        self.animator = animator
        animator.startAnimation()
    }

-    private func finishAnimation(at targetPosition: FloatingPanelPosition) {
-        log.debug("finishAnimation to \(targetPosition)")
-
+    private func endAnimation(_ finished: Bool) {
        self.isDecelerating = false
        self.animator = nil

@@ -738,7 +811,7 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
        stopScrollDeceleration = false

        log.debug("finishAnimation -- state = \(state) surface.minY = \(surfaceView.presentationFrame.minY) topY = \(layoutAdapter.topY)")
-        if state == layoutAdapter.topMostState, abs(surfaceView.presentationFrame.minY - layoutAdapter.topY) <= 1.0 {
+        if finished, state == layoutAdapter.topMostState, abs(surfaceView.presentationFrame.minY - layoutAdapter.topY) <= 1.0 {
            unlockScrollView()
        }
    }
@@ -746,7 +819,7 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
    private func distance(to targetPosition: FloatingPanelPosition) -> CGFloat {
        let currentY = surfaceView.frame.minY
        let targetY = layoutAdapter.positionY(for: targetPosition)
-        return CGFloat(abs(currentY - targetY))
+        return CGFloat(targetY - currentY)
    }

    // Distance travelled after decelerating to zero velocity at a constant rate.
@@ -840,10 +913,25 @@ class FloatingPanel: NSObject, UIGestureRecognizerDelegate {
        // Must use setContentOffset(_:animated) to force-stop deceleration
        scrollView?.setContentOffset(contentOffset, animated: false)
    }
+
+    private func contentOrigin(of scrollView: UIScrollView) -> CGPoint {
+        if let vc = viewcontroller, let origin = vc.delegate?.floatingPanel(vc, contentOffsetForPinning: scrollView) {
+            return origin
+        }
+        return CGPoint(x: 0.0, y: 0.0 - scrollView.contentInset.top)
+    }
+
+    private func allowScrollPanGesture(for scrollView: UIScrollView) -> Bool {
+        let contentOffset = scrollView.contentOffset - contentOrigin(of: scrollView)
+        if state == layoutAdapter.topMostState {
+            return contentOffset.y <= -30.0 || contentOffset.y > 0
+        }
+        return false
+    }
 }

 class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
-    fileprivate weak var floatingPanel: FloatingPanel?
+    fileprivate weak var floatingPanel: FloatingPanelCore?
    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
        super.touchesBegan(touches, with: event)
        if floatingPanel?.animator != nil {
@@ -855,7 +943,7 @@ class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
            return super.delegate
        }
        set {
-            guard newValue is FloatingPanel else {
+            guard newValue is FloatingPanelCore else {
                let exception = NSException(name: .invalidArgumentException,
                                            reason: "FloatingPanelController's built-in pan gesture recognizer must have its controller as its delegate.",
                                            userInfo: nil)
@@ -11,15 +11,24 @@ import UIKit
 /// It can't be used with FloatingPanelIntrinsicLayout.
 public protocol FloatingPanelFullScreenLayout: FloatingPanelLayout { }

+public extension FloatingPanelFullScreenLayout {
+    var positionReference: FloatingPanelLayoutReference {
+        return .fromSuperview
+    }
+}
+
 /// FloatingPanelIntrinsicLayout
 ///
 /// Use the layout protocol if you want to layout a panel using the intrinsic height.
-/// It can't be used with FloatingPanelFullScreenLayout.
+/// It can't be used with `FloatingPanelFullScreenLayout`.
 ///
 /// - Attention:
 ///     `insetFor(position:)` must return `nil` for the full position. Because
 ///     the inset is determined automatically by the intrinsic height.
 ///     You can customize insets only for the half, tip and hidden positions.
+///
+/// - Note:
+///     By default, the `positionReference` is set to `.fromSafeArea`.
 public protocol FloatingPanelIntrinsicLayout: FloatingPanelLayout { }

 public extension FloatingPanelIntrinsicLayout {
@@ -34,6 +43,15 @@ public extension FloatingPanelIntrinsicLayout {
    func insetFor(position: FloatingPanelPosition) -> CGFloat? {
        return nil
    }
+
+    var positionReference: FloatingPanelLayoutReference {
+        return .fromSafeArea
+    }
+}
+
+public enum FloatingPanelLayoutReference: Int {
+    case fromSafeArea = 0
+    case fromSuperview = 1
 }

 public protocol FloatingPanelLayout: class {
@@ -74,6 +92,9 @@ public protocol FloatingPanelLayout: class {
    ///
    /// Default is 0.3 at full position, otherwise 0.0.
    func backdropAlphaFor(position: FloatingPanelPosition) -> CGFloat
+
+    var positionReference: FloatingPanelLayoutReference { get }
+
 }

 public extension FloatingPanelLayout {
@@ -94,6 +115,10 @@ public extension FloatingPanelLayout {
    func backdropAlphaFor(position: FloatingPanelPosition) -> CGFloat {
        return position == .full ? 0.3 : 0.0
    }
+
+    var positionReference: FloatingPanelLayoutReference {
+        return .fromSafeArea
+    }
 }

 public class FloatingPanelDefaultLayout: FloatingPanelLayout {
@@ -160,6 +185,8 @@ class FloatingPanelLayoutAdapter {
    private var tipConstraints: [NSLayoutConstraint] = []
    private var offConstraints: [NSLayoutConstraint] = []
    private var interactiveTopConstraint: NSLayoutConstraint?
+    private var bottomConstraint: NSLayoutConstraint?
+

    private var heightConstraint: NSLayoutConstraint?

@@ -184,6 +211,10 @@ class FloatingPanelLayoutAdapter {
        return layout.supportedPositions
    }

+    var validPositions: Set<FloatingPanelPosition> {
+        return supportedPositions.union([.hidden])
+    }
+
    var topMostState: FloatingPanelPosition {
        return supportedPositions.sorted(by: { $0.rawValue < $1.rawValue }).first ?? .hidden
    }
@@ -218,27 +249,28 @@ class FloatingPanelLayoutAdapter {
    func positionY(for pos: FloatingPanelPosition) -> CGFloat {
        switch pos {
        case .full:
-            switch layout {
-            case is FloatingPanelIntrinsicLayout:
+            if layout is FloatingPanelIntrinsicLayout {
                return surfaceView.superview!.bounds.height - surfaceView.bounds.height
-            case is FloatingPanelFullScreenLayout:
-                return fullInset
-            default:
+            }
+            switch layout.positionReference {
+            case .fromSafeArea:
                return (safeAreaInsets.top + fullInset)
+            case .fromSuperview:
+                return fullInset
            }
        case .half:
-            switch layout {
-            case is FloatingPanelFullScreenLayout:
-                return surfaceView.superview!.bounds.height - halfInset
-            default:
+            switch layout.positionReference {
+            case .fromSafeArea:
                return surfaceView.superview!.bounds.height - (safeAreaInsets.bottom + halfInset)
+            case .fromSuperview:
+                return surfaceView.superview!.bounds.height - halfInset
            }
        case .tip:
-            switch layout {
-            case is FloatingPanelFullScreenLayout:
-                return surfaceView.superview!.bounds.height - tipInset
-            default:
+            switch layout.positionReference {
+            case .fromSafeArea:
                return surfaceView.superview!.bounds.height - (safeAreaInsets.bottom + tipInset)
+            case .fromSuperview:
+                return surfaceView.superview!.bounds.height - tipInset
            }
        case .hidden:
            return surfaceView.superview!.bounds.height - hiddenInset
@@ -279,6 +311,10 @@ class FloatingPanelLayoutAdapter {
        self.vc = vc

        NSLayoutConstraint.deactivate(fixedConstraints + fullConstraints + halfConstraints + tipConstraints + offConstraints)
+        NSLayoutConstraint.deactivate(constraint: self.heightConstraint)
+        self.heightConstraint = nil
+        NSLayoutConstraint.deactivate(constraint: self.bottomConstraint)
+        self.bottomConstraint = nil

        surfaceView.translatesAutoresizingMaskIntoConstraints = false
        backdropView.translatesAutoresizingMaskIntoConstraints = false
@@ -294,9 +330,14 @@ class FloatingPanelLayoutAdapter {

        fixedConstraints = surfaceConstraints + backdropConstraints

+        if vc.contentMode == .fitToBounds {
+            bottomConstraint = surfaceView.bottomAnchor.constraint(equalTo: vc.view.bottomAnchor,
+                                                                   constant: 0.0)
+        }
+
        // Flexible surface constraints for full, half, tip and off
        let topAnchor: NSLayoutYAxisAnchor = {
-            if layout is FloatingPanelFullScreenLayout {
+            if layout.positionReference == .fromSuperview {
                return vc.view.topAnchor
            } else {
                return vc.layoutGuide.topAnchor
@@ -315,7 +356,7 @@ class FloatingPanelLayoutAdapter {
        }

        let bottomAnchor: NSLayoutYAxisAnchor = {
-            if layout is FloatingPanelFullScreenLayout {
+            if layout.positionReference == .fromSuperview {
                return vc.view.bottomAnchor
            } else {
                return vc.layoutGuide.bottomAnchor
@@ -342,16 +383,15 @@ class FloatingPanelLayoutAdapter {
        NSLayoutConstraint.deactivate(fullConstraints + halfConstraints + tipConstraints + offConstraints)

        let interactiveTopConstraint: NSLayoutConstraint
-        switch layout {
-        case is FloatingPanelIntrinsicLayout,
-             is FloatingPanelFullScreenLayout:
-            initialConst = surfaceView.frame.minY + offset.y
-            interactiveTopConstraint = surfaceView.topAnchor.constraint(equalTo: vc.view.topAnchor,
-                                                                        constant: initialConst)
-        default:
+        switch layout.positionReference {
+        case .fromSafeArea:
            initialConst = surfaceView.frame.minY - safeAreaInsets.top + offset.y
            interactiveTopConstraint = surfaceView.topAnchor.constraint(equalTo: vc.layoutGuide.topAnchor,
                                                                        constant: initialConst)
+        case .fromSuperview:
+            initialConst = surfaceView.frame.minY + offset.y
+            interactiveTopConstraint = surfaceView.topAnchor.constraint(equalTo: vc.view.topAnchor,
+                                                                        constant: initialConst)
        }
        NSLayoutConstraint.activate([interactiveTopConstraint])
        self.interactiveTopConstraint = interactiveTopConstraint
@@ -360,41 +400,48 @@ class FloatingPanelLayoutAdapter {
    func endInteraction(at state: FloatingPanelPosition) {
        // Don't deactivate `interactiveTopConstraint` here because it leads to
        // unsatisfiable constraints
+
+        if self.interactiveTopConstraint == nil {
+            // Actiavate `interactiveTopConstraint` for `fitToBounds` mode.
+            // It goes throught this path when the pan gesture state jumps
+            // from .begin to .end.
+            startInteraction(at: state)
+        }
    }

    // The method is separated from prepareLayout(to:) for the rotation support
    // It must be called in FloatingPanelController.traitCollectionDidChange(_:)
    func updateHeight() {
        guard let vc = vc else { return }
+        NSLayoutConstraint.deactivate(constraint: heightConstraint)
+        heightConstraint = nil

-        if let const = self.heightConstraint {
-            NSLayoutConstraint.deactivate([const])
+        if layout is FloatingPanelIntrinsicLayout {
+            updateIntrinsicHeight()
+        }
+        defer {
+            if layout is FloatingPanelIntrinsicLayout {
+                NSLayoutConstraint.deactivate(fullConstraints)
+                fullConstraints = [
+                    surfaceView.topAnchor.constraint(equalTo: vc.layoutGuide.bottomAnchor,
+                                                     constant: -fullInset),
+                ]
+            }
        }

-        let heightConstraint: NSLayoutConstraint
+        guard vc.contentMode != .fitToBounds else { return }

        switch layout {
        case is FloatingPanelIntrinsicLayout:
-            updateIntrinsicHeight()
            heightConstraint = surfaceView.heightAnchor.constraint(equalToConstant: intrinsicHeight + safeAreaInsets.bottom)
        default:
            let const = -(positionY(for: topMostState))
            heightConstraint =  surfaceView.heightAnchor.constraint(equalTo: vc.view.heightAnchor,
                                                                    constant: const)
        }
-
-        NSLayoutConstraint.activate([heightConstraint])
-        self.heightConstraint = heightConstraint
+        NSLayoutConstraint.activate(constraint: heightConstraint)

        surfaceView.bottomOverflow = vc.view.bounds.height + layout.topInteractionBuffer
-
-        if layout is FloatingPanelIntrinsicLayout {
-            NSLayoutConstraint.deactivate(fullConstraints)
-            fullConstraints = [
-                surfaceView.topAnchor.constraint(equalTo: vc.layoutGuide.bottomAnchor,
-                                                 constant: -fullInset),
-            ]
-        }
    }

    func updateInteractiveTopConstraint(diff: CGFloat, allowsTopBuffer: Bool, with behavior: FloatingPanelBehavior) {
@@ -404,24 +451,24 @@ class FloatingPanelLayoutAdapter {

        let topMostConst: CGFloat = {
            var ret: CGFloat = 0.0
-            switch layout {
-            case is FloatingPanelIntrinsicLayout, is FloatingPanelFullScreenLayout:
-                ret = topY
-            default:
+            switch layout.positionReference {
+            case .fromSafeArea:
                ret = topY - safeAreaInsets.top
+            case .fromSuperview:
+                ret = topY
            }
-            return max(ret, 0.0) // The top boundary is equal to the related topAnchor.
+            return ret
        }()
        let bottomMostConst: CGFloat = {
            var ret: CGFloat = 0.0
            let _bottomY = vc.isRemovalInteractionEnabled ? positionY(for: .hidden) : bottomY
-            switch layout {
-            case is FloatingPanelIntrinsicLayout, is FloatingPanelFullScreenLayout:
-                ret = _bottomY
-            default:
+            switch layout.positionReference {
+            case .fromSafeArea:
                ret = _bottomY - safeAreaInsets.top
+            case .fromSuperview:
+                ret = _bottomY
            }
-            return min(ret, surfaceView.superview!.bounds.height)
+            return ret
        }()
        let minConst = allowsTopBuffer ? topMostConst - layout.topInteractionBuffer : topMostConst
        let maxConst = bottomMostConst + layout.bottomInteractionBuffer
@@ -451,7 +498,19 @@ class FloatingPanelLayoutAdapter {
        return (1.0 - (1.0 / ((buffer * 0.55 / base) + 1.0))) * base
    }

-    func activateLayout(of state: FloatingPanelPosition) {
+    func activateFixedLayout() {
+        // Must deactivate `interactiveTopConstraint` here
+        NSLayoutConstraint.deactivate(constraint: self.interactiveTopConstraint)
+        self.interactiveTopConstraint = nil
+
+        NSLayoutConstraint.activate(fixedConstraints)
+
+        if vc.contentMode == .fitToBounds {
+            NSLayoutConstraint.activate(constraint: self.bottomConstraint)
+        }
+    }
+
+    func activateInteractiveLayout(of state: FloatingPanelPosition) {
        defer {
            layoutSurfaceIfNeeded()
            log.debug("activateLayout -- surface.presentation = \(self.surfaceView.presentationFrame) surface.frame = \(self.surfaceView.frame)")
@@ -461,14 +520,7 @@ class FloatingPanelLayoutAdapter {

        setBackdropAlpha(of: state)

-        // Must deactivate `interactiveTopConstraint` here
-        if let interactiveTopConstraint = interactiveTopConstraint {
-            NSLayoutConstraint.deactivate([interactiveTopConstraint])
-            self.interactiveTopConstraint = nil
-        }
-        NSLayoutConstraint.activate(fixedConstraints)
-
-        if isValid(state) == false {
+        if validPositions.contains(state) == false {
            state = layout.initialPosition
        }

@@ -485,8 +537,9 @@ class FloatingPanelLayoutAdapter {
        }
    }

-    func isValid(_ state: FloatingPanelPosition) -> Bool {
-        return supportedPositions.union([.hidden]).contains(state)
+    func activateLayout(of state: FloatingPanelPosition) {
+        activateFixedLayout()
+        activateInteractiveLayout(of: state)
    }

    private func layoutSurfaceIfNeeded() {
@@ -507,8 +560,8 @@ class FloatingPanelLayoutAdapter {
    private func checkLayoutConsistance() {
        // Verify layout configurations
        assert(supportedPositions.count > 0)
-        assert(supportedPositions.contains(layout.initialPosition),
-               "Does not include an initial position (\(layout.initialPosition)) in supportedPositions (\(supportedPositions))")
+        assert(validPositions.contains(layout.initialPosition),
+               "Does not include an initial position (\(layout.initialPosition)) in (\(validPositions))")

        if layout is FloatingPanelIntrinsicLayout {
            assert(layout.insetFor(position: .full) == nil, "Return `nil` for full position on FloatingPanelIntrinsicLayout")
@@ -34,7 +34,7 @@ public class FloatingPanelSurfaceView: UIView {

    /// A root view of a content view controller
    public weak var contentView: UIView!
-    
+
    /// The content insets specifying the insets around the content view.
    public var contentInsets: UIEdgeInsets = .zero {
        didSet {
@@ -81,8 +81,8 @@ public class FloatingPanelSurfaceView: UIView {
    /// The color of the surface border.
    public var borderWidth: CGFloat = 0.0  { didSet { setNeedsLayout() } }

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

@@ -97,9 +97,11 @@ public class FloatingPanelSurfaceView: UIView {
    @available(*, unavailable, renamed: "containerView")
    public var backgroundView: UIView!

-    private lazy var containerViewTopInsetConstraint: NSLayoutConstraint = containerView.topAnchor.constraint(equalTo: topAnchor, constant: containerTopInset)
-    private lazy var containerViewHeightConstraint: NSLayoutConstraint = containerView.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 1.0)
-    
+    private lazy var containerViewTopConstraint = containerView.topAnchor.constraint(equalTo: topAnchor, constant: containerMargins.top)
+    private lazy var containerViewHeightConstraint = containerView.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 1.0)
+    private lazy var containerViewLeftConstraint = containerView.leftAnchor.constraint(equalTo: leftAnchor, constant: 0.0)
+    private lazy var containerViewRightConstraint = containerView.rightAnchor.constraint(equalTo: rightAnchor, constant: 0.0)
+
    /// The content view top constraint
    private var contentViewTopConstraint: NSLayoutConstraint?
    /// The content view left constraint
@@ -109,9 +111,9 @@ public class FloatingPanelSurfaceView: UIView {
    /// The content height constraint
    private var contentViewHeightConstraint: NSLayoutConstraint?

-    private lazy var grabberHandleWidthConstraint: NSLayoutConstraint = grabberHandle.widthAnchor.constraint(equalToConstant: grabberHandleWidth)
-    private lazy var grabberHandleHeightConstraint: NSLayoutConstraint = grabberHandle.heightAnchor.constraint(equalToConstant: grabberHandleHeight)
-    private lazy var grabberHandleTopConstraint: NSLayoutConstraint = grabberHandle.topAnchor.constraint(equalTo: topAnchor, constant: grabberTopPadding)
+    private lazy var grabberHandleWidthConstraint = grabberHandle.widthAnchor.constraint(equalToConstant: grabberHandleWidth)
+    private lazy var grabberHandleHeightConstraint = grabberHandle.heightAnchor.constraint(equalToConstant: grabberHandleHeight)
+    private lazy var grabberHandleTopConstraint = grabberHandle.topAnchor.constraint(equalTo: topAnchor, constant: grabberTopPadding)

    public override class var requiresConstraintBasedLayout: Bool { return true }

@@ -132,9 +134,9 @@ public class FloatingPanelSurfaceView: UIView {
        addSubview(containerView)
        containerView.translatesAutoresizingMaskIntoConstraints = false
        NSLayoutConstraint.activate([
-            containerViewTopInsetConstraint,
-            containerView.leftAnchor.constraint(equalTo: leftAnchor, constant: 0.0),
-            containerView.rightAnchor.constraint(equalTo: rightAnchor, constant: 0.0),
+            containerViewTopConstraint,
+            containerViewLeftConstraint,
+            containerViewRightConstraint,
            containerViewHeightConstraint,
            ])

@@ -149,13 +151,15 @@ public class FloatingPanelSurfaceView: UIView {
    }

    public override func updateConstraints() {
-        containerViewTopInsetConstraint.constant = containerTopInset
-        containerViewHeightConstraint.constant = bottomOverflow
+        containerViewTopConstraint.constant = containerMargins.top
+        containerViewLeftConstraint.constant = containerMargins.left
+        containerViewRightConstraint.constant = -containerMargins.right
+        containerViewHeightConstraint.constant = (containerMargins.bottom == 0) ? bottomOverflow : -(containerMargins.top + containerMargins.bottom)

-        contentViewTopConstraint?.constant = contentInsets.top
-        contentViewLeftConstraint?.constant = contentInsets.left
-        contentViewRightConstraint?.constant = contentInsets.right
-        contentViewHeightConstraint?.constant = -(containerTopInset + contentInsets.top + contentInsets.bottom)
+        contentViewTopConstraint?.constant = containerMargins.top + contentInsets.top
+        contentViewLeftConstraint?.constant = containerMargins.left + contentInsets.left
+        contentViewRightConstraint?.constant = containerMargins.right + contentInsets.right
+        contentViewHeightConstraint?.constant = -(containerMargins.top + containerMargins.bottom + contentInsets.top + contentInsets.bottom)

        grabberHandleTopConstraint.constant = grabberTopPadding
        grabberHandleWidthConstraint.constant = grabberHandleWidth
@@ -196,6 +200,7 @@ public class FloatingPanelSurfaceView: UIView {
            return
        }
        containerView.layer.masksToBounds = true
+        guard containerMargins.bottom == 0 else { return }
        if #available(iOS 11, *) {
            // Don't use `contentView.clipToBounds` because it prevents content view from expanding the height of a subview of it
            // for the bottom overflow like Auto Layout settings of UIVisualEffectView in Main.storyboard of Example/Maps.
@@ -218,10 +223,12 @@ public class FloatingPanelSurfaceView: UIView {
        /* contentView.frame = bounds */ // MUST NOT: Because the top safe area inset of a content VC will be incorrect.
        contentView.translatesAutoresizingMaskIntoConstraints = false

-        let topConstraint = contentView.topAnchor.constraint(equalTo: topAnchor, constant: contentInsets.top)
-        let leftConstraint = contentView.leftAnchor.constraint(equalTo: leftAnchor, constant: contentInsets.left)
-        let rightConstraint = rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: contentInsets.right)
-        let heightConstraint = contentView.heightAnchor.constraint(equalTo: heightAnchor, constant: -(containerTopInset + contentInsets.top + contentInsets.bottom))
+        let topConstraint = contentView.topAnchor.constraint(equalTo: topAnchor, constant: containerMargins.top + contentInsets.top)
+        let leftConstraint = contentView.leftAnchor.constraint(equalTo: leftAnchor, constant: containerMargins.left + contentInsets.left)
+        let rightConstraint = rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: containerMargins.right + contentInsets.right)
+        let heightPadding = containerMargins.top + containerMargins.bottom + contentInsets.top + contentInsets.bottom
+        let heightConstraint = contentView.heightAnchor.constraint(equalTo: heightAnchor, constant: -heightPadding)
+        heightConstraint.priority = UILayoutPriority(999)
        NSLayoutConstraint.activate([
            topConstraint,
            leftConstraint,
@@ -59,9 +59,7 @@ class FloatingPanelPresentationController: UIPresentationController {
        // Forward touch events to the presenting view controller
        (fpc.view as? FloatingPanelPassThroughView)?.eventForwardingView = presentingViewController.view

-        // Set tap-to-dismiss in the backdrop view
-        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleBackdrop(tapGesture:)))
-        fpc.backdropView.addGestureRecognizer(tapGesture)
+        fpc.backdropView.dismissalTapGestureRecognizer.isEnabled = true
    }

    @objc func handleBackdrop(tapGesture: UITapGestureRecognizer) {
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.6</string>
+	<string>1.7.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
@@ -21,7 +21,7 @@ class CustomLayoutGuide: LayoutGuideProvider {
 }

 extension UIViewController {
-    var layoutInsets: UIEdgeInsets {
+    @objc var layoutInsets: UIEdgeInsets {
        if #available(iOS 11.0, *) {
            return view.safeAreaInsets
        } else {
@@ -75,6 +75,12 @@ extension UIView {
    func enableAutoLayout() {
        translatesAutoresizingMaskIntoConstraints = false
    }
+
+    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)
+    }
 }

 #if __FP_LOG
@@ -108,9 +114,6 @@ extension UIGestureRecognizerState: CustomDebugStringConvertible {
 #endif

 extension UIScrollView {
-    var contentOffsetZero: CGPoint {
-        return CGPoint(x: 0.0, y: 0.0 - contentInset.top)
-    }
    var isLocked: Bool {
        return !showsVerticalScrollIndicator && !bounces &&  isDirectionalLockEnabled
    }
@@ -127,8 +130,10 @@ extension UISpringTimingParameters {

 extension CGPoint {
    static var nan: CGPoint {
-        return CGPoint(x: CGFloat.nan,
-                       y: CGFloat.nan)
+        return CGPoint(x: CGFloat.nan, y: CGFloat.nan)
+    }
+    static func - (left: CGPoint, right: CGPoint) -> CGPoint {
+        return CGPoint(x: left.x - right.x, y: left.y - right.y)
    }
 }

@@ -140,3 +145,14 @@ extension UITraitCollection {
            || previous.layoutDirection != layoutDirection
    }
 }
+
+extension NSLayoutConstraint {
+    static func activate(constraint: NSLayoutConstraint?) {
+        guard let constraint = constraint else { return }
+        self.activate([constraint])
+    }
+    static func deactivate(constraint: NSLayoutConstraint?) {
+        guard let constraint = constraint else { return }
+        self.deactivate([constraint])
+    }
+}
@@ -101,6 +101,22 @@ class FloatingPanelControllerTests: XCTestCase {
        XCTAssertEqual(delegate.position, .hidden)
        XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .hidden))
    }
+    
+    func test_moveWithNearbyPosition() {
+        let delegate = FloatingPanelTestDelegate()
+        let fpc = FloatingPanelController(delegate: delegate)
+        XCTAssertEqual(delegate.position, .hidden)
+        fpc.showForTest()
+        
+        XCTAssertEqual(fpc.nearbyPosition, .half)
+        
+        fpc.hide()
+        XCTAssertEqual(fpc.nearbyPosition, .tip)
+        
+        fpc.move(to: .full, animated: false)
+        XCTAssertEqual(fpc.nearbyPosition, .full)
+        XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .full))
+    }

    func test_originSurfaceY() {
        let fpc = FloatingPanelController(delegate: nil)
@@ -117,6 +133,31 @@ class FloatingPanelControllerTests: XCTestCase {
        fpc.move(to: .hidden, animated: false)
        XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .hidden))
    }
+
+    func test_contentMode() {
+        let fpc = FloatingPanelController(delegate: nil)
+        fpc.loadViewIfNeeded()
+        fpc.view.frame = CGRect(x: 0, y: 0, width: 375, height: 667)
+        fpc.show(animated: false, completion: nil)
+
+        fpc.contentMode = .static
+
+        fpc.move(to: .full, animated: false)
+        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.originYOfSurface(for: .full))
+        fpc.move(to: .half, animated: false)
+        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.originYOfSurface(for: .full))
+        fpc.move(to: .tip, animated: false)
+        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.originYOfSurface(for: .full))
+
+        fpc.contentMode = .fitToBounds
+
+        fpc.move(to: .full, animated: false)
+        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.originYOfSurface(for: .full))
+        fpc.move(to: .half, animated: false)
+        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.originYOfSurface(for: .half))
+        fpc.move(to: .tip, animated: false)
+        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.originYOfSurface(for: .tip))
+    }
 }

 private class MyZombieViewController: UIViewController, FloatingPanelLayout, FloatingPanelBehavior, FloatingPanelControllerDelegate {
@@ -194,13 +194,98 @@ class FloatingPanelLayoutTests: XCTestCase {

        fpc.floatingPanel.layoutAdapter.endInteraction(at: fpc.position)
    }
+
+    func test_updateInteractiveTopConstraintWithMinusInsets() {
+        class FloatingPanelLayoutMinusInsets: FloatingPanelTestLayout {
+            let initialPosition: FloatingPanelPosition = .full
+            let supportedPositions: Set<FloatingPanelPosition> = [.tip, .full]
+            func insetFor(position: FloatingPanelPosition) -> CGFloat? {
+                switch position {
+                case .full, .tip: return -200
+                default: return nil
+                }
+            }
+        }
+        let delegate = FloatingPanelTestDelegate()
+        delegate.layout = FloatingPanelLayoutMinusInsets()
+        fpc.delegate = delegate
+        fpc.showForTest()
+        fpc.floatingPanel.layoutAdapter.startInteraction(at: fpc.position)
+
+        let fullPos = fpc.originYOfSurface(for: .full)
+        let tipPos = fpc.originYOfSurface(for: .tip)
+        let current = fpc.surfaceView.frame.minY
+
+        var next: CGFloat
+        fpc.floatingPanel.layoutAdapter.updateInteractiveTopConstraint(diff: -100.0, allowsTopBuffer: false, with: fpc.behavior)
+        next = fpc.surfaceView.frame.minY
+        XCTAssertEqual(next, current)
+
+        fpc.floatingPanel.layoutAdapter.updateInteractiveTopConstraint(diff: -100.0, allowsTopBuffer: true, with: fpc.behavior)
+        next = fpc.surfaceView.frame.minY
+        XCTAssertEqual(next, fullPos - fpc.layout.topInteractionBuffer)
+
+        fpc.floatingPanel.layoutAdapter.updateInteractiveTopConstraint(diff: tipPos - fullPos + 100.0, allowsTopBuffer: true, with: fpc.behavior)
+        next = fpc.surfaceView.frame.minY
+        XCTAssertEqual(next, tipPos + fpc.layout.bottomInteractionBuffer)
+
+        fpc.floatingPanel.layoutAdapter.endInteraction(at: fpc.position)
+    }
+
+    func test_positionReference() {
+        fpc = CustomSafeAreaFloatingPanelController()
+        fpc.loadViewIfNeeded()
+        fpc.view.frame = CGRect(x: 0, y: 0, width: 375, height: 667)
+
+        class MyFloatingPanelFullLayout: FloatingPanelTestLayout {
+            var initialPosition: FloatingPanelPosition = .half
+            var positionReference: FloatingPanelLayoutReference {
+                return .fromSuperview
+            }
+        }
+        class MyFloatingPanelSafeAreaLayout: FloatingPanelTestLayout {
+            var initialPosition: FloatingPanelPosition = .half
+            var positionReference: FloatingPanelLayoutReference {
+                return .fromSafeArea
+            }
+        }
+        let fullLayout = MyFloatingPanelFullLayout()
+        let delegate = FloatingPanelTestDelegate()
+        delegate.layout = fullLayout
+        fpc.delegate = delegate
+        fpc.showForTest()
+
+        XCTAssertEqual(fpc.layout.positionReference, .fromSuperview)
+        XCTAssertEqual(fpc.originYOfSurface(for: .full), fullLayout.insetFor(position: .full))
+        XCTAssertEqual(fpc.originYOfSurface(for: .half), fpc.view!.frame.height - fullLayout.insetFor(position: .half)!)
+        XCTAssertEqual(fpc.originYOfSurface(for: .tip), fpc.view!.frame.height - fullLayout.insetFor(position: .tip)!)
+
+        let safeAreaLayout = MyFloatingPanelSafeAreaLayout()
+        delegate.layout = safeAreaLayout
+        fpc.delegate = delegate
+
+        XCTAssertEqual(fpc.layout.positionReference, .fromSafeArea)
+        XCTAssertEqual(fpc.originYOfSurface(for: .full),
+                       fullLayout.insetFor(position: .full)! + fpc.layoutInsets.top)
+        XCTAssertEqual(fpc.originYOfSurface(for: .half),
+                       fpc.view!.frame.height - (fullLayout.insetFor(position: .half)! +  fpc.layoutInsets.bottom))
+        XCTAssertEqual(fpc.originYOfSurface(for: .tip),
+                       fpc.view!.frame.height - (fullLayout.insetFor(position: .tip)! +  fpc.layoutInsets.bottom))
+    }
 }

 private typealias LayoutSegmentTestParameter = (UInt, pos: CGFloat, forwardY: Bool, lower: FloatingPanelPosition?, upper: FloatingPanelPosition?)
-private func assertLayoutSegment(_ floatingPanel: FloatingPanel, with params: [LayoutSegmentTestParameter]) {
+private func assertLayoutSegment(_ floatingPanel: FloatingPanelCore, with params: [LayoutSegmentTestParameter]) {
    params.forEach { (line, pos, forwardY, lowr, upper) in
        let segument = floatingPanel.layoutAdapter.segument(at: pos, forward: forwardY)
        XCTAssertEqual(segument.lower, lowr, line: line)
        XCTAssertEqual(segument.upper, upper, line: line)
    }
 }
+
+private class CustomSafeAreaFloatingPanelController: FloatingPanelController { }
+extension CustomSafeAreaFloatingPanelController {
+    override var layoutInsets: UIEdgeInsets {
+        return UIEdgeInsets(top: 64.0, left: 0.0, bottom: 0.0, right: 34.0)
+    }
+}
@@ -23,7 +23,7 @@ class FloatingPanelSurfaceViewTests: XCTestCase {
        XCTAssert(surface.backgroundColor == surface.containerView.backgroundColor)
    }

-    func test_surfaceView_constraintsUpdate() {
+    func test_surfaceView_grabberHandle() {
        let surface = FloatingPanelSurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
        XCTAssert(surface.contentView == nil)
        surface.layoutIfNeeded()
@@ -39,6 +39,42 @@ class FloatingPanelSurfaceViewTests: XCTestCase {
        XCTAssert(surface.grabberHandle.frame.height == surface.grabberHandleHeight, "\(surface.grabberHandle.frame.height) == \(surface.grabberHandleHeight)")
    }

+    func test_surfaceView_containerMargins() {
+        let surface = FloatingPanelSurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
+        surface.layoutIfNeeded()
+        XCTAssertEqual(surface.containerView.frame, surface.bounds)
+        surface.containerMargins = 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))
+    }
+
+    func test_surfaceView_contentInsets() {
+        let surface = FloatingPanelSurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
+        let contentView = UIView()
+        surface.add(contentView: contentView)
+        surface.layoutIfNeeded()
+        XCTAssertEqual(surface.contentView.frame, surface.bounds)
+        surface.contentInsets = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
+        surface.setNeedsLayout()
+        surface.layoutIfNeeded()
+        XCTAssertEqual(surface.contentView.frame, surface.bounds.inset(by: surface.contentInsets))
+    }
+
+    func test_surfaceView_containerMargins_and_contentInsets() {
+        let surface = FloatingPanelSurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
+        let contentView = UIView()
+        surface.add(contentView: contentView)
+        surface.layoutIfNeeded()
+        XCTAssertEqual(surface.contentView.frame, surface.bounds)
+        surface.containerMargins = UIEdgeInsets(top: 16.0, left: 16.0, bottom: 16.0, right: 16.0)
+        surface.contentInsets = 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, surface.containerView.bounds.inset(by: surface.contentInsets))
+    }
+
    func test_surfaceView_cornderRaduis() {
        let surface = FloatingPanelSurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
        XCTAssert(surface.cornerRadius == 0.0)
@@ -523,7 +523,7 @@ private class FloatingPanelLayout3Positions: FloatingPanelTestLayout {
 }

 private typealias TestParameter = (UInt, CGFloat,CGPoint, FloatingPanelPosition)
-private func assertTargetPosition(_ floatingPanel: FloatingPanel, with params: [TestParameter]) {
+private func assertTargetPosition(_ floatingPanel: FloatingPanelCore, with params: [TestParameter]) {
    params.forEach { (line, pos, velocity, result) in
        floatingPanel.surfaceView.frame.origin.y = pos
        XCTAssertEqual(floatingPanel.targetPosition(from: pos, with: velocity), result, line: line)
@@ -7,8 +7,7 @@
 [![Swift 5.0](https://img.shields.io/badge/Swift-5.0-orange.svg?style=flat)](https://swift.org/)
 [![Swift 5.1](https://img.shields.io/badge/Swift-5.1-orange.svg?style=flat)](https://swift.org/)

-#  FloatingPanel
-
+# 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.
@@ -25,20 +24,31 @@ The new interface displays the related contents and utilities in parallel as a u
 - [Installation](#installation)
  - [CocoaPods](#cocoapods)
  - [Carthage](#carthage)
+  - [Swift Package Manager with Xcode 11](#swift-package-manager-with-xcode-11)
 - [Getting Started](#getting-started)
  - [Add a floating panel as a child view controller](#add-a-floating-panel-as-a-child-view-controller)
  - [Present a floating panel as a modality](#present-a-floating-panel-as-a-modality)
 - [View hierarchy](#view-hierarchy)
 - [Usage](#usage)
  - [Show/Hide a floating panel in a view with your view hierarchy](#showhide-a-floating-panel-in-a-view-with-your-view-hierarchy)
+  - [Scale the content view when the surface position changes](#scale-the-content-view-when-the-surface-position-changes)
  - [Customize the layout with `FloatingPanelLayout` protocol](#customize-the-layout-with-floatingpanellayout-protocol)
    - [Change the initial position and height](#change-the-initial-position-and-height)
    - [Support your landscape layout](#support-your-landscape-layout)
    - [Use Intrinsic height layout](#use-intrinsic-height-layout)
+    - [Specify position insets from the frame of `FloatingPanelController.view`, not the SafeArea](#specify-position-insets-from-the-frame-of-floatingpanelcontrollerview-not-the-safearea)
  - [Customize the behavior with `FloatingPanelBehavior` protocol](#customize-the-behavior-with-floatingpanelbehavior-protocol)
    - [Modify your floating panel's interaction](#modify-your-floating-panels-interaction)
-  - [Use a custom grabber handle](#use-a-custom-grabber-handle)
-  - [Add tap gestures to the surface or backdrop views](#add-tap-gestures-to-the-surface-or-backdrop-views)
+    - [Activate the rubber-band effect on the top/bottom edges](#activate-the-rubber-band-effect-on-the-topbottom-edges)
+    - [Manage the projection of a pan gesture momentum](#manage-the-projection-of-a-pan-gesture-momentum)
+  - [Customize the surface design](#customize-the-surface-design)
+    - [Use a custom grabber handle](#use-a-custom-grabber-handle)
+    - [Customize layout of the grabber handle](#customize-layout-of-the-grabber-handle)
+    - [Customize content padding from surface edges](#customize-content-padding-from-surface-edges)
+    - [Customize margins of the surface edges](#customize-margins-of-the-surface-edges)
+  - [Customize gestures](#customize-gestures)
+    - [Suppress the panel interaction](#suppress-the-panel-interaction)
+    - [Add tap gestures to the surface or backdrop views](#add-tap-gestures-to-the-surface-or-backdrop-views)
  - [Create an additional floating panel for a detail](#create-an-additional-floating-panel-for-a-detail)
  - [Move a position with an animation](#move-a-position-with-an-animation)
  - [Work your contents together with a floating panel behavior](#work-your-contents-together-with-a-floating-panel-behavior)
@@ -85,7 +95,7 @@ it, simply add the following line to your Podfile:
 pod 'FloatingPanel'
 ```

-✏️ To suppress "Swift Conversion" warnings in Xcode, please set a Swift version to `SWIFT_VERSION` for the project in your Podfile. It will be resolved in CocoaPods v1.7.0.
+✏️FloatingPanel v1.7.0 or later requires CocoaPods v1.7.0+ for `swift_versions` support.

 ### Carthage

@@ -171,41 +181,72 @@ FloatingPanelController.view (FloatingPanelPassThroughView)

 ### Show/Hide a floating panel in a view with your view hierarchy

+If you need more control over showing and hiding the floating panel, you can forgo the `addPanel` and `removePanelFromParent` methods. These methods are a convenience wrapper for **FloatingPanel**'s `show` and `hide` methods along with some required setup.
+
+There are two ways to work with the `FloatingPanelController`:
+1. Add it to the hierarchy once and then call `show` and `hide` methods to make it appear/disappear.
+2. Add it to the hierarchy when needed and remove afterwards.
+
+The following example shows how to add the controller to your `UIViewController` and how to remove it. Make sure that you never add the same `FloatingPanelController` to the hierarchy before removing it.
+
+**NOTE**: `self.` prefix is not required, nor recommended. It's used here to make it clearer where do the functions used come from. `self` is an instance of a custom UIViewController in your code.
+
 ```swift
-// Add the controller and the managed views to a view controller.
-// From the second time, just call `show(animated:completion)`.
-view.addSubview(fpc.view)
+// Add the floating panel view to the controller's view on top of other views.
+self.view.addSubview(fpc.view)
+
+// REQUIRED. It makes the floating panel view have the same size as the controller's view.
+fpc.view.frame = self.view.bounds

-fpc.view.frame = view.bounds // MUST
 // In addition, Auto Layout constraints are highly recommended.
-// Because it makes the layout more robust on trait collection change.
-//
-//     fpc.view.translatesAutoresizingMaskIntoConstraints = false
-//     NSLayoutConstraint.activate([...])
-// 
+// Constraint the fpc.view to all four edges of your controller's view.
+// It makes the layout more robust on trait collection change.
+fpc.view.translatesAutoresizingMaskIntoConstraints = false
+NSLayoutConstraint.activate([
+  fpc.view.topAnchor.constraint(equalTo: self.view.topAnchor, constant: 0.0),
+  fpc.view.leftAnchor.constraint(equalTo: self.view.leftAnchor, constant: 0.0),
+  fpc.view.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: 0.0),
+  fpc.view.bottomAnchor.constraint(equalTo: self.view.bottomAnchor, constant: 0.0),
+])

-parent.addChild(fpc)
+// Add the floating panel controller to the controller hierarchy.
+self.addChild(fpc)

-// Show a floating panel to the initial position defined in your `FloatingPanelLayout` object.
+// Show the floating panel at the initial position defined in your `FloatingPanelLayout` object.
 fpc.show(animated: true) {
-
-    // Only for the first time
-    self.didMove(toParent: self)
-}
-
-...
-
-// Hide it
-fpc.hide(animated: true) {
-
-    // Remove it if needed
-    self.willMove(toParent: nil)
-    self.view.removeFromSuperview()
-    self.removeFromParent()
+    // Inform the floating panel controller that the transition to the controller hierarchy has completed.
+    fpc.didMove(toParent: self)
 }
 ```

-NOTE: `FloatingPanelController` wraps `show`/`hide` with `addPanel`/`removePanelFromParent` for easy-to-use. But `show`/`hide` are more convenience for your app.
+After you add the `FloatingPanelController` as seen above, you can call `fpc.show(animated: true) { }` to show the panel and `fpc.hide(animated: true) { }` to hide it.
+
+To remove the `FloatingPanelController` from the hierarchy, follow the example below.
+
+```swift
+// Inform the panel controller that it will be removed from the hierarchy.
+fpc.willMove(toParent: nil)
+    
+// Hide the floating panel.
+fpc.hide(animated: true) {
+    // Remove the floating panel view from your controller's view.
+    fpc.view.removeFromSuperview()
+    // Remove the floating panel controller from the controller hierarchy.
+    fpc.removeFromParent()
+}
+```
+
+### Scale the content view when the surface position changes
+
+Specify the `contentMode` to `.fitToBounds` if the surface height fits the bounds of `FloatingPanelController.view` when the surface position changes
+
+```swift
+fpc.contentMode = .fitToBounds
+```
+
+Otherwise, `FloatingPanelController` fixes the content by the height of the top most position.
+
+✏️ In `.fitToBounds` mode, the surface height changes as following a user interaction so that you have a responsibility to configure Auto Layout constrains not to break the layout of a content view by the elastic surface height.

 ### Customize the layout with `FloatingPanelLayout` protocol

@@ -297,6 +338,27 @@ class RemovablePanelLayout: FloatingPanelIntrinsicLayout {
 }
 ```

+#### Specify position insets from the frame of `FloatingPanelController.view`, not the SafeArea
+
+There are 2 ways. One is returning `.fromSuperview` for `FloatingPanelLayout.positionReference` in your layout.
+
+```swift
+class MyFullScreenLayout: FloatingPanelLayout {
+    ...
+    var positionReference: FloatingPanelLayoutReference {
+        return .fromSuperview
+    }
+}
+```
+
+Another is using `FloatingPanelFullScreenLayout` protocol.
+
+```swift
+class MyFullScreenLayout: FloatingPanelFullScreenLayout {
+    ...
+}
+```
+
 ### Customize the behavior with `FloatingPanelBehavior` protocol

 #### Modify your floating panel's interaction
@@ -319,7 +381,33 @@ class FloatingPanelStocksBehavior: FloatingPanelBehavior {
 }
 ```

-### Use a custom grabber handle
+#### Activate the rubber-band effect on the top/bottom edges
+
+```swift
+class FloatingPanelBehavior: FloatingPanelBehavior {
+    ...
+    func allowsRubberBanding(for edge: UIRectEdge) -> Bool {
+        return true
+    }
+}
+```
+
+#### Manage the projection of a pan gesture momentum
+
+This allows full projectional panel behavior. For example, a user can swipe up a panel from tip to full nearby the tip position.
+
+```swift
+class FloatingPanelBehavior: FloatingPanelBehavior {
+    ...
+    func shouldProjectMomentum(_ fpc: FloatingPanelController, for proposedTargetPosition: FloatingPanelPosition) -> Bool {
+        return true
+    }
+}
+```
+
+### Customize the surface design
+
+#### Use a custom grabber handle

 ```swift
 let myGrabberHandleView = MyGrabberHandleView()
@@ -327,7 +415,50 @@ fpc.surfaceView.grabberHandle.isHidden = true
 fpc.surfaceView.addSubview(myGrabberHandleView)
 ```

-### Add tap gestures to the surface or backdrop views
+#### Customize layout of the grabber handle
+
+```swift
+fpc.surfaceView.grabberTopPadding = 10.0
+fpc.surfaceView.grabberHandleWidth = 44.0
+fpc.surfaceView.grabberHandleHeight = 12.0
+```
+
+#### Customize content padding from surface edges
+
+```swift
+fpc.surfaceView.contentInsets = .init(top: 20, left: 20, bottom: 20, right: 20)
+```
+
+#### Customize margins of the surface edges
+
+```swift
+fpc.surfaceView.containerMargins = .init(top: 20.0, left: 16.0, bottom: 16.0, right: 16.0)
+```
+
+The feature can be used for these 2 kind panels
+
+* Facebook/Slack-like panel whose surface top edge is separated from the grabber handle.
+* iOS native panel to display AirPods information, for example.
+
+### Customize gestures
+
+#### Suppress the panel interaction
+
+You can disable the pan gesture recognizer directly
+
+```swift
+fpc.panGestureRecognizer.isEnable = false
+```
+
+Or use this `FloatingPanelControllerDelegate` method.
+
+```swift
+func floatingPanelShouldBeginDragging(_ vc: FloatingPanelController) -> Bool {
+    return aCondition ?  false : true
+}
+```
+
+#### Add tap gestures to the surface or backdrop views

 ```swift
 override func viewDidLoad() {
Author	SHA1	Message	Date
Shin Yamamoto	e4548b26bd	Release 1.7.5	2020-06-03 22:33:02 +09:00
Shin Yamamoto	d540b1ddde	Fix the panel behavior in a sheet modal (#358 ) * Add "Show Panel in Sheet Modal" sample * Fix the behavior in a sheet modal	2020-06-03 22:31:30 +09:00
Shin Yamamoto	aaeb752911	No need to recognize both of the pan gesture and dismiss gesuter of sheet modal	2020-05-30 10:11:12 +09:00
Grigory	966caad519	Fix the constraints break on fitToBounds mode (#359 )	2020-05-30 09:44:58 +09:00
Shin Yamamoto	a62c3a23dc	Fix some view controllers in Samples.app for a sheet modal	2020-05-23 09:07:01 +09:00
Shin Yamamoto	7bbc3d5910	fix the behavior in a sheet modal	2020-05-23 08:12:01 +09:00
Shin Yamamoto	e2afb1e22f	Add "Show Panel in Sheet Modal" sample	2020-05-23 08:11:30 +09:00
Shin Yamamoto	8cca1178fd	fix {top,bottom} constant's boundary in updating panel interactively (#352 ) Because {top,bottom}Y can be {less,more} than the SafeArea/Superview bounds, if a minus value is set to the inset for {top,bottom} most position.	2020-05-21 08:59:52 +09:00
Shin Yamamoto	a09a0e9e32	fix the animation velocity's sign (#354 ) Using a directional distance to calculate an animation velocity fixes an issue where a panel's animation was wrong when a user swipes up a panel at the top most position.	2020-05-16 09:18:59 +09:00
Shin Yamamoto	43c76faa20	fix invalid safearea insets in a table view with static cells (#353 ) See also https://github.com/SCENEE/FloatingPanel/issues/330	2020-05-16 09:17:34 +09:00
Shin Yamamoto	5787a350ab	fix the memory leak of FloatingPanelController object (#350 )	2020-05-15 07:41:18 +09:00
Shin Yamamoto	9abb80de64	Fix an invalid indicator insets of the tracking scroll view (#346 )	2020-04-29 14:22:34 +09:00
Shin Yamamoto	7d90458d99	Support the initial hidden position not including the supported positions (#345 )	2020-04-29 14:20:49 +09:00
Shin Yamamoto	5d5f14acd8	fix a build error on Xcode 11.4 (#337 )	2020-03-30 17:52:00 +09:00
Shin Yamamoto	bed519f0c0	Merge pull request #326 from SCENEE/release-1.7.4 Release 1.7.4	2020-02-29 18:52:15 +09:00
Shin Yamamoto	7c47e2e20e	Release 1.7.4	2020-02-29 13:25:11 +09:00
Federico Zanetello	f909cd4101	ignore .swiftpm/ folder (#324 )	2020-02-29 13:20:50 +09:00
Federico Zanetello	8c24aa3fc9	fix api typo (#325 ) fixes floatingPanel(_ vc: FloatingPanelController, contentOffsetForPinning) name	2020-02-29 13:18:09 +09:00
Shin Yamamoto	7531d80f1c	Merge pull request #323 from SCENEE/release-1.7.3 Release 1.7.3	2020-02-29 10:40:38 +09:00
Shin Yamamoto	c4c1906cae	Release 1.7.3	2020-02-28 21:00:44 +09:00
Shin Yamamoto	4f717c5840	update github issue template	2020-02-28 21:00:40 +09:00
Shin Yamamoto	fbd83ef500	fix a run script error	2020-02-26 22:53:44 +09:00
Shin Yamamoto	2a91145366	Fix breaking content offset of the tracked scroll view (#315 ) * Convert the tracked scroll view frame to the surface coordinate space	2020-02-26 22:49:51 +09:00
Shin Yamamoto	f5d72aa0a5	Add failure requirements for multiple panels (#322 ) * add multi panel sample	2020-02-26 22:47:52 +09:00
Shin Yamamoto	65f67c98f4	Add floatingPanel(_:contentOffsetForPinning:) delegate method (#314 ) * add floatingPanel(_:contentOffsetForPinning:) * add 'Show NavigationController' sample * fix the initial content offset in a navigation bar with a large text The content offset preservation should be applied only when `FloatingPanelController.contentInsetAdjustmentBehavior` is `.always`. This is because the library user loses control of the initial offset.	2020-02-24 11:16:10 +09:00
Shin Yamamoto	1f79c2573f	Merge pull request #316 from jacksonjude/master Minor README.md typo	2020-02-15 10:32:03 +09:00
jacksonjude	bc840dde46	Minor README.md typo	2020-02-08 22:36:50 -08:00
Shin Yamamoto	57ed039857	Merge pull request #312 from SCENEE/release-1.7.2 Release 1.7.2	2020-01-30 09:29:00 +09:00
Shin Yamamoto	11f0e8c84e	Release 1.7.2	2020-01-29 11:33:11 +09:00
Shin Yamamoto	dd19c866d4	Merge pull request #311 from SCENEE/return-childvc-to-consult Return the child view controller to consult	2020-01-29 11:31:01 +09:00
Shin Yamamoto	801fed9843	Return the child view controller to consult	2020-01-29 08:54:53 +09:00
Shin Yamamoto	847b5c0917	Merge pull request #310 from SCENEE/fix-didenddecelerating-call Fix delegate calls	2020-01-28 22:39:37 +09:00
Shin Yamamoto	c64056ca7b	Make floatingPanelDidEndDragging's velocity zero when it won't animate Ideally, it's better to define a delegate method like scrollViewDidEndDragging(_:willDecelerate:) in FloatingPanelControllerDelegate to notify whether a panel will be decelerated or not. However it's a broken change so I add this change as workaround. The delegate method definition will be improved on v2.0.	2020-01-28 11:40:31 +09:00
Shin Yamamoto	269c3e29b5	Call floatingPanelDidEndDecelerating even if an animation interrupted	2020-01-27 16:50:16 +09:00
Shin Yamamoto	002bbb4a4a	Merge pull request #307 from SCENEE/iss-293 Fix a panel's move-up while dragging it down	2020-01-21 20:40:48 +09:00
Shin Yamamoto	14011a5bc2	Fix grabber area behavior The grabber area was not working expectedly.	2020-01-18 17:27:58 +09:00
Shin Yamamoto	23f2242c9a	Fix a panel's move-up in dragging it down This issue is that a panel moved up while dragging it down if content offset of the tracking scroll view in a content view controller was greater than its top interaction buffer. Ref. #293	2020-01-18 17:26:38 +09:00
Shin Yamamoto	4fd92a4002	Fix Maps.app's crash on device after the second launch (#306 ) This seems to be Xcode 11's bug of linking frameworks.	2020-01-18 15:05:46 +09:00
Ramesh R C	9c57089b0e	Add FloatingPanelController.nearbyPosition (#303 ) * Added nearbyPosition : always a position of a user's finger. * debugging nearby position in Maps.app. * Added test cases move with nearby position.	2020-01-09 13:26:30 +09:00
Shin Yamamoto	3b11cdc72a	Merge pull request #291 from SCENEE/release-1.7.1 Release 1.7.1	2019-11-27 21:59:57 +09:00
Shin Yamamoto	4edaad2cf4	Release 1.7.1	2019-11-21 21:17:11 +09:00
Shin Yamamoto	92fc0621e2	Merge pull request #292 from TadeasKriz/patch-1 Improve manual `show` and `hide` example.	2019-11-21 21:16:32 +09:00
Tadeas Kriz	e9f4392c48	Improve manual `show` and `hide` example.	2019-11-20 15:56:17 +01:00
Shin Yamamoto	4df40becaf	Merge pull request #290 from SCENEE/fix/addpanel Pass parent to didMove(toParent:)	2019-11-20 10:36:22 +09:00
Shin Yamamoto	ba11e7c7d7	Pass parent to didMove(toParent:) `4ad7f11` commit causes the wrong parameter.	2019-11-20 09:51:47 +09:00
Shin Yamamoto	ae671f22c6	Merge pull request #288 from SCENEE/fix-swiftinterface-error Rename the internal FloatingPanel object for .swiftinterface issue	2019-11-19 23:01:36 +09:00
Shin Yamamoto	f22f58212b	Clean up lines with only white spaces	2019-11-19 18:37:52 +09:00
Shin Yamamoto	54ff1c360d	Rename 'FloatingPanel' type for '.swiftinterface' issue See also https://forums.swift.org/t/frameworkname-is-not-a-member-type-of-frameworkname-errors-inside-swiftinterface/28962	2019-11-19 18:37:44 +09:00
dmytrofrolov1	772d6c3ef3	Improve the surface position evaluation and top scroll bouncing of content * Evaluate the surface position approximately by 1px with a display scale * Allow a top scroll bouncing of content without closing floating panel when a user scrolls it a lot	2019-11-19 18:29:20 +09:00
Shin Yamamoto	a94c3b3c26	Merge pull request #287 from SCENEE/fix-module-stability Enable the swift module interfaces	2019-11-15 22:07:01 +09:00
Shin Yamamoto	d0ffc4ceb1	Enable the swift module interfaces	2019-11-15 14:32:33 +09:00
Shin Yamamoto	597ce487aa	Merge pull request #275 from peka2/patch-1 Update README	2019-10-09 00:32:57 +09:00
peka2	87eb8d94fd	Update README	2019-10-08 18:58:01 +09:00
Shin Yamamoto	4944fc516a	Update README	2019-10-05 14:09:41 +09:00
Shin Yamamoto	7537384339	Merge pull request #273 from SCENEE/release-1.7.0 Release 1.7.0	2019-10-05 14:07:40 +09:00
Shin Yamamoto	8fd134512f	Release v1.7.0	2019-09-28 23:02:45 +09:00
Shin Yamamoto	f566fc6475	Add a sample of panel including a PageVC content	2019-09-28 23:02:45 +09:00
Shin Yamamoto	9cbcb48a9b	Merge pull request #266 from SCENEE/add-containerinsets Add FloatingPanelSurfaceView.containerMargins	2019-09-28 22:47:21 +09:00
Shin Yamamoto	817956cef3	Update README	2019-09-28 21:49:47 +09:00
Shin Yamamoto	3c1aa7aa42	Fix FloatingPanelFullScreenLayout is not working	2019-09-28 13:18:58 +09:00
Shin Yamamoto	7598e8f160	ci: Update xcode versions	2019-09-28 13:18:58 +09:00
Shin Yamamoto	ba011e7242	Add 'Show with ContainerMargins' sample	2019-09-28 13:18:44 +09:00
Shin Yamamoto	ecdf20db8f	Add FloatingPanelSurfaceView.containerMargins `FloatingPanelSurfaceView.containerTopInset` is replaced by the top inset.	2019-09-28 13:18:44 +09:00
Shin Yamamoto	3a7f39321c	Update allowsRubberBanding() sample	2019-09-28 13:18:44 +09:00
Shin Yamamoto	e75d83e7a4	Merge pull request #270 from SCENEE/release-1.6.6 Release 1.6.6	2019-09-28 13:17:37 +09:00
Shin Yamamoto	2cdb4a6bc2	Suppress UITableViewAlertForLayoutOutsideViewHierarchy alert Following the alert suggestion > [TableView] Warning once only: UITableView was told to layout its visible > cells and other contents without being in the view hierarchy (the table > view or one of its superviews has not been added to a window).	2019-09-16 21:58:28 +09:00
Shin Yamamoto	1a4d5a7954	CI: Add Xcode 11 & Swift 5.1 build * Add a build on Xcode 11 image with SUPPORTS_MACCATALYST=NO because Xcode 11 runs on macOS 10.14 in Travis CI * Add Swift 5.1 badge	2019-09-16 21:56:28 +09:00
Shin Yamamoto	22ef3e7cd9	Merge pull request #253 from SCENEE/release-1.6.5 Release 1.6.5	2019-08-31 13:48:32 +09:00
Nikolay Derkach	f8b8176988	Support bottom content inset for container view (#257 ) and also fix height of a content view resized by the inset Fix #256	2019-08-31 12:43:53 +09:00
Shin Yamamoto	0c5bf2bfe9	Merge pull request #252 from hartbit/updating-layout Improve the documentation of floatingPanelDidChangePosition	2019-08-24 17:02:33 +09:00
David Hart	8b45517915	Improve floatingPanelDidChangePosition and tigger it on removal	2019-08-22 14:09:02 +02:00
Shin Yamamoto	3cca07fefd	Merge pull request #251 from rikusouda/fix/call_did_end_remove_by_backdrop_view Call floatingPanelDidEndRemove when dismiss with tap on backdrop view	2019-08-21 15:21:55 +09:00
Yuki Yoshioka	276ae23f13	Call floatingPanelDidEndRemove when dismiss with tap on backdrop view By #205 added dismissing by backdrop view. But `floatingPanelDidEndRemove` is not called from it.	2019-08-19 14:34:11 +09:00
Shin Yamamoto	c1b2ffeb78	Merge pull request #212 from joshuafinch/feature/cocoapods-1.7 Add support for specifying swift_versions in CocoaPods 1.7 and above	2019-08-15 13:47:44 +09:00
Shin Yamamoto	262ee34201	Merge pull request #247 from SCENEE/release-1.6.4 Release 1.6.4	2019-08-09 23:52:04 +09:00
Shin Yamamoto	53719bd94a	Feat elastic layout (#145 ) * Move the prepareLayout(in:) call * Support 'fitToBounds' content mode * Add NSLayoutConstraint.{de}activate(constraint:) * Update README	2019-08-03 14:45:35 +09:00
Nikolay Derkach	935b7d9e10	Allow to disable tap on backdrop view for panel dismissal (#205 ) * Add 'FloatingPanelBackdropView. dismissalTapGestureRecognizer' * Enable tap on backdropview gesture recognizer only for the modal presentation	2019-08-03 12:37:39 +09:00
Shin Yamamoto	e3bf19b972	Merge pull request #224 from SCENEE/feat-position-reference Add FloatingPanelLayout.positionReference	2019-07-27 15:22:18 +09:00
Shin Yamamoto	c36f09d3e9	Update README	2019-07-27 13:47:13 +09:00
Shin Yamamoto	9936a89118	Add FloatingPanelLayoutTests.test_positionReference()	2019-07-27 11:44:33 +09:00
Shin Yamamoto	562424cd8f	Add FloatingPanelLayout.positionReference	2019-07-27 11:44:33 +09:00
Shin Yamamoto	0c3fb83d0a	Merge pull request #241 from SCENEE/release-1.6.3 Release 1.6.3	2019-07-26 23:00:45 +09:00
Joshua Finch	23846dbf23	Add support for CocoaPods version 1.7 swift_version	2019-06-01 22:56:21 +01:00