tamagui 1.85.7 → 1.85.9-1705340264375

package/dist/native.js

@@ -1329,7 +1329,7 @@ var require_insertStyleRule_native = __commonJS({
       }
       return scannedCache.set(sheet2, cacheKey), dedupedThemes;
     }
-    var colorVarToVal, rootComputedStyle = null, schemes = { dark: !0, light: !0 };
+    var colorVarToVal, rootComputedStyle = null;
     function addThemesFromCSS(cssStyleRule, tokens) {
       let selectors = cssStyleRule.selectorText.split(",");
       if (!selectors.length)
@@ -1347,7 +1347,7 @@ var require_insertStyleRule_native = __commonJS({
         if (sepI === -1)
           continue;
         let key = rule.slice(rule.indexOf("--") + 2, sepI), val = rule.slice(sepI + 2), value;
-        if (val[3] === "(") {
+        if (val.startsWith("var(")) {
           let varName = val.slice(6, -1), tokenVal = colorVarToVal[varName];
           tokenVal ? value = tokenVal : (rootComputedStyle ||= getComputedStyle(document.body), value = rootComputedStyle.getPropertyValue("--" + varName));
         } else
@@ -1361,20 +1361,17 @@ var require_insertStyleRule_native = __commonJS({
           !0
         );
       }
-      return {
-        names: [
-          ...new Set(
-            selectors.map((selector) => {
-              let parts = selector.replace(/(.t_|:root)/g, "").trim().split(" "), secondToLast = parts[parts.length - 2] || "", scheme = secondToLast.includes("dark") ? "dark" : secondToLast.includes("light") ? "light" : "", name = (() => {
-                let _ = parts[parts.length - 1];
-                return scheme && _.startsWith(scheme) && (_ = _.slice(scheme.length + 1)), _;
-              })();
-              return scheme === name || schemes[name] ? scheme : `${scheme}${scheme && name ? "_" : ""}${name}`;
-            })
-          )
-        ],
+      let dedupedEntry = {
+        names: [],
         theme: values
       };
+      for (let selector of selectors) {
+        let scheme = selector.includes("t_dark") ? "dark" : selector.includes("t_light") ? "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
+        name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
+        let themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
+        dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
+      }
+      return dedupedEntry;
     }
     function getTamaguiSelector(rule, collectThemes = !1) {
       if (rule instanceof CSSStyleRule) {
@@ -2077,11 +2074,11 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       }
       return !1;
     }
-    var activeThemeManagers = /* @__PURE__ */ new Set(), _uidToManager = /* @__PURE__ */ new WeakMap(), _idToUID = {}, getId = (id) => _idToUID[id], getThemeManager = (id) => _uidToManager.get(getId(id)), registerThemeManager = (t) => {
-      if (!_idToUID[t.id]) {
-        let id = _idToUID[t.id] = {};
-        _uidToManager.set(id, t);
-      }
+    var activeThemeManagers = /* @__PURE__ */ new Set(), _idToManager = /* @__PURE__ */ new Map(), getThemeManager = (id) => {
+      var _a;
+      return (_a = _idToManager.get(id)) == null ? void 0 : _a.deref();
+    }, registerThemeManager = (t) => {
+      _idToManager.set(t.id, new WeakRef(t));
     }, useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
       let { disable } = props, parentManagerId = (0, import_react2.useContext)(import_ThemeManagerContext.ThemeManagerIDContext), parentManager = getThemeManager(parentManagerId);
       if (!isRoot && !parentManager || disable)
@@ -3642,7 +3639,9 @@ var require_propMapper_native = __commonJS({
         let expanded = (0, import_expandStylesAndRemoveNullishValues.expandStylesAndRemoveNullishValues)(
           variantValue,
           !!styleProps.noNormalize
-        ), next = Object.entries(expanded);
+        );
+        process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   expanding styles from ", variantValue, "to", expanded);
+        let next = Object.entries(expanded);
         return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, (0, import_createVariable.getVariableValue)(fontFamilyResult)), next;
       }
     };
@@ -3680,7 +3679,7 @@ var require_propMapper_native = __commonJS({
           continue;
         }
         if ((0, import_createVariable.isVariable)(val)) {
-          res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues);
+          res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
           continue;
         }
         if (typeof val == "string") {
@@ -15122,7 +15121,7 @@ var require_Popper_native = __commonJS({
       usePopperContext: () => usePopperContext
     });
     module2.exports = __toCommonJS2(Popper_exports);
-    var import_compose_refs = require_index_native10(), import_constants4 = require_index_native(), import_constants22 = require_index_native(), import_core13 = require_index_native15(), import_floating = require_index_native53(), import_get_token2 = require_index_native17(), import_stacks3 = require_index_native19(), React2 = __toESM2(require("react")), import_react_native4 = require("react-native"), import_jsx_runtime6 = require("react/jsx-runtime"), PopperContext = (0, import_core13.createStyledContext)({}), { useStyledContext: usePopperContext, Provider: PopperProvider } = PopperContext;
+    var import_compose_refs = require_index_native10(), import_constants4 = require_index_native(), import_core13 = require_index_native15(), import_floating = require_index_native53(), import_get_token2 = require_index_native17(), import_stacks3 = require_index_native19(), React2 = __toESM2(require("react")), import_react_native4 = require("react-native"), import_jsx_runtime6 = require("react/jsx-runtime"), PopperContext = (0, import_core13.createStyledContext)({}), { useStyledContext: usePopperContext, Provider: PopperProvider } = PopperContext;
     function Popper(props) {
       let {
         children,
@@ -15134,7 +15133,7 @@ var require_Popper_native = __commonJS({
         offset: offset2,
         __scopePopper
       } = props, [isMounted, setIsMounted] = React2.useState(!1);
-      (0, import_constants22.useIsomorphicLayoutEffect)(() => {
+      (0, import_constants4.useIsomorphicLayoutEffect)(() => {
         setIsMounted(!0);
       }, []);
       let [anchorRef, setAnchorRef] = React2.useState(), [arrowEl, setArrow] = React2.useState(null), [arrowSize, setArrowSize] = React2.useState(0), offsetOptions = offset2 ?? arrowSize, floating = (0, import_floating.useFloating)({
@@ -15154,10 +15153,10 @@ var require_Popper_native = __commonJS({
         // @ts-expect-error this comes from Tooltip for example
         open
       } = floating;
-      if ((0, import_constants22.useIsomorphicLayoutEffect)(() => {
+      if ((0, import_constants4.useIsomorphicLayoutEffect)(() => {
         floating.refs.setReference(anchorRef);
       }, [anchorRef]), import_constants4.isWeb)
-        (0, import_constants22.useIsomorphicLayoutEffect)(() => {
+        (0, import_constants4.useIsomorphicLayoutEffect)(() => {
           if (open && refs.reference.current && refs.floating.current)
             return (0, import_floating.autoUpdate)(refs.reference.current, refs.floating.current, floating.update);
         }, [open, floating.update, refs.floating, refs.reference]);
@@ -15172,7 +15171,7 @@ var require_Popper_native = __commonJS({
           return () => {
             showSubscription.remove(), hideSubscription.remove();
           };
-        }, []), (0, import_constants22.useIsomorphicLayoutEffect)(() => {
+        }, []), (0, import_constants4.useIsomorphicLayoutEffect)(() => {
           floating.update();
         }, [dimensions, keyboardOpen]);
       }
@@ -15243,7 +15242,7 @@ var require_Popper_native = __commonJS({
       ), [placement, strategy, props]), [hasInitialPosition, setHasInitialPosition] = React2.useState(!0);
       if (React2.useEffect(() => {
         (x || y) && setHasInitialPosition(!1);
-      }, [x, y]), (0, import_constants22.useIsomorphicLayoutEffect)(() => {
+      }, [x, y]), (0, import_constants4.useIsomorphicLayoutEffect)(() => {
         isMounted && update();
       }, [isMounted]), !isMounted)
         return null;
@@ -15262,7 +15261,7 @@ var require_Popper_native = __commonJS({
           animateOnly: rest.animateOnly
         }
       };
-      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_stacks3.YStack, { ...getFloatingProps ? getFloatingProps(frameProps) : frameProps, children: contents });
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core13.Stack, { ...getFloatingProps ? getFloatingProps(frameProps) : frameProps, children: contents });
     }), PopperArrowFrame = (0, import_core13.styled)(import_stacks3.YStack, {
       name: "PopperArrow",
       variants: {
@@ -15310,7 +15309,7 @@ var require_Popper_native = __commonJS({
       if (primaryPlacement) {
         arrowStyle[isVertical ? "width" : "height"] = size2 * 2;
         let oppSide = opposites[primaryPlacement];
-        oppSide && (arrowStyle[oppSide] = -size2, innerArrowStyle[oppSide] = size2 / 2), oppSide === "bottom" && (arrowStyle[oppSide] += 1), (oppSide === "top" || oppSide === "bottom") && (arrowStyle.left = 0), (oppSide === "left" || oppSide === "right") && (arrowStyle.top = 0), (0, import_constants22.useIsomorphicLayoutEffect)(() => {
+        oppSide && (arrowStyle[oppSide] = -size2, innerArrowStyle[oppSide] = size2 / 2), oppSide === "bottom" && (arrowStyle[oppSide] += 1), (oppSide === "top" || oppSide === "bottom") && (arrowStyle.left = 0), (oppSide === "left" || oppSide === "right") && (arrowStyle.top = 0), (0, import_constants4.useIsomorphicLayoutEffect)(() => {
           var _a2;
           (_a2 = context.onArrowSize) == null || _a2.call(context, size2);
         }, [size2, context.onArrowSize]);