@tamagui/core 2.0.0-rc.21 → 2.0.0-rc.21-1772323626103

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built @tamagui/core in 623 ms
+built @tamagui/core in 1702 ms
 Running afterBuild script...
-afterBuild completed in 655 ms
+afterBuild completed in 2259 ms

package/dist/native.cjs

@@ -8870,53 +8870,29 @@ function resolvePlatformNames(nativeProp) {
   ) : Array.isArray(nativeProp) ? nativeProp : [nativeProp], set = new Set(platforms2);
   return set.has("mobile") && (set.add("android"), set.add("ios"), set.delete("mobile")), set;
 }
-var webOnlyStylePropsView = {
-  transition: true,
-  textWrap: true,
-  backdropFilter: true,
-  WebkitBackdropFilter: true,
-  background: true,
-  borderTop: true,
-  borderRight: true,
-  borderBottom: true,
-  borderLeft: true,
+var nonAnimatableWebViewProps = {
   backgroundAttachment: true,
   backgroundBlendMode: true,
   backgroundClip: true,
   backgroundOrigin: true,
-  backgroundPosition: true,
   backgroundRepeat: true,
-  backgroundSize: true,
   borderBottomStyle: true,
-  borderImage: true,
   borderLeftStyle: true,
   borderRightStyle: true,
   borderTopStyle: true,
-  caretColor: true,
-  clipPath: true,
   contain: true,
   containerType: true,
   content: true,
   float: true,
-  mask: true,
-  maskBorder: true,
   maskBorderMode: true,
-  maskBorderOutset: true,
   maskBorderRepeat: true,
-  maskBorderSlice: true,
-  maskBorderSource: true,
-  maskBorderWidth: true,
   maskClip: true,
   maskComposite: true,
-  maskImage: true,
   maskMode: true,
   maskOrigin: true,
-  maskPosition: true,
   maskRepeat: true,
-  maskSize: true,
   maskType: true,
   objectFit: true,
-  objectPosition: true,
   overflowBlock: true,
   overflowInline: true,
   overflowX: true,
@@ -8924,20 +8900,46 @@ var webOnlyStylePropsView = {
   // NOTE: pointerEvents is NOT web-only - it's a core React Native View prop (not a style)
   pointerEvents: true,
   scrollbarWidth: true,
-  textEmphasis: true,
+  textWrap: true,
   touchAction: true,
   transformStyle: true,
-  userSelect: true,
   willChange: true
-}, webOnlyStylePropsText = {
+}, nonAnimatableWebTextProps = {
   whiteSpace: true,
   wordWrap: true,
   textOverflow: true,
+  WebkitBoxOrient: true
+}, webOnlyStylePropsView = __spreadProps(__spreadValues({}, nonAnimatableWebViewProps), {
+  transition: true,
+  backdropFilter: true,
+  WebkitBackdropFilter: true,
+  background: true,
+  borderTop: true,
+  borderRight: true,
+  borderBottom: true,
+  borderLeft: true,
+  backgroundPosition: true,
+  backgroundSize: true,
+  borderImage: true,
+  caretColor: true,
+  clipPath: true,
+  mask: true,
+  maskBorder: true,
+  maskBorderOutset: true,
+  maskBorderSlice: true,
+  maskBorderSource: true,
+  maskBorderWidth: true,
+  maskImage: true,
+  maskPosition: true,
+  maskSize: true,
+  objectPosition: true,
+  textEmphasis: true,
+  userSelect: true
+}), webOnlyStylePropsText = __spreadProps(__spreadValues({}, nonAnimatableWebTextProps), {
   textDecorationDistance: true,
   // cursor: now cross-platform - in stylePropsView
-  WebkitLineClamp: true,
-  WebkitBoxOrient: true
-};
+  WebkitLineClamp: true
+});
 var cssShorthandLonghands = {
   // border longhands
   borderWidth: true,
@@ -9014,8 +9016,47 @@ var cssShorthandLonghands = {
     // outlineColor is supported on RN 0.77+ (New Architecture)
     outlineColor: true
   })
-}, stylePropsUnitless = {
+}, nonAnimatableViewProps = {
+  alignContent: true,
+  alignItems: true,
+  alignSelf: true,
+  backfaceVisibility: true,
+  borderCurve: true,
+  borderStyle: true,
+  borderBlockStyle: true,
+  borderBlockEndStyle: true,
+  borderBlockStartStyle: true,
+  borderInlineStyle: true,
+  borderInlineEndStyle: true,
+  borderInlineStartStyle: true,
+  boxSizing: true,
+  cursor: true,
+  direction: true,
+  display: true,
+  flexDirection: true,
+  flexWrap: true,
+  isolation: true,
+  justifyContent: true,
+  mixBlendMode: true,
+  outlineStyle: true,
+  overflow: true,
+  position: true
+}, nonAnimatableFontProps = {
+  fontFamily: true,
+  fontStyle: true,
+  fontVariant: true,
+  textTransform: true
+}, nonAnimatableTextOnlyProps = {
+  textAlign: true,
+  textDecorationLine: true,
+  textDecorationStyle: true,
+  userSelect: true
+}, nonAnimatableUnitlessProps = {
   WebkitLineClamp: true,
+  lineClamp: true,
+  gridTemplateColumns: true,
+  gridTemplateAreas: true
+}, nonAnimatableStyleProps = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, nonAnimatableViewProps), nonAnimatableFontProps), nonAnimatableTextOnlyProps), nonAnimatableUnitlessProps), stylePropsUnitless = __spreadProps(__spreadValues({}, nonAnimatableUnitlessProps), {
   animationIterationCount: true,
   aspectRatio: true,
   borderImageOutset: true,
@@ -9037,9 +9078,6 @@ var cssShorthandLonghands = {
   gridColumnEnd: true,
   gridColumnGap: true,
   gridColumnStart: true,
-  gridTemplateColumns: true,
-  gridTemplateAreas: true,
-  lineClamp: true,
   opacity: true,
   order: true,
   orphans: true,
@@ -9052,7 +9090,7 @@ var cssShorthandLonghands = {
   scaleY: true,
   scaleZ: true,
   shadowOpacity: true
-}, stylePropsTransform = {
+}), stylePropsTransform = {
   x: true,
   y: true,
   scale: true,
@@ -9066,10 +9104,7 @@ var cssShorthandLonghands = {
   rotateY: true,
   rotateX: true,
   rotateZ: true
-}, stylePropsView = __spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
-  backfaceVisibility: true,
-  borderCurve: true,
-  cursor: true,
+}, stylePropsView = __spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadProps(__spreadValues({}, nonAnimatableViewProps), {
   borderBottomEndRadius: true,
   borderBottomStartRadius: true,
   borderBottomWidth: true,
@@ -9081,34 +9116,20 @@ var cssShorthandLonghands = {
   borderInlineWidth: true,
   borderInlineEndWidth: true,
   borderInlineStartWidth: true,
-  borderStyle: true,
-  borderBlockStyle: true,
-  borderBlockEndStyle: true,
-  borderBlockStartStyle: true,
-  borderInlineStyle: true,
-  borderInlineEndStyle: true,
-  borderInlineStartStyle: true,
   borderTopEndRadius: true,
   borderTopStartRadius: true,
   borderTopWidth: true,
   borderWidth: true,
   transform: true,
   transformOrigin: true,
-  alignContent: true,
-  alignItems: true,
-  alignSelf: true,
   borderEndWidth: true,
   borderStartWidth: true,
   bottom: true,
-  display: true,
   end: true,
   flexBasis: true,
-  flexDirection: true,
-  flexWrap: true,
   gap: true,
   columnGap: true,
   rowGap: true,
-  justifyContent: true,
   left: true,
   margin: true,
   marginBlock: true,
@@ -9125,7 +9146,6 @@ var cssShorthandLonghands = {
   marginStart: true,
   marginTop: true,
   marginVertical: true,
-  overflow: true,
   padding: true,
   paddingBottom: true,
   paddingInline: true,
@@ -9140,7 +9160,6 @@ var cssShorthandLonghands = {
   paddingStart: true,
   paddingTop: true,
   paddingVertical: true,
-  position: true,
   right: true,
   start: true,
   top: true,
@@ -9151,10 +9170,9 @@ var cssShorthandLonghands = {
   insetInline: true,
   insetInlineEnd: true,
   insetInlineStart: true,
-  direction: true,
   shadowOffset: true,
   shadowRadius: true
-}, tokenCategories.color), tokenCategories.radius), tokenCategories.size), tokenCategories.radius), stylePropsTransform), stylePropsUnitless), isAndroid ? {
+}), tokenCategories.color), tokenCategories.radius), tokenCategories.size), stylePropsTransform), stylePropsUnitless), isAndroid ? {
   elevationAndroid: true
 } : {}), {
   boxShadow: true,
@@ -9165,32 +9183,19 @@ var cssShorthandLonghands = {
   // the actual RN 0.76+ prop name (backgroundImage expands to this on native)
   experimental_backgroundImage: true,
   // RN 0.76/0.77+ style props (New Architecture)
-  boxSizing: true,
-  mixBlendMode: true,
-  isolation: true,
   outline: true,
   outlineColor: true,
   outlineOffset: true,
-  outlineStyle: true,
   outlineWidth: true
-}), stylePropsFont = {
-  fontFamily: true,
+}), stylePropsFont = __spreadProps(__spreadValues({}, nonAnimatableFontProps), {
   fontSize: true,
-  fontStyle: true,
   fontWeight: true,
-  fontVariant: true,
   letterSpacing: true,
-  lineHeight: true,
-  textTransform: true
-}, stylePropsTextOnly = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, stylePropsFont), {
-  textAlign: true,
-  textDecorationLine: true,
-  textDecorationStyle: true
-}), textColors), {
+  lineHeight: true
+}), stylePropsTextOnly = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, stylePropsFont), nonAnimatableTextOnlyProps), textColors), {
   textShadow: true,
   textShadowOffset: true,
   textShadowRadius: true,
-  userSelect: true,
   verticalAlign: true
 }), stylePropsText = __spreadValues(__spreadValues({}, stylePropsView), stylePropsTextOnly), stylePropsAll = stylePropsText, validPseudoKeys = {
   enterStyle: true,
@@ -10717,43 +10722,43 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     if (!noSkip && keyInit in skipProps) return "continue";
     (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
     var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
-    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key4, val2, originalVal) {
-      var _parentStaticConfig_variants, isStyledContextProp = styledContext && key4 in styledContext;
+    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key5, val2, originalVal) {
+      var _parentStaticConfig_variants, isStyledContextProp = styledContext && key5 in styledContext;
       if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
-        viewProps[key4] = val2;
+        viewProps[key5] = val2;
         return;
       }
       if (false, val2 != null) {
-        if (key4 === "pointerEvents") {
-          viewProps[key4] = val2;
+        if (key5 === "pointerEvents") {
+          viewProps[key5] = val2;
           return;
         }
-        if (!isHOC && isValidStyleKey(key4, validStyles$1, accept) || isAndroid && key4 === "elevation") {
-          mergeStyle(styleState, key4, val2, 1, false, originalVal);
+        if (!isHOC && isValidStyleKey(key5, validStyles$1, accept) || isAndroid && key5 === "elevation") {
+          mergeStyle(styleState, key5, val2, 1, false, originalVal);
           return;
         }
-        if (isPseudo = key4 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key4), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key4 in variants, isMedia === "group" && (key4 = normalizeGroupKey(key4, groupContext)), (inlineProps == null ? void 0 : inlineProps.has(key4)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key4))) {
+        if (isPseudo = key5 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key5), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key5 in variants, isMedia === "group" && (key5 = normalizeGroupKey(key5, groupContext)), (inlineProps == null ? void 0 : inlineProps.has(key5)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key5))) {
           var _props_key;
-          viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
+          viewProps[key5] = (_props_key = props[key5]) !== null && _props_key !== void 0 ? _props_key : val2;
         }
         var shouldPassThrough2 = styleProps2.noExpand && isPseudo || isHOC && (isMediaOrPseudo || (parentStaticConfig == null || (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]));
         if (shouldPassThrough2) {
-          passDownProp(viewProps, key4, val2, isMediaOrPseudo), false;
+          passDownProp(viewProps, key5, val2, isMediaOrPseudo), false;
           return;
         }
         if (isPseudo) {
           if (!val2) return;
-          var pseudoStyleObject = getSubStyle(styleState, key4, val2, styleProps2.noClass && process.env.IS_STATIC !== "is_static");
+          var pseudoStyleObject = getSubStyle(styleState, key5, val2, styleProps2.noClass && process.env.IS_STATIC !== "is_static");
           if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
             var _pseudos, _key;
-            if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key4] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") {
-              Object.assign(pseudos[key4], pseudoStyleObject);
+            if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key5] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") {
+              Object.assign(pseudos[key5], pseudoStyleObject);
               return;
             }
           }
-          var descriptor = pseudoDescriptors[key4], isEnter = key4 === "enterStyle", isExit = key4 === "exitStyle";
+          var descriptor = pseudoDescriptors[key5], isEnter = key5 === "enterStyle", isExit = key5 === "exitStyle";
           if (!descriptor) return;
-          var pseudoStyles, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, psuedoStyle, fullKey;
+          var pseudoStyles, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _iterator3, _step3, psuedoStyle, fullKey;
           if (shouldDoClasses && !isExit) ;
           if (!shouldDoClasses || isExit || isEnter) {
             var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled2 = componentState[descriptorKey] === false;
@@ -10767,7 +10772,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                 if (shouldMerge) {
                   if (process.env.IS_STATIC === "is_static") {
                     var _pseudos1, _key1;
-                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = _$val;
+                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key5] || (_pseudos1[_key1] = {}), pseudos[key5][pkey] = _$val;
                   }
                   mergeStyle(styleState, pkey, _$val, importance, false, pseudoOriginalValues == null ? void 0 : pseudoOriginalValues[pkey]);
                 }
@@ -10782,15 +10787,15 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
         }
         if (isMedia) {
           if (!val2) return;
-          var mediaKeyShort = key4.slice(isMedia == "theme" ? 7 : 1);
+          var mediaKeyShort = key5.slice(isMedia == "theme" ? 7 : 1);
           hasMedia || (hasMedia = true);
           var hasSpace = val2.space;
-          if ((hasSpace || !shouldDoClasses || styleProps2.willBeAnimated) && ((!hasMedia || typeof hasMedia == "boolean") && (hasMedia = /* @__PURE__ */ new Set()), hasMedia.add(mediaKeyShort)), isMedia === "platform" && !isActivePlatform(key4)) return;
+          if ((hasSpace || !shouldDoClasses || styleProps2.willBeAnimated) && ((!hasMedia || typeof hasMedia == "boolean") && (hasMedia = /* @__PURE__ */ new Set()), hasMedia.add(mediaKeyShort)), isMedia === "platform" && !isActivePlatform(key5)) return;
           var priority = mediaStylesSeen;
           mediaStylesSeen += 1;
           var shouldDoClassesForThisMedia = shouldDoClasses || isWeb && isMedia === "theme";
           if (shouldDoClassesForThisMedia) {
-            var mediaStyle = getSubStyle(styleState, key4, val2, false), mediaStyles = getCSSStylesAtomic(mediaStyle), _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
+            var mediaStyle = getSubStyle(styleState, key5, val2, false), mediaStyles = getCSSStylesAtomic(mediaStyle), _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
             try {
               for (var _iterator12 = mediaStyles[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
                 var style3 = _step12.value, property = style3[StyleObjectProperty], isSubStyle = property[0] === "$";
@@ -10810,11 +10815,11 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               }
             }
           } else {
-            let mergeMediaStyle2 = function(key5, val3, originalVal2) {
+            let mergeMediaStyle2 = function(key6, val3, originalVal2) {
               var _styleState4;
               (_styleState4 = styleState).style || (_styleState4.style = {});
-              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState[mediaKeyShort], importanceBump, debug, originalVal2);
-              didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
+              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key6, val3, mediaState[mediaKeyShort], importanceBump, debug, originalVal2);
+              didMerge && key6 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
             };
             var mergeMediaStyle = mergeMediaStyle2, isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
             if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
@@ -10822,7 +10827,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                 return;
               }
             }
-            var mediaStyle1 = getSubStyle(styleState, key4, val2, true), importanceBump = 0;
+            var mediaStyle1 = getSubStyle(styleState, key5, val2, true), importanceBump = 0;
             if (isThemeMedia) {
               if (isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
@@ -10887,7 +10892,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
         }
         if (!isVariant) {
           if (isStyledContextProp) return;
-          viewProps[key4] = val2;
+          viewProps[key5] = val2;
         }
       }
     }), false) ;
@@ -10933,8 +10938,8 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       fallbackProps
     } = styleProps2;
     fallbackProps && (styleState.props = new Proxy(props, {
-      get(_2, key4, val2) {
-        return Reflect.has(props, key4) ? Reflect.get(props, key4) : Reflect.get(fallbackProps, key4);
+      get(_2, key5, val2) {
+        return Reflect.has(props, key5) ? Reflect.get(props, key5) : Reflect.get(fallbackProps, key5);
       }
     }));
   }
@@ -13617,6 +13622,9 @@ exports.mergeIfNotShallowEqual = mergeIfNotShallowEqual;
 exports.mergeProps = mergeProps;
 exports.mergeSlotStyleProps = mergeSlotStyleProps;
 exports.mutatedAutoVariables = mutatedAutoVariables;
+exports.nonAnimatableStyleProps = nonAnimatableStyleProps;
+exports.nonAnimatableWebTextProps = nonAnimatableWebTextProps;
+exports.nonAnimatableWebViewProps = nonAnimatableWebViewProps;
 exports.normalizeColor = normalizeColor;
 exports.normalizeStyle = normalizeStyle$1;
 exports.normalizeValueWithProperty = normalizeValueWithProperty;

package/dist/test.native.cjs

@@ -606,53 +606,29 @@ function resolvePlatformNames(nativeProp) {
   ) : Array.isArray(nativeProp) ? nativeProp : [nativeProp], set = new Set(platforms2);
   return set.has("mobile") && (set.add("android"), set.add("ios"), set.delete("mobile")), set;
 }
-var webOnlyStylePropsView = {
-  transition: true,
-  textWrap: true,
-  backdropFilter: true,
-  WebkitBackdropFilter: true,
-  background: true,
-  borderTop: true,
-  borderRight: true,
-  borderBottom: true,
-  borderLeft: true,
+var nonAnimatableWebViewProps = {
   backgroundAttachment: true,
   backgroundBlendMode: true,
   backgroundClip: true,
   backgroundOrigin: true,
-  backgroundPosition: true,
   backgroundRepeat: true,
-  backgroundSize: true,
   borderBottomStyle: true,
-  borderImage: true,
   borderLeftStyle: true,
   borderRightStyle: true,
   borderTopStyle: true,
-  caretColor: true,
-  clipPath: true,
   contain: true,
   containerType: true,
   content: true,
   float: true,
-  mask: true,
-  maskBorder: true,
   maskBorderMode: true,
-  maskBorderOutset: true,
   maskBorderRepeat: true,
-  maskBorderSlice: true,
-  maskBorderSource: true,
-  maskBorderWidth: true,
   maskClip: true,
   maskComposite: true,
-  maskImage: true,
   maskMode: true,
   maskOrigin: true,
-  maskPosition: true,
   maskRepeat: true,
-  maskSize: true,
   maskType: true,
   objectFit: true,
-  objectPosition: true,
   overflowBlock: true,
   overflowInline: true,
   overflowX: true,
@@ -660,20 +636,46 @@ var webOnlyStylePropsView = {
   // NOTE: pointerEvents is NOT web-only - it's a core React Native View prop (not a style)
   pointerEvents: true,
   scrollbarWidth: true,
-  textEmphasis: true,
+  textWrap: true,
   touchAction: true,
   transformStyle: true,
-  userSelect: true,
   willChange: true
-}, webOnlyStylePropsText = {
+}, nonAnimatableWebTextProps = {
   whiteSpace: true,
   wordWrap: true,
   textOverflow: true,
+  WebkitBoxOrient: true
+}, webOnlyStylePropsView = __spreadProps(__spreadValues({}, nonAnimatableWebViewProps), {
+  transition: true,
+  backdropFilter: true,
+  WebkitBackdropFilter: true,
+  background: true,
+  borderTop: true,
+  borderRight: true,
+  borderBottom: true,
+  borderLeft: true,
+  backgroundPosition: true,
+  backgroundSize: true,
+  borderImage: true,
+  caretColor: true,
+  clipPath: true,
+  mask: true,
+  maskBorder: true,
+  maskBorderOutset: true,
+  maskBorderSlice: true,
+  maskBorderSource: true,
+  maskBorderWidth: true,
+  maskImage: true,
+  maskPosition: true,
+  maskSize: true,
+  objectPosition: true,
+  textEmphasis: true,
+  userSelect: true
+}), webOnlyStylePropsText = __spreadProps(__spreadValues({}, nonAnimatableWebTextProps), {
   textDecorationDistance: true,
   // cursor: now cross-platform - in stylePropsView
-  WebkitLineClamp: true,
-  WebkitBoxOrient: true
-};
+  WebkitLineClamp: true
+});
 var cssShorthandLonghands = {
   // border longhands
   borderWidth: true,
@@ -750,8 +752,47 @@ var cssShorthandLonghands = {
     // outlineColor is supported on RN 0.77+ (New Architecture)
     outlineColor: true
   })
-}, stylePropsUnitless = {
+}, nonAnimatableViewProps = {
+  alignContent: true,
+  alignItems: true,
+  alignSelf: true,
+  backfaceVisibility: true,
+  borderCurve: true,
+  borderStyle: true,
+  borderBlockStyle: true,
+  borderBlockEndStyle: true,
+  borderBlockStartStyle: true,
+  borderInlineStyle: true,
+  borderInlineEndStyle: true,
+  borderInlineStartStyle: true,
+  boxSizing: true,
+  cursor: true,
+  direction: true,
+  display: true,
+  flexDirection: true,
+  flexWrap: true,
+  isolation: true,
+  justifyContent: true,
+  mixBlendMode: true,
+  outlineStyle: true,
+  overflow: true,
+  position: true
+}, nonAnimatableFontProps = {
+  fontFamily: true,
+  fontStyle: true,
+  fontVariant: true,
+  textTransform: true
+}, nonAnimatableTextOnlyProps = {
+  textAlign: true,
+  textDecorationLine: true,
+  textDecorationStyle: true,
+  userSelect: true
+}, nonAnimatableUnitlessProps = {
   WebkitLineClamp: true,
+  lineClamp: true,
+  gridTemplateColumns: true,
+  gridTemplateAreas: true
+}, nonAnimatableStyleProps = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, nonAnimatableViewProps), nonAnimatableFontProps), nonAnimatableTextOnlyProps), nonAnimatableUnitlessProps), stylePropsUnitless = __spreadProps(__spreadValues({}, nonAnimatableUnitlessProps), {
   animationIterationCount: true,
   aspectRatio: true,
   borderImageOutset: true,
@@ -773,9 +814,6 @@ var cssShorthandLonghands = {
   gridColumnEnd: true,
   gridColumnGap: true,
   gridColumnStart: true,
-  gridTemplateColumns: true,
-  gridTemplateAreas: true,
-  lineClamp: true,
   opacity: true,
   order: true,
   orphans: true,
@@ -788,7 +826,7 @@ var cssShorthandLonghands = {
   scaleY: true,
   scaleZ: true,
   shadowOpacity: true
-}, stylePropsTransform = {
+}), stylePropsTransform = {
   x: true,
   y: true,
   scale: true,
@@ -802,10 +840,7 @@ var cssShorthandLonghands = {
   rotateY: true,
   rotateX: true,
   rotateZ: true
-}, stylePropsView = __spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
-  backfaceVisibility: true,
-  borderCurve: true,
-  cursor: true,
+}, stylePropsView = __spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadProps(__spreadValues({}, nonAnimatableViewProps), {
   borderBottomEndRadius: true,
   borderBottomStartRadius: true,
   borderBottomWidth: true,
@@ -817,34 +852,20 @@ var cssShorthandLonghands = {
   borderInlineWidth: true,
   borderInlineEndWidth: true,
   borderInlineStartWidth: true,
-  borderStyle: true,
-  borderBlockStyle: true,
-  borderBlockEndStyle: true,
-  borderBlockStartStyle: true,
-  borderInlineStyle: true,
-  borderInlineEndStyle: true,
-  borderInlineStartStyle: true,
   borderTopEndRadius: true,
   borderTopStartRadius: true,
   borderTopWidth: true,
   borderWidth: true,
   transform: true,
   transformOrigin: true,
-  alignContent: true,
-  alignItems: true,
-  alignSelf: true,
   borderEndWidth: true,
   borderStartWidth: true,
   bottom: true,
-  display: true,
   end: true,
   flexBasis: true,
-  flexDirection: true,
-  flexWrap: true,
   gap: true,
   columnGap: true,
   rowGap: true,
-  justifyContent: true,
   left: true,
   margin: true,
   marginBlock: true,
@@ -861,7 +882,6 @@ var cssShorthandLonghands = {
   marginStart: true,
   marginTop: true,
   marginVertical: true,
-  overflow: true,
   padding: true,
   paddingBottom: true,
   paddingInline: true,
@@ -876,7 +896,6 @@ var cssShorthandLonghands = {
   paddingStart: true,
   paddingTop: true,
   paddingVertical: true,
-  position: true,
   right: true,
   start: true,
   top: true,
@@ -887,10 +906,9 @@ var cssShorthandLonghands = {
   insetInline: true,
   insetInlineEnd: true,
   insetInlineStart: true,
-  direction: true,
   shadowOffset: true,
   shadowRadius: true
-}, tokenCategories.color), tokenCategories.radius), tokenCategories.size), tokenCategories.radius), stylePropsTransform), stylePropsUnitless), isAndroid ? {
+}), tokenCategories.color), tokenCategories.radius), tokenCategories.size), stylePropsTransform), stylePropsUnitless), isAndroid ? {
   elevationAndroid: true
 } : {}), {
   boxShadow: true,
@@ -901,32 +919,19 @@ var cssShorthandLonghands = {
   // the actual RN 0.76+ prop name (backgroundImage expands to this on native)
   experimental_backgroundImage: true,
   // RN 0.76/0.77+ style props (New Architecture)
-  boxSizing: true,
-  mixBlendMode: true,
-  isolation: true,
   outline: true,
   outlineColor: true,
   outlineOffset: true,
-  outlineStyle: true,
   outlineWidth: true
-}), stylePropsFont = {
-  fontFamily: true,
+}), stylePropsFont = __spreadProps(__spreadValues({}, nonAnimatableFontProps), {
   fontSize: true,
-  fontStyle: true,
   fontWeight: true,
-  fontVariant: true,
   letterSpacing: true,
-  lineHeight: true,
-  textTransform: true
-}, stylePropsTextOnly = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, stylePropsFont), {
-  textAlign: true,
-  textDecorationLine: true,
-  textDecorationStyle: true
-}), textColors), {
+  lineHeight: true
+}), stylePropsTextOnly = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, stylePropsFont), nonAnimatableTextOnlyProps), textColors), {
   textShadow: true,
   textShadowOffset: true,
   textShadowRadius: true,
-  userSelect: true,
   verticalAlign: true
 }), stylePropsText = __spreadValues(__spreadValues({}, stylePropsView), stylePropsTextOnly), stylePropsAll = stylePropsText, validPseudoKeys = {
   enterStyle: true,
@@ -2999,43 +3004,43 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     if (!noSkip && keyInit in skipProps) return "continue";
     (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
     var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
-    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key4, val2, originalVal) {
-      var _parentStaticConfig_variants, isStyledContextProp = styledContext && key4 in styledContext;
+    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key5, val2, originalVal) {
+      var _parentStaticConfig_variants, isStyledContextProp = styledContext && key5 in styledContext;
       if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
-        viewProps[key4] = val2;
+        viewProps[key5] = val2;
         return;
       }
       if (false, val2 != null) {
-        if (key4 === "pointerEvents") {
-          viewProps[key4] = val2;
+        if (key5 === "pointerEvents") {
+          viewProps[key5] = val2;
           return;
         }
-        if (!isHOC && isValidStyleKey(key4, validStyles$1, accept) || isAndroid && key4 === "elevation") {
-          mergeStyle(styleState, key4, val2, 1, false, originalVal);
+        if (!isHOC && isValidStyleKey(key5, validStyles$1, accept) || isAndroid && key5 === "elevation") {
+          mergeStyle(styleState, key5, val2, 1, false, originalVal);
           return;
         }
-        if (isPseudo = key4 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key4), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key4 in variants, isMedia === "group" && (key4 = normalizeGroupKey(key4, groupContext)), (inlineProps == null ? void 0 : inlineProps.has(key4)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key4))) {
+        if (isPseudo = key5 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key5), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key5 in variants, isMedia === "group" && (key5 = normalizeGroupKey(key5, groupContext)), (inlineProps == null ? void 0 : inlineProps.has(key5)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key5))) {
           var _props_key;
-          viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
+          viewProps[key5] = (_props_key = props[key5]) !== null && _props_key !== void 0 ? _props_key : val2;
         }
         var shouldPassThrough2 = styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || (parentStaticConfig == null || (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]));
         if (shouldPassThrough2) {
-          passDownProp(viewProps, key4, val2, isMediaOrPseudo), false;
+          passDownProp(viewProps, key5, val2, isMediaOrPseudo), false;
           return;
         }
         if (isPseudo) {
           if (!val2) return;
-          var pseudoStyleObject = getSubStyle(styleState, key4, val2, styleProps.noClass && process.env.IS_STATIC !== "is_static");
+          var pseudoStyleObject = getSubStyle(styleState, key5, val2, styleProps.noClass && process.env.IS_STATIC !== "is_static");
           if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
             var _pseudos, _key;
-            if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key4] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") {
-              Object.assign(pseudos[key4], pseudoStyleObject);
+            if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key5] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") {
+              Object.assign(pseudos[key5], pseudoStyleObject);
               return;
             }
           }
-          var descriptor = pseudoDescriptors[key4], isEnter = key4 === "enterStyle", isExit = key4 === "exitStyle";
+          var descriptor = pseudoDescriptors[key5], isEnter = key5 === "enterStyle", isExit = key5 === "exitStyle";
           if (!descriptor) return;
-          var pseudoStyles, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, psuedoStyle, fullKey;
+          var pseudoStyles, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _iterator3, _step3, psuedoStyle, fullKey;
           if (shouldDoClasses && !isExit) ;
           if (!shouldDoClasses || isExit || isEnter) {
             var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled2 = componentState[descriptorKey] === false;
@@ -3049,7 +3054,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                 if (shouldMerge) {
                   if (process.env.IS_STATIC === "is_static") {
                     var _pseudos1, _key1;
-                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = _$val;
+                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key5] || (_pseudos1[_key1] = {}), pseudos[key5][pkey] = _$val;
                   }
                   mergeStyle(styleState, pkey, _$val, importance, false, pseudoOriginalValues == null ? void 0 : pseudoOriginalValues[pkey]);
                 }
@@ -3064,15 +3069,15 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
         }
         if (isMedia) {
           if (!val2) return;
-          var mediaKeyShort = key4.slice(isMedia == "theme" ? 7 : 1);
+          var mediaKeyShort = key5.slice(isMedia == "theme" ? 7 : 1);
           hasMedia || (hasMedia = true);
           var hasSpace = val2.space;
-          if ((hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && ((!hasMedia || typeof hasMedia == "boolean") && (hasMedia = /* @__PURE__ */ new Set()), hasMedia.add(mediaKeyShort)), isMedia === "platform" && !isActivePlatform(key4)) return;
+          if ((hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && ((!hasMedia || typeof hasMedia == "boolean") && (hasMedia = /* @__PURE__ */ new Set()), hasMedia.add(mediaKeyShort)), isMedia === "platform" && !isActivePlatform(key5)) return;
           var priority = mediaStylesSeen;
           mediaStylesSeen += 1;
           var shouldDoClassesForThisMedia = shouldDoClasses || isWeb && isMedia === "theme";
           if (shouldDoClassesForThisMedia) {
-            var mediaStyle = getSubStyle(styleState, key4, val2, false), mediaStyles = getCSSStylesAtomic(mediaStyle), _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
+            var mediaStyle = getSubStyle(styleState, key5, val2, false), mediaStyles = getCSSStylesAtomic(mediaStyle), _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
             try {
               for (var _iterator12 = mediaStyles[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
                 var style3 = _step12.value, property = style3[StyleObjectProperty], isSubStyle = property[0] === "$";
@@ -3092,11 +3097,11 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               }
             }
           } else {
-            let mergeMediaStyle2 = function(key5, val3, originalVal2) {
+            let mergeMediaStyle2 = function(key6, val3, originalVal2) {
               var _styleState4;
               (_styleState4 = styleState).style || (_styleState4.style = {});
-              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState[mediaKeyShort], importanceBump, debug, originalVal2);
-              didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
+              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key6, val3, mediaState[mediaKeyShort], importanceBump, debug, originalVal2);
+              didMerge && key6 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
             };
             var mergeMediaStyle = mergeMediaStyle2, isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
             if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
@@ -3104,7 +3109,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                 return;
               }
             }
-            var mediaStyle1 = getSubStyle(styleState, key4, val2, true), importanceBump = 0;
+            var mediaStyle1 = getSubStyle(styleState, key5, val2, true), importanceBump = 0;
             if (isThemeMedia) {
               if (isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
@@ -3169,7 +3174,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
         }
         if (!isVariant) {
           if (isStyledContextProp) return;
-          viewProps[key4] = val2;
+          viewProps[key5] = val2;
         }
       }
     }), false) ;
@@ -3215,8 +3220,8 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       fallbackProps
     } = styleProps;
     fallbackProps && (styleState.props = new Proxy(props, {
-      get(_2, key4, val2) {
-        return Reflect.has(props, key4) ? Reflect.get(props, key4) : Reflect.get(fallbackProps, key4);
+      get(_2, key5, val2) {
+        return Reflect.has(props, key5) ? Reflect.get(props, key5) : Reflect.get(fallbackProps, key5);
       }
     }));
   }
@@ -5691,6 +5696,9 @@ exports.mergeIfNotShallowEqual = mergeIfNotShallowEqual;
 exports.mergeProps = mergeProps;
 exports.mergeSlotStyleProps = mergeSlotStyleProps;
 exports.mutatedAutoVariables = mutatedAutoVariables;
+exports.nonAnimatableStyleProps = nonAnimatableStyleProps;
+exports.nonAnimatableWebTextProps = nonAnimatableWebTextProps;
+exports.nonAnimatableWebViewProps = nonAnimatableWebViewProps;
 exports.normalizeColor = normalizeColor;
 exports.normalizeStyle = normalizeStyle$1;
 exports.normalizeValueWithProperty = normalizeValueWithProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.21-1772323626103",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -79,17 +79,17 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/helpers": "2.0.0-rc.21",
-    "@tamagui/react-native-media-driver": "2.0.0-rc.21",
-    "@tamagui/react-native-use-pressable": "2.0.0-rc.21",
-    "@tamagui/use-element-layout": "2.0.0-rc.21",
-    "@tamagui/use-event": "2.0.0-rc.21",
-    "@tamagui/web": "2.0.0-rc.21"
+    "@tamagui/helpers": "2.0.0-rc.21-1772323626103",
+    "@tamagui/react-native-media-driver": "2.0.0-rc.21-1772323626103",
+    "@tamagui/react-native-use-pressable": "2.0.0-rc.21-1772323626103",
+    "@tamagui/use-element-layout": "2.0.0-rc.21-1772323626103",
+    "@tamagui/use-event": "2.0.0-rc.21-1772323626103",
+    "@tamagui/web": "2.0.0-rc.21-1772323626103"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.21",
-    "@tamagui/native-bundle": "2.0.0-rc.21",
-    "@tamagui/react-native-web-lite": "2.0.0-rc.21",
+    "@tamagui/build": "2.0.0-rc.21-1772323626103",
+    "@tamagui/native-bundle": "2.0.0-rc.21-1772323626103",
+    "@tamagui/react-native-web-lite": "2.0.0-rc.21-1772323626103",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": ">=19",