@tamagui/core 1.88.17 → 1.88.18

package/dist/native.js

@@ -1694,7 +1694,7 @@ var require_useMedia_native = __commonJS({
       getMediaImportanceIfMoreImportant: () => getMediaImportanceIfMoreImportant,
       getMediaKeyImportance: () => getMediaKeyImportance,
       isMediaKey: () => isMediaKey,
-      mediaKeyMatch: () => mediaKeyMatch,
+      mediaKeyMatch: () => mediaKeyMatch2,
       mediaKeyToQuery: () => mediaKeyToQuery,
       mediaKeys: () => mediaKeys,
       mediaObjectToString: () => mediaObjectToString2,
@@ -1828,7 +1828,7 @@ var require_useMedia_native = __commonJS({
     function mediaKeyToQuery(key) {
       return cachedMediaKeyToQuery[key] || mediaObjectToString2(mediaQueryConfig2[key], key);
     }
-    function mediaKeyMatch(key, dimensions) {
+    function mediaKeyMatch2(key, dimensions) {
       let mediaQueries = mediaQueryConfig2[key];
       return Object.keys(mediaQueries).every((query) => {
         let expectedVal = +mediaQueries[query], isMax = query.startsWith("max"), isWidth = query.endsWith("Width"), givenVal = dimensions[isWidth ? "width" : "height"];
@@ -3675,7 +3675,7 @@ var require_getVariantExtras_native = __commonJS({
     module2.exports = __toCommonJS2(getVariantExtras_exports);
     var import_createVariable = require_createVariable_native();
     function getVariantExtras(styleState) {
-      let { curProps, conf, context, theme } = styleState, fonts = conf.fontsParsed;
+      let { curProps, props, conf, context, theme } = styleState, fonts = conf.fontsParsed;
       context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
       let fontFamily = (0, import_createVariable.getVariableValue)(
         styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont
@@ -3688,14 +3688,12 @@ 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: new Proxy(curProps, {
+        props: new Proxy(props, {
           // handles shorthands
           get(target, key) {
-            let 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 (let tryKey of [key, conf.inverseShorthands[key]])
+              if (tryKey)
+                return Reflect.has(curProps, tryKey) ? Reflect.get(curProps, tryKey) : Reflect.get(target, tryKey);
           }
         })
       };
@@ -3998,8 +3996,8 @@ var require_getSplitStyles_native = __commonJS({
         inlineWhenUnflattened,
         parentStaticConfig,
         acceptsClassName
-      } = staticConfig, viewProps = {}, mediaState2 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants.isWeb && !styleProps.noClassNames, rulesToInsert = [], classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, style = {}, className = props.className ?? "", mediaStylesSeen = 0, styleState = {
-        curProps: { ...props },
+      } = staticConfig, viewProps = {}, mediaState2 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, style = {}, className = props.className || "", mediaStylesSeen = 0, styleState = {
+        curProps: {},
         classNames,
         conf,
         props,
@@ -4023,44 +4021,45 @@ var require_getSplitStyles_native = __commonJS({
         theme: { ...theme }
       }), console.groupEnd());
       for (let 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;
         let 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]) {
-            let 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]) {
+              let 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 (let 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;
         }
@@ -4077,12 +4076,12 @@ var require_getSplitStyles_native = __commonJS({
             case "accessibilityRequired":
             default:
           }
-        let isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo = !!(isMedia || isPseudo), isStyleProp = isMediaOrPseudo || isVariant && !styleProps.noExpand || isValidStyleKeyInit || isShorthand;
+        let isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo = !!(isMedia || isPseudo), isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !styleProps.noExpand || isShorthand;
         if (isStyleProp && (props.asChild === "except-style" || props.asChild === "except-style-web"))
           continue;
         let 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,
@@ -4157,7 +4156,7 @@ current`, {
                     let val2 = pseudoStyleObject[pkey];
                     if (isDisabled) {
                       let 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 {
                       let 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, {
@@ -4382,13 +4381,7 @@ current`, {
             !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_react3.useInsertionEffect || import_constants.useIsomorphicLayoutEffect : () => {
-    }, useSplitStyles = (...args) => {
-      let res = getSplitStyles(...args);
-      return useInsertEffectCompat(() => {
-        (0, import_insertStyleRule.insertStyleRules)(res.rulesToInsert);
-      }, [res.rulesToInsert]), res;
-    }, animatableDefaults = {
+    }, useSplitStyles = (a, b, c, d, e, f, g, h, i, j) => getSplitStyles(a, b, c, d, e, f, g, h, i, j), animatableDefaults = {
       opacity: 1,
       scale: 1,
       rotate: "0deg",
@@ -4927,7 +4920,7 @@ var require_createComponent_native = __commonJS({
         let isStringElement = typeof elementType == "string";
         process.env.NODE_ENV === "development" && time && time`theme`;
         let mediaState2 = (0, import_useMedia.useMedia)(stateRef, componentContext);
-        process.env.NODE_ENV === "development" && time && time`media`, (0, import_createVariable.setDidGetVariableValue)(!1);
+        (0, import_createVariable.setDidGetVariableValue)(!1), process.env.NODE_ENV === "development" && time && time`media`;
         let resolveValues = (
           // if HOC + mounted + has animation prop, resolve as value so it passes non-variable to child
           isAnimated && !supportsCSSVars || isHOC && state.unmounted == !1 && hasAnimationProp ? "value" : "auto"
@@ -6720,6 +6713,7 @@ var require_index_native9 = __commonJS({
       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,