@swmansion/react-native-bottom-sheet 0.10.0 → 0.10.2

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

@@ -180,7 +180,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         val closedTy = detentSpecs.maxOfOrNull { it.height } ?: h.toFloat()
         sheetContainer.translationY = closedTy
         emitPosition()
-        snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = false)
+        snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = true)
       } else {
         sheetContainer.translationY = translationY(targetIndex)
         emitPosition()
@@ -337,14 +337,20 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         } else {
           val currentVisibleHeight = previousMaxHeight - sheetContainer.translationY
           val targetHeight = detentSpecs.getOrNull(targetIndex)?.height ?: 0f
-          if (targetHeight <= currentVisibleHeight + 0.5f) {
-            // Content shrank (or is unchanged): snap immediately. Animating here
-            // would expose blank space below the shrunken content.
+          val isContentDetent = rawDetentSpecs.getOrNull(targetIndex)?.kind == DetentKind.CONTENT
+          val didShrink = targetHeight < currentVisibleHeight - 0.5f
+          if (isContentDetent && didShrink) {
+            // Content shrank: snap immediately. Animating here would expose
+            // blank space below the shrunken content.
+            sheetContainer.translationY = targetTy
+            emitPosition()
+          } else if (kotlin.math.abs(targetHeight - currentVisibleHeight) <= 0.5f) {
+            // No meaningful change.
             sheetContainer.translationY = targetTy
             emitPosition()
           } else {
-            // Content grew: re-anchor at the current visible height, then animate
-            // up to the taller detent.
+            // Detent value changed (or content grew): re-anchor at the current
+            // visible height, then animate to the new target.
             sheetContainer.translationY =
               (newMaxHeight - currentVisibleHeight).coerceIn(0f, newMaxHeight)
             scrimPinnedFull = scrimPinnedFull || wasScrimFull

package/ios/BottomSheetContentView.mm

@@ -6,17 +6,17 @@
 #import <ReactNativeBottomSheet/ReactNativeBottomSheet-Swift.h>
 #endif
 
-@interface BottomSheetContentView () <RNSBottomSheetHostingViewDelegate>
+@interface BottomSheetContentView () <BottomSheetHostingViewDelegate>
 @end
 
 @implementation BottomSheetContentView {
-  RNSBottomSheetHostingView *_impl;
+  BottomSheetHostingView *_impl;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
-    _impl = [[RNSBottomSheetHostingView alloc] initWithFrame:self.bounds];
+    _impl = [[BottomSheetHostingView alloc] initWithFrame:self.bounds];
     _impl.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     _impl.eventDelegate = self;
     [self addSubview:_impl];
@@ -100,22 +100,22 @@
   [_impl resetSheetState];
 }
 
-- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didChangeIndex:(NSInteger)index
+- (void)bottomSheetHostingView:(BottomSheetHostingView *)view didChangeIndex:(NSInteger)index
 {
   [self.delegate bottomSheetView:self didChangeIndex:index];
 }
 
-- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didSettle:(NSInteger)index
+- (void)bottomSheetHostingView:(BottomSheetHostingView *)view didSettle:(NSInteger)index
 {
   [self.delegate bottomSheetView:self didSettle:index];
 }
 
-- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didChangePosition:(CGFloat)position
+- (void)bottomSheetHostingView:(BottomSheetHostingView *)view didChangePosition:(CGFloat)position
 {
   [self.delegate bottomSheetView:self didChangePosition:position];
 }
 
-- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didReportError:(NSString *)message
+- (void)bottomSheetHostingView:(BottomSheetHostingView *)view didReportError:(NSString *)message
 {
   [self.delegate bottomSheetView:self didReportError:message];
 }

package/ios/{RNSBottomSheetHostingView.swift → BottomSheetHostingView.swift}

@@ -1,10 +1,10 @@
 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)
-  func bottomSheetHostingView(_ view: RNSBottomSheetHostingView, didReportError message: String)
+@objc public protocol BottomSheetHostingViewDelegate: AnyObject {
+  func bottomSheetHostingView(_ view: BottomSheetHostingView, didChangeIndex index: Int)
+  func bottomSheetHostingView(_ view: BottomSheetHostingView, didSettle index: Int)
+  func bottomSheetHostingView(_ view: BottomSheetHostingView, didChangePosition position: CGFloat)
+  func bottomSheetHostingView(_ view: BottomSheetHostingView, didReportError message: String)
 }
 
 private struct DetentSpec: Equatable {
@@ -24,8 +24,8 @@ private struct RawDetentSpec {
 }
 
 @objcMembers
-public final class RNSBottomSheetHostingView: UIView {
-  public weak var eventDelegate: RNSBottomSheetHostingViewDelegate?
+public final class BottomSheetHostingView: UIView {
+  public weak var eventDelegate: BottomSheetHostingViewDelegate?
   public var modal: Bool = false {
     didSet { updateScrim() }
   }
@@ -152,7 +152,7 @@ public final class RNSBottomSheetHostingView: UIView {
         let closedTy = maximumResolvedDetentHeight ?? bounds.height
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: closedTy)
         emitPosition()
-        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: false)
+        snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: true)
       } else {
         sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
         emitPosition()
@@ -669,14 +669,21 @@ public final class RNSBottomSheetHostingView: UIView {
       } else {
         let currentVisibleHeight = previousMaxHeight - currentTranslationY
         let targetHeight = detent(at: targetIndex).height
-        if targetHeight <= currentVisibleHeight + 0.5 {
-          // Content shrank (or is unchanged): snap immediately. Animating here
-          // would expose blank space below the shrunken content.
+        let isContentDetent = rawDetentSpecs.indices.contains(targetIndex)
+          && rawDetentSpecs[targetIndex].kind == .content
+        let didShrink = targetHeight < currentVisibleHeight - 0.5
+        if isContentDetent, didShrink {
+          // Content shrank: snap immediately. Animating here would expose blank
+          // space below the shrunken content.
+          sheetContainer.transform = CGAffineTransform(translationX: 0, y: targetTy)
+          emitPosition()
+        } else if abs(targetHeight - currentVisibleHeight) <= 0.5 {
+          // No meaningful change.
           sheetContainer.transform = CGAffineTransform(translationX: 0, y: targetTy)
           emitPosition()
         } else {
-          // Content grew: re-anchor at the current visible height, then animate
-          // up to the taller detent.
+          // Detent value changed (or content grew): re-anchor at the current
+          // visible height, then animate to the new target.
           let startTy = min(max(newMaxHeight - currentVisibleHeight, 0), newMaxHeight)
           sheetContainer.transform = CGAffineTransform(translationX: 0, y: startTy)
           scrimPinnedFull = scrimPinnedFull || wasScrimFull
@@ -770,7 +777,7 @@ public final class RNSBottomSheetHostingView: UIView {
   }
 }
 
-extension RNSBottomSheetHostingView: UIGestureRecognizerDelegate {
+extension BottomSheetHostingView: UIGestureRecognizerDelegate {
   public func gestureRecognizer(
     _ gestureRecognizer: UIGestureRecognizer,
     shouldBeRequiredToFailBy other: UIGestureRecognizer
@@ -787,7 +794,7 @@ extension RNSBottomSheetHostingView: UIGestureRecognizerDelegate {
   }
 }
 
-private extension RNSBottomSheetHostingView {
+private extension BottomSheetHostingView {
   var currentTranslationY: CGFloat {
     if activeAnimator != nil, let presentation = sheetContainer.layer.presentation() {
       return presentation.affineTransform().ty

package/lib/module/BottomSheetNativeComponent.ts

@@ -15,7 +15,7 @@ export interface NativeProps extends ViewProps {
   detents: ReadonlyArray<NativeDetent>;
   maxDetentHeight: CodegenTypes.Double;
   index: CodegenTypes.Int32;
-  animateIn: boolean;
+  animateIn?: CodegenTypes.WithDefault<boolean, true>;
   modal: boolean;
   disableScrollableNegotiation?: boolean;
   scrimColor?: ColorValue;

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

@@ -8,7 +8,7 @@ export interface NativeProps extends ViewProps {
     detents: ReadonlyArray<NativeDetent>;
     maxDetentHeight: CodegenTypes.Double;
     index: CodegenTypes.Int32;
-    animateIn: boolean;
+    animateIn?: CodegenTypes.WithDefault<boolean, true>;
     modal: boolean;
     disableScrollableNegotiation?: boolean;
     scrimColor?: ColorValue;

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,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,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"}
+{"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,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,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.10.0",
+  "version": "0.10.2",
   "description": "Provides bottom-sheet components for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/BottomSheetNativeComponent.ts

@@ -15,7 +15,7 @@ export interface NativeProps extends ViewProps {
   detents: ReadonlyArray<NativeDetent>;
   maxDetentHeight: CodegenTypes.Double;
   index: CodegenTypes.Int32;
-  animateIn: boolean;
+  animateIn?: CodegenTypes.WithDefault<boolean, true>;
   modal: boolean;
   disableScrollableNegotiation?: boolean;
   scrimColor?: ColorValue;