@swmansion/react-native-bottom-sheet 0.6.2 → 0.7.0-next.1

package/ios/BottomSheetComponentView.mm

@@ -0,0 +1,100 @@
+#import "BottomSheetComponentView.h"
+#import "BottomSheetContentView.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <react/renderer/components/ReactNativeBottomSheetSpec/ComponentDescriptors.h>
+#import <react/renderer/components/ReactNativeBottomSheetSpec/EventEmitters.h>
+#import <react/renderer/components/ReactNativeBottomSheetSpec/Props.h>
+#import <react/renderer/components/ReactNativeBottomSheetSpec/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface BottomSheetComponentView () <BottomSheetContentViewDelegate>
+@end
+
+@implementation BottomSheetComponentView {
+  BottomSheetContentView *_sheetView;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<BottomSheetViewComponentDescriptor>();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const BottomSheetViewProps>();
+    _props = defaultProps;
+
+    _sheetView = [[BottomSheetContentView alloc] initWithFrame:CGRectZero];
+    _sheetView.delegate = self;
+    _sheetView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    self.contentView = _sheetView;
+  }
+  return self;
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newViewProps = static_cast<const BottomSheetViewProps &>(*props);
+  const auto &oldViewProps = static_cast<const BottomSheetViewProps &>(*_props);
+
+  // Always update detents — the codegen struct lacks operator==.
+  {
+    NSMutableArray<NSDictionary *> *detentsArray = [NSMutableArray new];
+    for (const auto &detent : newViewProps.detents) {
+      [detentsArray addObject:@{
+        @"height": @(detent.height),
+        @"programmatic": @(detent.programmatic),
+      }];
+    }
+    [_sheetView setDetents:detentsArray];
+  }
+
+  if (newViewProps.index != oldViewProps.index) {
+    [_sheetView setDetentIndex:newViewProps.index];
+  }
+
+  if (newViewProps.animateIn != oldViewProps.animateIn) {
+    _sheetView.animateIn = newViewProps.animateIn;
+  }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  [_sheetView mountChildComponentView:childComponentView atIndex:index];
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  [_sheetView unmountChildComponentView:childComponentView];
+}
+
+#pragma mark - BottomSheetContentViewDelegate
+
+- (void)bottomSheetView:(BottomSheetContentView *)view didChangeIndex:(NSInteger)index
+{
+  if (_eventEmitter) {
+    auto emitter = std::static_pointer_cast<const BottomSheetViewEventEmitter>(_eventEmitter);
+    emitter->onIndexChange({.index = static_cast<int>(index)});
+  }
+}
+
+- (void)bottomSheetView:(BottomSheetContentView *)view didChangePosition:(CGFloat)position
+{
+  if (_eventEmitter) {
+    auto emitter = std::static_pointer_cast<const BottomSheetViewEventEmitter>(_eventEmitter);
+    emitter->onPositionChange({.position = static_cast<double>(position)});
+  }
+}
+
+@end
+
+Class<RCTComponentViewProtocol> BottomSheetViewCls(void)
+{
+  return BottomSheetComponentView.class;
+}

package/ios/BottomSheetContentView.h

@@ -0,0 +1,25 @@
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class BottomSheetContentView;
+
+@protocol BottomSheetContentViewDelegate <NSObject>
+- (void)bottomSheetView:(BottomSheetContentView *)view didChangeIndex:(NSInteger)index;
+- (void)bottomSheetView:(BottomSheetContentView *)view didChangePosition:(CGFloat)position;
+@end
+
+@interface BottomSheetContentView : UIView
+
+@property (nonatomic, weak, nullable) id<BottomSheetContentViewDelegate> delegate;
+@property (nonatomic) BOOL animateIn;
+@property (nonatomic, readonly) UIView *sheetContainer;
+
+- (void)setDetents:(NSArray<NSDictionary *> *)raw;
+- (void)setDetentIndex:(NSInteger)newIndex;
+- (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index;
+- (void)unmountChildComponentView:(UIView *)childView;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/BottomSheetContentView.mm

@@ -0,0 +1,73 @@
+#import "BottomSheetContentView.h"
+
+#if __has_include("ReactNativeBottomSheet-Swift.h")
+#import "ReactNativeBottomSheet-Swift.h"
+#else
+#import <ReactNativeBottomSheet/ReactNativeBottomSheet-Swift.h>
+#endif
+
+@interface BottomSheetContentView () <RNSBottomSheetHostingViewDelegate>
+@end
+
+@implementation BottomSheetContentView {
+  RNSBottomSheetHostingView *_impl;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    _impl = [[RNSBottomSheetHostingView alloc] initWithFrame:self.bounds];
+    _impl.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    _impl.eventDelegate = self;
+    [self addSubview:_impl];
+  }
+
+  return self;
+}
+
+- (BOOL)animateIn
+{
+  return _impl.animateIn;
+}
+
+- (void)setAnimateIn:(BOOL)animateIn
+{
+  _impl.animateIn = animateIn;
+}
+
+- (UIView *)sheetContainer
+{
+  return _impl.sheetContainer;
+}
+
+- (void)setDetents:(NSArray<NSDictionary *> *)raw
+{
+  [_impl setDetents:raw];
+}
+
+- (void)setDetentIndex:(NSInteger)newIndex
+{
+  [_impl setDetentIndex:newIndex];
+}
+
+- (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index
+{
+  [_impl mountChildComponentView:childView atIndex:index];
+}
+
+- (void)unmountChildComponentView:(UIView *)childView
+{
+  [_impl unmountChildComponentView:childView];
+}
+
+- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didChangeIndex:(NSInteger)index
+{
+  [self.delegate bottomSheetView:self didChangeIndex:index];
+}
+
+- (void)bottomSheetHostingView:(RNSBottomSheetHostingView *)view didChangePosition:(CGFloat)position
+{
+  [self.delegate bottomSheetView:self didChangePosition:position];
+}
+
+@end

package/ios/RNSBottomSheetHostingView.swift

@@ -0,0 +1,294 @@
+import UIKit
+
+@objc public protocol RNSBottomSheetHostingViewDelegate: AnyObject {
+  func bottomSheetHostingView(_ view: RNSBottomSheetHostingView, didChangeIndex index: Int)
+  func bottomSheetHostingView(_ view: RNSBottomSheetHostingView, didChangePosition position: CGFloat)
+}
+
+private struct DetentSpec {
+  let height: CGFloat
+  let programmatic: Bool
+}
+
+@objcMembers
+public final class RNSBottomSheetHostingView: UIView {
+  public weak var eventDelegate: RNSBottomSheetHostingViewDelegate?
+
+  private var detentSpecs: [DetentSpec] = [] {
+    didSet { setNeedsLayout() }
+  }
+
+  private var targetIndex: Int = 0
+  public var animateIn: Bool = true
+
+  public let sheetContainer = UIView()
+  private var panGesture: UIPanGestureRecognizer!
+  private var activeAnimator: UIViewPropertyAnimator?
+  private var displayLink: CADisplayLink?
+  private var pendingIndex: Int?
+  private var hasLaidOut = false
+  private var isPanning = false
+
+  public override init(frame: CGRect) {
+    super.init(frame: frame)
+    backgroundColor = .clear
+    clipsToBounds = false
+
+    sheetContainer.backgroundColor = .clear
+    sheetContainer.clipsToBounds = false
+    addSubview(sheetContainer)
+
+    panGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
+    panGesture.delegate = self
+    sheetContainer.addGestureRecognizer(panGesture)
+  }
+
+  public required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  public override func layoutSubviews() {
+    super.layoutSubviews()
+    guard bounds.width > 0, bounds.height > 0 else { return }
+
+    let maxHeight = detentSpecs.last?.height ?? bounds.height
+    sheetContainer.bounds = CGRect(x: 0, y: 0, width: bounds.width, height: maxHeight)
+    sheetContainer.center = CGPoint(x: bounds.width / 2, y: bounds.height - maxHeight / 2)
+
+    if !hasLaidOut && !detentSpecs.isEmpty {
+      hasLaidOut = true
+      let indexToApply = pendingIndex ?? targetIndex
+      pendingIndex = nil
+      targetIndex = max(0, min(detentSpecs.count - 1, indexToApply))
+
+      if animateIn {
+        let closedTy = detentSpecs.last?.height ?? bounds.height
+        sheetContainer.transform = CGAffineTransform(translationX: 0, y: closedTy)
+        emitPosition()
+        snapToIndex(targetIndex, velocity: 0)
+      } else {
+        sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
+        emitPosition()
+        eventDelegate?.bottomSheetHostingView(self, didChangeIndex: targetIndex)
+      }
+      return
+    }
+
+    if activeAnimator != nil || isPanning { return }
+    sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
+  }
+
+  public override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+    let containerPoint = convert(point, to: sheetContainer)
+    guard sheetContainer.bounds.contains(containerPoint) else { return nil }
+    return sheetContainer.hitTest(containerPoint, with: event)
+  }
+
+  public func setDetents(_ raw: [NSDictionary]) {
+    detentSpecs = raw.compactMap { dict in
+      guard let height = dict["height"] as? Double ?? (dict["height"] as? NSNumber)?.doubleValue else {
+        return nil
+      }
+      let programmatic = (dict["programmatic"] as? Bool) ?? (dict["programmatic"] as? NSNumber)?.boolValue ?? false
+      return DetentSpec(height: CGFloat(height), programmatic: programmatic)
+    }
+  }
+
+  public func setDetentIndex(_ newIndex: Int) {
+    guard newIndex >= 0 else { return }
+
+    if !hasLaidOut {
+      pendingIndex = newIndex
+      targetIndex = newIndex
+      return
+    }
+
+    guard newIndex < detentSpecs.count, newIndex != targetIndex else { return }
+    snapToIndex(newIndex, velocity: 0)
+  }
+
+  public func mountChildComponentView(_ childView: UIView, atIndex index: Int) {
+    sheetContainer.insertSubview(childView, at: index)
+  }
+
+  public func unmountChildComponentView(_ childView: UIView) {
+    childView.removeFromSuperview()
+  }
+
+  private func detent(at index: Int) -> DetentSpec {
+    guard detentSpecs.indices.contains(index) else {
+      return DetentSpec(height: 0, programmatic: false)
+    }
+    return detentSpecs[index]
+  }
+
+  private func translationY(for index: Int) -> CGFloat {
+    let maxHeight = detentSpecs.last?.height ?? bounds.height
+    let snapHeight = detent(at: index).height
+    return maxHeight - snapHeight
+  }
+
+  private var draggableRange: (minTy: CGFloat, maxTy: CGFloat) {
+    let draggable = detentSpecs.enumerated().filter { !$0.element.programmatic }
+    let highestIndex = draggable.last?.offset ?? 0
+    let lowestIndex = draggable.first?.offset ?? 0
+    return (minTy: translationY(for: highestIndex), maxTy: translationY(for: lowestIndex))
+  }
+
+  private func emitPosition() {
+    let maxHeight = detentSpecs.last?.height ?? bounds.height
+    let ty = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
+    eventDelegate?.bottomSheetHostingView(self, didChangePosition: maxHeight - ty)
+  }
+
+  private func startDisplayLink() {
+    guard displayLink == nil else { return }
+    let link = CADisplayLink(target: self, selector: #selector(displayLinkFired))
+    link.add(to: .main, forMode: .common)
+    displayLink = link
+  }
+
+  private func stopDisplayLink() {
+    displayLink?.invalidate()
+    displayLink = nil
+  }
+
+  @objc private func displayLinkFired() {
+    emitPosition()
+  }
+
+  private func snapToIndex(_ index: Int, velocity: CGFloat) {
+    guard index >= 0, index < detentSpecs.count else { return }
+    targetIndex = index
+
+    let currentTy = sheetContainer.transform.ty
+    let targetTy = translationY(for: index)
+    let distance = targetTy - currentTy
+    let velocityRatio = distance != 0 ? velocity / distance : 0
+    let clampedRatio = min(max(velocityRatio, -5), 5)
+    let initialVelocity = CGVector(dx: 0, dy: clampedRatio)
+
+    activeAnimator?.stopAnimation(true)
+
+    let spring = UISpringTimingParameters(dampingRatio: 1.0, initialVelocity: initialVelocity)
+    let animator = UIViewPropertyAnimator(duration: 0.45, timingParameters: spring)
+
+    animator.addAnimations {
+      self.sheetContainer.transform = CGAffineTransform(translationX: 0, y: targetTy)
+    }
+    animator.addCompletion { [weak self] position in
+      guard let self, position == .end else { return }
+      self.stopDisplayLink()
+      self.emitPosition()
+      self.activeAnimator = nil
+      self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
+    }
+    animator.startAnimation()
+    activeAnimator = animator
+    startDisplayLink()
+  }
+
+  @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
+    let maxHeight = detentSpecs.last?.height ?? bounds.height
+
+    switch gesture.state {
+    case .began:
+      isPanning = true
+      gesture.setTranslation(.zero, in: self)
+      if let animator = activeAnimator {
+        stopDisplayLink()
+        let visual = sheetContainer.layer.presentation()?.affineTransform() ?? sheetContainer.transform
+        animator.stopAnimation(true)
+        sheetContainer.transform = visual
+        activeAnimator = nil
+      }
+
+    case .changed:
+      let delta = gesture.translation(in: self).y
+      gesture.setTranslation(.zero, in: self)
+      let minTy = draggableRange.minTy
+      let maxTy = draggableRange.maxTy
+      let newTy = max(minTy, min(maxTy, sheetContainer.transform.ty + delta))
+      sheetContainer.transform = CGAffineTransform(translationX: 0, y: newTy)
+      emitPosition()
+
+    case .ended, .cancelled:
+      isPanning = false
+      let velocity = gesture.velocity(in: self).y
+      let currentHeight = maxHeight - sheetContainer.transform.ty
+      let index = bestSnapIndex(for: currentHeight, velocity: velocity)
+      snapToIndex(index, velocity: velocity)
+
+    case .failed:
+      isPanning = false
+
+    default:
+      break
+    }
+  }
+
+  private func bestSnapIndex(for height: CGFloat, velocity: CGFloat) -> Int {
+    let draggable = detentSpecs.enumerated().filter { !$0.element.programmatic }
+    guard !draggable.isEmpty else { return targetIndex }
+
+    let flickThreshold: CGFloat = 600
+
+    if velocity < -flickThreshold {
+      return draggable.first(where: { $0.element.height > height })?.offset
+        ?? draggable.last?.offset ?? targetIndex
+    }
+    if velocity > flickThreshold {
+      return draggable.last(where: { $0.element.height < height })?.offset
+        ?? draggable.first?.offset ?? targetIndex
+    }
+
+    return draggable.min(by: {
+      abs($0.element.height - height) < abs($1.element.height - height)
+    })?.offset ?? targetIndex
+  }
+
+  private func firstScrollView(in view: UIView) -> UIScrollView? {
+    for subview in view.subviews {
+      if let scrollView = subview as? UIScrollView {
+        return scrollView
+      }
+      if let found = firstScrollView(in: subview) {
+        return found
+      }
+    }
+    return nil
+  }
+
+  public override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    guard gestureRecognizer === panGesture else { return true }
+
+    let velocity = panGesture.velocity(in: self)
+    guard abs(velocity.y) > abs(velocity.x) else { return false }
+
+    let maxDraggableIndex = detentSpecs.indices.last(where: { !detentSpecs[$0].programmatic }) ?? 0
+    guard targetIndex >= maxDraggableIndex else { return true }
+
+    if velocity.y < 0 {
+      return false
+    }
+
+    let scrollAtTop = (firstScrollView(in: sheetContainer)?.contentOffset.y ?? 0) <= 0
+    return scrollAtTop
+  }
+}
+
+extension RNSBottomSheetHostingView: UIGestureRecognizerDelegate {
+  public func gestureRecognizer(
+    _ gestureRecognizer: UIGestureRecognizer,
+    shouldBeRequiredToFailBy other: UIGestureRecognizer
+  ) -> Bool {
+    return gestureRecognizer === panGesture && other is UIPanGestureRecognizer
+  }
+
+  public func gestureRecognizer(
+    _ gestureRecognizer: UIGestureRecognizer,
+    shouldRecognizeSimultaneouslyWith other: UIGestureRecognizer
+  ) -> Bool {
+    return false
+  }
+}

package/lib/module/BottomSheet.js

@@ -1,8 +1,79 @@
 "use strict";
 
-import { BottomSheetBase } from "./BottomSheetBase.js";
-import { jsx as _jsx } from "react/jsx-runtime";
-export const BottomSheet = props => /*#__PURE__*/_jsx(BottomSheetBase, {
-  ...props
-});
+import { useState } from 'react';
+import { StyleSheet, View, useWindowDimensions } from 'react-native';
+import { runOnUI } from 'react-native-reanimated';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import BottomSheetNativeComponent from './BottomSheetNativeComponent';
+import { resolveDetent } from "./bottomSheetUtils.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export { programmatic } from "./bottomSheetUtils.js";
+export const BottomSheet = ({
+  children,
+  style,
+  detents = [0, 'max'],
+  index,
+  animateIn = true,
+  onIndexChange,
+  position
+}) => {
+  const {
+    height: screenHeight
+  } = useWindowDimensions();
+  const insets = useSafeAreaInsets();
+  const maxHeight = screenHeight - insets.top;
+  const [contentHeight, setContentHeight] = useState(0);
+  const resolvedDetents = detents.map(detent => {
+    const value = resolveDetent(detent, contentHeight, maxHeight);
+    return {
+      height: Math.max(0, Math.min(value, maxHeight)),
+      programmatic: isDetentProgrammatic(detent)
+    };
+  });
+  const handleSentinelLayout = event => {
+    setContentHeight(event.nativeEvent.layout.y);
+  };
+  const clampedIndex = Math.max(0, Math.min(index, resolvedDetents.length - 1));
+  const isCollapsed = (resolvedDetents[clampedIndex]?.height ?? 0) === 0;
+  const sheetPointerEvents = isCollapsed ? 'none' : 'box-none';
+  const handleIndexChange = event => {
+    onIndexChange?.(event.nativeEvent.index);
+  };
+  const handlePositionChange = event => {
+    if (position !== undefined) {
+      const height = event.nativeEvent.position;
+      runOnUI(() => {
+        'worklet';
+
+        position.set(height);
+      })();
+    }
+  };
+  return /*#__PURE__*/_jsx(View, {
+    pointerEvents: "box-none",
+    style: StyleSheet.absoluteFill,
+    children: /*#__PURE__*/_jsx(BottomSheetNativeComponent, {
+      pointerEvents: sheetPointerEvents,
+      style: [StyleSheet.absoluteFill, style],
+      detents: resolvedDetents,
+      index: index,
+      animateIn: animateIn,
+      onIndexChange: handleIndexChange,
+      onPositionChange: handlePositionChange,
+      children: /*#__PURE__*/_jsxs(View, {
+        pointerEvents: "box-none",
+        children: [children, /*#__PURE__*/_jsx(View, {
+          onLayout: handleSentinelLayout,
+          pointerEvents: "none"
+        })]
+      })
+    })
+  });
+};
+function isDetentProgrammatic(detent) {
+  if (typeof detent === 'object' && detent !== null) {
+    return detent.programmatic === true;
+  }
+  return false;
+}
 //# sourceMappingURL=BottomSheet.js.map

package/lib/module/BottomSheet.js.map

@@ -1 +1 @@
-{"version":3,"names":["BottomSheetBase","jsx","_jsx","BottomSheet","props"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":";;AACA,SAASA,eAAe,QAAQ,sBAAmB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAIpD,OAAO,MAAMC,WAAW,GAAIC,KAAuB,iBACjDF,IAAA,CAACF,eAAe;EAAA,GAAKI;AAAK,CAAG,CAC9B","ignoreList":[]}
+{"version":3,"names":["useState","StyleSheet","View","useWindowDimensions","runOnUI","useSafeAreaInsets","BottomSheetNativeComponent","resolveDetent","jsx","_jsx","jsxs","_jsxs","programmatic","BottomSheet","children","style","detents","index","animateIn","onIndexChange","position","height","screenHeight","insets","maxHeight","top","contentHeight","setContentHeight","resolvedDetents","map","detent","value","Math","max","min","isDetentProgrammatic","handleSentinelLayout","event","nativeEvent","layout","y","clampedIndex","length","isCollapsed","sheetPointerEvents","handleIndexChange","handlePositionChange","undefined","set","pointerEvents","absoluteFill","onPositionChange","onLayout"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/BottomSheetNativeComponent.ts

@@ -0,0 +1,24 @@
+import {
+  codegenNativeComponent,
+  type CodegenTypes,
+  type ViewProps,
+} from 'react-native';
+
+type NativeDetent = Readonly<{
+  height: CodegenTypes.Double;
+  programmatic: boolean;
+}>;
+
+export interface NativeProps extends ViewProps {
+  detents: ReadonlyArray<NativeDetent>;
+  index: CodegenTypes.Int32;
+  animateIn: boolean;
+  onIndexChange?: CodegenTypes.DirectEventHandler<
+    Readonly<{ index: CodegenTypes.Int32 }>
+  >;
+  onPositionChange?: CodegenTypes.DirectEventHandler<
+    Readonly<{ position: CodegenTypes.Double }>
+  >;
+}
+
+export default codegenNativeComponent<NativeProps>('BottomSheetView');

package/lib/module/index.js

@@ -5,6 +5,6 @@ export { ModalBottomSheet } from "./ModalBottomSheet.js";
 export { BottomSheetProvider } from "./BottomSheetProvider.js";
 export { BottomSheetFlatList } from "./BottomSheetFlatList.js";
 export { BottomSheetScrollView } from "./BottomSheetScrollView.js";
-export { programmatic } from "./BottomSheetBase.js";
+export { programmatic } from "./bottomSheetUtils.js";
 export { bottomSheetScrollable } from "./bottomSheetScrollable.js";
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["BottomSheet","ModalBottomSheet","BottomSheetProvider","BottomSheetFlatList","BottomSheetScrollView","programmatic","bottomSheetScrollable"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,kBAAe;AAE3C,SAASC,gBAAgB,QAAQ,uBAAoB;AAErD,SAASC,mBAAmB,QAAQ,0BAAuB;AAC3D,SAASC,mBAAmB,QAAQ,0BAAuB;AAE3D,SAASC,qBAAqB,QAAQ,4BAAyB;AAG/D,SAASC,YAAY,QAAQ,sBAAmB;AAChD,SAASC,qBAAqB,QAAQ,4BAAyB","ignoreList":[]}
+{"version":3,"names":["BottomSheet","ModalBottomSheet","BottomSheetProvider","BottomSheetFlatList","BottomSheetScrollView","programmatic","bottomSheetScrollable"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,kBAAe;AAE3C,SAASC,gBAAgB,QAAQ,uBAAoB;AAErD,SAASC,mBAAmB,QAAQ,0BAAuB;AAC3D,SAASC,mBAAmB,QAAQ,0BAAuB;AAE3D,SAASC,qBAAqB,QAAQ,4BAAyB;AAG/D,SAASC,YAAY,QAAQ,uBAAoB;AACjD,SAASC,qBAAqB,QAAQ,4BAAyB","ignoreList":[]}

package/lib/module/useBottomSheetPanGesture.js

@@ -130,16 +130,21 @@ export const useBottomSheetPanGesture = ({
     const resolvedDetents = detentsValue.value;
     const draggable = isDraggableValue.value;
     let maxDraggableTranslateY = sheetHeight.value;
+    let minDraggableTranslateY = 0;
     let foundDraggable = false;
     for (let i = 0; i < resolvedDetents.length; i++) {
       if (!(draggable[i] ?? true)) continue;
       const t = sheetHeight.value - (resolvedDetents[i] ?? 0);
-      if (!foundDraggable || t > maxDraggableTranslateY) {
+      if (!foundDraggable) {
         maxDraggableTranslateY = t;
+        minDraggableTranslateY = t;
         foundDraggable = true;
+      } else {
+        if (t > maxDraggableTranslateY) maxDraggableTranslateY = t;
+        if (t < minDraggableTranslateY) minDraggableTranslateY = t;
       }
     }
-    const nextTranslate = Math.min(Math.max(rawTranslate, 0), maxDraggableTranslateY);
+    const nextTranslate = Math.min(Math.max(rawTranslate, minDraggableTranslateY), maxDraggableTranslateY);
     translateY.set(nextTranslate);
     if (isDraggingSheet.value && rawTranslate < 0 && hasActive) {
       isDraggingSheet.set(false);