tamagui 1.89.5 → 1.89.7

package/dist/native.js

@@ -3909,7 +3909,7 @@ var require_getSplitStyles_native = __commonJS({
       return (staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles))[key] || ((_a = staticConfig.acceptTokens) == null ? void 0 : _a[key]);
     }
     var getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) => {
-      var _a, _b, _c, _e, _f, _g, _h;
+      var _a, _b, _c, _f, _g, _h;
       conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       let { shorthands } = conf, {
         isHOC,
@@ -3921,7 +3921,7 @@ var require_getSplitStyles_native = __commonJS({
         inlineWhenUnflattened,
         parentStaticConfig,
         acceptsClassName
-      } = staticConfig, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, style = {}, className = props.className || "", mediaStylesSeen = 0, styleState = {
+      } = staticConfig, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, styleState = {
         curProps: {},
         classNames,
         conf,
@@ -3929,7 +3929,7 @@ var require_getSplitStyles_native = __commonJS({
         styleProps,
         componentState,
         staticConfig,
-        style,
+        style: null,
         theme,
         usedKeys,
         viewProps,
@@ -3985,7 +3985,7 @@ var require_getSplitStyles_native = __commonJS({
           continue;
         }
         if (!isValidStyleKeyInit && keyInit.startsWith("_style") && (0, import_isObj.isObj)(valInit)) {
-          Object.assign(styleState.style, valInit);
+          styleState.style || (styleState.style = {}), Object.assign(styleState.style, valInit);
           continue;
         }
         if (0)
@@ -4018,7 +4018,7 @@ var require_getSplitStyles_native = __commonJS({
         })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !isVariant) || !styleProps.noSkip && keyInit in import_skipProps.skipProps)
           continue;
         if ((isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit), isValidStyleKeyInit && !variants && valInit !== "unset" && (valInitType === "number" || valInitType === "string" && valInit[0] !== "$")) {
-          style[keyInit] = valInit;
+          styleState.style || (styleState.style = {}), styleState.style[keyInit] = valInit;
           continue;
         }
         let avoidPropMap = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
@@ -4045,7 +4045,7 @@ var require_getSplitStyles_native = __commonJS({
             }), (0, import_log.log)("expanded", expanded, `
 usedKeys`, { ...usedKeys }, `
 current`, {
-              ...style
+              ...styleState.style
             }));
           } catch {
           }
@@ -4091,7 +4091,7 @@ current`, {
                   let val2 = pseudoStyleObject[pkey];
                   if (isDisabled) {
                     let defaultValues = animatableDefaults[pkey];
-                    defaultValues != null && !(pkey in usedKeys) && !(pkey in styleState.style) && mergeStyle(styleState, pkey, defaultValues);
+                    defaultValues != null && !(pkey in usedKeys) && (!styleState.style || !(pkey in styleState.style)) && mergeStyle(styleState, pkey, defaultValues);
                   } else {
                     let curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
                     shouldMerge && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
@@ -4155,16 +4155,16 @@ current`, {
                 }
                 let mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle, debug), priority = mediaStylesSeen;
                 mediaStylesSeen += 1;
-                for (let style2 of mediaStyles) {
+                for (let style of mediaStyles) {
                   let out = (0, import_createMediaStyle.createMediaStyle)(
-                    style2,
+                    style,
                     mediaKeyShort,
                     import_useMedia.mediaQueryConfig,
                     isMedia,
                     !1,
                     priority
                   );
-                  process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out), `${style2.property}${PROP_SPLIT}${mediaKeyShort}` in usedKeys || out.identifier;
+                  process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out), `${style.property}${PROP_SPLIT}${mediaKeyShort}` in usedKeys || out.identifier;
                 }
               } else {
                 let isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group";
@@ -4204,8 +4204,8 @@ current`, {
                     space = valInit.space;
                     continue;
                   }
-                  (0, import_useMedia.mergeMediaByImportance)(
-                    style,
+                  styleState.style || (styleState.style = {}), (0, import_useMedia.mergeMediaByImportance)(
+                    styleState.style,
                     mediaKeyShort,
                     subKey,
                     mediaStyle[subKey],
@@ -4234,7 +4234,7 @@ current`, {
         }
         if (process.env.NODE_ENV === "development" && debug === "verbose") {
           try {
-            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", { ...style }), (0, import_log.log)("transforms", { ...transforms }), (0, import_log.log)("viewProps", { ...viewProps });
+            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", { ...styleState.style }), (0, import_log.log)("transforms", { ...transforms }), (0, import_log.log)("viewProps", { ...viewProps });
           } catch {
           }
           console.groupEnd();
@@ -4244,20 +4244,19 @@ current`, {
         if (isHOC)
           viewProps.style = props.style;
         else
-          for (let style2 of [].concat(props.style))
-            style2 && (style2.$$css ? Object.assign(styleState.classNames, style2) : Object.assign(styleState.style, style2));
-      if (styleProps.noNormalize !== !1 && ((0, import_expandStyles.fixStyles)(style), import_constants4.isWeb && !staticConfig.isReactNative && (0, import_getStylesAtomic.styleToCSS)(style), styleState.transforms && Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
-        mergeTransform(style, key, val, !0);
-      }), parentSplitStyles && !shouldDoClasses))
+          for (let style of [].concat(props.style))
+            style && (style.$$css ? Object.assign(styleState.classNames, style) : (styleState.style || (styleState.style = {}), Object.assign(styleState.style, style)));
+      if (styleProps.noNormalize !== !1 && (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants4.isWeb && !staticConfig.isReactNative && (0, import_getStylesAtomic.styleToCSS)(styleState.style)), styleState.transforms && (styleState.style || (styleState.style = {}), Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
+        mergeTransform(styleState.style, key, val, !0);
+      })), parentSplitStyles && !shouldDoClasses))
         for (let key in parentSplitStyles.style)
-          key in classNames || key in style || (style[key] = parentSplitStyles.style[key]);
+          key in classNames || styleState.style && key in styleState.style || (styleState.style || (styleState.style = {}), styleState.style[key] = parentSplitStyles.style[key]);
       let result = {
         space,
         hasMedia,
         fontFamily: styleState.fontFamily,
         viewProps,
-        // @ts-expect-error
-        style,
+        style: styleState.style,
         pseudos,
         classNames,
         rulesToInsert,
@@ -4265,18 +4264,23 @@ current`, {
         pseudoGroups,
         mediaGroups
       };
-      if (style.fontFamily) {
-        let faceInfo = (_e = (0, import_config.getFont)(style.fontFamily)) == null ? void 0 : _e.face;
-        if (faceInfo) {
-          let overrideFace = (_g = (_f = faceInfo[style.fontWeight]) == null ? void 0 : _f[style.fontStyle || "normal"]) == null ? void 0 : _g.val;
-          overrideFace && (style.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style.fontWeight, delete style.fontStyle);
+      {
+        let style = styleState.style;
+        if (style != null && style.fontFamily) {
+          let faceInfo = (_f = (0, import_config.getFont)(style.fontFamily)) == null ? void 0 : _f.face;
+          if (faceInfo) {
+            let overrideFace = (_h = (_g = faceInfo[style.fontWeight]) == null ? void 0 : _g[style.fontStyle || "normal"]) == null ? void 0 : _h.val;
+            overrideFace && (style.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style.fontWeight, delete style.fontStyle);
+          }
+          process.env.NODE_ENV === "development" && debug && debug !== "profile" && (0, import_log.log)(`Found fontFamily native: ${style.fontFamily}`, faceInfo);
         }
-        process.env.NODE_ENV === "development" && debug && debug !== "profile" && (0, import_log.log)(`Found fontFamily native: ${style.fontFamily}`, faceInfo);
       }
-      let fontFamily = isText || isInput ? styleState.fontFamily || ((_h = staticConfig.defaultProps) == null ? void 0 : _h.fontFamily) : null;
-      fontFamily && fontFamily[0] === "$" && (fontFamily = fontFamily.slice(1));
-      let fontFamilyClassName = fontFamily ? `font_${fontFamily}` : "", asChild = props.asChild;
-      if (asChild === "except-style" || asChild === "except-style-web" || styleProps.noExpand || (viewProps.style = style), process.env.NODE_ENV === "development" && debug === "verbose" && import_isDevTools.isDevTools) {
+      let asChild = props.asChild;
+      if (!(asChild === "except-style" || asChild === "except-style-web")) {
+        let style = styleState.style;
+        style && !styleProps.noMergeStyle && (viewProps.style = style);
+      }
+      if (process.env.NODE_ENV === "development" && debug === "verbose" && import_isDevTools.isDevTools) {
         console.groupCollapsed("\u{1F539} getSplitStyles ===>");
         try {
           let logs = {
@@ -4285,7 +4289,6 @@ current`, {
             componentState,
             transforms,
             viewProps,
-            viewPropsOrder: Object.keys(viewProps),
             rulesToInsert,
             parentSplitStyles
           };
@@ -4298,14 +4301,14 @@ current`, {
       return result;
     };
     function mergeStyle(styleState, key, val, disableNormalize = !1) {
-      let { classNames, viewProps, style, usedKeys, styleProps } = styleState;
+      let { classNames, viewProps, usedKeys, styleProps } = styleState;
       if (import_constants4.isWeb && (val == null ? void 0 : val[0]) === "_")
         classNames[key] = val, usedKeys[key] || (usedKeys[key] = 1);
       else if (key in import_helpers.stylePropsTransform)
         styleState.transforms || (styleState.transforms = {}), styleState.transforms[key] = val;
       else {
         let out = import_constants4.isWeb && !disableNormalize && !styleProps.noNormalize ? (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key) : val;
-        key in import_helpers.validStylesOnBaseProps ? viewProps[key] = out : style[key] = out;
+        key in import_helpers.validStylesOnBaseProps ? viewProps[key] = out : (styleState.style || (styleState.style = {}), styleState.style[key] = out);
       }
     }
     var getSubStyle = (styleState, subKey, styleIn, avoidMergeTransform) => {
@@ -4852,7 +4855,7 @@ var require_createComponent_native = __commonJS({
           elementType,
           debugProp
         );
-        props.group && props.untilMeasured === "hide" && !curState.hasMeasured && (splitStyles.style.opacity = 0), process.env.NODE_ENV === "development" && time && time`split-styles`, curState.isListeningToTheme = splitStyles.dynamicThemeAccess;
+        props.group && props.untilMeasured === "hide" && !curState.hasMeasured && (splitStyles.style || (splitStyles.style = {}), splitStyles.style.opacity = 0), process.env.NODE_ENV === "development" && time && time`split-styles`, curState.isListeningToTheme = splitStyles.dynamicThemeAccess;
         let isMediaArray = splitStyles.hasMedia && Array.isArray(splitStyles.hasMedia), shouldListenForMedia = (0, import_createVariable.didGetVariableValue)() || isMediaArray || noClassNames && splitStyles.hasMedia === !0, mediaListeningKeys = isMediaArray ? splitStyles.hasMedia : null;
         (0, import_useMedia.setMediaShouldUpdate)(stateRef, {
           enabled: shouldListenForMedia,
@@ -4901,7 +4904,7 @@ var require_createComponent_native = __commonJS({
           let animations = useAnimations({
             props: propsWithAnimation,
             // if hydrating, send empty style
-            style: splitStylesStyle,
+            style: splitStylesStyle || {},
             presence,
             componentState: state,
             styleProps,
@@ -5058,6 +5061,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
         let ResetPresence = (_m = config == null ? void 0 : config.animations) == null ? void 0 : _m.ResetPresence;
         ResetPresence && willBeAnimated && (hasEnterStyle || presenceState) && content && typeof content != "string" && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ResetPresence, { children: content })), process.env.NODE_ENV === "development" && time && time`create-element`;
         let groupState = curState.group, subGroupContext = (0, import_react2.useMemo)(() => {
+          var _a3, _b2;
           if (!(!groupState || !groupName))
             return groupState.listeners.clear(), {
               ...componentContext.groups,
@@ -5069,8 +5073,8 @@ If you meant to do this, you can disable this warning - either change untilMeasu
                   // capture just initial width and height if they exist
                   // will have top, left, width, height (not x, y)
                   layout: {
-                    width: fromPx(splitStyles.style.width),
-                    height: fromPx(splitStyles.style.height)
+                    width: fromPx((_a3 = splitStyles.style) == null ? void 0 : _a3.width),
+                    height: fromPx((_b2 = splitStyles.style) == null ? void 0 : _b2.height)
                   }
                 }
               },
@@ -6272,7 +6276,7 @@ var require_useProps_native = __commonJS({
       };
     }
     function useStyle2(props, opts) {
-      return usePropsAndStyle2(props, opts)[1];
+      return usePropsAndStyle2(props, opts)[1] || {};
     }
     function usePropsAndStyle2(props, opts) {
       var _a, _b;
@@ -6288,6 +6292,7 @@ var require_useProps_native = __commonJS({
           isAnimated: !1,
           mediaState: media,
           noSkip: !0,
+          noMergeStyle: !0,
           noClassNames: !0,
           resolveValues: "auto",
           ...opts
@@ -6295,7 +6300,7 @@ var require_useProps_native = __commonJS({
         null,
         componentContext
       );
-      return [splitStyles.viewProps, splitStyles.style, theme, media];
+      return [splitStyles.viewProps, splitStyles.style || {}, theme, media];
     }
   }
 });