tamagui 1.75.5 → 1.75.7

package/dist/cjs/setup.js

@@ -1,3 +1,23 @@
-var import_polyfill_dev = require("@tamagui/polyfill-dev");
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
+    for (let key of __getOwnPropNames(from))
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // 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 ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
+  mod
+));
+var import_polyfill_dev = require("@tamagui/polyfill-dev"), React = __toESM(require("react"));
+globalThis.React ||= React;
 typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
 //# sourceMappingURL=setup.js.map

package/dist/cjs/setup.js.map

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

package/dist/cjs/setup.native.js

@@ -1,4 +1,24 @@
 "use strict";
-var import_polyfill_dev = require("@tamagui/polyfill-dev");
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
+    for (let key of __getOwnPropNames(from))
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // 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 ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
+  mod
+));
+var import_polyfill_dev = require("@tamagui/polyfill-dev"), React = __toESM(require("react"));
+globalThis.React ||= React;
 typeof requestAnimationFrame > "u" && (globalThis.requestAnimationFrame = setImmediate);
 //# sourceMappingURL=setup.js.map

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

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

package/dist/esm/setup.js

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

package/dist/esm/setup.js.map

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

package/dist/esm/setup.native.js

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

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

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

package/dist/jsx/setup.js

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

package/dist/jsx/setup.js.map

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

package/dist/jsx/setup.native.js

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

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

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

package/dist/native.js

@@ -1737,65 +1737,6 @@ var require_createMediaStyle_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/expandStyle.native.js
-var require_expandStyle_native = __commonJS({
-  "../web/dist/cjs/helpers/expandStyle.native.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all2) => {
-      for (var name in all2)
-        __defProp2(target, name, { get: all2[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), expandStyle_exports = {};
-    __export2(expandStyle_exports, {
-      expandStyle: () => expandStyle
-    });
-    module2.exports = __toCommonJS2(expandStyle_exports);
-    var import_constants = require_index_native2();
-    function expandStyle(key, value) {
-      if (!1)
-        switch (key) {
-          case "textAlignVertical":
-          case "writingDirection":
-        }
-      if (import_constants.isAndroid && key === "elevationAndroid")
-        return [["elevation", value]];
-      if (key in EXPANSIONS)
-        return EXPANSIONS[key].map((key2) => [key2, value]);
-    }
-    var all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], xy = ["X", "Y"], EXPANSIONS = {
-      borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
-      borderRadius: [
-        "TopLeftRadius",
-        "TopRightRadius",
-        "BottomRightRadius",
-        "BottomLeftRadius"
-      ],
-      borderWidth: ["TopWidth", "RightWidth", "BottomWidth", "LeftWidth"],
-      margin: all,
-      marginHorizontal: horiz,
-      marginVertical: vert,
-      overscrollBehavior: xy,
-      padding: all,
-      paddingHorizontal: horiz,
-      paddingVertical: vert,
-      ...import_constants.isWeb && {
-        // react-native only supports borderStyle
-        borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
-        // react-native doesn't support X / Y
-        overflow: xy
-      }
-    }, _a;
-    for (let parent in EXPANSIONS) {
-      let prefix = parent.slice(0, ((_a = /[A-Z]/.exec(parent)) == null ? void 0 : _a.index) ?? parent.length);
-      EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`);
-    }
-  }
-});
-
 // ../../node_modules/@react-native/normalize-color/index.js
 var require_normalize_color = __commonJS({
   "../../node_modules/@react-native/normalize-color/index.js"(exports, module2) {
@@ -2437,26 +2378,10 @@ var require_expandStyles_native = __commonJS({
       return to;
     }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), expandStyles_exports = {};
     __export2(expandStyles_exports, {
-      expandStylesAndRemoveNullishValues: () => expandStylesAndRemoveNullishValues,
       fixStyles: () => fixStyles
     });
     module2.exports = __toCommonJS2(expandStyles_exports);
-    var import_constants = require_index_native2(), import_expandStyle = require_expandStyle_native(), import_normalizeShadow = require_normalizeShadow_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_pseudoDescriptors = require_pseudoDescriptors_native();
-    function expandStylesAndRemoveNullishValues(style) {
-      let res = {};
-      for (let key in style) {
-        let valIn = style[key];
-        if (valIn == null)
-          continue;
-        if (key in import_pseudoDescriptors.pseudoDescriptors) {
-          res[key] = expandStylesAndRemoveNullishValues(valIn);
-          continue;
-        }
-        let val = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(valIn, key), out = (0, import_expandStyle.expandStyle)(key, val);
-        out ? Object.assign(res, Object.fromEntries(out)) : res[key] = val;
-      }
-      return fixStyles(res), res;
-    }
+    var import_constants = require_index_native2(), import_normalizeShadow = require_normalizeShadow_native();
     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)
@@ -2498,6 +2423,101 @@ var require_getStylesAtomic_native = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/expandStyle.native.js
+var require_expandStyle_native = __commonJS({
+  "../web/dist/cjs/helpers/expandStyle.native.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all2) => {
+      for (var name in all2)
+        __defProp2(target, name, { get: all2[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), expandStyle_exports = {};
+    __export2(expandStyle_exports, {
+      expandStyle: () => expandStyle
+    });
+    module2.exports = __toCommonJS2(expandStyle_exports);
+    var import_constants = require_index_native2();
+    function expandStyle(key, value) {
+      if (!1)
+        switch (key) {
+          case "textAlignVertical":
+          case "writingDirection":
+        }
+      if (import_constants.isAndroid && key === "elevationAndroid")
+        return [["elevation", value]];
+      if (key in EXPANSIONS)
+        return EXPANSIONS[key].map((key2) => [key2, value]);
+    }
+    var all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], xy = ["X", "Y"], EXPANSIONS = {
+      borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
+      borderRadius: [
+        "TopLeftRadius",
+        "TopRightRadius",
+        "BottomRightRadius",
+        "BottomLeftRadius"
+      ],
+      borderWidth: ["TopWidth", "RightWidth", "BottomWidth", "LeftWidth"],
+      margin: all,
+      marginHorizontal: horiz,
+      marginVertical: vert,
+      overscrollBehavior: xy,
+      padding: all,
+      paddingHorizontal: horiz,
+      paddingVertical: vert,
+      ...import_constants.isWeb && {
+        // react-native only supports borderStyle
+        borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
+        // react-native doesn't support X / Y
+        overflow: xy
+      }
+    }, _a;
+    for (let parent in EXPANSIONS) {
+      let prefix = parent.slice(0, ((_a = /[A-Z]/.exec(parent)) == null ? void 0 : _a.index) ?? parent.length);
+      EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`);
+    }
+  }
+});
+
+// ../web/dist/cjs/helpers/expandStylesAndRemoveNullishValues.native.js
+var require_expandStylesAndRemoveNullishValues_native = __commonJS({
+  "../web/dist/cjs/helpers/expandStylesAndRemoveNullishValues.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), expandStylesAndRemoveNullishValues_exports = {};
+    __export2(expandStylesAndRemoveNullishValues_exports, {
+      expandStylesAndRemoveNullishValues: () => expandStylesAndRemoveNullishValues
+    });
+    module2.exports = __toCommonJS2(expandStylesAndRemoveNullishValues_exports);
+    var import_expandStyle = require_expandStyle_native(), import_expandStyles = require_expandStyles_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_pseudoDescriptors = require_pseudoDescriptors_native();
+    function expandStylesAndRemoveNullishValues(style, disableNormalize = !1) {
+      let res = {};
+      for (let key in style) {
+        let prop = style[key];
+        if (prop == null)
+          continue;
+        if (key in import_pseudoDescriptors.pseudoDescriptors) {
+          res[key] = expandStylesAndRemoveNullishValues(prop, disableNormalize);
+          continue;
+        }
+        let value = disableNormalize ? prop : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(prop, key), out = (0, import_expandStyle.expandStyle)(key, value);
+        out ? Object.assign(res, Object.fromEntries(out)) : res[key] = value;
+      }
+      return (0, import_expandStyles.fixStyles)(res), res;
+    }
+  }
+});
+
 // ../web/dist/cjs/helpers/getVariantExtras.native.js
 var require_getVariantExtras_native = __commonJS({
   "../web/dist/cjs/helpers/getVariantExtras.native.js"(exports, module2) {
@@ -2604,7 +2624,7 @@ var require_propMapper_native = __commonJS({
       propMapper: () => propMapper
     });
     module2.exports = __toCommonJS2(propMapper_exports);
-    var import_constants = require_index_native2(), import_helpers = require_index_native4(), import_config = require_config_native(), import_isDevTools = require_isDevTools_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_expandStyles = require_expandStyles_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
+    var import_constants = require_index_native2(), import_helpers = require_index_native4(), 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) => {
       if (!import_constants.isAndroid && key === "elevationAndroid")
         return;
       let subProps = styleStateIn.styleProps.fallbackProps || subPropsIn, styleState = subProps ? new Proxy(styleStateIn, {
@@ -2661,7 +2681,10 @@ var require_propMapper_native = __commonJS({
         );
       }
       if (variantValue) {
-        let expanded = (0, import_expandStyles.expandStylesAndRemoveNullishValues)(variantValue), next = Object.entries(expanded);
+        let expanded = (0, import_expandStylesAndRemoveNullishValues.expandStylesAndRemoveNullishValues)(
+          variantValue,
+          !!styleProps.noNormalize
+        ), next = Object.entries(expanded);
         return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, (0, import_createVariable.getVariableValue)(fontFamilyResult)), next;
       }
     };
@@ -2826,7 +2849,7 @@ var require_getSplitStyles_native = __commonJS({
     module2.exports = __toCommonJS2(getSplitStyles_exports);
     var import_constants = require_index_native2(), import_helpers = require_index_native4(), import_react2 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_getStylesAtomic = require_getStylesAtomic_native(), import_insertStyleRule = require_insertStyleRule_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), fontFamilyKey = "fontFamily", IS_STATIC = process.env.IS_STATIC === "is_static", conf, PROP_SPLIT = "-", getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) => {
       var _a, _b, _c, _e, _f, _g;
-      conf = conf || (0, import_config.getConfig)();
+      conf = conf || (0, import_config.getConfig)(), import_constants.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       let { shorthands } = conf, {
         isHOC,
         isText,
@@ -2897,7 +2920,7 @@ var require_getSplitStyles_native = __commonJS({
           continue;
         }
         if (keyInit[0] === "_" && keyInit.startsWith("_style")) {
-          mergeStyleProp(styleState, valInit);
+          mergeStylePropIntoStyle(styleState, valInit);
           continue;
         }
         if (!1 && !(keyInit in accessibilityDirectMap))
@@ -3151,7 +3174,7 @@ current`, {
           }
         }
       }
-      if (props.style && mergeStyleProp(styleState, props.style), !styleProps.noNormalize && ((0, import_expandStyles.fixStyles)(style), import_constants.isWeb && !staticConfig.isReactNative && (0, import_getStylesAtomic.styleToCSS)(style), styleState.transforms && Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
+      if (props.style && mergeStylePropIntoStyle(styleState, props.style), styleProps.noNormalize !== !1 && ((0, import_expandStyles.fixStyles)(style), import_constants.isWeb && !staticConfig.isReactNative && (0, import_getStylesAtomic.styleToCSS)(style), styleState.transforms && Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
         mergeTransform(style, key, val, !0);
       }), parentSplitStyles && !shouldDoClasses))
         for (let key in parentSplitStyles.style)
@@ -3199,14 +3222,14 @@ current`, {
       }
       return result;
     };
-    function mergeStyle(styleState, key, val) {
+    function mergeStyle(styleState, key, val, disableNormalize = !1) {
       let { classNames, viewProps, style, usedKeys, styleProps } = styleState;
       if (import_constants.isWeb && (val == null ? void 0 : val[0]) === "_")
         classNames[key] = val, usedKeys[key] ||= 1;
       else if (key in import_helpers.stylePropsTransform)
         styleState.transforms ||= {}, styleState.transforms[key] = val;
       else {
-        let out = import_constants.isWeb && !styleProps.noNormalize ? (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key) : val;
+        let out = import_constants.isWeb && !disableNormalize && !styleProps.noNormalize ? (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key) : val;
         key in import_helpers.validStylesOnBaseProps ? viewProps[key] = out : style[key] = out;
       }
     }
@@ -3222,17 +3245,13 @@ current`, {
       }
       return styleProps.noNormalize || (0, import_expandStyles.fixStyles)(styleOut), styleOut;
     };
-    function mergeStyleProp(styleState, val) {
-      if (!val)
-        return;
-      let styles = [].concat(val).flat();
-      for (let cur of styles)
-        if (cur)
-          if (cur.$$css)
-            Object.assign(styleState.classNames, cur);
-          else
-            for (let key in cur)
-              key in styleState.usedKeys || mergeStyle(styleState, key, cur[key]);
+    function mergeStylePropIntoStyle(styleState, cur) {
+      if (cur)
+        if (cur.$$css)
+          Object.assign(styleState.classNames, cur);
+        else
+          for (let key in cur)
+            key in styleState.usedKeys || mergeStyle(styleState, key, cur[key]);
     }
     var useInsertEffectCompat = import_constants.isWeb ? import_react2.useInsertionEffect || import_constants.useIsomorphicLayoutEffect : () => {
     }, useSplitStyles = (...args) => {
@@ -3437,9 +3456,7 @@ var require_ThemeManager_native = __commonJS({
           return this.updateState(nextState, shouldNotify), nextState;
       }
       updateState(nextState, shouldNotify = !0) {
-        this.state = nextState, this._allKeys = null, process.env.NODE_ENV !== "production" && (this._numChangeEventsSent ??= 0, this._numChangeEventsSent++), shouldNotify && queueMicrotask(() => {
-          this.notify();
-        });
+        this.state = nextState, this._allKeys = null, process.env.NODE_ENV !== "production" && (this._numChangeEventsSent ??= 0, this._numChangeEventsSent++), shouldNotify && this.notify();
       }
       getStateIfChanged(props = this.props, state = this.state, parentManager = this.parentManager) {
         let _ = this.getState(props, parentManager);
@@ -3486,7 +3503,7 @@ var require_ThemeManager_native = __commonJS({
       let nextName = props.reset ? baseName : props.name || "", allComponentThemes = componentManagers.map((x) => (x == null ? void 0 : x.state.name) || "");
       isDirectParentAComponentTheme && allComponentThemes.shift();
       let base = baseName.split(import_constants2.THEME_NAME_SEPARATOR), max2 = base.length, min2 = props.componentName && !nextName ? max2 : 0;
-      process.env.NODE_ENV !== "production" && typeof props.debug == "string" && (console.groupCollapsed("ThemeManager.getState()"), console.info({ props, baseName, base, min: min2, max: max2 }));
+      process.env.NODE_ENV !== "production" && typeof props.debug == "string" && typeof window < "u" && (console.groupCollapsed("ThemeManager.getState()"), console.info({ props, baseName, base, min: min2, max: max2 }));
       for (let i = max2; i >= min2; i--) {
         let prefix = base.slice(0, i).join(import_constants2.THEME_NAME_SEPARATOR);
         props.inverse && (prefix = inverseThemeName(prefix));
@@ -3676,9 +3693,9 @@ If this is intended and you are using Tamagui without any themes, you can disabl
         let cur = manager;
         for (; cur; ) {
           if (!cur.parentManager)
-            return !0;
-          if (cur.parentManager.state.scheme !== cur.state.scheme)
             return !1;
+          if (cur.parentManager.state.scheme !== cur.state.scheme)
+            return !0;
           cur = cur.parentManager;
         }
       }
@@ -3717,14 +3734,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
         }), disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme(
           (name, manager, forced) => {
             let force = forced || (shouldUpdate == null ? void 0 : shouldUpdate()) || props.deopt || props["disable-child-theme"], shouldTryUpdate = force ?? !!(keys != null && keys.length || isNewTheme);
-            process.env.NODE_ENV === "development" && props.debug && console.info(" \u{1F538} onChange", themeManager.id, {
-              force,
-              shouldTryUpdate,
-              props,
-              name,
-              manager,
-              keys
-            }), shouldTryUpdate && setThemeState(createState);
+            process.env.NODE_ENV === "development" && props.debug === "verbose" && console.info(" \u{1F538} onChange", themeManager.id, { force, shouldTryUpdate, props, name, manager, keys }), shouldTryUpdate && setThemeState(createState);
           },
           themeManager.id
         );
@@ -4565,11 +4575,8 @@ If you meant to do this, you can disable this warning - either change untilMeasu
       }
       function styleable(Component2, options) {
         var _a2;
-        let ComponentForwardedRef = ((_a2 = Component2.render) == null ? void 0 : _a2.length) === 2 ? Component2 : (
-          // memo because theme changes otherwise would always re-render
-          (0, import_react2.memo)((0, import_react2.forwardRef)(Component2))
-        ), extendedConfig = extendStyledConfig(options == null ? void 0 : options.staticConfig), out = options != null && options.disableTheme ? ComponentForwardedRef : (0, import_themeable.themeable)(ComponentForwardedRef, extendedConfig);
-        return out.staticConfig = extendedConfig, out.styleable = styleable, out;
+        let out = ((_a2 = Component2.render) == null ? void 0 : _a2.length) === 2 ? Component2 : (0, import_react2.forwardRef)(Component2), extendedConfig = extendStyledConfig(options == null ? void 0 : options.staticConfig);
+        return out = options != null && options.disableTheme ? out : (0, import_themeable.themeable)(out, extendedConfig), process.env.TAMAGUI_MEMOIZE_STYLEABLE && (out = (0, import_react2.memo)(out)), out.staticConfig = extendedConfig, out.styleable = styleable, out;
       }
       return res.extractable = extractable, res.styleable = styleable, res;
     }
@@ -6055,6 +6062,7 @@ var require_index_native9 = __commonJS({
     __reExport2(src_exports2, require_ComponentContext_native(), module2.exports);
     __reExport2(src_exports2, require_createStyledContext_native(), module2.exports);
     __reExport2(src_exports2, require_expandStyles_native(), module2.exports);
+    __reExport2(src_exports2, require_expandStylesAndRemoveNullishValues_native(), module2.exports);
     __reExport2(src_exports2, require_propMapper_native(), module2.exports);
     __reExport2(src_exports2, require_getExpandedShorthands_native(), module2.exports);
     __reExport2(src_exports2, require_getSplitStyles_native(), module2.exports);
@@ -11892,8 +11900,11 @@ var require_useCurrentColor_native = __commonJS({
     });
     module2.exports = __toCommonJS2(useCurrentColor_exports);
     var import_web = require_index_native9(), useCurrentColor = (colorProp) => {
+      var _a;
       let theme = (0, import_web.useTheme)();
-      return (0, import_web.getVariable)(colorProp || theme[colorProp] || theme.color);
+      return (0, import_web.getVariable)(
+        colorProp || ((_a = theme[colorProp]) == null ? void 0 : _a.get("web")) || theme.color.get("web")
+      );
     };
   }
 });
@@ -16109,7 +16120,6 @@ var require_RadioGroup_native = __commonJS({
                 children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
                   RadioGroupFrame,
                   {
-                    "aria-valuetext": value,
                     role: "radiogroup",
                     "aria-orientation": orientation,
                     ref: forwardedRef,