@tamagui/core 1.110.0 → 1.110.2

package/dist/native.js

@@ -5674,6 +5674,7 @@ var require_normalize_color = __commonJS({
       switch (name) {
         case "transparent":
           return 0;
+        // http://www.w3.org/TR/css3-color/#svg-color
         case "aliceblue":
           return 4042850303;
         case "antiquewhite":
@@ -8147,7 +8148,10 @@ var require_getSplitStyles_native = __commonJS({
             // this fixes issues where style prop got merged with wrong priority
             !isHOC && (isValidStyleKey(key, staticConfig) || import_constants.isAndroid && key === "elevation")
           ) return mergeStyle(styleState, key, val), "continue";
-          isVariant || (viewProps[key] = val);
+          if (!isVariant) {
+            if (styleProps.styledContextProps && key in styleProps.styledContextProps) return "continue";
+            viewProps[key] = val;
+          }
         }, keyInit = keyOg, valInit = props[keyInit];
         if (accept) {
           var accepted = accept[keyInit];
@@ -9775,12 +9779,7 @@ var require_createComponent_native = __commonJS({
           var inverseShorthands = (0, import_config.getConfig)().inverseShorthands;
           for (var key in context.props) {
             var _propsIn_key, _ref, _ref1, propVal = (_ref1 = (_ref = (_propsIn_key = propsIn[key]) !== null && _propsIn_key !== void 0 ? _propsIn_key : propsIn[inverseShorthands[key]]) !== null && _ref !== void 0 ? _ref : defaultProps == null ? void 0 : defaultProps[key]) !== null && _ref1 !== void 0 ? _ref1 : defaultProps == null ? void 0 : defaultProps[inverseShorthands[key]];
-            if (propVal === void 0) {
-              if (contextValue) {
-                var isValidValue = key in _$validStyles || key in variants;
-                isValidValue && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = contextValue[key]);
-              }
-            } else overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal;
+            propVal === void 0 ? contextValue && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = contextValue[key]) : (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal);
           }
         }
         var curDefaultProps = styledContextProps ? _object_spread2({}, defaultProps, styledContextProps) : defaultProps, props = propsIn;
@@ -9864,7 +9863,8 @@ var require_createComponent_native = __commonJS({
           resolveValues,
           isExiting,
           isAnimated,
-          willBeAnimated
+          willBeAnimated,
+          styledContextProps
         }, splitStyles = (0, import_getSplitStyles.useSplitStyles)(props, staticConfig, theme, (themeState == null || (_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) || "", state, styleProps, null, componentContext, elementType, debugProp);
         if (props.group && props.untilMeasured === "hide" && !curStateRef.hasMeasured) {
           var _splitStyles;