@swmansion/react-native-bottom-sheet 0.8.0-next.6 → 0.8.0-next.7

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

@@ -181,14 +181,24 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
       val programmatic = dict["programmatic"] as? Boolean ?: false
       DetentSpec(height = (height * density).toFloat(), programmatic = programmatic)
     }
-
     if (width > 0 && height > 0 && detentSpecs.isNotEmpty()) {
       layoutSheetContainer(width, height)
 
-      if (hasLaidOut && activeAnimation == null && !isPanning) {
+      if (hasLaidOut && !isPanning) {
         targetIndex = targetIndex.coerceIn(0, detentSpecs.size - 1)
-        sheetContainer.translationY = translationY(targetIndex)
-        emitPosition()
+        if (activeAnimation != null) {
+          val currentTy = sheetContainer.translationY
+          activeAnimation?.cancel()
+          activeAnimation = null
+          stopChoreographer()
+          sheetContainer.translationY =
+            currentTy.coerceIn(0f, detentSpecs.lastOrNull()?.height ?: currentTy)
+          emitPosition()
+          snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = false)
+        } else {
+          sheetContainer.translationY = translationY(targetIndex)
+          emitPosition()
+        }
       }
     }
 
@@ -298,7 +308,6 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     targetIndex = index
 
     val targetTy = translationY(index)
-
     activeAnimation?.cancel()
 
     val spring = SpringAnimation(sheetContainer, DynamicAnimation.TRANSLATION_Y, targetTy).apply {

package/ios/BottomSheetComponentView.mm

@@ -18,6 +18,7 @@ using namespace facebook::react;
   BottomSheetContentView *_sheetView;
   State::Shared _sheetState;
   float _lastContentOffsetY;
+  BOOL _needsIndexSyncAfterRecycle;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -30,6 +31,7 @@ using namespace facebook::react;
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const BottomSheetViewProps>();
     _props = defaultProps;
+    _needsIndexSyncAfterRecycle = NO;
 
     _sheetView = [[BottomSheetContentView alloc] initWithFrame:CGRectZero];
     _sheetView.delegate = self;
@@ -56,8 +58,9 @@ using namespace facebook::react;
     [_sheetView setDetents:detentsArray];
   }
 
-  if (newViewProps.index != oldViewProps.index) {
+  if (_needsIndexSyncAfterRecycle || newViewProps.index != oldViewProps.index) {
     [_sheetView setDetentIndex:newViewProps.index];
+    _needsIndexSyncAfterRecycle = NO;
   }
 
   if (newViewProps.animateIn != oldViewProps.animateIn) {
@@ -129,6 +132,7 @@ using namespace facebook::react;
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
+  _needsIndexSyncAfterRecycle = YES;
   [_sheetView resetSheetState];
   _sheetState.reset();
   _lastContentOffsetY = 0;

package/ios/RNSBottomSheetHostingView.swift

@@ -162,6 +162,30 @@ public final class RNSBottomSheetHostingView: UIView {
       let programmatic = (dict["programmatic"] as? Bool) ?? (dict["programmatic"] as? NSNumber)?.boolValue ?? false
       return DetentSpec(height: CGFloat(height), programmatic: programmatic)
     }
+    guard bounds.width > 0, bounds.height > 0, !detentSpecs.isEmpty else {
+      return
+    }
+
+    if hasLaidOut && !isPanning {
+      targetIndex = max(0, min(detentSpecs.count - 1, targetIndex))
+      layoutIfNeeded()
+
+      if let animator = activeAnimator {
+        stopDisplayLink()
+        let visualTy = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
+        animator.stopAnimation(true)
+        activeAnimator = nil
+        sheetContainer.transform = CGAffineTransform(
+          translationX: 0,
+          y: min(max(visualTy, 0), detentSpecs.last?.height ?? visualTy)
+        )
+        emitPosition()
+        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: false)
+      } else {
+        sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
+        emitPosition()
+      }
+    }
   }
 
   public func setDetentIndex(_ newIndex: Int) {

package/package.json

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