@tamagui/sheet 1.130.2 → 1.130.3

package/dist/cjs/SheetScrollView.native.js

@@ -27,7 +27,7 @@ __export(SheetScrollView_exports, {
 });
 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)({
+  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) {
@@ -41,7 +41,7 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = req
     dys: [],
     // store a few recent dys to get velocity on release
     isScrolling: !1,
-    isDragging: !1
+    isDraggingScrollArea: !1
   });
   (0, import_react.useEffect)(function() {
     return setHasScrollView(!0), function() {
@@ -49,8 +49,8 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = req
     };
   }, []);
   var release = function() {
-    if (state.current.isDragging) {
-      state.current.isDragging = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
+    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) {
@@ -63,8 +63,31 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = req
         vy
       });
     }
-  }, scrollable = scrollEnabled ?? scrollEnabled_;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_scroll_view.ScrollView, {
+  }, scrollable = scrollEnabled;
+  return (0, import_react.useEffect)(function() {
+    if (!(typeof window > "u") && 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();
+      };
+    }
+  }, []), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_scroll_view.ScrollView, {
     ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
     flex: 1,
     scrollEventThrottle: 8,
@@ -85,7 +108,7 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = req
     // renderScrollComponent={Sheet.ScrollView}
     // ```
     onStartShouldSetResponder: function() {
-      return scrollBridge.scrollStartY = -1, state.current.isDragging = !0, scrollable;
+      return scrollBridge.scrollStartY = -1, state.current.isDraggingScrollArea = !0, scrollable;
     },
     // setting to false while onResponderMove is disabled
     onMoveShouldSetResponder: function(e) {
@@ -97,16 +120,16 @@ var import_jsx_runtime = require("react/jsx-runtime"), import_compose_refs = req
     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);
+        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 = (dy === 0 || isDraggingUp) && isPaneAtTop;
-        if (shouldScrollLock) {
+        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));
       }
     },

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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,sBAA4B,kCAC5B,cAAmC,0BAEnC,qBAA2B,iCAC3B,gCAAqC,4CACrC,eAAiC,2BAEjC,sBAAgC,2BAS1BA,yBAAyB,mBAElBC,kBAAkBC,6BAAAA,QAAMC,WAInC,SAAA,OAQEC,KAAAA;MAPA,EACEC,cACAC,UACAC,UACAC,eAAeC,mBACf,GAAGC,MAAAA,IAC+B,OAG9BC,cAAUC,qCAAgBZ,wBAAwBK,YAAAA,GAClD,EAAEQ,cAAcC,iBAAgB,IAAKH,SACrC,CAACH,eAAeO,iBAAAA,QAAqBC,oDAAqB;IAC9DC,MAAMR;IACNS,aAAa;EACf,CAAA,GACMC,YAAYjB,aAAAA,QAAMkB,OAA4B,IAAA,GAO9CC,mBAAmB,SAACC,MAAAA;QACxBH,mCAAAA;KAAAA,qBAAAA,UAAUI,aAAO,QAAjBJ,uBAAAA,WAAAA,oCAAAA,mBAAmBK,oBAAc,QAAjCL,sCAAAA,UAAAA,kCAAAA,KAAAA,oBAAoC;MAClCX,eAAec;IACjB,CAAA,GACAP,kBAAkBO,IAAAA;EACpB,GAEMG,QAAQvB,aAAAA,QAAMkB,OAAO;IACzBM,WAAW;IACXC,QAAQ;IACRC,KAAK,CAAA;;IACLC,aAAa;IACbC,sBAAsB;EACxB,CAAA;AAEAC,8BAAU,WAAA;AACRjB,4BAAiB,EAAA,GACV,WAAA;AACLA,uBAAiB,EAAA;IACnB;EACF,GAAG,CAAA,CAAE;AAEL,MAAMkB,UAAU,WAAA;AACd,QAAKP,MAAMF,QAAQO,sBAGnBL;YAAMF,QAAQO,uBAAuB,IACrCjB,aAAaoB,eAAe,IAC5BpB,aAAaqB,aAAa,IAC1BT,MAAMF,QAAQM,cAAc,IAC5BR,iBAAiB,EAAA;AACjB,UAAIc,KAAK;AACT,UAAIV,MAAMF,QAAQK,IAAIQ,QAAQ;AAC5B,YAAMC,YAAYZ,MAAMF,QAAQK,IAAIU,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;iBAAMD,IAAIC;WAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,aAAKQ,QAAQ;MACf;AACAlB,YAAMF,QAAQK,MAAM,CAAA,GACpBf,aAAamB,QAAQ;QACnBL,QAAQF,MAAMF,QAAQI;QACtBQ;MACF,CAAA;;EACF,GAEMS,aAAapC;AAEnBuB,qCAAU,WAAA;AACR,QAAI,SAAOc,SAAW,QACjB1B,UAAUI,SAEf;UAAMuB,aAAa,IAAIC,gBAAAA,GAEjBC,OAAO7B,UAAUI,QAAQ0B,kBAAiB;AAKhDD,WAAKE;QACH;QACA,SAACC,GAAAA;AACC,UAAItC,aAAauC,oBACfJ,KAAKK,SAAS;YACZC,KAAKzC,aAAa0C;YAClBC,UAAU;UACZ,CAAA;QAGJ;;QACA;UACEC,QAAQX,WAAWW;UACnBC,SAAS;QACX;MAAA;AAGF,UAAMC,sBAAsB9C,aAAa+C,iBAAiB,SAACC,KAAAA;MAG3D,CAAA;AAEA,aAAO,WAAA;AACLF,4BAAAA,GACAb,WAAWgB,MAAK;MAClB;;EACF,GAAG,CAAA,CAAE,GAGH,uCAAAC,KAACC,+BAAAA;IACC5D,SAAK6D,iCAAY9C,WAAkBf,GAAAA;IACnC8D,MAAM;IACNC,qBAAqB;IACrBC,oBAAoBpC;IACpBqC,WAAU;IACV7D,eAAeoC;;;;IAIfrC,UAAU,SAAC4C,GAAAA;AACT,UAAM,EAAEI,EAAC,IAAKJ,EAAEmB,YAAYC;AAC5B1D,mBAAa0C,IAAIA,GAEbiB,sBACF3D,aAAaqB,aAAaqB,IAAI,IAE5BA,IAAI,MACN1C,aAAaoB,eAAe,KAI9B1B,YAAAA,QAAAA,SAAW4C,CAAAA;IASb;;;;;;;IACAsB,2BAA2B,WAAA;AACzB5D,0BAAaoB,eAAe,IAC5BR,MAAMF,QAAQO,uBAAuB,IAC9Bc;IACT;;IAEA8B,0BAA0B,SAACvB,GAAAA;AACzB,aAAOP;IACT;IACA+B,uBAAuB;MACrBC,WAAW;IACb;IACAC,iBAAiB,SAAC1B,GAAAA;AAEhB,UAAIqB,mBAAO;AACT,YAAM,EAAEM,MAAK,IAAK3B,EAAEmB;AAEpB,QAAK7C,MAAMF,QAAQM,eACbhB,aAAaoB,iBAAiB,OAChCpB,aAAaoB,eAAe6C,OAC5BrD,MAAMF,QAAQG,YAAYoD;AAI9B,YAAMnD,SAASmD,QAAQjE,aAAaoB,cAC9B8C,KAAKD,QAAQrD,MAAMF,QAAQG;AACjCD,cAAMF,QAAQG,YAAYoD;AAC1B,YAAME,eAAeD,KAAK,GACpBE,cAAcpE,aAAaqE,SAASrE,aAAasE,UAEjDC,oBAAoBL,OAAO,KAAKC,iBAAiBC;AAEvD,YAAIG,oBAAoB,CAAC3D,MAAMF,QAAQM,aAAa;AAClDJ,gBAAMF,QAAQM,cAAc,IAC5BhB,aAAaqB,aAAa,IAC1Bb,iBAAiB,EAAA;AACjB;QACF;AAEA,YAAIR,aAAa0C,KAAK;AACpB;AAGFlC,yBAAiB,EAAA,GACjBR,aAAawE,KAAK1D,MAAAA,GAClBF,MAAMF,QAAQI,SAASA,QACvBF,MAAMF,QAAQK,IAAI0D,KAAKP,EAAAA,GAEnBtD,MAAMF,QAAQK,IAAIQ,SAAS,QAC7BX,MAAMF,QAAQK,MAAMH,MAAMF,QAAQK,IAAIU,MAAM,GAAC;MAEjD;IACF;IACC,GAAG5B;;;AAKV,CAAA;",
+  "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", "window", "controller", "AbortController", "node", "getScrollableNode", "addEventListener", "e", "isParentDragging", "scrollTo", "top", "y", "behavior", "signal", "passive", "disposeBridgeListen", "onParentDragging", "val", "abort", "_jsx", "ScrollView", "composeRefs", "flex", "scrollEventThrottle", "onResponderRelease", "className", "nativeEvent", "contentOffset", "isWeb", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push"]
 }

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

@@ -38,7 +38,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.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;AAAA,MAAC;AAAA;AAAA,QACC,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;",
   "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;QACCC,kBAAkBC;QACjB,GAAGnB;QACJoB,eAAa;;UAEb,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 {

package/dist/cjs/useSheetProviderProps.js

@@ -34,7 +34,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 = import_react.default.useCallback(
     (next) => {
       props.dismissOnSnapToBottom && next === snapPoints.length - 1 ? state.setOpen(!1) : setPositionImmediate(next);
@@ -72,18 +72,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 = (0, import_use_constant.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 = (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 {
     screenSize: snapPointsMode === "percent" ? frameSize / ((typeof maxSnapPoint == "number" ? maxSnapPoint : 100) / 100) : maxContentSize,
     maxSnapPoint,

package/dist/cjs/useSheetProviderProps.js.map

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

package/dist/cjs/useSheetProviderProps.native.js

@@ -46,7 +46,7 @@ function useSheetProviderProps(props, state) {
     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 = import_react.default.useCallback(function(next) {
     props.dismissOnSnapToBottom && next === snapPoints.length - 1 ? state.setOpen(!1) : setPositionImmediate(next);
   }, [
@@ -82,7 +82,7 @@ function useSheetProviderProps(props, state) {
   if (!animationDriver)
     throw new Error(process.env.NODE_ENV === "production" ? "\u274C 008" : "Must set animations in tamagui.config.ts");
   var scrollBridge = (0, import_use_constant.useConstant)(function() {
-    return {
+    var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
       enabled: !1,
       y: 0,
       paneY: 0,
@@ -92,8 +92,20 @@ function useSheetProviderProps(props, state) {
       },
       release: function() {
       },
-      scrollLock: !1
+      scrollLock: !1,
+      isParentDragging: !1,
+      onParentDragging: function(cb) {
+        return parentDragListeners.add(cb), function() {
+          parentDragListeners.delete(cb);
+        };
+      },
+      setParentDragging: function(val) {
+        val !== bridge.isParentDragging && (bridge.isParentDragging = val, parentDragListeners.forEach(function(cb) {
+          return cb(val);
+        }));
+      }
     };
+    return bridge;
   }), _props_forceRemoveScrollEnabled, removeScrollEnabled = (_props_forceRemoveScrollEnabled = props.forceRemoveScrollEnabled) !== null && _props_forceRemoveScrollEnabled !== void 0 ? _props_forceRemoveScrollEnabled : open && props.modal, maxSnapPoint = snapPoints[0], screenSize = snapPointsMode === "percent" ? frameSize / ((typeof maxSnapPoint == "number" ? maxSnapPoint : 100) / 100) : maxContentSize, _props_dismissOnOverlayPress, _props_dismissOnSnapToBottom, providerProps = {
     screenSize,
     maxSnapPoint,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useSheetProviderProps.tsx"],
-  "mappings": "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",
-  "names": ["useSheetProviderProps", "props", "state", "options", "handleRef", "React", "useRef", "contentRef", "frameSize", "setFrameSize", "useState", "maxContentSize", "setMaxContentSize", "snapPointsMode", "snapPointsProp", "snapPoints", "hasFit", "useMemo", "dismissOnSnapToBottom", "JSON", "stringify", "position_", "setPositionImmediate", "useControllableState", "prop", "position", "defaultProp", "defaultPosition", "open", "onChange", "onPositionChange", "strategy", "setPosition", "useCallback", "next", "length", "setOpen", "process", "env", "NODE_ENV", "some", "p", "endsWith", "n", "Number", "slice", "console", "warn", "indexOf", "shouldSetPositionOpen", "useEffect", "animationDriver", "useConfiguration", "Error", "scrollBridge", "useConstant", "enabled", "y", "paneY", "paneMinY", "scrollStartY", "drag", "release", "scrollLock", "removeScrollEnabled", "forceRemoveScrollEnabled", "modal", "maxSnapPoint", "screenSize", "providerProps", "hidden", "isHidden", "dismissOnOverlayPress", "onOverlayComponent", "scope", "__scopeSheet", "onlyShowFrame"]
+  "mappings": "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",
+  "names": ["useSheetProviderProps", "props", "state", "options", "handleRef", "React", "useRef", "contentRef", "frameSize", "setFrameSize", "useState", "maxContentSize", "setMaxContentSize", "snapPointsMode", "snapPointsProp", "snapPoints", "hasFit", "useMemo", "dismissOnSnapToBottom", "JSON", "stringify", "position_", "setPositionImmediate", "useControllableState", "prop", "position", "defaultProp", "defaultPosition", "open", "onChange", "onPositionChange", "strategy", "setPosition", "useCallback", "next", "length", "setOpen", "process", "env", "NODE_ENV", "some", "p", "endsWith", "n", "Number", "slice", "console", "warn", "indexOf", "shouldSetPositionOpen", "useEffect", "animationDriver", "useConfiguration", "Error", "scrollBridge", "useConstant", "parentDragListeners", "Set", "bridge", "enabled", "y", "paneY", "paneMinY", "scrollStartY", "drag", "release", "scrollLock", "isParentDragging", "onParentDragging", "cb", "add", "delete", "setParentDragging", "val", "forEach", "removeScrollEnabled", "forceRemoveScrollEnabled", "modal", "maxSnapPoint", "screenSize", "providerProps", "hidden", "isHidden", "dismissOnOverlayPress", "onOverlayComponent", "scope", "__scopeSheet", "onlyShowFrame"]
 }

package/dist/esm/SheetImplementationCustom.js

@@ -16,7 +16,7 @@ import {
   useThemeName
 } from "@tamagui/core";
 import { Portal, USE_NATIVE_PORTAL } from "@tamagui/portal";
-import React, { useRef, useState } from "react";
+import React, { useState } from "react";
 import { Dimensions, Keyboard, PanResponder, View } from "react-native-web";
 import { ParentSheetContext, SheetInsideSheetContext } from "./contexts";
 import { resisted } from "./helpers";
@@ -122,15 +122,13 @@ const relativeDimensionTo = isWeb ? "window" : "screen", SheetImplementationCust
     }, [hasntMeasured, screenSize, frameSize]), useIsomorphicLayoutEffect(() => {
       isAbleToPosition && animateTo(position);
     }, [isAbleToPosition, position]);
-    const disableDrag = props.disableDrag ?? controller?.disableDrag, themeName = useThemeName(), [isDragging, setIsDragging] = React.useState(!1), scrollEnabled = useRef(!0), setScrollEnabled = React.useCallback((val) => {
-      scrollEnabled.current = val;
-    }, []), panResponder = React.useMemo(() => {
+    const disableDrag = props.disableDrag ?? controller?.disableDrag, themeName = useThemeName(), [isDragging, setIsDragging] = React.useState(!1), panResponder = React.useMemo(() => {
       if (disableDrag || !frameSize || isShowingInnerSheet) return;
       const minY = positions[0];
       scrollBridge.paneMinY = minY;
       let startY = at.current;
       function setPanning(val) {
-        setIsDragging(val), isClient && (sheetHiddenStyleSheet || (sheetHiddenStyleSheet = document.createElement("style"), typeof document.head < "u" && document.head.appendChild(sheetHiddenStyleSheet)), val ? sheetHiddenStyleSheet.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : sheetHiddenStyleSheet.innerText = "");
+        setIsDragging(val), scrollBridge.setParentDragging(!1), isClient && (sheetHiddenStyleSheet || (sheetHiddenStyleSheet = document.createElement("style"), typeof document.head < "u" && document.head.appendChild(sheetHiddenStyleSheet)), val ? sheetHiddenStyleSheet.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : sheetHiddenStyleSheet.innerText = "");
       }
       const release = ({ vy, dragAt }) => {
         if (scrollBridge.scrollLock)
@@ -142,7 +140,7 @@ const relativeDimensionTo = isWeb ? "window" : "screen", SheetImplementationCust
           const position2 = positions[i], curDist = end > position2 ? end - position2 : position2 - end;
           curDist < dist && (dist = curDist, closestPoint = i);
         }
-        setPosition(closestPoint), animateTo(closestPoint), setScrollEnabled(closestPoint === 0);
+        setPosition(closestPoint), animateTo(closestPoint);
       }, finish = (_e, state2) => {
         release({
           vy: state2.vy,
@@ -157,11 +155,12 @@ const relativeDimensionTo = isWeb ? "window" : "screen", SheetImplementationCust
           if (scrollBridge.scrollLock)
             return !1;
           const isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 10;
+          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
         }
-        return getShouldSet();
+        const granted = getShouldSet();
+        return granted && scrollBridge.setParentDragging(!0), granted;
       }, grant = () => {
-        setScrollEnabled(!1), setPanning(!0), stopSpring(), startY = at.current;
+        setPanning(!0), stopSpring(), startY = at.current;
       };
       let isExternalDrag = !1;
       return scrollBridge.drag = (dy) => {
@@ -173,7 +172,7 @@ const relativeDimensionTo = isWeb ? "window" : "screen", SheetImplementationCust
         onPanResponderGrant: grant,
         onPanResponderMove: (_e, { dy }) => {
           const toFull = dy + startY, to = resisted(toFull, minY);
-          animatedNumber.setValue(to, { type: "direct" });
+          to <= minY ? scrollBridge.setParentDragging(!1) : scrollBridge.setParentDragging(!0), animatedNumber.setValue(to, { type: "direct" });
         },
         onPanResponderEnd: finish,
         onPanResponderTerminate: finish,
@@ -234,57 +233,49 @@ const relativeDimensionTo = isWeb ? "window" : "screen", SheetImplementationCust
     const forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${isWeb ? "dvh" : "%"}` : maxSnapPoint, setHasScrollView = React.useCallback((val) => {
       hasScrollView.current = val;
     }, []);
-    let contents = /* @__PURE__ */ jsx(ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ jsxs(
-      SheetProvider,
-      {
-        ...providerProps,
-        scrollEnabled: scrollEnabled.current,
-        setHasScrollView,
-        children: [
-          /* @__PURE__ */ jsx(AnimatePresence, { custom: { open }, children: shouldHideParentSheet || !open ? null : overlayComponent }),
-          snapPointsMode !== "percent" && /* @__PURE__ */ jsx(
-            View,
+    let contents = /* @__PURE__ */ jsx(ParentSheetContext.Provider, { value: nextParentContext, children: /* @__PURE__ */ jsxs(SheetProvider, { ...providerProps, setHasScrollView, children: [
+      /* @__PURE__ */ jsx(AnimatePresence, { custom: { open }, children: shouldHideParentSheet || !open ? null : overlayComponent }),
+      snapPointsMode !== "percent" && /* @__PURE__ */ jsx(
+        View,
+        {
+          style: {
+            opacity: 0,
+            position: "absolute",
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 0,
+            pointerEvents: "none"
+          },
+          onLayout: handleMaxContentViewLayout
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        AnimatedView,
+        {
+          ref,
+          ...panResponder?.panHandlers,
+          onLayout: handleAnimationViewLayout,
+          animation: isDragging || disableAnimation ? null : animation,
+          disableClassName: !0,
+          style: [
             {
-              style: {
-                opacity: 0,
-                position: "absolute",
-                top: 0,
-                left: 0,
-                right: 0,
-                bottom: 0,
+              position: "absolute",
+              zIndex,
+              width: "100%",
+              height: forcedContentHeight,
+              minHeight: forcedContentHeight,
+              opacity: shouldHideParentSheet ? 0 : opacity,
+              ...(shouldHideParentSheet || !open) && {
                 pointerEvents: "none"
-              },
-              onLayout: handleMaxContentViewLayout
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            AnimatedView,
-            {
-              ref,
-              ...panResponder?.panHandlers,
-              onLayout: handleAnimationViewLayout,
-              animation: isDragging || disableAnimation ? null : animation,
-              disableClassName: !0,
-              style: [
-                {
-                  position: "absolute",
-                  zIndex,
-                  width: "100%",
-                  height: forcedContentHeight,
-                  minHeight: forcedContentHeight,
-                  opacity: shouldHideParentSheet ? 0 : opacity,
-                  ...(shouldHideParentSheet || !open) && {
-                    pointerEvents: "none"
-                  }
-                },
-                animatedStyle
-              ],
-              children: props.children
-            }
-          )
-        ]
-      }
-    ) });
+              }
+            },
+            animatedStyle
+          ],
+          children: props.children
+        }
+      )
+    ] }) });
     const shouldMountChildren = unmountChildrenWhenHidden ? !!opacity : !0;
     if (modal) {
       const modalContents = /* @__PURE__ */ jsx(Portal, { stackZIndex: zIndex, ...portalProps, children: shouldMountChildren && /* @__PURE__ */ jsx(ContainerComponent, { children: /* @__PURE__ */ jsx(Theme, { forceClassName: !0, name: themeName, children: contents }) }) });