@tamagui/core 1.144.2 → 1.144.4

package/dist/native.cjs

@@ -9010,6 +9010,26 @@ function px(value) {
 function getOppositeScheme(scheme) {
   return scheme === "dark" ? "light" : "dark";
 }
+var colorStyleKeys = {
+  backgroundColor: true,
+  borderColor: true,
+  borderTopColor: true,
+  borderRightColor: true,
+  borderBottomColor: true,
+  borderLeftColor: true,
+  borderBlockColor: true,
+  borderBlockEndColor: true,
+  borderBlockStartColor: true,
+  color: true,
+  shadowColor: true,
+  textDecorationColor: true,
+  textShadowColor: true,
+  tintColor: true,
+  outlineColor: true
+};
+function isColorStyleKey(key) {
+  return colorStyleKeys[key] === true;
+}
 function getDynamicVal(param) {
   var {
     scheme,
@@ -9422,7 +9442,7 @@ var defaultOffset = {
 };
 var normalizeColor = function(color, opacity) {
   if (color) {
-    if (color[0] === "$") return color;
+    if (typeof color != "string" || color[0] === "$") return color;
     if (color.startsWith("var(")) {
       if (typeof opacity == "number" && opacity < 1) return `color-mix(in srgb, ${color} ${opacity * 100}%, transparent)`;
     } else {
@@ -9435,8 +9455,10 @@ var normalizeColor = function(color, opacity) {
     return color;
   }
 }, getRgba = function(color) {
-  var colorNum = normalizeCSSColor(color);
-  if (colorNum != null) return rgba(colorNum);
+  if (typeof color == "string") {
+    var colorNum = normalizeCSSColor(color);
+    if (colorNum != null) return rgba(colorNum);
+  }
 };
 function normalizeShadow(param) {
   var {
@@ -10135,19 +10157,27 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
             }
             var mediaStyle1 = getSubStyle(styleState, key4, val2, true), importanceBump = 0;
             if (isThemeMedia) {
-              if (dynamicThemeAccess = true, isIos && getSetting("fastSchemeChange")) {
+              if (isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
                 (_styleState3 = styleState).style || (_styleState3.style = {});
-                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1);
+                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1), isCurrentScheme = themeName === scheme || themeName.startsWith(scheme);
                 for (var subKey1 in mediaStyle1) {
-                  var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), oppositeVal = extractValueFromDynamic(styleState.style[subKey1], oppositeScheme);
-                  mediaStyle1[subKey1] = getDynamicVal({
-                    scheme,
-                    val: _$val1,
-                    oppositeVal
-                  }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
+                  var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), existing = styleState.style[subKey1];
+                  if (!isColorStyleKey(subKey1)) {
+                    dynamicThemeAccess = true, isCurrentScheme ? mediaStyle1[subKey1] = _$val1 : delete mediaStyle1[subKey1];
+                    continue;
+                  }
+                  if (existing == null ? void 0 : existing.dynamic) existing.dynamic[scheme] = _$val1, mediaStyle1[subKey1] = existing;
+                  else {
+                    var oppositeVal = extractValueFromDynamic(existing, oppositeScheme);
+                    mediaStyle1[subKey1] = getDynamicVal({
+                      scheme,
+                      val: _$val1,
+                      oppositeVal
+                    }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
+                  }
                 }
-              } else if (!(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
+              } else if (dynamicThemeAccess = true, !(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
             } else if (isGroupMedia) {
               var _groupContext_groupName, _componentState_group, groupInfo = getGroupPropParts(mediaKeyShort), groupName = groupInfo.name, groupState = groupContext == null || (_groupContext_groupName = groupContext[groupName]) === null || _groupContext_groupName === void 0 ? void 0 : _groupContext_groupName.state, groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media;
               if (!groupState) {
@@ -10212,7 +10242,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     inlineWhenUnflattened,
     parentStaticConfig,
     acceptsClassName
-  } = staticConfig, viewProps = {}, mediaState = styleProps2.mediaState || exports.mediaState, shouldDoClasses = acceptsClassName && isWeb, rulesToInsert = void 0, classNames = {}, pseudos = null, space = props.space, hasMedia = false, dynamicThemeAccess, pseudoGroups, mediaGroups;
+  } = staticConfig, viewProps = {}, mediaState = styleProps2.mediaState || exports.mediaState, shouldDoClasses = acceptsClassName && isWeb, rulesToInsert = void 0, classNames = {}, space = props.space, pseudos = null, hasMedia = false, dynamicThemeAccess, pseudoGroups, mediaGroups;
   props.className || "";
   var mediaStylesSeen = 0, validStyles$1 = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? stylePropsText : validStyles);
   var styleState = {

package/dist/test.native.cjs

@@ -1162,6 +1162,26 @@ function px(value) {
 function getOppositeScheme(scheme) {
   return scheme === "dark" ? "light" : "dark";
 }
+var colorStyleKeys = {
+  backgroundColor: true,
+  borderColor: true,
+  borderTopColor: true,
+  borderRightColor: true,
+  borderBottomColor: true,
+  borderLeftColor: true,
+  borderBlockColor: true,
+  borderBlockEndColor: true,
+  borderBlockStartColor: true,
+  color: true,
+  shadowColor: true,
+  textDecorationColor: true,
+  textShadowColor: true,
+  tintColor: true,
+  outlineColor: true
+};
+function isColorStyleKey(key) {
+  return colorStyleKeys[key] === true;
+}
 function getDynamicVal(param) {
   var {
     scheme,
@@ -2115,7 +2135,7 @@ function rgba(colorInt) {
 }
 var normalizeColor = function(color, opacity) {
   if (color) {
-    if (color[0] === "$") return color;
+    if (typeof color != "string" || color[0] === "$") return color;
     if (color.startsWith("var(")) {
       if (typeof opacity == "number" && opacity < 1) return `color-mix(in srgb, ${color} ${opacity * 100}%, transparent)`;
     } else {
@@ -2128,8 +2148,10 @@ var normalizeColor = function(color, opacity) {
     return color;
   }
 }, getRgba = function(color) {
-  var colorNum = normalizeCSSColor(color);
-  if (colorNum != null) return rgba(colorNum);
+  if (typeof color == "string") {
+    var colorNum = normalizeCSSColor(color);
+    if (colorNum != null) return rgba(colorNum);
+  }
 };
 function normalizeShadow(param) {
   var {
@@ -2830,19 +2852,27 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
             }
             var mediaStyle1 = getSubStyle(styleState, key4, val2, true), importanceBump = 0;
             if (isThemeMedia) {
-              if (dynamicThemeAccess = true, isIos && getSetting("fastSchemeChange")) {
+              if (isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
                 (_styleState3 = styleState).style || (_styleState3.style = {});
-                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1);
+                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1), isCurrentScheme = themeName === scheme || themeName.startsWith(scheme);
                 for (var subKey1 in mediaStyle1) {
-                  var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), oppositeVal = extractValueFromDynamic(styleState.style[subKey1], oppositeScheme);
-                  mediaStyle1[subKey1] = getDynamicVal({
-                    scheme,
-                    val: _$val1,
-                    oppositeVal
-                  }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
+                  var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), existing = styleState.style[subKey1];
+                  if (!isColorStyleKey(subKey1)) {
+                    dynamicThemeAccess = true, isCurrentScheme ? mediaStyle1[subKey1] = _$val1 : delete mediaStyle1[subKey1];
+                    continue;
+                  }
+                  if (existing == null ? void 0 : existing.dynamic) existing.dynamic[scheme] = _$val1, mediaStyle1[subKey1] = existing;
+                  else {
+                    var oppositeVal = extractValueFromDynamic(existing, oppositeScheme);
+                    mediaStyle1[subKey1] = getDynamicVal({
+                      scheme,
+                      val: _$val1,
+                      oppositeVal
+                    }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
+                  }
                 }
-              } else if (!(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
+              } else if (dynamicThemeAccess = true, !(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
             } else if (isGroupMedia) {
               var _groupContext_groupName, _componentState_group, groupInfo = getGroupPropParts(mediaKeyShort), groupName = groupInfo.name, groupState = groupContext == null || (_groupContext_groupName = groupContext[groupName]) === null || _groupContext_groupName === void 0 ? void 0 : _groupContext_groupName.state, groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media;
               if (!groupState) {
@@ -2907,7 +2937,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     inlineWhenUnflattened,
     parentStaticConfig,
     acceptsClassName
-  } = staticConfig, viewProps = {}, mediaState = styleProps.mediaState || exports.mediaState, shouldDoClasses = acceptsClassName && isWeb, rulesToInsert = void 0, classNames = {}, pseudos = null, space = props.space, hasMedia = false, dynamicThemeAccess, pseudoGroups, mediaGroups;
+  } = staticConfig, viewProps = {}, mediaState = styleProps.mediaState || exports.mediaState, shouldDoClasses = acceptsClassName && isWeb, rulesToInsert = void 0, classNames = {}, space = props.space, pseudos = null, hasMedia = false, dynamicThemeAccess, pseudoGroups, mediaGroups;
   props.className || "";
   var mediaStylesSeen = 0, validStyles$1 = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? stylePropsText : validStyles);
   var styleState = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.144.2",
+  "version": "1.144.4",
   "type": "module",
   "source": "src/index.tsx",
   "main": "dist/cjs",
@@ -33,18 +33,18 @@
     "native-test.d.ts"
   ],
   "dependencies": {
-    "@tamagui/helpers": "1.144.2",
-    "@tamagui/react-native-media-driver": "1.144.2",
-    "@tamagui/react-native-use-pressable": "1.144.2",
-    "@tamagui/react-native-use-responder-events": "1.144.2",
-    "@tamagui/use-element-layout": "1.144.2",
-    "@tamagui/use-event": "1.144.2",
-    "@tamagui/web": "1.144.2"
+    "@tamagui/helpers": "1.144.4",
+    "@tamagui/react-native-media-driver": "1.144.4",
+    "@tamagui/react-native-use-pressable": "1.144.4",
+    "@tamagui/react-native-use-responder-events": "1.144.4",
+    "@tamagui/use-element-layout": "1.144.4",
+    "@tamagui/use-event": "1.144.4",
+    "@tamagui/web": "1.144.4"
   },
   "devDependencies": {
-    "@tamagui/build": "1.144.2",
-    "@tamagui/native-bundle": "1.144.2",
-    "@tamagui/react-native-web-lite": "1.144.2",
+    "@tamagui/build": "1.144.4",
+    "@tamagui/native-bundle": "1.144.4",
+    "@tamagui/react-native-web-lite": "1.144.4",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",