tamagui 1.130.3 → 1.130.5

package/dist/native.js

@@ -7871,10 +7871,7 @@ var require_Theme_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(Theme_exports);
-    var import_jsx_runtime6 = require("react/jsx-runtime"), import_constants4 = require_index_native6(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_useTheme = require_useTheme_native(), import_useThemeState = require_useThemeState_native(), import_ThemeDebug = require_ThemeDebug_native(), empty = {
-      className: "",
-      style: {}
-    }, Theme2 = /* @__PURE__ */ (0, import_react3.forwardRef)(function(props, ref) {
+    var import_jsx_runtime6 = require("react/jsx-runtime"), import_constants4 = require_index_native6(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_useTheme = require_useTheme_native(), import_useThemeState = require_useThemeState_native(), import_ThemeDebug = require_ThemeDebug_native(), Theme2 = /* @__PURE__ */ (0, import_react3.forwardRef)(function(props, ref) {
       if (props.disable) return props.children;
       var { passThrough } = props, isRoot = !!props._isRoot, [_, themeState] = (0, import_useTheme.useThemeWithState)(props, isRoot), disableDirectChildTheme = props["disable-child-theme"], finalChildren = disableDirectChildTheme ? import_react3.Children.map(props.children, function(child) {
         return passThrough ? child : /* @__PURE__ */ (0, import_react3.cloneElement)(child, {
@@ -7922,17 +7919,21 @@ var require_Theme_native = __commonJS({
         forceClassName,
         themeState,
         state,
-        ...getThemeClassNameAndStyle(themeState, props, isRoot)
+        themeSpanProps: getThemeClassNameAndColor(themeState, props, isRoot)
       }), forceClassName === !1) return children;
       if (import_constants4.isWeb) {
-        var { className = "", style } = passThrough ? {} : getThemeClassNameAndStyle(themeState, props, isRoot);
+        var baseStyle = props.contain ? inertContainedStyle : inertStyle, { className = "", color } = passThrough ? {} : getThemeClassNameAndColor(themeState, props, isRoot);
         if (children = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", {
-          className: `${className} _dsp_contents is_Theme`,
-          style: passThrough ? void 0 : style,
+          className: `${className} is_Theme`,
+          style: passThrough ? baseStyle : {
+            color,
+            ...baseStyle
+          },
           children
         }), state.hasEverThemed === "wrapped") {
-          var className1 = !passThrough && requiresExtraWrapper ? `${isInverse ? name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "" : ""} _dsp_contents` : "_dsp_contents";
+          var className1 = !passThrough && requiresExtraWrapper ? `${isInverse ? name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "" : ""} ` : "";
           children = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", {
+            style: baseStyle,
             className: className1,
             children
           });
@@ -7941,14 +7942,21 @@ var require_Theme_native = __commonJS({
       }
       return children;
     }
-    function getThemeClassNameAndStyle(themeState, props) {
+    var inertStyle = {
+      display: "contents"
+    }, inertContainedStyle = {
+      display: "contents",
+      contain: "strict"
+    }, empty = {
+      className: "",
+      color: void 0
+    };
+    function getThemeClassNameAndColor(themeState, props) {
       var isRoot = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1;
       if (!themeState.isNew && !props.forceClassName) return empty;
-      var themeColor = themeState != null && themeState.theme && themeState.isNew ? (0, import_createVariable.variableToString)(themeState.theme.color) : "", style = themeColor ? {
-        color: themeColor
-      } : void 0, maxInverses = (0, import_config.getSetting)("maxDarkLightNesting") || 3, themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""), className = `${isRoot ? "" : "t_sub_theme"} t_${themeClassName}`;
+      var themeColor = themeState != null && themeState.theme && themeState.isNew ? (0, import_createVariable.variableToString)(themeState.theme.color) : "", maxInverses = (0, import_config.getSetting)("maxDarkLightNesting") || 3, themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""), className = `${isRoot ? "" : "t_sub_theme"} t_${themeClassName}`;
       return {
-        style,
+        color: themeColor,
         className
       };
     }
@@ -9055,13 +9063,13 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           onPress,
           onLongPress
         });
-        process.env.NODE_ENV === "development" && time2 && time2`spaced-as-child`;
-        var useChildrenResult;
-        import_setupHooks.hooks.useChildren && (useChildrenResult = import_setupHooks.hooks.useChildren(elementType, content, viewProps)), process.env.NODE_ENV === "development" && time2 && time2`use-children`, splitStyles || (elementType = "span", content = propsIn.children, viewProps = {
+        process.env.NODE_ENV === "development" && time2 && time2`spaced-as-child`, splitStyles || (content = propsIn.children, elementType = BaseViewComponent, viewProps = {
           style: {
             display: "contents"
           }
-        }), useChildrenResult ? content = useChildrenResult : content = /* @__PURE__ */ import_react3.default.createElement(elementType, viewProps, content);
+        });
+        var useChildrenResult;
+        import_setupHooks.hooks.useChildren && (useChildrenResult = import_setupHooks.hooks.useChildren(elementType, content, viewProps)), process.env.NODE_ENV === "development" && time2 && time2`use-children`, useChildrenResult ? content = useChildrenResult : content = /* @__PURE__ */ import_react3.default.createElement(elementType, viewProps, content);
         var ResetPresence2 = config == null || (_config_animations = config.animations) === null || _config_animations === void 0 ? void 0 : _config_animations.ResetPresence, needsReset = !!// not when passing down to child
         (!asChild && // not when passThrough
         splitStyles && // not when HOC
@@ -13419,7 +13427,6 @@ var require_index_native19 = __commonJS({
         return cb();
       }), queuedUpdates.clear()));
     }
-    var expectedFrameTime = 16.67, numDroppedFramesUntilPause = 10;
     function startGlobalIntersectionObserver() {
       !import_constants4.isClient || globalIntersectionObserver || (globalIntersectionObserver = new IntersectionObserver(function(entries) {
         entries.forEach(function(entry) {
@@ -13432,20 +13439,18 @@ var require_index_native19 = __commonJS({
     }
     if (import_constants4.isClient) if (rAF) {
       layoutOnAnimationFrame = function() {
-        var now = Date.now(), timeSinceLastFrame = now - lastFrameAt;
-        if (lastFrameAt = now, frameCount++, frameCount % RUN_EVERY_X_FRAMES === 0) {
-          frameCount = 0, rAF(layoutOnAnimationFrame);
-          return;
-        }
         if (strategy !== "off") {
-          var hasRecentSyncWork = timeSinceLastFrame > expectedFrameTime * numDroppedFramesUntilPause;
-          hasRecentSyncWork || Nodes.forEach(function(node) {
-            updateLayoutIfChanged(node, lastFrameAt);
+          if (frameCount++ % RUN_EVERY_X_FRAMES !== 0) {
+            rAF(layoutOnAnimationFrame);
+            return;
+          }
+          frameCount === Number.MAX_SAFE_INTEGER && (frameCount = 0), Nodes.forEach(function(node) {
+            updateLayoutIfChanged(node);
           });
         }
         rAF(layoutOnAnimationFrame);
-      }, layoutOnAnimationFrame2 = layoutOnAnimationFrame, supportsCheckVisibility = "checkVisibility" in document.body, lastFrameAt = Date.now();
-      async function updateLayoutIfChanged(node, frameId) {
+      }, layoutOnAnimationFrame2 = layoutOnAnimationFrame, supportsCheckVisibility = "checkVisibility" in document.body;
+      async function updateLayoutIfChanged(node) {
         if (IntersectionState.get(node) !== !1 && !(process.env.TAMAGUI_ONLAYOUT_VISIBILITY_CHECK === "1" && supportsCheckVisibility && !node.checkVisibility())) {
           var onLayout = LayoutHandlers.get(node);
           if (typeof onLayout == "function") {
@@ -13457,7 +13462,7 @@ var require_index_native19 = __commonJS({
                   getBoundingClientRectAsync(node),
                   getBoundingClientRectAsync(parentNode)
                 ]);
-                if (nr === !1 || pr === !1 || frameId !== lastFrameAt) return;
+                if (nr === !1 || pr === !1) return;
                 nodeRect = nr, parentRect = pr;
               } else nodeRect = node.getBoundingClientRect(), parentRect = parentNode.getBoundingClientRect();
               var cachedRect = NodeRectCache.get(node), cachedParentRect = NodeRectCache.get(parentNode);
@@ -13475,9 +13480,9 @@ var require_index_native19 = __commonJS({
           }
         }
       }
-      rAF(layoutOnAnimationFrame), frameCount = 0, RUN_EVERY_X_FRAMES = 4;
+      rAF(layoutOnAnimationFrame), frameCount = 0, RUN_EVERY_X_FRAMES = 8;
     } else process.env.NODE_ENV === "development" && console.warn("No requestAnimationFrame - please polyfill for onLayout to work correctly");
-    var layoutOnAnimationFrame, layoutOnAnimationFrame2, supportsCheckVisibility, lastFrameAt, frameCount, RUN_EVERY_X_FRAMES, getElementLayoutEvent = function(nodeRect, parentRect) {
+    var layoutOnAnimationFrame, layoutOnAnimationFrame2, supportsCheckVisibility, frameCount, RUN_EVERY_X_FRAMES, getElementLayoutEvent = function(nodeRect, parentRect) {
       return {
         nativeEvent: {
           layout: getRelativeDimensions(nodeRect, parentRect),
@@ -13542,7 +13547,7 @@ 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), startGlobalIntersectionObserver(), globalIntersectionObserver && (globalIntersectionObserver.observe(node2), IntersectionState.set(node2, !0));
+            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), IntersectionState.delete(node2), globalIntersectionObserver && globalIntersectionObserver.unobserve(node2);
@@ -16828,7 +16833,7 @@ var require_Portal_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(Portal_native_exports);
-    var import_jsx_runtime6 = require("react/jsx-runtime"), import_stacks3 = require_index_native24(), import_z_index_stack2 = require_index_native29(), React4 = __toESM2(require("react")), import_react_native4 = require_fake_react_native(), import_constants4 = require_constants_native3(), import_GorhomPortalItem = require_GorhomPortalItem_native(), import_helpers = require_helpers_native(), createPortal = function() {
+    var import_jsx_runtime6 = require("react/jsx-runtime"), import_core12 = require_index_native20(), import_z_index_stack2 = require_index_native29(), React4 = __toESM2(require("react")), import_react_native4 = require_fake_react_native(), import_constants4 = require_constants_native3(), import_GorhomPortalItem = require_GorhomPortalItem_native(), import_helpers = require_helpers_native(), createPortal = function() {
       if (import_constants4.IS_FABRIC) try {
         var _ReactFabricShimModule_default, ReactFabricShimModule = require_fake_react_native(), _ReactFabricShimModule_default_createPortal;
         return (_ReactFabricShimModule_default_createPortal = ReactFabricShimModule == null || (_ReactFabricShimModule_default = ReactFabricShimModule.default) === null || _ReactFabricShimModule_default === void 0 ? void 0 : _ReactFabricShimModule_default.createPortal) !== null && _ReactFabricShimModule_default_createPortal !== void 0 ? _ReactFabricShimModule_default_createPortal : ReactFabricShimModule.createPortal;
@@ -16842,15 +16847,17 @@ var require_Portal_native = __commonJS({
         return console.info("Note: error importing portal, defaulting to non-native portals", err), null;
       }
     }(), Portal = function(propsIn) {
-      var { stackZIndex, ...props } = propsIn, rootTag = React4.useContext(import_react_native4.RootTagContext), zIndex = (0, import_z_index_stack2.useStackedZIndex)((0, import_helpers.getStackedZIndexProps)(propsIn)), contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, {
+      var rootTag = React4.useContext(import_react_native4.RootTagContext), zIndex = (0, import_z_index_stack2.useStackedZIndex)((0, import_helpers.getStackedZIndexProps)(propsIn)), { children, passThrough } = propsIn, contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.View, {
         pointerEvents: "box-none",
-        fullscreen: !0,
         position: "absolute",
+        inset: 0,
         maxWidth: "100%",
-        ...props,
-        zIndex
+        zIndex,
+        passThrough,
+        children
       });
       return !createPortal || !import_constants4.USE_NATIVE_PORTAL || !rootTag ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_GorhomPortalItem.GorhomPortalItem, {
+        passThrough,
         hostName: "root",
         children: contents
       }) : createPortal(contents, rootTag);
@@ -18643,11 +18650,11 @@ var require_SheetImplementationCustom_native = __commonJS({
         scrollBridge.paneMinY = minY;
         var startY = at.current;
         function setPanning(val) {
-          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 = "");
+          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 = "");
         }
         var release = function(param) {
           var { vy, dragAt } = param;
-          if (!scrollBridge.scrollLock) {
+          if (scrollBridge.setParentDragging(!1), !scrollBridge.scrollLock) {
             isExternalDrag = !1, previouslyScrolling = !1, setPanning(!1);
             for (var at2 = dragAt + startY, end = at2 + frameSize * vy * 0.2, closestPoint = 0, dist = Number.POSITIVE_INFINITY, i = 0; i < positions.length; i++) {
               var position2 = positions[i], curDist = end > position2 ? end - position2 : position2 - end;
@@ -18826,6 +18833,7 @@ var require_SheetImplementationCustom_native = __commonJS({
           ...portalProps,
           children: shouldMountChildren && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ContainerComponent, {
             children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Theme, {
+              contain: !0,
               forceClassName: !0,
               name: themeName,
               children: contents
@@ -19013,116 +19021,144 @@ 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, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
-        prop: scrollEnabledProp,
-        defaultProp: !0
-      }), scrollRef = import_react3.default.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 = import_react3.default.useRef({
-        lastPageY: 0,
-        dragAt: 0,
-        dys: [],
-        // store a few recent dys to get velocity on release
-        isScrolling: !1,
-        isDraggingScrollArea: !1
-      });
-      (0, import_react3.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 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(
+      // 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 = (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) {
+          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 = import_react3.default.useRef({
+          lastPageY: 0,
+          dragAt: 0,
+          dys: [],
+          // store a few recent dys to get velocity on release
+          isScrolling: !1,
+          isDraggingScrollArea: !1
+        });
+        (0, import_react3.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 (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"
+        }, scrollable = scrollEnabled;
+        (0, import_react3.useEffect)(function() {
+          var _scrollRef_current;
+          if (import_core12.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
-            }
-          );
-          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,
-        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, import_core12.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 (import_core12.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;
+              return function() {
+                disposeBridgeListen(), controller.abort();
+              };
             }
-            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] = (0, import_react3.useState)(!0), parentHeight = (0, import_react3.useRef)(0), contentHeight = (0, import_react3.useRef)(0), setIsScrollable = function() {
+          parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
+        };
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
+          onLayout: function(e) {
+            parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+          },
+          ref: (0, import_compose_refs.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, import_core12.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 (import_core12.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__ */ (0, import_jsx_runtime6.jsx)(import_core12.View, {
+              position: "absolute",
+              inset: 0,
+              pointerEvents: "none",
+              zIndex: -1,
+              onLayout: function(e) {
+                contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+              }
+            }),
+            children
+          ]
+        });
+      }
+    );
   }
 });
 
@@ -24110,6 +24146,7 @@ var require_Animate_native = __commonJS({
         },
         children
       }) : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.AnimatePresence, {
+        passThrough,
         ...props,
         children: mounted || passThrough ? children : null
       }) : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, {
@@ -24879,8 +24916,8 @@ var require_Popover_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(Popover_exports);
-    var import_jsx_runtime6 = require("react/jsx-runtime"), import_polyfill_dev = require_polyfill_dev(), import_adapt = require_index_native31(), import_animate = require_index_native57(), import_animate_presence = require_index_native4(), import_aria_hidden = require_index_native33(), import_compose_refs = require_index_native11(), import_constants4 = require_index_native6(), import_core12 = require_index_native20(), import_floating = require_index_native58(), import_focus_scope = require_index_native35(), import_helpers = require_index_native7(), import_popper = require_index_native59(), import_portal2 = require_index_native30(), import_remove_scroll = require_index_native36(), import_sheet = require_index_native38(), import_stacks3 = require_index_native24(), import_use_controllable_state = require_index_native10(), import_z_index_stack2 = require_index_native29(), React4 = __toESM2(require("react")), import_useFloatingContext = require_useFloatingContext_native(), needsRepropagation = import_constants4.isAndroid || import_constants4.isIos && !import_portal2.USE_NATIVE_PORTAL, POPOVER_SCOPE = "PopoverScope", PopoverContext = (0, import_core12.createStyledContext)({}), usePopoverContext = PopoverContext.useStyledContext, PopoverAnchor = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover), { onCustomAnchorAdd, onCustomAnchorRemove } = context || {};
+    var import_jsx_runtime6 = require("react/jsx-runtime"), import_polyfill_dev = require_polyfill_dev(), import_adapt = require_index_native31(), import_animate = require_index_native57(), import_animate_presence = require_index_native4(), import_aria_hidden = require_index_native33(), import_compose_refs = require_index_native11(), import_constants4 = require_index_native6(), import_core12 = require_index_native20(), import_floating = require_index_native58(), import_focus_scope = require_index_native35(), import_helpers = require_index_native7(), import_popper = require_index_native59(), import_portal2 = require_index_native30(), import_remove_scroll = require_index_native36(), import_scroll_view = require_index_native37(), import_sheet = require_index_native38(), import_stacks3 = require_index_native24(), import_use_controllable_state = require_index_native10(), import_z_index_stack2 = require_index_native29(), React4 = __toESM2(require("react")), import_useFloatingContext = require_useFloatingContext_native(), needsRepropagation = import_constants4.isAndroid || import_constants4.isIos && !import_portal2.USE_NATIVE_PORTAL, POPOVER_SCOPE = "PopoverScope", PopoverContext = (0, import_core12.createStyledContext)({}), usePopoverContext = PopoverContext.useStyledContext, PopoverAnchor = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
+      var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover || POPOVER_SCOPE), { onCustomAnchorAdd, onCustomAnchorRemove } = context || {};
       return React4.useEffect(function() {
         return onCustomAnchorAdd(), function() {
           return onCustomAnchorRemove();
@@ -24894,7 +24931,7 @@ var require_Popover_native = __commonJS({
         ref: forwardedRef
       });
     }), PopoverTrigger = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover), anchorTo = context.anchorTo, composedTriggerRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, context.triggerRef);
+      var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover || POPOVER_SCOPE), anchorTo = context.anchorTo, composedTriggerRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, context.triggerRef);
       if (!props.children) return null;
       var trigger = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.View, {
         "aria-expanded": context.open,
@@ -24938,7 +24975,7 @@ var require_Popover_native = __commonJS({
         children: trigger
       });
     }), PopoverContent = import_popper.PopperContentFrame.extractable(/* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { trapFocus, enableRemoveScroll = !1, zIndex, __scopePopover, ...contentImplProps } = props, context = usePopoverContext(__scopePopover), contentRef = React4.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef), isRightClickOutsideRef = React4.useRef(!1), [isFullyHidden, setIsFullyHidden] = React4.useState(!context.open);
+      var { trapFocus, enableRemoveScroll = !1, zIndex, __scopePopover, ...contentImplProps } = props, context = usePopoverContext(__scopePopover || POPOVER_SCOPE), contentRef = React4.useRef(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef), isRightClickOutsideRef = React4.useRef(!1), [isFullyHidden, setIsFullyHidden] = React4.useState(!context.open);
       if (context.open && isFullyHidden && setIsFullyHidden(!1), React4.useEffect(function() {
         if (context.open) {
           var content = contentRef.current;
@@ -24948,17 +24985,19 @@ var require_Popover_native = __commonJS({
         context.open
       ]), !context.keepChildrenMounted && isFullyHidden) return null;
       var _contentImplProps_pointerEvents;
-      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContentPortal, {
-        __scopePopover,
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverPortal, {
+        passThrough: context.breakpointActive,
+        __scopePopover: __scopePopover || POPOVER_SCOPE,
         zIndex,
         children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Stack, {
+          passThrough: context.breakpointActive,
           pointerEvents: context.open ? (_contentImplProps_pointerEvents = contentImplProps.pointerEvents) !== null && _contentImplProps_pointerEvents !== void 0 ? _contentImplProps_pointerEvents : "auto" : "none",
           children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContentImpl, {
             ...contentImplProps,
             enableRemoveScroll,
             ref: composedRefs,
             setIsFullyHidden,
-            __scopePopover,
+            __scopePopover: __scopePopover || POPOVER_SCOPE,
             // we make sure we're not trapping once it's been closed
             // (closed !== unmounted when animating out)
             trapFocus: trapFocus ?? context.open,
@@ -24983,55 +25022,76 @@ var require_Popover_native = __commonJS({
           })
         })
       });
-    }));
-    function PopoverRepropagateContext(props) {
-      var popperContext = (0, import_popper.usePopperContext)(props.scope || POPOVER_SCOPE);
+    })), useParentContexts = function(scope) {
+      var popperContext = (0, import_popper.usePopperContext)(scope || POPOVER_SCOPE), adaptContext = (0, import_adapt.useAdaptContext)(), context = usePopoverContext(scope || POPOVER_SCOPE);
+      return {
+        popperContext,
+        adaptContext,
+        context
+      };
+    };
+    function RepropagateParentContexts(param) {
+      var { adaptContext, children, context, popperContext, scope } = param;
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContext.Provider, {
-        scope: props.scope,
+        scope,
         ...popperContext,
         children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContext.Provider, {
-          ...props.context,
+          ...context,
           children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.ProvideAdaptContext, {
-            ...props.adaptContext,
-            children: props.children
+            ...adaptContext,
+            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, isPopover = !context.breakpointActive, isSheet = context.breakpointActive;
-      return needsRepropagation && (contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverRepropagateContext, {
-        scope: __scopePopover || POPOVER_SCOPE,
-        context,
-        adaptContext,
-        zIndex,
-        children: props.children
-      })), /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, {
+    var PortalAdaptSafe = function(param) {
+      var { children, __scopePopover } = param;
+      if (needsRepropagation) {
+        var scope = __scopePopover || POPOVER_SCOPE, parentContexts = useParentContexts(scope);
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
+          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(RepropagateParentContexts, {
+            scope,
+            ...parentContexts,
+            children
+          })
+        });
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
+        children
+      });
+    };
+    function PopoverPortal(props) {
+      var scope = props.__scopePopover || POPOVER_SCOPE, zIndex = props.zIndex, themeName = (0, import_core12.useThemeName)(), content = props.children;
+      if (needsRepropagation) {
+        var parentContexts = useParentContexts(scope);
+        content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(RepropagateParentContexts, {
+          scope,
+          ...parentContexts,
+          children: content
+        });
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, {
+        passThrough: props.passThrough,
         stackZIndex: !0,
         zIndex,
         children: (
           /* 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,
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Theme, {
+            passThrough: props.passThrough,
+            contain: !0,
             forceClassName: !0,
             name: themeName,
-            children: [
-              !!context.open && isSheet && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, {
-                fullscreen: !0,
-                onPress: (0, import_helpers.composeEventHandlers)(props.onPress, context.onOpenToggle)
-              }),
-              /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_z_index_stack2.StackZIndexContext, {
-                zIndex: (0, import_portal2.resolveViewZIndex)(zIndex),
-                children: contents
-              })
-            ]
+            children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_z_index_stack2.StackZIndexContext, {
+              zIndex: (0, import_portal2.resolveViewZIndex)(zIndex),
+              children: content
+            })
           })
         )
       });
     }
     var PopoverContentImpl = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { trapFocus, __scopePopover, onOpenAutoFocus, onCloseAutoFocus, disableOutsidePointerEvents, disableFocusScope, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, children, enableRemoveScroll, freezeContentsWhenHidden, setIsFullyHidden, lazyMount, ...contentProps } = props, context = usePopoverContext(__scopePopover), { open, keepChildrenMounted } = context, handleExitComplete = React4.useCallback(function() {
+      var { trapFocus, __scopePopover, onOpenAutoFocus, onCloseAutoFocus, disableOutsidePointerEvents, disableFocusScope, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, children, enableRemoveScroll, freezeContentsWhenHidden, setIsFullyHidden, lazyMount, ...contentProps } = props, context = usePopoverContext(__scopePopover || POPOVER_SCOPE), { open, keepChildrenMounted } = context, handleExitComplete = React4.useCallback(function() {
         setIsFullyHidden == null || setIsFullyHidden(!0);
       }, [
         setIsFullyHidden
@@ -25039,42 +25099,27 @@ var require_Popover_native = __commonJS({
         disable: context.breakpointActive,
         children
       });
-      return context.breakpointActive, /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(RepropagatePopperAdapt, {
-        __scopePopover: __scopePopover || POPOVER_SCOPE,
-        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate.Animate, {
-          type: "presence",
-          present: !!open,
-          keepChildrenMounted: !!keepChildrenMounted,
-          onExitComplete: handleExitComplete,
-          lazyMount,
+      return context.breakpointActive, /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate.Animate, {
+        type: "presence",
+        present: !!open,
+        keepChildrenMounted: !!keepChildrenMounted,
+        onExitComplete: handleExitComplete,
+        lazyMount,
+        passThrough: context.breakpointActive,
+        children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContent, {
+          __scopePopper: __scopePopover || POPOVER_SCOPE,
+          "data-state": getState(open),
+          id: context.contentId,
+          ref: forwardedRef,
           passThrough: context.breakpointActive,
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContent, {
-            __scopePopper: __scopePopover || POPOVER_SCOPE,
-            "data-state": getState(open),
-            id: context.contentId,
-            ref: forwardedRef,
-            passThrough: context.breakpointActive,
-            ...contentProps,
+          ...contentProps,
+          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PortalAdaptSafe, {
             children: contents
-          }, context.contentId)
-        })
-      });
-    }), RepropagatePopperAdapt = function(param) {
-      var { children, __scopePopover } = param;
-      if (needsRepropagation) {
-        var popperContext = (0, import_popper.usePopperContext)(__scopePopover || POPOVER_SCOPE);
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContext.Provider, {
-            ...popperContext,
-            children
           })
-        });
-      }
-      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
-        children
+        }, context.contentId)
       });
-    }, PopoverClose = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover);
+    }), PopoverClose = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
+      var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover || POPOVER_SCOPE);
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, {
         ...rest,
         ref: forwardedRef,
@@ -25094,7 +25139,14 @@ var require_Popover_native = __commonJS({
       });
     }), PopoverScrollView = /* @__PURE__ */ React4.forwardRef(function(props, ref) {
       var context = usePopoverContext(POPOVER_SCOPE);
-      return props.children;
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_scroll_view.ScrollView, {
+        ref,
+        // when adapted, no pointer events!
+        pointerEvents: context.breakpointActive ? "none" : void 0,
+        scrollEnabled: !context.breakpointActive,
+        passThrough: context.breakpointActive,
+        ...props
+      });
     }), Popover = (0, import_helpers.withStaticProperties)(/* @__PURE__ */ React4.forwardRef(function(props, ref) {
       var id = React4.useId();
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptParent, {
@@ -25174,7 +25226,7 @@ var require_Popover_native = __commonJS({
         keepChildrenMounted
       }, memoizedChildren = React4.useMemo(function() {
         return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContext.Provider, {
-          scope: __scopePopover,
+          scope: __scopePopover || POPOVER_SCOPE,
           ...popoverContext,
           children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverSheetController, {
             onOpenChange: setOpen,
@@ -25182,6 +25234,7 @@ var require_Popover_native = __commonJS({
           })
         });
       }, [
+        __scopePopover,
         setOpen,
         children,
         ...Object.values(popoverContext)
@@ -25204,7 +25257,7 @@ var require_Popover_native = __commonJS({
       return open ? "open" : "closed";
     }
     var PopoverSheetController = function(param) {
-      var { __scopePopover, ...props } = param, context = usePopoverContext(__scopePopover), showSheet = useShowPopoverSheet(context), breakpointActive = context.breakpointActive, getShowSheet = (0, import_core12.useGet)(showSheet);
+      var { __scopePopover, ...props } = param, context = usePopoverContext(__scopePopover || POPOVER_SCOPE), showSheet = useShowPopoverSheet(context), breakpointActive = context.breakpointActive, getShowSheet = (0, import_core12.useGet)(showSheet);
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_sheet.SheetController, {
         onOpenChange: function(val) {
           if (getShowSheet()) {