tamagui 1.130.1 → 1.130.3

package/dist/test.native.js

@@ -7011,7 +7011,9 @@ var require_useThemeState_native = __commonJS({
       var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, id = arguments.length > 4 ? arguments[4] : void 0, parentId = arguments.length > 5 ? arguments[5] : void 0, needsUpdate = arguments.length > 6 ? arguments[6] : void 0, pendingUpdate = arguments.length > 7 ? arguments[7] : void 0, { debug } = props, parentState = states.get(parentId);
       if (props.passThrough) return [
         !1,
-        lastState ?? parentState
+        lastState || parentState || {
+          name: ""
+        }
       ];
       themes || (themes = (0, import_config.getConfig)().themes);
       var name = !propsKey && (!lastState || !(lastState != null && lastState.isNew)) ? null : getNewThemeName(parentState == null ? void 0 : parentState.name, props, pendingUpdate === "force" ? !0 : !!needsUpdate), isSameAsParent = parentState && (!name || name === parentState.name), shouldRerender = !!(needsUpdate && (pendingUpdate || (lastState == null ? void 0 : lastState.name) !== (parentState == null ? void 0 : parentState.name)));
@@ -7345,7 +7347,7 @@ var require_useTheme_native = __commonJS({
       var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, [theme] = useThemeWithState(props), res = theme;
       return res;
     }, useThemeWithState = function(props) {
-      var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, keys = (0, import_react3.useRef)(null), themeState = (0, import_useThemeState.useThemeState)(props, isRoot, keys), themeProxied = (0, import_getThemeProxied.getThemeProxied)(props, themeState, keys);
+      var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, keys = (0, import_react3.useRef)(null), themeState = (0, import_useThemeState.useThemeState)(props, isRoot, keys), themeProxied = props.passThrough ? {} : (0, import_getThemeProxied.getThemeProxied)(props, themeState, keys);
       return [
         themeProxied,
         themeState
@@ -7507,7 +7509,7 @@ var require_Theme_native = __commonJS({
       }
       if (forceClassName === !1) return children;
       if (import_constants4.isWeb) {
-        var { className, style } = getThemeClassNameAndStyle(themeState, props, isRoot);
+        var { className = "", style } = passThrough ? {} : getThemeClassNameAndStyle(themeState, props, isRoot);
         if (children = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", {
           className: `${className} _dsp_contents is_Theme`,
           style: passThrough ? void 0 : style,
@@ -8305,7 +8307,7 @@ var require_createComponent_native = __commonJS({
             });
           }
         }
-        if (splitStyles && (!hasAnimationProp || groupName) && animationDriver != null && animationDriver.avoidReRenders) {
+        if (splitStyles && (hasAnimationProp || groupName) && animationDriver != null && animationDriver.avoidReRenders) {
           var useStyleListener = stateRef.current.useStyleListener, ogSetStateShallow = setStateShallow;
           stateRef.current.setStateShallow = function(nextOrGetNext) {
             var prev = NextState.get(stateRef) || state, next = typeof nextOrGetNext == "function" ? nextOrGetNext(prev) : nextOrGetNext;
@@ -8320,9 +8322,9 @@ var require_createComponent_native = __commonJS({
                 };
                 NextState.set(stateRef, updatedState);
                 var { group, hasDynGroupChildren, unmounted, animation, ...childrenGroupState } = updatedState;
-                if (groupContext && notifyGroupSubscribers(groupContext, stateRef.current.group || null, childrenGroupState), !hasAnimationProp || !useStyleListener) return;
+                groupContext && notifyGroupSubscribers(groupContext, stateRef.current.group || null, childrenGroupState);
                 var nextStyles = (0, import_getSplitStyles.getSplitStyles)(props, staticConfig, theme, themeName, updatedState, styleProps, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp);
-                useStyleListener((nextStyles == null ? void 0 : nextStyles.style) || {});
+                useStyleListener == null || useStyleListener((nextStyles == null ? void 0 : nextStyles.style) || {});
               } else ogSetStateShallow(next);
             }
           }, setStateShallow = function(state2) {
@@ -12835,7 +12837,7 @@ var require_index_native19 = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(index_exports2);
-    var import_constants4 = require_index_native6(), import_is_equal_shallow = require_index_native12(), LayoutHandlers = /* @__PURE__ */ new WeakMap(), Nodes = /* @__PURE__ */ new Set(), strategy = "async";
+    var import_constants4 = require_index_native6(), import_is_equal_shallow = require_index_native12(), LayoutHandlers = /* @__PURE__ */ new WeakMap(), Nodes = /* @__PURE__ */ new Set(), IntersectionState = /* @__PURE__ */ new WeakMap(), globalIntersectionObserver = null, strategy = "async";
     function setOnLayoutStrategy3(state) {
       strategy = state;
     }
@@ -12846,52 +12848,64 @@ var require_index_native19 = __commonJS({
       }), queuedUpdates.clear()));
     }
     var expectedFrameTime = 16.67, numDroppedFramesUntilPause = 10;
+    function startGlobalIntersectionObserver() {
+      !import_constants4.isClient || globalIntersectionObserver || (globalIntersectionObserver = new IntersectionObserver(function(entries) {
+        entries.forEach(function(entry) {
+          var node = entry.target;
+          IntersectionState.get(node) !== entry.isIntersecting && IntersectionState.set(node, entry.isIntersecting);
+        });
+      }, {
+        threshold: 0
+      }));
+    }
     if (import_constants4.isClient && rAF) {
       layoutOnAnimationFrame = function() {
         var now = Date.now(), timeSinceLastFrame = now - lastFrameAt;
-        if (lastFrameAt = now, frameCount < runEveryXFrames) {
-          frameCount++, rAF(layoutOnAnimationFrame);
+        if (lastFrameAt = now, frameCount++, frameCount % RUN_EVERY_X_FRAMES === 0) {
+          frameCount = 0, rAF(layoutOnAnimationFrame);
           return;
         }
-        if (frameCount = 0, strategy !== "off") {
+        if (strategy !== "off") {
           var hasRecentSyncWork = timeSinceLastFrame > expectedFrameTime * numDroppedFramesUntilPause;
           hasRecentSyncWork || Nodes.forEach(function(node) {
             updateLayoutIfChanged(node, lastFrameAt);
           });
         }
         rAF(layoutOnAnimationFrame);
-      }, layoutOnAnimationFrame2 = layoutOnAnimationFrame, lastFrameAt = Date.now();
+      }, layoutOnAnimationFrame2 = layoutOnAnimationFrame, supportsCheckVisibility = "checkVisibility" in document.body, lastFrameAt = Date.now();
       async function updateLayoutIfChanged(node, frameId) {
-        var onLayout = LayoutHandlers.get(node);
-        if (typeof onLayout == "function") {
-          var parentNode = node.parentElement;
-          if (parentNode) {
-            var nodeRect, parentRect;
-            if (strategy === "async") {
-              var [nr, pr] = await Promise.all([
-                getBoundingClientRectAsync(node),
-                getBoundingClientRectAsync(parentNode)
-              ]);
-              if (nr === !1 || pr === !1 || frameId !== lastFrameAt) return;
-              nodeRect = nr, parentRect = pr;
-            } else nodeRect = node.getBoundingClientRect(), parentRect = parentNode.getBoundingClientRect();
-            var cachedRect = NodeRectCache.get(node), cachedParentRect = NodeRectCache.get(parentNode);
-            if (!cachedRect || // has changed one rect
-            // @ts-expect-error DOMRectReadOnly can go into object
-            !(0, import_is_equal_shallow.isEqualShallow)(cachedRect, nodeRect) && // @ts-expect-error DOMRectReadOnly can go into object
-            (!cachedParentRect || !(0, import_is_equal_shallow.isEqualShallow)(cachedParentRect, parentRect))) {
-              NodeRectCache.set(node, nodeRect), ParentRectCache.set(parentNode, parentRect);
-              var event = getElementLayoutEvent(nodeRect, parentRect);
-              avoidUpdates ? queuedUpdates.set(node, function() {
-                return onLayout(event);
-              }) : onLayout(event);
+        if (IntersectionState.get(node) !== !1 && !(process.env.TAMAGUI_ONLAYOUT_VISIBILITY_CHECK === "1" && supportsCheckVisibility && !node.checkVisibility())) {
+          var onLayout = LayoutHandlers.get(node);
+          if (typeof onLayout == "function") {
+            var parentNode = node.parentElement;
+            if (parentNode) {
+              var nodeRect, parentRect;
+              if (strategy === "async") {
+                var [nr, pr] = await Promise.all([
+                  getBoundingClientRectAsync(node),
+                  getBoundingClientRectAsync(parentNode)
+                ]);
+                if (nr === !1 || pr === !1 || frameId !== lastFrameAt) return;
+                nodeRect = nr, parentRect = pr;
+              } else nodeRect = node.getBoundingClientRect(), parentRect = parentNode.getBoundingClientRect();
+              var cachedRect = NodeRectCache.get(node), cachedParentRect = NodeRectCache.get(parentNode);
+              if (!cachedRect || // has changed one rect
+              // @ts-expect-error DOMRectReadOnly can go into object
+              !(0, import_is_equal_shallow.isEqualShallow)(cachedRect, nodeRect) && // @ts-expect-error DOMRectReadOnly can go into object
+              (!cachedParentRect || !(0, import_is_equal_shallow.isEqualShallow)(cachedParentRect, parentRect))) {
+                NodeRectCache.set(node, nodeRect), ParentRectCache.set(parentNode, parentRect);
+                var event = getElementLayoutEvent(nodeRect, parentRect);
+                avoidUpdates ? queuedUpdates.set(node, function() {
+                  return onLayout(event);
+                }) : onLayout(event);
+              }
             }
           }
         }
       }
-      rAF(layoutOnAnimationFrame), frameCount = 0, runEveryXFrames = 6;
+      rAF(layoutOnAnimationFrame), frameCount = 0, RUN_EVERY_X_FRAMES = 4;
     }
-    var layoutOnAnimationFrame, layoutOnAnimationFrame2, lastFrameAt, frameCount, runEveryXFrames, getElementLayoutEvent = function(nodeRect, parentRect) {
+    var layoutOnAnimationFrame, layoutOnAnimationFrame2, supportsCheckVisibility, lastFrameAt, frameCount, RUN_EVERY_X_FRAMES, getElementLayoutEvent = function(nodeRect, parentRect) {
       return {
         nativeEvent: {
           layout: getRelativeDimensions(nodeRect, parentRect),
@@ -12956,10 +12970,10 @@ var require_index_native19 = __commonJS({
         if (onLayout) {
           var node2 = (_ref_current2 = ref.current) === null || _ref_current2 === void 0 ? void 0 : _ref_current2.host;
           if (node2) {
-            LayoutHandlers.set(node2, onLayout), Nodes.add(node2);
+            LayoutHandlers.set(node2, onLayout), Nodes.add(node2), startGlobalIntersectionObserver(), globalIntersectionObserver && (globalIntersectionObserver.observe(node2), IntersectionState.set(node2, !0));
             var parentNode = node2.parentNode;
             return parentNode && onLayout(getElementLayoutEvent(node2.getBoundingClientRect(), parentNode.getBoundingClientRect())), function() {
-              Nodes.delete(node2), LayoutHandlers.delete(node2), NodeRectCache.delete(node2), LastChangeTime.delete(node2);
+              Nodes.delete(node2), LayoutHandlers.delete(node2), NodeRectCache.delete(node2), LastChangeTime.delete(node2), IntersectionState.delete(node2), globalIntersectionObserver && globalIntersectionObserver.unobserve(node2);
             };
           }
         }
@@ -12973,14 +12987,13 @@ var require_index_native19 = __commonJS({
     }
     var getBoundingClientRectAsync = function(node) {
       return new Promise(function(res) {
-        if (!(!node || node.nodeType !== 1)) {
-          var io = new IntersectionObserver(function(entries) {
-            return entries[0].isIntersecting ? (io.disconnect(), res(entries[0].boundingClientRect)) : res(!1);
-          }, {
-            threshold: 0
-          });
-          io.observe(node);
-        }
+        if (!node || node.nodeType !== 1) return res(!1);
+        var io = new IntersectionObserver(function(entries) {
+          return io.disconnect(), res(entries[0].boundingClientRect);
+        }, {
+          threshold: 0
+        });
+        io.observe(node);
       });
     }, getBoundingClientRect = function(node) {
       var _node_getBoundingClientRect;
@@ -17212,11 +17225,15 @@ var require_RemoveScroll_native = __commonJS({
     __export2(RemoveScroll_native_exports, {
       RemoveScroll: function() {
         return RemoveScroll;
+      },
+      getAllowedScrollableNode: function() {
+        return getAllowedScrollableNode;
       }
     });
     module2.exports = __toCommonJS2(RemoveScroll_native_exports);
     var RemoveScroll = function(props) {
       return props.children;
+    }, getAllowedScrollableNode = function() {
     };
   }
 });
@@ -17489,11 +17506,11 @@ var require_useSheetOpenState_native = __commonJS({
       var { isHidden, controller } = (0, import_useSheetController.useSheetController)(), onOpenChangeInternal = function(val) {
         var _controller_onOpenChange, _props_onOpenChange;
         controller == null || (_controller_onOpenChange = controller.onOpenChange) === null || _controller_onOpenChange === void 0 || _controller_onOpenChange.call(controller, val), (_props_onOpenChange = props.onOpenChange) === null || _props_onOpenChange === void 0 || _props_onOpenChange.call(props, val);
-      }, _controller_open, propVal = (_controller_open = controller == null ? void 0 : controller.open) !== null && _controller_open !== void 0 ? _controller_open : props.open, _props_defaultOpen, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
+      }, _controller_open, _props_open, propVal = props.preferAdaptParentOpenState ? (_controller_open = controller == null ? void 0 : controller.open) !== null && _controller_open !== void 0 ? _controller_open : props.open : (_props_open = props.open) !== null && _props_open !== void 0 ? _props_open : controller == null ? void 0 : controller.open, _props_defaultOpen, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
         prop: propVal,
         defaultProp: (_props_defaultOpen = props.defaultOpen) !== null && _props_defaultOpen !== void 0 ? _props_defaultOpen : !1,
         onChange: onOpenChangeInternal,
-        strategy: "prop-wins"
+        strategy: "most-recent-wins"
       });
       return {
         open,
@@ -17580,7 +17597,7 @@ var require_useSheetProviderProps_native = __commonJS({
         prop: props.position,
         defaultProp: props.defaultPosition || (state.open ? 0 : -1),
         onChange: props.onPositionChange,
-        strategy: "prop-wins"
+        strategy: "most-recent-wins"
       }), position = state.open === !1 ? -1 : position_, { open } = state, setPosition = import_react3.default.useCallback(function(next) {
         props.dismissOnSnapToBottom && next === snapPoints.length - 1 ? state.setOpen(!1) : setPositionImmediate(next);
       }, [
@@ -17600,7 +17617,7 @@ var require_useSheetProviderProps_native = __commonJS({
       var { animationDriver } = (0, import_core12.useConfiguration)();
       if (!animationDriver) throw new Error("Must set animations in tamagui.config.ts");
       var scrollBridge = (0, import_use_constant.useConstant)(function() {
-        return {
+        var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
           enabled: !1,
           y: 0,
           paneY: 0,
@@ -17610,8 +17627,20 @@ var require_useSheetProviderProps_native = __commonJS({
           },
           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,
@@ -17716,7 +17745,6 @@ var require_nativeSheet_native = __commonJS({
         }
         return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, {
           children: /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_SheetContext.SheetProvider, {
-            scrollEnabled: !0,
             setHasScrollView: emptyFn,
             ...providerProps,
             onlyShowFrame: !0,
@@ -18009,15 +18037,13 @@ var require_SheetImplementationCustom_native = __commonJS({
         isAbleToPosition,
         position
       ]);
-      var _props_disableDrag, disableDrag = (_props_disableDrag = props.disableDrag) !== null && _props_disableDrag !== void 0 ? _props_disableDrag : controller == null ? void 0 : controller.disableDrag, themeName = (0, import_core12.useThemeName)(), [isDragging, setIsDragging] = import_react3.default.useState(!1), scrollEnabled = (0, import_react3.useRef)(!0), setScrollEnabled = import_react3.default.useCallback(function(val) {
-        scrollEnabled.current = val;
-      }, []), panResponder = import_react3.default.useMemo(function() {
+      var _props_disableDrag, disableDrag = (_props_disableDrag = props.disableDrag) !== null && _props_disableDrag !== void 0 ? _props_disableDrag : controller == null ? void 0 : controller.disableDrag, themeName = (0, import_core12.useThemeName)(), [isDragging, setIsDragging] = import_react3.default.useState(!1), panResponder = import_react3.default.useMemo(function() {
         if (disableDrag || !frameSize || isShowingInnerSheet) return;
         var minY = positions[0];
         scrollBridge.paneMinY = minY;
         var startY = at.current;
         function setPanning(val) {
-          setIsDragging(val), import_constants4.isClient && (sheetHiddenStyleSheet || (sheetHiddenStyleSheet = document.createElement("style"), typeof document.head < "u" && document.head.appendChild(sheetHiddenStyleSheet)), val ? sheetHiddenStyleSheet.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : sheetHiddenStyleSheet.innerText = "");
+          setIsDragging(val), scrollBridge.setParentDragging(!1), import_constants4.isClient && (sheetHiddenStyleSheet || (sheetHiddenStyleSheet = document.createElement("style"), typeof document.head < "u" && document.head.appendChild(sheetHiddenStyleSheet)), val ? sheetHiddenStyleSheet.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : sheetHiddenStyleSheet.innerText = "");
         }
         var release = function(param) {
           var { vy, dragAt } = param;
@@ -18027,7 +18053,7 @@ var require_SheetImplementationCustom_native = __commonJS({
               var position2 = positions[i], curDist = end > position2 ? end - position2 : position2 - end;
               curDist < dist && (dist = curDist, closestPoint = i);
             }
-            setPosition(closestPoint), animateTo(closestPoint), setScrollEnabled(closestPoint === 0);
+            setPosition(closestPoint), animateTo(closestPoint);
           }
         }, finish = function(_e, state2) {
           release({
@@ -18037,14 +18063,15 @@ var require_SheetImplementationCustom_native = __commonJS({
         }, previouslyScrolling = !1, onMoveShouldSet = function(e, param) {
           var { dy } = param;
           function getShouldSet() {
-            if (e.target === providerProps.handleRef.current || !scrollEnabled.current) return !0;
+            if (e.target === providerProps.handleRef.current) return !0;
             if (scrollBridge.scrollLock) return !1;
             var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-            return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 10;
+            return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
           }
-          return getShouldSet();
+          var granted = getShouldSet();
+          return granted && scrollBridge.setParentDragging(!0), granted;
         }, grant = function() {
-          setScrollEnabled(!1), setPanning(!0), stopSpring(), startY = at.current;
+          setPanning(!0), stopSpring(), startY = at.current;
         }, isExternalDrag = !1;
         return scrollBridge.drag = function(dy) {
           isExternalDrag || (isExternalDrag = !0, grant());
@@ -18056,8 +18083,8 @@ var require_SheetImplementationCustom_native = __commonJS({
           onMoveShouldSetPanResponder: onMoveShouldSet,
           onPanResponderGrant: grant,
           onPanResponderMove: function(_e, param) {
-            var { dy } = param, toFull = dy + startY, to = (0, import_helpers.resisted)(toFull, minY);
-            animatedNumber.setValue(to, {
+            var { dy } = param, toFull = dy + startY, to = (0, import_helpers.resisted)(toFull, minY), isAtTop = to <= minY;
+            isAtTop ? scrollBridge.setParentDragging(!1) : scrollBridge.setParentDragging(!0), animatedNumber.setValue(to, {
               type: "direct"
             });
           },
@@ -18131,7 +18158,6 @@ var require_SheetImplementationCustom_native = __commonJS({
         value: nextParentContext,
         children: /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_SheetContext.SheetProvider, {
           ...providerProps,
-          scrollEnabled: scrollEnabled.current,
           setHasScrollView,
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.AnimatePresence, {
@@ -18388,7 +18414,7 @@ var require_SheetScrollView_native = __commonJS({
     });
     module2.exports = __toCommonJS2(SheetScrollView_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native11(), import_core12 = require_index_native20(), import_scroll_view = require_index_native37(), import_use_controllable_state = require_index_native10(), import_react3 = __toESM2(require("react")), import_SheetContext = require_SheetContext_native(), SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ import_react3.default.forwardRef(function(param, ref) {
-      var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
+      var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
         prop: scrollEnabledProp,
         defaultProp: !0
       }), scrollRef = import_react3.default.useRef(null), setScrollEnabled = function(next) {
@@ -18402,7 +18428,7 @@ var require_SheetScrollView_native = __commonJS({
         dys: [],
         // store a few recent dys to get velocity on release
         isScrolling: !1,
-        isDragging: !1
+        isDraggingScrollArea: !1
       });
       (0, import_react3.useEffect)(function() {
         return setHasScrollView(!0), function() {
@@ -18410,8 +18436,8 @@ var require_SheetScrollView_native = __commonJS({
         };
       }, []);
       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) {
@@ -18424,8 +18450,31 @@ var require_SheetScrollView_native = __commonJS({
             vy
           });
         }
-      }, scrollable = scrollEnabled ?? scrollEnabled_;
-      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_scroll_view.ScrollView, {
+      }, scrollable = scrollEnabled;
+      return (0, import_react3.useEffect)(function() {
+        if (!(typeof window > "u") && scrollRef.current) {
+          var controller = new AbortController(), node = scrollRef.current.getScrollableNode();
+          node.addEventListener(
+            "touchmove",
+            function(e) {
+              scrollBridge.isParentDragging && node.scrollTo({
+                top: scrollBridge.y,
+                behavior: "instant"
+              });
+            },
+            // can't preventdefault its not cancellable
+            {
+              signal: controller.signal,
+              passive: !1
+            }
+          );
+          var disposeBridgeListen = scrollBridge.onParentDragging(function(val) {
+          });
+          return function() {
+            disposeBridgeListen(), controller.abort();
+          };
+        }
+      }, []), /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_scroll_view.ScrollView, {
         ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
         flex: 1,
         scrollEventThrottle: 8,
@@ -18446,7 +18495,7 @@ var require_SheetScrollView_native = __commonJS({
         // 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) {
@@ -18458,15 +18507,15 @@ var require_SheetScrollView_native = __commonJS({
         onResponderMove: function(e) {
           if (import_core12.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));
           }
         },
@@ -18621,7 +18670,7 @@ var require_createSheet_native = __commonJS({
           element
         ]), context.onlyShowFrame, null;
       })), SheetFrame = Frame.extractable(/* @__PURE__ */ (0, import_react3.forwardRef)(function(param2, forwardedRef) {
-        var { __scopeSheet, adjustPaddingForOffscreenContent, disableHideBottomOverflow, children, ...props } = param2, context = (0, import_SheetContext.useSheetContext)(import_constants22.SHEET_NAME, __scopeSheet), { hasFit, removeScrollEnabled, frameSize, contentRef, open } = context, composedContentRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef), offscreenSize = (0, import_useSheetOffscreenSize.useSheetOffscreenSize)(context), sheetContents = (0, import_react3.useMemo)(function() {
+        var { __scopeSheet, adjustPaddingForOffscreenContent, disableHideBottomOverflow, children, ...props } = param2, context = (0, import_SheetContext.useSheetContext)(import_constants22.SHEET_NAME, __scopeSheet), { hasFit, removeScrollEnabled = !0, frameSize, contentRef, open } = context, composedContentRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef), offscreenSize = (0, import_useSheetOffscreenSize.useSheetOffscreenSize)(context), sheetContents = (0, import_react3.useMemo)(function() {
           return (
             // @ts-expect-error
             /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Frame, {
@@ -24250,23 +24299,20 @@ var require_Popover_native = __commonJS({
     }));
     function PopoverRepropagateContext(props) {
       var popperContext = (0, import_popper.usePopperContext)(props.scope || POPOVER_SCOPE);
-      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, {
-        zIndex: props.zIndex,
-        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContext.Provider, {
-          scope: props.scope,
-          ...popperContext,
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContext.Provider, {
-            ...props.context,
-            children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.ProvideAdaptContext, {
-              ...props.adaptContext,
-              children: props.children
-            })
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContext.Provider, {
+        scope: props.scope,
+        ...popperContext,
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContext.Provider, {
+          ...props.context,
+          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.ProvideAdaptContext, {
+            ...props.adaptContext,
+            children: props.children
           })
         })
       });
     }
     function PopoverContentPortal(props) {
-      var { __scopePopover } = props, zIndex = props.zIndex, context = usePopoverContext(__scopePopover), themeName = (0, import_core12.useThemeName)(), adaptContext = (0, import_adapt.useAdaptContext)(), contents = props.children;
+      var { __scopePopover } = props, zIndex = props.zIndex, context = usePopoverContext(__scopePopover), themeName = (0, import_core12.useThemeName)(), adaptContext = (0, import_adapt.useAdaptContext)(), contents = props.children, isPopover = !context.breakpointActive, isSheet = context.breakpointActive;
       return needsRepropagation && (contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverRepropagateContext, {
         scope: __scopePopover || POPOVER_SCOPE,
         context,
@@ -24280,10 +24326,11 @@ var require_Popover_native = __commonJS({
           /* forceClassName avoids forced re-mount renders for some reason... see the HeadMenu as you change tints a few times */
           /* without this you'll see the site menu re-rendering. It must be something in wrapping children in Theme */
           /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_core12.Theme, {
+            passThrough: isPopover,
             forceClassName: !0,
             name: themeName,
             children: [
-              !!context.open && !context.breakpointActive && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, {
+              !!context.open && isSheet && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, {
                 fullscreen: !0,
                 onPress: (0, import_helpers.composeEventHandlers)(props.onPress, context.onOpenToggle)
               }),