Fix bounce when expanding sheet on ios (#5627)

bluesky-social · Oct 6, 2024 · 686dfa5 · 686dfa5
1 parent 0ebf636
commit 686dfa5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/bottom-sheet/ios/SheetView.swift b/modules/bottom-sheet/ios/SheetView.swift
@@ -66,6 +66,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
       }
     }
   }
+  private var prevLayoutDetentIdentifier: UISheetPresentationController.Detent.Identifier?
 
   // MARK: - Lifecycle
 
@@ -143,11 +144,13 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   }
 
   func updateLayout() {
-    if let contentHeight = self.innerView?.subviews.first?.frame.size.height {
+    if self.prevLayoutDetentIdentifier == self.selectedDetentIdentifier,
+       let contentHeight = self.innerView?.subviews.first?.frame.size.height {
       self.sheetVc?.updateDetents(contentHeight: self.clampHeight(contentHeight),
-                               preventExpansion: self.preventExpansion)
+                                  preventExpansion: self.preventExpansion)
       self.selectedDetentIdentifier = self.sheetVc?.getCurrentDetentIdentifier()
     }
+    self.prevLayoutDetentIdentifier = self.selectedDetentIdentifier
   }
 
   func dismiss() {

diff --git a/modules/bottom-sheet/ios/SheetViewController.swift b/modules/bottom-sheet/ios/SheetViewController.swift
@@ -62,7 +62,7 @@ class SheetViewController: UIViewController {
       }
     }
   }
-  
+
   func getCurrentDetentIdentifier() -> UISheetPresentationController.Detent.Identifier? {
     guard let sheet = self.sheetPresentationController else {
       return nil
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ class SheetViewController: UIViewController { @@
           }
         }
       }
       func getCurrentDetentIdentifier() -> UISheetPresentationController.Detent.Identifier? {
         guard let sheet = self.sheetPresentationController else {
           return nil
@@ Expand Down @@