Hide sheet when near the bottom

aheze · Jun 6, 2022 · 1a115f9 · 1a115f9
1 parent 8352aa4
commit 1a115f9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/Example/SplitSheetExample/Assets.xcassets/Image.imageset/Contents.json b/Example/SplitSheetExample/Assets.xcassets/Image.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "dynamic-wang-KZuZAaEojq4-unsplash.jpg",
+      "filename" : "harold-wainwright-aEK8X33l7V4-unsplash (1).jpg",
       "idiom" : "universal",
       "scale" : "1x"
     },

diff --git a/...eetExample/Assets.xcassets/Image.imageset/dynamic-wang-KZuZAaEojq4-unsplash.jpg b/...eetExample/Assets.xcassets/Image.imageset/dynamic-wang-KZuZAaEojq4-unsplash.jpg
diff --git a/...e/Assets.xcassets/Image.imageset/harold-wainwright-aEK8X33l7V4-unsplash (1).jpg b/...e/Assets.xcassets/Image.imageset/harold-wainwright-aEK8X33l7V4-unsplash (1).jpg
diff --git a/Example/SplitSheetExample/ViewController.swift b/Example/SplitSheetExample/ViewController.swift
@@ -32,13 +32,13 @@ class ViewController: UIViewController {
         super.viewDidLoad()
 
         /// If true, `mainViewController` will shift up as the sheet is shown.
-        splitSheetController.displaceContent = false
+        splitSheetController.displaceContent = true
 
         /// Show a grabber handle.
         splitSheetController.showHandle = true
 
         /// The minimum sheet height.
-        splitSheetController.minimumSheetHeight = CGFloat(300)
+        splitSheetController.minimumSheetHeight = CGFloat(400)
 
         /// When the sheet is shown and dragged within this limit, the sheet will bounce back.
         splitSheetController.snappingDistance = CGFloat(150)
@@ -50,7 +50,7 @@ class ViewController: UIViewController {
         splitSheetController.swipeUpToShowAllowed = true
 
         /// Override the status bar color.
-        splitSheetController.statusBarStyle = UIStatusBarStyle.lightContent
+        splitSheetController.statusBarStyle = UIStatusBarStyle.default
 
         /// Add the sheet.
         embed(splitSheetController, inside: view)
@@ -62,6 +62,7 @@ class MainViewController: UIViewController {
         /// image credits:
         /// https://unsplash.com/photos/aEK8X33l7V4
         /// https://unsplash.com/photos/bokTMevSgxY
+        /// https://unsplash.com/photos/KZuZAaEojq4
         let image = UIImage(named: "Image")
         let imageView = UIImageView(image: image)
         imageView.contentMode = .scaleAspectFill

diff --git a/Sources/SplitSheet.swift b/Sources/SplitSheet.swift
@@ -279,6 +279,7 @@ extension SplitSheetController: UIScrollViewDelegate {
         let detents = [hiddenDetent, shownDetent, expandedDetent]
         let predictedContentOffset = targetContentOffset.pointee.y /// Use the system-predicted target content to take care of flicking with the finger.
 
+        print("distanceToShown: \(distanceToShown)")
         switch velocity.y {
         /// When the velocity is negative (scrolled down.)
         case ..<0:
@@ -298,11 +299,18 @@ extension SplitSheetController: UIScrollViewDelegate {
 
         /// Handle velocity == 0 case.
         default:
+
+            /// Ignore if sheet was released near the `expanded` detent.
             guard distanceToShown > -snappingDistance else { return }
+
             if distanceToShown < snappingDistance {
                 targetContentOffset.pointee.y = minimumSheetHeight
-            } else {}
+            } else {
+                targetContentOffset.pointee.y = 0 /// Hide if near the bottom.
+            }
         }
+
+        /// When the offset is 0, the sheet is hidden. Otherwise, it's shown.
         updateShowing(targetContentOffset.pointee.y != 0)
     }
 }