@tamagui/sheet 1.130.2 → 1.130.4

package/dist/jsx/SheetScrollView.mjs.map

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

package/dist/jsx/SheetScrollView.native.js

@@ -1,98 +1,144 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { composeRefs } from "@tamagui/compose-refs";
-import { isWeb } from "@tamagui/core";
+import { isClient, isWeb, View } from "@tamagui/core";
 import { ScrollView } from "@tamagui/scroll-view";
 import { useControllableState } from "@tamagui/use-controllable-state";
-import React, { useEffect } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useSheetContext } from "./SheetContext";
-var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ React.forwardRef(function(param, ref) {
-  var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = useControllableState({
-    prop: scrollEnabledProp,
-    defaultProp: !0
-  }), scrollRef = React.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 = React.useRef({
-    lastPageY: 0,
-    dragAt: 0,
-    dys: [],
-    // store a few recent dys to get velocity on release
-    isScrolling: !1,
-    isDragging: !1
-  });
-  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__ */ _jsx(ScrollView, {
-    ref: 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, 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 (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 SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ React.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 = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = useControllableState({
+      prop: scrollEnabledProp,
+      defaultProp: !0
+    }), scrollRef = React.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 = React.useRef({
+      lastPageY: 0,
+      dragAt: 0,
+      dys: [],
+      // store a few recent dys to get velocity on release
+      isScrolling: !1,
+      isDraggingScrollArea: !1
+    });
+    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
+        });
+      }
+    }, scrollable = scrollEnabled;
+    useEffect(function() {
+      if (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();
+        };
       }
-    },
-    ...props,
-    children
-  });
-});
+    }, []);
+    var [hasScrollableContent, setHasScrollableContent] = useState(!0), parentHeight = useRef(0), contentHeight = useRef(0), setIsScrollable = function() {
+      parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
+    };
+    return /* @__PURE__ */ _jsxs(ScrollView, {
+      onLayout: function(e) {
+        parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+      },
+      ref: 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, 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 (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__ */ _jsx(View, {
+          position: "absolute",
+          inset: 0,
+          pointerEvents: "none",
+          zIndex: -1,
+          onLayout: function(e) {
+            contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+          }
+        }),
+        children
+      ]
+    });
+  }
+);
 export {
   SheetScrollView
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SheetScrollView.tsx"],
-  "mappings": "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",
-  "names": ["composeRefs", "isWeb", "ScrollView", "useControllableState", "React", "useEffect", "useSheetContext", "SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "scrollBridge", "scrollEnabled_", "setHasScrollView", "setScrollEnabled_", "prop", "defaultProp", "scrollRef", "useRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDragging", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "flex", "scrollEventThrottle", "onResponderRelease", "className", "e", "y", "nativeEvent", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push"]
+  "mappings": ";AAAA,SAASA,mBAAmB;AAC5B,SAASC,UAAUC,OAAOC,YAAyB;AAEnD,SAASC,kBAAkB;AAC3B,SAASC,4BAA4B;AACrC,OAAOC,SAASC,WAAWC,QAAQC,gBAAgB;AAEnD,SAASC,uBAAuB;AAShC,IAAMC,yBAAyB,mBAElBC,kBAAkBN,sBAAMO;;;EAMnC,SAAA,OAQEC,KAAAA;QAPA,EACEC,cACAC,UACAC,UACAC,eAAeC,mBACf,GAAGC,MAAAA,IAC+B,OAG9BC,UAAUX,gBAAgBC,wBAAwBI,YAAAA,GAClD,EAAEO,cAAcC,iBAAgB,IAAKF,SACrC,CAACH,eAAeM,iBAAAA,IAAqBnB,qBAAqB;MAC9DoB,MAAMN;MACNO,aAAa;IACf,CAAA,GACMC,YAAYrB,MAAME,OAA4B,IAAA,GAO9CoB,mBAAmB,SAACC,MAAAA;UACxBF,mCAAAA;OAAAA,qBAAAA,UAAUG,aAAO,QAAjBH,uBAAAA,WAAAA,oCAAAA,mBAAmBI,oBAAc,QAAjCJ,sCAAAA,UAAAA,kCAAAA,KAAAA,oBAAoC;QAClCT,eAAeW;MACjB,CAAA,GACAL,kBAAkBK,IAAAA;IACpB,GAEMG,QAAQ1B,MAAME,OAAO;MACzByB,WAAW;MACXC,QAAQ;MACRC,KAAK,CAAA;;MACLC,aAAa;MACbC,sBAAsB;IACxB,CAAA;AAEA9B,cAAU,WAAA;AACRgB,8BAAiB,EAAA,GACV,WAAA;AACLA,yBAAiB,EAAA;MACnB;IACF,GAAG,CAAA,CAAE;AAEL,QAAMe,UAAU,WAAA;AACd,UAAKN,MAAMF,QAAQO,sBAGnBL;cAAMF,QAAQO,uBAAuB,IACrCf,aAAaiB,eAAe,IAC5BjB,aAAakB,aAAa,IAC1BR,MAAMF,QAAQM,cAAc,IAC5BR,iBAAiB,EAAA;AACjB,YAAIa,KAAK;AACT,YAAIT,MAAMF,QAAQK,IAAIO,QAAQ;AAC5B,cAAMC,YAAYX,MAAMF,QAAQK,IAAIS,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;mBAAMD,IAAIC;aAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,eAAKQ,QAAQ;QACf;AACAjB,cAAMF,QAAQK,MAAM,CAAA,GACpBb,aAAagB,QAAQ;UACnBJ,QAAQF,MAAMF,QAAQI;UACtBO;QACF,CAAA;;IACF,GAEMS,aAAahC;AAEnBX,cAAU,WAAA;AACR,UAAKN,YACA0B,UAAUG,SAEf;YAAMqB,aAAa,IAAIC,gBAAAA,GAEjBC,OAAO1B,UAAUG,QAAQwB,kBAAiB;AAKhDD,aAAKE;UACH;UACA,SAACC,GAAAA;AACC,YAAIlC,aAAamC,oBACfJ,KAAKK,SAAS;cACZC,KAAKrC,aAAasC;cAClBC,UAAU;YACZ,CAAA;UAGJ;;UACA;YACEC,QAAQX,WAAWW;YACnBC,SAAS;UACX;QAAA;AAGF,YAAMC,sBAAsB1C,aAAa2C,iBAAiB,SAACC,KAAAA;QAG3D,CAAA;AAEA,eAAO,WAAA;AACLF,8BAAAA,GACAb,WAAWgB,MAAK;QAClB;;IACF,GAAG,CAAA,CAAE;AAEL,QAAM,CAACC,sBAAsBC,uBAAAA,IAA2B5D,SAAS,EAAA,GAC3D6D,eAAe9D,OAAO,CAAA,GACtB+D,gBAAgB/D,OAAO,CAAA,GAEvBgE,kBAAkB,WAAA;AACtB,MAAIF,aAAaxC,WAAWyC,cAAczC,WACxCuC,wBAAwBE,cAAczC,UAAUwC,aAAaxC,OAAO;IAExE;AAEA,WACE,sBAAC1B,YAAAA;MACCqE,UAAU,SAACjB,GAAAA;AACTc,qBAAaxC,UAAU0B,EAAEkB,YAAYC,OAAOC,QAC5CJ,gBAAAA;MACF;MACA1D,KAAKd,YAAY2B,WAAkBb,GAAAA;MACnC+D,MAAM;MACNC,qBAAqB;MACrBC,oBAAoBzC;MACpB0C,WAAU;MACV9D,eAAegC;;;;MAIfjC,UAAU,SAACuC,GAAAA;AACT,YAAM,EAAEI,EAAC,IAAKJ,EAAEkB,YAAYO;AAC5B3D,qBAAasC,IAAIA,GAEb1D,UACFoB,aAAakB,aAAaoB,IAAI,IAE5BA,IAAI,MACNtC,aAAaiB,eAAe,KAI9BtB,YAAAA,QAAAA,SAAWuC,CAAAA;MASb;;;;;;;MACA0B,2BAA2B,WAAA;AACzB5D,4BAAaiB,eAAe,IAC5BP,MAAMF,QAAQO,uBAAuB,IAC9Ba;MACT;;MAEAiC,0BAA0B,SAAC3B,GAAAA;AACzB,eAAON;MACT;MACAkC,uBAAuB;QACrBC,WAAW;MACb;MACAC,iBAAiB,SAAC9B,GAAAA;AAEhB,YAAItD,OAAO;AACT,cAAM,EAAEqF,MAAK,IAAK/B,EAAEkB;AAEpB,UAAK1C,MAAMF,QAAQM,eACbd,aAAaiB,iBAAiB,OAChCjB,aAAaiB,eAAegD,OAC5BvD,MAAMF,QAAQG,YAAYsD;AAI9B,cAAMrD,SAASqD,QAAQjE,aAAaiB,cAC9BiD,KAAKD,QAAQvD,MAAMF,QAAQG;AACjCD,gBAAMF,QAAQG,YAAYsD;AAC1B,cAAME,eAAeD,KAAK,GACpBE,cAAcpE,aAAaqE,SAASrE,aAAasE,UAEjDC,mBACJzB,yBAAyBoB,OAAO,KAAKC,iBAAiBC;AAExD,cAAIG,oBAAoB,CAAC7D,MAAMF,QAAQM,aAAa;AAClDJ,kBAAMF,QAAQM,cAAc,IAC5Bd,aAAakB,aAAa,IAC1BZ,iBAAiB,EAAA;AACjB;UACF;AAEA,cAAIN,aAAasC,KAAK;AACpB;AAGFhC,2BAAiB,EAAA,GACjBN,aAAawE,KAAK5D,MAAAA,GAClBF,MAAMF,QAAQI,SAASA,QACvBF,MAAMF,QAAQK,IAAI4D,KAAKP,EAAAA,GAEnBxD,MAAMF,QAAQK,IAAIO,SAAS,QAC7BV,MAAMF,QAAQK,MAAMH,MAAMF,QAAQK,IAAIS,MAAM,GAAC;QAEjD;MACF;MACC,GAAGxB;;;QAGJ,qBAACjB,MAAAA;UACC6F,UAAS;UACTC,OAAO;UACPC,eAAc;UACdC,QAAQ;UACR1B,UAAU,SAACjB,GAAAA;AACTe,0BAAczC,UAAU0B,EAAEkB,YAAYC,OAAOC,QAC7CJ,gBAAAA;UACF;;QAGDxD;;;EAGP;AAAA;",
+  "names": ["composeRefs", "isClient", "isWeb", "View", "ScrollView", "useControllableState", "React", "useEffect", "useRef", "useState", "useSheetContext", "SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "scrollBridge", "setHasScrollView", "setScrollEnabled_", "prop", "defaultProp", "scrollRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDraggingScrollArea", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "controller", "AbortController", "node", "getScrollableNode", "addEventListener", "e", "isParentDragging", "scrollTo", "top", "y", "behavior", "signal", "passive", "disposeBridgeListen", "onParentDragging", "val", "abort", "hasScrollableContent", "setHasScrollableContent", "parentHeight", "contentHeight", "setIsScrollable", "onLayout", "nativeEvent", "layout", "height", "flex", "scrollEventThrottle", "onResponderRelease", "className", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push", "position", "inset", "pointerEvents", "zIndex"]
 }

package/dist/jsx/nativeSheet.js

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

package/dist/jsx/nativeSheet.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nativeSheet.tsx"],
-  "mappings": "AAAA,SAAS,cAAc;AAEvB,SAAS,WAAW,cAAc;AAClC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAqD9B,mBASQ,KARN,YADF;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,QAAQ,kBAAkB,KAAK,GAC/B,gBAAgB,sBAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,MAAM,OAGT,MAAS;AAEZ,cAAU,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,gCACE;AAAA,MAAC;AAAA;AAAA,QACC,eAAa;AAAA,QACb,kBAAkB;AAAA,QACjB,GAAG;AAAA,QACJ,eAAa;AAAA,QAEb;AAAA,8BAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,8BAAC,6BACC,8BAAC,QAAK,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,SAAS,cAAc;AAEvB,SAAS,WAAW,cAAc;AAClC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAqD9B,mBAIQ,KAHN,YADF;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,QAAQ,kBAAkB,KAAK,GAC/B,gBAAgB,sBAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,MAAM,OAGT,MAAS;AAEZ,cAAU,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,gCACE,+BAAC,iBAAc,kBAAkB,SAAU,GAAG,eAAe,eAAa,IACxE;AAAA,0BAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,8BAAC,6BACC,8BAAC,QAAK,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/jsx/nativeSheet.mjs

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

package/dist/jsx/nativeSheet.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["YStack","useEffect","useRef","View","SheetProvider","useSheetOpenState","useSheetProviderProps","Fragment","jsx","jsxs","nativeSheets","ios","getNativeSheet","platform","setupNativeSheet","RNIOSModal","ModalSheetView","ModalSheetViewMainContent","props","state","providerProps","open","setOpen","ref","current","presentModal","dismissModal","setOpenInternal","next","onOpenChange","children","scrollEnabled","setHasScrollView","emptyFn","onlyShowFrame","onModalDidDismiss","style","flex","position","opacity","pointerEvents","width","height"],"sources":["../../src/nativeSheet.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAEvB,SAASC,SAAA,EAAWC,MAAA,QAAc;AAClC,SAASC,IAAA,QAAY;AACrB,SAASC,aAAA,QAAqB;AAE9B,SAASC,iBAAA,QAAyB;AAClC,SAASC,qBAAA,QAA6B;AAqD9B,SAAAC,QAAA,EASQC,GAAA,EARNC,IAAA,QADF;AA/CR,MAAMC,YAAA,GAAmF;EACvFC,GAAA,EAAK;AACP;AAEO,SAASC,eAAeC,QAAA,EAAgC;EAC7D,OAAOH,YAAA,CAAaG,QAAQ;AAC9B;AAEO,SAASC,iBACdD,QAAA,EACAE,UAAA,EACA;EACA,MAAM;IAAEC,cAAA;IAAgBC;EAA0B,IAAIF,UAAA;EAElDF,QAAA,KAAa,UACfH,YAAA,CAAaG,QAAQ,IAAKK,KAAA,IAAsB;IAC9C,MAAMC,KAAA,GAAQd,iBAAA,CAAkBa,KAAK;MAC/BE,aAAA,GAAgBd,qBAAA,CAAsBY,KAAA,EAAOC,KAAK;MAIlD;QAAEE,IAAA;QAAMC;MAAQ,IAAIH,KAAA;MACpBI,GAAA,GAAMrB,MAAA,CAGT,MAAS;IAEZD,SAAA,CAAU,MAAM;MACVoB,IAAA,GACFE,GAAA,CAAIC,OAAA,EAASC,YAAA,CAAa,IAE1BF,GAAA,CAAIC,OAAA,EAASE,YAAA,CAAa;IAE9B,GAAG,CAACL,IAAI,CAAC;IAET,SAASM,gBAAgBC,IAAA,EAAe;MACtCV,KAAA,CAAMW,YAAA,GAAeR,IAAI,GACzBC,OAAA,CAAQM,IAAI;IACd;IAQA,OACE,eAAApB,GAAA,CAAAD,QAAA;MACEuB,QAAA,iBAAArB,IAAA,CAACL,aAAA;QACC2B,aAAA,EAAa;QACbC,gBAAA,EAAkBC,OAAA;QACjB,GAAGb,aAAA;QACJc,aAAA,EAAa;QAEbJ,QAAA,kBAAAtB,GAAA,CAACQ,cAAA;UAAeO,GAAA;UAAUY,iBAAA,EAAmBA,CAAA,KAAMR,eAAA,CAAgB,EAAK;UACtEG,QAAA,iBAAAtB,GAAA,CAACS,yBAAA;YACCa,QAAA,iBAAAtB,GAAA,CAACL,IAAA;cAAKiC,KAAA,EAAO;gBAAEC,IAAA,EAAM;cAAE;cAAIP,QAAA,EAAAZ,KAAA,CAAMY;YAAA,CAAS;UAAA,CAC5C;QAAA,CACF,GAIA,eAAAtB,GAAA,CAACR,MAAA;UACCsC,QAAA,EAAS;UACTC,OAAA,EAAS;UACTC,aAAA,EAAc;UACdC,KAAA,EAAO;UACPC,MAAA,EAAQ;UAEPZ,QAAA,EAAAZ,KAAA,CAAMY;QAAA,CACT;MAAA,CACF;IAAA,CACF;EAEJ;AAEJ;AAEA,MAAMG,OAAA,GAAUA,CAAA,KAAM,CAEtB","ignoreList":[]}
+{"version":3,"names":["YStack","useEffect","useRef","View","SheetProvider","useSheetOpenState","useSheetProviderProps","Fragment","jsx","jsxs","nativeSheets","ios","getNativeSheet","platform","setupNativeSheet","RNIOSModal","ModalSheetView","ModalSheetViewMainContent","props","state","providerProps","open","setOpen","ref","current","presentModal","dismissModal","setOpenInternal","next","onOpenChange","children","setHasScrollView","emptyFn","onlyShowFrame","onModalDidDismiss","style","flex","position","opacity","pointerEvents","width","height"],"sources":["../../src/nativeSheet.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAA,QAAc;AAEvB,SAASC,SAAA,EAAWC,MAAA,QAAc;AAClC,SAASC,IAAA,QAAY;AACrB,SAASC,aAAA,QAAqB;AAE9B,SAASC,iBAAA,QAAyB;AAClC,SAASC,qBAAA,QAA6B;AAqD9B,SAAAC,QAAA,EAIQC,GAAA,EAHNC,IAAA,QADF;AA/CR,MAAMC,YAAA,GAAmF;EACvFC,GAAA,EAAK;AACP;AAEO,SAASC,eAAeC,QAAA,EAAgC;EAC7D,OAAOH,YAAA,CAAaG,QAAQ;AAC9B;AAEO,SAASC,iBACdD,QAAA,EACAE,UAAA,EACA;EACA,MAAM;IAAEC,cAAA;IAAgBC;EAA0B,IAAIF,UAAA;EAElDF,QAAA,KAAa,UACfH,YAAA,CAAaG,QAAQ,IAAKK,KAAA,IAAsB;IAC9C,MAAMC,KAAA,GAAQd,iBAAA,CAAkBa,KAAK;MAC/BE,aAAA,GAAgBd,qBAAA,CAAsBY,KAAA,EAAOC,KAAK;MAIlD;QAAEE,IAAA;QAAMC;MAAQ,IAAIH,KAAA;MACpBI,GAAA,GAAMrB,MAAA,CAGT,MAAS;IAEZD,SAAA,CAAU,MAAM;MACVoB,IAAA,GACFE,GAAA,CAAIC,OAAA,EAASC,YAAA,CAAa,IAE1BF,GAAA,CAAIC,OAAA,EAASE,YAAA,CAAa;IAE9B,GAAG,CAACL,IAAI,CAAC;IAET,SAASM,gBAAgBC,IAAA,EAAe;MACtCV,KAAA,CAAMW,YAAA,GAAeR,IAAI,GACzBC,OAAA,CAAQM,IAAI;IACd;IAQA,OACE,eAAApB,GAAA,CAAAD,QAAA;MACEuB,QAAA,iBAAArB,IAAA,CAACL,aAAA;QAAc2B,gBAAA,EAAkBC,OAAA;QAAU,GAAGZ,aAAA;QAAea,aAAA,EAAa;QACxEH,QAAA,kBAAAtB,GAAA,CAACQ,cAAA;UAAeO,GAAA;UAAUW,iBAAA,EAAmBA,CAAA,KAAMP,eAAA,CAAgB,EAAK;UACtEG,QAAA,iBAAAtB,GAAA,CAACS,yBAAA;YACCa,QAAA,iBAAAtB,GAAA,CAACL,IAAA;cAAKgC,KAAA,EAAO;gBAAEC,IAAA,EAAM;cAAE;cAAIN,QAAA,EAAAZ,KAAA,CAAMY;YAAA,CAAS;UAAA,CAC5C;QAAA,CACF,GAIA,eAAAtB,GAAA,CAACR,MAAA;UACCqC,QAAA,EAAS;UACTC,OAAA,EAAS;UACTC,aAAA,EAAc;UACdC,KAAA,EAAO;UACPC,MAAA,EAAQ;UAEPX,QAAA,EAAAZ,KAAA,CAAMY;QAAA,CACT;MAAA,CACF;IAAA,CACF;EAEJ;AAEJ;AAEA,MAAME,OAAA,GAAUA,CAAA,KAAM,CAEtB","ignoreList":[]}

package/dist/jsx/nativeSheet.native.js

@@ -32,7 +32,6 @@ function setupNativeSheet(platform, RNIOSModal) {
     }
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsxs(SheetProvider, {
-        scrollEnabled: !0,
         setHasScrollView: emptyFn,
         ...providerProps,
         onlyShowFrame: !0,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nativeSheet.tsx"],
-  "mappings": ";AAAA,SAASA,cAAc;AAEvB,SAASC,WAAWC,cAAc;AAClC,SAASC,YAAY;AACrB,SAASC,qBAAqB;AAE9B,SAASC,yBAAyB;AAClC,SAASC,6BAA6B;AAMtC,IAAMC,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,QAAQX,kBAAkBU,KAAAA,GAC1BE,gBAAgBX,sBAAsBS,OAAOC,KAAAA,GAI7C,EAAEE,MAAMC,QAAO,IAAKH,OACpBI,MAAMlB,OAGTmB,MAAAA;AAEHpB,cAAU,WAAA;AACR,UAAIiB,MAAM;YACRE;SAAAA,eAAAA,IAAIE,aAAO,QAAXF,iBAAAA,UAAAA,aAAaG,aAAY;MAC3B,OAAO;YACLH;SAAAA,gBAAAA,IAAIE,aAAO,QAAXF,kBAAAA,UAAAA,cAAaI,aAAY;MAC3B;IACF,GAAG;MAACN;KAAK;AAET,aAASO,gBAAgBC,MAAa;UACpCX;OAAAA,sBAAAA,MAAMY,kBAAY,QAAlBZ,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBG,IAAAA,GACrBC,QAAQO,IAAAA;IACV;AAQA,WACE,qBAAA,WAAA;gBACE,sBAACtB,eAAAA;QACCwB,eAAa;QACbC,kBAAkBC;QACjB,GAAGb;QACJc,eAAa;;UAEb,qBAAClB,gBAAAA;YAAeO;YAAUY,mBAAmB,WAAA;qBAAMP,gBAAgB,EAAA;;sBACjE,qBAACX,2BAAAA;wBACC,qBAACX,MAAAA;gBAAK8B,OAAO;kBAAEC,MAAM;gBAAE;0BAAInB,MAAMoB;;;;;;UAMrC,qBAACnC,QAAAA;YACCoC,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPzB,MAAMoB;;;;;EAKjB;AAEJ;AAEA,IAAML,UAAU,WAAA;AAEhB;",
-  "names": ["YStack", "useEffect", "useRef", "View", "SheetProvider", "useSheetOpenState", "useSheetProviderProps", "nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "RNIOSModal", "ModalSheetView", "ModalSheetViewMainContent", "props", "state", "providerProps", "open", "setOpen", "ref", "undefined", "current", "presentModal", "dismissModal", "setOpenInternal", "next", "onOpenChange", "scrollEnabled", "setHasScrollView", "emptyFn", "onlyShowFrame", "onModalDidDismiss", "style", "flex", "children", "position", "opacity", "pointerEvents", "width", "height"]
+  "mappings": ";AAAA,SAASA,cAAc;AAEvB,SAASC,WAAWC,cAAc;AAClC,SAASC,YAAY;AACrB,SAASC,qBAAqB;AAE9B,SAASC,yBAAyB;AAClC,SAASC,6BAA6B;AAMtC,IAAMC,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,QAAQX,kBAAkBU,KAAAA,GAC1BE,gBAAgBX,sBAAsBS,OAAOC,KAAAA,GAI7C,EAAEE,MAAMC,QAAO,IAAKH,OACpBI,MAAMlB,OAGTmB,MAAAA;AAEHpB,cAAU,WAAA;AACR,UAAIiB,MAAM;YACRE;SAAAA,eAAAA,IAAIE,aAAO,QAAXF,iBAAAA,UAAAA,aAAaG,aAAY;MAC3B,OAAO;YACLH;SAAAA,gBAAAA,IAAIE,aAAO,QAAXF,kBAAAA,UAAAA,cAAaI,aAAY;MAC3B;IACF,GAAG;MAACN;KAAK;AAET,aAASO,gBAAgBC,MAAa;UACpCX;OAAAA,sBAAAA,MAAMY,kBAAY,QAAlBZ,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBG,IAAAA,GACrBC,QAAQO,IAAAA;IACV;AAQA,WACE,qBAAA,WAAA;gBACE,sBAACtB,eAAAA;QAAcwB,kBAAkBC;QAAU,GAAGZ;QAAea,eAAa;;UACxE,qBAACjB,gBAAAA;YAAeO;YAAUW,mBAAmB,WAAA;qBAAMN,gBAAgB,EAAA;;sBACjE,qBAACX,2BAAAA;wBACC,qBAACX,MAAAA;gBAAK6B,OAAO;kBAAEC,MAAM;gBAAE;0BAAIlB,MAAMmB;;;;;;UAMrC,qBAAClC,QAAAA;YACCmC,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPxB,MAAMmB;;;;;EAKjB;AAEJ;AAEA,IAAML,UAAU,WAAA;AAEhB;",
+  "names": ["YStack", "useEffect", "useRef", "View", "SheetProvider", "useSheetOpenState", "useSheetProviderProps", "nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "RNIOSModal", "ModalSheetView", "ModalSheetViewMainContent", "props", "state", "providerProps", "open", "setOpen", "ref", "undefined", "current", "presentModal", "dismissModal", "setOpenInternal", "next", "onOpenChange", "setHasScrollView", "emptyFn", "onlyShowFrame", "onModalDidDismiss", "style", "flex", "children", "position", "opacity", "pointerEvents", "width", "height"]
 }

package/dist/jsx/useSheetOpenState.js

@@ -3,11 +3,11 @@ import { useSheetController } from "./useSheetController";
 const useSheetOpenState = (props) => {
   const { isHidden, controller } = useSheetController(), onOpenChangeInternal = (val) => {
     controller?.onOpenChange?.(val), props.onOpenChange?.(val);
-  }, propVal = controller?.open ?? props.open, [open, setOpen] = useControllableState({
+  }, propVal = props.preferAdaptParentOpenState ? controller?.open ?? props.open : props.open ?? controller?.open, [open, setOpen] = useControllableState({
     prop: propVal,
     defaultProp: props.defaultOpen ?? !1,
     onChange: onOpenChangeInternal,
-    strategy: "prop-wins"
+    strategy: "most-recent-wins"
   });
   return {
     open,

package/dist/jsx/useSheetOpenState.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useSheetOpenState.tsx"],
-  "mappings": "AAAA,SAAS,4BAA4B;AAGrC,SAAS,0BAA0B;AAE5B,MAAM,oBAAoB,CAAC,UAAsB;AACtD,QAAM,EAAE,UAAU,WAAW,IAAI,mBAAmB,GAE9C,uBAAuB,CAAC,QAAiB;AAC7C,gBAAY,eAAe,GAAG,GAC9B,MAAM,eAAe,GAAG;AAAA,EAC1B,GAEM,UAAU,YAAY,QAAQ,MAAM,MACpC,CAAC,MAAM,OAAO,IAAI,qBAAqB;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,SAAS,4BAA4B;AAGrC,SAAS,0BAA0B;AAE5B,MAAM,oBAAoB,CAAC,UAAsB;AACtD,QAAM,EAAE,UAAU,WAAW,IAAI,mBAAmB,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,IAAI,qBAAqB;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/jsx/useSheetOpenState.mjs

@@ -8,12 +8,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] = useControllableState({
       prop: propVal,
       defaultProp: props.defaultOpen ?? !1,
       onChange: onOpenChangeInternal,
-      strategy: "prop-wins"
+      strategy: "most-recent-wins"
     });
   return {
     open,

package/dist/jsx/useSheetOpenState.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useControllableState","useSheetController","useSheetOpenState","props","isHidden","controller","onOpenChangeInternal","val","onOpenChange","propVal","open","setOpen","prop","defaultProp","defaultOpen","onChange","strategy"],"sources":["../../src/useSheetOpenState.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,oBAAA,QAA4B;AAGrC,SAASC,kBAAA,QAA0B;AAE5B,MAAMC,iBAAA,GAAqBC,KAAA,IAAsB;EACtD,MAAM;MAAEC,QAAA;MAAUC;IAAW,IAAIJ,kBAAA,CAAmB;IAE9CK,oBAAA,GAAwBC,GAAA,IAAiB;MAC7CF,UAAA,EAAYG,YAAA,GAAeD,GAAG,GAC9BJ,KAAA,CAAMK,YAAA,GAAeD,GAAG;IAC1B;IAEME,OAAA,GAAUJ,UAAA,EAAYK,IAAA,IAAQP,KAAA,CAAMO,IAAA;IACpC,CAACA,IAAA,EAAMC,OAAO,IAAIX,oBAAA,CAAqB;MAC3CY,IAAA,EAAMH,OAAA;MACNI,WAAA,EAAaV,KAAA,CAAMW,WAAA,IAAe;MAClCC,QAAA,EAAUT,oBAAA;MACVU,QAAA,EAAU;IACZ,CAAC;EAED,OAAO;IACLN,IAAA;IACAC,OAAA;IACAP,QAAA;IACAC;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["useControllableState","useSheetController","useSheetOpenState","props","isHidden","controller","onOpenChangeInternal","val","onOpenChange","propVal","preferAdaptParentOpenState","open","setOpen","prop","defaultProp","defaultOpen","onChange","strategy"],"sources":["../../src/useSheetOpenState.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,oBAAA,QAA4B;AAGrC,SAASC,kBAAA,QAA0B;AAE5B,MAAMC,iBAAA,GAAqBC,KAAA,IAAsB;EACtD,MAAM;MAAEC,QAAA;MAAUC;IAAW,IAAIJ,kBAAA,CAAmB;IAE9CK,oBAAA,GAAwBC,GAAA,IAAiB;MAC7CF,UAAA,EAAYG,YAAA,GAAeD,GAAG,GAC9BJ,KAAA,CAAMK,YAAA,GAAeD,GAAG;IAC1B;IAEME,OAAA,GAAUN,KAAA,CAAMO,0BAAA,GACjBL,UAAA,EAAYM,IAAA,IAAQR,KAAA,CAAMQ,IAAA,GAC1BR,KAAA,CAAMQ,IAAA,IAAQN,UAAA,EAAYM,IAAA;IAEzB,CAACA,IAAA,EAAMC,OAAO,IAAIZ,oBAAA,CAAqB;MAC3Ca,IAAA,EAAMJ,OAAA;MACNK,WAAA,EAAaX,KAAA,CAAMY,WAAA,IAAe;MAClCC,QAAA,EAAUV,oBAAA;MACVW,QAAA,EAAU;IACZ,CAAC;EAED,OAAO;IACLN,IAAA;IACAC,OAAA;IACAR,QAAA;IACAC;EACF;AACF","ignoreList":[]}

package/dist/jsx/useSheetOpenState.native.js

@@ -4,11 +4,11 @@ var useSheetOpenState = function(props) {
   var { isHidden, controller } = 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] = 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] = 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/jsx/useSheetOpenState.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useSheetOpenState.tsx"],
-  "mappings": "AAAA,SAASA,4BAA4B;AAGrC,SAASC,0BAA0B;AAE5B,IAAMC,oBAAoB,SAACC,OAAAA;AAChC,MAAM,EAAEC,UAAUC,WAAU,IAAKJ,mBAAAA,GAE3BK,uBAAuB,SAACC,KAAAA;QAC5BF,0BACAF;AADAE,kBAAAA,SAAAA,2BAAAA,WAAYG,kBAAY,QAAxBH,6BAAAA,UAAAA,yBAAAA,KAAAA,YAA2BE,GAAAA,IAC3BJ,sBAAAA,MAAMK,kBAAY,QAAlBL,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBI,GAAAA;EACvB,GAEgBF,kBAAVI,WAAUJ,mBAAAA,cAAAA,OAAAA,SAAAA,WAAYK,UAAI,QAAhBL,qBAAAA,SAAAA,mBAAoBF,MAAMO,MAG3BP,oBAFT,CAACO,MAAMC,OAAAA,IAAWX,qBAAqB;IAC3CY,MAAMH;IACNI,cAAaV,qBAAAA,MAAMW,iBAAW,QAAjBX,uBAAAA,SAAAA,qBAAqB;IAClCY,UAAUT;IACVU,UAAU;EACZ,CAAA;AAEA,SAAO;IACLN;IACAC;IACAP;IACAC;EACF;AACF;",
-  "names": ["useControllableState", "useSheetController", "useSheetOpenState", "props", "isHidden", "controller", "onOpenChangeInternal", "val", "onOpenChange", "propVal", "open", "setOpen", "prop", "defaultProp", "defaultOpen", "onChange", "strategy"]
+  "mappings": "AAAA,SAASA,4BAA4B;AAGrC,SAASC,0BAA0B;AAE5B,IAAMC,oBAAoB,SAACC,OAAAA;AAChC,MAAM,EAAEC,UAAUC,WAAU,IAAKJ,mBAAAA,GAE3BK,uBAAuB,SAACC,KAAAA;QAC5BF,0BACAF;AADAE,kBAAAA,SAAAA,2BAAAA,WAAYG,kBAAY,QAAxBH,6BAAAA,UAAAA,yBAAAA,KAAAA,YAA2BE,GAAAA,IAC3BJ,sBAAAA,MAAMK,kBAAY,QAAlBL,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBI,GAAAA;EACvB,GAGKF,kBACAF,aAFCM,UAAUN,MAAMO,8BACjBL,mBAAAA,cAAAA,OAAAA,SAAAA,WAAYM,UAAI,QAAhBN,qBAAAA,SAAAA,mBAAoBF,MAAMQ,QAC1BR,cAAAA,MAAMQ,UAAI,QAAVR,gBAAAA,SAAAA,cAAcE,cAAAA,OAAAA,SAAAA,WAAYM,MAIhBR,oBAFT,CAACQ,MAAMC,OAAAA,IAAWZ,qBAAqB;IAC3Ca,MAAMJ;IACNK,cAAaX,qBAAAA,MAAMY,iBAAW,QAAjBZ,uBAAAA,SAAAA,qBAAqB;IAClCa,UAAUV;IACVW,UAAU;EACZ,CAAA;AAEA,SAAO;IACLN;IACAC;IACAR;IACAC;EACF;AACF;",
+  "names": ["useControllableState", "useSheetController", "useSheetOpenState", "props", "isHidden", "controller", "onOpenChangeInternal", "val", "onOpenChange", "propVal", "preferAdaptParentOpenState", "open", "setOpen", "prop", "defaultProp", "defaultOpen", "onChange", "strategy"]
 }

package/dist/jsx/useSheetProviderProps.js

@@ -10,7 +10,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_, { open } = state, setPosition = React.useCallback(
     (next) => {
       props.dismissOnSnapToBottom && next === snapPoints.length - 1 ? state.setOpen(!1) : setPositionImmediate(next);
@@ -48,18 +48,28 @@ function useSheetProviderProps(props, state, options = {}) {
     throw new Error(
       process.env.NODE_ENV === "production" ? "\u274C 008" : "Must set animations in tamagui.config.ts"
     );
-  const scrollBridge = useConstant(() => ({
-    enabled: !1,
-    y: 0,
-    paneY: 0,
-    paneMinY: 0,
-    scrollStartY: -1,
-    drag: () => {
-    },
-    release: () => {
-    },
-    scrollLock: !1
-  })), removeScrollEnabled = props.forceRemoveScrollEnabled ?? (open && props.modal), maxSnapPoint = snapPoints[0];
+  const scrollBridge = 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 {
     screenSize: snapPointsMode === "percent" ? frameSize / ((typeof maxSnapPoint == "number" ? maxSnapPoint : 100) / 100) : maxContentSize,
     maxSnapPoint,

package/dist/jsx/useSheetProviderProps.js.map

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

package/dist/jsx/useSheetProviderProps.mjs

@@ -15,7 +15,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_,
     {
@@ -43,16 +43,27 @@ function useSheetProviderProps(props, state, options = {}) {
     animationDriver
   } = useConfiguration();
   if (!animationDriver) throw new Error(process.env.NODE_ENV === "production" ? "\u274C 008" : "Must set animations in tamagui.config.ts");
-  const scrollBridge = useConstant(() => ({
-      enabled: !1,
-      y: 0,
-      paneY: 0,
-      paneMinY: 0,
-      scrollStartY: -1,
-      drag: () => {},
-      release: () => {},
-      scrollLock: !1
-    })),
+  const scrollBridge = 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 {