Opt-in the dismissSwizzling call as needed

2023-12-02 09:46:51 +09:00
35 changed files with 264 additions and 781 deletions
@@ -7,8 +7,15 @@ jobs:
    steps:
      - checkout
      - run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 12 Pro'
+  test-ios13_7-iPhone_11_Pro:
+    macos:
+      xcode: 12.5.1
+    steps:
+      - checkout
+      - run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro'

 workflows:
  test: 
    jobs:
      - test-ios14_5-iPhone_12_Pro
+      - test-ios13_7-iPhone_11_Pro
@@ -11,74 +11,75 @@ on:

 jobs:
  build:
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runsOn }}
    env:
      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
    strategy:
      fail-fast: false
      matrix:
        include:
-          - swift: "5.10"
-            xcode: "15.4"
-            runs-on: macos-14
          - swift: "5.9"
-            xcode: "15.2"
-            runs-on: macos-13
+            xcode: "15.0.1"
+            runsOn: macos-13
          - swift: "5.8"
            xcode: "14.3.1"
-            runs-on: macos-13
+            runsOn: macos-13
          - swift: "5.7"
            xcode: "14.1"
-            runs-on: macos-12
+            runsOn: macos-12
          - swift: "5.6"
            xcode: "13.4.1"
-            runs-on: macos-12
+            runsOn: macos-12
          - swift: "5.5"
            xcode: "13.2.1"
-            runs-on: macos-12
+            runsOn: macos-11
+          - swift: "5.4"
+            xcode: "12.5.1"
+            runsOn: macos-11
+          - swift: "5.3"
+            xcode: "12.4"
+            runsOn: macos-11
+          - swift: "5.2"
+            xcode: "11.7"
+            runsOn: macos-11
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Building in Swift ${{ matrix.swift }}
        run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=${{ matrix.swift }} clean build

  test:
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.runsOn }}
    env:
      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
    strategy:
      fail-fast: false
      matrix:
        include:
-          - os: "17.5"
-            xcode: "15.4"
+          - os: "17.0.1"
+            xcode: "15.0.1"
            sim: "iPhone 15 Pro"
            parallel: NO  # Stop random test job failures
-            runs-on: macos-14
+            runsOn: macos-13
          - os: "16.4"
            xcode: "14.3.1"
            sim: "iPhone 14 Pro"
            parallel: NO  # Stop random test job failures
-            runs-on: macos-13
+            runsOn: macos-13
          - os: "15.5"
            xcode: "13.4.1"
            sim: "iPhone 13 Pro"
            parallel: NO  # Stop random test job failures
-            runs-on: macos-12
+            runsOn: macos-12
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: Testing in iOS ${{ matrix.os }}
-      run: |
-        xcodebuild clean test \
-          -workspace FloatingPanel.xcworkspace \
-          -scheme FloatingPanel \
-          -destination 'platform=iOS Simulator,OS=${{ matrix.os }},name=${{ matrix.sim }}' \
-          -parallel-testing-enabled '${{ matrix.parallel }}'
+      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:
-    runs-on: macos-14
+    runs-on: macos-12
    env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
    strategy:
      fail-fast: false
      matrix:
@@ -88,76 +89,40 @@ jobs:
          - example: "Stocks"
          - example: "Samples"
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: Building ${{ matrix.example }}
-      run: |
-        xcodebuild clean build \
-          -workspace FloatingPanel.xcworkspace \
-          -scheme ${{ matrix.example }} \
-          -sdk iphonesimulator
+      run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme ${{ matrix.example }} -sdk iphonesimulator clean build

  swiftpm:
-    runs-on: macos-14
+    runs-on: macos-12
    env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [iphoneos, iphonesimulator]
-        arch: [x86_64, arm64]
-        exclude:
-          - platform: iphoneos
-            arch: x86_64
-        include:
-          # 17.2
-          - platform: iphoneos
-            sys: "ios17.2"
-          - platform: iphonesimulator
-            sys: "ios17.2-simulator"
-    steps:
-    - uses: actions/checkout@v4
-    - name: "Swift Package Manager build"
-      run: |
-        xcrun swift build \
-          --sdk "$(xcrun --sdk ${{ matrix.platform }} --show-sdk-path)" \
-          -Xswiftc "-target" -Xswiftc "${{ matrix.arch }}-apple-${{ matrix.sys }}"
-
-  swiftpm_old:
-    runs-on: ${{ matrix.runs-on }}
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
    strategy:
      fail-fast: false
      matrix:
        include:
-          # 16.4
-          - target: "x86_64-apple-ios16.4-simulator"
-            xcode: "14.3.1"
-            runs-on: macos-13
-          - target: "arm64-apple-ios16.4-simulator"
-            xcode: "14.3.1"
-            runs-on: macos-13
          # 15.7
          - target: "x86_64-apple-ios15.7-simulator"
-            xcode: "14.1"
-            runs-on: macos-12
          - target: "arm64-apple-ios15.7-simulator"
-            xcode: "14.1"
-            runs-on: macos-12
+          # 16.1
+          - target: "x86_64-apple-ios16.1-simulator"
+          - target: "arm64-apple-ios16.1-simulator"
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: "Swift Package Manager build"
-      run: |
-        swift build \
-          -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" \
-          -Xswiftc "-target" -Xswiftc "${{ matrix.target }}"
+      run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "${{ matrix.target }}"
+
+  carthage:
+    runs-on: macos-11
+    steps:
+    - uses: actions/checkout@v3
+    - name: "Carthage build"
+      run: carthage build --use-xcframeworks --no-skip-current

  cocoapods:
-    runs-on: macos-14
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+    runs-on: macos-12
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: "CocoaPods: pod lib lint"
      run: pod lib lint --allow-warnings
    - name: "CocoaPods: pod spec lint"
@@ -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
+    }
+}
@@ -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()
@@ -18,7 +18,7 @@
 		5442E24A25FC53C100A26F43 /* DebugTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5442E24925FC53C100A26F43 /* DebugTextViewController.swift */; };
 		5442E25225FC541700A26F43 /* NestedScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5442E25125FC541700A26F43 /* NestedScrollViewController.swift */; };
 		54496C59263A7E5A0031E0C8 /* UseCaseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54496C58263A7E5A0031E0C8 /* UseCaseController.swift */; };
-		544BC56826CC918200D0A436 /* TableViewControllerForAdaptiveLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 544BC56726CC918200D0A436 /* TableViewControllerForAdaptiveLayout.swift */; };
+		544BC56826CC918200D0A436 /* AdaptiveLayoutTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 544BC56726CC918200D0A436 /* AdaptiveLayoutTestViewController.swift */; };
 		545DB9EE21511E6300CA77B8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DB9ED21511E6300CA77B8 /* AppDelegate.swift */; };
 		545DB9F021511E6300CA77B8 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545DB9EF21511E6300CA77B8 /* MainViewController.swift */; };
 		545DB9F321511E6300CA77B8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 545DB9F121511E6300CA77B8 /* Main.storyboard */; };
@@ -30,11 +30,8 @@
 		549D23CC233C7779008EF4D7 /* FloatingPanel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 549D23CA233C7779008EF4D7 /* FloatingPanel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		54B51116216AFE5F0033A6F3 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54B51115216AFE5F0033A6F3 /* Extensions.swift */; };
 		54CDC5D8215BBE23007D205C /* SupplementaryViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54CDC5D7215BBE23007D205C /* SupplementaryViews.swift */; };
-		54E58CB72BF8A8D900408EA9 /* CollectionViewControllerForAdaptiveLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E58CB62BF8A8D900408EA9 /* CollectionViewControllerForAdaptiveLayout.swift */; };
 		54EAD35B263A75EB006A36EA /* PanelLayouts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EAD35A263A75EB006A36EA /* PanelLayouts.swift */; };
 		54EAD365263A765F006A36EA /* PagePanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EAD364263A765F006A36EA /* PagePanelController.swift */; };
-		54F185822BF4AD0000916F57 /* DebugListCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54F185812BF4AD0000916F57 /* DebugListCollectionViewController.swift */; };
-		54F185842BF4B82E00916F57 /* UnavailableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54F185832BF4B82E00916F57 /* UnavailableViewController.swift */; };
 		5D82A6AD28D1843C006A44BA /* libswiftCoreGraphics.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D82A6AC28D18438006A44BA /* libswiftCoreGraphics.tbd */; };
 /* End PBXBuildFile section */

@@ -64,7 +61,7 @@
 		5442E24925FC53C100A26F43 /* DebugTextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugTextViewController.swift; sourceTree = "<group>"; };
 		5442E25125FC541700A26F43 /* NestedScrollViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NestedScrollViewController.swift; sourceTree = "<group>"; };
 		54496C58263A7E5A0031E0C8 /* UseCaseController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UseCaseController.swift; sourceTree = "<group>"; };
-		544BC56726CC918200D0A436 /* TableViewControllerForAdaptiveLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewControllerForAdaptiveLayout.swift; sourceTree = "<group>"; };
+		544BC56726CC918200D0A436 /* AdaptiveLayoutTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveLayoutTestViewController.swift; sourceTree = "<group>"; };
 		545DB9EA21511E6300CA77B8 /* Samples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Samples.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		545DB9ED21511E6300CA77B8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		545DB9EF21511E6300CA77B8 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
@@ -77,11 +74,8 @@
 		549D23CA233C7779008EF4D7 /* FloatingPanel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FloatingPanel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		54B51115216AFE5F0033A6F3 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		54CDC5D7215BBE23007D205C /* SupplementaryViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupplementaryViews.swift; sourceTree = "<group>"; };
-		54E58CB62BF8A8D900408EA9 /* CollectionViewControllerForAdaptiveLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewControllerForAdaptiveLayout.swift; sourceTree = "<group>"; };
 		54EAD35A263A75EB006A36EA /* PanelLayouts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanelLayouts.swift; sourceTree = "<group>"; };
 		54EAD364263A765F006A36EA /* PagePanelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagePanelController.swift; sourceTree = "<group>"; };
-		54F185812BF4AD0000916F57 /* DebugListCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugListCollectionViewController.swift; sourceTree = "<group>"; };
-		54F185832BF4B82E00916F57 /* UnavailableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnavailableViewController.swift; sourceTree = "<group>"; };
 		5D82A6AC28D18438006A44BA /* libswiftCoreGraphics.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCoreGraphics.tbd; path = usr/lib/swift/libswiftCoreGraphics.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */

@@ -101,18 +95,17 @@
 		5442E22225FC519700A26F43 /* ContentViewControllers */ = {
 			isa = PBXGroup;
 			children = (
-				54E58CB52BF8A88600408EA9 /* AdaptiveLayout */,
 				5442E23F25FC533800A26F43 /* DebugTableViewController.swift */,
 				5442E24925FC53C100A26F43 /* DebugTextViewController.swift */,
-				54F185812BF4AD0000916F57 /* DebugListCollectionViewController.swift */,
 				5442E23325FC528400A26F43 /* DetailViewController.swift */,
 				5442E24325FC538200A26F43 /* InspectorViewController.swift */,
+				5442E22325FC51AF00A26F43 /* ImageViewController.swift */,
 				5442E25125FC541700A26F43 /* NestedScrollViewController.swift */,
 				5442E23925FC52CD00A26F43 /* ModalViewController.swift */,
 				5442E22725FC51E200A26F43 /* MultiPanelController.swift */,
 				5442E22B25FC521F00A26F43 /* SettingsViewController.swift */,
 				5442E22F25FC525200A26F43 /* TabBarViewController.swift */,
-				54F185832BF4B82E00916F57 /* UnavailableViewController.swift */,
+				544BC56726CC918200D0A436 /* AdaptiveLayoutTestViewController.swift */,
 			);
 			path = ContentViewControllers;
 			sourceTree = "<group>";
@@ -164,16 +157,6 @@
 			path = UseCases;
 			sourceTree = "<group>";
 		};
-		54E58CB52BF8A88600408EA9 /* AdaptiveLayout */ = {
-			isa = PBXGroup;
-			children = (
-				5442E22325FC51AF00A26F43 /* ImageViewController.swift */,
-				544BC56726CC918200D0A436 /* TableViewControllerForAdaptiveLayout.swift */,
-				54E58CB62BF8A8D900408EA9 /* CollectionViewControllerForAdaptiveLayout.swift */,
-			);
-			path = AdaptiveLayout;
-			sourceTree = "<group>";
-		};
 		5D82A6AB28D18438006A44BA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -255,17 +238,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				5442E23425FC528400A26F43 /* DetailViewController.swift in Sources */,
-				54E58CB72BF8A8D900408EA9 /* CollectionViewControllerForAdaptiveLayout.swift in Sources */,
 				54496C59263A7E5A0031E0C8 /* UseCaseController.swift in Sources */,
 				54CDC5D8215BBE23007D205C /* SupplementaryViews.swift in Sources */,
 				54B51116216AFE5F0033A6F3 /* Extensions.swift in Sources */,
-				544BC56826CC918200D0A436 /* TableViewControllerForAdaptiveLayout.swift in Sources */,
+				544BC56826CC918200D0A436 /* AdaptiveLayoutTestViewController.swift in Sources */,
 				5442E24A25FC53C100A26F43 /* DebugTextViewController.swift in Sources */,
 				546341AC25C6426500CA0596 /* CustomState.swift in Sources */,
 				5442E23A25FC52CD00A26F43 /* ModalViewController.swift in Sources */,
 				5442E22425FC51AF00A26F43 /* ImageViewController.swift in Sources */,
 				5442E24025FC533800A26F43 /* DebugTableViewController.swift in Sources */,
-				54F185822BF4AD0000916F57 /* DebugListCollectionViewController.swift in Sources */,
 				5442E25225FC541700A26F43 /* NestedScrollViewController.swift in Sources */,
 				5442E22825FC51E200A26F43 /* MultiPanelController.swift in Sources */,
 				546341A125C6415100CA0596 /* UseCase.swift in Sources */,
@@ -276,7 +257,6 @@
 				54EAD365263A765F006A36EA /* PagePanelController.swift in Sources */,
 				5442E24425FC538200A26F43 /* InspectorViewController.swift in Sources */,
 				5442E22C25FC521F00A26F43 /* SettingsViewController.swift in Sources */,
-				54F185842BF4B82E00916F57 /* UnavailableViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -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
+    }
 }
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RoN-h0-uBD">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RoN-h0-uBD">
    <device id="retina6_1" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -801,10 +801,10 @@ Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
            </objects>
            <point key="canvasLocation" x="-2.1739130434782612" y="733.92857142857144"/>
        </scene>
-        <!--Table View Controller For Adaptive Layout-->
+        <!--Adaptive Layout Test View Controller-->
        <scene sceneID="rDI-lU-wEx">
            <objects>
-                <viewController storyboardIdentifier="TableViewControllerForAdaptiveLayout" id="5nC-6E-bXf" customClass="TableViewControllerForAdaptiveLayout" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="AdaptiveLayoutTestViewController" id="5nC-6E-bXf" customClass="AdaptiveLayoutTestViewController" customModule="Samples" customModuleProvider="target" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="jXL-Ss-NCJ">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="778"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -861,13 +861,13 @@ Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC
            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
        </systemColor>
        <systemColor name="systemOrangeColor">
-            <color red="1" green="0.58431372550000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.58431372549019611" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
        </systemColor>
        <systemColor name="systemPurpleColor">
-            <color red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.68627450980392157" green="0.32156862745098042" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
        </systemColor>
        <systemColor name="systemTealColor">
-            <color red="0.18823529410000001" green="0.69019607839999997" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18823529411764706" green="0.69019607843137254" blue="0.7803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
        </systemColor>
    </resources>
 </document>
@@ -1,175 +0,0 @@
-// Copyright 2018-Present Shin Yamamoto. All rights reserved. MIT license.
-
-import UIKit
-import FloatingPanel
-
-@available(iOS 13.0, *)
-class CollectionViewControllerForAdaptiveLayout: UIViewController {
-    class PanelLayout: FloatingPanelLayout {
-        let position: FloatingPanelPosition = .bottom
-        let initialState: FloatingPanelState = .full
-
-        private unowned var targetGuide: UILayoutGuide
-
-        init(targetGuide: UILayoutGuide) {
-            self.targetGuide = targetGuide
-        }
-
-        var anchors: [FloatingPanelState : FloatingPanelLayoutAnchoring] {
-            return [
-                .full: FloatingPanelAdaptiveLayoutAnchor(
-                    absoluteOffset: 0.0,
-                    contentLayout: targetGuide,
-                    referenceGuide: .superview,
-                    contentBoundingGuide: .safeArea
-                ),
-                .half: FloatingPanelAdaptiveLayoutAnchor(
-                    fractionalOffset: 0.5,
-                    contentLayout: targetGuide,
-                    referenceGuide: .superview,
-                    contentBoundingGuide: .safeArea
-                ),
-            ]
-        }
-    }
-
-    enum LayoutType {
-        case flow
-        case compositional
-    }
-
-    weak var collectionView: UICollectionView!
-    var layoutType: LayoutType = .flow
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        setupCollectionView()
-    }
-
-    private func setupCollectionView() {
-        let collectionViewLayout = {
-            switch layoutType {
-            case .flow:
-                CollectionViewLayoutFactory.flowLayout
-            case .compositional:
-                CollectionViewLayoutFactory.compositionalLayout
-            }
-        }()
-        let collectionView = IntrinsicCollectionView(
-            frame: .zero,
-            collectionViewLayout: collectionViewLayout
-        )
-
-        collectionView.delegate = self
-        collectionView.dataSource = self
-        collectionView.backgroundColor = .yellow
-        collectionView.register(Cell.self, forCellWithReuseIdentifier: Cell.reuseIdentifier)
-
-        view.addSubview(collectionView)
-        self.collectionView = collectionView
-
-        collectionView.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            collectionView.topAnchor.constraint(equalTo: view.topAnchor),
-            collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-            collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor)
-        ])
-    }
-}
-
-@available(iOS 13.0, *)
-extension CollectionViewControllerForAdaptiveLayout: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
-    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 5  // Only three cells needed to fill the space
-    }
-
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Cell.reuseIdentifier, for: indexPath) as! Cell
-        cell.configure(text: "Item \(indexPath.row)")
-        return cell
-    }
-
-
-    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        let width = collectionView.frame.width  
-        return CGSize(width: width, height: 100)
-    }
-}
-
-@available(iOS 13.0, *)
-extension CollectionViewControllerForAdaptiveLayout {
-    enum CollectionViewLayoutFactory {
-        static var flowLayout: UICollectionViewLayout {
-            let layout = UICollectionViewFlowLayout()
-            layout.scrollDirection = .vertical
-            layout.minimumLineSpacing = 8  // Vertical spacing between rows
-            return layout
-        }
-
-        @available(iOS 13.0, *)
-        static var compositionalLayout: UICollectionViewLayout {
-            UICollectionViewCompositionalLayout { (sectionIndex: Int, layoutEnvironment: NSCollectionLayoutEnvironment) -> NSCollectionLayoutSection? in
-                let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .absolute(100))
-                let item = NSCollectionLayoutItem(layoutSize: itemSize)
-
-                let group = NSCollectionLayoutGroup.horizontal(layoutSize: itemSize, subitems: [item])
-
-                let section = NSCollectionLayoutSection(group: group)
-                section.interGroupSpacing = 8 // Spacing between each group/item
-                section.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
-
-                return section
-            }
-        }
-    }
-
-
-    private final class Cell: UICollectionViewCell {
-        static let reuseIdentifier = "Cell"
-
-        private let label: UILabel = {
-            let label = UILabel()
-            label.textAlignment = .center
-            label.textColor = .white
-            return label
-        }()
-
-        override init(frame: CGRect) {
-            super.init(frame: frame)
-            commonInit()
-        }
-
-        required init?(coder: NSCoder) {
-            super.init(coder: coder)
-            commonInit()
-        }
-
-        private func commonInit() {
-            backgroundColor = .systemBlue
-            addSubview(label)
-            label.translatesAutoresizingMaskIntoConstraints = false
-            NSLayoutConstraint.activate([
-                label.centerXAnchor.constraint(equalTo: centerXAnchor),
-                label.centerYAnchor.constraint(equalTo: centerYAnchor)
-            ])
-        }
-
-        func configure(text: String) {
-            label.text = text
-        }
-    }
-
-    private final class IntrinsicCollectionView: UICollectionView {
-        override public var contentSize: CGSize {
-            didSet {
-                invalidateIntrinsicContentSize()
-            }
-        }
-
-        override public var intrinsicContentSize: CGSize {
-            layoutIfNeeded()
-            return CGSize(width: UIView.noIntrinsicMetric, height: contentSize.height)
-        }
-    }
-}
@@ -3,7 +3,7 @@
 import UIKit
 import FloatingPanel

-final class TableViewControllerForAdaptiveLayout: UIViewController, UITableViewDataSource, UITableViewDelegate {
+final class AdaptiveLayoutTestViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
    class PanelLayout: FloatingPanelLayout {
        let position: FloatingPanelPosition = .bottom
        let initialState: FloatingPanelState = .full
@@ -75,6 +75,7 @@ final class TableViewControllerForAdaptiveLayout: UIViewController, UITableViewD
 }

 class IntrinsicTableView: UITableView {
+
    override var contentSize:CGSize {
        didSet {
            invalidateIntrinsicContentSize()
@@ -1,77 +0,0 @@
-// Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
-
-import UIKit
-
-@available(iOS 14, *)
-class DebugListCollectionViewController: UIViewController {
-
-    enum Section {
-        case main
-    }
-
-    var dataSource: UICollectionViewDiffableDataSource<Section, Int>! = nil
-    var collectionView: UICollectionView! = nil
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        navigationItem.title = "List"
-        configureHierarchy()
-        configureDataSource()
-    }
-}
-
-@available(iOS 14, *)
-extension DebugListCollectionViewController {
-    /// - Tag: List
-    private func createLayout() -> UICollectionViewLayout {
-        var config = UICollectionLayoutListConfiguration(appearance: .insetGrouped)
-        config.trailingSwipeActionsConfigurationProvider =  { indexPath -> UISwipeActionsConfiguration? in
-            return UISwipeActionsConfiguration(
-                actions: [UIContextualAction(
-                    style: .destructive,
-                    title: "Delete",
-                    handler: { _, _, completion in
-                        // Do nothing now
-                    }
-                )]
-            )
-        }
-        return UICollectionViewCompositionalLayout.list(using: config)
-    }
-}
-
-@available(iOS 14, *)
-extension DebugListCollectionViewController {
-    private func configureHierarchy() {
-        collectionView = UICollectionView(frame: view.bounds, collectionViewLayout: createLayout())
-        collectionView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        view.addSubview(collectionView)
-        collectionView.delegate = self
-    }
-    private func configureDataSource() {
-
-        let cellRegistration = UICollectionView.CellRegistration<UICollectionViewListCell, Int> { (cell, indexPath, item) in
-            var content = cell.defaultContentConfiguration()
-            content.text = "\(item)"
-            cell.contentConfiguration = content
-        }
-
-        dataSource = UICollectionViewDiffableDataSource<Section, Int>(collectionView: collectionView) {
-            (collectionView: UICollectionView, indexPath: IndexPath, identifier: Int) -> UICollectionViewCell? in
-
-            return collectionView.dequeueConfiguredReusableCell(using: cellRegistration, for: indexPath, item: identifier)
-        }
-
-        var snapshot = NSDiffableDataSourceSnapshot<Section, Int>()
-        snapshot.appendSections([.main])
-        snapshot.appendItems(Array(0..<94))
-        dataSource.apply(snapshot, animatingDifferences: false)
-    }
-}
-
-@available(iOS 14, *)
-extension DebugListCollectionViewController: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        collectionView.deselectItem(at: indexPath, animated: true)
-    }
-}
@@ -1,24 +0,0 @@
-// Copyright 2018 the FloatingPanel authors. All rights reserved. MIT license.
-
-import UIKit
-
-class UnavailableViewController: UIViewController {
-    weak var label: UILabel!
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        let label = UILabel()
-        label.text = "Unavailable content"
-        label.numberOfLines = 0
-        label.textAlignment = .center
-        label.frame = view.bounds
-        label.autoresizingMask = [
-            .flexibleTopMargin,
-            .flexibleLeftMargin,
-            .flexibleBottomMargin,
-            .flexibleRightMargin
-        ]
-        view.addSubview(label)
-        self.label = label
-    }
-}
@@ -5,7 +5,6 @@ import UIKit
 enum UseCase: Int, CaseIterable {
    case trackingTableView
    case trackingTextView
-    case trackingCollectionViewList
    case showDetail
    case showModal
    case showPanelModal
@@ -23,18 +22,14 @@ enum UseCase: Int, CaseIterable {
    case showNavigationController
    case showTopPositionedPanel
    case showAdaptivePanel
-    case showAdaptivePanelWithTableView
-    case showAdaptivePanelWithCollectionView
-    case showAdaptivePanelWithCompositionalCollectionView
+    case showAdaptivePanelWithCustomGuide
    case showCustomStatePanel
-    case showCustomBackdrop
 }

 extension UseCase {
    var name: String {
        switch self {
        case .trackingTableView: return "Scroll tracking(TableView)"
-        case .trackingCollectionViewList: return "Scroll tracking(List CollectionView)"
        case .trackingTextView: return "Scroll tracking(TextView)"
        case .showDetail: return "Show Detail Panel"
        case .showModal: return "Show Modal"
@@ -53,11 +48,8 @@ extension UseCase {
        case .showNavigationController: return "Show Navigation Controller"
        case .showTopPositionedPanel: return "Show Top Positioned Panel"
        case .showAdaptivePanel: return "Show Adaptive Panel"
-        case .showAdaptivePanelWithTableView: return "Show Adaptive Panel (TableView)"
-        case .showAdaptivePanelWithCollectionView: return "Show Adaptive Panel (CollectionView)"
-        case .showAdaptivePanelWithCompositionalCollectionView: return "Show Adaptive Panel (Compositional CollectionView)"
+        case .showAdaptivePanelWithCustomGuide: return "Show Adaptive Panel (Custom Layout Guide)"
        case .showCustomStatePanel: return "Show Panel with Custom state"
-        case .showCustomBackdrop: return "Show Panel with Custom Backdrop"
        }
    }
 }
@@ -71,13 +63,6 @@ extension UseCase {
    private var content: Content {
        switch self {
        case .trackingTableView: return .viewController(DebugTableViewController())
-        case .trackingCollectionViewList:
-            if #available(iOS 14, *) {
-                return .viewController(DebugListCollectionViewController())
-            } else {
-                let msg = "UICollectionLayoutListConfiguration is unavailable.\nBuild this app on iOS 14 and later."
-                return makeUnavailableViewContent(message: msg)
-            }
        case .trackingTextView: return .storyboard("ConsoleViewController") // Storyboard only
        case .showDetail: return .storyboard(String(describing: DetailViewController.self))
        case .showModal: return .storyboard(String(describing: ModalViewController.self))
@@ -96,19 +81,8 @@ extension UseCase {
        case .showNavigationController: return .storyboard("RootNavigationController") // Storyboard only
        case .showTopPositionedPanel: return .viewController(DebugTableViewController())
        case .showAdaptivePanel: return .storyboard(String(describing: ImageViewController.self))
-        case .showAdaptivePanelWithTableView: return .storyboard(String(describing: TableViewControllerForAdaptiveLayout.self))
-        case .showAdaptivePanelWithCollectionView,
-            .showAdaptivePanelWithCompositionalCollectionView:
-            if #available(iOS 13, *) {
-                let vc = CollectionViewControllerForAdaptiveLayout()
-                vc.layoutType = self == .showAdaptivePanelWithCollectionView ? .flow : .compositional
-                return .viewController(vc)
-            } else {
-                let msg = "Compositional layout is unavailable.\nBuild this app on iOS 13 and later."
-                return makeUnavailableViewContent(message: msg)
-            }
+        case .showAdaptivePanelWithCustomGuide: return .storyboard(String(describing: AdaptiveLayoutTestViewController.self))
        case .showCustomStatePanel: return .viewController(DebugTableViewController())
-        case .showCustomBackdrop: return .viewController(UIViewController())
        }
    }

@@ -121,11 +95,4 @@ extension UseCase {
            return vc
        }
    }
-
-    private func makeUnavailableViewContent(message: String) -> Content {
-        let vc = UnavailableViewController()
-        vc.loadViewIfNeeded()
-        vc.label.text = message
-        return .viewController(vc)
-    }
 }
@@ -3,7 +3,6 @@
 import UIKit
 import FloatingPanel

-@MainActor
 final class UseCaseController: NSObject {
    unowned let mainVC: MainViewController
    private(set) var useCase: UseCase
@@ -53,30 +52,6 @@ extension UseCaseController {
            fpc.ext_trackScrollView(in: contentVC)
            addMain(panel: fpc)

-         case .trackingCollectionViewList:
-            let fpc = FloatingPanelController()
-            fpc.delegate = self
-            fpc.contentInsetAdjustmentBehavior = .always
-            fpc.surfaceView.appearance = {
-                let appearance = SurfaceAppearance()
-                appearance.cornerRadius = 6.0
-                return appearance
-            }()
-
-            let tapGesture = UITapGestureRecognizer(target: self, action: #selector(UseCaseController.handleSurface(tapGesture:)))
-            tapGesture.cancelsTouchesInView = false
-            tapGesture.numberOfTapsRequired = 2
-            // Prevents a delay to response a tap in menus of DebugTableViewController.
-            tapGesture.delaysTouchesEnded = false
-            fpc.surfaceView.addGestureRecognizer(tapGesture)
-
-            fpc.set(contentViewController: contentVC)
-            if #available(iOS 14, *),
-                let scrollView = (fpc.contentViewController as? DebugListCollectionViewController)?.collectionView {
-                    fpc.track(scrollView: scrollView)
-            }
-            addMain(panel: fpc)
-
        case .trackingTextView:
            let fpc = FloatingPanelController()
            fpc.delegate = self
@@ -264,13 +239,13 @@ extension UseCaseController {
            fpc.set(contentViewController: contentVC)
            fpc.ext_trackScrollView(in: contentVC)
            if case let contentVC as ImageViewController = contentVC {
-                let mode: ImageViewController.Mode = (useCase == .showAdaptivePanelWithTableView) ? .withHeaderFooter : .onlyImage
+                let mode: ImageViewController.Mode = (useCase == .showAdaptivePanelWithCustomGuide) ? .withHeaderFooter : .onlyImage
                let layoutGuide = contentVC.layoutGuideFor(mode: mode)
                fpc.layout = ImageViewController.PanelLayout(targetGuide: layoutGuide)
            }
            addMain(panel: fpc)

-        case .showAdaptivePanelWithTableView:
+        case .showAdaptivePanelWithCustomGuide:
            let fpc = FloatingPanelController()
            fpc.isRemovalInteractionEnabled = true
            fpc.contentInsetAdjustmentBehavior = .always
@@ -280,25 +255,10 @@ extension UseCaseController {
                return appearance
            }()

-            fpc.set(contentViewController: contentVC)
-            fpc.track(scrollView: (contentVC as! TableViewControllerForAdaptiveLayout).tableView)
-            fpc.layout = TableViewControllerForAdaptiveLayout.PanelLayout(targetGuide: contentVC.view.makeBoundsLayoutGuide())
-            addMain(panel: fpc)

-        case .showAdaptivePanelWithCollectionView, .showAdaptivePanelWithCompositionalCollectionView:
-            let fpc = FloatingPanelController()
-            fpc.isRemovalInteractionEnabled = true
-            fpc.contentInsetAdjustmentBehavior = .always
-            fpc.surfaceView.appearance = {
-                let appearance = SurfaceAppearance()
-                appearance.cornerRadius = 6.0
-                return appearance
-            }()
            fpc.set(contentViewController: contentVC)
-            if #available(iOS 13, *) {
-                fpc.track(scrollView: (contentVC as! CollectionViewControllerForAdaptiveLayout).collectionView)
-                fpc.layout = CollectionViewControllerForAdaptiveLayout.PanelLayout(targetGuide: contentVC.view.makeBoundsLayoutGuide())
-            }
+            fpc.ext_trackScrollView(in: contentVC)
+            fpc.layout = AdaptiveLayoutTestViewController.PanelLayout(targetGuide: contentVC.view.makeBoundsLayoutGuide())
            addMain(panel: fpc)

        case .showCustomStatePanel:
@@ -313,52 +273,6 @@ extension UseCaseController {
            fpc.set(contentViewController: contentVC)
            fpc.ext_trackScrollView(in: contentVC)
            addMain(panel: fpc)
-
-        case .showCustomBackdrop:
-            class BlurBackdropView: BackdropView {
-                var effectView: UIVisualEffectView!
-                override var alpha: CGFloat {
-                    set {
-                        effectView.alpha = newValue
-                    }
-                    get {
-                        effectView.alpha
-                    }
-                }
-                override init() {
-                    super.init()
-
-                    let effect = UIBlurEffect(style: .prominent)
-                    let effectView = UIVisualEffectView(effect: effect)
-                    addSubview(effectView)
-                    effectView.frame = bounds
-                    effectView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-                    self.effectView = effectView
-                }
-
-                required init?(coder: NSCoder) {
-                    fatalError("init(coder:) has not been implemented")
-                }
-            }
-            class CustomBottomLayout: FloatingPanelBottomLayout {
-                override var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
-                    return [
-                        .full: FloatingPanelLayoutAnchor(absoluteInset: 100.0, edge: .top, referenceGuide: .safeArea),
-                        .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
-                        .tip: FloatingPanelLayoutAnchor(fractionalInset: 0.1, edge: .bottom, referenceGuide: .safeArea),
-                    ]
-                }
-                override func backdropAlpha(for state: FloatingPanelState) -> CGFloat {
-                    return state == .full ? 0.8 : 0.0
-                }
-            }
-
-            let fpc = FloatingPanelController()
-            fpc.delegate = self
-            fpc.set(contentViewController: contentVC)
-            fpc.backdropView = BlurBackdropView()
-            fpc.layout = CustomBottomLayout()
-            addMain(panel: fpc)
        }
    }

@@ -498,7 +412,7 @@ private extension FloatingPanelController {
        case let contentVC as ImageViewController:
            track(scrollView: contentVC.scrollView)

-        case let contentVC as TableViewControllerForAdaptiveLayout:
+        case let contentVC as AdaptiveLayoutTestViewController:
            track(scrollView: contentVC.tableView)

        default:
@@ -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
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|

  s.name                = "FloatingPanel"
-  s.version             = "2.8.4"
+  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.
@@ -462,7 +462,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -475,19 +475,6 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
-				SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
-				SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
-				SWIFT_UPCOMING_FEATURE_EXISTENTIAL_ANY = YES;
-				SWIFT_UPCOMING_FEATURE_FORWARD_TRAILING_CLOSURES = YES;
-				SWIFT_UPCOMING_FEATURE_GLOBAL_CONCURRENCY = YES;
-				SWIFT_UPCOMING_FEATURE_IMPLICIT_OPEN_EXISTENTIALS = YES;
-				SWIFT_UPCOMING_FEATURE_IMPORT_OBJC_FORWARD_DECLS = YES;
-				SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES;
-				SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT = YES;
-				SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
-				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -507,7 +494,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -518,19 +505,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
-				SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
-				SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
-				SWIFT_UPCOMING_FEATURE_EXISTENTIAL_ANY = YES;
-				SWIFT_UPCOMING_FEATURE_FORWARD_TRAILING_CLOSURES = YES;
-				SWIFT_UPCOMING_FEATURE_GLOBAL_CONCURRENCY = YES;
-				SWIFT_UPCOMING_FEATURE_IMPLICIT_OPEN_EXISTENTIALS = YES;
-				SWIFT_UPCOMING_FEATURE_IMPORT_OBJC_FORWARD_DECLS = YES;
-				SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES;
-				SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT = YES;
-				SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
-				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -657,7 +631,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -670,19 +644,6 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "TEST DEBUG FP_LOG";
 				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
-				SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
-				SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
-				SWIFT_UPCOMING_FEATURE_EXISTENTIAL_ANY = YES;
-				SWIFT_UPCOMING_FEATURE_FORWARD_TRAILING_CLOSURES = YES;
-				SWIFT_UPCOMING_FEATURE_GLOBAL_CONCURRENCY = YES;
-				SWIFT_UPCOMING_FEATURE_IMPLICIT_OPEN_EXISTENTIALS = YES;
-				SWIFT_UPCOMING_FEATURE_IMPORT_OBJC_FORWARD_DECLS = YES;
-				SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES;
-				SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT = YES;
-				SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
-				SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -2,13 +2,14 @@
 [![Platform](https://img.shields.io/cocoapods/p/FloatingPanel.svg)](https://cocoapods.org/pods/FloatingPanel)
 [![Version](https://img.shields.io/cocoapods/v/FloatingPanel.svg)](https://cocoapods.org/pods/FloatingPanel)
 ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/scenee/FloatingPanel/ci.yml?branch=master)
+[![Carthage compatible](https://img.shields.io/badge/carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

 # FloatingPanel

 FloatingPanel is a simple and easy-to-use UI component 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@SPI](https://swiftpackageindex.com/scenee/FloatingPanel/2.8.4/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,6 +22,7 @@ Please see also [the API reference@SPI](https://swiftpackageindex.com/scenee/Flo
 - [Requirements](#requirements)
 - [Installation](#installation)
  - [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)
@@ -102,6 +104,14 @@ it, simply add the following line to your Podfile:
 pod 'FloatingPanel'
 ```

+### Carthage
+
+For [Carthage](https://github.com/Carthage/Carthage), add the following to your `Cartfile`:
+
+```ogdl
+github "scenee/FloatingPanel"
+```
+
 ### Swift Package Manager

 Follow [this doc](https://developer.apple.com/documentation/swift_packages/adding_package_dependencies_to_your_app).
@@ -4,7 +4,7 @@ import UIKit

 /// A view that presents a backdrop interface behind a panel.
@objc(FloatingPanelBackdropView)
-open class BackdropView: UIView {
+public class BackdropView: UIView {

    /// The gesture recognizer for tap gestures to dismiss a panel.
    ///
@@ -12,14 +12,14 @@ open class BackdropView: UIView {
    /// To dismiss a panel by tap gestures on the backdrop, `dismissalTapGestureRecognizer.isEnabled` is set to true.
    @objc public var dismissalTapGestureRecognizer: UITapGestureRecognizer

-    public init() {
+    init() {
        dismissalTapGestureRecognizer = UITapGestureRecognizer()
        dismissalTapGestureRecognizer.isEnabled = false
        super.init(frame: .zero)
        addGestureRecognizer(dismissalTapGestureRecognizer)
    }

-    required public init?(coder: NSCoder) {
+    required init?(coder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }
 }
@@ -86,9 +86,9 @@ open class FloatingPanelDefaultBehavior: FloatingPanelBehavior {

 class BehaviorAdapter {
    unowned let vc: FloatingPanelController
-    fileprivate var behavior: any FloatingPanelBehavior
+    fileprivate var behavior: FloatingPanelBehavior

-    init(vc: FloatingPanelController, behavior: any FloatingPanelBehavior) {
+    init(vc: FloatingPanelController, behavior: FloatingPanelBehavior) {
        self.vc = vc
        self.behavior = behavior
    }
@@ -123,7 +123,7 @@ class BehaviorAdapter {
 }

 extension FloatingPanelController {
-    var _behavior: any FloatingPanelBehavior {
+    var _behavior: FloatingPanelBehavior {
        get { floatingPanel.behaviorAdapter.behavior }
        set { floatingPanel.behaviorAdapter.behavior = newValue}
    }
@@ -6,15 +6,14 @@ import os.log
 /// A set of methods implemented by the delegate of a panel controller allows the adopting delegate to respond to
 /// messages from the FloatingPanelController class and thus respond to, and in some affect, operations such as
 /// dragging, attracting a panel, layout of a panel and the content, and transition animations.
-@MainActor
@objc public protocol FloatingPanelControllerDelegate {
    /// Returns a FloatingPanelLayout object. If you use the default one, you can use a `FloatingPanelBottomLayout` object.
    @objc(floatingPanel:layoutForTraitCollection:) optional
-    func floatingPanel(_ fpc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> any FloatingPanelLayout
+    func floatingPanel(_ fpc: FloatingPanelController, layoutFor newCollection: UITraitCollection) -> FloatingPanelLayout

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

    /// Returns a UIViewPropertyAnimator object to add/present the  panel to a position.
    ///
@@ -151,7 +150,7 @@ open class FloatingPanelController: UIViewController {

    /// The delegate of a panel controller object.
    @objc
-    public weak var delegate: (any FloatingPanelControllerDelegate)?{
+    public weak var delegate: FloatingPanelControllerDelegate?{
        didSet{
            didUpdateDelegate()
        }
@@ -159,15 +158,14 @@ open class FloatingPanelController: UIViewController {

    /// Returns the surface view managed by the controller object. It's the same as `self.view`.
    @objc
-    public var surfaceView: SurfaceView {
+    public var surfaceView: SurfaceView! {
        return floatingPanel.surfaceView
    }

    /// Returns the backdrop view managed by the controller object.
    @objc
-    public var backdropView: BackdropView {
-        set { floatingPanel.backdropView = newValue }
-        get { return floatingPanel.backdropView }
+    public var backdropView: BackdropView! {
+        return floatingPanel.backdropView
    }

    /// Returns the scroll view that the controller tracks.
@@ -199,7 +197,7 @@ open class FloatingPanelController: UIViewController {
    /// You need to call ``invalidateLayout()`` if you want to apply a new layout object into the panel
    /// immediately.
    @objc
-    public var layout: any FloatingPanelLayout {
+    public var layout: FloatingPanelLayout {
        get { _layout }
        set {
            _layout = newValue
@@ -212,7 +210,7 @@ open class FloatingPanelController: UIViewController {

    /// The behavior object that the controller manages
    @objc
-    public var behavior: any FloatingPanelBehavior {
+    public var behavior: FloatingPanelBehavior {
        get { _behavior }
        set {
            _behavior = newValue
@@ -283,19 +281,17 @@ open class FloatingPanelController: UIViewController {

    /// Initialize a newly created panel controller.
    @objc
-    public init(delegate: (any FloatingPanelControllerDelegate)? = nil) {
+    public init(delegate: FloatingPanelControllerDelegate? = nil) {
        super.init(nibName: nil, bundle: nil)
        self.delegate = delegate
        setUp()
    }

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

-        let initialLayout: any FloatingPanelLayout
+        let initialLayout: FloatingPanelLayout
        if let layout = delegate?.floatingPanel?(self, layoutFor: traitCollection) {
            initialLayout = layout
        } else {
@@ -312,7 +308,7 @@ open class FloatingPanelController: UIViewController {
        }
    }

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

    /// Creates the view that the controller manages.
    open override func loadView() {
@@ -345,7 +341,7 @@ open class FloatingPanelController: UIViewController {
        floatingPanel.adjustScrollContentInsetIfNeeded()
    }

-    open override func viewWillTransition(to size: CGSize, with coordinator: any UIViewControllerTransitionCoordinator) {
+    open override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
        super.viewWillTransition(to: size, with: coordinator)

        if self.view.bounds.size == size {
@@ -364,7 +360,7 @@ open class FloatingPanelController: UIViewController {
        }
    }

-    open override func willTransition(to newCollection: UITraitCollection, with coordinator: any UIViewControllerTransitionCoordinator) {
+    open override func willTransition(to newCollection: UITraitCollection, with coordinator: UIViewControllerTransitionCoordinator) {
        super.willTransition(to: newCollection, with: coordinator)

        if shouldUpdateLayout(from: traitCollection, to: newCollection) == false {
@@ -383,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
    }
@@ -400,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)")

@@ -484,18 +481,16 @@ open class FloatingPanelController: UIViewController {
        // 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
-            MainActor.assumeIsolated {
-                // 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 }
+            // 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)
-            }
+            self.update(safeAreaInsets: self.view.safeAreaInsets)
        }

        move(to: floatingPanel.layoutAdapter.initialState,
@@ -544,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 }
@@ -698,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 {
@@ -732,7 +739,7 @@ extension FloatingPanelController {

 // MARK: - Swizzling

-@MainActor private var originalDismissImp: IMP?
+private var originalDismissImp: IMP?
 private typealias DismissFunction = @convention(c) (AnyObject, Selector, Bool, (() -> Void)?) -> Void
 extension FloatingPanelController {
    private static let dismissSwizzling: Void = {
@@ -3,19 +3,14 @@
 import UIKit
 import os.log

+///
 /// The presentation model of FloatingPanel
 ///
 class Core: NSObject, UIGestureRecognizerDelegate {
    private weak var ownerVC: FloatingPanelController?

    let surfaceView: SurfaceView
-    var backdropView: BackdropView {
-        didSet {
-            backdropView.dismissalTapGestureRecognizer
-                .addTarget(self, action: #selector(handleBackdrop(tapGesture:)))
-        }
-    }
-
+    let backdropView: BackdropView
    let layoutAdapter: LayoutAdapter
    let behaviorAdapter: BehaviorAdapter

@@ -29,7 +24,6 @@ class Core: NSObject, UIGestureRecognizerDelegate {
                    scrollBounce = cur.bounces
                    scrollIndictorVisible = cur.showsVerticalScrollIndicator
                }
-                scrollLocked = false
            } else {
                if let pre = oldValue {
                    pre.isDirectionalLockEnabled = false
@@ -74,11 +68,10 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    private var scrollBounce = false
    private var scrollIndictorVisible = false
    private var scrollBounceThreshold: CGFloat = -30.0
-    private var scrollLocked = false

    // MARK: - Interface

-    init(_ vc: FloatingPanelController, layout: any FloatingPanelLayout, behavior: any FloatingPanelBehavior) {
+    init(_ vc: FloatingPanelController, layout: FloatingPanelLayout, behavior: FloatingPanelBehavior) {
        ownerVC = vc

        surfaceView = SurfaceView()
@@ -113,7 +106,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    }

    deinit {
-        moveAnimator?.stopAnimation(false)
+        // Release `NumericSpringAnimator.displayLink` from the run loop.
+        self.moveAnimator?.stopAnimation(false)
    }

    func move(to: FloatingPanelState, animated: Bool, completion: (() -> Void)? = nil) {
@@ -586,16 +580,11 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        // When no scrollView, nothing to handle.
        guard let scrollView = scrollView, scrollView.frame.contains(initialLocation) else { return false }

-        // Prevents moving a panel on swipe actions using _UISwipeActionPanGestureRecognizer.
-        // [Warning] Do not apply this to WKWebView. Since iOS 17.4, WKWebView has an additional pan
-        // gesture recognizer besides UIScrollViewPanGestureRecognizer. Applying this to WKWebView
-        // will block panel movements because another pan gesture isn't `scrollView.panGestureRecognizer`.
-        if let scrollGestureRecognizers = scrollView.gestureRecognizers,
-            scrollView is UITableView || scrollView is UICollectionView {
+        // For _UISwipeActionPanGestureRecognizer
+        if let scrollGestureRecognizers = scrollView.gestureRecognizers {
            for gesture in scrollGestureRecognizers {
-                guard gesture.state == .began || gesture.state == .changed else {
-                    continue
-                }
+                guard gesture.state == .began || gesture.state == .changed
+                else { continue }

                if gesture != scrollView.panGestureRecognizer {
                    return true
@@ -654,19 +643,14 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    }

    private func panningChange(with translation: CGPoint) {
+        os_log(msg, log: devLog, type: .debug, "panningChange -- translation = \(value(of: translation))")
        let pre = value(of: layoutAdapter.surfaceLocation)
        let diff = value(of: translation - initialTranslation)
        let next = pre + diff

-        os_log(msg, log: devLog, type: .debug, """
-        panningChange -- translation = \(value(of: translation)), diff = \(diff), pre = \(pre), next = \(next)
-        """)
-
-        layoutAdapter.updateInteractiveEdgeConstraint(
-            diff: diff,
-            scrollingContent: shouldScrollingContentInMoving(from: pre, to: next),
-            allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:)
-        )
+        layoutAdapter.updateInteractiveEdgeConstraint(diff: diff,
+                                                      scrollingContent: shouldScrollingContentInMoving(from: pre, to: next),
+                                                      allowsRubberBanding: behaviorAdapter.allowsRubberBanding(for:))

        let cur = value(of: layoutAdapter.surfaceLocation)

@@ -679,36 +663,31 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        }
    }

-    /// Determines if the content should scroll while the surface is moving from `cur` to `target`.
-    ///
-    /// - Note: `cur` argument starts from an anchor location of surface view in a state. For example,
-    /// it starts from zero if the state is full whose FloatingPanelLayoutAnchor.absoluteInset is zero
-    /// and there is no additional safe area insets like a navigation bar. Therefore, `cur` argument
-    /// can be minus if the absoluteInset is minus with such a condition.
-    private func shouldScrollingContentInMoving(from cur: CGFloat, to target: CGFloat) -> Bool {
+    private func shouldScrollingContentInMoving(from pre: CGFloat, to next: CGFloat) -> Bool {
        // Don't allow scrolling if the initial panning location is in the grabber area.
        if surfaceView.grabberAreaContains(initialLocation) {
            return false
        }
-        if let sv = scrollView, sv.panGestureRecognizer.state == .changed {
-            let (contentSize, bounds, alwaysBounceHorizontal, alwaysBounceVertical)
-                = (sv.contentSize, sv.bounds, sv.alwaysBounceHorizontal, sv.alwaysBounceVertical)
-
+        if let scrollView = scrollView, scrollView.panGestureRecognizer.state == .changed {
            switch layoutAdapter.position {
            case .top:
-                if cur < target, contentSize.height > bounds.height || alwaysBounceVertical {
+                if pre > .zero, pre < next,
+                    scrollView.contentSize.height > scrollView.bounds.height || scrollView.alwaysBounceVertical {
                    return true
                }
            case .left:
-                if cur < target, contentSize.width > bounds.width || alwaysBounceHorizontal {
+                if pre > .zero, pre < next,
+                    scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
                    return true
                }
            case .bottom:
-                if cur > target, contentSize.height > bounds.height || alwaysBounceVertical {
+                if pre > .zero, pre > next,
+                    scrollView.contentSize.height > scrollView.bounds.height || scrollView.alwaysBounceVertical {
                    return true
                }
            case .right:
-                if cur > target, contentSize.width > bounds.width || alwaysBounceHorizontal {
+                if pre > .zero, pre > next,
+                    scrollView.contentSize.width > scrollView.bounds.width || scrollView.alwaysBounceHorizontal {
                    return true
                }
            }
@@ -749,7 +728,13 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        }

        guard shouldAttract(to: target) else {
-            self.endWithoutAttraction(target)
+            self.updateLayout(to: target)
+            self.unlockScrollView()
+            // The `floatingPanelDidEndDragging(_:willAttract:)` must be called after the state property changes.
+            // This allows library users to get the correct state in the delegate method.
+            if let vc = ownerVC {
+                vc.delegate?.floatingPanelDidEndDragging?(vc, willAttract: false)
+            }
            return
        }

@@ -892,17 +877,6 @@ class Core: NSObject, UIGestureRecognizerDelegate {
        return true
    }

-    func endWithoutAttraction(_ target: FloatingPanelState) {
-        self.state = target
-        self.updateLayout(to: target)
-        self.unlockScrollView()
-        // The `floatingPanelDidEndDragging(_:willAttract:)` must be called after the state property changes.
-        // This allows library users to get the correct state in the delegate method.
-        if let vc = ownerVC {
-            vc.delegate?.floatingPanelDidEndDragging?(vc, willAttract: false)
-        }
-    }
-
    private func startAttraction(to state: FloatingPanelState, with velocity: CGPoint, completion: @escaping (() -> Void)) {
        os_log(msg, log: devLog, type: .debug, "startAnimation to \(state) -- velocity = \(value(of: velocity))")
        guard let vc = ownerVC else { return }
@@ -1077,25 +1051,29 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    private func lockScrollView(strict: Bool = false) {
        guard let scrollView = scrollView else { return }

-        if scrollLocked {
-            os_log(msg, log: devLog, type: .debug, "Already scroll locked")
-            return
-        }
-        scrollBounce = scrollView.bounces
        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")

-
-        scrollLocked = true
        scrollView.isDirectionalLockEnabled = true
+
        switch layoutAdapter.position {
        case .top, .bottom:
            scrollIndictorVisible = scrollView.showsVerticalScrollIndicator
@@ -1107,14 +1085,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
    }

    private func unlockScrollView() {
-        guard let scrollView = scrollView else { return }
-        if !scrollLocked {
-            os_log(msg, log: devLog, type: .debug, "Already scroll unlocked.")
-            return
-        }
+        guard let scrollView = scrollView, scrollView.isLocked else { return }
        os_log(msg, log: devLog, type: .debug, "unlock scroll view")

-        scrollLocked = false
        scrollView.bounces = scrollBounce
        scrollView.isDirectionalLockEnabled = false
        switch layoutAdapter.position {
@@ -1245,7 +1218,7 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
    ///
    /// - Note: The delegate is used by FloatingPanel itself. If you set your own delegate object, an
    /// exception is raised. If you want to handle the methods of UIGestureRecognizerDelegate, you can use `delegateProxy`.
-    public override weak var delegate: (any UIGestureRecognizerDelegate)? {
+    public override weak var delegate: UIGestureRecognizerDelegate? {
        get {
            return super.delegate
        }
@@ -1266,7 +1239,7 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
    /// The default object implementing a set methods of the delegate of the gesture recognizer.
    ///
    /// Use this property with ``delegateProxy`` when you need to use the default gesture behaviors in a proxy implementation.
-    public var delegateOrigin: any UIGestureRecognizerDelegate {
+    public var delegateOrigin: UIGestureRecognizerDelegate {
        return floatingPanel
    }

@@ -1274,7 +1247,7 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {
    ///
    /// `UIGestureRecognizerDelegate` methods implementing by this object are called instead of the default delegate,
    ///  ``delegateOrigin``.
-    public weak var delegateProxy: (any UIGestureRecognizerDelegate)? {
+    public weak var delegateProxy: UIGestureRecognizerDelegate? {
        didSet {
            self.delegate = floatingPanel?.panGestureDelegateRouter // Update the cached IMP
        }
@@ -1307,7 +1280,7 @@ public final class FloatingPanelPanGestureRecognizer: UIPanGestureRecognizer {

 // MARK: - Animator

-private final class NumericSpringAnimator: NSObject,  @unchecked Sendable  {
+private class NumericSpringAnimator: NSObject {
    struct Data {
        let value: CGFloat
        let velocity: CGFloat
@@ -36,7 +36,6 @@ extension CGPoint {

 // MARK: - UIKit

-@MainActor
 protocol LayoutGuideProvider {
    var topAnchor: NSLayoutYAxisAnchor { get }
    var leftAnchor: NSLayoutXAxisAnchor { get }
@@ -110,6 +109,12 @@ extension UIGestureRecognizer.State: CustomDebugStringConvertible {
 #endif

 extension UIScrollView {
+    var isLocked: Bool {
+        return !showsVerticalScrollIndicator && !bounces && isDirectionalLockEnabled
+    }
+    var isLooselyLocked: Bool {
+        return !showsVerticalScrollIndicator && isDirectionalLockEnabled
+    }
    var fp_contentOffsetMax: CGPoint {
        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.8.4</string>
+	<string>2.8.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
@@ -4,7 +4,6 @@ import UIKit
 import os.log

 /// An interface for generating layout information for a panel.
-@MainActor
@objc public protocol FloatingPanelLayout {
    /// Returns the position of a panel in a `FloatingPanelController` view .
    @objc var position: FloatingPanelPosition { get }
@@ -13,7 +12,7 @@ import os.log
    @objc var initialState: FloatingPanelState { get }

    /// Returns the layout anchors to specify the snapping locations for each state.
-    @objc var anchors: [FloatingPanelState: any FloatingPanelLayoutAnchoring] { get }
+    @objc var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring] { get }

    /// Returns layout constraints to determine the cross dimension of a panel.
    @objc optional func prepareLayout(surfaceView: UIView, in view: UIView) -> [NSLayoutConstraint]
@@ -32,7 +31,7 @@ open class FloatingPanelBottomLayout: NSObject, FloatingPanelLayout {
        return .half
    }

-    open var anchors: [FloatingPanelState: any FloatingPanelLayoutAnchoring]  {
+    open var anchors: [FloatingPanelState: FloatingPanelLayoutAnchoring]  {
        return [
            .full: FloatingPanelLayoutAnchor(absoluteInset: 18.0, edge: .top, referenceGuide: .safeArea),
            .half: FloatingPanelLayoutAnchor(fractionalInset: 0.5, edge: .bottom, referenceGuide: .safeArea),
@@ -61,12 +60,11 @@ struct LayoutSegment {
    let upper: FloatingPanelState?
 }

-@MainActor
 class LayoutAdapter {
    private unowned var vc: FloatingPanelController
    private let defaultLayout = FloatingPanelBottomLayout()

-    fileprivate var layout: any FloatingPanelLayout {
+    fileprivate var layout: FloatingPanelLayout {
        didSet {
            surfaceView.position = position
        }
@@ -289,7 +287,7 @@ class LayoutAdapter {
        return offset.rounded(by: surfaceView.fp_displayScale)
    }

-    private var hiddenAnchor: any FloatingPanelLayoutAnchoring {
+    private var hiddenAnchor: FloatingPanelLayoutAnchoring {
        switch position {
        case .top:
            return FloatingPanelLayoutAnchor(absoluteInset: -100, edge: .top, referenceGuide: .superview)
@@ -302,7 +300,7 @@ class LayoutAdapter {
        }
    }

-    init(vc: FloatingPanelController, layout: any FloatingPanelLayout) {
+    init(vc: FloatingPanelController, layout: FloatingPanelLayout) {
        self.vc = vc
        self.layout = layout
    }
@@ -406,7 +404,7 @@ class LayoutAdapter {
        }
    }

-    private func referenceEdge(of anchor: any FloatingPanelLayoutAnchoring) -> FloatingPanelReferenceEdge {
+    private func referenceEdge(of anchor: FloatingPanelLayoutAnchoring) -> FloatingPanelReferenceEdge {
        switch anchor {
        case is FloatingPanelIntrinsicLayoutAnchor,
            is FloatingPanelAdaptiveLayoutAnchor:
@@ -548,7 +546,7 @@ class LayoutAdapter {
        NSLayoutConstraint.deactivate(constraint: interactionConstraint)
        interactionConstraint = nil

-        let layoutGuideProvider: any LayoutGuideProvider
+        let layoutGuideProvider: LayoutGuideProvider
        switch anchor.referenceGuide {
        case .safeArea:
            layoutGuideProvider = vc.view.safeAreaLayoutGuide
@@ -856,7 +854,7 @@ extension LayoutAdapter {
 }

 extension FloatingPanelController {
-    var _layout: any FloatingPanelLayout {
+    var _layout: FloatingPanelLayout {
        get {
            floatingPanel.layoutAdapter.layout
        }
@@ -3,7 +3,6 @@
 import UIKit

 /// An interface for implementing custom layout anchor objects.
-@MainActor
@objc public protocol FloatingPanelLayoutAnchoring {
    var referenceGuide: FloatingPanelLayoutReferenceGuide { get }
    func layoutConstraints(_ fpc: FloatingPanelController, for position: FloatingPanelPosition) -> [NSLayoutConstraint]
@@ -18,7 +17,7 @@ import UIKit
    /// positioning.
    ///
    /// - Parameters:
-    ///     - absoluteInset: An absolute offset to attach the panel from the edge.
+    ///     - absoluteOffset: An absolute offset to attach the panel from the edge.
    ///     - edge: Specify the edge of ``FloatingPanelController``'s view. This is the staring point of the offset.
    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
    @objc public init(absoluteInset: CGFloat, edge: FloatingPanelReferenceEdge, referenceGuide: FloatingPanelLayoutReferenceGuide) {
@@ -35,7 +34,7 @@ import UIKit
    /// 1.0 represents a distance to the opposite edge.
    ///
    /// - Parameters:
-    ///     - fractionalInset: A fractional value of the size of ``FloatingPanelController``'s view to attach the panel from the edge.
+    ///     - fractionalOffset: A fractional value of the size of ``FloatingPanelController``'s view to attach the panel from the edge.
    ///     - edge: Specify the edge of ``FloatingPanelController``'s view. This is the staring point of the offset.
    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
    @objc public init(fractionalInset: CGFloat, edge: FloatingPanelReferenceEdge, referenceGuide: FloatingPanelLayoutReferenceGuide) {
@@ -66,7 +65,7 @@ public extension FloatingPanelLayoutAnchor {
        }
    }

-    private func layoutConstraints(_ layoutGuide: any LayoutGuideProvider, for edgeAnchor: NSLayoutYAxisAnchor) -> [NSLayoutConstraint] {
+    private func layoutConstraints(_ layoutGuide: LayoutGuideProvider, for edgeAnchor: NSLayoutYAxisAnchor) -> [NSLayoutConstraint] {
        switch referenceEdge {
        case .top:
            if isAbsolute {
@@ -85,7 +84,7 @@ public extension FloatingPanelLayoutAnchor {
        }
    }

-    private func layoutConstraints(_ layoutGuide: any LayoutGuideProvider, for edgeAnchor: NSLayoutXAxisAnchor) -> [NSLayoutConstraint] {
+    private func layoutConstraints(_ layoutGuide: LayoutGuideProvider, for edgeAnchor: NSLayoutXAxisAnchor) -> [NSLayoutConstraint] {
        switch referenceEdge {
        case .left:
            if isAbsolute {
@@ -116,8 +115,8 @@ public extension FloatingPanelLayoutAnchor {
    /// - Parameters:
    ///     - absoluteOffset: An absolute offset from the content size in the main dimension(i.e. y axis for a bottom panel) to attach the panel.
    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
-    @objc public init(absoluteOffset: CGFloat, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
-        self.offset = absoluteOffset
+    @objc public init(absoluteOffset offset: CGFloat, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
+        self.offset = offset
        self.referenceGuide = referenceGuide
        self.isAbsolute = true
    }
@@ -130,8 +129,8 @@ public extension FloatingPanelLayoutAnchor {
    /// - Parameters:
    ///     - fractionalOffset: A fractional offset of the content size in the main dimension(i.e. y axis for a bottom panel) to attach the panel.
    ///     - referenceGuide: The rectangular area to lay out the content. If it's set to `.safeArea`, the panel content lays out inside the safe area of its ``FloatingPanelController``'s view.
-    @objc public init(fractionalOffset: CGFloat, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
-        self.offset = fractionalOffset
+    @objc public init(fractionalOffset offset: CGFloat, referenceGuide: FloatingPanelLayoutReferenceGuide = .safeArea) {
+        self.offset = offset
        self.referenceGuide = referenceGuide
        self.isAbsolute = false
    }
@@ -178,12 +177,12 @@ public extension FloatingPanelIntrinsicLayoutAnchor {
    ///
    /// - Warning: If ``contentBoundingGuide`` is set to none, the panel may expand out of the screen size, depending on the intrinsic size of its content.
    @objc public init(
-        absoluteOffset: CGFloat,
+        absoluteOffset offset: CGFloat,
        contentLayout: UILayoutGuide,
        referenceGuide: FloatingPanelLayoutReferenceGuide,
        contentBoundingGuide: FloatingPanelLayoutContentBoundingGuide = .none
    ) {
-        self.offset = absoluteOffset
+        self.offset = offset
        self.contentLayoutGuide = contentLayout
        self.referenceGuide = referenceGuide
        self.contentBoundingGuide = contentBoundingGuide
@@ -205,12 +204,12 @@ public extension FloatingPanelIntrinsicLayoutAnchor {
    ///
    /// - Warning: If ``contentBoundingGuide`` is set to none, the panel may expand out of the screen size, depending on the intrinsic size of its content.
    @objc public init(
-        fractionalOffset: CGFloat,
+        fractionalOffset offset: CGFloat,
        contentLayout: UILayoutGuide,
        referenceGuide: FloatingPanelLayoutReferenceGuide,
        contentBoundingGuide: FloatingPanelLayoutContentBoundingGuide = .none
    ) {
-        self.offset = fractionalOffset
+        self.offset = offset
        self.contentLayoutGuide = contentLayout
        self.referenceGuide = referenceGuide
        self.contentBoundingGuide = contentBoundingGuide
@@ -3,7 +3,6 @@
 import UIKit

 /// Constants that specify the edge of the container of a panel.
-@MainActor
@objc public enum FloatingPanelReferenceEdge: Int {
    case top
    case left
@@ -29,14 +28,13 @@ extension FloatingPanelReferenceEdge {
 }

 /// A representation to specify a rectangular area to lay out a panel.
-@MainActor
@objc public enum FloatingPanelLayoutReferenceGuide: Int {
    case superview = 0
    case safeArea = 1
 }

 extension FloatingPanelLayoutReferenceGuide {
-    func layoutGuide(vc: UIViewController) -> any LayoutGuideProvider {
+    func layoutGuide(vc: UIViewController) -> LayoutGuideProvider {
        switch self {
        case .safeArea:
            return vc.view.safeAreaLayoutGuide
@@ -47,7 +45,6 @@ extension FloatingPanelLayoutReferenceGuide {
 }

 /// A representation to specify a bounding box which limit the content size of a panel.
-@MainActor
@objc public enum FloatingPanelLayoutContentBoundingGuide: Int {
    case none = 0
    case superview = 1
@@ -55,7 +52,7 @@ extension FloatingPanelLayoutReferenceGuide {
 }

 extension FloatingPanelLayoutContentBoundingGuide {
-    func layoutGuide(_ fpc: FloatingPanelController) -> (any LayoutGuideProvider)? {
+    func layoutGuide(_ fpc: FloatingPanelController) -> LayoutGuideProvider? {
        switch self {
        case .superview:
            return fpc.view
@@ -3,11 +3,11 @@
 import os.log

 let msg = StaticString("%{public}@")
-nonisolated(unsafe) let sysLog = OSLog(subsystem: Logging.subsystem, category: Logging.category)
+let sysLog = OSLog(subsystem: Logging.subsystem, category: Logging.category)
 #if FP_LOG
 let devLog = OSLog(subsystem: Logging.subsystem, category: "\(Logging.category):dev")
 #else
-nonisolated(unsafe) let devLog = OSLog.disabled
+let devLog = OSLog.disabled
 #endif

 struct Logging {
@@ -3,7 +3,6 @@
 import UIKit

 /// Constants describing the position of a panel in a screen
-@MainActor
@objc public enum FloatingPanelPosition: Int {
    case top
    case left
@@ -26,7 +25,7 @@ extension FloatingPanelPosition {
        }
    }

-    func mainDimensionAnchor(_ layoutGuide: any LayoutGuideProvider) -> NSLayoutDimension {
+    func mainDimensionAnchor(_ layoutGuide: LayoutGuideProvider) -> NSLayoutDimension {
        switch self {
        case .top, .bottom: return layoutGuide.heightAnchor
        case .left, .right: return layoutGuide.widthAnchor
@@ -4,7 +4,7 @@ import Foundation

 /// An object that represents the display state of a panel in a screen.
@objc
-public final class FloatingPanelState: NSObject, NSCopying, RawRepresentable, Sendable {
+open class FloatingPanelState: NSObject, NSCopying, RawRepresentable {
    public typealias RawValue = String

    required public init?(rawValue: RawValue) {
@@ -56,11 +56,11 @@ public class SurfaceAppearance: NSObject {
    /// Defaults to `.circular`.
    @available(iOS 13.0, *)
    public var cornerCurve: CALayerCornerCurve {
-        get { _cornerCurve as? CALayerCornerCurve ?? .circular }
+        get { _cornerCurve ?? .circular }
        set { _cornerCurve = newValue }
    }

-    private var _cornerCurve: Any?
+    private var _cornerCurve: CALayerCornerCurve?

    /// An array of shadows used to create drop shadows underneath a surface view.
    public var shadows: [Shadow] = [Shadow()]
@@ -418,30 +418,12 @@ public class SurfaceView: UIView {
        let leftConstraint = contentView.leftAnchor.constraint(equalTo: leftAnchor, constant: containerMargins.left + contentPadding.left)
        let rightConstraint = rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: containerMargins.right + contentPadding.right)
        let bottomConstraint = bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: containerMargins.bottom + contentPadding.bottom)
-
-        var constraints = [
+        NSLayoutConstraint.activate([
            topConstraint,
            leftConstraint,
            rightConstraint,
-            bottomConstraint
-        ]
-
-        // This constraint is for UICollectionView using UICollectionViewCompositionalLayout.
-        // It's seemingly obvious, but the UICollectionView doesn't work without setting it. (#628)
-        switch position {
-        case .top, .bottom:
-            constraints += [
-                heightAnchor.constraint(greaterThanOrEqualToConstant: 1.0)
-            ]
-        case .left, .right:
-            constraints += [
-                widthAnchor.constraint(greaterThanOrEqualToConstant: 1.0)
-            ]
-        }
-
-        NSLayoutConstraint.activate(
-            constraints
-            .map {
+            bottomConstraint,
+        ].map {
            switch mode {
            case .static:
                $0.priority = .required
@@ -5,11 +5,11 @@ import UIKit
 class ModalTransition: NSObject, UIViewControllerTransitioningDelegate {
    func animationController(forPresented presented: UIViewController,
                             presenting: UIViewController,
-                             source: UIViewController) -> (any UIViewControllerAnimatedTransitioning)? {
+                             source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
        return ModalPresentTransition()
    }

-    func animationController(forDismissed dismissed: UIViewController) -> (any UIViewControllerAnimatedTransitioning)? {
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
        return ModalDismissTransition()
    }

@@ -81,7 +81,7 @@ class PresentationController: UIPresentationController {
 }

 class ModalPresentTransition: NSObject, UIViewControllerAnimatedTransitioning {
-    func transitionDuration(using transitionContext: (any UIViewControllerContextTransitioning)?) -> TimeInterval {
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
        guard
            let fpc = transitionContext?.viewController(forKey: .to) as? FloatingPanelController
        else { fatalError()}
@@ -90,7 +90,7 @@ class ModalPresentTransition: NSObject, UIViewControllerAnimatedTransitioning {
        return TimeInterval(animator.duration)
    }

-    func interruptibleAnimator(using transitionContext: any UIViewControllerContextTransitioning) -> any UIViewImplicitlyAnimating {
+    func interruptibleAnimator(using transitionContext: UIViewControllerContextTransitioning) -> UIViewImplicitlyAnimating {
        guard
            let fpc = transitionContext.viewController(forKey: .to) as? FloatingPanelController
        else { fatalError() }
@@ -110,13 +110,13 @@ class ModalPresentTransition: NSObject, UIViewControllerAnimatedTransitioning {
        return transitionAnimator
    }

-    func animateTransition(using transitionContext: any UIViewControllerContextTransitioning) {
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
        self.interruptibleAnimator(using: transitionContext).startAnimation()
    }
 }

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

-    func interruptibleAnimator(using transitionContext: any UIViewControllerContextTransitioning) -> any UIViewImplicitlyAnimating {
+    func interruptibleAnimator(using transitionContext: UIViewControllerContextTransitioning) -> UIViewImplicitlyAnimating {
        guard
            let fpc = transitionContext.viewController(forKey: .from) as? FloatingPanelController
        else { fatalError() }
@@ -142,7 +142,7 @@ class ModalDismissTransition: NSObject, UIViewControllerAnimatedTransitioning {
        return fpc.transitionAnimator!
    }

-    func animateTransition(using transitionContext: any UIViewControllerContextTransitioning) {
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
        self.interruptibleAnimator(using: transitionContext).startAnimation()
    }
 }
@@ -64,7 +64,6 @@ class ControllerTests: XCTestCase {
    }

    func test_moveTo() {
-        let timeout = 3.0
        let delegate = FloatingPanelTestDelegate()
        let fpc = FloatingPanelController(delegate: delegate)
        XCTAssertEqual(delegate.position, .hidden)
@@ -103,7 +102,7 @@ class ControllerTests: XCTestCase {
            }
            XCTAssertEqual(fpc.state, .full)
            XCTAssertEqual(delegate.position, .full)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)
        }

        XCTContext.runActivity(named: "move to half(animated)") { act in
@@ -114,7 +113,7 @@ class ControllerTests: XCTestCase {
            }
            XCTAssertEqual(fpc.state, .half)
            XCTAssertEqual(delegate.position, .half)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)
        }

        XCTContext.runActivity(named: "move to tip(animated)") { act in
@@ -125,7 +124,7 @@ class ControllerTests: XCTestCase {
            }
            XCTAssertEqual(fpc.state, .tip)
            XCTAssertEqual(delegate.position, .tip)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)
        }

        fpc.move(to: .hidden, animated: true)
@@ -138,7 +137,6 @@ class ControllerTests: XCTestCase {
        class MyFloatingPanelTop2BottomLayout: FloatingPanelTop2BottomTestLayout {
            override var initialState: FloatingPanelState { return .half }
        }
-        let timeout = 3.0
        let delegate = FloatingPanelTestDelegate()
        let fpc = FloatingPanelController(delegate: delegate)
        fpc.layout = MyFloatingPanelTop2BottomLayout()
@@ -177,7 +175,7 @@ class ControllerTests: XCTestCase {
            }
            XCTAssertEqual(fpc.state, .full)
            XCTAssertEqual(delegate.position, .full)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)
        }

        XCTContext.runActivity(named: "move to half(animated)") { act in
@@ -188,7 +186,7 @@ class ControllerTests: XCTestCase {
            }
            XCTAssertEqual(fpc.state, .half)
            XCTAssertEqual(delegate.position, .half)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)
        }

        XCTContext.runActivity(named: "move to tip(animated)") { act in
@@ -199,7 +197,7 @@ class ControllerTests: XCTestCase {
            }
            XCTAssertEqual(fpc.state, .tip)
            XCTAssertEqual(delegate.position, .tip)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)
        }

        fpc.move(to: .hidden, animated: true)
@@ -225,7 +223,6 @@ class ControllerTests: XCTestCase {
    }

    func test_moveTo_didMoveDelegate() {
-        let timeout = 3.0
        let delegate = FloatingPanelTestDelegate()
        let fpc = FloatingPanelController(delegate: delegate)
        XCTAssertEqual(delegate.position, .hidden)
@@ -240,7 +237,7 @@ class ControllerTests: XCTestCase {
                exp.fulfill()
            }
            fpc.move(to: .full, animated: false)
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)

            XCTAssertEqual(count, 1)
        }
@@ -256,7 +253,7 @@ class ControllerTests: XCTestCase {
            fpc.move(to: .half, animated: true) {
                exp.fulfill()
            }
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)

            XCTAssertGreaterThan(count, 1)
        }
@@ -273,7 +270,7 @@ class ControllerTests: XCTestCase {
                    exp.fulfill()
                }
            }
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)

            XCTAssertEqual(count, 1)
        }
@@ -291,7 +288,7 @@ class ControllerTests: XCTestCase {
                    exp.fulfill()
                }
            }
-            wait(for: [exp], timeout: timeout)
+            wait(for: [exp], timeout: 1.0)

            XCTAssertGreaterThan(count, 1)
        }
@@ -209,8 +209,6 @@ class CoreTests: XCTestCase {
            return floor(fpc.backdropView.alpha * 1e+06) / 1e+06
        }

-        let timeout = 3.0
-
        let delegate = TestDelegate()
        let fpc = FloatingPanelController(delegate: delegate)
        fpc.layout = BackdropTestLayout()
@@ -230,14 +228,14 @@ class CoreTests: XCTestCase {
        fpc.move(to: .full, animated: true) {
            exp1.fulfill()
        }
-        wait(for: [exp1], timeout: timeout)
+        wait(for: [exp1], timeout: 1.0)
        XCTAssertEqual(_floor(fpc.backdropView.alpha), 0.3)

        let exp2 = expectation(description: "move to half with animation")
        fpc.move(to: .half, animated: true) {
            exp2.fulfill()
        }
-        wait(for: [exp2], timeout: timeout)
+        wait(for: [exp2], timeout: 1.0)
        XCTAssertEqual(fpc.backdropView.alpha, 0.0)

        // Test a content mode change of FloatingPanelController
@@ -248,7 +246,7 @@ class CoreTests: XCTestCase {
        }
        fpc.contentMode = .fitToBounds
        XCTAssertEqual(fpc.backdropView.alpha, 0.0)  // Must not affect the backdrop alpha by changing the content mode
-        wait(for: [exp3], timeout: timeout)
+        wait(for: [exp3], timeout: 1.0)
        XCTAssertEqual(_floor(fpc.backdropView.alpha), 0.3)

        // Test a size class change of FloatingPanelController.view
@@ -915,26 +913,6 @@ class CoreTests: XCTestCase {
            )
        }
    }
-
-    func test_handleGesture_endWithoutAttraction() throws {
-        class Delegate: FloatingPanelControllerDelegate {
-            var willAttract: Bool?
-            func floatingPanelDidEndDragging(_ fpc: FloatingPanelController, willAttract attract: Bool) {
-                willAttract = attract
-            }
-        }
-        let fpc = FloatingPanelController()
-        let delegate = Delegate()
-        fpc.showForTest()
-        fpc.delegate = delegate
-        XCTAssertEqual(fpc.state, .half)
-
-        fpc.floatingPanel.endWithoutAttraction(.full)
-
-        XCTAssertEqual(fpc.state, .full)
-        XCTAssertEqual(fpc.surfaceLocation(for: .full).y, fpc.surfaceLocation.y)
-        XCTAssertEqual(delegate.willAttract, false)
-    }
 }

 private class FloatingPanelLayout3Positions: FloatingPanelTestLayout {