@tamagui/web 1.88.17 → 1.88.18

package/dist/esm/helpers/getSplitStyles.native.js

@@ -42,10 +42,10 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     inlineWhenUnflattened,
     parentStaticConfig,
     acceptsClassName
-  } = staticConfig, viewProps = {}, mediaState = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants.isWeb && !styleProps.noClassNames, rulesToInsert = [], classNames = {}, transforms = {};
-  let pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, style = {}, className = props.className ?? "", mediaStylesSeen = 0;
+  } = staticConfig, viewProps = {}, mediaState = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {};
+  let pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, style = {}, className = props.className || "", mediaStylesSeen = 0;
   const styleState = {
-    curProps: { ...props },
+    curProps: {},
     classNames,
     conf,
     props,
@@ -69,44 +69,45 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     theme: { ...theme }
   }), console.groupEnd());
   for (const keyOg in props) {
-    process.env.NODE_ENV === "development" && console.groupEnd();
     let keyInit = keyOg, valInit = props[keyOg];
     if (styleProps.disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit === "className" || keyInit in usedKeys || keyInit in skipProps && !styleProps.noSkip && !isHOC)
       continue;
     const valInitType = typeof valInit, isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
-    if (styleState.curProps[keyInit] = valInit, !import_constants.isAndroid && keyInit === "elevationAndroid")
-      continue;
-    if (keyInit === "userSelect")
-      keyInit = "selectable", valInit = valInit !== "none";
-    else if (keyInit === "role") {
-      viewProps.accessibilityRole = import_accessibilityDirectMap.accessibilityWebRoleToNativeRole[valInit];
-      continue;
-    } else if (keyInit.startsWith("aria-")) {
-      if (import_accessibilityDirectMap.webToNativeAccessibilityDirectMap[keyInit]) {
-        const nativeA11yProp = import_accessibilityDirectMap.webToNativeAccessibilityDirectMap[keyInit];
-        keyInit === "aria-hidden" && (viewProps["aria-hidden"] = valInit), viewProps[nativeA11yProp] = valInit;
+    if (valInit !== props[keyInit] && (styleState.curProps[keyInit] = valInit), !isValidStyleKeyInit) {
+      if (!import_constants.isAndroid && keyInit === "elevationAndroid")
         continue;
-      }
-      if (import_accessibilityDirectMap.nativeAccessibilityValue[keyInit]) {
-        let field = import_accessibilityDirectMap.nativeAccessibilityValue[keyInit];
-        viewProps.accessibilityValue ? viewProps.accessibilityValue[field] = valInit : viewProps.accessibilityValue = {
-          [field]: valInit
-        };
-      } else if (import_accessibilityDirectMap.nativeAccessibilityState[keyInit]) {
-        let field = import_accessibilityDirectMap.nativeAccessibilityState[keyInit];
-        viewProps.accessibilityState ? viewProps.accessibilityState[field] = valInit : viewProps.accessibilityState = {
-          [field]: valInit
-        };
-      }
-      continue;
-    } else if (keyInit.startsWith("data-"))
-      continue;
+      if (keyInit === "userSelect")
+        keyInit = "selectable", valInit = valInit !== "none";
+      else if (keyInit === "role") {
+        viewProps.accessibilityRole = import_accessibilityDirectMap.accessibilityWebRoleToNativeRole[valInit];
+        continue;
+      } else if (keyInit.startsWith("aria-")) {
+        if (import_accessibilityDirectMap.webToNativeAccessibilityDirectMap[keyInit]) {
+          const nativeA11yProp = import_accessibilityDirectMap.webToNativeAccessibilityDirectMap[keyInit];
+          keyInit === "aria-hidden" && (viewProps["aria-hidden"] = valInit), viewProps[nativeA11yProp] = valInit;
+          continue;
+        }
+        if (import_accessibilityDirectMap.nativeAccessibilityValue[keyInit]) {
+          let field = import_accessibilityDirectMap.nativeAccessibilityValue[keyInit];
+          viewProps.accessibilityValue ? viewProps.accessibilityValue[field] = valInit : viewProps.accessibilityValue = {
+            [field]: valInit
+          };
+        } else if (import_accessibilityDirectMap.nativeAccessibilityState[keyInit]) {
+          let field = import_accessibilityDirectMap.nativeAccessibilityState[keyInit];
+          viewProps.accessibilityState ? viewProps.accessibilityState[field] = valInit : viewProps.accessibilityState = {
+            [field]: valInit
+          };
+        }
+        continue;
+      } else if (keyInit.startsWith("data-"))
+        continue;
+    }
     if (keyInit === "dataSet") {
       for (const keyInit2 in valInit)
         viewProps[`data-${hyphenate(keyInit2)}`] = valInit[keyInit2];
       continue;
     }
-    if (keyInit.startsWith("_style") && (0, import_isObj.isObj)(valInit)) {
+    if (!isValidStyleKeyInit && keyInit.startsWith("_style") && (0, import_isObj.isObj)(valInit)) {
       Object.assign(styleState.style, valInit);
       continue;
     }
@@ -127,12 +128,12 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     let isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
     const isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant;
     let isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo = !!(isMedia || isPseudo);
-    const isStyleProp = isMediaOrPseudo || isVariant && !styleProps.noExpand || isValidStyleKeyInit || isShorthand;
+    const isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !styleProps.noExpand || isShorthand;
     if (isStyleProp && (props.asChild === "except-style" || props.asChild === "except-style-web"))
       continue;
     const shouldPassProp = !isStyleProp || // is in parent variants
     isHOC && (parentStaticConfig == null ? void 0 : parentStaticConfig.variants) && keyInit in parentStaticConfig.variants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = (_a = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _a[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo || parentVariant || keyInit in skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
-    if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), console.groupCollapsed(
+    if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(
       `  \u{1F511} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""}`
     ), (0, import_log.log)({ isVariant, valInit, shouldPassProp }), import_constants.isClient && (0, import_log.log)({
       variants,
@@ -211,7 +212,7 @@ current`, {
               const val2 = pseudoStyleObject[pkey];
               if (isDisabled) {
                 const defaultValues = animatableDefaults[pkey];
-                defaultValues != null && !(pkey in usedKeys) && mergeStyle(styleState, pkey, defaultValues);
+                defaultValues != null && !(pkey in usedKeys) && !(pkey in styleState.style) && mergeStyle(styleState, pkey, defaultValues);
               } else {
                 const curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
                 shouldMerge && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
@@ -439,13 +440,8 @@ const getSubStyle = (styleState, subKey, styleIn, avoidMergeTransform) => {
         !avoidMergeTransform && skey in import_helpers.stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps.noNormalize ? sval : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(sval, key);
   }
   return styleProps.noNormalize || (0, import_expandStyles.fixStyles)(styleOut), styleOut;
-}, useInsertEffectCompat = import_constants.isWeb ? import_react.useInsertionEffect || import_constants.useIsomorphicLayoutEffect : () => {
-}, useSplitStyles = (...args) => {
-  const res = getSplitStyles(...args);
-  return useInsertEffectCompat(() => {
-    (0, import_insertStyleRule.insertStyleRules)(res.rulesToInsert);
-  }, [res.rulesToInsert]), res;
 };
+const useSplitStyles = (a, b, c, d, e, f, g, h, i, j) => getSplitStyles(a, b, c, d, e, f, g, h, i, j);
 const animatableDefaults = {
   opacity: 1,
   scale: 1,

package/dist/esm/helpers/getSplitStyles.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getSplitStyles.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["import_constants", "globalMediaState", "keyInit", "val", "key", "style", "mediaState", "conf"]
 }

package/dist/esm/helpers/getVariantExtras.js

@@ -1,6 +1,6 @@
 import { getVariableValue } from "../createVariable";
 function getVariantExtras(styleState) {
-  const { curProps, conf, context, theme } = styleState;
+  const { curProps, props, conf, context, theme } = styleState;
   let fonts = conf.fontsParsed;
   context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
   const fontFamily = getVariableValue(
@@ -14,14 +14,12 @@ function getVariantExtras(styleState) {
     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: new Proxy(curProps, {
+    props: new Proxy(props, {
       // handles shorthands
       get(target, key) {
-        const shorthand = conf.inverseShorthands[key];
-        if (shorthand && Reflect.has(target, shorthand))
-          return Reflect.get(target, shorthand);
-        if (Reflect.has(target, key))
-          return Reflect.get(target, key);
+        for (const tryKey of [key, conf.inverseShorthands[key]])
+          if (tryKey)
+            return Reflect.has(curProps, tryKey) ? Reflect.get(curProps, tryKey) : Reflect.get(target, tryKey);
       }
     })
   };

package/dist/esm/helpers/getVariantExtras.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getVariantExtras.tsx"],
-  "mappings": "AAAA,SAAS,wBAAwB;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,MAAM,SAAS,MAAM,IAAI;AAC3C,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,aAAa;AAAA,IACjB,WAAW,cAAc,WAAW,SAAS,cAAc,WAAW,KAAK;AAAA,EAC7E;AA0BA,SAxBa;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA;AAAA,IACA,MAAM,MAAM,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA;AAAA;AAAA,IAG7D,OAAO,IAAI,MAAM,UAAU;AAAA;AAAA,MAEzB,IAAI,QAAQ,KAAK;AACf,cAAM,YAAY,KAAK,kBAAkB,GAAU;AAGnD,YAAI,aAAa,QAAQ,IAAI,QAAQ,SAAS;AAC5C,iBAAO,QAAQ,IAAI,QAAQ,SAAS;AAEtC,YAAI,QAAQ,IAAI,QAAQ,GAAG;AACzB,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AAAA,IACF,CAAC;AAAA,EACH;AAGF;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
+  "mappings": "AAAA,SAAS,wBAAwB;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,OAAO,MAAM,SAAS,MAAM,IAAI;AAClD,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,aAAa;AAAA,IACjB,WAAW,cAAc,WAAW,SAAS,cAAc,WAAW,KAAK;AAAA,EAC7E;AAsBA,SApBa;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA;AAAA,IACA,MAAM,MAAM,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA;AAAA;AAAA,IAG7D,OAAO,IAAI,MAAM,OAAO;AAAA;AAAA,MAEtB,IAAI,QAAQ,KAAK;AACf,mBAAW,UAAU,CAAC,KAAK,KAAK,kBAAkB,GAAU,CAAC;AAC3D,cAAK;AACL,mBAAI,QAAQ,IAAI,UAAU,MAAM,IAAU,QAAQ,IAAI,UAAU,MAAM,IAC/D,QAAQ,IAAI,QAAQ,MAAM;AAAA,MAErC;AAAA,IACF,CAAC;AAAA,EACH;AAGF;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
   "names": []
 }

package/dist/esm/helpers/getVariantExtras.mjs

@@ -2,6 +2,7 @@ import { getVariableValue } from "../createVariable.mjs";
 function getVariantExtras(styleState) {
   const {
     curProps,
+    props,
     conf,
     context,
     theme
@@ -17,12 +18,10 @@ function getVariantExtras(styleState) {
     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: new Proxy(curProps, {
+    props: new Proxy(props, {
       // handles shorthands
       get(target, key) {
-        const shorthand = conf.inverseShorthands[key];
-        if (shorthand && Reflect.has(target, shorthand)) return Reflect.get(target, shorthand);
-        if (Reflect.has(target, key)) return Reflect.get(target, key);
+        for (const tryKey of [key, conf.inverseShorthands[key]]) if (tryKey) return Reflect.has(curProps, tryKey) ? Reflect.get(curProps, tryKey) : Reflect.get(target, tryKey);
       }
     })
   };

package/dist/esm/helpers/getVariantExtras.native.js

@@ -21,7 +21,7 @@ __export(getVariantExtras_exports, {
 module.exports = __toCommonJS(getVariantExtras_exports);
 var import_createVariable = require("../createVariable");
 function getVariantExtras(styleState) {
-  const { curProps, conf, context, theme } = styleState;
+  const { curProps, props, conf, context, theme } = styleState;
   let fonts = conf.fontsParsed;
   context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
   const fontFamily = (0, import_createVariable.getVariableValue)(
@@ -35,14 +35,12 @@ function getVariantExtras(styleState) {
     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: new Proxy(curProps, {
+    props: new Proxy(props, {
       // handles shorthands
       get(target, key) {
-        const shorthand = conf.inverseShorthands[key];
-        if (shorthand && Reflect.has(target, shorthand))
-          return Reflect.get(target, shorthand);
-        if (Reflect.has(target, key))
-          return Reflect.get(target, key);
+        for (const tryKey of [key, conf.inverseShorthands[key]])
+          if (tryKey)
+            return Reflect.has(curProps, tryKey) ? Reflect.get(curProps, tryKey) : Reflect.get(target, tryKey);
       }
     })
   };

package/dist/esm/helpers/getVariantExtras.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getVariantExtras.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,MAAM,SAAS,MAAM,IAAI;AAC3C,MAAI,QAAQ,KAAK;AACjB,EAAI,2BAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,iBAAa;AAAA,IACjB,WAAW,cAAc,WAAW,SAAS,cAAc,WAAW,KAAK;AAAA,EAC7E;AA0BA,SAxBa;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA;AAAA,IACA,MAAM,MAAM,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA;AAAA;AAAA,IAG7D,OAAO,IAAI,MAAM,UAAU;AAAA;AAAA,MAEzB,IAAI,QAAQ,KAAK;AACf,cAAM,YAAY,KAAK,kBAAkB,GAAU;AAGnD,YAAI,aAAa,QAAQ,IAAI,QAAQ,SAAS;AAC5C,iBAAO,QAAQ,IAAI,QAAQ,SAAS;AAEtC,YAAI,QAAQ,IAAI,QAAQ,GAAG;AACzB,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AAAA,IACF,CAAC;AAAA,EACH;AAGF;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,OAAO,MAAM,SAAS,MAAM,IAAI;AAClD,MAAI,QAAQ,KAAK;AACjB,EAAI,2BAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,iBAAa;AAAA,IACjB,WAAW,cAAc,WAAW,SAAS,cAAc,WAAW,KAAK;AAAA,EAC7E;AAsBA,SApBa;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA;AAAA,IACA,MAAM,MAAM,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA;AAAA;AAAA,IAG7D,OAAO,IAAI,MAAM,OAAO;AAAA;AAAA,MAEtB,IAAI,QAAQ,KAAK;AACf,mBAAW,UAAU,CAAC,KAAK,KAAK,kBAAkB,GAAU,CAAC;AAC3D,cAAK;AACL,mBAAI,QAAQ,IAAI,UAAU,MAAM,IAAU,QAAQ,IAAI,UAAU,MAAM,IAC/D,QAAQ,IAAI,QAAQ,MAAM;AAAA,MAErC;AAAA,IACF,CAAC;AAAA,EACH;AAGF;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
   "names": []
 }

package/dist/esm/index.js

@@ -47,6 +47,7 @@ export * from "./internalWithTheme";
 import {
   configureMedia,
   mediaState,
+  mediaKeyMatch,
   useMedia,
   getMedia,
   mediaObjectToString,
@@ -81,6 +82,7 @@ export {
   getToken,
   getTokenValue,
   getTokens,
+  mediaKeyMatch,
   mediaObjectToString,
   mediaQueryConfig,
   mediaState,

package/dist/esm/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAKd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
+  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAKd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
   "names": []
 }

package/dist/esm/index.mjs

@@ -36,7 +36,7 @@ export * from "./helpers/themeable.mjs";
 export * from "./helpers/themes.mjs";
 export * from "./helpers/createShallowSetState.mjs";
 export * from "./internalWithTheme.mjs";
-import { configureMedia, mediaState, useMedia, getMedia, mediaObjectToString, mediaQueryConfig } from "./hooks/useMedia.mjs";
+import { configureMedia, mediaState, mediaKeyMatch, useMedia, getMedia, mediaObjectToString, mediaQueryConfig } from "./hooks/useMedia.mjs";
 export * from "./hooks/useTheme.mjs";
 export * from "./hooks/useThemeName.mjs";
 export * from "./hooks/useConfiguration.mjs";
@@ -58,4 +58,4 @@ export * from "@tamagui/compose-refs";
 export * from "@tamagui/helpers";
 export * from "@tamagui/constants";
 export * from "./setupHooks.mjs";
-export { configureMedia, getConfig, getMedia, getThemes, getToken, getTokenValue, getTokens, mediaObjectToString, mediaQueryConfig, mediaState, setupDev, updateConfig, useMedia };
+export { configureMedia, getConfig, getMedia, getThemes, getToken, getTokenValue, getTokens, mediaKeyMatch, mediaObjectToString, mediaQueryConfig, mediaState, setupDev, updateConfig, useMedia };

package/dist/esm/index.native.js

@@ -22,6 +22,7 @@ __export(src_exports, {
   getToken: () => import_config.getToken,
   getTokenValue: () => import_config.getTokenValue,
   getTokens: () => import_config.getTokens,
+  mediaKeyMatch: () => import_useMedia.mediaKeyMatch,
   mediaObjectToString: () => import_useMedia.mediaObjectToString,
   mediaQueryConfig: () => import_useMedia.mediaQueryConfig,
   mediaState: () => import_useMedia.mediaState,
@@ -99,6 +100,7 @@ __reExport(src_exports, require("./setupHooks"), module.exports);
   getToken,
   getTokenValue,
   getTokens,
+  mediaKeyMatch,
   mediaObjectToString,
   mediaQueryConfig,
   mediaState,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,+BAXd;AAgBA,wBAAc,gCAhBd;AAkBA,oBAQO;AAEP,wBAAc,kCA5Bd;AA8BA,wBAAc,wCA9Bd;AAgCA,wBAAc,0CAhCd;AAiCA,wBAAc,mCAjCd;AAkCA,wBAAc,uCAlCd;AAmCA,wBAAc,qCAnCd;AAoCA,wBAAc,iCApCd;AAqCA,wBAAc,4CArCd;AAsCA,wBAAc,qCAtCd;AAuCA,wBAAc,sCAvCd;AAwCA,wBAAc,uCAxCd;AAyCA,wBAAc,uCAzCd;AA0CA,wBAAc,yCA1Cd;AA2CA,wBAAc,uCA3Cd;AA4CA,wBAAc,iCA5Cd;AA6CA,wBAAc,iCA7Cd;AA8CA,wBAAc,qCA9Cd;AA+CA,wBAAc,0CA/Cd;AAgDA,wBAAc,0CAhDd;AAiDA,wBAAc,wCAjDd;AAkDA,wBAAc,gCAlDd;AAmDA,wBAAc,6BAnDd;AAoDA,wBAAc,4CApDd;AAqDA,wBAAc,gCArDd;AAuDA,sBAOO;AACP,wBAAc,6BA/Dd;AAgEA,wBAAc,iCAhEd;AAiEA,wBAAc,qCAjEd;AAkEA,wBAAc,qCAlEd;AAmEA,wBAAc,6BAnEd;AAoEA,wBAAc,qCApEd;AAsEA,wBAAc,yBAtEd;AAuEA,wBAAc,0BAvEd;AAwEA,wBAAc,yBAxEd;AAyEA,wBAAc,yBAzEd;AA0EA,wBAAc,0BA1Ed;AA2EA,wBAAc,kCA3Ed;AA4EA,wBAAc,iCA5Ed;AA6EA,wBAAc,oCA7Ed;AA8EA,wBAAc,kCA9Ed;AAgFA,wBAAc,wCAhFd;AAiFA,wBAAc,+BAjFd;AAkFA,wBAAc,kCAlFd;AAmFA,wBAAc,6BAnFd;AAoFA,wBAAc,+BApFd;AAsFA,wBAAc,yBAtFd;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,+BAXd;AAgBA,wBAAc,gCAhBd;AAkBA,oBAQO;AAEP,wBAAc,kCA5Bd;AA8BA,wBAAc,wCA9Bd;AAgCA,wBAAc,0CAhCd;AAiCA,wBAAc,mCAjCd;AAkCA,wBAAc,uCAlCd;AAmCA,wBAAc,qCAnCd;AAoCA,wBAAc,iCApCd;AAqCA,wBAAc,4CArCd;AAsCA,wBAAc,qCAtCd;AAuCA,wBAAc,sCAvCd;AAwCA,wBAAc,uCAxCd;AAyCA,wBAAc,uCAzCd;AA0CA,wBAAc,yCA1Cd;AA2CA,wBAAc,uCA3Cd;AA4CA,wBAAc,iCA5Cd;AA6CA,wBAAc,iCA7Cd;AA8CA,wBAAc,qCA9Cd;AA+CA,wBAAc,0CA/Cd;AAgDA,wBAAc,0CAhDd;AAiDA,wBAAc,wCAjDd;AAkDA,wBAAc,gCAlDd;AAmDA,wBAAc,6BAnDd;AAoDA,wBAAc,4CApDd;AAqDA,wBAAc,gCArDd;AAuDA,sBAQO;AACP,wBAAc,6BAhEd;AAiEA,wBAAc,iCAjEd;AAkEA,wBAAc,qCAlEd;AAmEA,wBAAc,qCAnEd;AAoEA,wBAAc,6BApEd;AAqEA,wBAAc,qCArEd;AAuEA,wBAAc,yBAvEd;AAwEA,wBAAc,0BAxEd;AAyEA,wBAAc,yBAzEd;AA0EA,wBAAc,yBA1Ed;AA2EA,wBAAc,0BA3Ed;AA4EA,wBAAc,kCA5Ed;AA6EA,wBAAc,iCA7Ed;AA8EA,wBAAc,oCA9Ed;AA+EA,wBAAc,kCA/Ed;AAiFA,wBAAc,wCAjFd;AAkFA,wBAAc,+BAlFd;AAmFA,wBAAc,kCAnFd;AAoFA,wBAAc,6BApFd;AAqFA,wBAAc,+BArFd;AAuFA,wBAAc,yBAvFd;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.88.17",
+  "version": "1.88.18",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,19 +27,19 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.88.17",
-    "@tamagui/constants": "1.88.17",
-    "@tamagui/helpers": "1.88.17",
-    "@tamagui/normalize-css-color": "1.88.17",
-    "@tamagui/timer": "1.88.17",
-    "@tamagui/use-did-finish-ssr": "1.88.17",
-    "@tamagui/use-event": "1.88.17",
-    "@tamagui/use-force-update": "1.88.17",
+    "@tamagui/compose-refs": "1.88.18",
+    "@tamagui/constants": "1.88.18",
+    "@tamagui/helpers": "1.88.18",
+    "@tamagui/normalize-css-color": "1.88.18",
+    "@tamagui/timer": "1.88.18",
+    "@tamagui/use-did-finish-ssr": "1.88.18",
+    "@tamagui/use-event": "1.88.18",
+    "@tamagui/use-force-update": "1.88.18",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.88.17",
+    "@tamagui/build": "1.88.18",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "typescript": "^5.3.3",

package/src/createComponent.tsx

@@ -599,10 +599,10 @@ export function createComponent<
     // HOOK 14 (-1 if no animation, -1 if disableSSR, -1 if no context, -1 if production)
     const mediaState = useMedia(stateRef, componentContext)
 
-    if (process.env.NODE_ENV === 'development' && time) time`media`
-
     setDidGetVariableValue(false)
 
+    if (process.env.NODE_ENV === 'development' && time) time`media`
+
     const resolveValues =
       // if HOC + mounted + has animation prop, resolve as value so it passes non-variable to child
       (isAnimated && !supportsCSSVars) ||