@tamagui/core 1.123.8 → 1.123.10

package/dist/native.js

@@ -676,7 +676,6 @@ var require_validStyleProps_native = __commonJS({
         ...textColors
       }
     }, stylePropsUnitless = {
-      perspective: !0,
       WebkitLineClamp: !0,
       animationIterationCount: !0,
       aspectRatio: !0,
@@ -4652,9 +4651,9 @@ var require_expandStyles_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/getStylesAtomic.native.js
-var require_getStylesAtomic_native = __commonJS({
-  "../web/dist/cjs/helpers/getStylesAtomic.native.js"(exports2, module2) {
+// ../web/dist/cjs/helpers/getCSSStylesAtomic.native.js
+var require_getCSSStylesAtomic_native = __commonJS({
+  "../web/dist/cjs/helpers/getCSSStylesAtomic.native.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
       for (var name in all) __defProp2(target, name, {
@@ -4688,22 +4687,22 @@ var require_getStylesAtomic_native = __commonJS({
       return __copyProps2(__defProp2({}, "__esModule", {
         value: !0
       }), mod);
-    }, getStylesAtomic_native_exports = {};
-    __export2(getStylesAtomic_native_exports, {
+    }, getCSSStylesAtomic_native_exports = {};
+    __export2(getCSSStylesAtomic_native_exports, {
+      getCSSStylesAtomic: function() {
+        return getCSSStylesAtomic;
+      },
       getStyleAtomic: function() {
         return getStyleAtomic;
       },
-      getStylesAtomic: function() {
-        return getStylesAtomic;
-      },
       styleToCSS: function() {
         return styleToCSS;
       }
     });
-    module2.exports = __toCommonJS2(getStylesAtomic_native_exports);
+    module2.exports = __toCommonJS2(getCSSStylesAtomic_native_exports);
     var empty = function() {
       console.warn("no-op native");
-    }, getStylesAtomic = empty, getStyleAtomic = empty, styleToCSS = empty;
+    }, getCSSStylesAtomic = empty, getStyleAtomic = empty, styleToCSS = empty;
   }
 });
 
@@ -5712,7 +5711,7 @@ var require_propMapper_native = __commonJS({
             return;
           }
         }
-        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
+        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
           key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
           var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
           if (expanded) for (var max = expanded.length, i = 0; i < max; i++) {
@@ -5774,7 +5773,7 @@ var require_propMapper_native = __commonJS({
           if (styleProps.noExpand) res[subKey] = val;
           else if (variants && subKey in variants) {
             if (parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
-            val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
+            val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val;
             else {
               var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
               if (variantOut) {
@@ -5807,7 +5806,7 @@ var require_propMapper_native = __commonJS({
           if (typeof val == "string") {
             var fVal = (
               // SYNC WITH *1
-              val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val
+              val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val
             );
             res[subKey] = fVal;
             continue;
@@ -5867,16 +5866,18 @@ var require_propMapper_native = __commonJS({
     var fontShorthand = {
       fontSize: "size",
       fontWeight: "weight"
-    }, lastFontFamilyToken = null, getTokenForKey = function(key, value) {
-      var resolveAs = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "none", styleState = arguments.length > 3 ? arguments[3] : void 0, _staticConfig_accept;
+    }, lastFontFamilyToken = null, getTokenForKey = function(key, value, styleProps, styleState) {
+      var _staticConfig_accept, resolveAs = styleProps.resolveValues || "none";
       if (resolveAs === "none") return value;
       var { theme, conf = (0, import_config.getConfig)(), context, fontFamily, staticConfig } = styleState, tokensParsed = conf.tokensParsed, valOrVar, hasSet = !1, customTokenAccept = staticConfig == null || (_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key];
       if (customTokenAccept) {
         var _theme_value, val = (_theme_value = theme == null ? void 0 : theme[value]) !== null && _theme_value !== void 0 ? _theme_value : tokensParsed[customTokenAccept][value];
         val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
       }
-      if (theme && value in theme) valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
-      else {
+      if (theme && value in theme) {
+        if (resolveAs === "except-theme") return value;
+        valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
+      } else {
         if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];
         else {
           switch (key) {
@@ -6027,6 +6028,7 @@ var require_transformsToString_native = __commonJS({
         // { scale: 2 } => 'scale(2)'
         // { translateX: 20 } => 'translateX(20px)'
         // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
+        // { perspective: 1000 } => perspective(1000px)
         function(transform) {
           var type = Object.keys(transform)[0], value = transform[type];
           return type === "matrix" || type === "matrix3d" ? `${type}(${value.join(",")})` : `${type}(${(0, import_normalizeValueWithProperty.normalizeValueWithProperty)(value, type)})`;
@@ -6100,7 +6102,7 @@ var require_getSplitStyles_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(getSplitStyles_exports);
-    var import_constants2 = require_index_native2(), import_helpers2 = require_index_native3(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), 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_isActivePlatform = require_isActivePlatform_native(), import_isActiveTheme = require_isActiveTheme_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), import_sortString = require_sortString_native(), import_transformsToString = require_transformsToString_native(), consoleGroupCollapsed = import_constants2.isWeb ? console.groupCollapsed : console.info, conf, PROP_SPLIT = "-";
+    var import_constants2 = require_index_native2(), import_helpers2 = require_index_native3(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getCSSStylesAtomic = require_getCSSStylesAtomic_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_insertStyleRule = require_insertStyleRule_native(), import_isActivePlatform = require_isActivePlatform_native(), import_isActiveTheme = require_isActiveTheme_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), import_sortString = require_sortString_native(), import_transformsToString = require_transformsToString_native(), consoleGroupCollapsed = import_constants2.isWeb ? console.groupCollapsed : console.info, conf, PROP_SPLIT = "-";
     function isValidStyleKey(key, validStyles2, accept) {
       return key in validStyles2 ? !0 : accept && key in accept;
     }
@@ -6206,7 +6208,7 @@ var require_getSplitStyles_native = __commonJS({
               var descriptor = import_pseudoDescriptors.pseudoDescriptors[key4], isEnter = key4 === "enterStyle", isExit = key4 === "exitStyle";
               if (!descriptor) return;
               if (shouldDoClasses && !isExit) {
-                var pseudoStyles = (0, import_getStylesAtomic.getStyleAtomic)(pseudoStyleObject, descriptor);
+                var pseudoStyles = (0, import_getCSSStylesAtomic.getStyleAtomic)(pseudoStyleObject, descriptor);
                 process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key4), (0, import_log.log)({
                   pseudoStyleObject,
                   pseudoStyles
@@ -6283,7 +6285,7 @@ var require_getSplitStyles_native = __commonJS({
                   var importance1 = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKeyShort, "space", usedKeys, !0);
                   importance1 && (space = val2.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`Found more important space for current media ${mediaKeyShort}: ${val2} (importance: ${importance1})`));
                 }
-                var mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
+                var mediaStyles = (0, import_getCSSStylesAtomic.getCSSStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
                 mediaStylesSeen += 1;
                 var _iteratorNormalCompletion12 = !0, _didIteratorError12 = !1, _iteratorError12 = void 0;
                 try {
@@ -6381,7 +6383,7 @@ var require_getSplitStyles_native = __commonJS({
           console.groupEnd();
         }
       };
-      props.reddish && (debug = "verbose"), conf = conf || (0, import_config.getConfig)(), import_constants2.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
+      conf = conf || (0, import_config.getConfig)(), import_constants2.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState2 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants2.isWeb && !styleProps.noClass, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, validStyles2 = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers2.stylePropsText : import_helpers2.validStyles);
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-setup`;
       var styleState = {
@@ -6423,7 +6425,7 @@ var require_getSplitStyles_native = __commonJS({
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-propsend`;
       var avoidNormalize = styleProps.noNormalize === !1;
       if (!avoidNormalize) {
-        if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants2.isWeb && !isReactNative && (0, import_getStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
+        if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), !styleProps.noExpand && !styleProps.noMergeStyle && import_constants2.isWeb && !isReactNative && (0, import_getCSSStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
           var _styleState;
           (_styleState = styleState).style || (_styleState.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
             var [a] = param, [b] = param1;
@@ -6443,7 +6445,7 @@ var require_getSplitStyles_native = __commonJS({
       }
       if (0) var _styleState_style, shouldStringifyTransforms;
       if (0) {
-        if (styleState.style && shouldDoClasses) {
+        if (!styleProps.noMergeStyle && styleState.style && shouldDoClasses) {
           var retainedStyles, shouldRetain;
           if (!styleState.style.$$css) {
             var atomic, _iteratorNormalCompletion, _didIteratorError, _iteratorError;
@@ -6463,7 +6465,7 @@ var require_getSplitStyles_native = __commonJS({
         } else if (viewProps.tabIndex == null) var _viewProps_focusable, isFocusable, role;
       }
       var styleProp = props.style;
-      if (styleProp) if (isHOC) viewProps.style = normalizeStyle(styleProp);
+      if (!styleProps.noMergeStyle && styleProp) if (isHOC) viewProps.style = normalizeStyle(styleProp);
       else for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i = 0; i < len; i++) {
         var style = isArray ? styleProp[i] : styleProp;
         if (style) if (style.$$css) Object.assign(styleState.classNames, style);
@@ -6495,11 +6497,11 @@ var require_getSplitStyles_native = __commonJS({
         pseudoGroups,
         mediaGroups
       }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
-      if (!asChildExceptStyleLike) {
+      if (!styleProps.noMergeStyle && !asChildExceptStyleLike) {
         var style2 = styleState.style;
         if (0) {
           var _staticConfig_defaultProps, fontFamily, fontFamilyClassName, groupClassName, componentNameFinal, componentClassName, classList, finalClassName;
-          if (!styleProps.noMergeStyle && !(styleProps.isAnimated && !conf.animations.supportsCSSVars && isReactNative) && isReactNative) {
+          if (!(styleProps.isAnimated && !conf.animations.supportsCSSVars && isReactNative) && isReactNative) {
             var cnStyles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1;
             try {
               for (var _iterator1, _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) var name;
@@ -6507,7 +6509,7 @@ var require_getSplitStyles_native = __commonJS({
             } finally {
             }
           }
-        } else style2 && !styleProps.noMergeStyle && (viewProps.style = style2);
+        } else style2 && (viewProps.style = style2);
       }
       if (process.env.NODE_ENV === "development" && debug === "verbose" && import_isDevTools.isDevTools) {
         consoleGroupCollapsed("\u{1F539} getSplitStyles ===>");
@@ -10742,7 +10744,7 @@ var require_index_native8 = __commonJS({
     __reExport2(index_exports2, require_expandStyles_native(), module2.exports);
     __reExport2(index_exports2, require_getExpandedShorthands_native(), module2.exports);
     __reExport2(index_exports2, require_getSplitStyles_native(), module2.exports);
-    __reExport2(index_exports2, require_getStylesAtomic_native(), module2.exports);
+    __reExport2(index_exports2, require_getCSSStylesAtomic_native(), module2.exports);
     __reExport2(index_exports2, require_createComponent_native(), module2.exports);
     __reExport2(index_exports2, require_getThemeCSSRules_native(), module2.exports);
     __reExport2(index_exports2, require_getVariantExtras_native(), module2.exports);