tamagui 1.82.0 → 1.82.1

package/dist/native.js

@@ -1429,36 +1429,6 @@ var require_insertStyleRule_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/createProxy.native.js
-var require_createProxy_native = __commonJS({
-  "../web/dist/cjs/helpers/createProxy.native.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), createProxy_exports = {};
-    __export2(createProxy_exports, {
-      createProxy: () => createProxy
-    });
-    module2.exports = __toCommonJS2(createProxy_exports);
-    function createProxy(target, handler) {
-      return process.env.NODE_ENV === "development" && (typeof target != "object" || !target) && console.warn(
-        "Invalid object given for proxy:",
-        target,
-        `
-  
-  This can be due to a missing theme or configuration given to Tamagui.`,
-        new Error().stack
-      ), new Proxy(target || {}, handler);
-    }
-  }
-});
-
 // ../web/dist/cjs/helpers/matchMedia.native.js
 var require_matchMedia_native = __commonJS({
   "../web/dist/cjs/helpers/matchMedia.native.js"(exports, module2) {
@@ -1547,117 +1517,6 @@ var require_pseudoDescriptors_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/objectIdentityKey.native.js
-var require_objectIdentityKey_native = __commonJS({
-  "../web/dist/cjs/helpers/objectIdentityKey.native.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), objectIdentityKey_exports = {};
-    __export2(objectIdentityKey_exports, {
-      objectIdentityKey: () => objectIdentityKey
-    });
-    module2.exports = __toCommonJS2(objectIdentityKey_exports);
-    function objectIdentityKey(obj) {
-      let k = "";
-      for (let key in obj) {
-        k += key;
-        let arg = obj[key], type = typeof arg;
-        if (!arg || type !== "object" && type !== "function")
-          k += type + arg;
-        else if (cache.has(arg))
-          k += cache.get(arg);
-        else {
-          let v = Math.random();
-          cache.set(arg, v), k += v;
-        }
-      }
-      return k;
-    }
-    var cache = /* @__PURE__ */ new WeakMap();
-  }
-});
-
-// ../web/dist/cjs/helpers/createStyledContext.native.js
-var require_createStyledContext_native = __commonJS({
-  "../web/dist/cjs/helpers/createStyledContext.native.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), createStyledContext_exports = {};
-    __export2(createStyledContext_exports, {
-      createStyledContext: () => createStyledContext2
-    });
-    module2.exports = __toCommonJS2(createStyledContext_exports);
-    var import_react2 = require("react"), import_objectIdentityKey = require_objectIdentityKey_native(), import_jsx_runtime6 = require("react/jsx-runtime");
-    function createStyledContext2(defaultValues) {
-      let OGContext = (0, import_react2.createContext)(defaultValues), OGProvider2 = OGContext.Provider, Context = OGContext, scopedContexts = /* @__PURE__ */ new Map(), Provider = ({
-        children,
-        scope,
-        ...values
-      }) => {
-        let next = (0, import_react2.useMemo)(() => ({
-          // this ! is a workaround for ts error
-          ...defaultValues,
-          ...values
-        }), [(0, import_objectIdentityKey.objectIdentityKey)(values)]), Provider2 = OGProvider2;
-        if (scope) {
-          let ScopedContext = scopedContexts.get(scope);
-          ScopedContext || (ScopedContext = (0, import_react2.createContext)(defaultValues), scopedContexts.set(scope, ScopedContext)), Provider2 = ScopedContext.Provider;
-        }
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Provider2, { value: next, children });
-      }, useStyledContext = (scope) => {
-        let context = scope ? scopedContexts.get(scope) : OGContext;
-        return (0, import_react2.useContext)(context);
-      };
-      return Context.Provider = Provider, Context.props = defaultValues, Context.context = OGContext, Context.useStyledContext = useStyledContext, Context;
-    }
-  }
-});
-
-// ../web/dist/cjs/contexts/ComponentContext.native.js
-var require_ComponentContext_native = __commonJS({
-  "../web/dist/cjs/contexts/ComponentContext.native.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), ComponentContext_exports = {};
-    __export2(ComponentContext_exports, {
-      ComponentContext: () => ComponentContext2
-    });
-    module2.exports = __toCommonJS2(ComponentContext_exports);
-    var import_createStyledContext = require_createStyledContext_native(), ComponentContext2 = (0, import_createStyledContext.createStyledContext)({
-      disableSSR: void 0,
-      inText: !1,
-      language: null,
-      animationDriver: null,
-      groups: {
-        emit: null,
-        subscribe: null,
-        state: {}
-      }
-    });
-  }
-});
-
 // ../web/dist/cjs/hooks/useDisableSSR.native.js
 var require_useDisableSSR_native = __commonJS({
   "../web/dist/cjs/hooks/useDisableSSR.native.js"(exports, module2) {
@@ -1672,17 +1531,12 @@ var require_useDisableSSR_native = __commonJS({
       return to;
     }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), useDisableSSR_exports = {};
     __export2(useDisableSSR_exports, {
-      getDisableSSR: () => getDisableSSR,
-      useDisableSSR: () => useDisableSSR
+      getDisableSSR: () => getDisableSSR
     });
     module2.exports = __toCommonJS2(useDisableSSR_exports);
-    var import_react2 = require("react"), import_config = require_config_native(), import_ComponentContext = require_ComponentContext_native();
-    function useDisableSSR() {
-      let componentContext = (0, import_react2.useContext)(import_ComponentContext.ComponentContext);
-      return getDisableSSR(componentContext);
-    }
+    var import_config = require_config_native();
     function getDisableSSR(componentContext) {
-      return componentContext.disableSSR ?? (0, import_config.getConfig)().disableSSR;
+      return (componentContext == null ? void 0 : componentContext.disableSSR) ?? (0, import_config.getConfig)().disableSSR;
     }
   }
 });
@@ -1718,9 +1572,9 @@ var require_useMedia_native = __commonJS({
       useMedia: () => useMedia3
     });
     module2.exports = __toCommonJS2(useMedia_exports);
-    var import_constants4 = require_index_native(), import_react2 = require("react"), import_config = require_config_native(), import_createProxy = require_createProxy_native(), import_matchMedia = require_matchMedia_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_useDisableSSR = require_useDisableSSR_native(), mediaState3 = (
+    var import_constants4 = require_index_native(), import_react2 = require("react"), import_config = require_config_native(), import_matchMedia = require_matchMedia_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_useDisableSSR = require_useDisableSSR_native(), mediaState3 = (
       // development only safeguard
-      process.env.NODE_ENV === "development" ? (0, import_createProxy.createProxy)(
+      process.env.NODE_ENV === "development" ? new Proxy(
         {},
         {
           get(target, key) {
@@ -1792,7 +1646,7 @@ var require_useMedia_native = __commonJS({
       return listeners.add(subscriber), () => listeners.delete(subscriber);
     }
     function useMedia3(uid, componentContext) {
-      let internal = (0, import_react2.useRef)(), initialState = ((componentContext ? (0, import_useDisableSSR.getDisableSSR)(componentContext) : (0, import_useDisableSSR.useDisableSSR)()) || !import_constants4.isWeb ? mediaState3 : initState) || {}, state = (0, import_react2.useSyncExternalStore)(
+      let internal = (0, import_react2.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants4.isWeb ? mediaState3 : initState) || {}, state = (0, import_react2.useSyncExternalStore)(
         subscribe,
         () => {
           if (!internal.current)
@@ -1990,6 +1844,117 @@ var require_constants_native2 = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/objectIdentityKey.native.js
+var require_objectIdentityKey_native = __commonJS({
+  "../web/dist/cjs/helpers/objectIdentityKey.native.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), objectIdentityKey_exports = {};
+    __export2(objectIdentityKey_exports, {
+      objectIdentityKey: () => objectIdentityKey
+    });
+    module2.exports = __toCommonJS2(objectIdentityKey_exports);
+    function objectIdentityKey(obj) {
+      let k = "";
+      for (let key in obj) {
+        k += key;
+        let arg = obj[key], type = typeof arg;
+        if (!arg || type !== "object" && type !== "function")
+          k += type + arg;
+        else if (cache.has(arg))
+          k += cache.get(arg);
+        else {
+          let v = Math.random();
+          cache.set(arg, v), k += v;
+        }
+      }
+      return k;
+    }
+    var cache = /* @__PURE__ */ new WeakMap();
+  }
+});
+
+// ../web/dist/cjs/helpers/createStyledContext.native.js
+var require_createStyledContext_native = __commonJS({
+  "../web/dist/cjs/helpers/createStyledContext.native.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), createStyledContext_exports = {};
+    __export2(createStyledContext_exports, {
+      createStyledContext: () => createStyledContext2
+    });
+    module2.exports = __toCommonJS2(createStyledContext_exports);
+    var import_react2 = require("react"), import_objectIdentityKey = require_objectIdentityKey_native(), import_jsx_runtime6 = require("react/jsx-runtime");
+    function createStyledContext2(defaultValues) {
+      let OGContext = (0, import_react2.createContext)(defaultValues), OGProvider2 = OGContext.Provider, Context = OGContext, scopedContexts = /* @__PURE__ */ new Map(), Provider = ({
+        children,
+        scope,
+        ...values
+      }) => {
+        let next = (0, import_react2.useMemo)(() => ({
+          // this ! is a workaround for ts error
+          ...defaultValues,
+          ...values
+        }), [(0, import_objectIdentityKey.objectIdentityKey)(values)]), Provider2 = OGProvider2;
+        if (scope) {
+          let ScopedContext = scopedContexts.get(scope);
+          ScopedContext || (ScopedContext = (0, import_react2.createContext)(defaultValues), scopedContexts.set(scope, ScopedContext)), Provider2 = ScopedContext.Provider;
+        }
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Provider2, { value: next, children });
+      }, useStyledContext = (scope) => {
+        let context = scope ? scopedContexts.get(scope) : OGContext;
+        return (0, import_react2.useContext)(context);
+      };
+      return Context.Provider = Provider, Context.props = defaultValues, Context.context = OGContext, Context.useStyledContext = useStyledContext, Context;
+    }
+  }
+});
+
+// ../web/dist/cjs/contexts/ComponentContext.native.js
+var require_ComponentContext_native = __commonJS({
+  "../web/dist/cjs/contexts/ComponentContext.native.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), ComponentContext_exports = {};
+    __export2(ComponentContext_exports, {
+      ComponentContext: () => ComponentContext2
+    });
+    module2.exports = __toCommonJS2(ComponentContext_exports);
+    var import_createStyledContext = require_createStyledContext_native(), ComponentContext2 = (0, import_createStyledContext.createStyledContext)({
+      disableSSR: void 0,
+      inText: !1,
+      language: null,
+      animationDriver: null,
+      groups: {
+        emit: null,
+        subscribe: null,
+        state: {}
+      }
+    });
+  }
+});
+
 // ../web/dist/cjs/defaultComponentState.native.js
 var require_defaultComponentState_native = __commonJS({
   "../web/dist/cjs/defaultComponentState.native.js"(exports, module2) {
@@ -2768,10 +2733,10 @@ var require_normalizeColor_native = __commonJS({
       rgba: () => import_normalize_css_color2.rgba
     });
     module2.exports = __toCommonJS2(normalizeColor_exports);
-    var import_constants4 = require_index_native(), import_normalize_css_color = require_index_native11(), import_normalize_css_color2 = require_index_native11(), normalizeColor = (color, opacity) => {
+    var import_normalize_css_color = require_index_native11(), import_normalize_css_color2 = require_index_native11(), normalizeColor = (color, opacity) => {
       if (!color)
         return;
-      if (color[0] === "$" || color[0] === "v" && color.startsWith("var(") || import_constants4.isWeb && opacity === 1)
+      if (color[0] === "$" || color.startsWith("var("))
         return color;
       let colorProcessed = (0, import_normalize_css_color.normalizeCSSColor)(color);
       if (colorProcessed != null) {
@@ -2897,7 +2862,7 @@ var require_expandStyles_native = __commonJS({
     function fixStyles(style) {
       "elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
       for (let key in borderDefaults)
-        key in style && !style[borderDefaults[key]] && (style[borderDefaults[key]] = "solid");
+        key in style && (style[borderDefaults[key]] ||= "solid");
     }
     var nativeStyle = import_constants4.isWeb ? null : "borderStyle", borderDefaults = {
       borderWidth: "borderStyle",
@@ -3072,7 +3037,7 @@ var require_getVariantExtras_native = __commonJS({
       getVariantExtras: () => getVariantExtras
     });
     module2.exports = __toCommonJS2(getVariantExtras_exports);
-    var import_createVariable = require_createVariable_native(), import_createProxy = require_createProxy_native();
+    var import_createVariable = require_createVariable_native();
     function getVariantExtras(styleState) {
       let { curProps, conf, context, theme } = styleState, fonts = conf.fontsParsed;
       context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
@@ -3087,7 +3052,7 @@ var require_getVariantExtras_native = __commonJS({
         font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
         // TODO do this in splitstlye
         // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
-        props: (0, import_createProxy.createProxy)(curProps, {
+        props: new Proxy(curProps, {
           // handles shorthands
           get(target, key) {
             let shorthand = conf.inverseShorthands[key];
@@ -3162,7 +3127,7 @@ var require_propMapper_native = __commonJS({
     module2.exports = __toCommonJS2(propMapper_exports);
     var import_constants4 = require_index_native(), import_helpers = require_index_native7(), import_config = require_config_native(), import_isDevTools = require_isDevTools_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_expandStylesAndRemoveNullishValues = require_expandStylesAndRemoveNullishValues_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
       var _a;
-      if (!import_constants4.isAndroid && key === "elevationAndroid")
+      if (lastFontFamilyToken = null, !import_constants4.isAndroid && key === "elevationAndroid")
         return;
       if (value === "unset") {
         let unsetVal = (_a = styleStateIn.conf.unset) == null ? void 0 : _a[key];
@@ -3191,7 +3156,7 @@ var require_propMapper_native = __commonJS({
         let result = (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [
           [key, value]
         ];
-        return key === "fontFamily" && fontFamilyCache.set(result, lastFontFamilyToken), result;
+        return key === "fontFamily" && lastFontFamilyToken && fontFamilyCache.set(result, lastFontFamilyToken), result;
       }
     }, resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
       let { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
@@ -3935,9 +3900,8 @@ var require_proxyThemeVariables_native = __commonJS({
       proxyThemeVariables: () => proxyThemeVariables
     });
     module2.exports = __toCommonJS2(proxyThemeVariables_exports);
-    var import_createProxy = require_createProxy_native();
     function proxyThemeVariables(obj) {
-      return (0, import_createProxy.createProxy)(obj || {}, {
+      return new Proxy(obj || {}, {
         has(target, key) {
           return Reflect.has(target, removeStarting$(key));
         },
@@ -4121,28 +4085,6 @@ var require_ThemeManager_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/hooks/getThemeUnwrapped.native.js
-var require_getThemeUnwrapped_native = __commonJS({
-  "../web/dist/cjs/hooks/getThemeUnwrapped.native.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), getThemeUnwrapped_exports = {};
-    __export2(getThemeUnwrapped_exports, {
-      GetThemeUnwrapped: () => GetThemeUnwrapped,
-      getThemeUnwrapped: () => getThemeUnwrapped
-    });
-    module2.exports = __toCommonJS2(getThemeUnwrapped_exports);
-    var getThemeUnwrapped = (theme) => (theme == null ? void 0 : theme[GetThemeUnwrapped]) || theme, GetThemeUnwrapped = Symbol();
-  }
-});
-
 // ../web/dist/cjs/hooks/useTheme.native.js
 var require_useTheme_native = __commonJS({
   "../web/dist/cjs/hooks/useTheme.native.js"(exports, module2) {
@@ -4164,7 +4106,7 @@ var require_useTheme_native = __commonJS({
       useThemeWithState: () => useThemeWithState
     });
     module2.exports = __toCommonJS2(useTheme_exports);
-    var import_constants4 = require_index_native(), import_react2 = require("react"), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_createProxy = require_createProxy_native(), import_createShallowSetState = require_createShallowSetState_native(), import_ThemeManager = require_ThemeManager_native(), import_ThemeManagerContext = require_ThemeManagerContext_native(), import_getThemeUnwrapped = require_getThemeUnwrapped_native(), emptyProps = { name: null }, cached;
+    var import_constants4 = require_index_native(), import_react2 = require("react"), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_createShallowSetState = require_createShallowSetState_native(), import_ThemeManager = require_ThemeManager_native(), import_ThemeManagerContext = require_ThemeManagerContext_native(), emptyProps = { name: null }, cached;
     function getDefaultThemeProxied() {
       if (cached)
         return cached;
@@ -4205,7 +4147,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       function track(key) {
         keys && !keys.includes(key) && (keys.push(key), process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
       }
-      return (0, import_createProxy.createProxy)(theme, {
+      return new Proxy(theme, {
         has(_, key) {
           if (Reflect.has(theme, key))
             return !0;
@@ -4213,8 +4155,6 @@ If this is intended and you are using Tamagui without any themes, you can disabl
             return key[0] === "$" && (key = key.slice(1)), themeManager == null ? void 0 : themeManager.allKeys.has(key);
         },
         get(_, key) {
-          if (key === import_getThemeUnwrapped.GetThemeUnwrapped)
-            return theme;
           if (
             // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
             // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
@@ -5438,11 +5378,10 @@ var require_proxyThemeToParents_native = __commonJS({
     }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), proxyThemeToParents_exports = {};
     __export2(proxyThemeToParents_exports, {
       proxyThemeToParents: () => proxyThemeToParents,
-      proxyThemesToParents: () => proxyThemesToParents,
-      themesRaw: () => themesRaw
+      proxyThemesToParents: () => proxyThemesToParents
     });
     module2.exports = __toCommonJS2(proxyThemeToParents_exports);
-    var import_config = require_config_native(), import_getThemeUnwrapped = require_getThemeUnwrapped_native(), themesRaw = {};
+    var import_config = require_config_native(), themesRaw = {};
     function proxyThemesToParents(dedupedThemes) {
       for (let { names, theme } of dedupedThemes)
         for (let name of names)
@@ -5459,9 +5398,7 @@ var require_proxyThemeToParents_native = __commonJS({
       let cur = [], parents = themeName.split("_").slice(0, -1).map((part) => (cur.push(part), cur.join("_"))), numParents = parents.length;
       return new Proxy(theme, {
         get(target, key) {
-          if (key === import_getThemeUnwrapped.GetThemeUnwrapped)
-            return theme;
-          if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
+          if (!key || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
           // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
           key == "undefined" || Reflect.has(target, key))
             return Reflect.get(target, key);
@@ -5470,7 +5407,7 @@ var require_proxyThemeToParents_native = __commonJS({
             if (parent && Reflect.has(parent, key))
               return Reflect.get(parent, key);
           }
-          return (0, import_config.getTokenObject)(key) ?? Reflect.get(target, key);
+          return (0, import_config.getTokenObject)(key);
         }
       });
     }
@@ -5521,14 +5458,14 @@ var require_themes_native = __commonJS({
     module2.exports = __toCommonJS2(themes_exports);
     var import_createVariable = require_createVariable_native();
     function ensureThemeVariable(theme, key) {
-      let val = theme[key], themeKey = key;
-      (0, import_createVariable.isVariable)(val) ? val.name !== themeKey && (theme[key] = (0, import_createVariable.createVariable)({
+      let val = theme[key];
+      (0, import_createVariable.isVariable)(val) ? val.name !== key && (theme[key] = (0, import_createVariable.createVariable)({
         key: val.name,
-        name: themeKey,
+        name: key,
         val: val.val
       })) : theme[key] = (0, import_createVariable.createVariable)({
-        key: themeKey,
-        name: themeKey,
+        key,
+        name: key,
         val
       });
     }
@@ -5878,31 +5815,18 @@ var require_mergeVariants_native = __commonJS({
       mergeVariants: () => mergeVariants
     });
     module2.exports = __toCommonJS2(mergeVariants_exports);
-    var mergeVariants = (parentVariants, ourVariants) => {
+    var mergeVariants = (parentVariants, ourVariants, level = 0) => {
       let variants = {};
       for (let key in ourVariants) {
         let parentVariant = parentVariants == null ? void 0 : parentVariants[key], ourVariant = ourVariants[key];
-        if (!parentVariant || typeof ourVariant == "function") {
-          variants[key] = ourVariant;
-          continue;
-        }
-        if (parentVariant && !ourVariant) {
-          variants[key] = parentVariant[key];
-          continue;
-        }
-        variants[key] = {};
-        for (let subKey in ourVariant) {
-          let val = ourVariant[subKey], parentVal = parentVariant == null ? void 0 : parentVariant[subKey];
-          typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
-            // keep order
-            ...parentVal,
-            ...val
-          };
-        }
-        parentVariant && (variants[key] = {
+        !parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(
+          parentVariant,
+          ourVariant,
+          level + 1
+        ) : variants[key] = {
           ...parentVariant,
-          ...variants[key]
-        });
+          ...ourVariant
+        };
       }
       return {
         ...parentVariants,
@@ -7985,26 +7909,27 @@ var require_index_native15 = __commonJS({
         return viewProps;
       },
       useEvents(viewProps, events, { pseudos }, setStateShallow, staticConfig) {
-        if (events)
-          if (events.onFocus && (viewProps.onFocus = events.onFocus), events.onBlur && (viewProps.onBlur = events.onBlur), staticConfig.isInput) {
+        if (events && (events.onFocus && (viewProps.onFocus = events.onFocus), events.onBlur && (viewProps.onBlur = events.onBlur)), staticConfig.isInput) {
+          if (events) {
             let { onPressIn, onPressOut, onPress } = events, inputEvents = {
               onPressIn,
               onPressOut: onPressOut || onPress
             };
             onPressOut && onPress && (inputEvents.onPressOut = (0, import_web.composeEventHandlers)(onPress, onPressOut)), Object.assign(viewProps, inputEvents);
-          } else {
-            viewProps.hitSlop && (events.hitSlop = viewProps.hitSlop);
-            let pressability = (0, import_Pressability.usePressability)(events);
-            if (process.env.NODE_ENV === "development" && viewProps.debug && console.info(
-              `Checking for press ${!!events.onPress} then applying pressability props: ${Object.keys(
-                pressability || {}
-              )}`
-            ), events.onPress)
-              for (let key in pressability) {
-                let og = viewProps[key], val = pressability[key];
-                viewProps[key] = og && !dontComposePressabilityKeys[key] ? (0, import_web.composeEventHandlers)(og, val) : val;
-              }
           }
+        } else {
+          events && viewProps.hitSlop && (events.hitSlop = viewProps.hitSlop);
+          let pressability = (0, import_Pressability.usePressability)(events);
+          if (events && (process.env.NODE_ENV === "development" && viewProps.debug && console.info(
+            `Checking for press ${!!events.onPress} then applying pressability props: ${Object.keys(
+              pressability || {}
+            )}`
+          ), events.onPress))
+            for (let key in pressability) {
+              let og = viewProps[key], val = pressability[key];
+              viewProps[key] = og && !dontComposePressabilityKeys[key] ? (0, import_web.composeEventHandlers)(og, val) : val;
+            }
+        }
       },
       useChildren(elementType, children, viewProps, events, staticConfig) {
         if (process.env.NODE_ENV !== "test") {
@@ -11995,7 +11920,7 @@ var require_getFontSize_native = __commonJS({
     }, getFontSizeToken = (inSize, opts) => {
       if (typeof inSize == "number")
         return null;
-      let relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0, fontSize = (0, import_core13.getConfig)().fontsParsed[(opts == null ? void 0 : opts.font) || "$body"].size, size2 = inSize || ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size2);
+      let relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0, fontSize = (0, import_core13.getConfig)().fontsParsed[(opts == null ? void 0 : opts.font) || "$body"].size, size2 = (inSize === "$true" ? "$4" : inSize) || ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size2);
       foundIndex === -1 && size2.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size2.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size2, opts, "in size tokens", sizeTokens);
       let tokenIndex = Math.min(
         Math.max(0, foundIndex + relativeSize),
@@ -12271,7 +12196,9 @@ var require_Button_native = __commonJS({
         ellipse,
         maxFontSizeMultiplier,
         ...restProps
-      } = propsActive, size2 = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size2 == "number" ? size2 * 0.5 : (0, import_font_size.getFontSize)(size2)) * scaleIcon, getThemedIcon = (0, import_helpers_tamagui.useGetThemedIcon)({
+      } = propsActive, size2 = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size2 == "number" ? size2 * 0.5 : (0, import_font_size.getFontSize)(size2, {
+        font: (fontFamily == null ? void 0 : fontFamily[0]) === "$" ? fontFamily : void 0
+      })) * scaleIcon, getThemedIcon = (0, import_helpers_tamagui.useGetThemedIcon)({
         size: iconSize,
         color
       }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? (0, import_web.getVariableValue)(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : (0, import_text2.wrapChildrenInText)(
@@ -13698,7 +13625,7 @@ var require_Group_native = __commonJS({
             borderRadius,
             forceUseItem,
             ...restProps
-          } = (0, import_core13.getExpandedShorthands)(activeProps), vertical = orientation === "vertical", [itemChildrenCount, setItemChildrenCount] = (0, import_use_controllable_state.useControllableState)({
+          } = activeProps, vertical = orientation === "vertical", [itemChildrenCount, setItemChildrenCount] = (0, import_use_controllable_state.useControllableState)({
             defaultProp: forceUseItem ? 1 : 0
           }), isUsingItems = itemChildrenCount > 0, radius = borderRadius ?? (size2 ? (0, import_core13.getVariableValue)((0, import_core13.getTokens)().radius[size2]) - 1 : void 0), disablePassBorderRadius = disablePassBorderRadiusProp ?? radius === void 0, childrenArray = import_react2.Children.toArray(childrenProp), children = isUsingItems ? import_react2.Children.toArray(childrenProp).filter(import_react2.isValidElement) : childrenArray.map((child, i) => {
             if (!(0, import_react2.isValidElement)(child))
@@ -16947,10 +16874,12 @@ var require_Select_native = __commonJS({
         {
           ...!props.unstyled && {
             size: itemParentContext.size,
-            ellipse: !0
+            ellipse: !0,
+            // we don't want events from the portalled `SelectValue` children to bubble
+            // through the item they came from
+            pointerEvents: "none"
           },
           ref: composedRefs,
-          pointerEvents: "none",
           ...props,
           children: unwrapSelectItem(selectValueChildren)
         }