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

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

@@ -56,6 +56,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   private val sheetContainer = FrameLayout(context)
   private val scrimPaint = Paint(Paint.ANTI_ALIAS_FLAG)
   private var activeAnimation: SpringAnimation? = null
+  private var activeAnimationEmitsSettle = false
   private var velocityTracker: VelocityTracker? = null
   private var choreographerCallback: Choreographer.FrameCallback? = null
   private val density = context.resources.displayMetrics.density
@@ -188,13 +189,15 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         targetIndex = targetIndex.coerceIn(0, detentSpecs.size - 1)
         if (activeAnimation != null) {
           val currentTy = sheetContainer.translationY
+          val shouldEmitSettle = activeAnimationEmitsSettle
           activeAnimation?.cancel()
           activeAnimation = null
+          activeAnimationEmitsSettle = false
           stopChoreographer()
           sheetContainer.translationY =
             currentTy.coerceIn(0f, detentSpecs.lastOrNull()?.height ?: currentTy)
           emitPosition()
-          snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = false)
+          snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = shouldEmitSettle)
         } else {
           sheetContainer.translationY = translationY(targetIndex)
           emitPosition()
@@ -308,6 +311,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     targetIndex = index
 
     val targetTy = translationY(index)
+    activeAnimationEmitsSettle = emitSettle
     activeAnimation?.cancel()
 
     val spring = SpringAnimation(sheetContainer, DynamicAnimation.TRANSLATION_Y, targetTy).apply {
@@ -323,6 +327,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         stopChoreographer()
         emitPosition()
         activeAnimation = null
+        activeAnimationEmitsSettle = false
         updateInteractionState()
         if (emitIndexChange) listener?.onIndexChange(index)
         if (emitSettle) listener?.onSettle(index)

package/ios/RNSBottomSheetHostingView.swift

@@ -35,6 +35,7 @@ public final class RNSBottomSheetHostingView: UIView {
   private let scrimView = UIControl()
   private var panGesture: UIPanGestureRecognizer!
   private var activeAnimator: UIViewPropertyAnimator?
+  private var activeAnimatorEmitsSettle = false
   private var displayLink: CADisplayLink?
   private var pendingIndex: Int?
   private var hasLaidOut = false
@@ -173,14 +174,16 @@ public final class RNSBottomSheetHostingView: UIView {
       if let animator = activeAnimator {
         stopDisplayLink()
         let visualTy = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
+        let shouldEmitSettle = activeAnimatorEmitsSettle
         animator.stopAnimation(true)
         activeAnimator = nil
+        activeAnimatorEmitsSettle = false
         sheetContainer.transform = CGAffineTransform(
           translationX: 0,
           y: min(max(visualTy, 0), detentSpecs.last?.height ?? visualTy)
         )
         emitPosition()
-        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: false)
+        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: shouldEmitSettle)
       } else {
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
         emitPosition()
@@ -337,6 +340,7 @@ public final class RNSBottomSheetHostingView: UIView {
     let clampedRatio = min(max(velocityRatio, -5), 5)
     let initialVelocity = CGVector(dx: 0, dy: clampedRatio)
 
+    activeAnimatorEmitsSettle = emitSettle
     activeAnimator?.stopAnimation(true)
 
     let spring = UISpringTimingParameters(dampingRatio: 1.0, initialVelocity: initialVelocity)
@@ -350,6 +354,7 @@ public final class RNSBottomSheetHostingView: UIView {
       self.stopDisplayLink()
       self.emitPosition()
       self.activeAnimator = nil
+      self.activeAnimatorEmitsSettle = false
       self.setContentInteractionEnabled(true)
       self.updateInteractionState()
       if emitIndexChange {

package/package.json

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