@tamagui/sheet 1.130.3 → 1.130.5

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

@@ -1,10 +1,10 @@
 import { composeRefs } from "@tamagui/compose-refs";
-import { isWeb } from "@tamagui/core";
+import { isClient, isWeb, View } from "@tamagui/core";
 import { ScrollView } from "@tamagui/scroll-view";
 import { useControllableState } from "@tamagui/use-controllable-state";
-import React, { useEffect } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useSheetContext } from "./SheetContext.mjs";
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
   SheetScrollView = React.forwardRef(({
     __scopeSheet,
@@ -53,10 +53,11 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
         });
       },
       scrollable = scrollEnabled;
-    return useEffect(() => {
-      if (typeof window > "u" || !scrollRef.current) return;
+    useEffect(() => {
+      if (!isClient || !scrollRef.current) return;
       const controller = new AbortController(),
-        node = scrollRef.current.getScrollableNode();
+        node = scrollRef.current?.getScrollableNode();
+      if (!node) return;
       node.addEventListener("touchmove", e => {
         scrollBridge.isParentDragging && node.scrollTo({
           top: scrollBridge.y,
@@ -70,7 +71,17 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
       return () => {
         disposeBridgeListen(), controller.abort();
       };
-    }, []), /* @__PURE__ */jsx(ScrollView, {
+    }, [scrollRef]);
+    const [hasScrollableContent, setHasScrollableContent] = useState(!0),
+      parentHeight = useRef(0),
+      contentHeight = useRef(0),
+      setIsScrollable = () => {
+        parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
+      };
+    return /* @__PURE__ */jsxs(ScrollView, {
+      onLayout: e => {
+        parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+      },
       ref: composeRefs(scrollRef, ref),
       flex: 1,
       scrollEventThrottle: 8,
@@ -99,7 +110,7 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
           state.current.lastPageY = pageY;
           const isDraggingUp = dy < 0,
             isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY;
-          if ((dy === 0 || isDraggingUp) && isPaneAtTop && !state.current.isScrolling) {
+          if (hasScrollableContent && (dy === 0 || isDraggingUp) && isPaneAtTop && !state.current.isScrolling) {
             state.current.isScrolling = !0, scrollBridge.scrollLock = !0, setScrollEnabled(!0);
             return;
           }
@@ -108,7 +119,15 @@ const SHEET_SCROLL_VIEW_NAME = "SheetScrollView",
         }
       },
       ...props,
-      children
+      children: [/* @__PURE__ */jsx(View, {
+        position: "absolute",
+        inset: 0,
+        pointerEvents: "none",
+        zIndex: -1,
+        onLayout: e => {
+          contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+        }
+      }), children]
     });
   });
 export { SheetScrollView };

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

package/dist/jsx/SheetScrollView.native.js

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

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/SheetScrollView.tsx"],
-  "mappings": ";AAAA,SAASA,mBAAmB;AAC5B,SAASC,aAA0B;AAEnC,SAASC,kBAAkB;AAC3B,SAASC,4BAA4B;AACrC,OAAOC,SAASC,iBAAiB;AAEjC,SAASC,uBAAuB;AAShC,IAAMC,yBAAyB,mBAElBC,kBAAkBJ,sBAAMK,WAInC,SAAA,OAQEC,KAAAA;MAPA,EACEC,cACAC,UACAC,UACAC,eAAeC,mBACf,GAAGC,MAAAA,IAC+B,OAG9BC,UAAUX,gBAAgBC,wBAAwBI,YAAAA,GAClD,EAAEO,cAAcC,iBAAgB,IAAKF,SACrC,CAACH,eAAeM,iBAAAA,IAAqBjB,qBAAqB;IAC9DkB,MAAMN;IACNO,aAAa;EACf,CAAA,GACMC,YAAYnB,MAAMoB,OAA4B,IAAA,GAO9CC,mBAAmB,SAACC,MAAAA;QACxBH,mCAAAA;KAAAA,qBAAAA,UAAUI,aAAO,QAAjBJ,uBAAAA,WAAAA,oCAAAA,mBAAmBK,oBAAc,QAAjCL,sCAAAA,UAAAA,kCAAAA,KAAAA,oBAAoC;MAClCT,eAAeY;IACjB,CAAA,GACAN,kBAAkBM,IAAAA;EACpB,GAEMG,QAAQzB,MAAMoB,OAAO;IACzBM,WAAW;IACXC,QAAQ;IACRC,KAAK,CAAA;;IACLC,aAAa;IACbC,sBAAsB;EACxB,CAAA;AAEA7B,YAAU,WAAA;AACRc,4BAAiB,EAAA,GACV,WAAA;AACLA,uBAAiB,EAAA;IACnB;EACF,GAAG,CAAA,CAAE;AAEL,MAAMgB,UAAU,WAAA;AACd,QAAKN,MAAMF,QAAQO,sBAGnBL;YAAMF,QAAQO,uBAAuB,IACrChB,aAAakB,eAAe,IAC5BlB,aAAamB,aAAa,IAC1BR,MAAMF,QAAQM,cAAc,IAC5BR,iBAAiB,EAAA;AACjB,UAAIa,KAAK;AACT,UAAIT,MAAMF,QAAQK,IAAIO,QAAQ;AAC5B,YAAMC,YAAYX,MAAMF,QAAQK,IAAIS,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;AACAjB,YAAMF,QAAQK,MAAM,CAAA,GACpBd,aAAaiB,QAAQ;QACnBJ,QAAQF,MAAMF,QAAQI;QACtBO;MACF,CAAA;;EACF,GAEMS,aAAajC;AAEnBT,mBAAU,WAAA;AACR,QAAI,SAAO2C,SAAW,QACjBzB,UAAUI,SAEf;UAAMsB,aAAa,IAAIC,gBAAAA,GAEjBC,OAAO5B,UAAUI,QAAQyB,kBAAiB;AAKhDD,WAAKE;QACH;QACA,SAACC,GAAAA;AACC,UAAIpC,aAAaqC,oBACfJ,KAAKK,SAAS;YACZC,KAAKvC,aAAawC;YAClBC,UAAU;UACZ,CAAA;QAGJ;;QACA;UACEC,QAAQX,WAAWW;UACnBC,SAAS;QACX;MAAA;AAGF,UAAMC,sBAAsB5C,aAAa6C,iBAAiB,SAACC,KAAAA;MAG3D,CAAA;AAEA,aAAO,WAAA;AACLF,4BAAAA,GACAb,WAAWgB,MAAK;MAClB;;EACF,GAAG,CAAA,CAAE,GAGH,qBAAC/D,YAAAA;IACCQ,KAAKV,YAAYuB,WAAkBb,GAAAA;IACnCwD,MAAM;IACNC,qBAAqB;IACrBC,oBAAoBjC;IACpBkC,WAAU;IACVvD,eAAeiC;;;;IAIflC,UAAU,SAACyC,GAAAA;AACT,UAAM,EAAEI,EAAC,IAAKJ,EAAEgB,YAAYC;AAC5BrD,mBAAawC,IAAIA,GAEbzD,UACFiB,aAAamB,aAAaqB,IAAI,IAE5BA,IAAI,MACNxC,aAAakB,eAAe,KAI9BvB,YAAAA,QAAAA,SAAWyC,CAAAA;IASb;;;;;;;IACAkB,2BAA2B,WAAA;AACzBtD,0BAAakB,eAAe,IAC5BP,MAAMF,QAAQO,uBAAuB,IAC9Ba;IACT;;IAEA0B,0BAA0B,SAACnB,GAAAA;AACzB,aAAOP;IACT;IACA2B,uBAAuB;MACrBC,WAAW;IACb;IACAC,iBAAiB,SAACtB,GAAAA;AAEhB,UAAIrD,OAAO;AACT,YAAM,EAAE4E,MAAK,IAAKvB,EAAEgB;AAEpB,QAAKzC,MAAMF,QAAQM,eACbf,aAAakB,iBAAiB,OAChClB,aAAakB,eAAeyC,OAC5BhD,MAAMF,QAAQG,YAAY+C;AAI9B,YAAM9C,SAAS8C,QAAQ3D,aAAakB,cAC9B0C,KAAKD,QAAQhD,MAAMF,QAAQG;AACjCD,cAAMF,QAAQG,YAAY+C;AAC1B,YAAME,eAAeD,KAAK,GACpBE,cAAc9D,aAAa+D,SAAS/D,aAAagE,UAEjDC,oBAAoBL,OAAO,KAAKC,iBAAiBC;AAEvD,YAAIG,oBAAoB,CAACtD,MAAMF,QAAQM,aAAa;AAClDJ,gBAAMF,QAAQM,cAAc,IAC5Bf,aAAamB,aAAa,IAC1BZ,iBAAiB,EAAA;AACjB;QACF;AAEA,YAAIP,aAAawC,KAAK;AACpB;AAGFjC,yBAAiB,EAAA,GACjBP,aAAakE,KAAKrD,MAAAA,GAClBF,MAAMF,QAAQI,SAASA,QACvBF,MAAMF,QAAQK,IAAIqD,KAAKP,EAAAA,GAEnBjD,MAAMF,QAAQK,IAAIO,SAAS,QAC7BV,MAAMF,QAAQK,MAAMH,MAAMF,QAAQK,IAAIS,MAAM,GAAC;MAEjD;IACF;IACC,GAAGzB;;;AAKV,CAAA;",
-  "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"]
+  "mappings": ";AAAA,SAASA,mBAAmB;AAC5B,SAASC,UAAUC,OAAOC,YAAyB;AAEnD,SAASC,kBAAkB;AAC3B,SAASC,4BAA4B;AACrC,OAAOC,SAASC,WAAWC,QAAQC,gBAAgB;AAEnD,SAASC,uBAAuB;AAShC,IAAMC,yBAAyB,mBAElBC,kBAAkBN,sBAAMO;;;EAMnC,SAAA,OAQEC,KAAAA;QAPA,EACEC,cACAC,UACAC,UACAC,eAAeC,mBACf,GAAGC,MAAAA,IAC+B,OAG9BC,UAAUX,gBAAgBC,wBAAwBI,YAAAA,GAClD,EAAEO,cAAcC,iBAAgB,IAAKF,SACrC,CAACH,eAAeM,iBAAAA,IAAqBnB,qBAAqB;MAC9DoB,MAAMN;MACNO,aAAa;IACf,CAAA,GACMC,YAAYrB,MAAME,OAA4B,IAAA,GAO9CoB,mBAAmB,SAACC,MAAAA;UACxBF,mCAAAA;OAAAA,qBAAAA,UAAUG,aAAO,QAAjBH,uBAAAA,WAAAA,oCAAAA,mBAAmBI,oBAAc,QAAjCJ,sCAAAA,UAAAA,kCAAAA,KAAAA,oBAAoC;QAClCT,eAAeW;MACjB,CAAA,GACAL,kBAAkBK,IAAAA;IACpB,GAEMG,QAAQ1B,MAAME,OAAO;MACzByB,WAAW;MACXC,QAAQ;MACRC,KAAK,CAAA;;MACLC,aAAa;MACbC,sBAAsB;IACxB,CAAA;AAEA9B,cAAU,WAAA;AACRgB,8BAAiB,EAAA,GACV,WAAA;AACLA,yBAAiB,EAAA;MACnB;IACF,GAAG,CAAA,CAAE;AAEL,QAAMe,UAAU,WAAA;AACd,UAAKN,MAAMF,QAAQO,sBAGnBL;cAAMF,QAAQO,uBAAuB,IACrCf,aAAaiB,eAAe,IAC5BjB,aAAakB,aAAa,IAC1BR,MAAMF,QAAQM,cAAc,IAC5BR,iBAAiB,EAAA;AACjB,YAAIa,KAAK;AACT,YAAIT,MAAMF,QAAQK,IAAIO,QAAQ;AAC5B,cAAMC,YAAYX,MAAMF,QAAQK,IAAIS,MAAM,GAAC,GACrCC,OAAOF,UAAUD,SAASC,UAAUG,OAAO,SAACC,GAAGC,GAAAA;mBAAMD,IAAIC;aAAG,CAAA,IAAK,GACjEC,QAAQJ,OAAOF,UAAUD;AAC/BD,eAAKQ,QAAQ;QACf;AACAjB,cAAMF,QAAQK,MAAM,CAAA,GACpBb,aAAagB,QAAQ;UACnBJ,QAAQF,MAAMF,QAAQI;UACtBO;QACF,CAAA;;IACF,GAEMS,aAAahC;AAEnBX,cAAU,WAAA;UAMKoB;AALb,UAAK1B,YACA0B,UAAUG,SAEf;YAAMqB,aAAa,IAAIC,gBAAAA,GAEjBC,QAAO1B,qBAAAA,UAAUG,aAAO,QAAjBH,uBAAAA,SAAAA,SAAAA,mBAAmB2B,kBAAiB;AAEjD,YAAKD,MAOLA;eAAKE;YACH;YACA,SAACC,GAAAA;AACC,cAAIlC,aAAamC,oBACfJ,KAAKK,SAAS;gBACZC,KAAKrC,aAAasC;gBAClBC,UAAU;cACZ,CAAA;YAGJ;;YACA;cACEC,QAAQX,WAAWW;cACnBC,SAAS;YACX;UAAA;AAGF,cAAMC,sBAAsB1C,aAAa2C,iBAAiB,SAACC,KAAAA;UAG3D,CAAA;AAEA,iBAAO,WAAA;AACLF,gCAAAA,GACAb,WAAWgB,MAAK;UAClB;;;IACF,GAAG;MAACxC;KAAU;AAEd,QAAM,CAACyC,sBAAsBC,uBAAAA,IAA2B5D,SAAS,EAAA,GAC3D6D,eAAe9D,OAAO,CAAA,GACtB+D,gBAAgB/D,OAAO,CAAA,GAEvBgE,kBAAkB,WAAA;AACtB,MAAIF,aAAaxC,WAAWyC,cAAczC,WACxCuC,wBAAwBE,cAAczC,UAAUwC,aAAaxC,OAAO;IAExE;AAEA,WACE,sBAAC1B,YAAAA;MACCqE,UAAU,SAACjB,GAAAA;AACTc,qBAAaxC,UAAU0B,EAAEkB,YAAYC,OAAOC,QAC5CJ,gBAAAA;MACF;MACA1D,KAAKd,YAAY2B,WAAkBb,GAAAA;MACnC+D,MAAM;MACNC,qBAAqB;MACrBC,oBAAoBzC;MACpB0C,WAAU;MACV9D,eAAegC;;;;MAIfjC,UAAU,SAACuC,GAAAA;AACT,YAAM,EAAEI,EAAC,IAAKJ,EAAEkB,YAAYO;AAC5B3D,qBAAasC,IAAIA,GAEb1D,UACFoB,aAAakB,aAAaoB,IAAI,IAE5BA,IAAI,MACNtC,aAAaiB,eAAe,KAI9BtB,YAAAA,QAAAA,SAAWuC,CAAAA;MASb;;;;;;;MACA0B,2BAA2B,WAAA;AACzB5D,4BAAaiB,eAAe,IAC5BP,MAAMF,QAAQO,uBAAuB,IAC9Ba;MACT;;MAEAiC,0BAA0B,SAAC3B,GAAAA;AACzB,eAAON;MACT;MACAkC,uBAAuB;QACrBC,WAAW;MACb;MACAC,iBAAiB,SAAC9B,GAAAA;AAEhB,YAAItD,OAAO;AACT,cAAM,EAAEqF,MAAK,IAAK/B,EAAEkB;AAEpB,UAAK1C,MAAMF,QAAQM,eACbd,aAAaiB,iBAAiB,OAChCjB,aAAaiB,eAAegD,OAC5BvD,MAAMF,QAAQG,YAAYsD;AAI9B,cAAMrD,SAASqD,QAAQjE,aAAaiB,cAC9BiD,KAAKD,QAAQvD,MAAMF,QAAQG;AACjCD,gBAAMF,QAAQG,YAAYsD;AAC1B,cAAME,eAAeD,KAAK,GACpBE,cAAcpE,aAAaqE,SAASrE,aAAasE,UAEjDC,mBACJzB,yBAAyBoB,OAAO,KAAKC,iBAAiBC;AAExD,cAAIG,oBAAoB,CAAC7D,MAAMF,QAAQM,aAAa;AAClDJ,kBAAMF,QAAQM,cAAc,IAC5Bd,aAAakB,aAAa,IAC1BZ,iBAAiB,EAAA;AACjB;UACF;AAEA,cAAIN,aAAasC,KAAK;AACpB;AAGFhC,2BAAiB,EAAA,GACjBN,aAAawE,KAAK5D,MAAAA,GAClBF,MAAMF,QAAQI,SAASA,QACvBF,MAAMF,QAAQK,IAAI4D,KAAKP,EAAAA,GAEnBxD,MAAMF,QAAQK,IAAIO,SAAS,QAC7BV,MAAMF,QAAQK,MAAMH,MAAMF,QAAQK,IAAIS,MAAM,GAAC;QAEjD;MACF;MACC,GAAGxB;;;QAGJ,qBAACjB,MAAAA;UACC6F,UAAS;UACTC,OAAO;UACPC,eAAc;UACdC,QAAQ;UACR1B,UAAU,SAACjB,GAAAA;AACTe,0BAAczC,UAAU0B,EAAEkB,YAAYC,OAAOC,QAC7CJ,gBAAAA;UACF;;QAGDxD;;;EAGP;AAAA;",
+  "names": ["composeRefs", "isClient", "isWeb", "View", "ScrollView", "useControllableState", "React", "useEffect", "useRef", "useState", "useSheetContext", "SHEET_SCROLL_VIEW_NAME", "SheetScrollView", "forwardRef", "ref", "__scopeSheet", "children", "onScroll", "scrollEnabled", "scrollEnabledProp", "props", "context", "scrollBridge", "setHasScrollView", "setScrollEnabled_", "prop", "defaultProp", "scrollRef", "setScrollEnabled", "next", "current", "setNativeProps", "state", "lastPageY", "dragAt", "dys", "isScrolling", "isDraggingScrollArea", "release", "scrollStartY", "scrollLock", "vy", "length", "recentDys", "slice", "dist", "reduce", "a", "b", "avgDy", "scrollable", "controller", "AbortController", "node", "getScrollableNode", "addEventListener", "e", "isParentDragging", "scrollTo", "top", "y", "behavior", "signal", "passive", "disposeBridgeListen", "onParentDragging", "val", "abort", "hasScrollableContent", "setHasScrollableContent", "parentHeight", "contentHeight", "setIsScrollable", "onLayout", "nativeEvent", "layout", "height", "flex", "scrollEventThrottle", "onResponderRelease", "className", "contentOffset", "onStartShouldSetResponder", "onMoveShouldSetResponder", "contentContainerStyle", "minHeight", "onResponderMove", "pageY", "dy", "isDraggingUp", "isPaneAtTop", "paneY", "paneMinY", "shouldScrollLock", "drag", "push", "position", "inset", "pointerEvents", "zIndex"]
 }

package/dist/jsx/nativeSheet.js

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

package/dist/jsx/nativeSheet.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/nativeSheet.tsx"],
-  "mappings": "AAAA,SAAS,cAAc;AAEvB,SAAS,WAAW,cAAc;AAClC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAqD9B,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;",
+  "mappings": "AAAA,SAAS,cAAc;AAEvB,SAAS,WAAW,cAAc;AAClC,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAqD9B,mBAIQ,KAHN,YADF;AA/CR,MAAM,eAAmF;AAAA,EACvF,KAAK;AACP;AAEO,SAAS,eAAe,UAAgC;AAC7D,SAAO,aAAa,QAAQ;AAC9B;AAEO,SAAS,iBACd,UACA,YACA;AACA,QAAM,EAAE,gBAAgB,0BAA0B,IAAI;AAEtD,EAAI,aAAa,UACf,aAAa,QAAQ,IAAI,CAAC,UAAsB;AAC9C,UAAM,QAAQ,kBAAkB,KAAK,GAC/B,gBAAgB,sBAAsB,OAAO,KAAK,GAIlD,EAAE,MAAM,QAAQ,IAAI,OACpB,MAAM,OAGT,MAAS;AAEZ,cAAU,MAAM;AACd,MAAI,OACF,IAAI,SAAS,aAAa,IAE1B,IAAI,SAAS,aAAa;AAAA,IAE9B,GAAG,CAAC,IAAI,CAAC;AAET,aAAS,gBAAgB,MAAe;AACtC,YAAM,eAAe,IAAI,GACzB,QAAQ,IAAI;AAAA,IACd;AAQA,WACE,gCACE,+BAAC,iBAAc,kBAAkB,SAAU,GAAG,eAAe,eAAa,IACxE;AAAA,0BAAC,kBAAe,KAAU,mBAAmB,MAAM,gBAAgB,EAAK,GACtE,8BAAC,6BACC,8BAAC,QAAK,OAAO,EAAE,MAAM,EAAE,GAAI,gBAAM,UAAS,GAC5C,GACF;AAAA,MAIA;AAAA,QAAC;AAAA;AAAA,UACC,UAAS;AAAA,UACT,SAAS;AAAA,UACT,eAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UAEP,gBAAM;AAAA;AAAA,MACT;AAAA,OACF,GACF;AAAA,EAEJ;AAEJ;AAEA,MAAM,UAAU,MAAM;AAEtB;",
   "names": []
 }

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

package/dist/jsx/nativeSheet.native.js.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,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;",
+  "mappings": ";AAAA,SAASA,cAAc;AAEvB,SAASC,WAAWC,cAAc;AAClC,SAASC,YAAY;AACrB,SAASC,qBAAqB;AAE9B,SAASC,yBAAyB;AAClC,SAASC,6BAA6B;AAMtC,IAAMC,eAAmF;EACvFC,KAAK;AACP;AAEO,SAASC,eAAeC,UAA8B;AAC3D,SAAOH,aAAaG,QAAAA;AACtB;AAEO,SAASC,iBACdD,UACAE,YAAmE;AAEnE,MAAM,EAAEC,gBAAgBC,0BAAyB,IAAKF;AAEtD,EAAIF,aAAa,UACfH,aAAaG,QAAAA,IAAY,SAACK,OAAAA;AACxB,QAAMC,QAAQX,kBAAkBU,KAAAA,GAC1BE,gBAAgBX,sBAAsBS,OAAOC,KAAAA,GAI7C,EAAEE,MAAMC,QAAO,IAAKH,OACpBI,MAAMlB,OAGTmB,MAAAA;AAEHpB,cAAU,WAAA;AACR,UAAIiB,MAAM;YACRE;SAAAA,eAAAA,IAAIE,aAAO,QAAXF,iBAAAA,UAAAA,aAAaG,aAAY;MAC3B,OAAO;YACLH;SAAAA,gBAAAA,IAAIE,aAAO,QAAXF,kBAAAA,UAAAA,cAAaI,aAAY;MAC3B;IACF,GAAG;MAACN;KAAK;AAET,aAASO,gBAAgBC,MAAa;UACpCX;OAAAA,sBAAAA,MAAMY,kBAAY,QAAlBZ,wBAAAA,UAAAA,oBAAAA,KAAAA,OAAqBG,IAAAA,GACrBC,QAAQO,IAAAA;IACV;AAQA,WACE,qBAAA,WAAA;gBACE,sBAACtB,eAAAA;QAAcwB,kBAAkBC;QAAU,GAAGZ;QAAea,eAAa;;UACxE,qBAACjB,gBAAAA;YAAeO;YAAUW,mBAAmB,WAAA;qBAAMN,gBAAgB,EAAA;;sBACjE,qBAACX,2BAAAA;wBACC,qBAACX,MAAAA;gBAAK6B,OAAO;kBAAEC,MAAM;gBAAE;0BAAIlB,MAAMmB;;;;;;UAMrC,qBAAClC,QAAAA;YACCmC,UAAS;YACTC,SAAS;YACTC,eAAc;YACdC,OAAO;YACPC,QAAQ;sBAEPxB,MAAMmB;;;;;EAKjB;AAEJ;AAEA,IAAML,UAAU,WAAA;AAEhB;",
   "names": ["YStack", "useEffect", "useRef", "View", "SheetProvider", "useSheetOpenState", "useSheetProviderProps", "nativeSheets", "ios", "getNativeSheet", "platform", "setupNativeSheet", "RNIOSModal", "ModalSheetView", "ModalSheetViewMainContent", "props", "state", "providerProps", "open", "setOpen", "ref", "undefined", "current", "presentModal", "dismissModal", "setOpenInternal", "next", "onOpenChange", "setHasScrollView", "emptyFn", "onlyShowFrame", "onModalDidDismiss", "style", "flex", "children", "position", "opacity", "pointerEvents", "width", "height"]
 }

package/package.json

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

package/src/SheetImplementationCustom.tsx

@@ -251,7 +251,6 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
 
       function setPanning(val: boolean) {
         setIsDragging(val)
-        scrollBridge.setParentDragging(false)
 
         // make unselectable:
         if (isClient) {
@@ -271,6 +270,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
       }
 
       const release = ({ vy, dragAt }: { dragAt: number; vy: number }) => {
+        scrollBridge.setParentDragging(false)
         if (scrollBridge.scrollLock) {
           return
         }
@@ -346,6 +346,8 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
 
         const granted = getShouldSet()
 
+        // console.log('DEBUG', granted, scrollBridge.scrollLock, scrollBridge.y)
+
         if (granted) {
           scrollBridge.setParentDragging(true)
         }
@@ -561,7 +563,7 @@ export const SheetImplementationCustom = React.forwardRef<View, SheetProps>(
         <Portal stackZIndex={zIndex} {...portalProps}>
           {shouldMountChildren && (
             <ContainerComponent>
-              <Theme forceClassName name={themeName}>
+              <Theme contain forceClassName name={themeName}>
                 {contents}
               </Theme>
             </ContainerComponent>