@tamagui/sheet 1.130.2 → 1.130.4

package/dist/cjs/SheetScrollView.js

@@ -34,7 +34,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
     scrollEnabled: scrollEnabledProp,
     ...props
   }, ref) => {
-    const context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
+    const context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
       prop: scrollEnabledProp,
       defaultProp: !0
     }), scrollRef = import_react.default.useRef(null), setScrollEnabled = (next) => {
@@ -47,15 +47,15 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
       dys: [],
       // store a few recent dys to get velocity on release
       isScrolling: !1,
-      isDragging: !1
+      isDraggingScrollArea: !1
     });
     (0, import_react.useEffect)(() => (setHasScrollView(!0), () => {
       setHasScrollView(!1);
     }), []);
     const release = () => {
-      if (!state.current.isDragging)
+      if (!state.current.isDraggingScrollArea)
         return;
-      state.current.isDragging = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
+      state.current.isDraggingScrollArea = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
       let vy = 0;
       if (state.current.dys.length) {
         const recentDys = state.current.dys.slice(-10);
@@ -65,10 +65,38 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
         dragAt: state.current.dragAt,
         vy
       });
-    }, scrollable = scrollEnabled ?? scrollEnabled_;
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    }, scrollable = scrollEnabled;
+    (0, import_react.useEffect)(() => {
+      if (!import_core.isClient || !scrollRef.current) return;
+      const controller = new AbortController(), node = scrollRef.current.getScrollableNode();
+      node.addEventListener(
+        "touchmove",
+        (e) => {
+          scrollBridge.isParentDragging && node.scrollTo({
+            top: scrollBridge.y,
+            behavior: "instant"
+          });
+        },
+        {
+          signal: controller.signal,
+          passive: !1
+        }
+      );
+      const disposeBridgeListen = scrollBridge.onParentDragging((val) => {
+      });
+      return () => {
+        disposeBridgeListen(), controller.abort();
+      };
+    }, []);
+    const [hasScrollableContent, setHasScrollableContent] = (0, import_react.useState)(!0), parentHeight = (0, import_react.useRef)(0), contentHeight = (0, import_react.useRef)(0), setIsScrollable = () => {
+      parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
+    };
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
       import_scroll_view.ScrollView,
       {
+        onLayout: (e) => {
+          parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+        },
         ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
         flex: 1,
         scrollEventThrottle: 8,
@@ -79,7 +107,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
           const { y } = e.nativeEvent.contentOffset;
           scrollBridge.y = y, import_core.isWeb && (scrollBridge.scrollLock = y > 0), y > 0 && (scrollBridge.scrollStartY = -1), onScroll?.(e);
         },
-        onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDragging = !0, scrollable),
+        onStartShouldSetResponder: () => (scrollBridge.scrollStartY = -1, state.current.isDraggingScrollArea = !0, scrollable),
         onMoveShouldSetResponder: (e) => scrollable,
         contentContainerStyle: {
           minHeight: "100%"
@@ -87,21 +115,35 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = import_react
         onResponderMove: (e) => {
           if (import_core.isWeb) {
             const { pageY } = e.nativeEvent;
-            if (state.current.isScrolling)
-              return;
-            scrollBridge.scrollStartY === -1 && (scrollBridge.scrollStartY = pageY, state.current.lastPageY = pageY);
+            state.current.isScrolling || scrollBridge.scrollStartY === -1 && (scrollBridge.scrollStartY = pageY, state.current.lastPageY = pageY);
             const dragAt = pageY - scrollBridge.scrollStartY, dy = pageY - state.current.lastPageY;
             state.current.lastPageY = pageY;
             const isDraggingUp = dy < 0, isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY;
-            if ((dy === 0 || isDraggingUp) && isPaneAtTop) {
+            if (hasScrollableContent && (dy === 0 || isDraggingUp) && isPaneAtTop && !state.current.isScrolling) {
               state.current.isScrolling = !0, scrollBridge.scrollLock = !0, setScrollEnabled(!0);
               return;
             }
+            if (scrollBridge.y >= 0)
+              return;
             setScrollEnabled(!1), scrollBridge.drag(dragAt), state.current.dragAt = dragAt, state.current.dys.push(dy), state.current.dys.length > 100 && (state.current.dys = state.current.dys.slice(-10));
           }
         },
         ...props,
-        children
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+            import_core.View,
+            {
+              position: "absolute",
+              inset: 0,
+              pointerEvents: "none",
+              zIndex: -1,
+              onLayout: (e) => {
+                contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+              }
+            }
+          ),
+          children
+        ]
       }
     );
   }

package/dist/cjs/SheetScrollView.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SheetScrollView.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["React"]
 }

package/dist/cjs/SheetScrollView.native.js

@@ -26,94 +26,140 @@ __export(SheetScrollView_exports, {
   SheetScrollView: () => SheetScrollView
 });
 module.exports = __toCommonJS(SheetScrollView_exports);
-var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = require("@tamagui/compose-refs"), import_core = require("@tamagui/core"), import_scroll_view = require("@tamagui/scroll-view"), import_use_controllable_state = require("@tamagui/use-controllable-state"), import_react = __toESM(require("react")), import_SheetContext = require("./SheetContext"), SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ import_react.default.forwardRef(function(param, ref) {
-  var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
-    prop: scrollEnabledProp,
-    defaultProp: !0
-  }), scrollRef = import_react.default.useRef(null), setScrollEnabled = function(next) {
-    var _scrollRef_current_setNativeProps, _scrollRef_current;
-    (_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 || (_scrollRef_current_setNativeProps = _scrollRef_current.setNativeProps) === null || _scrollRef_current_setNativeProps === void 0 || _scrollRef_current_setNativeProps.call(_scrollRef_current, {
-      scrollEnabled: next
-    }), setScrollEnabled_(next);
-  }, state = import_react.default.useRef({
-    lastPageY: 0,
-    dragAt: 0,
-    dys: [],
-    // store a few recent dys to get velocity on release
-    isScrolling: !1,
-    isDragging: !1
-  });
-  (0, import_react.useEffect)(function() {
-    return setHasScrollView(!0), function() {
-      setHasScrollView(!1);
-    };
-  }, []);
-  var release = function() {
-    if (state.current.isDragging) {
-      state.current.isDragging = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
-      var vy = 0;
-      if (state.current.dys.length) {
-        var recentDys = state.current.dys.slice(-10), dist = recentDys.length ? recentDys.reduce(function(a, b) {
-          return a + b;
-        }, 0) : 0, avgDy = dist / recentDys.length;
-        vy = avgDy * 0.04;
-      }
-      state.current.dys = [], scrollBridge.release({
-        dragAt: state.current.dragAt,
-        vy
-      });
-    }
-  }, scrollable = scrollEnabled ?? scrollEnabled_;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_scroll_view.ScrollView, {
-    ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
-    flex: 1,
-    scrollEventThrottle: 8,
-    onResponderRelease: release,
-    className: "_ovs-contain",
-    scrollEnabled: scrollable,
-    // {...(Platform.OS === 'android' && {
-    //   pointerEvents: scrollable ? undefined : 'none',
-    // })}
-    onScroll: function(e) {
-      var { y } = e.nativeEvent.contentOffset;
-      scrollBridge.y = y, import_core.isWeb && (scrollBridge.scrollLock = y > 0), y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
-    },
-    // This assures that we do not skip the "scrollBridge" values processing
-    // when passing this prop into a <Sheet.ScrollView /> overriding it here
-    // Useful when using this ScrollView with lists such as "FlashList", i.e.
-    // ```
-    // renderScrollComponent={Sheet.ScrollView}
-    // ```
-    onStartShouldSetResponder: function() {
-      return scrollBridge.scrollStartY = -1, state.current.isDragging = !0, scrollable;
-    },
-    // setting to false while onResponderMove is disabled
-    onMoveShouldSetResponder: function(e) {
-      return scrollable;
-    },
-    contentContainerStyle: {
-      minHeight: "100%"
-    },
-    onResponderMove: function(e) {
-      if (import_core.isWeb) {
-        var { pageY } = e.nativeEvent;
-        if (state.current.isScrolling)
-          return;
-        scrollBridge.scrollStartY === -1 && (scrollBridge.scrollStartY = pageY, state.current.lastPageY = pageY);
-        var dragAt = pageY - scrollBridge.scrollStartY, dy = pageY - state.current.lastPageY;
-        state.current.lastPageY = pageY;
-        var isDraggingUp = dy < 0, isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY, shouldScrollLock = (dy === 0 || isDraggingUp) && isPaneAtTop;
-        if (shouldScrollLock) {
-          state.current.isScrolling = !0, scrollBridge.scrollLock = !0, setScrollEnabled(!0);
-          return;
+var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = require("@tamagui/compose-refs"), import_core = require("@tamagui/core"), import_scroll_view = require("@tamagui/scroll-view"), import_use_controllable_state = require("@tamagui/use-controllable-state"), import_react = __toESM(require("react")), import_SheetContext = require("./SheetContext"), SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ import_react.default.forwardRef(
+  // we disallow customizing it because we want to let people know it doens't work well with out measuring of inner content
+  // height using a view
+  function(param, ref) {
+    var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
+      prop: scrollEnabledProp,
+      defaultProp: !0
+    }), scrollRef = import_react.default.useRef(null), setScrollEnabled = function(next) {
+      var _scrollRef_current_setNativeProps, _scrollRef_current;
+      (_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 || (_scrollRef_current_setNativeProps = _scrollRef_current.setNativeProps) === null || _scrollRef_current_setNativeProps === void 0 || _scrollRef_current_setNativeProps.call(_scrollRef_current, {
+        scrollEnabled: next
+      }), setScrollEnabled_(next);
+    }, state = import_react.default.useRef({
+      lastPageY: 0,
+      dragAt: 0,
+      dys: [],
+      // store a few recent dys to get velocity on release
+      isScrolling: !1,
+      isDraggingScrollArea: !1
+    });
+    (0, import_react.useEffect)(function() {
+      return setHasScrollView(!0), function() {
+        setHasScrollView(!1);
+      };
+    }, []);
+    var release = function() {
+      if (state.current.isDraggingScrollArea) {
+        state.current.isDraggingScrollArea = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
+        var vy = 0;
+        if (state.current.dys.length) {
+          var recentDys = state.current.dys.slice(-10), dist = recentDys.length ? recentDys.reduce(function(a, b) {
+            return a + b;
+          }, 0) : 0, avgDy = dist / recentDys.length;
+          vy = avgDy * 0.04;
         }
-        setScrollEnabled(!1), scrollBridge.drag(dragAt), state.current.dragAt = dragAt, state.current.dys.push(dy), state.current.dys.length > 100 && (state.current.dys = state.current.dys.slice(-10));
+        state.current.dys = [], scrollBridge.release({
+          dragAt: state.current.dragAt,
+          vy
+        });
       }
-    },
-    ...props,
-    children
-  });
-});
+    }, scrollable = scrollEnabled;
+    (0, import_react.useEffect)(function() {
+      if (import_core.isClient && scrollRef.current) {
+        var controller = new AbortController(), node = scrollRef.current.getScrollableNode();
+        node.addEventListener(
+          "touchmove",
+          function(e) {
+            scrollBridge.isParentDragging && node.scrollTo({
+              top: scrollBridge.y,
+              behavior: "instant"
+            });
+          },
+          // can't preventdefault its not cancellable
+          {
+            signal: controller.signal,
+            passive: !1
+          }
+        );
+        var disposeBridgeListen = scrollBridge.onParentDragging(function(val) {
+        });
+        return function() {
+          disposeBridgeListen(), controller.abort();
+        };
+      }
+    }, []);
+    var [hasScrollableContent, setHasScrollableContent] = (0, import_react.useState)(!0), parentHeight = (0, import_react.useRef)(0), contentHeight = (0, import_react.useRef)(0), setIsScrollable = function() {
+      parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
+    };
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_scroll_view.ScrollView, {
+      onLayout: function(e) {
+        parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+      },
+      ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
+      flex: 1,
+      scrollEventThrottle: 8,
+      onResponderRelease: release,
+      className: "_ovs-contain",
+      scrollEnabled: scrollable,
+      // {...(Platform.OS === 'android' && {
+      //   pointerEvents: scrollable ? undefined : 'none',
+      // })}
+      onScroll: function(e) {
+        var { y } = e.nativeEvent.contentOffset;
+        scrollBridge.y = y, import_core.isWeb && (scrollBridge.scrollLock = y > 0), y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
+      },
+      // This assures that we do not skip the "scrollBridge" values processing
+      // when passing this prop into a <Sheet.ScrollView /> overriding it here
+      // Useful when using this ScrollView with lists such as "FlashList", i.e.
+      // ```
+      // renderScrollComponent={Sheet.ScrollView}
+      // ```
+      onStartShouldSetResponder: function() {
+        return scrollBridge.scrollStartY = -1, state.current.isDraggingScrollArea = !0, scrollable;
+      },
+      // setting to false while onResponderMove is disabled
+      onMoveShouldSetResponder: function(e) {
+        return scrollable;
+      },
+      contentContainerStyle: {
+        minHeight: "100%"
+      },
+      onResponderMove: function(e) {
+        if (import_core.isWeb) {
+          var { pageY } = e.nativeEvent;
+          state.current.isScrolling || scrollBridge.scrollStartY === -1 && (scrollBridge.scrollStartY = pageY, state.current.lastPageY = pageY);
+          var dragAt = pageY - scrollBridge.scrollStartY, dy = pageY - state.current.lastPageY;
+          state.current.lastPageY = pageY;
+          var isDraggingUp = dy < 0, isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY, shouldScrollLock = hasScrollableContent && (dy === 0 || isDraggingUp) && isPaneAtTop;
+          if (shouldScrollLock && !state.current.isScrolling) {
+            state.current.isScrolling = !0, scrollBridge.scrollLock = !0, setScrollEnabled(!0);
+            return;
+          }
+          if (scrollBridge.y >= 0)
+            return;
+          setScrollEnabled(!1), scrollBridge.drag(dragAt), state.current.dragAt = dragAt, state.current.dys.push(dy), state.current.dys.length > 100 && (state.current.dys = state.current.dys.slice(-10));
+        }
+      },
+      ...props,
+      children: [
+        /* content height measurer */
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.View, {
+          position: "absolute",
+          inset: 0,
+          pointerEvents: "none",
+          zIndex: -1,
+          onLayout: function(e) {
+            contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+          }
+        }),
+        children
+      ]
+    });
+  }
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SheetScrollView

package/dist/cjs/SheetScrollView.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SheetScrollView.tsx"],
-  "mappings": "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",
-  "names": ["SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "React", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "useSheetContext", "scrollBridge", "scrollEnabled_", "setHasScrollView", "setScrollEnabled_", "useControllableState", "prop", "defaultProp", "scrollRef", "useRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDragging", "useEffect", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "_jsx", "ScrollView", "composeRefs", "flex", "scrollEventThrottle", "onResponderRelease", "className", "e", "y", "nativeEvent", "contentOffset", "isWeb", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push"]
+  "mappings": "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",
+  "names": ["SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "React", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "useSheetContext", "scrollBridge", "setHasScrollView", "setScrollEnabled_", "useControllableState", "prop", "defaultProp", "scrollRef", "useRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDraggingScrollArea", "useEffect", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "isClient", "controller", "AbortController", "node", "getScrollableNode", "addEventListener", "e", "isParentDragging", "scrollTo", "top", "y", "behavior", "signal", "passive", "disposeBridgeListen", "onParentDragging", "val", "abort", "hasScrollableContent", "setHasScrollableContent", "useState", "parentHeight", "contentHeight", "setIsScrollable", "_jsxs", "ScrollView", "onLayout", "nativeEvent", "layout", "height", "composeRefs", "flex", "scrollEventThrottle", "onResponderRelease", "className", "contentOffset", "isWeb", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push", "_jsx", "View", "position", "inset", "pointerEvents", "zIndex"]
 }

package/dist/cjs/nativeSheet.cjs

@@ -58,7 +58,6 @@ function setupNativeSheet(platform, RNIOSModal) {
     }
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
       children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_SheetContext.SheetProvider, {
-        scrollEnabled: !0,
         setHasScrollView: emptyFn,
         ...providerProps,
         onlyShowFrame: !0,

package/dist/cjs/nativeSheet.js

@@ -35,29 +35,20 @@ function setupNativeSheet(platform, RNIOSModal) {
     function setOpenInternal(next) {
       props.onOpenChange?.(open), setOpen(next);
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-      import_SheetContext.SheetProvider,
-      {
-        scrollEnabled: !0,
-        setHasScrollView: emptyFn,
-        ...providerProps,
-        onlyShowFrame: !0,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModalSheetView, { ref, onModalDidDismiss: () => setOpenInternal(!1), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModalSheetViewMainContent, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: { flex: 1 }, children: props.children }) }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-            import_stacks.YStack,
-            {
-              position: "absolute",
-              opacity: 0,
-              pointerEvents: "none",
-              width: 0,
-              height: 0,
-              children: props.children
-            }
-          )
-        ]
-      }
-    ) });
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_SheetContext.SheetProvider, { setHasScrollView: emptyFn, ...providerProps, onlyShowFrame: !0, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModalSheetView, { ref, onModalDidDismiss: () => setOpenInternal(!1), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ModalSheetViewMainContent, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: { flex: 1 }, children: props.children }) }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_stacks.YStack,
+        {
+          position: "absolute",
+          opacity: 0,
+          pointerEvents: "none",
+          width: 0,
+          height: 0,
+          children: props.children
+        }
+      )
+    ] }) });
   });
 }
 const emptyFn = () => {

package/dist/cjs/nativeSheet.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nativeSheet.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB,4BAEvB,eAAkC,kBAClC,sBAAqB,yBACrB,sBAA8B,2BAE9B,2BAAkC,gCAClC,+BAAsC,oCAqD9B;AA/CR,MAAM,eAAmF;AAAA,EACvF,KAAK;AACP;AAEO,SAAS,eAAe,UAAgC;AAC7D,SAAO,aAAa,QAAQ;AAC9B;AAEO,SAAS,iBACd,UACA,YACA;AACA,QAAM,EAAE,gBAAgB,0BAA0B,IAAI;AAEtD,EAAI,aAAa,UACf,aAAa,QAAQ,IAAI,CAAC,UAAsB;AAC9C,UAAM,YAAQ,4CAAkB,KAAK,GAC/B,oBAAgB,oDAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,UAAM,qBAGT,MAAS;AAEZ,gCAAU,MAAM;AACd,MAAI,OACF,IAAI,SAAS,aAAa,IAE1B,IAAI,SAAS,aAAa;AAAA,IAE9B,GAAG,CAAC,IAAI,CAAC;AAET,aAAS,gBAAgB,MAAe;AACtC,YAAM,eAAe,IAAI,GACzB,QAAQ,IAAI;AAAA,IACd;AAQA,WACE,2EACE;AAAA,MAAC;AAAA;AAAA,QACC,eAAa;AAAA,QACb,kBAAkB;AAAA,QACjB,GAAG;AAAA,QACJ,eAAa;AAAA,QAEb;AAAA,sDAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,sDAAC,6BACC,sDAAC,4BAAK,OAAO,EAAE,MAAM,EAAE,GAAI,gBAAM,UAAS,GAC5C,GACF;AAAA,UAIA;AAAA,YAAC;AAAA;AAAA,cACC,UAAS;AAAA,cACT,SAAS;AAAA,cACT,eAAc;AAAA,cACd,OAAO;AAAA,cACP,QAAQ;AAAA,cAEP,gBAAM;AAAA;AAAA,UACT;AAAA;AAAA;AAAA,IACF,GACF;AAAA,EAEJ;AAEJ;AAEA,MAAM,UAAU,MAAM;AAEtB;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB,4BAEvB,eAAkC,kBAClC,sBAAqB,yBACrB,sBAA8B,2BAE9B,2BAAkC,gCAClC,+BAAsC,oCAqD9B;AA/CR,MAAM,eAAmF;AAAA,EACvF,KAAK;AACP;AAEO,SAAS,eAAe,UAAgC;AAC7D,SAAO,aAAa,QAAQ;AAC9B;AAEO,SAAS,iBACd,UACA,YACA;AACA,QAAM,EAAE,gBAAgB,0BAA0B,IAAI;AAEtD,EAAI,aAAa,UACf,aAAa,QAAQ,IAAI,CAAC,UAAsB;AAC9C,UAAM,YAAQ,4CAAkB,KAAK,GAC/B,oBAAgB,oDAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,UAAM,qBAGT,MAAS;AAEZ,gCAAU,MAAM;AACd,MAAI,OACF,IAAI,SAAS,aAAa,IAE1B,IAAI,SAAS,aAAa;AAAA,IAE9B,GAAG,CAAC,IAAI,CAAC;AAET,aAAS,gBAAgB,MAAe;AACtC,YAAM,eAAe,IAAI,GACzB,QAAQ,IAAI;AAAA,IACd;AAQA,WACE,2EACE,uDAAC,qCAAc,kBAAkB,SAAU,GAAG,eAAe,eAAa,IACxE;AAAA,kDAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,sDAAC,6BACC,sDAAC,4BAAK,OAAO,EAAE,MAAM,EAAE,GAAI,gBAAM,UAAS,GAC5C,GACF;AAAA,MAIA;AAAA,QAAC;AAAA;AAAA,UACC,UAAS;AAAA,UACT,SAAS;AAAA,UACT,eAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UAEP,gBAAM;AAAA;AAAA,MACT;AAAA,OACF,GACF;AAAA,EAEJ;AAEJ;AAEA,MAAM,UAAU,MAAM;AAEtB;",
   "names": []
 }

package/dist/cjs/nativeSheet.native.js

@@ -46,7 +46,6 @@ function setupNativeSheet(platform, RNIOSModal) {
     }
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
       children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_SheetContext.SheetProvider, {
-        scrollEnabled: !0,
         setHasScrollView: emptyFn,
         ...providerProps,
         onlyShowFrame: !0,

package/dist/cjs/nativeSheet.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nativeSheet.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;uDAAA,gBAAuB,4BAEvB,eAAkC,kBAClC,sBAAqB,yBACrB,sBAA8B,2BAE9B,2BAAkC,gCAClC,+BAAsC,oCAMhCA,eAAmF;EACvFC,KAAK;AACP;AAEO,SAASC,eAAeC,UAA8B;AAC3D,SAAOH,aAAaG,QAAAA;AACtB;AAEO,SAASC,iBACdD,UACAE,YAAmE;AAEnE,MAAM,EAAEC,gBAAgBC,0BAAyB,IAAKF;AAEtD,EAAIF,aAAa,UACfH,aAAaG,QAAAA,IAAY,SAACK,OAAAA;AACxB,QAAMC,YAAQC,4CAAkBF,KAAAA,GAC1BG,oBAAgBC,oDAAsBJ,OAAOC,KAAAA,GAI7C,EAAEI,MAAMC,QAAO,IAAKL,OACpBM,UAAMC,qBAGTC,MAAAA;AAEHC,gCAAU,WAAA;AACR,UAAIL,MAAM;YACRE;SAAAA,eAAAA,IAAII,aAAO,QAAXJ,iBAAAA,UAAAA,aAAaK,aAAY;MAC3B,OAAO;YACLL;SAAAA,gBAAAA,IAAII,aAAO,QAAXJ,kBAAAA,UAAAA,cAAaM,aAAY;MAC3B;IACF,GAAG;MAACR;KAAK;AAET,aAASS,gBAAgBC,MAAa;UACpCf;OAAAA,sBAAAA,MAAMgB,kBAAY,QAAlBhB,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBK,IAAAA,GACrBC,QAAQS,IAAAA;IACV;AAQA,WACE,uCAAAE,KAAA,mBAAAC,UAAA;gBACE,uCAAAC,MAACC,mCAAAA;QACCC,eAAa;QACbC,kBAAkBC;QACjB,GAAGpB;QACJqB,eAAa;;UAEb,uCAAAP,KAACnB,gBAAAA;YAAeS;YAAUkB,mBAAmB,WAAA;qBAAMX,gBAAgB,EAAA;;sBACjE,uCAAAG,KAAClB,2BAAAA;wBACC,uCAAAkB,KAACS,0BAAAA;gBAAKC,OAAO;kBAAEC,MAAM;gBAAE;0BAAI5B,MAAM6B;;;;;;UAMrC,uCAAAZ,KAACa,sBAAAA;YACCC,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPnC,MAAM6B;;;;;EAKjB;AAEJ;AAEA,IAAMN,UAAU,WAAA;AAEhB;",
-  "names": ["nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "RNIOSModal", "ModalSheetView", "ModalSheetViewMainContent", "props", "state", "useSheetOpenState", "providerProps", "useSheetProviderProps", "open", "setOpen", "ref", "useRef", "undefined", "useEffect", "current", "presentModal", "dismissModal", "setOpenInternal", "next", "onOpenChange", "_jsx", "_Fragment", "_jsxs", "SheetProvider", "scrollEnabled", "setHasScrollView", "emptyFn", "onlyShowFrame", "onModalDidDismiss", "View", "style", "flex", "children", "YStack", "position", "opacity", "pointerEvents", "width", "height"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;uDAAA,gBAAuB,4BAEvB,eAAkC,kBAClC,sBAAqB,yBACrB,sBAA8B,2BAE9B,2BAAkC,gCAClC,+BAAsC,oCAMhCA,eAAmF;EACvFC,KAAK;AACP;AAEO,SAASC,eAAeC,UAA8B;AAC3D,SAAOH,aAAaG,QAAAA;AACtB;AAEO,SAASC,iBACdD,UACAE,YAAmE;AAEnE,MAAM,EAAEC,gBAAgBC,0BAAyB,IAAKF;AAEtD,EAAIF,aAAa,UACfH,aAAaG,QAAAA,IAAY,SAACK,OAAAA;AACxB,QAAMC,YAAQC,4CAAkBF,KAAAA,GAC1BG,oBAAgBC,oDAAsBJ,OAAOC,KAAAA,GAI7C,EAAEI,MAAMC,QAAO,IAAKL,OACpBM,UAAMC,qBAGTC,MAAAA;AAEHC,gCAAU,WAAA;AACR,UAAIL,MAAM;YACRE;SAAAA,eAAAA,IAAII,aAAO,QAAXJ,iBAAAA,UAAAA,aAAaK,aAAY;MAC3B,OAAO;YACLL;SAAAA,gBAAAA,IAAII,aAAO,QAAXJ,kBAAAA,UAAAA,cAAaM,aAAY;MAC3B;IACF,GAAG;MAACR;KAAK;AAET,aAASS,gBAAgBC,MAAa;UACpCf;OAAAA,sBAAAA,MAAMgB,kBAAY,QAAlBhB,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBK,IAAAA,GACrBC,QAAQS,IAAAA;IACV;AAQA,WACE,uCAAAE,KAAA,mBAAAC,UAAA;gBACE,uCAAAC,MAACC,mCAAAA;QAAcC,kBAAkBC;QAAU,GAAGnB;QAAeoB,eAAa;;UACxE,uCAAAN,KAACnB,gBAAAA;YAAeS;YAAUiB,mBAAmB,WAAA;qBAAMV,gBAAgB,EAAA;;sBACjE,uCAAAG,KAAClB,2BAAAA;wBACC,uCAAAkB,KAACQ,0BAAAA;gBAAKC,OAAO;kBAAEC,MAAM;gBAAE;0BAAI3B,MAAM4B;;;;;;UAMrC,uCAAAX,KAACY,sBAAAA;YACCC,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPlC,MAAM4B;;;;;EAKjB;AAEJ;AAEA,IAAMN,UAAU,WAAA;AAEhB;",
+  "names": ["nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "RNIOSModal", "ModalSheetView", "ModalSheetViewMainContent", "props", "state", "useSheetOpenState", "providerProps", "useSheetProviderProps", "open", "setOpen", "ref", "useRef", "undefined", "useEffect", "current", "presentModal", "dismissModal", "setOpenInternal", "next", "onOpenChange", "_jsx", "_Fragment", "_jsxs", "SheetProvider", "setHasScrollView", "emptyFn", "onlyShowFrame", "onModalDidDismiss", "View", "style", "flex", "children", "YStack", "position", "opacity", "pointerEvents", "width", "height"]
 }

package/dist/cjs/types.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/types.tsx"],
-  "mappings": ";;;;;;;;;;;;AAuBI;;",
+  "mappings": ";;;;;;;;;;;;AAaI;;",
   "names": []
 }

package/dist/cjs/useSheetOpenState.cjs

@@ -33,12 +33,12 @@ const useSheetOpenState = props => {
     onOpenChangeInternal = val => {
       controller?.onOpenChange?.(val), props.onOpenChange?.(val);
     },
-    propVal = controller?.open ?? props.open,
+    propVal = props.preferAdaptParentOpenState ? controller?.open ?? props.open : props.open ?? controller?.open,
     [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
       prop: propVal,
       defaultProp: props.defaultOpen ?? !1,
       onChange: onOpenChangeInternal,
-      strategy: "prop-wins"
+      strategy: "most-recent-wins"
     });
   return {
     open,

package/dist/cjs/useSheetOpenState.js

@@ -21,11 +21,11 @@ var import_use_controllable_state = require("@tamagui/use-controllable-state"),
 const useSheetOpenState = (props) => {
   const { isHidden, controller } = (0, import_useSheetController.useSheetController)(), onOpenChangeInternal = (val) => {
     controller?.onOpenChange?.(val), props.onOpenChange?.(val);
-  }, propVal = controller?.open ?? props.open, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
+  }, propVal = props.preferAdaptParentOpenState ? controller?.open ?? props.open : props.open ?? controller?.open, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
     prop: propVal,
     defaultProp: props.defaultOpen ?? !1,
     onChange: onOpenChangeInternal,
-    strategy: "prop-wins"
+    strategy: "most-recent-wins"
   });
   return {
     open,

package/dist/cjs/useSheetOpenState.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useSheetOpenState.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAAqC,4CAGrC,4BAAmC;AAE5B,MAAM,oBAAoB,CAAC,UAAsB;AACtD,QAAM,EAAE,UAAU,WAAW,QAAI,8CAAmB,GAE9C,uBAAuB,CAAC,QAAiB;AAC7C,gBAAY,eAAe,GAAG,GAC9B,MAAM,eAAe,GAAG;AAAA,EAC1B,GAEM,UAAU,YAAY,QAAQ,MAAM,MACpC,CAAC,MAAM,OAAO,QAAI,oDAAqB;AAAA,IAC3C,MAAM;AAAA,IACN,aAAa,MAAM,eAAe;AAAA,IAClC,UAAU;AAAA,IACV,UAAU;AAAA,EACZ,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAAqC,4CAGrC,4BAAmC;AAE5B,MAAM,oBAAoB,CAAC,UAAsB;AACtD,QAAM,EAAE,UAAU,WAAW,QAAI,8CAAmB,GAE9C,uBAAuB,CAAC,QAAiB;AAC7C,gBAAY,eAAe,GAAG,GAC9B,MAAM,eAAe,GAAG;AAAA,EAC1B,GAEM,UAAU,MAAM,6BACjB,YAAY,QAAQ,MAAM,OAC1B,MAAM,QAAQ,YAAY,MAEzB,CAAC,MAAM,OAAO,QAAI,oDAAqB;AAAA,IAC3C,MAAM;AAAA,IACN,aAAa,MAAM,eAAe;AAAA,IAClC,UAAU;AAAA,IACV,UAAU;AAAA,EACZ,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/cjs/useSheetOpenState.native.js

@@ -22,11 +22,11 @@ var import_use_controllable_state = require("@tamagui/use-controllable-state"),
   var { isHidden, controller } = (0, import_useSheetController.useSheetController)(), onOpenChangeInternal = function(val) {
     var _controller_onOpenChange, _props_onOpenChange;
     controller == null || (_controller_onOpenChange = controller.onOpenChange) === null || _controller_onOpenChange === void 0 || _controller_onOpenChange.call(controller, val), (_props_onOpenChange = props.onOpenChange) === null || _props_onOpenChange === void 0 || _props_onOpenChange.call(props, val);
-  }, _controller_open, propVal = (_controller_open = controller == null ? void 0 : controller.open) !== null && _controller_open !== void 0 ? _controller_open : props.open, _props_defaultOpen, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
+  }, _controller_open, _props_open, propVal = props.preferAdaptParentOpenState ? (_controller_open = controller == null ? void 0 : controller.open) !== null && _controller_open !== void 0 ? _controller_open : props.open : (_props_open = props.open) !== null && _props_open !== void 0 ? _props_open : controller == null ? void 0 : controller.open, _props_defaultOpen, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
     prop: propVal,
     defaultProp: (_props_defaultOpen = props.defaultOpen) !== null && _props_defaultOpen !== void 0 ? _props_defaultOpen : !1,
     onChange: onOpenChangeInternal,
-    strategy: "prop-wins"
+    strategy: "most-recent-wins"
   });
   return {
     open,

package/dist/cjs/useSheetOpenState.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useSheetOpenState.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;oCAAqC,4CAGrC,4BAAmC,iCAEtBA,oBAAoB,SAACC,OAAAA;AAChC,MAAM,EAAEC,UAAUC,WAAU,QAAKC,8CAAAA,GAE3BC,uBAAuB,SAACC,KAAAA;QAC5BH,0BACAF;AADAE,kBAAAA,SAAAA,2BAAAA,WAAYI,kBAAY,QAAxBJ,6BAAAA,UAAAA,yBAAAA,KAAAA,YAA2BG,GAAAA,IAC3BL,sBAAAA,MAAMM,kBAAY,QAAlBN,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBK,GAAAA;EACvB,GAEgBH,kBAAVK,WAAUL,mBAAAA,cAAAA,OAAAA,SAAAA,WAAYM,UAAI,QAAhBN,qBAAAA,SAAAA,mBAAoBF,MAAMQ,MAG3BR,oBAFT,CAACQ,MAAMC,OAAAA,QAAWC,oDAAqB;IAC3CC,MAAMJ;IACNK,cAAaZ,qBAAAA,MAAMa,iBAAW,QAAjBb,uBAAAA,SAAAA,qBAAqB;IAClCc,UAAUV;IACVW,UAAU;EACZ,CAAA;AAEA,SAAO;IACLP;IACAC;IACAR;IACAC;EACF;AACF;",
-  "names": ["useSheetOpenState", "props", "isHidden", "controller", "useSheetController", "onOpenChangeInternal", "val", "onOpenChange", "propVal", "open", "setOpen", "useControllableState", "prop", "defaultProp", "defaultOpen", "onChange", "strategy"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;oCAAqC,4CAGrC,4BAAmC,iCAEtBA,oBAAoB,SAACC,OAAAA;AAChC,MAAM,EAAEC,UAAUC,WAAU,QAAKC,8CAAAA,GAE3BC,uBAAuB,SAACC,KAAAA;QAC5BH,0BACAF;AADAE,kBAAAA,SAAAA,2BAAAA,WAAYI,kBAAY,QAAxBJ,6BAAAA,UAAAA,yBAAAA,KAAAA,YAA2BG,GAAAA,IAC3BL,sBAAAA,MAAMM,kBAAY,QAAlBN,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBK,GAAAA;EACvB,GAGKH,kBACAF,aAFCO,UAAUP,MAAMQ,8BACjBN,mBAAAA,cAAAA,OAAAA,SAAAA,WAAYO,UAAI,QAAhBP,qBAAAA,SAAAA,mBAAoBF,MAAMS,QAC1BT,cAAAA,MAAMS,UAAI,QAAVT,gBAAAA,SAAAA,cAAcE,cAAAA,OAAAA,SAAAA,WAAYO,MAIhBT,oBAFT,CAACS,MAAMC,OAAAA,QAAWC,oDAAqB;IAC3CC,MAAML;IACNM,cAAab,qBAAAA,MAAMc,iBAAW,QAAjBd,uBAAAA,SAAAA,qBAAqB;IAClCe,UAAUX;IACVY,UAAU;EACZ,CAAA;AAEA,SAAO;IACLP;IACAC;IACAT;IACAC;EACF;AACF;",
+  "names": ["useSheetOpenState", "props", "isHidden", "controller", "useSheetController", "onOpenChangeInternal", "val", "onOpenChange", "propVal", "preferAdaptParentOpenState", "open", "setOpen", "useControllableState", "prop", "defaultProp", "defaultOpen", "onChange", "strategy"]
 }

package/dist/cjs/useSheetProviderProps.cjs

@@ -51,7 +51,7 @@ function useSheetProviderProps(props, state, options = {}) {
       prop: props.position,
       defaultProp: props.defaultPosition || (state.open ? 0 : -1),
       onChange: props.onPositionChange,
-      strategy: "prop-wins"
+      strategy: "most-recent-wins"
     }),
     position = state.open === !1 ? -1 : position_,
     {
@@ -79,16 +79,27 @@ function useSheetProviderProps(props, state, options = {}) {
     animationDriver
   } = (0, import_core.useConfiguration)();
   if (!animationDriver) throw new Error(process.env.NODE_ENV === "production" ? "\u274C 008" : "Must set animations in tamagui.config.ts");
-  const scrollBridge = (0, import_use_constant.useConstant)(() => ({
-      enabled: !1,
-      y: 0,
-      paneY: 0,
-      paneMinY: 0,
-      scrollStartY: -1,
-      drag: () => {},
-      release: () => {},
-      scrollLock: !1
-    })),
+  const scrollBridge = (0, import_use_constant.useConstant)(() => {
+      const parentDragListeners = /* @__PURE__ */new Set(),
+        bridge = {
+          enabled: !1,
+          y: 0,
+          paneY: 0,
+          paneMinY: 0,
+          scrollStartY: -1,
+          drag: () => {},
+          release: () => {},
+          scrollLock: !1,
+          isParentDragging: !1,
+          onParentDragging: cb => (parentDragListeners.add(cb), () => {
+            parentDragListeners.delete(cb);
+          }),
+          setParentDragging: val => {
+            val !== bridge.isParentDragging && (bridge.isParentDragging = val, parentDragListeners.forEach(cb => cb(val)));
+          }
+        };
+      return bridge;
+    }),
     removeScrollEnabled = props.forceRemoveScrollEnabled ?? (open && props.modal),
     maxSnapPoint = snapPoints[0];
   return {