@tamagui/sheet 1.130.1 → 1.130.3

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,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useSheetProviderProps.tsx"],
-  "mappings": "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",
-  "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", "providerProps", "hidden", "isHidden", "dismissOnOverlayPress", "onOverlayComponent", "scope", "__scopeSheet", "onlyShowFrame"]
+  "mappings": "AAAA,OAAOA,WAAW;AAElB,SAASC,wBAAwB;AACjC,SAASC,mBAAmB;AAC5B,SAASC,4BAA4B;AAS9B,SAASC,sBACdC,OACAC,OAAqB;MACrBC,UAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAEI,CAAC,GAECC,YAAYR,MAAMS,OAAuB,IAAA,GACzCC,aAAaV,MAAMS,OAAuB,IAAA,GAC1C,CAACE,WAAWC,YAAAA,IAAgBZ,MAAMa,SAAiB,CAAA,GACnD,CAACC,gBAAgBC,iBAAAA,IAAqBf,MAAMa,SAAiB,CAAA,GAC5CR,uBAAjBW,kBAAiBX,wBAAAA,MAAMW,oBAAc,QAApBX,0BAAAA,SAAAA,wBAAwB,WAE7CA,mBADIY,kBACJZ,oBAAAA,MAAMa,gBAAU,QAAhBb,sBAAAA,SAAAA,oBACCW,mBAAmB,YAChB;IAAC;MACDA,mBAAmB,aACjB;IAAC;MACD;IAAC;KACHG,SAASF,eAAe,CAAA,MAAO,OAE/BC,aAAalB,MAAMoB,QACvB,WAAA;WAAOf,MAAMgB,wBAAwB;SAAIJ;MAAgB;QAAKA;KAE9D;IAACK,KAAKC,UAAUN,cAAAA;IAAiBZ,MAAMgB;GAAsB,GAIzD,CAACG,WAAWC,oBAAAA,IAAwBtB,qBAAqB;IAC7DuB,MAAMrB,MAAMsB;IACZC,aAAavB,MAAMwB,oBAAoBvB,MAAMwB,OAAO,IAAI;IACxDC,UAAU1B,MAAM2B;IAChBC,UAAU;EACZ,CAAA,GAEMN,WAAWrB,MAAMwB,SAAS,KAAQ,KAAKN,WAEvC,EAAEM,KAAI,IAAKxB,OAEX4B,cAAclC,MAAMmC,YACxB,SAACC,MAAAA;AAEC,IAAI/B,MAAMgB,yBAAyBe,SAASlB,WAAWmB,SAAS,IAC9D/B,MAAMgC,QAAQ,EAAA,IAEdb,qBAAqBW,IAAAA;EAEzB,GACA;IAAC/B,MAAMgB;IAAuBH,WAAWmB;IAAQZ;IAAsBnB,MAAMgC;GAAQ;AAGvF,EAAIC,QAAQC,IAAIC,aAAa,kBAEzBzB,mBAAmB,WACnBE,WAAWwB,KAAK,SAACC,GAAAA;AACf,QAAI,OAAOA,KAAM,UAAU;AACzB,UAAIA,MAAM;AACR,eAAO;AAET,UAAIA,EAAEC,SAAS,GAAA,GAAM;AACnB,YAAMC,IAAIC,OAAOH,EAAEI,MAAM,GAAG,EAAC,CAAA;AAC7B,eAAOF,IAAI,KAAKA,IAAI;MACtB;AACA,aAAO;IACT;AACA,WAAO,OAAOF,KAAM,YAAYA,IAAI;EACtC,CAAA,KAEAK,QAAQC,KACN,4JAAA,GAGAjC,mBAAmB,WAAWE,WAAWgC,QAAQ,KAAA,IAAS,KAC5DF,QAAQC,KACN,+GAAA,GAIFjC,mBAAmB,UAClBE,WAAWmB,YAAYhC,MAAMgB,wBAAwB,IAAI,MACxDH,WAAW,CAAA,MAAO,UAEpB8B,QAAQC,KACN,2FAAA,GAIFjC,mBAAmB,cACnBE,WAAWwB,KAAK,SAACC,GAAAA;WAAM,OAAOA,KAAM,YAAYA,IAAI;QAEpDK,QAAQC,KACN,kHAAA,GAIFjC,mBAAmB,aACnBE,WAAWwB,KAAK,SAACC,GAAAA;WAAM,OAAOA,KAAM,YAAYA,IAAI,KAAKA,IAAI;QAE7DK,QAAQC,KACN,0HAAA,IAMFnB,QAAQzB,MAAMgB,yBAAyBM,aAAaT,WAAWmB,SAAS,KAC1EZ,qBAAqB,CAAA;AAIvB,MAAM0B,wBAAwBrB,QAAQH,WAAW;AACjD3B,QAAMoD,UAAU,WAAA;AACd,IAAID,yBACFjB,YAAY,CAAA;EAEhB,GAAG;IAACA;IAAaiB;GAAsB;AAEvC,MAAM,EAAEE,gBAAe,IAAKpD,iBAAAA;AAC5B,MAAI,CAACoD;AACH,UAAM,IAAIC,MACRf,QAAQC,IAAIC,aAAa,eACrB,eACA,0CAAA;AAIR,MAAMc,eAAerD,YAA0B,WAAA;AAC7C,QAAMsD,sBAAsB,oBAAIC,IAAAA,GAE1BC,SAAuB;MAC3BC,SAAS;MACTC,GAAG;MACHC,OAAO;MACPC,UAAU;MACVC,cAAc;MACdC,MAAM,WAAA;MAAO;MACbC,SAAS,WAAA;MAAO;MAChBC,YAAY;MACZC,kBAAkB;MAClBC,kBAAkB,SAACC,IAAAA;AACjBb,mCAAoBc,IAAID,EAAAA,GACjB,WAAA;AACLb,8BAAoBe,OAAOF,EAAAA;QAC7B;MACF;MACAG,mBAAmB,SAACC,KAAAA;AAClB,QAAIA,QAAQf,OAAOS,qBACjBT,OAAOS,mBAAmBM,KAC1BjB,oBAAoBkB,QAAQ,SAACL,IAAAA;iBAAOA,GAAGI,GAAAA;;MAE3C;IACF;AAEA,WAAOf;EACT,CAAA,GAE4BrD,iCAAtBsE,uBAAsBtE,kCAAAA,MAAMuE,8BAAwB,QAA9BvE,oCAAAA,SAAAA,kCAAmCyB,QAAQzB,MAAMwE,OAEvEC,eAAe5D,WAAW,CAAA,GAC1B6D,aACJ/D,mBAAmB,YACfL,cAAc,OAAOmE,gBAAiB,WAAWA,eAAe,OAAO,OACvEhE,gBAemBT,8BACAA,8BAdnB2E,gBAAgB;IACpBD;IACAD;IACAH;IACApB;IACAsB,OAAO,CAAC,CAACxE,MAAMwE;IACf/C,MAAMxB,MAAMwB;IACZQ,SAAShC,MAAMgC;IACf2C,QAAQ,CAAC,CAAC3E,MAAM4E;IAChBxE;IACAF;IACAG;IACAC;IACAuE,wBAAuB9E,+BAAAA,MAAM8E,2BAAqB,QAA3B9E,iCAAAA,SAAAA,+BAA+B;IACtDgB,wBAAuBhB,+BAAAA,MAAMgB,2BAAqB,QAA3BhB,iCAAAA,SAAAA,+BAA+B;IACtD+E,oBAAoB7E,QAAQ6E;IAC5BC,OAAOhF,MAAMiF;IACbnE;IACAQ;IACAT;IACAF;IACAD;IACAmB;IACAT;IACA8D,eAAe;EACjB;AAEA,SAAOP;AACT;",
+  "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", "providerProps", "hidden", "isHidden", "dismissOnOverlayPress", "onOverlayComponent", "scope", "__scopeSheet", "onlyShowFrame"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/sheet",
-  "version": "1.130.1",
+  "version": "1.130.3",
   "sideEffects": [
     "*.css"
   ],
@@ -37,29 +37,29 @@
     }
   },
   "dependencies": {
-    "@tamagui/adapt": "1.130.1",
-    "@tamagui/animate-presence": "1.130.1",
-    "@tamagui/animations-react-native": "1.130.1",
-    "@tamagui/compose-refs": "1.130.1",
-    "@tamagui/constants": "1.130.1",
-    "@tamagui/core": "1.130.1",
-    "@tamagui/create-context": "1.130.1",
-    "@tamagui/helpers": "1.130.1",
-    "@tamagui/portal": "1.130.1",
-    "@tamagui/remove-scroll": "1.130.1",
-    "@tamagui/scroll-view": "1.130.1",
-    "@tamagui/stacks": "1.130.1",
-    "@tamagui/use-constant": "1.130.1",
-    "@tamagui/use-controllable-state": "1.130.1",
-    "@tamagui/use-did-finish-ssr": "1.130.1",
-    "@tamagui/use-keyboard-visible": "1.130.1",
-    "@tamagui/z-index-stack": "1.130.1"
+    "@tamagui/adapt": "1.130.3",
+    "@tamagui/animate-presence": "1.130.3",
+    "@tamagui/animations-react-native": "1.130.3",
+    "@tamagui/compose-refs": "1.130.3",
+    "@tamagui/constants": "1.130.3",
+    "@tamagui/core": "1.130.3",
+    "@tamagui/create-context": "1.130.3",
+    "@tamagui/helpers": "1.130.3",
+    "@tamagui/portal": "1.130.3",
+    "@tamagui/remove-scroll": "1.130.3",
+    "@tamagui/scroll-view": "1.130.3",
+    "@tamagui/stacks": "1.130.3",
+    "@tamagui/use-constant": "1.130.3",
+    "@tamagui/use-controllable-state": "1.130.3",
+    "@tamagui/use-did-finish-ssr": "1.130.3",
+    "@tamagui/use-keyboard-visible": "1.130.3",
+    "@tamagui/z-index-stack": "1.130.3"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.130.1",
+    "@tamagui/build": "1.130.3",
     "react": "*"
   },
   "publishConfig": {

package/src/SheetImplementationCustom.tsx

@@ -239,11 +239,6 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
     const disableDrag = props.disableDrag ?? controller?.disableDrag
     const themeName = useThemeName()
     const [isDragging, setIsDragging] = React.useState(false)
-    const scrollEnabled = useRef(true)
-
-    const setScrollEnabled = React.useCallback((val: boolean) => {
-      scrollEnabled.current = val
-    }, [])
 
     const panResponder = React.useMemo(() => {
       if (disableDrag) return
@@ -256,6 +251,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
 
       function setPanning(val: boolean) {
         setIsDragging(val)
+        scrollBridge.setParentDragging(false)
 
         // make unselectable:
         if (isClient) {
@@ -301,8 +297,6 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
         // have to call both because state may not change but need to snap back
         setPosition(closestPoint)
         animateTo(closestPoint)
-
-        setScrollEnabled(closestPoint === 0)
       }
 
       const finish = (_e: GestureResponderEvent, state: PanResponderGestureState) => {
@@ -320,7 +314,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
       ): boolean => {
         function getShouldSet() {
           // if dragging handle always allow:
-          if (e.target === providerProps.handleRef.current || !scrollEnabled.current) {
+          if (e.target === providerProps.handleRef.current) {
             return true
           }
 
@@ -345,15 +339,21 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
               return false
             }
           }
+
           // we could do some detection of other touchables and cancel here..
-          return Math.abs(dy) > 10
+          return Math.abs(dy) > 5
         }
 
-        return getShouldSet()
+        const granted = getShouldSet()
+
+        if (granted) {
+          scrollBridge.setParentDragging(true)
+        }
+
+        return granted
       }
 
       const grant = () => {
-        setScrollEnabled(false)
         setPanning(true)
         stopSpring()
         startY = at.current
@@ -378,6 +378,15 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
         onPanResponderMove: (_e, { dy }) => {
           const toFull = dy + startY
           const to = resisted(toFull, minY)
+
+          // handles the case where you hand off back and forth more than once
+          const isAtTop = to <= minY
+          if (isAtTop) {
+            scrollBridge.setParentDragging(false)
+          } else {
+            scrollBridge.setParentDragging(true)
+          }
+
           animatedNumber.setValue(to, { type: 'direct' })
         },
         onPanResponderEnd: finish,
@@ -483,11 +492,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
 
     let contents = (
       <ParentSheetContext.Provider value={nextParentContext}>
-        <SheetProvider
-          {...providerProps}
-          scrollEnabled={scrollEnabled.current}
-          setHasScrollView={setHasScrollView}
-        >
+        <SheetProvider {...providerProps} setHasScrollView={setHasScrollView}>
           <AnimatePresence custom={{ open }}>
             {shouldHideParentSheet || !open ? null : overlayComponent}
           </AnimatePresence>

package/src/SheetScrollView.tsx

@@ -31,7 +31,7 @@ export const SheetScrollView = React.forwardRef<
     ref
   ) => {
     const context = useSheetContext(SHEET_SCROLL_VIEW_NAME, __scopeSheet)
-    const { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context
+    const { scrollBridge, setHasScrollView } = context
     const [scrollEnabled, setScrollEnabled_] = useControllableState({
       prop: scrollEnabledProp,
       defaultProp: true,
@@ -55,7 +55,7 @@ export const SheetScrollView = React.forwardRef<
       dragAt: 0,
       dys: [] as number[], // store a few recent dys to get velocity on release
       isScrolling: false,
-      isDragging: false,
+      isDraggingScrollArea: false,
     })
 
     useEffect(() => {
@@ -66,10 +66,10 @@ export const SheetScrollView = React.forwardRef<
     }, [])
 
     const release = () => {
-      if (!state.current.isDragging) {
+      if (!state.current.isDraggingScrollArea) {
         return
       }
-      state.current.isDragging = false
+      state.current.isDraggingScrollArea = false
       scrollBridge.scrollStartY = -1
       scrollBridge.scrollLock = false
       state.current.isScrolling = false
@@ -88,8 +88,46 @@ export const SheetScrollView = React.forwardRef<
       })
     }
 
-    // Override scrollEnabled if provided
-    const scrollable = scrollEnabled ?? scrollEnabled_
+    const scrollable = scrollEnabled
+
+    useEffect(() => {
+      if (typeof window === 'undefined') return
+      if (!scrollRef.current) return
+
+      const controller = new AbortController()
+
+      const node = scrollRef.current.getScrollableNode() as HTMLElement
+
+      // this is unfortuantely the only way to prevent a scroll once a scroll already started
+      // we just keep setting it back to the last value - it should only ever be 0 as this only
+      // ever runs when you  scroll down, then back to top and start dragging, then back to scroll
+      node.addEventListener(
+        'touchmove',
+        (e) => {
+          if (scrollBridge.isParentDragging) {
+            node.scrollTo({
+              top: scrollBridge.y,
+              behavior: 'instant',
+            })
+            // can't preventdefault its not cancellable
+          }
+        },
+        {
+          signal: controller.signal,
+          passive: false,
+        }
+      )
+
+      const disposeBridgeListen = scrollBridge.onParentDragging((val) => {
+        if (val) {
+        }
+      })
+
+      return () => {
+        disposeBridgeListen()
+        controller.abort()
+      }
+    }, [])
 
     return (
       <ScrollView
@@ -105,6 +143,7 @@ export const SheetScrollView = React.forwardRef<
         onScroll={(e) => {
           const { y } = e.nativeEvent.contentOffset
           scrollBridge.y = y
+
           if (isWeb) {
             scrollBridge.scrollLock = y > 0
           }
@@ -125,7 +164,7 @@ export const SheetScrollView = React.forwardRef<
         }}
         onStartShouldSetResponder={() => {
           scrollBridge.scrollStartY = -1
-          state.current.isDragging = true
+          state.current.isDraggingScrollArea = true
           return scrollable
         }}
         // setting to false while onResponderMove is disabled
@@ -140,14 +179,11 @@ export const SheetScrollView = React.forwardRef<
           if (isWeb) {
             const { pageY } = e.nativeEvent
 
-            if (state.current.isScrolling) {
-              // e.stopPropagation()
-              return
-            }
-
-            if (scrollBridge.scrollStartY === -1) {
-              scrollBridge.scrollStartY = pageY
-              state.current.lastPageY = pageY
+            if (!state.current.isScrolling) {
+              if (scrollBridge.scrollStartY === -1) {
+                scrollBridge.scrollStartY = pageY
+                state.current.lastPageY = pageY
+              }
             }
 
             const dragAt = pageY - scrollBridge.scrollStartY
@@ -158,13 +194,17 @@ export const SheetScrollView = React.forwardRef<
 
             const shouldScrollLock = (dy === 0 || isDraggingUp) && isPaneAtTop
 
-            if (shouldScrollLock) {
+            if (shouldScrollLock && !state.current.isScrolling) {
               state.current.isScrolling = true
               scrollBridge.scrollLock = true
               setScrollEnabled(true)
               return
             }
 
+            if (scrollBridge.y >= 0) {
+              return
+            }
+
             setScrollEnabled(false)
             scrollBridge.drag(dragAt)
             state.current.dragAt = dragAt

package/src/createSheet.tsx

@@ -148,7 +148,13 @@ export function createSheet<
         forwardedRef
       ) => {
         const context = useSheetContext(SHEET_NAME, __scopeSheet)
-        const { hasFit, removeScrollEnabled, frameSize, contentRef, open } = context
+        const {
+          hasFit,
+          removeScrollEnabled = true,
+          frameSize,
+          contentRef,
+          open,
+        } = context
         const composedContentRef = useComposedRefs(forwardedRef, contentRef)
         const offscreenSize = useSheetOffscreenSize(context)
 

package/src/nativeSheet.tsx

@@ -59,12 +59,7 @@ export function setupNativeSheet(
 
       return (
         <>
-          <SheetProvider
-            scrollEnabled
-            setHasScrollView={emptyFn}
-            {...providerProps}
-            onlyShowFrame
-          >
+          <SheetProvider setHasScrollView={emptyFn} {...providerProps} onlyShowFrame>
             <ModalSheetView ref={ref} onModalDidDismiss={() => setOpenInternal(false)}>
               <ModalSheetViewMainContent>
                 <View style={{ flex: 1 }}>{props.children}</View>