@tamagui/sheet 1.0.1-beta.133 → 1.0.1-beta.136

package/dist/cjs/SheetScrollView.js

@@ -0,0 +1,115 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var SheetScrollView_exports = {};
+__export(SheetScrollView_exports, {
+  SheetScrollView: () => SheetScrollView
+});
+module.exports = __toCommonJS(SheetScrollView_exports);
+var import_react = __toESM(require("react"));
+var import_react_native = require("react-native");
+var import_SheetContext = require("./SheetContext");
+const SHEET_SCROLL_VIEW_NAME = "SheetScrollView";
+const SheetScrollView = (0, import_react.forwardRef)(({ __scopeSheet, ...props }, ref) => {
+  const { scrollBridge } = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet);
+  const [scrollEnabled, setScrollEnabled] = (0, import_react.useState)(true);
+  const state = (0, import_react.useRef)({
+    lastPageY: 0,
+    dragAt: 0,
+    dys: [],
+    isScrolling: false
+  });
+  const release = () => {
+    scrollBridge.scrollStartY = -1;
+    state.current.isScrolling = false;
+    setScrollEnabled(true);
+    let vy = 0;
+    if (state.current.dys.length) {
+      const recentDys = state.current.dys.slice(-10);
+      const dist = recentDys.length ? recentDys.reduce((a, b) => a + b, 0) : 0;
+      const avgDy = dist / recentDys.length;
+      vy = avgDy * 0.04;
+      console.table([{ vy, avgDy, dist, recentDys }]);
+    }
+    state.current.dys = [];
+    scrollBridge.release({
+      dragAt: state.current.dragAt,
+      vy
+    });
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_react_native.ScrollView, {
+    ref,
+    scrollEventThrottle: 8,
+    scrollEnabled,
+    onScroll: (e) => {
+      const { y } = e.nativeEvent.contentOffset;
+      scrollBridge.y = y;
+      if (y > 0) {
+        scrollBridge.scrollStartY = -1;
+      }
+    },
+    onStartShouldSetResponder: () => {
+      scrollBridge.scrollStartY = -1;
+      return true;
+    },
+    onMoveShouldSetResponder: () => true,
+    onResponderMove: (e) => {
+      const { pageY } = e.nativeEvent;
+      if (state.current.isScrolling) {
+        return;
+      }
+      if (scrollBridge.scrollStartY === -1) {
+        scrollBridge.scrollStartY = pageY;
+        state.current.lastPageY = pageY;
+      }
+      const dragAt = pageY - scrollBridge.scrollStartY;
+      const dy = pageY - state.current.lastPageY;
+      state.current.lastPageY = pageY;
+      const isDraggingUp = dy < 0;
+      const isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY;
+      if ((dy === 0 || isDraggingUp) && isPaneAtTop) {
+        state.current.isScrolling = true;
+        setScrollEnabled(true);
+        return;
+      }
+      setScrollEnabled(false);
+      scrollBridge.drag(dragAt);
+      state.current.dragAt = dragAt;
+      state.current.dys.push(dy);
+      if (state.current.dys.length > 100) {
+        state.current.dys = state.current.dys.slice(-10);
+      }
+    },
+    onResponderRelease: release,
+    ...props,
+    style: [
+      {
+        flex: 1
+      },
+      props.style
+    ]
+  });
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SheetScrollView
+});
+//# sourceMappingURL=SheetScrollView.js.map

package/dist/cjs/SheetScrollView.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/SheetScrollView.tsx"],
+  "sourcesContent": ["import React, { forwardRef, useRef, useState } from 'react'\nimport { ScrollView, ScrollViewProps } from 'react-native'\n\nimport { useSheetContext } from './SheetContext'\nimport { SheetScopedProps } from './types'\n\n/* -------------------------------------------------------------------------------------------------\n * SheetScrollView\n * -----------------------------------------------------------------------------------------------*/\n\nconst SHEET_SCROLL_VIEW_NAME = 'SheetScrollView'\n\nexport const SheetScrollView = forwardRef<ScrollView, ScrollViewProps>(\n  ({ __scopeSheet, ...props }: SheetScopedProps<ScrollViewProps>, ref) => {\n    const { scrollBridge } = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet)\n    const [scrollEnabled, setScrollEnabled] = useState(true)\n    const state = useRef({\n      lastPageY: 0,\n      dragAt: 0,\n      dys: [] as number[], // store a few recent dys to get velocity on release\n      isScrolling: false,\n    })\n\n    const release = () => {\n      scrollBridge.scrollStartY = -1\n      state.current.isScrolling = false\n      setScrollEnabled(true)\n      let vy = 0\n      if (state.current.dys.length) {\n        const recentDys = state.current.dys.slice(-10)\n        const dist = recentDys.length ? recentDys.reduce((a, b) => a + b, 0) : 0\n        const avgDy = dist / recentDys.length\n        vy = avgDy * 0.04\n        console.table([{ vy, avgDy, dist, recentDys }])\n      }\n      state.current.dys = []\n      scrollBridge.release({\n        dragAt: state.current.dragAt,\n        vy,\n      })\n    }\n\n    return (\n      <ScrollView\n        ref={ref}\n        scrollEventThrottle={8}\n        scrollEnabled={scrollEnabled}\n        onScroll={(e) => {\n          const { y } = e.nativeEvent.contentOffset\n          scrollBridge.y = y\n          if (y > 0) {\n            scrollBridge.scrollStartY = -1\n          }\n        }}\n        onStartShouldSetResponder={() => {\n          scrollBridge.scrollStartY = -1\n          return true\n        }}\n        onMoveShouldSetResponder={() => true}\n        onResponderMove={(e) => {\n          const { pageY } = e.nativeEvent\n\n          if (state.current.isScrolling) {\n            return\n          }\n\n          if (scrollBridge.scrollStartY === -1) {\n            scrollBridge.scrollStartY = pageY\n            state.current.lastPageY = pageY\n          }\n\n          const dragAt = pageY - scrollBridge.scrollStartY\n          const dy = pageY - state.current.lastPageY\n          state.current.lastPageY = pageY // after dy\n          // const isAboveStart = dragAt <= 0\n          // const isDraggingDown = dy > 0\n          // const isScrollAtTop = scrollBridge.y <= 0\n          const isDraggingUp = dy < 0\n          const isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY\n\n          if ((dy === 0 || isDraggingUp) && isPaneAtTop) {\n            state.current.isScrolling = true\n            setScrollEnabled(true)\n            return\n          }\n\n          setScrollEnabled(false)\n          scrollBridge.drag(dragAt)\n          state.current.dragAt = dragAt\n          state.current.dys.push(dy)\n          // only do every so often, cut down to 10 again\n          if (state.current.dys.length > 100) {\n            state.current.dys = state.current.dys.slice(-10)\n          }\n        }}\n        onResponderRelease={release}\n        // onResponderEnd={release}\n        // onResponderTerminate={release}\n        {...props}\n        style={[\n          {\n            flex: 1,\n          },\n          props.style,\n        ]}\n      />\n    )\n  }\n)\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAoD;AACpD,0BAA4C;AAE5C,0BAAgC;AAOhC,MAAM,yBAAyB;AAExB,MAAM,kBAAkB,6BAC7B,CAAC,EAAE,iBAAiB,SAA4C,QAAQ;AACtE,QAAM,EAAE,iBAAiB,yCAAgB,wBAAwB,YAAY;AAC7E,QAAM,CAAC,eAAe,oBAAoB,2BAAS,IAAI;AACvD,QAAM,QAAQ,yBAAO;AAAA,IACnB,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,KAAK,CAAC;AAAA,IACN,aAAa;AAAA,EACf,CAAC;AAED,QAAM,UAAU,MAAM;AACpB,iBAAa,eAAe;AAC5B,UAAM,QAAQ,cAAc;AAC5B,qBAAiB,IAAI;AACrB,QAAI,KAAK;AACT,QAAI,MAAM,QAAQ,IAAI,QAAQ;AAC5B,YAAM,YAAY,MAAM,QAAQ,IAAI,MAAM,GAAG;AAC7C,YAAM,OAAO,UAAU,SAAS,UAAU,OAAO,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,IAAI;AACvE,YAAM,QAAQ,OAAO,UAAU;AAC/B,WAAK,QAAQ;AACb,cAAQ,MAAM,CAAC,EAAE,IAAI,OAAO,MAAM,UAAU,CAAC,CAAC;AAAA,IAChD;AACA,UAAM,QAAQ,MAAM,CAAC;AACrB,iBAAa,QAAQ;AAAA,MACnB,QAAQ,MAAM,QAAQ;AAAA,MACtB;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SACE,mDAAC;AAAA,IACC;AAAA,IACA,qBAAqB;AAAA,IACrB;AAAA,IACA,UAAU,CAAC,MAAM;AACf,YAAM,EAAE,MAAM,EAAE,YAAY;AAC5B,mBAAa,IAAI;AACjB,UAAI,IAAI,GAAG;AACT,qBAAa,eAAe;AAAA,MAC9B;AAAA,IACF;AAAA,IACA,2BAA2B,MAAM;AAC/B,mBAAa,eAAe;AAC5B,aAAO;AAAA,IACT;AAAA,IACA,0BAA0B,MAAM;AAAA,IAChC,iBAAiB,CAAC,MAAM;AACtB,YAAM,EAAE,UAAU,EAAE;AAEpB,UAAI,MAAM,QAAQ,aAAa;AAC7B;AAAA,MACF;AAEA,UAAI,aAAa,iBAAiB,IAAI;AACpC,qBAAa,eAAe;AAC5B,cAAM,QAAQ,YAAY;AAAA,MAC5B;AAEA,YAAM,SAAS,QAAQ,aAAa;AACpC,YAAM,KAAK,QAAQ,MAAM,QAAQ;AACjC,YAAM,QAAQ,YAAY;AAI1B,YAAM,eAAe,KAAK;AAC1B,YAAM,cAAc,aAAa,SAAS,aAAa;AAEvD,UAAK,QAAO,KAAK,iBAAiB,aAAa;AAC7C,cAAM,QAAQ,cAAc;AAC5B,yBAAiB,IAAI;AACrB;AAAA,MACF;AAEA,uBAAiB,KAAK;AACtB,mBAAa,KAAK,MAAM;AACxB,YAAM,QAAQ,SAAS;AACvB,YAAM,QAAQ,IAAI,KAAK,EAAE;AAEzB,UAAI,MAAM,QAAQ,IAAI,SAAS,KAAK;AAClC,cAAM,QAAQ,MAAM,MAAM,QAAQ,IAAI,MAAM,GAAG;AAAA,MACjD;AAAA,IACF;AAAA,IACA,oBAAoB;AAAA,IAGnB,GAAG;AAAA,IACJ,OAAO;AAAA,MACL;AAAA,QACE,MAAM;AAAA,MACR;AAAA,MACA,MAAM;AAAA,IACR;AAAA,GACF;AAEJ,CACF;",
+  "names": []
+}

package/dist/cjs/types.js

@@ -0,0 +1,17 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);
+//# sourceMappingURL=types.js.map

package/dist/cjs/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/types.tsx"],
+  "sourcesContent": ["import { ScopedProps } from '@tamagui/create-context'\nimport { RemoveScroll } from '@tamagui/remove-scroll'\nimport React, { ReactNode } from 'react'\nimport { Animated } from 'react-native'\n\nexport type SheetProps = ScopedProps<\n  {\n    open?: boolean\n    defaultOpen?: boolean\n    onChangeOpen?: OpenChangeHandler\n    position?: number\n    defaultPosition?: number\n    snapPoints?: number[]\n    onChangePosition?: PositionChangeHandler\n    children?: ReactNode\n    dismissOnOverlayPress?: boolean\n    dismissOnSnapToBottom?: boolean\n    animationConfig?: Animated.SpringAnimationConfig\n    handleDisableScroll?: boolean\n    disableDrag?: boolean\n    modal?: boolean\n  },\n  'Sheet'\n>\n\nexport type PositionChangeHandler = (position: number) => void\n\ntype OpenChangeHandler = ((open: boolean) => void) | React.Dispatch<React.SetStateAction<boolean>>\n\nexport type RemoveScrollProps = React.ComponentProps<typeof RemoveScroll>\n\nexport type SheetScopedProps<A> = ScopedProps<A, 'Sheet'>\n\nexport type ScrollBridge = {\n  enabled: boolean\n  y: number\n  paneY: number\n  paneMinY: number\n  scrollStartY: number\n  drag: (dy: number) => void\n  release: (state: { dragAt: number; vy: number }) => void\n  scrollLock: boolean\n  onFinishAnimate?: () => void\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
+  "names": []
+}

package/dist/esm/RemoveScrollProps.js

@@ -0,0 +1 @@
+//# sourceMappingURL=RemoveScrollProps.js.map

package/dist/esm/RemoveScrollProps.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/dist/esm/SHEET_HANDLE_NAME.js

@@ -0,0 +1,9 @@
+const constants = {};
+const SHEET_NAME = "Sheet";
+const SHEET_HANDLE_NAME = "SheetHandle";
+export {
+  SHEET_HANDLE_NAME,
+  SHEET_NAME,
+  constants
+};
+//# sourceMappingURL=SHEET_HANDLE_NAME.js.map

package/dist/esm/SHEET_HANDLE_NAME.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/SHEET_HANDLE_NAME.tsx"],
+  "sourcesContent": ["export const constants = {}\n\nexport const SHEET_NAME = 'Sheet'\nexport const SHEET_HANDLE_NAME = 'SheetHandle'\n"],
+  "mappings": "AAAO,MAAM,YAAY,CAAC;AAEnB,MAAM,aAAa;AACnB,MAAM,oBAAoB;",
+  "names": []
+}

package/dist/esm/Sheet.js

@@ -1,8 +1,6 @@
 import { useComposedRefs } from "@tamagui/compose-refs";
 import {
-  Slot,
   Theme,
-  composeEventHandlers,
   isClient,
   isWeb,
   mergeEvent,
@@ -14,9 +12,7 @@ import {
   useThemeName,
   withStaticProperties
 } from "@tamagui/core";
-import { createContextScope } from "@tamagui/create-context";
 import { Portal } from "@tamagui/portal";
-import { RemoveScroll } from "@tamagui/remove-scroll";
 import { XStack, YStack } from "@tamagui/stacks";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import React, {
@@ -32,41 +28,45 @@ import React, {
 } from "react";
 import {
   Animated,
-  PanResponder,
-  ScrollView
+  PanResponder
 } from "react-native";
-const SHEET_NAME = "Sheet";
-const SHEET_HANDLE_NAME = "SheetHandle";
-const [createSheetContext, createSheetScope] = createContextScope(SHEET_NAME);
-const [SheetProvider, useSheetContext] = createSheetContext(SHEET_NAME, {});
+import { SHEET_HANDLE_NAME, SHEET_NAME } from "./SHEET_HANDLE_NAME";
+import { SheetProvider, useSheetContext } from "./SheetContext";
+import { SheetScrollView } from "./SheetScrollView";
+import { createSheetScope } from "./SheetContext";
 const SheetHandleFrame = styled(XStack, {
   name: SHEET_HANDLE_NAME,
   height: 10,
   borderRadius: 100,
   backgroundColor: "$background",
-  position: "absolute",
-  pointerEvents: "auto",
   zIndex: 10,
-  y: -18,
-  top: 0,
-  left: "35%",
-  right: "35%",
+  marginHorizontal: "35%",
+  marginBottom: "$2",
   opacity: 0.5,
   hoverStyle: {
     opacity: 0.7
+  },
+  variants: {
+    open: {
+      true: {
+        pointerEvents: "auto"
+      },
+      false: {
+        opacity: 0,
+        pointerEvents: "none"
+      }
+    }
   }
 });
 const SheetHandle = SheetHandleFrame.extractable(({ __scopeSheet, ...props }) => {
   const context = useSheetContext(SHEET_HANDLE_NAME, __scopeSheet);
-  if (context.open === false) {
-    return null;
-  }
   return /* @__PURE__ */ React.createElement(SheetHandleFrame, {
     onPress: () => {
       const max = context.snapPoints.length + (context.dismissOnSnapToBottom ? -1 : 0);
       const nextPos = (context.position + 1) % max;
       context.setPosition(nextPos);
     },
+    open: context.open,
     ...props
   });
 });
@@ -91,81 +91,12 @@ const SheetOverlayFrame = styled(YStack, {
 });
 const SheetOverlay = SheetOverlayFrame.extractable(({ __scopeSheet, ...props }) => {
   const context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet);
-  return /* @__PURE__ */ React.createElement(RemoveScroll, {
-    enabled: context.open && context.modal,
-    as: Slot,
-    allowPinchZoom: context.allowPinchZoom,
-    shards: [context.contentRef],
-    removeScrollBar: false
-  }, /* @__PURE__ */ React.createElement(SheetOverlayFrame, {
+  return /* @__PURE__ */ React.createElement(SheetOverlayFrame, {
     closed: !context.open || context.hidden,
     ...props,
     onPress: mergeEvent(props.onPress, context.dismissOnOverlayPress ? () => {
       context.setOpen(false);
     } : void 0)
-  }));
-});
-const SHEET_SCROLL_VIEW_NAME = "SheetScrollView";
-const SheetScrollView = forwardRef(({ __scopeSheet, ...props }, ref) => {
-  const { scrollBridge } = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet);
-  const [scrollEnabled, setScrollEnabled] = useState(true);
-  const state = useRef({
-    dy: 0,
-    dys: []
-  });
-  const release = () => {
-    setScrollEnabled(true);
-    const recentDys = state.current.dys.slice(-10);
-    const dist = recentDys.length ? recentDys.reduce((a, b, i) => a + b - (recentDys[i - 1] ?? recentDys[0]), 0) : 0;
-    const avgDy = dist / recentDys.length;
-    const vy = avgDy * 0.075;
-    state.current.dys = [];
-    scrollBridge.release({
-      dy: state.current.dy,
-      vy
-    });
-  };
-  return /* @__PURE__ */ React.createElement(ScrollView, {
-    ref,
-    scrollEventThrottle: 16,
-    ...props,
-    scrollEnabled: props.scrollEnabled || scrollEnabled,
-    onScroll: composeEventHandlers(props.onScroll, (e) => {
-      const { y } = e.nativeEvent.contentOffset;
-      scrollBridge.y = y;
-      if (y > 0) {
-        scrollBridge.scrollStartY = -1;
-      }
-    }),
-    onResponderMove: composeEventHandlers(props.onResponderMove, (e) => {
-      const { pageY } = e.nativeEvent;
-      if (scrollBridge.y <= 0) {
-        if (scrollBridge.scrollStartY === -1) {
-          scrollBridge.scrollStartY = pageY;
-        }
-        const dy = pageY - scrollBridge.scrollStartY;
-        if (dy <= 0) {
-          setScrollEnabled(true);
-          return;
-        }
-        setScrollEnabled(false);
-        scrollBridge.drag(dy);
-        state.current.dy = dy;
-        state.current.dys.push(dy);
-        if (state.current.dys.length > 100) {
-          state.current.dys = state.current.dys.slice(-10);
-        }
-      }
-    }),
-    onResponderReject: composeEventHandlers(props.onResponderReject, release),
-    onResponderTerminate: composeEventHandlers(props.onResponderTerminate, release),
-    onResponderRelease: composeEventHandlers(props.onResponderRelease, release),
-    style: [
-      {
-        flex: 1
-      },
-      props.style
-    ]
   });
 });
 const selectionStyleSheet = isClient ? document.createElement("style") : null;
@@ -208,7 +139,7 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
     dismissOnSnapToBottom = false,
     disableDrag: disableDragProp,
     modal = false,
-    allowPinchZoom
+    handleDisableScroll = true
   } = props;
   if (process.env.NODE_ENV === "development") {
     if (snapPointsProp.some((p) => p < 0 || p > 100)) {
@@ -223,11 +154,14 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
   const scrollBridge = useConstant(() => ({
     enabled: false,
     y: 0,
+    paneY: 0,
+    paneMinY: 0,
     scrollStartY: -1,
     drag: () => {
     },
     release: () => {
-    }
+    },
+    scrollLock: false
   }));
   const onChangeOpenInternal = (val) => {
     var _a;
@@ -274,6 +208,10 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
     var _a;
     (_a = spring.current) == null ? void 0 : _a.stop();
     spring.current = null;
+    if (scrollBridge.onFinishAnimate) {
+      scrollBridge.onFinishAnimate();
+      scrollBridge.onFinishAnimate = void 0;
+    }
   }
   const shouldSetPositionOpen = open && position < 0;
   useEffect(() => {
@@ -327,6 +265,7 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
   useEffect(() => {
     positionValue.current.addListener(({ value }) => {
       at.current = value;
+      scrollBridge.paneY = value;
     });
     return () => {
       positionValue.current.removeAllListeners();
@@ -339,6 +278,7 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
       return;
     const pos = positionValue.current;
     const minY = positions[0];
+    scrollBridge.paneMinY = minY;
     let startY = at.current;
     function makeUnselectable(val) {
       if (!selectionStyleSheet)
@@ -349,12 +289,12 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
         selectionStyleSheet.innerText = `:root * { user-select: none !important; -webkit-user-select: none !important; }`;
       }
     }
-    const release = ({ vy, dy }) => {
+    const release = ({ vy, dragAt }) => {
       isExternalDrag = false;
       previouslyScrolling = false;
       makeUnselectable(false);
-      const at2 = dy + startY;
-      const end = at2 + frameSize * vy * 0.33;
+      const at2 = dragAt + startY;
+      const end = at2 + frameSize * vy * 0.2;
       let closestPoint = 0;
       let dist = Infinity;
       for (let i = 0; i < positions.length; i++) {
@@ -369,23 +309,26 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
       animateTo(closestPoint);
     };
     const finish = (_e, state) => {
-      release(state);
+      release({
+        vy: state.vy,
+        dragAt: state.dy
+      });
     };
     let previouslyScrolling = false;
     const onMoveShouldSet = (_e, { dy }) => {
-      if (scrollBridge.enabled) {
-        if (scrollBridge.y !== 0) {
-          previouslyScrolling = true;
-          return false;
-        }
-        if (scrollBridge.y === 0 && dy < 0) {
-          return false;
-        }
+      const isScrolled = scrollBridge.y !== 0;
+      if (isScrolled) {
+        previouslyScrolling = true;
+        return false;
       }
       if (previouslyScrolling) {
         previouslyScrolling = false;
         return true;
       }
+      const isDraggingUp = dy < 0;
+      if (!isScrolled && isDraggingUp) {
+        return false;
+      }
       return Math.abs(dy) > 8;
     };
     const grant = () => {
@@ -394,24 +337,24 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
       startY = at.current;
     };
     let isExternalDrag = false;
+    function setPositionValue(next) {
+      pos.setValue(next);
+    }
     scrollBridge.drag = (dy) => {
       if (!isExternalDrag) {
         isExternalDrag = true;
         grant();
       }
       const to = dy + startY;
-      pos.setValue(resisted(to, minY));
+      setPositionValue(resisted(to, minY));
     };
     scrollBridge.release = release;
     return PanResponder.create({
-      onMoveShouldSetPanResponder: (...args) => {
-        const res = onMoveShouldSet(...args);
-        return res;
-      },
+      onMoveShouldSetPanResponder: onMoveShouldSet,
       onPanResponderGrant: grant,
       onPanResponderMove: (_e, { dy }) => {
         const to = dy + startY;
-        pos.setValue(resisted(to, minY));
+        setPositionValue(resisted(to, minY));
       },
       onPanResponderEnd: finish,
       onPanResponderTerminate: finish,
@@ -450,7 +393,6 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
     contentRef,
     dismissOnOverlayPress,
     dismissOnSnapToBottom,
-    allowPinchZoom,
     open,
     hidden: isHidden,
     scope: __scopeSheet,
@@ -459,7 +401,7 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
     setPosition,
     setOpen,
     scrollBridge
-  }, isResizing ? null : overlayComponent, isHidden ? null : handleComponent, /* @__PURE__ */ React.createElement(Animated.View, {
+  }, isResizing ? null : overlayComponent, /* @__PURE__ */ React.createElement(Animated.View, {
     ref,
     ...panResponder == null ? void 0 : panResponder.panHandlers,
     onLayout: (e) => {
@@ -478,7 +420,7 @@ const Sheet = withStaticProperties(themeable(forwardRef(function Sheet2(props, r
       height: "100%",
       transform: [{ translateY }]
     }
-  }, isResizing ? null : frameComponent));
+  }, handleComponent, isResizing ? null : frameComponent));
   if (modal) {
     return /* @__PURE__ */ React.createElement(Portal, null, /* @__PURE__ */ React.createElement(Theme, {
       name: themeName
@@ -538,7 +480,6 @@ export {
   SheetHandleFrame,
   SheetOverlay,
   SheetOverlayFrame,
-  SheetScrollView,
   createSheetScope
 };
 //# sourceMappingURL=Sheet.js.map