@swmansion/react-native-bottom-sheet 0.7.0-next.3 → 0.7.0-next.5

package/android/src/main/java/com/swmansion/reactnativebottomsheet/BottomSheetView.kt

@@ -408,8 +408,19 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   fun destroy() {
     activeAnimation?.cancel()
+    activeAnimation = null
     stopChoreographer()
     velocityTracker?.recycle()
     velocityTracker = null
+    detentSpecs = emptyList()
+    targetIndex = 0
+    pendingIndex = null
+    hasLaidOut = false
+    isPanning = false
+    initialTouchY = 0f
+    lastTouchY = 0f
+    activePointerId = MotionEvent.INVALID_POINTER_ID
+    sheetContainer.translationY = 0f
+    sheetContainer.removeAllViews()
   }
 }

package/ios/BottomSheetComponentView.mm

@@ -92,6 +92,12 @@ using namespace facebook::react;
   }
 }
 
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  [_sheetView resetSheetState];
+}
+
 @end
 
 Class<RCTComponentViewProtocol> BottomSheetViewCls(void)

package/ios/BottomSheetContentView.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setDetentIndex:(NSInteger)newIndex;
 - (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index;
 - (void)unmountChildComponentView:(UIView *)childView;
+- (void)resetSheetState;
 
 @end
 

package/ios/BottomSheetContentView.mm

@@ -60,6 +60,11 @@
   [_impl unmountChildComponentView:childView];
 }
 
+- (void)resetSheetState
+{
+  [_impl resetSheetState];
+}
+
 - (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didChangeIndex:(NSInteger)index
 {
   [self.delegate bottomSheetView:self didChangeIndex:index];

package/ios/RNSBottomSheetHostingView.swift

@@ -28,6 +28,7 @@ public final class RNSBottomSheetHostingView: UIView {
   private var pendingIndex: Int?
   private var hasLaidOut = false
   private var isPanning = false
+  private var isContentInteractionDisabled = false
 
   public override init(frame: CGRect) {
     super.init(frame: frame)
@@ -40,6 +41,9 @@ public final class RNSBottomSheetHostingView: UIView {
 
     panGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
     panGesture.delegate = self
+    panGesture.cancelsTouchesInView = true
+    panGesture.delaysTouchesBegan = true
+    panGesture.delaysTouchesEnded = true
     sheetContainer.addGestureRecognizer(panGesture)
   }
 
@@ -128,6 +132,22 @@ public final class RNSBottomSheetHostingView: UIView {
     childView.removeFromSuperview()
   }
 
+  public func resetSheetState() {
+    activeAnimator?.stopAnimation(true)
+    activeAnimator = nil
+    stopDisplayLink()
+    detentSpecs = []
+    targetIndex = 0
+    pendingIndex = nil
+    hasLaidOut = false
+    isPanning = false
+    setContentInteractionEnabled(true)
+    sheetContainer.transform = .identity
+    for subview in sheetContainer.subviews {
+      subview.removeFromSuperview()
+    }
+  }
+
   private func detent(at index: Int) -> DetentSpec {
     guard detentSpecs.indices.contains(index) else {
       return DetentSpec(height: 0, programmatic: false)
@@ -166,6 +186,17 @@ public final class RNSBottomSheetHostingView: UIView {
     displayLink = nil
   }
 
+  private func setContentInteractionEnabled(_ isEnabled: Bool) {
+    if isContentInteractionDisabled == !isEnabled {
+      return
+    }
+
+    for subview in sheetContainer.subviews {
+      subview.isUserInteractionEnabled = isEnabled
+    }
+    isContentInteractionDisabled = !isEnabled
+  }
+
   @objc private func displayLinkFired() {
     emitPosition()
   }
@@ -194,6 +225,7 @@ public final class RNSBottomSheetHostingView: UIView {
       self.stopDisplayLink()
       self.emitPosition()
       self.activeAnimator = nil
+      self.setContentInteractionEnabled(true)
       self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
     }
     animator.startAnimation()
@@ -207,6 +239,7 @@ public final class RNSBottomSheetHostingView: UIView {
     switch gesture.state {
     case .began:
       isPanning = true
+      setContentInteractionEnabled(false)
       gesture.setTranslation(.zero, in: self)
       if let animator = activeAnimator {
         stopDisplayLink()
@@ -234,6 +267,7 @@ public final class RNSBottomSheetHostingView: UIView {
 
     case .failed:
       isPanning = false
+      setContentInteractionEnabled(true)
 
     default:
       break
@@ -291,6 +325,19 @@ public final class RNSBottomSheetHostingView: UIView {
 }
 
 extension RNSBottomSheetHostingView: UIGestureRecognizerDelegate {
+  public func gestureRecognizer(
+    _ gestureRecognizer: UIGestureRecognizer,
+    shouldRequireFailureOf other: UIGestureRecognizer
+  ) -> Bool {
+    guard gestureRecognizer === panGesture else { return false }
+
+    if other is UITapGestureRecognizer {
+      return true
+    }
+
+    return false
+  }
+
   public func gestureRecognizer(
     _ gestureRecognizer: UIGestureRecognizer,
     shouldBeRequiredToFailBy other: UIGestureRecognizer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/react-native-bottom-sheet",
-  "version": "0.7.0-next.3",
+  "version": "0.7.0-next.5",
   "description": "Provides bottom-sheet components for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",