tamagui 1.123.0 → 1.123.2

package/dist/cjs/setup.cjs

@@ -23,4 +23,4 @@ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
 var import_polyfill_dev = require("@tamagui/polyfill-dev"),
   React = __toESM(require("react"));
 globalThis.React ||= React;
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);

package/dist/cjs/setup.js

@@ -19,5 +19,5 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var import_polyfill_dev = require("@tamagui/polyfill-dev"), React = __toESM(require("react"));
 globalThis.React ||= React;
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.js.map

package/dist/cjs/setup.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/setup.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,0BAAO,kCAEP,QAAuB;AAIvB,WAAW,UAAa;AAGpB,OAAO,wBAA0B,QACnC,WAAW,wBAA2B;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA,0BAAO,kCAEP,QAAuB;AAIvB,WAAW,UAAa;AAGpB,OAAO,wBAA0B,QACnC,WAAW,wBACT,OAAO,eAAiB,MAAc,aAAa;",
   "names": []
 }

package/dist/cjs/setup.native.js

@@ -20,5 +20,5 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var import_polyfill_dev = require("@tamagui/polyfill-dev"), React = __toESM(require("react")), _globalThis, _React;
 (_globalThis = globalThis)[_React = "React"] || (_globalThis[_React] = React);
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.js.map

package/dist/cjs/setup.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/tamagui/src/setup.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA,0BAAO,kCAEP,QAAuB,2BAIvBA,aAAW;CAAXA,cAAAA,YAAW,SAAA,OAAA,MAAXA,YAAW,MAAA,IAAaC;AAGpB,OAAOC,wBAA0B,QACnCF,WAAW,wBAA2BG;",
-  "names": ["globalThis", "React", "requestAnimationFrame", "setImmediate"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA,0BAAO,kCAEP,QAAuB,2BAIvBA,aAAW;CAAXA,cAAAA,YAAW,SAAA,OAAA,MAAXA,YAAW,MAAA,IAAaC;AAGpB,OAAOC,wBAA0B,QACnCF,WAAW,wBACT,OAAOG,eAAiB,MAAcC,aAAaD;",
+  "names": ["globalThis", "React", "requestAnimationFrame", "setImmediate", "setTimeout"]
 }

package/dist/esm/setup.js

@@ -1,5 +1,5 @@
 
 import * as React from "react";
 globalThis.React ||= React;
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.js.map

package/dist/esm/setup.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/setup.ts"],
-  "mappings": "AAAA,OAAO;AAEP,YAAY,WAAW;AAIvB,WAAW,UAAa;AAGpB,OAAO,wBAA0B,QACnC,WAAW,wBAA2B;",
+  "mappings": "AAAA,OAAO;AAEP,YAAY,WAAW;AAIvB,WAAW,UAAa;AAGpB,OAAO,wBAA0B,QACnC,WAAW,wBACT,OAAO,eAAiB,MAAc,aAAa;",
   "names": []
 }

package/dist/esm/setup.mjs

@@ -1,4 +1,4 @@
 import * as React from "react";
 globalThis.React ||= React;
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.mjs.map

package/dist/esm/setup.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","globalThis","requestAnimationFrame","setImmediate"],"sources":["../../src/setup.ts"],"sourcesContent":[null],"mappings":"AAEA,YAAYA,KAAA,MAAW;AAIvBC,UAAA,CAAWD,KAAA,KAAaA,KAAA;AAGpB,OAAOE,qBAAA,GAA0B,QACnCD,UAAA,CAAWC,qBAAA,GAA2BC,YAAA","ignoreList":[]}
+{"version":3,"names":["React","globalThis","requestAnimationFrame","setImmediate","setTimeout"],"sources":["../../src/setup.ts"],"sourcesContent":[null],"mappings":"AAEA,YAAYA,KAAA,MAAW;AAIvBC,UAAA,CAAWD,KAAA,KAAaA,KAAA;AAGpB,OAAOE,qBAAA,GAA0B,QACnCD,UAAA,CAAWC,qBAAA,GACT,OAAOC,YAAA,GAAiB,MAAcC,UAAA,GAAaD,YAAA","ignoreList":[]}

package/dist/esm/setup.native.js

@@ -2,5 +2,5 @@
 import * as React from "react";
 var _globalThis, _React;
 (_globalThis = globalThis)[_React = "React"] || (_globalThis[_React] = React);
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.js.map

package/dist/esm/setup.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/tamagui/src/setup.ts"],
-  "mappings": "AAAA,OAAO;AAEP,YAAYA,WAAW;IAIvBC,aAAW;CAAXA,cAAAA,YAAW,SAAA,OAAA,MAAXA,YAAW,MAAA,IAAaD;AAGpB,OAAOE,wBAA0B,QACnCD,WAAW,wBAA2BE;",
-  "names": ["React", "globalThis", "requestAnimationFrame", "setImmediate"]
+  "mappings": "AAAA,OAAO;AAEP,YAAYA,WAAW;IAIvBC,aAAW;CAAXA,cAAAA,YAAW,SAAA,OAAA,MAAXA,YAAW,MAAA,IAAaD;AAGpB,OAAOE,wBAA0B,QACnCD,WAAW,wBACT,OAAOE,eAAiB,MAAcC,aAAaD;",
+  "names": ["React", "globalThis", "requestAnimationFrame", "setImmediate", "setTimeout"]
 }

package/dist/jsx/setup.js

@@ -1,5 +1,5 @@
 
 import * as React from "react";
 globalThis.React ||= React;
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.js.map

package/dist/jsx/setup.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/setup.ts"],
-  "mappings": "AAAA,OAAO;AAEP,YAAY,WAAW;AAIvB,WAAW,UAAa;AAGpB,OAAO,wBAA0B,QACnC,WAAW,wBAA2B;",
+  "mappings": "AAAA,OAAO;AAEP,YAAY,WAAW;AAIvB,WAAW,UAAa;AAGpB,OAAO,wBAA0B,QACnC,WAAW,wBACT,OAAO,eAAiB,MAAc,aAAa;",
   "names": []
 }

package/dist/jsx/setup.mjs

@@ -1,4 +1,4 @@
 import * as React from "react";
 globalThis.React ||= React;
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.mjs.map

package/dist/jsx/setup.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","globalThis","requestAnimationFrame","setImmediate"],"sources":["../../src/setup.ts"],"sourcesContent":[null],"mappings":"AAEA,YAAYA,KAAA,MAAW;AAIvBC,UAAA,CAAWD,KAAA,KAAaA,KAAA;AAGpB,OAAOE,qBAAA,GAA0B,QACnCD,UAAA,CAAWC,qBAAA,GAA2BC,YAAA","ignoreList":[]}
+{"version":3,"names":["React","globalThis","requestAnimationFrame","setImmediate","setTimeout"],"sources":["../../src/setup.ts"],"sourcesContent":[null],"mappings":"AAEA,YAAYA,KAAA,MAAW;AAIvBC,UAAA,CAAWD,KAAA,KAAaA,KAAA;AAGpB,OAAOE,qBAAA,GAA0B,QACnCD,UAAA,CAAWC,qBAAA,GACT,OAAOC,YAAA,GAAiB,MAAcC,UAAA,GAAaD,YAAA","ignoreList":[]}

package/dist/jsx/setup.native.js

@@ -2,5 +2,5 @@ import "@tamagui/polyfill-dev";
 import * as React from "react";
 var _globalThis, _React;
 (_globalThis = globalThis)[_React = "React"] || (_globalThis[_React] = React);
-typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
+typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = typeof setImmediate > "u" ? setTimeout : setImmediate);
 //# sourceMappingURL=setup.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/tamagui/src/setup.ts"],
-  "mappings": "AAAA,OAAO;AAEP,YAAYA,WAAW;IAIvBC,aAAW;CAAXA,cAAAA,YAAW,SAAA,OAAA,MAAXA,YAAW,MAAA,IAAaD;AAGpB,OAAOE,wBAA0B,QACnCD,WAAW,wBAA2BE;",
-  "names": ["React", "globalThis", "requestAnimationFrame", "setImmediate"]
+  "mappings": "AAAA,OAAO;AAEP,YAAYA,WAAW;IAIvBC,aAAW;CAAXA,cAAAA,YAAW,SAAA,OAAA,MAAXA,YAAW,MAAA,IAAaD;AAGpB,OAAOE,wBAA0B,QACnCD,WAAW,wBACT,OAAOE,eAAiB,MAAcC,aAAaD;",
+  "names": ["React", "globalThis", "requestAnimationFrame", "setImmediate", "setTimeout"]
 }

package/dist/native.js

@@ -1184,7 +1184,10 @@ var require_constants_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(constants_native_exports);
-    var import_react3 = require("react"), isWeb6 = !1, isWindowDefined = !1, isServer2 = !1, isClient2 = !1, useIsomorphicLayoutEffect2 = import_react3.useLayoutEffect, isChrome2 = !1, isWebTouchable2 = !1, isTouchable2 = !0, isAndroid = !1, isIos = process.env.TEST_NATIVE_PLATFORM === "ios", currentPlatform = "native";
+    var import_react3 = require("react"), import_react_native4 = require("react-native"), isWeb6 = !1, isWindowDefined = !1, isServer2 = !1, isClient2 = !1, useIsomorphicLayoutEffect2 = import_react3.useLayoutEffect, isChrome2 = !1, isWebTouchable2 = !1, isTouchable2 = !0, isAndroid = import_react_native4.Platform.OS === "android" || process.env.TEST_NATIVE_PLATFORM === "android", isIos = import_react_native4.Platform.OS === "ios" || process.env.TEST_NATIVE_PLATFORM === "ios", platforms = {
+      ios: "ios",
+      android: "android"
+    }, currentPlatform = platforms[import_react_native4.Platform.OS] || "native";
   }
 });
 
@@ -3563,10 +3566,20 @@ var require_ThemeManager_native = __commonJS({
           }
         }
       ]), ThemeManager2;
-    }();
+    }(), cache = {};
     function getState(props, manager) {
-      if (props.name && props.reset) throw new Error(process.env.NODE_ENV === "production" ? "\u274C004" : "Cannot reset and set a new name at the same time.");
       if (!getHasThemeUpdatingProps(props)) return null;
+      var [allManagers] = getManagers(manager), cacheKey = `${props.name || ""}${props.componentName || ""}${props.inverse || ""}${props.reset || ""}${allManagers.map(function(x) {
+        return (x == null ? void 0 : x.state.name) || ".";
+      }).join("")}`, cached = cache[cacheKey];
+      if (!cached) {
+        var res = getStateUncached(props, manager);
+        return cache[cacheKey] = res, res;
+      }
+      return cached;
+    }
+    function getStateUncached(props, manager) {
+      if (props.name && props.reset) throw new Error(process.env.NODE_ENV === "production" ? "\u274C004" : "Cannot reset and set a new name at the same time.");
       var themes = (0, import_config.getThemes)(), [allManagers, componentManagers] = getManagers(manager), isDirectParentAComponentTheme = !!(manager != null && manager.state.isComponent), startIndex = props.reset && !isDirectParentAComponentTheme ? 1 : 0, baseManager = allManagers[startIndex], parentManager = allManagers[startIndex + 1];
       if (!baseManager && props.reset) return process.env.NODE_ENV !== "production" && console.warn("Cannot reset, no parent theme exists"), null;
       var { componentName } = props, result = null, baseName = (baseManager == null ? void 0 : baseManager.state.name) || "";
@@ -13942,7 +13955,7 @@ var require_Pressability_native = __commonJS({
 var require_addNativeValidStyles_native = __commonJS({
   "../../core/core/dist/cjs/addNativeValidStyles.native.js"(exports2, module2) {
     "use strict";
-    var __create2 = Object.create, __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __getProtoOf2 = Object.getPrototypeOf, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
       for (var name in all) __defProp2(target, name, {
         get: all[name],
         enumerable: !0
@@ -13970,18 +13983,6 @@ var require_addNativeValidStyles_native = __commonJS({
         }
       }
       return to;
-    }, __toESM2 = function(mod, isNodeMode, target) {
-      return target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-        // If the importer is in node compatibility mode or this is not an ESM
-        // file that has been converted to a CommonJS file using a Babel-
-        // compatible transform (i.e. "__esModule" has not been set), then set
-        // "default" to the CommonJS "module.exports" for node compatibility.
-        isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", {
-          value: mod,
-          enumerable: !0
-        }) : target,
-        mod
-      );
     }, __toCommonJS2 = function(mod) {
       return __copyProps2(__defProp2({}, "__esModule", {
         value: !0
@@ -13993,21 +13994,38 @@ var require_addNativeValidStyles_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(addNativeValidStyles_native_exports);
-    var import_helpers = require_index_native7(), import_ReactNativeVersion = __toESM2(require("react-native/Libraries/Core/ReactNativeVersion"));
-    function addNativeValidStyles() {
-      if (import_ReactNativeVersion.default) {
-        var { version: { major, minor } } = import_ReactNativeVersion.default;
-        if (major === 0 && minor >= 77) {
-          var additional = {
-            boxSizing: !0,
-            mixBlendMode: !0,
-            outlineWidth: !0,
-            outlineStyle: !0,
-            outlineSpread: !0,
-            outlineColor: !0
-          };
-          Object.assign(import_helpers.validStyles, additional), Object.assign(import_helpers.stylePropsAll, additional);
+    var import_helpers = require_index_native7();
+    function getReactNativeVersion() {
+      var version = process.env.REACT_NATIVE_VERSION || "";
+      if (!process.env.REACT_NATIVE_VERSION) try {
+        var ReactNativeOfficalVersion = require("react-native/Libraries/Core/ReactNativeVersion");
+        if (ReactNativeOfficalVersion) {
+          var { version: { major, minor, patch } } = ReactNativeOfficalVersion;
+          version = `${major}.${minor}.${patch}`;
         }
+      } catch {
+      } finally {
+        version || (version = "0.77");
+      }
+      var [major1, minor1, patch1] = version.split(".");
+      return [
+        +major1,
+        +minor1,
+        +patch1
+      ];
+    }
+    function addNativeValidStyles() {
+      var [major, minor] = getReactNativeVersion();
+      if (major === 0 && minor >= 77) {
+        var additional = {
+          boxSizing: !0,
+          mixBlendMode: !0,
+          outlineWidth: !0,
+          outlineStyle: !0,
+          outlineSpread: !0,
+          outlineColor: !0
+        };
+        Object.assign(import_helpers.validStyles, additional), Object.assign(import_helpers.stylePropsAll, additional);
       }
     }
   }
@@ -16833,7 +16851,7 @@ var require_Adapt_native = __commonJS({
         var Component = context == null ? void 0 : context.Contents;
         output = children(Component ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Component, {}) : null);
       } else output = children;
-      return (0, import_react3.useEffect)(function() {
+      return (0, import_constants4.useIsomorphicLayoutEffect)(function() {
         typeof children == "function" && output !== void 0 && (context == null || context.setChildren(output));
       }, [
         output
@@ -18417,7 +18435,10 @@ var require_SheetImplementationCustom_native = __commonJS({
         var adaptContext = (0, import_adapt.useAdaptContext)();
         contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.ProvideAdaptContext, {
           ...adaptContext,
-          children: contents
+          children: (
+            /* @ts-ignore */
+            contents
+          )
         });
       }
       var shouldMountChildren = unmountChildrenWhenHidden ? !!opacity : !0;
@@ -25216,7 +25237,7 @@ var require_Popper_native = __commonJS({
         unstyled: process.env.TAMAGUI_HEADLESS === "1"
       }
     }), PopperContent = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { __scopePopper, enableAnimationForPositionChange, ...rest } = props, { strategy, placement, refs, x, y, getFloatingProps, size: size4, update, floatingStyles, hasFloating } = usePopperContext(__scopePopper), contentRefs = (0, import_compose_refs.useComposedRefs)(refs.setFloating, forwardedRef), contents = React4.useMemo(function() {
+      var { __scopePopper, enableAnimationForPositionChange, ...rest } = props, { strategy, placement, refs, x, y, getFloatingProps, size: size4 } = usePopperContext(__scopePopper), contentRefs = (0, import_compose_refs.useComposedRefs)(refs.setFloating, forwardedRef), contents = React4.useMemo(function() {
         return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopperContentFrame, {
           "data-placement": placement,
           "data-strategy": strategy,
@@ -25632,16 +25653,20 @@ var require_Popover_native = __commonJS({
         ...props.popperContext,
         children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverContext.Provider, {
           ...props.context,
-          children: props.children
+          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.ProvideAdaptContext, {
+            ...props.adaptContext,
+            children: props.children
+          })
         })
       });
     }
     function PopoverContentPortal(props) {
-      var { __scopePopover } = props, _props_zIndex, zIndex = (_props_zIndex = props.zIndex) !== null && _props_zIndex !== void 0 ? _props_zIndex : 15e4, context = usePopoverContext(__scopePopover), popperContext = (0, import_popper.usePopperContext)(__scopePopover || POPOVER_SCOPE), themeName = (0, import_core12.useThemeName)(), contents = props.children;
+      var { __scopePopover } = props, _props_zIndex, zIndex = (_props_zIndex = props.zIndex) !== null && _props_zIndex !== void 0 ? _props_zIndex : 15e4, context = usePopoverContext(__scopePopover), popperContext = (0, import_popper.usePopperContext)(__scopePopover || POPOVER_SCOPE), themeName = (0, import_core12.useThemeName)(), adaptContext = (0, import_adapt.useAdaptContext)(), contents = props.children;
       return (import_react_native4.Platform.OS === "android" || import_react_native4.Platform.OS === "ios") && (contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PopoverRepropagateContext, {
         scope: __scopePopover || POPOVER_SCOPE,
         popperContext,
         context,
+        adaptContext,
         children: props.children
       })), /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, {
         zIndex,
@@ -25667,19 +25692,19 @@ var require_Popover_native = __commonJS({
         setIsFullyHidden == null || setIsFullyHidden(!0);
       }, [
         setIsFullyHidden
-      ]);
+      ]), contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.ResetPresence, {
+        children
+      });
       if (context.breakpointActive) {
         var childrenWithoutScrollView = React4.Children.toArray(children).map(function(child) {
           return /* @__PURE__ */ React4.isValidElement(child) && child.type === import_react_native4.ScrollView ? child.props.children : child;
-        }), content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.ResetPresence, {
-          children: childrenWithoutScrollView
         });
-        return (import_react_native4.Platform.OS === "android" || import_react_native4.Platform.OS === "ios") && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContext.Provider, {
-          scope: __scopePopover || POPOVER_SCOPE,
-          ...popperContext,
-          children: childrenWithoutScrollView
-        })), /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
-          children: content
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_adapt.AdaptPortalContents, {
+          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_popper.PopperContext.Provider, {
+            scope: __scopePopover || POPOVER_SCOPE,
+            ...popperContext,
+            children: childrenWithoutScrollView
+          })
         });
       }
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate.Animate, {
@@ -25693,31 +25718,10 @@ var require_Popover_native = __commonJS({
           id: context.contentId,
           ref: forwardedRef,
           ...contentProps,
-          children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_remove_scroll.RemoveScroll, {
-            enabled: disableRemoveScroll ? !1 : open,
-            allowPinchZoom: !0,
-            // causes lots of bugs on touch web on site
-            removeScrollBar: !1,
-            style: dspContentsStyle,
-            children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.ResetPresence, {
-              children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_focus_scope.FocusScope, {
-                loop: !0,
-                enabled: disableFocusScope ? !1 : open,
-                trapped: trapFocus,
-                onMountAutoFocus: onOpenAutoFocus,
-                onUnmountAutoFocus: onCloseAutoFocus,
-                children: import_constants4.isWeb ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", {
-                  style: dspContentsStyle,
-                  children
-                }) : children
-              })
-            })
-          })
+          children: contents
         }, context.contentId)
       });
-    }), dspContentsStyle = {
-      display: "contents"
-    }, PopoverClose = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
+    }), PopoverClose = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
       var { __scopePopover, ...rest } = props, context = usePopoverContext(__scopePopover);
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, {
         ...rest,