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

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

@@ -140,11 +140,10 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         val closedTy = detentSpecs.lastOrNull()?.height ?: h.toFloat()
         sheetContainer.translationY = closedTy
         emitPosition()
-        snapToIndex(targetIndex, 0f)
+        snapToIndex(targetIndex, 0f, emitIndexChange = false)
       } else {
         sheetContainer.translationY = translationY(targetIndex)
         emitPosition()
-        listener?.onIndexChange(targetIndex)
       }
       return
     }
@@ -206,7 +205,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     }
 
     if (newIndex >= detentSpecs.size || newIndex == targetIndex) return
-    snapToIndex(newIndex, 0f)
+    snapToIndex(newIndex, 0f, emitIndexChange = false)
   }
 
   fun setScrimColor(color: Int?) {
@@ -288,7 +287,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   // MARK: - Spring animation
 
-  private fun snapToIndex(index: Int, velocity: Float) {
+  private fun snapToIndex(index: Int, velocity: Float, emitIndexChange: Boolean = true) {
     if (index < 0 || index >= detentSpecs.size) return
     targetIndex = index
 
@@ -310,7 +309,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         emitPosition()
         activeAnimation = null
         updateInteractionState()
-        listener?.onIndexChange(index)
+        if (emitIndexChange) listener?.onIndexChange(index)
       }
     }
 

package/ios/RNSBottomSheetHostingView.swift

@@ -112,11 +112,10 @@ public final class RNSBottomSheetHostingView: UIView {
         let closedTy = detentSpecs.last?.height ?? bounds.height
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: closedTy)
         emitPosition()
-        snapToIndex(targetIndex, velocity: 0)
+        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false)
       } else {
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
         emitPosition()
-        eventDelegate?.bottomSheetHostingView(self, didChangeIndex: targetIndex)
       }
       return
     }
@@ -174,7 +173,7 @@ public final class RNSBottomSheetHostingView: UIView {
     }
 
     guard newIndex < detentSpecs.count, newIndex != targetIndex else { return }
-    snapToIndex(newIndex, velocity: 0)
+    snapToIndex(newIndex, velocity: 0, emitIndexChange: false)
   }
 
   public func mountChildComponentView(_ childView: UIView, atIndex index: Int) {
@@ -297,7 +296,7 @@ public final class RNSBottomSheetHostingView: UIView {
     snapToIndex(closedIndex, velocity: 0)
   }
 
-  private func snapToIndex(_ index: Int, velocity: CGFloat) {
+  private func snapToIndex(_ index: Int, velocity: CGFloat, emitIndexChange: Bool = true) {
     guard index >= 0, index < detentSpecs.count else { return }
     targetIndex = index
 
@@ -323,7 +322,9 @@ public final class RNSBottomSheetHostingView: UIView {
       self.activeAnimator = nil
       self.setContentInteractionEnabled(true)
       self.updateInteractionState()
-      self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
+      if emitIndexChange {
+        self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
+      }
     }
     animator.startAnimation()
     activeAnimator = animator

package/package.json

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