Opt-in the dismissSwizzling call as needed

Fix a typo
ci: support xcode 15.0.1
2023-12-02 09:46:51 +09:00 · 2023-12-02 09:03:31 +09:00 · 2023-11-18 11:51:15 +09:00 · 2023-11-04 21:17:09 +09:00 · 2023-11-04 13:25:25 +09:00 · 2023-10-08 14:51:26 +09:00
33 changed files with 683 additions and 478 deletions
@@ -18,8 +18,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
+          - swift: "5.9"
+            xcode: "15.0.1"
+            runsOn: macos-13
          - swift: "5.8"
-            xcode: "14.3"
+            xcode: "14.3.1"
            runsOn: macos-13
          - swift: "5.7"
            xcode: "14.1"
@@ -52,18 +55,25 @@ jobs:
      fail-fast: false
      matrix:
        include:
+          - os: "17.0.1"
+            xcode: "15.0.1"
+            sim: "iPhone 15 Pro"
+            parallel: NO  # Stop random test job failures
+            runsOn: macos-13
          - os: "16.4"
            xcode: "14.3.1"
            sim: "iPhone 14 Pro"
+            parallel: NO  # Stop random test job failures
            runsOn: macos-13
          - os: "15.5"
            xcode: "13.4.1"
            sim: "iPhone 13 Pro"
+            parallel: NO  # Stop random test job failures
            runsOn: macos-12
    steps:
    - uses: actions/checkout@v3
    - name: Testing in iOS ${{ matrix.os }}
-      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=${{ matrix.os }},name=${{ matrix.sim }}'
+      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=${{ matrix.os }},name=${{ matrix.sim }}' -parallel-testing-enabled '${{ matrix.parallel }}'
    timeout-minutes: 20

  example:
@@ -82,7 +82,10 @@ struct FloatingPanelView<Content: View, FloatingPanelContent: View>: UIViewContr
    /// Responsible to setup the view hierarchy and floating panel.
    final class Coordinator {
        private let parent: FloatingPanelView<Content, FloatingPanelContent>
-        private lazy var fpc = FloatingPanelController()
+        private lazy var fpc = {
+            FloatingPanelController.enableDismissToRemove()
+            return FloatingPanelController()
+        }()

        init(parent: FloatingPanelView<Content, FloatingPanelContent>) {
            self.parent = parent
@@ -1,9 +1,14 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import UIKit
+import FloatingPanel

@UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?
-}

+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+        FloatingPanelController.enableDismissToRemove()
+        return true
+    }
+}
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
@@ -11,16 +13,16 @@
            <objects>
                <viewController id="BYZ-38-t0r" customClass="MainViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="5Jw-n2-Cpw">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                            </mapView>
                            <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d9i-3g-8Ja">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="0.0"/>
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="59"/>
                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="lMa-xa-AVV">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="393" height="59"/>
                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                </view>
                                <blurEffect style="prominent"/>
@@ -52,31 +54,31 @@
            <objects>
                <viewController storyboardIdentifier="SearchViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0S1-Lk-JgE" customClass="SearchViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="Ncl-E9-yRn">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ye3-uU-bq3">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ED1-gT-FBj">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                    <subviews>
                                        <searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="Zcj-SE-gb8">
-                                            <rect key="frame" x="0.0" y="6" width="600" height="51"/>
+                                            <rect key="frame" x="0.0" y="6" width="393" height="56"/>
                                            <textInputTraits key="textInputTraits"/>
                                        </searchBar>
-                                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="D7r-re-InH">
-                                            <rect key="frame" x="0.0" y="61" width="600" height="539"/>
+                                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="D7r-re-InH">
+                                            <rect key="frame" x="0.0" y="66" width="393" height="786"/>
                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                            <view key="tableHeaderView" contentMode="scaleToFill" id="u28-LY-hIh" customClass="SearchHeaderView" customModule="Maps" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="600" height="116"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="393" height="116"/>
                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                <subviews>
                                                    <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="era-8w-yA1">
-                                                        <rect key="frame" x="24" y="10.5" width="552" height="97.5"/>
+                                                        <rect key="frame" x="24" y="10.666666666666664" width="345" height="97.333333333333343"/>
                                                        <subviews>
                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="auI-1v-Yfk">
-                                                                <rect key="frame" x="0.0" y="0.0" width="60" height="97.5"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="60" height="97.333333333333329"/>
                                                                <subviews>
                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="food" translatesAutoresizingMaskIntoConstraints="NO" id="ErN-bC-qTx">
                                                                        <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -86,7 +88,7 @@
                                                                        </constraints>
                                                                    </imageView>
                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Food &amp; Drinks" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nx2-fW-xAm">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
                                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                        <nil key="textColor"/>
                                                                        <nil key="highlightedColor"/>
@@ -94,7 +96,7 @@
                                                                </subviews>
                                                            </stackView>
                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="0vd-sD-XKv">
-                                                                <rect key="frame" x="164" y="0.0" width="60" height="97.5"/>
+                                                                <rect key="frame" x="95" y="0.0" width="60" height="97.333333333333329"/>
                                                                <subviews>
                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shopping" translatesAutoresizingMaskIntoConstraints="NO" id="xcm-St-HAo">
                                                                        <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -104,7 +106,7 @@
                                                                        </constraints>
                                                                    </imageView>
                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H7q-q2-ga5">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
                                                                        <string key="text">Shopping
 </string>
                                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -114,7 +116,7 @@
                                                                </subviews>
                                                            </stackView>
                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="Jd8-YL-b5s">
-                                                                <rect key="frame" x="328" y="0.0" width="60" height="97.5"/>
+                                                                <rect key="frame" x="190" y="0.0" width="60" height="97.333333333333329"/>
                                                                <subviews>
                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fun" translatesAutoresizingMaskIntoConstraints="NO" id="bMJ-Jn-Gi8">
                                                                        <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -124,7 +126,7 @@
                                                                        </constraints>
                                                                    </imageView>
                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kKh-45-FZ2">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
                                                                        <string key="text">Fun
 </string>
                                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -134,7 +136,7 @@
                                                                </subviews>
                                                            </stackView>
                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="dTL-e1-Arz">
-                                                                <rect key="frame" x="492" y="0.0" width="60" height="97.5"/>
+                                                                <rect key="frame" x="285" y="0.0" width="60" height="97.333333333333329"/>
                                                                <subviews>
                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="travel" translatesAutoresizingMaskIntoConstraints="NO" id="8h3-fo-pC3">
                                                                        <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -144,7 +146,7 @@
                                                                        </constraints>
                                                                    </imageView>
                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WBT-Vj-7QA">
-                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.5"/>
+                                                                        <rect key="frame" x="0.0" y="66" width="60" height="31.333333333333329"/>
                                                                        <string key="text">Travel
 </string>
                                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -166,10 +168,10 @@
                                            </view>
                                            <prototypes>
                                                <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" rowHeight="70" id="LzC-B9-Adb" customClass="SearchCell" customModule="Maps" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="160.5" width="600" height="70"/>
+                                                    <rect key="frame" x="0.0" y="166" width="393" height="70"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LzC-B9-Adb" id="evr-60-laS">
-                                                        <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="393" height="70"/>
                                                        <autoresizingMask key="autoresizingMask"/>
                                                        <subviews>
                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="like" translatesAutoresizingMaskIntoConstraints="NO" id="GEk-yE-lLq">
@@ -181,16 +183,16 @@
                                                                </constraints>
                                                            </imageView>
                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Gfl-Oy-rsy">
-                                                                <rect key="frame" x="57" y="12" width="528" height="46"/>
+                                                                <rect key="frame" x="57" y="12" width="321" height="46"/>
                                                                <subviews>
                                                                    <label opaque="NO" userInteractionEnabled="NO" tag="1" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Favorites" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Spf-8L-Ne6">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="528" height="22"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="321" height="22"/>
                                                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                                        <nil key="textColor"/>
                                                                        <nil key="highlightedColor"/>
                                                                    </label>
                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 Places" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gyo-3V-7U8">
-                                                                        <rect key="frame" x="0.0" y="24" width="528" height="22"/>
+                                                                        <rect key="frame" x="0.0" y="24" width="321" height="22"/>
                                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                                        <color key="textColor" red="0.57647058819999997" green="0.57647058819999997" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
                                                                        <nil key="highlightedColor"/>
@@ -255,18 +257,18 @@
            <objects>
                <viewController storyboardIdentifier="DetailViewController" id="Tp2-MF-IFz" customClass="DetailViewController" customModule="Maps" customModuleProvider="target" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="FmO-AT-4Y7">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <visualEffectView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c3d-2e-0b1">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <rect key="frame" x="-1" y="-1" width="393" height="852"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="9fL-a5-0LS">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                    <subviews>
                                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="kP7-56-wlG">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                        </tableView>
                                    </subviews>
@@ -124,7 +124,7 @@ extension MainViewController: UISearchBarDelegate {
        searchBar.showsCancelButton = true
        searchVC.showHeader(animated: true)
        searchVC.tableView.alpha = 1.0
-        detailVC.dismiss(animated: true, completion: nil)
+        detailFpc.removePanelFromParent(animated: true)
    }
    func deactivate(searchBar: UISearchBar) {
        searchBar.resignFirstResponder()
@@ -156,6 +156,14 @@ class SearchPanelPhoneDelegate: NSObject, FloatingPanelControllerDelegate, UIGes
        self.owner = owner
    }

+    func floatingPanel(
+        _ fpc: FloatingPanelController,
+        shouldAllowToScroll scrollView: UIScrollView,
+        in state: FloatingPanelState
+    ) -> Bool {
+        return state == .full || state == .half
+    }
+
    func floatingPanel(_ vc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout {
        switch newCollection.verticalSizeClass {
        case .compact:
@@ -215,17 +223,10 @@ class SearchPanelLandscapeLayout: FloatingPanelLayout {
        .tip: FloatingPanelLayoutAnchor(absoluteInset: 69.0, edge: .bottom, referenceGuide: .safeArea),
    ]
    func prepareLayout(surfaceView: UIView, in view: UIView) -> [NSLayoutConstraint] {
-        if #available(iOS 11.0, *) {
-            return [
-                surfaceView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 8.0),
-                surfaceView.widthAnchor.constraint(equalToConstant: 291),
-            ]
-        } else {
-            return [
-                surfaceView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 8.0),
-                surfaceView.widthAnchor.constraint(equalToConstant: 291),
-            ]
-        }
+        return [
+            surfaceView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 8.0),
+            surfaceView.widthAnchor.constraint(equalToConstant: 291),
+        ]
    }
    func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
        return 0.0
@@ -81,9 +81,6 @@ class SearchViewController: UIViewController, UITableViewDataSource {

    var items: [LocationItem] = []

-    // For iOS 10 only
-    private lazy var shadowLayer: CAShapeLayer = CAShapeLayer()
-
    override func viewDidLoad() {
        super.viewDidLoad()
        tableView.dataSource = self
@@ -92,29 +89,6 @@ class SearchViewController: UIViewController, UITableViewDataSource {
        hideHeader(animated: false)
    }

-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        if #available(iOS 11, *) {
-        } else {
-            // Exmaple: Add rounding corners on iOS 10
-            visualEffectView.layer.cornerRadius = 9.0
-            visualEffectView.clipsToBounds = true
-
-            // Exmaple: Add shadow manually on iOS 10
-            view.layer.insertSublayer(shadowLayer, at: 0)
-            let rect = visualEffectView.frame
-            let path = UIBezierPath(roundedRect: rect,
-                                    byRoundingCorners: [.topLeft, .topRight],
-                                    cornerRadii: CGSize(width: 9.0, height: 9.0))
-            shadowLayer.frame = visualEffectView.frame
-            shadowLayer.shadowPath = path.cgPath
-            shadowLayer.shadowColor = UIColor.black.cgColor
-            shadowLayer.shadowOffset = CGSize(width: 0.0, height: 1.0)
-            shadowLayer.shadowOpacity = 0.2
-            shadowLayer.shadowRadius = 3.0
-        }
-    }
-
    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
        return items.count
    }
@@ -130,16 +104,16 @@ class SearchViewController: UIViewController, UITableViewDataSource {
    }

    func showHeader(animated: Bool) {
-        changeHeader(height: 116.0, aniamted: animated)
+        changeHeader(height: 116.0, animated: animated)
    }

    func hideHeader(animated: Bool) {
-        changeHeader(height: 0.0, aniamted: animated)
+        changeHeader(height: 0.0, animated: animated)
    }

-    private func changeHeader(height: CGFloat, aniamted: Bool) {
+    private func changeHeader(height: CGFloat, animated: Bool) {
        guard let headerView = tableView.tableHeaderView, headerView.bounds.height != height else { return }
-        if aniamted == false {
+        if animated == false {
            updateHeader(height: height)
            return
        }
@@ -1,8 +1,13 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 import UIKit
+import FloatingPanel

@UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+        FloatingPanelController.enableDismissToRemove()
+        return true
+    }
 }
@@ -11,9 +11,7 @@ final class DebugTextViewController: UIViewController, UITextViewDelegate {
        textView.delegate = self
        print("viewDidLoad: TextView --- ", textView.contentOffset, textView.contentInset)

-        if #available(iOS 11.0, *) {
-            textView.contentInsetAdjustmentBehavior = .never
-        }
+        textView.contentInsetAdjustmentBehavior = .never
    }

    override func viewWillLayoutSubviews() {
@@ -32,9 +30,7 @@ final class DebugTextViewController: UIViewController, UITextViewDelegate {

    func scrollViewDidScroll(_ scrollView: UIScrollView) {
        print("TextView --- ", scrollView.contentOffset, scrollView.contentInset)
-        if #available(iOS 11.0, *) {
-            print("TextView --- ", scrollView.adjustedContentInset)
-        }
+        print("TextView --- ", scrollView.adjustedContentInset)
    }

    @IBAction func toggleTopMargin(_ sender: UISwitch) {
@@ -37,7 +37,6 @@ final class ImageViewController: UIViewController {
        case withHeaderFooter
    }

-    @available(iOS 11.0, *)
    func layoutGuideFor(mode: Mode) -> UILayoutGuide {
        switch mode {
        case .onlyImage:
@@ -14,21 +14,17 @@ final class SettingsViewController: InspectableViewController {

    override func viewDidLayoutSubviews() {
        super.viewDidLayoutSubviews()
-        if #available(iOS 11.0, *) {
-            let prefersLargeTitles = navigationController!.navigationBar.prefersLargeTitles
-            largeTitlesSwitch.setOn(prefersLargeTitles, animated: false)
-        } else {
-            largeTitlesSwitch.isEnabled = false
-        }
+        let prefersLargeTitles = navigationController!.navigationBar.prefersLargeTitles
+        largeTitlesSwitch.setOn(prefersLargeTitles, animated: false)
+
        let isTranslucent = navigationController!.navigationBar.isTranslucent
        translucentSwitch.setOn(isTranslucent, animated: false)
    }

    @IBAction func toggleLargeTitle(_ sender: UISwitch) {
-        if #available(iOS 11.0, *) {
-            navigationController?.navigationBar.prefersLargeTitles = sender.isOn
-        }
+        navigationController?.navigationBar.prefersLargeTitles = sender.isOn
    }
+
    @IBAction func toggleTranslucent(_ sender: UISwitch) {
        // White non-translucent navigation bar, supports dark appearance
        if #available(iOS 15, *) {
@@ -238,13 +238,8 @@ class ThreeTabBarPanelLayout: FloatingPanelLayout {
    }

    func prepareLayout(surfaceView: UIView, in view: UIView) -> [NSLayoutConstraint] {
-        if #available(iOS 11.0, *) {
-            leftConstraint = surfaceView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 0.0)
-            rightConstraint = surfaceView.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor, constant: 0.0)
-        } else {
-            leftConstraint = surfaceView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 0.0)
-            rightConstraint = surfaceView.rightAnchor.constraint(equalTo: view.rightAnchor, constant: 0.0)
-        }
+        leftConstraint = surfaceView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 0.0)
+        rightConstraint = surfaceView.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor, constant: 0.0)
        return [ leftConstraint, rightConstraint ]
    }
 }
@@ -33,22 +33,10 @@ class CustomLayoutGuide: LayoutGuideProvider {

 extension UIViewController {
    var layoutInsets: UIEdgeInsets {
-        if #available(iOS 11.0, *) {
-            return view.safeAreaInsets
-        } else {
-            return UIEdgeInsets(top: topLayoutGuide.length,
-                                left: 0.0,
-                                bottom: bottomLayoutGuide.length,
-                                right: 0.0)
-        }
+        return view.safeAreaInsets
    }

    var layoutGuide: LayoutGuideProvider {
-        if #available(iOS 11.0, *) {
-            return view!.safeAreaLayoutGuide
-        } else {
-            return CustomLayoutGuide(topAnchor: topLayoutGuide.bottomAnchor,
-                                     bottomAnchor: bottomLayoutGuide.topAnchor)
-        }
+        return view.safeAreaLayoutGuide
    }
 }
@@ -15,14 +15,11 @@ extension MainViewController {
        tableView.dataSource = self
        tableView.delegate = self
        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "Cell")
-        automaticallyAdjustsScrollViewInsets = false

        let searchController = UISearchController(searchResultsController: nil)
-        if #available(iOS 11.0, *) {
-            navigationItem.searchController = searchController
-            navigationItem.hidesSearchBarWhenScrolling = false
-            navigationItem.largeTitleDisplayMode = .automatic
-        }
+        navigationItem.searchController = searchController
+        navigationItem.hidesSearchBarWhenScrolling = false
+        navigationItem.largeTitleDisplayMode = .automatic
        var insets = UIEdgeInsets.zero
        insets.bottom += 69.0
        tableView.contentInset = insets
@@ -33,12 +30,10 @@ extension MainViewController {

    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()
-            }) {
-                observations.append(observation)
-            }
+        if let observation = navigationController?.navigationBar.observe(\.prefersLargeTitles, changeHandler: { (bar, _) in
+            self.tableView.reloadData()
+        }) {
+            observations.append(observation)
        }
    }

@@ -56,12 +51,8 @@ extension MainViewController {

 extension MainViewController: UITableViewDataSource {
    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if #available(iOS 11.0, *) {
-            if navigationController?.navigationBar.prefersLargeTitles == true {
-                return UseCase.allCases.count + 30
-            } else {
-                return UseCase.allCases.count
-            }
+        if navigationController?.navigationBar.prefersLargeTitles == true {
+            return UseCase.allCases.count + 30
        } else {
            return UseCase.allCases.count
        }
@@ -322,8 +322,16 @@ extension UseCaseController {
 }

 extension UseCaseController: FloatingPanelControllerDelegate {
+    func floatingPanel(
+        _ fpc: FloatingPanelController,
+        shouldAllowToScroll scrollView: UIScrollView,
+        in state: FloatingPanelState
+    ) -> Bool {
+        return state == .full || state == .half
+    }
+
    func floatingPanel(_ vc: FloatingPanelController, contentOffsetForPinning trackingScrollView: UIScrollView) -> CGPoint {
-        if useCase == .showNavigationController, #available(iOS 11.0, *) {
+        if useCase == .showNavigationController {
            // 148.0 is the SafeArea's top value for a navigation bar with a large title.
            return CGPoint(x: 0.0, y: 0.0 - trackingScrollView.contentInset.top - 148.0)
        }
@@ -1,9 +1,15 @@
 // Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.

 #import "AppDelegate.h"
+@import FloatingPanel;

@interface AppDelegate ()
@end

@implementation AppDelegate
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions
+{
+    [FloatingPanelController enableDismissToRemove];
+    return YES;
+}
@end
@@ -81,7 +81,7 @@ class MainViewController: UIViewController, FloatingPanelControllerDelegate {
    }

    private func hideStockTickerBanner() {
-        // Dimiss top bar with dissolve animation
+        // Dismiss top bar with dissolve animation
        UIView.animate(withDuration: 0.25) {
            self.topBannerView.alpha = 0.0
            self.labelStackView.alpha = 1.0
@@ -1,18 +1,18 @@
 Pod::Spec.new do |s|

  s.name                = "FloatingPanel"
-  s.version             = "2.7.0"
+  s.version             = "2.8.1"
  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.
 The new interface displays the related contents and utilities in parallel as a user wants.
                   DESC
-  s.homepage            = "https://github.com/SCENEE/FloatingPanel"
+  s.homepage            = "https://github.com/scenee/FloatingPanel"
  s.author              = "Shin Yamamoto"
  s.social_media_url    = "https://twitter.com/scenee"

-  s.platform            = :ios, "10.0"
-  s.source              = { :git => "https://github.com/SCENEE/FloatingPanel.git", :tag => s.version.to_s }
+  s.platform            = :ios, "11.0"
+  s.source              = { :git => "https://github.com/scenee/FloatingPanel.git", :tag => s.version.to_s }
  s.source_files        = "Sources/*.swift"
  s.swift_version       = '5.0'

@@ -462,12 +462,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanel;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -493,12 +494,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanel;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -521,6 +523,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -541,6 +544,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -627,16 +631,17 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanel;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "TEST DEBUG __FP_LOG";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "TEST DEBUG FP_LOG";
 				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -657,6 +662,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.scenee.FloatingPanelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
    name: "FloatingPanel",
    platforms: [
-        .iOS(.v10)
+        .iOS(.v11)
    ],
    products: [
        // Products define the executables and libraries produced by a package, and make them visible to other packages.
@@ -9,7 +9,7 @@
 FloatingPanel is a simple and easy-to-use UI component designed for a user interface featured in Apple Maps, Shortcuts and Stocks app.
 The user interface displays related content and utilities alongside the main content.

-Please see also [the API reference](https://floatingpanel.github.io/2.7.0/documentation/floatingpanel/) for more details.
+Please see also [the API reference](https://floatingpanel.github.io/2.8.1/documentation/floatingpanel/) for more details.

 ![Maps](https://github.com/SCENEE/FloatingPanel/blob/master/assets/maps.gif)
 ![Stocks](https://github.com/SCENEE/FloatingPanel/blob/master/assets/stocks.gif)
@@ -21,47 +21,47 @@ Please see also [the API reference](https://floatingpanel.github.io/2.7.0/docume
 - [Features](#features)
 - [Requirements](#requirements)
 - [Installation](#installation)
-    - [CocoaPods](#cocoapods)
-    - [Carthage](#carthage)
-    - [Swift Package Manager](#swift-package-manager)
+  - [CocoaPods](#cocoapods)
+  - [Carthage](#carthage)
+  - [Swift Package Manager](#swift-package-manager)
 - [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)
+  - [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 layout](#change-the-initial-layout)
-    - [Update your panel layout](#update-your-panel-layout)
-        - [Support your landscape layout](#support-your-landscape-layout)
-        - [Use the intrinsic size of a content in your panel layout](#use-the-intrinsic-size-of-a-content-in-your-panel-layout)
-        - [Specify an anchor for each state by an inset of the `FloatingPanelController.view` frame](#specify-an-anchor-for-each-state-by-an-inset-of-the-floatingpanelcontrollerview-frame)
-        - [Change the backdrop alpha](#change-the-backdrop-alpha)
-        - [Using custome panel states](#using-custome-panel-states)
-    - [Customize the behavior with `FloatingPanelBehavior` protocol](#customize-the-behavior-with-floatingpanelbehavior-protocol)
-        - [Modify your floating panel's interaction](#modify-your-floating-panels-interaction)
-        - [Activate the rubber-band effect on panel edges](#activate-the-rubber-band-effect-on-panel-edges)
-        - [Manage the projection of a pan gesture momentum](#manage-the-projection-of-a-pan-gesture-momentum)
-    - [Specify the panel move's boundary](#specify-the-panel-moves-boundary)
-    - [Customize the surface design](#customize-the-surface-design)
-        - [Modify your surface appearance](#modify-your-surface-appearance)
-        - [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 view](#add-tap-gestures-to-the-surface-view)
-        - [Interrupt the delegate methods of `FloatingPanelController.panGestureRecognizer`](#interrupt-the-delegate-methods-of-floatingpanelcontrollerpangesturerecognizer)
-    - [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)
-    - [Enabling the tap-to-dismiss action of the backdrop view](#enabling-the-tap-to-dismiss-action-of-the-backdrop-view)
+  - [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 layout](#change-the-initial-layout)
+  - [Update your panel layout](#update-your-panel-layout)
+    - [Support your landscape layout](#support-your-landscape-layout)
+    - [Use the intrinsic size of a content in your panel layout](#use-the-intrinsic-size-of-a-content-in-your-panel-layout)
+    - [Specify an anchor for each state by an inset of the `FloatingPanelController.view` frame](#specify-an-anchor-for-each-state-by-an-inset-of-the-floatingpanelcontrollerview-frame)
+    - [Change the backdrop alpha](#change-the-backdrop-alpha)
+    - [Using custome panel states](#using-custome-panel-states)
+  - [Customize the behavior with `FloatingPanelBehavior` protocol](#customize-the-behavior-with-floatingpanelbehavior-protocol)
+    - [Modify your floating panel's interaction](#modify-your-floating-panels-interaction)
+    - [Activate the rubber-band effect on panel edges](#activate-the-rubber-band-effect-on-panel-edges)
+    - [Manage the projection of a pan gesture momentum](#manage-the-projection-of-a-pan-gesture-momentum)
+  - [Specify the panel move's boundary](#specify-the-panel-moves-boundary)
+  - [Customize the surface design](#customize-the-surface-design)
+    - [Modify your surface appearance](#modify-your-surface-appearance)
+    - [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 view](#add-tap-gestures-to-the-surface-view)
+    - [Interrupt the delegate methods of `FloatingPanelController.panGestureRecognizer`](#interrupt-the-delegate-methods-of-floatingpanelcontrollerpangesturerecognizer)
+  - [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)
+  - [Enabling the tap-to-dismiss action of the backdrop view](#enabling-the-tap-to-dismiss-action-of-the-backdrop-view)
+  - [Allow to scroll content of the tracking scroll view in addition to the most expanded state](#allow-to-scroll-content-of-the-tracking-scroll-view-in-addition-to-the-most-expanded-state)
 - [Notes](#notes)
-    - ['Show' or 'Show Detail' Segues from `FloatingPanelController`'s content view controller](#show-or-show-detail-segues-from-floatingpanelcontrollers-content-view-controller)
-    - [UISearchController issue](#uisearchcontroller-issue)
-    - [FloatingPanelSurfaceView's issue on iOS 10](#floatingpanelsurfaceviews-issue-on-ios-10)
+  - ['Show' or 'Show Detail' Segues from `FloatingPanelController`'s content view controller](#show-or-show-detail-segues-from-floatingpanelcontrollers-content-view-controller)
+  - [UISearchController issue](#uisearchcontroller-issue)
 - [Maintainer](#maintainer)
 - [License](#license)

@@ -93,10 +93,6 @@ Examples can be found here:

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

-While it still supports iOS 10, it is recommended to use this library on iOS 11+.
-
-:pencil2: If you'd like to use Swift 4.0, please use FloatingPanel v1.
-
 ## Installation

 ### CocoaPods
@@ -108,8 +104,6 @@ it, simply add the following line to your Podfile:
 pod 'FloatingPanel'
 ```

-:pencil2: FloatingPanel v1.7.0 or later requires CocoaPods v1.7.0+ for `swift_versions` support.
-
 ### Carthage

 For [Carthage](https://github.com/Carthage/Carthage), add the following to your `Cartfile`:
@@ -168,7 +162,8 @@ self.present(fpc, animated: true, completion: nil)

 You can show a floating panel over UINavigationController from the container view controllers as a modality of `.overCurrentContext` style.

-:pencil2: FloatingPanelController has the custom presentation controller. If you would like to customize the presentation/dismissal, please see [Transitioning](https://github.com/SCENEE/FloatingPanel/blob/master/Sources/Transitioning.swift).
+> [!NOTE]
+> FloatingPanelController has the custom presentation controller. If you would like to customize the presentation/dismissal, please see [Transitioning](https://github.com/SCENEE/FloatingPanel/blob/master/Sources/Transitioning.swift).

 ## View hierarchy

@@ -252,7 +247,8 @@ fpc.contentMode = .fitToBounds

 Otherwise, `FloatingPanelController` fixes the content by the height of the top most position.

-:pencil2: 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.
+> [!NOTE]
+> 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

@@ -350,7 +346,8 @@ class IntrinsicPanelLayout: FloatingPanelLayout {
 }
 ```

-:pencil2: `FloatingPanelIntrinsicLayout` is deprecated on v1.
+> [!WARNING]
+> `FloatingPanelIntrinsicLayout` is deprecated on v1.

 #### Specify an anchor for each state by an inset of the `FloatingPanelController.view` frame

@@ -367,7 +364,8 @@ class MyFullScreenLayout: FloatingPanelLayout {
 }
 ```

-:pencil2: `FloatingPanelFullScreenLayout` is deprecated on v1.
+> [!WARNING]
+> `FloatingPanelFullScreenLayout` is deprecated on v1.

 #### Change the backdrop alpha

@@ -431,7 +429,8 @@ class CustomPanelBehavior: FloatingPanelBehavior {
 }
 ```

-:pencil2: `floatingPanel(_ vc:behaviorFor:)` is deprecated on v1.
+> [!WARNING]
+> `floatingPanel(_ vc:behaviorFor:)` is deprecated on v1.

 #### Activate the rubber-band effect on panel edges

@@ -473,7 +472,8 @@ func floatingPanelDidMove(_ vc: FloatingPanelController) {
 }
 ```

-:pencil2: `{top,bottom}InteractionBuffer` property is removed from `FloatingPanelLayout` since v2.
+> [!WARNING]
+> `{top,bottom}InteractionBuffer` property is removed from `FloatingPanelLayout` since v2.

 ### Customize the surface design

@@ -514,7 +514,8 @@ fpc.surfaceView.grabberHandlePadding = 10.0
 fpc.surfaceView.grabberHandleSize = .init(width: 44.0, height: 12.0)
 ```

-:pencil2: Note that `grabberHandleSize` width and height are reversed in the left/right position.
+> [!NOTE]
+> `grabberHandleSize` width and height are reversed in the left/right position.

 #### Customize content padding from surface edges

@@ -663,6 +664,24 @@ The tap-to-dismiss action is disabled by default. So it needs to be enabled as b
 fpc.backdropView.dismissalTapGestureRecognizer.isEnabled = true
 ```

+### Allow to scroll content of the tracking scroll view in addition to the most expanded state
+
+Just define conditions to allow content scrolling in `floatingPanel(:_:shouldAllowToScroll:in)` delegate method. If the returned value is true, the scroll content scrolls when its scroll position is not at the top of the content.
+
+```swift
+class MyViewController: FloatingPanelControllerDelegate {
+    ... 
+
+    func floatingPanel(
+        _ fpc: FloatingPanelController,
+        shouldAllowToScroll trackingScrollView: UIScrollView,
+        in state: FloatingPanelState
+    ) -> Bool {
+        return state == .full || state == .half
+    }
+}
+```
+
 ## Notes

 ### 'Show' or 'Show Detail' Segues from `FloatingPanelController`'s content view controller
@@ -703,21 +722,6 @@ It's a great way to decouple between a floating panel and the content VC.

 Because `UISearchController` automatically presents itself modally when a user interacts with the search bar, and then it swaps the superview of the search bar to the view managed by itself while it displays. As a result, `FloatingPanelController` can't control the search bar when it's active, as you can see from [the screen shot](https://github.com/SCENEE/FloatingPanel/issues/248#issuecomment-521263831).

-### FloatingPanelSurfaceView's issue on iOS 10
-
-* On iOS 10, `FloatingPanelSurfaceView.cornerRadius` isn't not automatically masked with the top rounded corners  because of `UIVisualEffectView` issue. See https://forums.developer.apple.com/thread/50854. 
-So you need to draw top rounding corners of your content.  Here is an example in Examples/Maps.
-```swift
-override func viewDidLayoutSubviews() {
-    super.viewDidLayoutSubviews()
-    if #available(iOS 10, *) {
-        visualEffectView.layer.cornerRadius = 9.0
-        visualEffectView.clipsToBounds = true
-    }
-}
-```
-* If you sets clear color to `FloatingPanelSurfaceView.backgroundColor`, please note the bottom overflow of your content on bouncing at full position. To prevent it, you need to expand your content. For example, See Example/Maps App's Auto Layout settings of `UIVisualEffectView` in Main.storyboard.
-
 ## Maintainer

 Shin Yamamoto <shin@scenee.com> | [@scenee](https://twitter.com/scenee)
@@ -25,12 +25,16 @@ public protocol FloatingPanelBehavior {
    @objc optional
    var momentumProjectionRate: CGFloat { get }

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

    /// Returns the progress to redirect to the previous position.
    ///
@@ -96,6 +96,35 @@ import os.log
    @objc(floatingPanel:contentOffsetForPinningScrollView:)
    optional
    func floatingPanel(_ fpc: FloatingPanelController, contentOffsetForPinning trackingScrollView: UIScrollView) -> CGPoint
+
+    /// Returns a Boolean value that determines whether the tracking scroll view should
+    /// scroll or not
+    ///
+    ///
+    /// If you return true, the scroll content scrolls when its scroll position is not
+    /// at the top of the content. If the delegate doesn’t implement this method, its
+    /// content can be scrolled only in the most expanded state.
+    ///
+    /// Basically, the decision to scroll is based on the `state` property like the
+    /// following code.
+    /// ```swift
+    /// func floatingPanel(
+    ///     _ fpc: FloatingPanelController,
+    ///     shouldAllowToScroll scrollView: UIScrollView,
+    ///     in state: FloatingPanelState
+    /// ) -> Bool {
+    ///     return state == .full || state == .half
+    /// }
+    /// ```
+    ///
+    /// - Attention: It is recommended that this method always returns the most expanded state(i.e.
+    /// .full). If it excludes the state, the panel might do unexpected behaviors.
+    @objc(floatingPanel:shouldAllowToScroll:in:)
+    optional func floatingPanel(
+        _ fpc: FloatingPanelController,
+        shouldAllowToScroll scrollView: UIScrollView,
+        in state: FloatingPanelState
+    ) -> Bool
 }

 ///
@@ -120,7 +149,7 @@ open class FloatingPanelController: UIViewController {
    }

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

    /// A Boolean value that determines whether the removal interaction is enabled.
@@ -259,8 +288,6 @@ open class FloatingPanelController: UIViewController {
    }

    private func setUp() {
-        _ = FloatingPanelController.dismissSwizzling
-
        modalPresentationStyle = .custom
        transitioningDelegate = modalTransition

@@ -281,7 +308,7 @@ open class FloatingPanelController: UIViewController {
        }
    }

-    // MARK:- Overrides
+    // MARK: - Overrides

    /// Creates the view that the controller manages.
    open override func loadView() {
@@ -301,19 +328,19 @@ open class FloatingPanelController: UIViewController {

    open override func viewDidLayoutSubviews() {
        super.viewDidLayoutSubviews()
-        if #available(iOS 11.0, *) {
-            // Ensure to update the static constraint of a panel after rotating a device in static mode
-            if contentMode == .static {
-                floatingPanel.layoutAdapter.updateStaticConstraint()
-            }
-        } else {
-            // Because {top,bottom}LayoutGuide is managed as a view
-            if floatingPanel.isAttracting == false {
-                self.update(safeAreaInsets: fp_safeAreaInsets)
-            }
+        // Ensure to update the static constraint of a panel after rotating a device in static mode
+        if contentMode == .static {
+            floatingPanel.layoutAdapter.updateStaticConstraint()
        }
    }

+    open override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        // Need to call this method just after the view appears, as the safe area is not
+        // correctly set before this time, for example, `show(animated:completion:)`.
+        floatingPanel.adjustScrollContentInsetIfNeeded()
+    }
+
    open override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
        super.viewWillTransition(to: size, with: coordinator)

@@ -352,7 +379,8 @@ open class FloatingPanelController: UIViewController {
        safeAreaInsetsObservation = nil
    }

-    // MARK:- Child view controller to consult
+    // MARK: - Child view controller to consult
+
    open override var childForStatusBarStyle: UIViewController? {
        return contentViewController
    }
@@ -369,19 +397,19 @@ open class FloatingPanelController: UIViewController {
        return contentViewController
    }

-    // MARK:- Privates
+    // MARK: - Privates

    private func shouldUpdateLayout(from previous: UITraitCollection, to new: UITraitCollection) -> Bool {
        return previous.horizontalSizeClass != new.horizontalSizeClass
-            || previous.verticalSizeClass != new.verticalSizeClass
-            || previous.preferredContentSizeCategory != new.preferredContentSizeCategory
-            || previous.layoutDirection != new.layoutDirection
+        || previous.verticalSizeClass != new.verticalSizeClass
+        || previous.preferredContentSizeCategory != new.preferredContentSizeCategory
+        || previous.layoutDirection != new.layoutDirection
    }

    private func update(safeAreaInsets: UIEdgeInsets) {
        guard
            preSafeAreaInsets != safeAreaInsets
-            else { return }
+        else { return }

        os_log(msg, log: devLog, type: .debug, "Update safeAreaInsets = \(safeAreaInsets)")

@@ -395,6 +423,7 @@ open class FloatingPanelController: UIViewController {
        }

        floatingPanel.layoutAdapter.updateStaticConstraint()
+        floatingPanel.adjustScrollContentInsetIfNeeded()

        if let contentOffset = contentOffset {
            trackingScrollView?.contentOffset = contentOffset
@@ -445,28 +474,23 @@ open class FloatingPanelController: UIViewController {
        // Must apply the current layout here
        activateLayout(forceLayout: true)

-        if #available(iOS 11.0, *) {
-            // Must track the safeAreaInsets of `self.view` to update the layout.
-            // There are 2 reasons.
-            // 1. This or the parent VC doesn't call viewSafeAreaInsetsDidChange() on the bottom
-            // 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.view.observe(\.safeAreaInsets, options: [.initial, .new, .old]) { [weak self] (_, change) in
-                // Use `self.view.safeAreaInsets` because `change.newValue` can be nil in particular case when
-                // is reported in https://github.com/SCENEE/FloatingPanel/issues/330
-                guard let self = self, change.oldValue != self.view.safeAreaInsets else { return }
+        // Must track the safeAreaInsets of `self.view` to update the layout.
+        // There are 2 reasons.
+        // 1. This or the parent VC doesn't call viewSafeAreaInsetsDidChange() on the bottom
+        // 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.view.observe(\.safeAreaInsets, options: [.initial, .new, .old]) { [weak self] (_, change) in
+            // Use `self.view.safeAreaInsets` because `change.newValue` can be nil in particular case when
+            // is reported in https://github.com/SCENEE/FloatingPanel/issues/330
+            guard let self = self, change.oldValue != self.view.safeAreaInsets else { return }

-                // Sometimes the bounding rectangle of the controlled view becomes invalid when the screen is rotated.
-                // This results in its safeAreaInsets change. In that case, `self.update(safeAreaInsets:)` leads
-                // an unsatisfied constraints error. So this method should not be called with those bounds.
-                guard self.view.bounds.height > 0 && self.view.bounds.width > 0 else { return }
+            // Sometimes the bounding rectangle of the controlled view becomes invalid when the screen is rotated.
+            // This results in its safeAreaInsets change. In that case, `self.update(safeAreaInsets:)` leads
+            // an unsatisfied constraints error. So this method should not be called with those bounds.
+            guard self.view.bounds.height > 0 && self.view.bounds.width > 0 else { return }

-                self.update(safeAreaInsets: self.view.safeAreaInsets)
-            }
-        } else {
-            // KVOs for topLayoutGuide & bottomLayoutGuide are not effective.
-            // Instead, update(safeAreaInsets:) is called at `viewDidLayoutSubviews()`
+            self.update(safeAreaInsets: self.view.safeAreaInsets)
        }

        move(to: floatingPanel.layoutAdapter.initialState,
@@ -515,7 +539,7 @@ open class FloatingPanelController: UIViewController {
            self.view.leftAnchor.constraint(equalTo: parent.view.leftAnchor, constant: 0.0),
            self.view.rightAnchor.constraint(equalTo: parent.view.rightAnchor, constant: 0.0),
            self.view.bottomAnchor.constraint(equalTo: parent.view.bottomAnchor, constant: 0.0),
-            ])
+        ])

        show(animated: animated) { [weak self] in
            guard let self = self else { return }
@@ -598,18 +622,12 @@ open class FloatingPanelController: UIViewController {

        switch contentInsetAdjustmentBehavior {
        case .always:
-            if #available(iOS 11.0, *) {
-                scrollView.contentInsetAdjustmentBehavior = .never
-            } else {
-                children.forEach { (vc) in
-                    vc.automaticallyAdjustsScrollViewInsets = false
-                }
-            }
+            scrollView.contentInsetAdjustmentBehavior = .never
        default:
            break
        }
    }
-    
+
    /// [Experimental] Allows the panel to move as its tracking scroll view bounces.
    ///
    /// This method must be called in the delegate method, `UIScrollViewDelegate.scrollViewDidScroll(_:)`,
@@ -675,6 +693,18 @@ open class FloatingPanelController: UIViewController {
        get { floatingPanel.layoutAdapter.surfaceLocation }
        set { floatingPanel.layoutAdapter.surfaceLocation = newValue }
    }
+
+
+    /// Calling this will allow to invoke `removePanelFromParent(animated:completion:)` as needed by
+    /// calling UIViewController's `dismiss` method
+    ///
+    /// Previously, until v2.8, this was the default behavior. However, from v2.9 onwards, due to
+    /// identified issues when used in conjunction with other libraries, it has been made an opt-in 
+    /// feature.
+    @objc
+    public static func enableDismissToRemove() {
+        _ = FloatingPanelController.dismissSwizzling
+    }
 }

 extension FloatingPanelController {
@@ -713,6 +743,7 @@ private var originalDismissImp: IMP?
 private typealias DismissFunction = @convention(c) (AnyObject, Selector, Bool, (() -> Void)?) -> Void
 extension FloatingPanelController {
    private static let dismissSwizzling: Void = {
+        guard originalDismissImp == nil else { return }
        let aClass: AnyClass! = UIViewController.self //object_getClass(vc)
        if let originalMethod = class_getInstanceMethod(aClass, #selector(dismiss(animated:completion:))),
           let swizzledImp = class_getMethodImplementation(aClass, #selector(__swizzled_dismiss(animated:completion:))) {
@@ -37,8 +37,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    private(set) var state: FloatingPanelState = .hidden {
        didSet {
            os_log(msg, log: devLog, type: .debug, "state changed: \(oldValue) -> \(state)")
-            if let vc = ownerVC {
-                vc.delegate?.floatingPanelDidChangeState?(vc)
+            if let fpc = ownerVC {
+                fpc.delegate?.floatingPanelDidChangeState?(fpc)
            }
        }
    }
@@ -120,7 +120,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            completion?()
            return
        }
-        if state != layoutAdapter.mostExpandedState {
+        if !isScrollable(state: state) {
            lockScrollView()
        }
        tearDownActiveInteraction()
@@ -130,7 +130,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        if animated {
            let updateScrollView: () -> Void = { [weak self] in
                guard let self = self else { return }
-                if self.state == self.layoutAdapter.mostExpandedState, 0 == self.layoutAdapter.offsetFromMostExpandedAnchor {
+                if self.isScrollable(state: self.state), 0 == self.layoutAdapter.offset(from: self.state) {
                    self.unlockScrollView()
                } else {
                    self.lockScrollView()
@@ -184,7 +184,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        } else {
            self.state = to
            self.updateLayout(to: to)
-            if self.state == self.layoutAdapter.mostExpandedState {
+            if isScrollable(state: state) {
                self.unlockScrollView()
            } else {
                self.lockScrollView()
@@ -209,6 +209,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            contentOffset = scrollView?.contentOffset
        }

+        if layoutAdapter.validStates.contains(state) == false {
+            state = layoutAdapter.initialState
+        }
        layoutAdapter.updateStaticConstraint()
        layoutAdapter.activateLayout(for: state, forceLayout: forceLayout)

@@ -221,11 +224,14 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        if let contentOffset = contentOffset {
            scrollView?.contentOffset = contentOffset
        }
+
+        adjustScrollContentInsetIfNeeded()
    }

    private func updateLayout(to target: FloatingPanelState) {
-        self.layoutAdapter.activateLayout(for: target, forceLayout: true)
-        self.backdropView.alpha = self.getBackdropAlpha(for: target)
+        layoutAdapter.activateLayout(for: target, forceLayout: true)
+        backdropView.alpha = getBackdropAlpha(for: target)
+        adjustScrollContentInsetIfNeeded()
    }

    private func getBackdropAlpha(for target: FloatingPanelState) -> CGFloat {
@@ -294,8 +300,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                return true
            }
        }
-        if #available(iOS 11.0, *),
-            otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
+        if otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
            // The dismiss gesture of a sheet modal should not begin until the pan gesture fails.
            return true
        }
@@ -327,7 +332,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                    if surfaceView.grabberAreaContains(gestureRecognizer.location(in: surfaceView)) {
                        return false
                    }
-                    guard state == layoutAdapter.mostExpandedState else { return false }
+
+                    guard isScrollable(state: state) else { return false }
+
                    // The condition where offset > 0 must not be included here. Because it will stop recognizing
                    // the panel pan gesture if a user starts scrolling content from an offset greater than 0.
                    return allowScrollPanGesture(of: scrollView) { offset in offset <= scrollBounceThreshold  }
@@ -350,8 +357,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
             is UIRotationGestureRecognizer,
             is UIScreenEdgePanGestureRecognizer,
             is UIPinchGestureRecognizer:
-            if #available(iOS 11.0, *),
-                otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
+            if otherGestureRecognizer.name == "_UISheetInteractionBackgroundDismissRecognizer" {
                // Should begin the pan gesture without waiting the dismiss gesture of a sheet modal.
                return false
            }
@@ -381,7 +387,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            let velocity = value(of: panGesture.velocity(in: panGesture.view))
            let location = panGesture.location(in: surfaceView)

-            let insideMostExpandedAnchor = 0 > layoutAdapter.offsetFromMostExpandedAnchor
+            let insideMostExpandedAnchor = 0 < layoutAdapter.offsetFromMostExpandedAnchor

            os_log(msg, log: devLog, type: .debug, """
                scroll gesture(\(state):\(panGesture.state)) -- \
@@ -392,21 +398,31 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                """
            )

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

            if insideMostExpandedAnchor {
-                // Scroll offset pinning
-                if state == layoutAdapter.mostExpandedState {
+                // Prevent scrolling if needed
+                if isScrollable(state: state) {
                    if interactionInProgress {
                        os_log(msg, log: devLog, type: .debug, "settle offset -- \(value(of: initialScrollOffset))")
+                        // Return content offset to initial offset to prevent scrolling
                        stopScrolling(at: initialScrollOffset)
                    } else {
-                        if surfaceView.grabberAreaContains(location) {
+                        if surfaceView.grabberAreaContains(initialLocation) {
                            // Preserve the current content offset in moving from full.
                            stopScrolling(at: initialScrollOffset)
                        }
+                        /// When the scroll offset is at the pinned offset and a panel is moved, the content
+                        /// must be fixed at the pinned position without scrolling. According to the scroll
+                        /// pan gesture behavior, the content might have already scrolled a bit by the time
+                        /// this handler is called. Thus `initialScrollOffset` property is used here.
+                        if value(of: initialScrollOffset - baseOffset) == 0.0 {
+                            stopScrolling(at: initialScrollOffset)
+                        }
                    }
                } else {
+                    // Return content offset to initial offset to prevent scrolling
                    stopScrolling(at: initialScrollOffset)
                }

@@ -414,7 +430,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                if interactionInProgress {
                    lockScrollView()
                } else {
-                    if state == layoutAdapter.mostExpandedState, self.transitionAnimator == nil {
+                    // Put back the scroll indicator and bounce of tracking scroll view
+                    // for scrollable states, not most expanded state.
+                    if isScrollable(state: state), self.transitionAnimator == nil {
                        switch layoutAdapter.position {
                        case .top, .left:
                            if offsetDiff < 0 && velocity > 0 {
@@ -428,6 +446,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                    }
                }
            } else {
+                // Here handles seamless scrolling at the most expanded position
                if interactionInProgress {
                    // Show a scroll indicator at the top in dragging.
                    switch layoutAdapter.position {
@@ -442,14 +461,14 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                            return
                        }
                    }
-                    if state == layoutAdapter.mostExpandedState {
+                    if isScrollable(state: state) {
                        // Adjust a small gap of the scroll offset just after swiping down starts in the grabber area.
                        if surfaceView.grabberAreaContains(location), surfaceView.grabberAreaContains(initialLocation) {
                            stopScrolling(at: initialScrollOffset)
                        }
                    }
                } else {
-                    if state == layoutAdapter.mostExpandedState {
+                    if isScrollable(state: state) {
                        let allowScroll = allowScrollPanGesture(of: scrollView) { offset in
                            offset <= scrollBounceThreshold || 0 < offset
                        }
@@ -480,7 +499,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            }
        case panGestureRecognizer:
            let translation = panGesture.translation(in: panGestureRecognizer.view!.superview)
+            // The touch velocity in the surface view
            let velocity = panGesture.velocity(in: panGesture.view)
+            // The touch location in the surface view
            let location = panGesture.location(in: panGesture.view)

            os_log(msg, log: devLog, type: .debug, """
@@ -538,7 +559,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            endAttraction(false)
        }
        if let animator = self.transitionAnimator {
-            guard 0 >= layoutAdapter.offsetFromMostExpandedAnchor else { return }
+            guard 0 <= layoutAdapter.offsetFromMostExpandedAnchor else { return }
            os_log(msg, log: devLog, type: .debug, "a panel animation(interruptible: \(animator.isInterruptible)) interrupted!!!")
            if animator.isInterruptible {
                animator.stopAnimation(false)
@@ -557,7 +578,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {

    private func shouldScrollViewHandleTouch(_ scrollView: UIScrollView?, point: CGPoint, velocity: CGFloat) -> Bool {
        // When no scrollView, nothing to handle.
-        guard let scrollView = scrollView else { return false }
+        guard let scrollView = scrollView, scrollView.frame.contains(initialLocation) else { return false }

        // For _UISwipeActionPanGestureRecognizer
        if let scrollGestureRecognizers = scrollView.gestureRecognizers {
@@ -572,27 +593,10 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        }

        guard
-            state == layoutAdapter.mostExpandedState,  // When not top most(i.e. .full), don't scroll.
-            interactionInProgress == false,        // When interaction already in progress, don't scroll.
-            0 == layoutAdapter.offsetFromMostExpandedAnchor
-        else {
-            return false
-        }
-
-        // When the current point is within grabber area but the initial point is not, do scroll.
-        if surfaceView.grabberAreaContains(point), !surfaceView.grabberAreaContains(initialLocation) {
-            return true
-        }
-
-        // When the initial point is within grabber area and the current point is out of surface, don't scroll.
-        if surfaceView.grabberAreaContains(initialLocation), !surfaceView.frame.contains(point) {
-            return false
-        }
-
-        let scrollViewFrame = scrollView.convert(scrollView.bounds, to: surfaceView)
-        guard
-            scrollViewFrame.contains(initialLocation), // When the initial point not in scrollView, don't scroll.
-            !surfaceView.grabberAreaContains(point)        // When point within grabber area, don't scroll.
+            isScrollable(state: state),  // When not top most(i.e. .full), don't scroll.
+            interactionInProgress == false,  // When interaction already in progress, don't scroll.
+            0 == layoutAdapter.offset(from: state),
+            !surfaceView.grabberAreaContains(initialLocation)  // When the initial point is within grabber area, don't scroll
        else {
            return false
        }
@@ -605,14 +609,14 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            if  offset < 0.0 {
                return true
            }
-            if velocity >= 0 {
+            if velocity >= 0, offset > 0.0 {
                return true
            }
        case .bottom, .right:
            if  offset > 0.0 {
                return true
            }
-            if velocity <= 0 {
+            if velocity <= 0, offset < 0.0 {
                return true
            }
        }
@@ -634,13 +638,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        os_log(msg, log: devLog, type: .debug, "panningBegan -- location = \(value(of: location))")

        guard let scrollView = scrollView else { return }
-        if state == layoutAdapter.mostExpandedState {
-            if surfaceView.grabberAreaContains(location) {
-                initialScrollOffset = scrollView.contentOffset
-            }
-        } else {
-            initialScrollOffset = scrollView.contentOffset
-        }
+
+        initialScrollOffset = scrollView.contentOffset
    }

    private func panningChange(with translation: CGPoint) {
@@ -729,7 +728,6 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        }

        guard shouldAttract(to: target) else {
-            self.state = target
            self.updateLayout(to: target)
            self.unlockScrollView()
            // The `floatingPanelDidEndDragging(_:willAttract:)` must be called after the state property changes.
@@ -777,13 +775,10 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        var offset: CGPoint = .zero

        initialSurfaceLocation = layoutAdapter.surfaceLocation
-        if state == layoutAdapter.mostExpandedState, let scrollView = scrollView {
-            let scrollFrame = scrollView.convert(scrollView.bounds, to: nil)
-            let touchStartingPoint = surfaceView.convert(initialLocation, to: nil)
-
-            ifLabel: if surfaceView.grabberAreaContains(location) {
+        if isScrollable(state: state), let scrollView = scrollView {
+            ifLabel: if surfaceView.grabberAreaContains(initialLocation) {
                initialScrollOffset = scrollView.contentOffset
-            } else if scrollFrame.contains(touchStartingPoint) {
+            } else if scrollView.frame.contains(initialLocation) {
                let pinningOffset = contentOffsetForPinning(of: scrollView)

                // This code block handles the scenario where there's a navigation bar or toolbar
@@ -861,7 +856,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        interactionInProgress = false

        // Prevent to keep a scroll view indicator visible at the half/tip position
-        if state != layoutAdapter.mostExpandedState {
+        if !isScrollable(state: state) {
            lockScrollView()
        }

@@ -947,11 +942,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        os_log(msg, log: devLog, type: .debug, """
            finishAnimation -- state = \(state) \
            surface location = \(layoutAdapter.surfaceLocation) \
-            edge most position = \(layoutAdapter.surfaceLocation(for: layoutAdapter.mostExpandedState))
+            offset from state position = \(layoutAdapter.offset(from: state))
            """)

        if tryUnlockScroll {
-            if (state == layoutAdapter.mostExpandedState && 0 == layoutAdapter.offsetFromMostExpandedAnchor)
+            if (isScrollable(state: state) && 0 == layoutAdapter.offset(from: state))
                || shouldLooselyLockScrollView {
                unlockScrollView()
            }
@@ -1042,7 +1037,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
            return
        }
        let contentOffset = scrollView.contentOffset.y
-        guard contentOffset < 0, layoutAdapter.position == .bottom, state == layoutAdapter.mostExpandedState else {
+        guard contentOffset < 0, layoutAdapter.position == .bottom, isScrollable(state: state) else {
            if surfaceView.transform != .identity {
                surfaceView.transform = .identity
                scrollView.transform = .identity
@@ -1056,26 +1051,37 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    private func lockScrollView(strict: Bool = false) {
        guard let scrollView = scrollView else { return }

-        if scrollView.isLocked {
-            os_log(msg, log: devLog, type: .debug, "Already scroll locked.")
-            return
-        }
-        os_log(msg, log: devLog, type: .debug, "lock scroll view")
-
-        scrollIndictorVisible = scrollView.showsVerticalScrollIndicator
-
        if !strict, shouldLooselyLockScrollView {
+            if scrollView.isLooselyLocked {
+                os_log(msg, log: devLog, type: .debug, "Already scroll locked loosely.")
+                return
+            }
            // Don't change its `bounces` property. If it's changed, it will cause its scroll content offset jump at
            // the most expanded anchor position while seamlessly scrolling content. This problem only occurs where its
            // content mode is `.fitToBounds` and the tracking scroll content is smaller than the content view size.
            // The reason why is because `bounces` prop change leads to the "content frame" change on `.fitToBounds`.
            // See also https://github.com/scenee/FloatingPanel/issues/524.
        } else {
+            if scrollView.isLocked {
+                os_log(msg, log: devLog, type: .debug, "Already scroll locked.")
+                return
+            }
+
            scrollBounce = scrollView.bounces
            scrollView.bounces = false
        }
+        os_log(msg, log: devLog, type: .debug, "lock scroll view")
+
        scrollView.isDirectionalLockEnabled = true
-        scrollView.showsVerticalScrollIndicator = false
+
+        switch layoutAdapter.position {
+        case .top, .bottom:
+            scrollIndictorVisible = scrollView.showsVerticalScrollIndicator
+            scrollView.showsVerticalScrollIndicator = false
+        case .left, .right:
+            scrollIndictorVisible = scrollView.showsHorizontalScrollIndicator
+            scrollView.showsHorizontalScrollIndicator = false
+        }
    }

    private func unlockScrollView() {
@@ -1084,13 +1090,21 @@ class Core: NSObject, UIGestureRecognizerDelegate {

        scrollView.bounces = scrollBounce
        scrollView.isDirectionalLockEnabled = false
-        scrollView.showsVerticalScrollIndicator = scrollIndictorVisible
+        switch layoutAdapter.position {
+        case .top, .bottom:
+            scrollView.showsVerticalScrollIndicator = scrollIndictorVisible
+        case .left, .right:
+            scrollView.showsHorizontalScrollIndicator = scrollIndictorVisible
+        }
    }

    private var shouldLooselyLockScrollView: Bool {
+        if surfaceView.frame == .zero {
+            return false
+        }
        var isSmallScrollContentAndFitToBoundsMode: Bool {
            if ownerVC?.contentMode == .fitToBounds, let scrollView = scrollView,
-               value(of: scrollView.contentSize) < value(of: scrollView.bounds.size) - min(layoutAdapter.offsetFromMostExpandedAnchor, 0) {
+               value(of: scrollView.contentSize) < value(of: scrollView.bounds.size) + max(layoutAdapter.offsetFromMostExpandedAnchor, 0) {
                return true
            }
            return false
@@ -1116,9 +1130,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        case .left:
            return CGPoint(x: scrollView.fp_contentOffsetMax.x, y: 0.0)
        case .bottom:
-            return CGPoint(x: 0.0, y: 0.0 - scrollView.fp_contentInset.top)
+            return CGPoint(x: 0.0, y: 0.0 - scrollView.adjustedContentInset.top)
        case .right:
-            return CGPoint(x: 0.0 - scrollView.fp_contentInset.left, y: 0.0)
+            return CGPoint(x: 0.0 - scrollView.adjustedContentInset.left, y: 0.0)
        }
    }

@@ -1132,10 +1146,55 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        }
        return condition(offset)
    }
+
+    func isScrollable(state: FloatingPanelState) -> Bool {
+        guard let scrollView = scrollView else { return false }
+        if let fpc = ownerVC, 
+            let scrollable = fpc.delegate?.floatingPanel?(fpc, shouldAllowToScroll: scrollView, in: state)
+        {
+            return scrollable
+        }
+        return state == layoutAdapter.mostExpandedState
+    }
+
+    /// Adjust content inset of the tracking scroll view if the controller's
+    /// `contentInsetAdjustmentBehavior` is `.always` and its `contentMode` is `.static`.
+    /// if its content is scrollable, the content might not be fully visible on `.half`
+    /// state, for example. Therefore the content inset needs to adjust to display the
+    /// full content.
+    func adjustScrollContentInsetIfNeeded() {
+        guard
+            let fpc = ownerVC,
+            let scrollView = scrollView,
+            fpc.contentInsetAdjustmentBehavior == .always
+        else { return }
+
+        switch fpc.contentMode {
+        case .static:
+            var inset = scrollView.safeAreaInsets
+            let offset = layoutAdapter.offsetFromMostExpandedAnchor
+            if  offset > 0 {
+                switch layoutAdapter.position {
+                case .top:
+                    inset.top = offset + scrollView.safeAreaInsets.top
+                case .bottom:
+                    inset.bottom = offset + scrollView.safeAreaInsets.bottom
+                case .left:
+                    inset.left = offset + scrollView.safeAreaInsets.left
+                case .right:
+                    inset.left = offset + scrollView.safeAreaInsets.right
+                }
+            }
+            scrollView.contentInset = inset
+        case .fitToBounds:
+            scrollView.contentInset = scrollView.safeAreaInsets
+        }
+    }
 }

 /// A gesture recognizer that looks for panning (dragging) gestures in a panel.
 public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
+    /// The gesture starting location in the surface view which it is attached to.
    fileprivate var initialLocation: CGPoint = .zero
    private weak var floatingPanel: Core!  //  Core has this gesture recognizer as non-optional
    fileprivate func set(floatingPanel: Core) {
@@ -1144,9 +1203,7 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {

    init() {
        super.init(target: nil, action: nil)
-        if #available(iOS 11.0, *) {
-            name = "FloatingPanelPanGestureRecognizer"
-        }
+        name = "FloatingPanelPanGestureRecognizer"
    }

    public override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
@@ -7,7 +7,9 @@ import UIKit
 extension CGFloat {
    /// Returns this value rounded to an logical pixel value by a display scale
    func rounded(by displayScale: CGFloat) -> CGFloat {
-        return (self * displayScale).rounded(.toNearestOrAwayFromZero) / displayScale
+        let p = CGFloat(1.0e9)
+        let v = (self * p).rounded(.towardZero) / p
+        return (v * displayScale).rounded(.toNearestOrAwayFromZero) / displayScale
    }
    func isEqual(to: CGFloat, on displayScale: CGFloat) -> Bool {
        return rounded(by: displayScale) == to.rounded(by: displayScale)
@@ -45,65 +47,16 @@ protocol LayoutGuideProvider {
 extension UILayoutGuide: LayoutGuideProvider {}
 extension UIView: LayoutGuideProvider {}

-private class CustomLayoutGuide: LayoutGuideProvider {
-    let topAnchor: NSLayoutYAxisAnchor
-    let leftAnchor: NSLayoutXAxisAnchor
-    let bottomAnchor: NSLayoutYAxisAnchor
-    let rightAnchor: NSLayoutXAxisAnchor
-    let widthAnchor: NSLayoutDimension
-    let heightAnchor: NSLayoutDimension
-    init(topAnchor: NSLayoutYAxisAnchor,
-         leftAnchor: NSLayoutXAxisAnchor,
-         bottomAnchor: NSLayoutYAxisAnchor,
-         rightAnchor: NSLayoutXAxisAnchor,
-         widthAnchor: NSLayoutDimension,
-         heightAnchor: NSLayoutDimension) {
-        self.topAnchor = topAnchor
-        self.leftAnchor = leftAnchor
-        self.bottomAnchor = bottomAnchor
-        self.rightAnchor = rightAnchor
-        self.widthAnchor = widthAnchor
-        self.heightAnchor = heightAnchor
-    }
-}
-
 extension UIViewController {
+    /// The proxy property to be used in `LayoutAdapter`
+    ///
+    /// This property is to allow the safe area inset to change in unit testing
    @objc var fp_safeAreaInsets: UIEdgeInsets {
-        if #available(iOS 11.0, *) {
-            return view.safeAreaInsets
-        } else {
-            return UIEdgeInsets(top: topLayoutGuide.length,
-                                left: 0.0,
-                                bottom: bottomLayoutGuide.length,
-                                right: 0.0)
-        }
-    }
-
-    var fp_safeAreaLayoutGuide: LayoutGuideProvider {
-        if #available(iOS 11.0, *) {
-            return view!.safeAreaLayoutGuide
-        } else {
-            return CustomLayoutGuide(topAnchor: topLayoutGuide.bottomAnchor,
-                                     leftAnchor: view.leftAnchor,
-                                     bottomAnchor: bottomLayoutGuide.topAnchor,
-                                     rightAnchor: view.rightAnchor,
-                                     widthAnchor: view.widthAnchor,
-                                     heightAnchor: topLayoutGuide.bottomAnchor.anchorWithOffset(to: bottomLayoutGuide.topAnchor))
-        }
+        return view.safeAreaInsets
    }
 }

-// The reason why UIView has no extensions of safe area insets and top/bottom guides
-// is for iOS10 compatibility.
 extension UIView {
-    var fp_safeAreaLayoutGuide: LayoutGuideProvider {
-        if #available(iOS 11.0, *) {
-            return safeAreaLayoutGuide
-        } else {
-            return self
-        }
-    }
-
    var presentationFrame: CGRect {
        return layer.presentation()?.frame ?? frame
    }
@@ -139,7 +92,7 @@ extension UIView {
    }
 }

-#if __FP_LOG
+#if FP_LOG
 extension UIGestureRecognizer.State: CustomDebugStringConvertible {
    public var debugDescription: String {
        switch self {
@@ -157,18 +110,14 @@ extension UIGestureRecognizer.State: CustomDebugStringConvertible {

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

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.0</string>
+	<string>2.8.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
@@ -45,8 +45,8 @@ open class FloatingPanelBottomLayout: NSObject, FloatingPanelLayout {

    open func prepareLayout(surfaceView: UIView, in view: UIView) -> [NSLayoutConstraint] {
        return [
-            surfaceView.leftAnchor.constraint(equalTo: view.fp_safeAreaLayoutGuide.leftAnchor, constant: 0.0),
-            surfaceView.rightAnchor.constraint(equalTo: view.fp_safeAreaLayoutGuide.rightAnchor, constant: 0.0),
+            surfaceView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 0.0),
+            surfaceView.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor, constant: 0.0),
        ]
    }

@@ -266,12 +266,23 @@ class LayoutAdapter {
    }

    var offsetFromMostExpandedAnchor: CGFloat {
+        return offset(from: mostExpandedState)
+    }
+
+    /// The distance from the given state position to the current surface location.
+    ///
+    /// If the returned value is positive, it indicates that the surface is moving from
+    /// the given state position to closer to the `hidden` state position. In other
+    /// words, the surface is within the given state position. Otherwise, it indicates
+    /// that the surface is outside this position and is moving away from the `hidden`
+    /// state position.
+    func offset(from state: FloatingPanelState) -> CGFloat {
        let offset: CGFloat
        switch position {
        case .top, .left:
-            offset = edgePosition(surfaceView.presentationFrame) - position(for: mostExpandedState)
+            offset = position(for: state) - edgePosition(surfaceView.frame)
        case .bottom, .right:
-            offset = position(for: mostExpandedState) - edgePosition(surfaceView.presentationFrame)
+            offset = edgePosition(surfaceView.frame) - position(for: state)
        }
        return offset.rounded(by: surfaceView.fp_displayScale)
    }
@@ -424,13 +435,13 @@ class LayoutAdapter {
            switch position {
            case .top, .bottom:
                surfaceConstraints = [
-                    surfaceView.leftAnchor.constraint(equalTo: vc.fp_safeAreaLayoutGuide.leftAnchor, constant: 0.0),
-                    surfaceView.rightAnchor.constraint(equalTo: vc.fp_safeAreaLayoutGuide.rightAnchor, constant: 0.0),
+                    surfaceView.leftAnchor.constraint(equalTo: vc.view.safeAreaLayoutGuide.leftAnchor, constant: 0.0),
+                    surfaceView.rightAnchor.constraint(equalTo: vc.view.safeAreaLayoutGuide.rightAnchor, constant: 0.0),
                ]
            case .left, .right:
                surfaceConstraints = [
-                    surfaceView.topAnchor.constraint(equalTo: vc.fp_safeAreaLayoutGuide.topAnchor, constant: 0.0),
-                    surfaceView.bottomAnchor.constraint(equalTo: vc.fp_safeAreaLayoutGuide.bottomAnchor, constant: 0.0),
+                    surfaceView.topAnchor.constraint(equalTo: vc.view.safeAreaLayoutGuide.topAnchor, constant: 0.0),
+                    surfaceView.bottomAnchor.constraint(equalTo: vc.view.safeAreaLayoutGuide.bottomAnchor, constant: 0.0),
                ]
            }
        }
@@ -538,7 +549,7 @@ class LayoutAdapter {
        let layoutGuideProvider: LayoutGuideProvider
        switch anchor.referenceGuide {
        case .safeArea:
-            layoutGuideProvider = vc.fp_safeAreaLayoutGuide
+            layoutGuideProvider = vc.view.safeAreaLayoutGuide
        case .superview:
            layoutGuideProvider = vc.view
        }
@@ -771,12 +782,6 @@ class LayoutAdapter {
            NSLayoutConstraint.activate(constraint: self.fitToBoundsConstraint)
        }

-        var state = state
-
-        if validStates.contains(state) == false {
-            state = layout.initialState
-        }
-
        // Recalculate the intrinsic size of a content view. This is because
        // UIView.systemLayoutSizeFitting() returns a different size between an
        // on-screen and off-screen view which includes
@@ -37,7 +37,7 @@ extension FloatingPanelLayoutReferenceGuide {
    func layoutGuide(vc: UIViewController) -> LayoutGuideProvider {
        switch self {
        case .safeArea:
-            return vc.fp_safeAreaLayoutGuide
+            return vc.view.safeAreaLayoutGuide
        case .superview:
            return vc.view
        }
@@ -57,7 +57,7 @@ extension FloatingPanelLayoutContentBoundingGuide {
        case .superview:
            return fpc.view
        case .safeArea:
-            return fpc.fp_safeAreaLayoutGuide
+            return fpc.view.safeAreaLayoutGuide
        case .none:
            return nil
        }
@@ -383,29 +383,24 @@ public class SurfaceView: UIView {
        }
        containerView.layer.masksToBounds = true
        if position.inset(containerMargins) != 0 {
-            if #available(iOS 11, *) {
-                containerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner,
-                                                     .layerMinXMaxYCorner, .layerMaxXMaxYCorner]
-            }
+            containerView.layer.maskedCorners = [
+                .layerMinXMinYCorner, .layerMaxXMinYCorner,
+                .layerMinXMaxYCorner, .layerMaxXMaxYCorner
+            ]
            return
        }
-        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.
-            // Because the bottom of contentView must be fit to the bottom of a screen to work the `safeLayoutGuide` of a content VC.
-            switch position {
-            case .top:
-                containerView.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
-            case .left:
-                containerView.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
-            case .bottom:
-                containerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-            case .right:
-                containerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
-            }
-        } else {
-            // Can't use `containerView.layer.mask` because of a UIVisualEffectView issue in iOS 10, https://forums.developer.apple.com/thread/50854
-            // Instead, a user should display rounding corners appropriately.
+        // 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.
+        // Because the bottom of contentView must be fit to the bottom of a screen to work the `safeLayoutGuide` of a content VC.
+        switch position {
+        case .top:
+            containerView.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
+        case .left:
+            containerView.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
+        case .bottom:
+            containerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        case .right:
+            containerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
        }
    }

@@ -334,6 +334,36 @@ class ControllerTests: XCTestCase {
        fpc.move(to: .tip, animated: false)
        XCTAssertEqual(fpc.surfaceView.frame.height, fpc.view.bounds.height - fpc.surfaceLocation(for: .tip).y)
    }
+
+    func test_switching_layout() {
+        final class FirstLayout: FloatingPanelLayout {
+            let position: FloatingPanelPosition = .bottom
+            let initialState: FloatingPanelState = .half
+            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+                .full: FloatingPanelLayoutAnchor(absoluteInset: 16.0, edge: .top, referenceGuide: .safeArea),
+                .half: FloatingPanelLayoutAnchor(absoluteInset: 262, edge: .top, referenceGuide: .safeArea),
+                .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .bottom, referenceGuide: .safeArea)
+            ]
+        }
+        final class SecondLayout: FloatingPanelLayout {
+            let position: FloatingPanelPosition = .bottom
+            let initialState: FloatingPanelState = .half
+            let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+                .half: FloatingPanelLayoutAnchor(absoluteInset: 262, edge: .top, referenceGuide: .safeArea)
+            ]
+        }
+        let fpc = FloatingPanelController()
+        fpc.layout = FirstLayout()
+        fpc.showForTest()
+
+        fpc.move(to: .tip, animated: false)
+
+        // Switch to another layout
+        fpc.layout = SecondLayout()
+        fpc.invalidateLayout()
+
+        XCTAssertEqual(fpc.state, .half)
+    }
 }

 private class MyZombieViewController: UIViewController, FloatingPanelLayout, FloatingPanelBehavior, FloatingPanelControllerDelegate {
@@ -820,6 +820,99 @@ class CoreTests: XCTestCase {
        fpc.showForTest()
        XCTAssertFalse(fpc.panGestureRecognizer.isEnabled)
    }
+
+    func test_is_scrollable() {
+        class Delegate: FloatingPanelControllerDelegate {
+            var shouldScroll = false
+            func floatingPanel(
+                _ fpc: FloatingPanelController,
+                shouldAllowToScroll scrollView: UIScrollView,
+                in state: FloatingPanelState
+            ) -> Bool {
+                return shouldScroll
+            }
+        }
+
+        let fpc = FloatingPanelController()
+        let scrollView = UIScrollView()
+        let delegate = Delegate()
+        fpc.layout = FloatingPanelBottomLayout()
+        fpc.track(scrollView: scrollView)
+        fpc.showForTest()
+
+        XCTAssertTrue(fpc.floatingPanel.isScrollable(state: .full))
+        XCTAssertFalse(fpc.floatingPanel.isScrollable(state: .half))
+
+        fpc.delegate = delegate
+
+        XCTAssertFalse(fpc.floatingPanel.isScrollable(state: .full))
+        XCTAssertFalse(fpc.floatingPanel.isScrollable(state: .half))
+
+        delegate.shouldScroll = true
+
+        XCTAssertTrue(fpc.floatingPanel.isScrollable(state: .full))
+        XCTAssertTrue(fpc.floatingPanel.isScrollable(state: .half))
+    }
+
+    func test_adjustScrollContentInsetIfNeeded() {
+        class CustomScrollView: UIScrollView {
+            var customSafeAreaInsets: UIEdgeInsets = .zero
+            override var safeAreaInsets: UIEdgeInsets {
+                customSafeAreaInsets
+            }
+        }
+
+        do {
+            let scrollView = CustomScrollView()
+            scrollView.customSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: 34, right: 0)
+            let fpc = FloatingPanelController()
+            fpc.track(scrollView: scrollView)
+            fpc.layout = FloatingPanelBottomLayout()
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.contentMode = .static
+            fpc.showForTest()
+
+            fpc.move(to: .half, animated: false)
+            fpc.floatingPanel.adjustScrollContentInsetIfNeeded()
+
+            let expect = 34 + (fpc.surfaceLocation(for: .half).y - fpc.surfaceLocation(for: .full).y)
+            XCTAssertEqual(
+                scrollView.contentInset,
+                UIEdgeInsets(top: 0, left: 0, bottom: expect, right: 0)
+            )
+
+            fpc.contentMode = .fitToBounds
+            XCTAssertEqual(
+                scrollView.contentInset,
+                scrollView.customSafeAreaInsets
+            )
+        }
+
+        do {
+            let scrollView = CustomScrollView()
+            scrollView.customSafeAreaInsets = UIEdgeInsets(top: 91, left: 0, bottom: 0, right: 0)
+            let fpc = FloatingPanelController()
+            fpc.track(scrollView: scrollView)
+            fpc.layout = FloatingPanelTopPositionedLayout()
+            fpc.contentInsetAdjustmentBehavior = .always
+            fpc.contentMode = .static
+            fpc.showForTest()
+
+            fpc.move(to: .half, animated: false)
+            fpc.floatingPanel.adjustScrollContentInsetIfNeeded()
+
+            let expect = 91 + (fpc.surfaceLocation(for: .full).y -  fpc.surfaceLocation(for: .half).y)
+            XCTAssertEqual(
+                scrollView.contentInset,
+                UIEdgeInsets(top: expect, left: 0, bottom: 0, right: 0)
+            )
+            fpc.contentMode = .fitToBounds
+            XCTAssertEqual(
+                scrollView.contentInset,
+                scrollView.customSafeAreaInsets
+            )
+        }
+    }
 }

 private class FloatingPanelLayout3Positions: FloatingPanelTestLayout {
@@ -9,4 +9,20 @@ class ExtensionTests: XCTestCase {
        XCTAssertNotEqual(CGFloat(333.5).rounded(by: 3), 333.66666666666674)
        XCTAssertTrue(CGFloat(333.5).isEqual(to: 333.66666666666674, on: 3.0))
    }
+    
+    func test_roundedByDisplayScale_2() {
+        XCTAssertEqual(CGFloat(-0.16666666666674246).rounded(by: 3), 0.0)
+        XCTAssertEqual(CGFloat(0.16666666666674246).rounded(by: 3), 0.0)
+
+        XCTAssertEqual(CGFloat(-0.3333333333374246).rounded(by: 3), -0.3333333333333333)
+        XCTAssertEqual(CGFloat(-0.3333333333074246).rounded(by: 3), -0.3333333333333333)
+        XCTAssertEqual(CGFloat(0.33333333333374246).rounded(by: 3), 0.3333333333333333)
+        XCTAssertEqual(CGFloat(0.33333333333074246).rounded(by: 3), 0.3333333333333333)
+
+        XCTAssertEqual(CGFloat(-0.16666666666674246).rounded(by: 2), 0.0)
+        XCTAssertEqual(CGFloat(0.16666666666674246).rounded(by: 2), 0.0)
+
+        XCTAssertEqual(CGFloat(-0.16666666666674246).rounded(by: 6), -0.16666666666666666)
+        XCTAssertEqual(CGFloat(0.16666666666674246).rounded(by: 6), 0.16666666666666666)
+    }
 }
@@ -411,18 +411,18 @@ class LayoutTests: XCTestCase {
        for prop in [
            // from top edge
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .superview),
             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .superview),
             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
            // from bottom edge
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
+             result: (#line, constant: 0.0, firstAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
+             result: (#line, constant: 100.0, firstAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .superview),
             result: (#line, constant: 0.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.bottomAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .superview),
@@ -440,7 +440,7 @@ class LayoutTests: XCTestCase {
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .safeArea),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
+             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.safeAreaLayoutGuide.heightAnchor)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .superview),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .superview),
@@ -450,7 +450,7 @@ class LayoutTests: XCTestCase {
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
+             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.safeAreaLayoutGuide.heightAnchor)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .superview),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
@@ -459,11 +459,7 @@ class LayoutTests: XCTestCase {
                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
                XCTAssertEqual(c.multiplier, CGFloat(prop.result.multiplier), line: UInt(prop.result.0))
                XCTAssertTrue(c.firstAnchor is NSLayoutAnchor<NSLayoutDimension>, line: UInt(prop.result.0))
-                // On iOS 10, `c.secondAnchor` can't be equal object to `prop.result.secondAnchor`
-                // because there is no safe area  on iOS 10 and `fp_safeAreaLayoutGuide` emulates it.
-                if #available(iOS 11, *) {
-                    XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
-                }
+                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }
    }
    func test_layoutAnchor_bottomPosition() {
@@ -476,9 +472,9 @@ class LayoutTests: XCTestCase {
        for prop in [
            // from top edge
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 100.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .top, referenceGuide: .superview),
             result: (#line, constant: 0.0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .superview),
@@ -486,9 +482,9 @@ class LayoutTests: XCTestCase {

            // from bottom edge
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 0.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
+             result: (#line, constant: 0.0, firstAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, constant: 100.0, firstAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
+             result: (#line, constant: 100.0, firstAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 0.0, edge: .bottom, referenceGuide: .superview),
             result: (#line, constant: 0.0, firstAnchor: fpc.view.bottomAnchor, secondAnchor: fpc.surfaceView.topAnchor)),
            (anchor: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .bottom, referenceGuide: .superview),
@@ -506,7 +502,7 @@ class LayoutTests: XCTestCase {
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .safeArea),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
+             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.safeAreaLayoutGuide.heightAnchor)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .top, referenceGuide: .superview),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .top, referenceGuide: .superview),
@@ -516,7 +512,7 @@ class LayoutTests: XCTestCase {
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .safeArea),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-             result: (#line, multiplier: 0.5, secondAnchor: fpc.fp_safeAreaLayoutGuide.heightAnchor)),
+             result: (#line, multiplier: 0.5, secondAnchor: fpc.view.safeAreaLayoutGuide.heightAnchor)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.0, edge: .bottom, referenceGuide: .superview),
             result: (#line, multiplier: 1.0, secondAnchor: nil)),
            (anchor: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .superview),
@@ -525,12 +521,7 @@ class LayoutTests: XCTestCase {
                let c = prop.anchor.layoutConstraints(fpc, for: position)[0]
                XCTAssertEqual(c.multiplier, CGFloat(prop.result.multiplier), line: UInt(prop.result.0))
                XCTAssertTrue(c.firstAnchor is NSLayoutAnchor<NSLayoutDimension>, line: UInt(prop.result.0))
-                // On iOS 10, `c.secondAnchor` can't be equal object to `prop.result.secondAnchor`
-                // because there is no safe area  on iOS 10 and `fp_safeAreaLayoutGuide` emulates it.
-                if #available(iOS 11, *) {
-                    XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
-                }
-                print(c)
+                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }
    }

@@ -556,20 +547,20 @@ class LayoutTests: XCTestCase {

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

            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
-             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
-             result: (#line, constant: 210, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 210, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .safeArea),
-             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.topAnchor)),
+             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.topAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .superview),
             result: (#line, constant: 420, firstAnchor: fpc.surfaceView.bottomAnchor, secondAnchor: fpc.view.topAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .superview),
@@ -606,20 +597,20 @@ class LayoutTests: XCTestCase {

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

            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .safeArea),
-             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
+             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .safeArea),
-             result: (#line, constant: -210, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
+             result: (#line, constant: -210, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 1.0, referenceGuide: .safeArea),
-             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.fp_safeAreaLayoutGuide.bottomAnchor)),
+             result: (#line, constant: 0, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.safeAreaLayoutGuide.bottomAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.0, referenceGuide: .superview),
             result: (#line, constant: -420, firstAnchor: fpc.surfaceView.topAnchor, secondAnchor: fpc.view.bottomAnchor)),
            (anchor: FloatingPanelIntrinsicLayoutAnchor(fractionalOffset: 0.5, referenceGuide: .superview),
@@ -633,6 +624,41 @@ class LayoutTests: XCTestCase {
                XCTAssertEqual(c.secondAnchor, prop.result.secondAnchor, line: UInt(prop.result.0))
        }
    }
+
+    func test_offsetFromMostExpandedAnchor() {
+        do {
+            let fpc = FloatingPanelController()
+            fpc.layout = FloatingPanelBottomLayout()
+            fpc.showForTest()
+
+            fpc.move(to: .full, animated: false)
+
+            XCTAssertEqual(fpc.floatingPanel.layoutAdapter.offsetFromMostExpandedAnchor, 0.0)
+
+            fpc.move(to: .half, animated: false)
+
+            XCTAssertEqual(
+                fpc.floatingPanel.layoutAdapter.offsetFromMostExpandedAnchor,
+                (fpc.surfaceLocation(for: .half) - fpc.surfaceLocation(for: .full)).y
+            )
+        }
+        do {
+            let fpc = FloatingPanelController()
+            fpc.layout = FloatingPanelTopPositionedLayout()
+            fpc.showForTest()
+
+            fpc.move(to: .full, animated: false)
+
+            XCTAssertEqual(fpc.floatingPanel.layoutAdapter.offsetFromMostExpandedAnchor, 0.0)
+
+            fpc.move(to: .half, animated: false)
+
+            XCTAssertEqual(
+                fpc.floatingPanel.layoutAdapter.offsetFromMostExpandedAnchor,
+                -(fpc.surfaceLocation(for: .half) - fpc.surfaceLocation(for: .full)).y
+            )
+        }
+    }
 }

 private typealias LayoutSegmentTestParameter = (UInt, pos: CGFloat, forwardY: Bool, lower: FloatingPanelState?, upper: FloatingPanelState?)
@@ -72,6 +72,16 @@ class FloatingPanelTop2BottomTestLayout: FloatingPanelLayout {
    }
 }

+class FloatingPanelTopPositionedLayout: FloatingPanelLayout {
+    let position: FloatingPanelPosition = .top
+    let initialState: FloatingPanelState = .full
+    let anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] = [
+        .full: FloatingPanelLayoutAnchor(absoluteInset: 88.0, edge: .bottom, referenceGuide: .safeArea),
+        .half: FloatingPanelLayoutAnchor(absoluteInset: 216.0, edge: .top, referenceGuide: .safeArea),
+        .tip: FloatingPanelLayoutAnchor(absoluteInset: 44.0, edge: .top, referenceGuide: .safeArea)
+    ]
+}
+
 class FloatingPanelProjectableBehavior: FloatingPanelBehavior {
    func shouldProjectMomentum(_ fpc: FloatingPanelController, to proposedState: FloatingPanelState) -> Bool {
        return true
Author	SHA1	Message	Date
Shin Yamamoto	ccabb1914a	Opt-in the dismissSwizzling call as needed	2023-12-02 09:46:51 +09:00
Shin Yamamoto	be2be99537	Fix a typo	2023-12-02 09:03:31 +09:00
Shin Yamamoto	afcf1ced36	ci: support xcode 15.0.1	2023-11-18 11:51:15 +09:00
Shin Yamamoto	5b33d3d5ff	Version 2.8.1	2023-11-04 21:17:09 +09:00
Shin Yamamoto	dbef6a691a	Fix an invalid behavior after switching to a new layout object (#611 ) * Added a test for the use case, ControllerTests.test_switching_layout()	2023-11-04 13:25:25 +09:00
Shin Yamamoto	dd238884bf	Version 2.8.0	2023-10-08 14:51:26 +09:00
Shin Yamamoto	046ed3df5b	Modify the doc comment of 'floatingPanel(_:shouldAllowToScroll:in:)'	2023-10-08 14:51:26 +09:00
Shin Yamamoto	4996ce1a84	Remove unnecessary notes	2023-10-08 14:51:26 +09:00
Shin Yamamoto	b8f7ff825d	Revise the doc comment of shouldProjectMomentum delegate method	2023-10-08 14:51:26 +09:00
Shin Yamamoto	6fb9a9b3a2	Add a new section for the new API	2023-09-20 08:58:02 +09:00
Shin Yamamoto	34ebb3bf19	Use alerts syntax in the README	2023-09-19 15:18:10 +09:00
Shin Yamamoto	dbf665526d	ci: disable parallel testing to improve stability	2023-09-19 09:43:04 +09:00
Shin Yamamoto	6c7f529eff	Add 'state' parameter into 'floatingPanel(_:shouldAllowToScroll:)' This is because the `state` argument of `Core.isScrollable(state:)` is not always equal to `FloatingPanelController.state` property. Therefore, the API should pass the `state` property of `Core.isScrollable(state:)`.	2023-09-19 09:41:07 +09:00
Shin Yamamoto	c414d3a2a6	Fix errors of offset value from a state position Sometimes an offset value has an error less than 1 pt, for example, -0.666... 0.333... etc. This is due to `surfaceView.presentationFrame`.	2023-09-13 22:04:18 +09:00
Shin Yamamoto	8eba647d75	Fix a panel not moving when picked up in certain area On `DebugTableViewController` in the Samples app, the panel does not move when a finger move up from the menu area to the grabber area. `scrollViewFrame` is not necessary due to the same condition is already checked at Core.swift:L578.	2023-09-13 22:04:18 +09:00
Shin Yamamoto	c3568067b7	Reverse 'LayoutAdapter.offsetFromMostExpandedAnchor' direction	2023-09-13 22:04:18 +09:00
Shin Yamamoto	72580f089d	Fix scroll offset reset when moving in grabber area In addition, `scrollFrame` conversion is removed because it's not really necessary.	2023-09-13 22:04:16 +09:00
Shin Yamamoto	c508ec892d	Return false in shouldScrollViewHandleTouch if initial touch is outside scroll view	2023-09-13 22:03:29 +09:00
Shin Yamamoto	ff2d4a48f1	Enable content scrolling in non-expanded states (#455 ) The new `floatingPanel(_:shouldAllowToScroll)` delegate method allows the library user to determine whether the content scrolls or not in certain state. `Core.isScrollable(state:)` and `LayoutAdpter.offset(from:)` are added for this feature.	2023-09-13 20:32:48 +09:00
Shin Yamamoto	62364eb6d5	Update the minimum deployment target to 11.0	2023-09-06 21:57:23 +09:00
Shin Yamamoto	ce5469a69d	Fix a compile error on swift 5.4 or earlier The error detail is here: > Extensions.swift:11:18: error: cannot convert value of type 'CGFloat' to > expected argument type 'Double' > > let v = (self * p).rounded(.towardZero) / p > ^ > Double( )	2023-09-03 23:25:50 +09:00
Shin Yamamoto	93c31fd71d	Fix CGFloat.rounded(by displayScale) for a floating point error Where a value is -0.16666666666674246, -0.0 is the rounded value to be expected. However the current implementation returned -0.3333333333333. This is because the floating point error. So this patch truncates it.	2023-09-01 22:34:48 +09:00
Shin Yamamoto	461f637818	Add `isLooselyLocked` flag	2023-09-01 22:34:48 +09:00
Shin Yamamoto	6b3b18b8ed	Care left/right positioned panels on the scroll indicator lock/unlock	2023-09-01 22:34:48 +09:00
Shin Yamamoto	b5ca468397	Fix the hidden scroll indicator in Maps example In Maps example, the scroll indicator of the table view doesn't show even if `UIScrollView.showsVerticalScrollIndicator` is set to `true`. This is due to the occurrence of two loose scroll locks before the scroll content is displayed.	2023-09-01 22:34:45 +09:00
Shin Yamamoto	80956bfac6	Display the scroll indicator of table view in Maps example The top inset of its scroll indicator has an unexpected top margin. `UITableView` seems to append a top inset in addition to its scroll insets. However, it's important to display the indicator for the library testing. This allows us to verify whether the scroll indicator shows and hides as expected.	2023-09-01 22:32:12 +09:00
Shin Yamamoto	5d382c440f	Rename outdated compilation condition name to latest	2023-09-01 21:13:06 +09:00
Shin Yamamoto	d28c939a4c	Fix active compilation conditinos in unit testing	2023-09-01 21:11:51 +09:00
Shin Yamamoto	8bd02145cf	Fix typo	2023-09-01 21:11:51 +09:00