@swmansion/react-native-bottom-sheet 0.7.0-next.4 → 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

@@ -132,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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/react-native-bottom-sheet",
-  "version": "0.7.0-next.4",
+  "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",