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

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

@@ -25,6 +25,7 @@ private data class DetentSpec(val height: Float, val programmatic: Boolean)
 
 interface BottomSheetViewListener {
   fun onIndexChange(index: Int)
+  fun onSettle(index: Int)
   fun onPositionChange(position: Double)
 }
 
@@ -140,7 +141,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         val closedTy = detentSpecs.lastOrNull()?.height ?: h.toFloat()
         sheetContainer.translationY = closedTy
         emitPosition()
-        snapToIndex(targetIndex, 0f, emitIndexChange = false)
+        snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = false)
       } else {
         sheetContainer.translationY = translationY(targetIndex)
         emitPosition()
@@ -180,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()
+        }
       }
     }
 
@@ -287,12 +298,16 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   // MARK: - Spring animation
 
-  private fun snapToIndex(index: Int, velocity: Float, emitIndexChange: Boolean = true) {
+  private fun snapToIndex(
+    index: Int,
+    velocity: Float,
+    emitIndexChange: Boolean = true,
+    emitSettle: Boolean = true,
+  ) {
     if (index < 0 || index >= detentSpecs.size) return
     targetIndex = index
 
     val targetTy = translationY(index)
-
     activeAnimation?.cancel()
 
     val spring = SpringAnimation(sheetContainer, DynamicAnimation.TRANSLATION_Y, targetTy).apply {
@@ -310,6 +325,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         activeAnimation = null
         updateInteractionState()
         if (emitIndexChange) listener?.onIndexChange(index)
+        if (emitSettle) listener?.onSettle(index)
       }
     }
 

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

@@ -40,6 +40,16 @@ class BottomSheetViewManager :
           .receiveEvent(view.id, "topIndexChange", event)
       }
 
+      override fun onSettle(index: Int) {
+        val event = com.facebook.react.bridge.Arguments.createMap().apply {
+          putInt("index", index)
+        }
+        val reactContext = view.context as? ThemedReactContext ?: return
+        reactContext
+          .getJSModule(com.facebook.react.uimanager.events.RCTEventEmitter::class.java)
+          .receiveEvent(view.id, "topSettle", event)
+      }
+
       override fun onPositionChange(position: Double) {
         val event = com.facebook.react.bridge.Arguments.createMap().apply {
           putDouble("position", position)
@@ -79,6 +89,7 @@ class BottomSheetViewManager :
   override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
     return mapOf(
       "topIndexChange" to mapOf("registrationName" to "onIndexChange"),
+      "topSettle" to mapOf("registrationName" to "onSettle"),
       "topPositionChange" to mapOf("registrationName" to "onPositionChange"),
     )
   }

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) {
@@ -100,6 +103,14 @@ using namespace facebook::react;
   }
 }
 
+- (void)bottomSheetView:(BottomSheetContentView *)view didSettle:(NSInteger)index
+{
+  if (_eventEmitter) {
+    auto emitter = std::static_pointer_cast<const BottomSheetViewEventEmitter>(_eventEmitter);
+    emitter->onSettle({.index = static_cast<int>(index)});
+  }
+}
+
 - (void)bottomSheetView:(BottomSheetContentView *)view didChangePosition:(CGFloat)position
 {
   if (_eventEmitter) {
@@ -121,6 +132,7 @@ using namespace facebook::react;
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
+  _needsIndexSyncAfterRecycle = YES;
   [_sheetView resetSheetState];
   _sheetState.reset();
   _lastContentOffsetY = 0;

package/ios/BottomSheetContentView.h

@@ -6,6 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol BottomSheetContentViewDelegate <NSObject>
 - (void)bottomSheetView:(BottomSheetContentView *)view didChangeIndex:(NSInteger)index;
+- (void)bottomSheetView:(BottomSheetContentView *)view didSettle:(NSInteger)index;
 - (void)bottomSheetView:(BottomSheetContentView *)view didChangePosition:(CGFloat)position;
 @end
 

package/ios/BottomSheetContentView.mm

@@ -90,6 +90,11 @@
   [self.delegate bottomSheetView:self didChangeIndex:index];
 }
 
+- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didSettle:(NSInteger)index
+{
+  [self.delegate bottomSheetView:self didSettle:index];
+}
+
 - (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didChangePosition:(CGFloat)position
 {
   [self.delegate bottomSheetView:self didChangePosition:position];

package/ios/RNSBottomSheetHostingView.swift

@@ -2,6 +2,7 @@ import UIKit
 
 @objc public protocol RNSBottomSheetHostingViewDelegate: AnyObject {
   func bottomSheetHostingView(_ view: RNSBottomSheetHostingView, didChangeIndex index: Int)
+  func bottomSheetHostingView(_ view: RNSBottomSheetHostingView, didSettle index: Int)
   func bottomSheetHostingView(_ view: RNSBottomSheetHostingView, didChangePosition position: CGFloat)
 }
 
@@ -112,7 +113,7 @@ public final class RNSBottomSheetHostingView: UIView {
         let closedTy = detentSpecs.last?.height ?? bounds.height
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: closedTy)
         emitPosition()
-        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false)
+        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: false)
       } else {
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
         emitPosition()
@@ -161,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) {
@@ -296,7 +321,12 @@ public final class RNSBottomSheetHostingView: UIView {
     snapToIndex(closedIndex, velocity: 0)
   }
 
-  private func snapToIndex(_ index: Int, velocity: CGFloat, emitIndexChange: Bool = true) {
+  private func snapToIndex(
+    _ index: Int,
+    velocity: CGFloat,
+    emitIndexChange: Bool = true,
+    emitSettle: Bool = true
+  ) {
     guard index >= 0, index < detentSpecs.count else { return }
     targetIndex = index
 
@@ -325,6 +355,9 @@ public final class RNSBottomSheetHostingView: UIView {
       if emitIndexChange {
         self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
       }
+      if emitSettle {
+        self.eventDelegate?.bottomSheetHostingView(self, didSettle: index)
+      }
     }
     animator.startAnimation()
     activeAnimator = animator

package/lib/module/BottomSheet.js

@@ -15,6 +15,7 @@ export const BottomSheet = ({
   index,
   animateIn = true,
   onIndexChange,
+  onSettle,
   onPositionChange,
   modal = false,
   scrimColor = 'rgba(0, 0, 0, 0.5)'
@@ -41,6 +42,9 @@ export const BottomSheet = ({
   const handleIndexChange = event => {
     onIndexChange?.(event.nativeEvent.index);
   };
+  const handleSettle = event => {
+    onSettle?.(event.nativeEvent.index);
+  };
   const handlePositionChange = event => {
     const height = event.nativeEvent.position;
     sheetOpacity.setValue(height === 0 ? 0 : 1);
@@ -72,6 +76,7 @@ export const BottomSheet = ({
         modal: modal,
         scrimColor: scrimColor,
         onIndexChange: handleIndexChange,
+        onSettle: handleSettle,
         onPositionChange: handlePositionChange,
         children: /*#__PURE__*/_jsxs(View, {
           collapsable: false,

package/lib/module/BottomSheet.js.map

@@ -1 +1 @@
-{"version":3,"names":["useRef","useState","Animated","StyleSheet","View","useWindowDimensions","useSafeAreaInsets","BottomSheetNativeComponent","Portal","resolveDetent","jsx","_jsx","jsxs","_jsxs","programmatic","BottomSheet","children","style","detents","index","animateIn","onIndexChange","onPositionChange","modal","scrimColor","height","windowHeight","insets","maxHeight","top","contentHeight","setContentHeight","sheetOpacity","Value","current","resolvedDetents","map","detent","value","Math","max","min","isDetentProgrammatic","handleSentinelLayout","event","nativeEvent","layout","y","clampedIndex","length","isCollapsed","handleIndexChange","handlePositionChange","position","setValue","sheet","absoluteFill","pointerEvents","opacity","left","right","bottom","collapsable","flex","onLayout"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useRef","useState","Animated","StyleSheet","View","useWindowDimensions","useSafeAreaInsets","BottomSheetNativeComponent","Portal","resolveDetent","jsx","_jsx","jsxs","_jsxs","programmatic","BottomSheet","children","style","detents","index","animateIn","onIndexChange","onSettle","onPositionChange","modal","scrimColor","height","windowHeight","insets","maxHeight","top","contentHeight","setContentHeight","sheetOpacity","Value","current","resolvedDetents","map","detent","value","Math","max","min","isDetentProgrammatic","handleSentinelLayout","event","nativeEvent","layout","y","clampedIndex","length","isCollapsed","handleIndexChange","handleSettle","handlePositionChange","position","setValue","sheet","absoluteFill","pointerEvents","opacity","left","right","bottom","collapsable","flex","onLayout"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/BottomSheetNativeComponent.ts

@@ -19,6 +19,9 @@ export interface NativeProps extends ViewProps {
   onIndexChange?: CodegenTypes.DirectEventHandler<
     Readonly<{ index: CodegenTypes.Int32 }>
   >;
+  onSettle?: CodegenTypes.DirectEventHandler<
+    Readonly<{ index: CodegenTypes.Int32 }>
+  >;
   onPositionChange?: CodegenTypes.DirectEventHandler<
     Readonly<{ position: CodegenTypes.Double }>
   >;

package/lib/typescript/src/BottomSheet.d.ts

@@ -10,9 +10,10 @@ export interface BottomSheetProps {
     index: number;
     animateIn?: boolean;
     onIndexChange?: (index: number) => void;
+    onSettle?: (index: number) => void;
     onPositionChange?: (position: number) => void;
     modal?: boolean;
     scrimColor?: string;
 }
-export declare const BottomSheet: ({ children, style, detents, index, animateIn, onIndexChange, onPositionChange, modal, scrimColor, }: BottomSheetProps) => import("react/jsx-runtime").JSX.Element;
+export declare const BottomSheet: ({ children, style, detents, index, animateIn, onIndexChange, onSettle, onPositionChange, modal, scrimColor, }: BottomSheetProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=BottomSheet.d.ts.map

package/lib/typescript/src/BottomSheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BottomSheet.d.ts","sourceRoot":"","sources":["../../../src/BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,KAAK,EAAqB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM5E,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,GAAI,qGAUzB,gBAAgB,4CA+ElB,CAAC"}
+{"version":3,"file":"BottomSheet.d.ts","sourceRoot":"","sources":["../../../src/BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,KAAK,EAAqB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM5E,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,GAAI,+GAWzB,gBAAgB,4CAmFlB,CAAC"}

package/lib/typescript/src/BottomSheetNativeComponent.d.ts

@@ -12,6 +12,9 @@ export interface NativeProps extends ViewProps {
     onIndexChange?: CodegenTypes.DirectEventHandler<Readonly<{
         index: CodegenTypes.Int32;
     }>>;
+    onSettle?: CodegenTypes.DirectEventHandler<Readonly<{
+        index: CodegenTypes.Int32;
+    }>>;
     onPositionChange?: CodegenTypes.DirectEventHandler<Readonly<{
         position: CodegenTypes.Double;
     }>>;

package/lib/typescript/src/BottomSheetNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BottomSheetNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,KAAK,YAAY,GAAG,QAAQ,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAC7C,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAA;KAAE,CAAC,CACxC,CAAC;IACF,gBAAgB,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAChD,QAAQ,CAAC;QAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAA;KAAE,CAAC,CAC5C,CAAC;CACH;;AAED,wBAAsE"}
+{"version":3,"file":"BottomSheetNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,KAAK,YAAY,GAAG,QAAQ,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAC7C,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAA;KAAE,CAAC,CACxC,CAAC;IACF,QAAQ,CAAC,EAAE,YAAY,CAAC,kBAAkB,CACxC,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAA;KAAE,CAAC,CACxC,CAAC;IACF,gBAAgB,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAChD,QAAQ,CAAC;QAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAA;KAAE,CAAC,CAC5C,CAAC;CACH;;AAED,wBAAsE"}

package/package.json

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

package/src/BottomSheet.tsx

@@ -16,6 +16,7 @@ export interface BottomSheetProps {
   index: number;
   animateIn?: boolean;
   onIndexChange?: (index: number) => void;
+  onSettle?: (index: number) => void;
   onPositionChange?: (position: number) => void;
   modal?: boolean;
   scrimColor?: string;
@@ -28,6 +29,7 @@ export const BottomSheet = ({
   index,
   animateIn = true,
   onIndexChange,
+  onSettle,
   onPositionChange,
   modal = false,
   scrimColor = 'rgba(0, 0, 0, 0.5)',
@@ -55,6 +57,9 @@ export const BottomSheet = ({
   const handleIndexChange = (event: { nativeEvent: { index: number } }) => {
     onIndexChange?.(event.nativeEvent.index);
   };
+  const handleSettle = (event: { nativeEvent: { index: number } }) => {
+    onSettle?.(event.nativeEvent.index);
+  };
 
   const handlePositionChange = (event: {
     nativeEvent: { position: number };
@@ -94,6 +99,7 @@ export const BottomSheet = ({
           modal={modal}
           scrimColor={scrimColor}
           onIndexChange={handleIndexChange}
+          onSettle={handleSettle}
           onPositionChange={handlePositionChange}
         >
           <View collapsable={false} style={{ flex: 1, maxHeight }}>

package/src/BottomSheetNativeComponent.ts

@@ -19,6 +19,9 @@ export interface NativeProps extends ViewProps {
   onIndexChange?: CodegenTypes.DirectEventHandler<
     Readonly<{ index: CodegenTypes.Int32 }>
   >;
+  onSettle?: CodegenTypes.DirectEventHandler<
+    Readonly<{ index: CodegenTypes.Int32 }>
+  >;
   onPositionChange?: CodegenTypes.DirectEventHandler<
     Readonly<{ position: CodegenTypes.Double }>
   >;