@swmansion/react-native-bottom-sheet 0.15.0-next.7 → 0.15.0-next.9

package/README.md

@@ -208,6 +208,10 @@ Decoupling the surface this way keeps the sheet covered as the content height
 changes. When content shrinks, the sheet animates to its new height without the
 background briefly exposing blank space behind the content.
 
+If your sheet content animates its own height, pass
+`animateContentResize={false}` to update the sheet position immediately when the
+active `'content'` detent changes size.
+
 Give the surface a filling style such as `StyleSheet.absoluteFill`. It is
 mounted in a full‍-‍size host, so a surface sized only by its own
 content would collapse and not show.

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

@@ -58,6 +58,7 @@ class BottomSheetHostView(context: Context) : ReactViewGroup(context) {
   private var detentSpecs: List<DetentSpec> = emptyList()
   private var targetIndex: Int = 0
   var animateIn: Boolean = true
+  var animateContentResize: Boolean = true
   var modal: Boolean = false
     set(value) {
       field = value
@@ -364,10 +365,14 @@ class BottomSheetHostView(context: Context) : ReactViewGroup(context) {
         } else {
           val currentVisibleHeight = previousMaxHeight - sheetContainer.translationY
           val targetHeight = detentSpecs.getOrNull(targetIndex)?.height ?: 0f
+          val shouldAnimateResize = shouldAnimateContentResize(targetIndex)
           if (kotlin.math.abs(targetHeight - currentVisibleHeight) <= 0.5f) {
             // No meaningful change.
             sheetContainer.translationY = targetTy
             emitPosition()
+          } else if (!shouldAnimateResize) {
+            sheetContainer.translationY = targetTy
+            emitPosition()
           } else {
             // The content detent changed (grew or shrank): re-anchor at the
             // current visible height, then animate to the new target. The
@@ -393,6 +398,9 @@ class BottomSheetHostView(context: Context) : ReactViewGroup(context) {
     updateScrim()
   }
 
+  private fun shouldAnimateContentResize(index: Int): Boolean =
+    animateContentResize || rawDetentSpecs.getOrNull(index)?.kind != DetentKind.CONTENT
+
   private fun currentContentHeight(): Float {
     val marker = contentHeightMarker ?: return Float.NaN
     return marker.top.toFloat()
@@ -825,12 +833,42 @@ class BottomSheetHostView(context: Context) : ReactViewGroup(context) {
       }
     }
 
-    if (view.canScrollVertically(1) || view.canScrollVertically(-1)) {
+    if (isVerticallyScrollable(view)) {
       return view
     }
     return null
   }
 
+  private fun isVerticallyScrollable(view: View): Boolean {
+    if (!view.canScrollVertically(1) && !view.canScrollVertically(-1)) {
+      return false
+    }
+    return getReactScrollEnabled(view) != false
+  }
+
+  private fun getReactScrollEnabled(view: View): Boolean? {
+    val method =
+      try {
+        view.javaClass.getMethod("getScrollEnabled")
+      } catch (_: NoSuchMethodException) {
+        return null
+      }
+
+    if (
+      method.returnType != Boolean::class.javaPrimitiveType &&
+        method.returnType != Boolean::class.javaObjectType
+    ) {
+      return null
+    }
+
+    return try {
+      method.isAccessible = true
+      method.invoke(view) as? Boolean
+    } catch (_: Exception) {
+      null
+    }
+  }
+
   private fun isViewInverted(view: View): Boolean {
     val values = FloatArray(9)
     var current: View? = view

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

@@ -112,6 +112,12 @@ class BottomSheetView(context: Context) : ReactViewGroup(context), LifecycleEven
       host.animateIn = value
     }
 
+  var animateContentResize: Boolean
+    get() = host.animateContentResize
+    set(value) {
+      host.animateContentResize = value
+    }
+
   var modal: Boolean
     get() = host.modal
     set(value) {

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

@@ -128,6 +128,11 @@ class BottomSheetViewManager :
     view.animateIn = animateIn
   }
 
+  @ReactProp(name = "animateContentResize")
+  override fun setAnimateContentResize(view: BottomSheetView, animateContentResize: Boolean) {
+    view.animateContentResize = animateContentResize
+  }
+
   @ReactProp(name = "modal")
   override fun setModal(view: BottomSheetView, modal: Boolean) {
     view.modal = modal

package/ios/BottomSheetComponentView.mm

@@ -113,6 +113,10 @@ using namespace facebook::react;
     _sheetView.animateIn = newViewProps.animateIn;
   }
 
+  if (newViewProps.animateContentResize != oldViewProps.animateContentResize) {
+    _sheetView.animateContentResize = newViewProps.animateContentResize;
+  }
+
   if (newViewProps.modal != oldViewProps.modal) {
     _sheetView.modal = newViewProps.modal;
   }

package/ios/BottomSheetContentView.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak, nullable) id<BottomSheetContentViewDelegate> delegate;
 @property (nonatomic) BOOL animateIn;
+@property (nonatomic) BOOL animateContentResize;
 @property (nonatomic) BOOL modal;
 @property (nonatomic) BOOL disableScrollableNegotiation;
 @property (nonatomic, readonly) UIView *sheetContainer;

package/ios/BottomSheetContentView.mm

@@ -35,6 +35,16 @@
   _impl.animateIn = animateIn;
 }
 
+- (BOOL)animateContentResize
+{
+  return _impl.animateContentResize;
+}
+
+- (void)setAnimateContentResize:(BOOL)animateContentResize
+{
+  _impl.animateContentResize = animateContentResize;
+}
+
 - (UIView *)sheetContainer
 {
   return _impl.sheetContainer;

package/ios/BottomSheetHostingView.swift

@@ -64,6 +64,7 @@ public final class BottomSheetHostingView: UIView {
 
   private var targetIndex: Int = 0
   public var animateIn: Bool = true
+  public var animateContentResize: Bool = true
 
   public let sheetContainer = UIView()
   private let scrimView = UIControl()
@@ -620,6 +621,7 @@ public final class BottomSheetHostingView: UIView {
   }
 
   private func isVerticallyScrollable(_ scrollView: UIScrollView) -> Bool {
+    guard scrollView.isScrollEnabled else { return false }
     let verticalInset = scrollView.adjustedContentInset.top + scrollView.adjustedContentInset.bottom
     let visibleHeight = max(0, scrollView.bounds.height - verticalInset)
     return scrollView.alwaysBounceVertical || scrollView.contentSize.height > visibleHeight
@@ -789,10 +791,14 @@ public final class BottomSheetHostingView: UIView {
       } else {
         let currentVisibleHeight = previousMaxHeight - currentTranslationY
         let targetHeight = detent(at: targetIndex).height
+        let shouldAnimateResize = shouldAnimateContentResize(at: targetIndex)
         if abs(targetHeight - currentVisibleHeight) <= 0.5 {
           // No meaningful change.
           sheetContainer.transform = CGAffineTransform(translationX: 0, y: targetTy)
           emitPosition()
+        } else if !shouldAnimateResize {
+          sheetContainer.transform = CGAffineTransform(translationX: 0, y: targetTy)
+          emitPosition()
         } else {
           // The content detent changed (grew or shrank): re-anchor at the
           // current visible height, then animate to the new target. The surface
@@ -813,6 +819,13 @@ public final class BottomSheetHostingView: UIView {
     }
   }
 
+  private func shouldAnimateContentResize(at index: Int) -> Bool {
+    guard rawDetentSpecs.indices.contains(index) else {
+      return animateContentResize
+    }
+    return animateContentResize || rawDetentSpecs[index].kind != .content
+  }
+
   private func refreshContentHeightMarker() {
     let marker = findContentHeightMarker()
     guard marker !== contentHeightMarker else { return }

package/lib/module/BottomSheet.js

@@ -27,6 +27,7 @@ export const BottomSheet = props => {
     detents = [0, 'content'],
     index,
     animateIn = true,
+    animateContentResize = true,
     onIndexChange,
     onSettle,
     onPositionChange,
@@ -103,6 +104,7 @@ export const BottomSheet = props => {
         maxDetentHeight: maxHeight,
         index: index,
         animateIn: animateIn,
+        animateContentResize: animateContentResize,
         modal: modal,
         nativeOverlay: usesNativeOverlay,
         disableScrollableNegotiation: disableScrollableNegotiation,

package/lib/module/BottomSheet.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","StyleSheet","View","useSafeAreaFrame","useSafeAreaInsets","BottomSheetNativeView","BottomSheetSurfaceNativeComponent","Portal","jsx","_jsx","jsxs","_jsxs","programmatic","BottomSheet","props","children","surface","style","detents","index","animateIn","onIndexChange","onSettle","onPositionChange","wrapNativeView","modal","nativeOverlay","disableScrollableNegotiation","scrimColor","scrimOpacities","height","windowHeight","insets","maxHeight","top","nativeDetents","map","detent","isDetentProgrammatic","value","resolveDetentValue","kind","Math","max","min","clampedIndex","length","selectedDetentValue","isCollapsed","resolvedScrimOpacity","usesNativeOverlay","handleIndexChange","event","nativeEvent","handleSettle","NativeView","sheet","absoluteFill","pointerEvents","position","left","right","bottom","maxDetentHeight","collapsable","flex"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useState","StyleSheet","View","useSafeAreaFrame","useSafeAreaInsets","BottomSheetNativeView","BottomSheetSurfaceNativeComponent","Portal","jsx","_jsx","jsxs","_jsxs","programmatic","BottomSheet","props","children","surface","style","detents","index","animateIn","animateContentResize","onIndexChange","onSettle","onPositionChange","wrapNativeView","modal","nativeOverlay","disableScrollableNegotiation","scrimColor","scrimOpacities","height","windowHeight","insets","maxHeight","top","nativeDetents","map","detent","isDetentProgrammatic","value","resolveDetentValue","kind","Math","max","min","clampedIndex","length","selectedDetentValue","isCollapsed","resolvedScrimOpacity","usesNativeOverlay","handleIndexChange","event","nativeEvent","handleSettle","NativeView","sheet","absoluteFill","pointerEvents","position","left","right","bottom","maxDetentHeight","collapsable","flex"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/BottomSheetNativeComponent.ts

@@ -16,6 +16,7 @@ export interface NativeProps extends ViewProps {
   maxDetentHeight: CodegenTypes.Double;
   index: CodegenTypes.Int32;
   animateIn?: CodegenTypes.WithDefault<boolean, true>;
+  animateContentResize?: CodegenTypes.WithDefault<boolean, true>;
   modal: boolean;
   nativeOverlay?: boolean;
   disableScrollableNegotiation?: boolean;

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

@@ -45,6 +45,13 @@ export interface BottomSheetProps {
     index: number;
     /** Whether the sheet should animate in on first layout. */
     animateIn?: boolean;
+    /**
+     * Whether the sheet should animate when the active `'content'` detent changes
+     * height. Disable this when your content animates its own height.
+     *
+     * @default true
+     */
+    animateContentResize?: boolean;
     /**
      * Called when a user-driven snap is initiated: the moment a drag commits to a
      * detent, before the animation settles. Does not fire for programmatic `index`

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,EAAY,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAO/E,OAA8B,EAC5B,KAAK,WAAW,EACjB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,wDAAwD;IACxD,QAAQ,EAAE,SAAS,CAAC;IACpB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,8DAA8D;IAC9D,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,KACjD,IAAI,CAAC;IACV;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,KAClC,aAAa,CAAC,WAAW,CAAC,CAAC;IAChC;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC;AAED,KAAK,yBAAyB,GAAG;IAC/B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;;;OAYG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,yBAAyB,CAAC;AAE5B,gFAAgF;AAChF,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB,4CAyIlD,CAAC"}
+{"version":3,"file":"BottomSheet.d.ts","sourceRoot":"","sources":["../../../src/BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAO/E,OAA8B,EAC5B,KAAK,WAAW,EACjB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAAC;IAC7C,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,wDAAwD;IACxD,QAAQ,EAAE,SAAS,CAAC;IACpB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,8DAA8D;IAC9D,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,CACjB,KAAK,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,KACjD,IAAI,CAAC;IACV;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,KAClC,aAAa,CAAC,WAAW,CAAC,CAAC;IAChC;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC;AAED,KAAK,yBAAyB,GAAG;IAC/B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;;;OAYG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,yBAAyB,CAAC;AAE5B,gFAAgF;AAChF,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB,4CA2IlD,CAAC"}

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

@@ -9,6 +9,7 @@ export interface NativeProps extends ViewProps {
     maxDetentHeight: CodegenTypes.Double;
     index: CodegenTypes.Int32;
     animateIn?: CodegenTypes.WithDefault<boolean, true>;
+    animateContentResize?: CodegenTypes.WithDefault<boolean, true>;
     modal: boolean;
     nativeOverlay?: boolean;
     disableScrollableNegotiation?: boolean;

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,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,eAAe,EAAE,YAAY,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,SAAS,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACpD,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,CAAC;QAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAA;KAAE,CAAC,CACxE,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,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,eAAe,EAAE,YAAY,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,SAAS,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,oBAAoB,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/D,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACpD,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,CAAC;QAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAA;KAAE,CAAC,CACxE,CAAC;CACH;;AAED,wBAAsE"}

package/package.json

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

package/src/BottomSheet.tsx

@@ -57,6 +57,13 @@ export interface BottomSheetProps {
   index: number;
   /** Whether the sheet should animate in on first layout. */
   animateIn?: boolean;
+  /**
+   * Whether the sheet should animate when the active `'content'` detent changes
+   * height. Disable this when your content animates its own height.
+   *
+   * @default true
+   */
+  animateContentResize?: boolean;
   /**
    * Called when a user-driven snap is initiated: the moment a drag commits to a
    * detent, before the animation settles. Does not fire for programmatic `index`
@@ -136,6 +143,7 @@ export const BottomSheet = (props: BottomSheetProps) => {
     detents = [0, 'content'],
     index,
     animateIn = true,
+    animateContentResize = true,
     onIndexChange,
     onSettle,
     onPositionChange,
@@ -227,6 +235,7 @@ export const BottomSheet = (props: BottomSheetProps) => {
           maxDetentHeight={maxHeight}
           index={index}
           animateIn={animateIn}
+          animateContentResize={animateContentResize}
           modal={modal}
           nativeOverlay={usesNativeOverlay}
           disableScrollableNegotiation={disableScrollableNegotiation}

package/src/BottomSheetNativeComponent.ts

@@ -16,6 +16,7 @@ export interface NativeProps extends ViewProps {
   maxDetentHeight: CodegenTypes.Double;
   index: CodegenTypes.Int32;
   animateIn?: CodegenTypes.WithDefault<boolean, true>;
+  animateContentResize?: CodegenTypes.WithDefault<boolean, true>;
   modal: boolean;
   nativeOverlay?: boolean;
   disableScrollableNegotiation?: boolean;