tamagui 1.110.1 → 1.110.3

package/dist/native.js

@@ -5917,6 +5917,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":
@@ -8390,7 +8391,10 @@ var require_getSplitStyles_native = __commonJS({
             // this fixes issues where style prop got merged with wrong priority
             !isHOC && (isValidStyleKey(key, staticConfig) || import_constants4.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];
@@ -9444,7 +9448,7 @@ var require_Slot_native = __commonJS({
       for (i = 0; i < sourceKeys.length; i++) key = sourceKeys[i], !(excluded.indexOf(key) >= 0) && (target[key] = source[key]);
       return target;
     }
-    var is19 = import_react4.version.startsWith("19."), Slot = /* @__PURE__ */ (0, import_react4.forwardRef)(function(props, forwardedRef) {
+    var is19 = import_react4.version.startsWith("19."), Slot = /* @__PURE__ */ (0, import_react4.memo)(/* @__PURE__ */ (0, import_react4.forwardRef)(function(props, forwardedRef) {
       var children = props.children, slotProps = _object_without_properties5(props, [
         "children"
       ]);
@@ -9455,9 +9459,7 @@ var require_Slot_native = __commonJS({
         }));
       }
       return import_react4.Children.count(children) > 1 ? import_react4.Children.only(null) : null;
-    });
-    Slot.displayName = "Slot";
-    var Slottable = function(param) {
+    })), Slottable = function(param) {
       var children = param.children;
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, {
         children
@@ -10018,7 +10020,10 @@ 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]];
-            propVal === void 0 ? contextValue && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = contextValue[key]) : (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal);
+            if (propVal === void 0) {
+              var val = contextValue == null ? void 0 : contextValue[key];
+              val !== void 0 && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = val);
+            } else overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal;
           }
         }
         var curDefaultProps = styledContextProps ? _object_spread9({}, defaultProps, styledContextProps) : defaultProps, props = propsIn;
@@ -10102,7 +10107,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;
@@ -17246,23 +17252,15 @@ var require_index_native22 = __commonJS({
     }
     var getFontSized2 = function() {
       var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "$true", _ref = arguments.length > 1 ? arguments[1] : void 0, font = _ref.font, fontFamily = _ref.fontFamily, props = _ref.props, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
-      if (font) {
-        var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken], fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken], letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken], textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken], _props_fontStyle, fontStyle = (_props_fontStyle = props.fontStyle) !== null && _props_fontStyle !== void 0 ? _props_fontStyle : (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken], _props_color, color = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken], style = {
-          color,
-          fontStyle,
-          textTransform,
-          fontFamily,
-          fontWeight,
-          letterSpacing,
-          fontSize,
-          lineHeight
-        };
-        return process.env.NODE_ENV === "development" && props.debug && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken), console.info({
-          style,
-          props,
-          font
-        }), console.groupEnd()), style;
-      }
+      if (!font) return {
+        fontSize: sizeTokenIn
+      };
+      var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, style = {}, fontSize = font.size[sizeToken], lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken], fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken], letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken], textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken], _props_fontStyle, fontStyle = (_props_fontStyle = props.fontStyle) !== null && _props_fontStyle !== void 0 ? _props_fontStyle : (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken], _props_color, color = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken];
+      return fontStyle && (style.fontStyle = fontStyle), textTransform && (style.textTransform = textTransform), fontFamily && (style.fontFamily = fontFamily), fontWeight && (style.fontWeight = fontWeight), letterSpacing && (style.letterSpacing = letterSpacing), fontSize && (style.fontSize = fontSize), lineHeight && (style.lineHeight = lineHeight), color && (style.color = color), process.env.NODE_ENV === "development" && props.debug && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken), console.info({
+        style,
+        props,
+        font
+      }), console.groupEnd()), style;
     }, cache = /* @__PURE__ */ new WeakMap();
     function getDefaultSizeToken(font) {
       if (((typeof font > "u" ? "undefined" : _type_of3(font)) > "u" ? "undefined" : _type_of1(font)) === "object" && cache.has(font)) return cache.get(font);
@@ -17341,8 +17339,8 @@ var require_SizableText_native = __commonJS({
       }
     });
     SizableText2.staticConfig.variants.fontFamily = {
-      "...": function(_, extras) {
-        var size4 = extras.props.size || "$true";
+      "...": function(_val, extras) {
+        var sizeProp = extras.props.size, fontSizeProp = extras.props.fontSize, size4 = sizeProp === "$true" && fontSizeProp ? fontSizeProp : extras.props.size || "$true";
         return (0, import_get_font_sized2.getFontSized)(size4, extras);
       }
     };