@tamagui/sheet 1.130.2 → 1.130.3

package/dist/jsx/SheetScrollView.js.map

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

package/dist/jsx/SheetScrollView.mjs

@@ -16,7 +16,6 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
     const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet),
       {
         scrollBridge,
-        scrollEnabled: scrollEnabled_,
         setHasScrollView
       } = context,
       [scrollEnabled, setScrollEnabled_] = useControllableState({
@@ -35,14 +34,14 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
         dys: [],
         // store a few recent dys to get velocity on release
         isScrolling: !1,
-        isDragging: !1
+        isDraggingScrollArea: !1
       });
     useEffect(() => (setHasScrollView(!0), () => {
       setHasScrollView(!1);
     }), []);
     const release = () => {
-        if (!state.current.isDragging) return;
-        state.current.isDragging = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
+        if (!state.current.isDraggingScrollArea) return;
+        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);
@@ -53,8 +52,25 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
           vy
         });
       },
-      scrollable = scrollEnabled ?? scrollEnabled_;
-    return /* @__PURE__ */jsx(ScrollView, {
+      scrollable = scrollEnabled;
+    return useEffect(() => {
+      if (typeof window > "u" || !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();
+      };
+    }, []), /* @__PURE__ */jsx(ScrollView, {
       ref: composeRefs(scrollRef, ref),
       flex: 1,
       scrollEventThrottle: 8,
@@ -67,7 +83,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
         } = e.nativeEvent.contentOffset;
         scrollBridge.y = y, 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%"
@@ -77,17 +93,17 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
           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 ((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));
         }
       },

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","isWeb","ScrollView","useControllableState","React","useEffect","useSheetContext","jsx","SHEET_SCROLL_VIEW_NAME","SheetScrollView","forwardRef","__scopeSheet","children","onScroll","scrollEnabled","scrollEnabledProp","props","ref","context","scrollBridge","setHasScrollView","setScrollEnabled_","prop","defaultProp","scrollRef","useRef","setScrollEnabled","next","current","setNativeProps","state","lastPageY","dragAt","dys","isScrolling","isDraggingScrollArea","release","scrollStartY","scrollLock","vy","length","recentDys","slice","reduce","a","b","scrollable","window","controller","AbortController","node","getScrollableNode","addEventListener","e","isParentDragging","scrollTo","top","y","behavior","signal","passive","disposeBridgeListen","onParentDragging","val","abort","flex","scrollEventThrottle","onResponderRelease","className","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":[]}

package/dist/jsx/SheetScrollView.native.js

@@ -6,7 +6,7 @@ import { useControllableState } from "@tamagui/use-controllable-state";
 import React, { useEffect } 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({
+  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) {
@@ -20,7 +20,7 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
     dys: [],
     // store a few recent dys to get velocity on release
     isScrolling: !1,
-    isDragging: !1
+    isDraggingScrollArea: !1
   });
   useEffect(function() {
     return setHasScrollView(!0), function() {
@@ -28,8 +28,8 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
     };
   }, []);
   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) {
@@ -42,8 +42,31 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
         vy
       });
     }
-  }, scrollable = scrollEnabled ?? scrollEnabled_;
-  return /* @__PURE__ */ _jsx(ScrollView, {
+  }, scrollable = scrollEnabled;
+  return 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__ */ _jsx(ScrollView, {
     ref: composeRefs(scrollRef, ref),
     flex: 1,
     scrollEventThrottle: 8,
@@ -64,7 +87,7 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
     // 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) {
@@ -76,16 +99,16 @@ var SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ *
     onResponderMove: function(e) {
       if (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/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": "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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", "setHasScrollView", "setScrollEnabled_", "prop", "defaultProp", "scrollRef", "useRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDraggingScrollArea", "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", "flex", "scrollEventThrottle", "onResponderRelease", "className", "nativeEvent", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push"]
 }

package/dist/jsx/nativeSheet.js

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

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,mBAQQ,KAPN,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,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;",
   "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,EAQQC,GAAA,EAPNC,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,gBAAA,EAAkBC,OAAA;QACjB,GAAGZ,aAAA;QACJa,aAAA,EAAa;QAEbH,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;QACCwB,kBAAkBC;QACjB,GAAGZ;QACJa,eAAa;;UAEb,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 {

package/dist/jsx/useSheetProviderProps.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","useConfiguration","useConstant","useControllableState","useSheetProviderProps","props","state","options","handleRef","useRef","contentRef","frameSize","setFrameSize","useState","maxContentSize","setMaxContentSize","snapPointsMode","snapPointsProp","snapPoints","hasFit","useMemo","dismissOnSnapToBottom","JSON","stringify","position_","setPositionImmediate","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","Error","scrollBridge","enabled","y","paneY","paneMinY","scrollStartY","drag","release","scrollLock","removeScrollEnabled","forceRemoveScrollEnabled","modal","maxSnapPoint","screenSize","hidden","isHidden","dismissOnOverlayPress","onOverlayComponent","scope","__scopeSheet","onlyShowFrame"],"sources":["../../src/useSheetProviderProps.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useConfiguration","useConstant","useControllableState","useSheetProviderProps","props","state","options","handleRef","useRef","contentRef","frameSize","setFrameSize","useState","maxContentSize","setMaxContentSize","snapPointsMode","snapPointsProp","snapPoints","hasFit","useMemo","dismissOnSnapToBottom","JSON","stringify","position_","setPositionImmediate","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","Error","scrollBridge","parentDragListeners","Set","bridge","enabled","y","paneY","paneMinY","scrollStartY","drag","release","scrollLock","isParentDragging","onParentDragging","cb","add","delete","setParentDragging","val","forEach","removeScrollEnabled","forceRemoveScrollEnabled","modal","maxSnapPoint","screenSize","hidden","isHidden","dismissOnOverlayPress","onOverlayComponent","scope","__scopeSheet","onlyShowFrame"],"sources":["../../src/useSheetProviderProps.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/useSheetProviderProps.native.js

@@ -21,7 +21,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 = React.useCallback(function(next) {
     props.dismissOnSnapToBottom && next === snapPoints.length - 1 ? state.setOpen(!1) : setPositionImmediate(next);
   }, [
@@ -57,7 +57,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 = useConstant(function() {
-    return {
+    var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
       enabled: !1,
       y: 0,
       paneY: 0,
@@ -67,8 +67,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,