@tamagui/core 1.133.0 → 1.133.1

package/dist/native.js

@@ -2555,10 +2555,11 @@ var require_mergeProps_native = __commonJS({
     };
     function mergeProp(out, defaultProps, props, key) {
       var val = props[key];
-      defaultProps && key in defaultProps && (key in import_pseudoDescriptors.pseudoDescriptors || key[0] === "$") && (val = {
-        ...defaultProps[key],
-        ...val
-      }), out[key] = val;
+      if (defaultProps && key in defaultProps && (key in import_pseudoDescriptors.pseudoDescriptors || key[0] === "$") && val && typeof val == "object") {
+        var defaultVal = defaultProps[key];
+        defaultVal && typeof defaultVal == "object" && (val = mergeProps(defaultVal, val));
+      }
+      out[key] = val;
     }
   }
 });
@@ -5428,7 +5429,7 @@ var require_getSplitStyles_native = __commonJS({
         (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
         var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
         if ((0, import_propMapper.propMapper)(keyInit, valInit, styleState, disablePropMap, function(key4, val2) {
-          var _parentStaticConfig_variants, isStyledContextProp = styleProps.styledContext && key4 in styleProps.styledContext;
+          var _parentStaticConfig_variants, isStyledContextProp = styledContext && key4 in styledContext;
           if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
             viewProps[key4] = val2;
             return;
@@ -5706,7 +5707,7 @@ var require_getSplitStyles_native = __commonJS({
           ...theme
         }
       }));
-      var { asChild } = props, { accept } = staticConfig, { noSkip, disableExpandShorthands, noExpand } = styleProps, { webContainerType } = conf.settings, parentVariants = parentStaticConfig == null ? void 0 : parentStaticConfig.variants;
+      var { asChild } = props, { accept } = staticConfig, { noSkip, disableExpandShorthands, noExpand, styledContext } = styleProps, { webContainerType } = conf.settings, parentVariants = parentStaticConfig == null ? void 0 : parentStaticConfig.variants;
       for (var keyOg in props) _loop(keyOg);
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-propsend`;
       var avoidNormalize = styleProps.noNormalize === !1;
@@ -7440,7 +7441,7 @@ var require_createComponent_native = __commonJS({
           var _propsIn_datatestrenders, _current, _;
           (_ = (_propsIn_datatestrenders = propsIn["data-test-renders"])[_current = "current"]) !== null && _ !== void 0 || (_propsIn_datatestrenders[_current] = 0), propsIn["data-test-renders"].current += 1;
         }
-        var { context, isReactNative } = staticConfig, styledContextValue = context ? import_react3.default.useContext(context) : void 0, overriddenContextProps = null, debugProp = propsIn.debug;
+        var { context, isReactNative } = staticConfig, debugProp = propsIn.debug, styledContextValue = context ? import_react3.default.useContext(context) : void 0, overriddenContextProps = null;
         if (0)
           var timer;
         process.env.NODE_ENV === "development" && time2 && time2`non-tamagui time (ignore)`;
@@ -7576,7 +7577,7 @@ var require_createComponent_native = __commonJS({
           isExiting,
           isAnimated,
           willBeAnimated,
-          styledContext: context
+          styledContext: styledContextValue
         }, themeName = (themeState == null ? void 0 : themeState.name) || "";
         process.env.NODE_ENV === "development" && time2 && time2`split-styles-prepare`;
         var splitStyles = (0, import_getSplitStyles.useSplitStyles)(props, staticConfig, theme, themeName, state, styleProps, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp), isPassthrough = !splitStyles, groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;