tamagui 1.89.3 → 1.89.5

package/dist/native.js

@@ -619,9 +619,9 @@ var require_index_native6 = __commonJS({
   }
 });
 
-// ../helpers/dist/cjs/native.js
-var require_native = __commonJS({
-  "../helpers/dist/cjs/native.js"(exports2, module2) {
+// ../helpers/dist/cjs/shouldRenderNativePlatform.native.js
+var require_shouldRenderNativePlatform_native = __commonJS({
+  "../helpers/dist/cjs/shouldRenderNativePlatform.native.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
       for (var name in all)
@@ -631,11 +631,11 @@ var require_native = __commonJS({
         for (let key of __getOwnPropNames2(from))
           !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
       return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), native_exports = {};
-    __export2(native_exports, {
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), shouldRenderNativePlatform_exports = {};
+    __export2(shouldRenderNativePlatform_exports, {
       shouldRenderNativePlatform: () => shouldRenderNativePlatform
     });
-    module2.exports = __toCommonJS2(native_exports);
+    module2.exports = __toCommonJS2(shouldRenderNativePlatform_exports);
     var import_constants4 = require_index_native6(), ALL_PLATFORMS = ["web", "android", "ios"];
     function shouldRenderNativePlatform(nativeProp) {
       if (!nativeProp)
@@ -935,7 +935,7 @@ var require_index_native7 = __commonJS({
     __reExport2(src_exports2, require_composeEventHandlers_native(), module2.exports);
     __reExport2(src_exports2, require_concatClassName_native(), module2.exports);
     __reExport2(src_exports2, require_types_native2(), module2.exports);
-    __reExport2(src_exports2, require_native(), module2.exports);
+    __reExport2(src_exports2, require_shouldRenderNativePlatform_native(), module2.exports);
     __reExport2(src_exports2, require_validStyleProps_native(), module2.exports);
     __reExport2(src_exports2, require_withStaticProperties_native(), module2.exports);
   }
@@ -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;
+      var _a, _b, _c, _e, _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,
@@ -4273,7 +4273,10 @@ current`, {
         }
         process.env.NODE_ENV === "development" && debug && debug !== "profile" && (0, import_log.log)(`Found fontFamily native: ${style.fontFamily}`, faceInfo);
       }
-      if (className && (classNames.className = className), process.env.NODE_ENV === "development" && debug === "verbose" && import_isDevTools.isDevTools) {
+      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) {
         console.groupCollapsed("\u{1F539} getSplitStyles ===>");
         try {
           let logs = {
@@ -4765,7 +4768,7 @@ var require_createComponent_native = __commonJS({
         // disableClassName="until-hydrated" to be more straightforward
         // see issue if not, Button sets disableClassName to true <Button animation="" /> with
         // the react-native driver errors because it tries to animate var(--color) to rbga(..)
-        propsIn.disableClassName && isHydrated), shouldForcePseudo = !!propsIn.forceStyle, noClassNames = shouldAvoidClasses || shouldForcePseudo, groupName = props.group, groupClassName = groupName ? `t_group_${props.group}` : "";
+        propsIn.disableClassName && isHydrated), shouldForcePseudo = !!propsIn.forceStyle, noClassNames = shouldAvoidClasses || shouldForcePseudo, groupName = props.group;
         if (groupName && !curState.group) {
           let listeners = /* @__PURE__ */ new Set();
           curState.group = {
@@ -4794,7 +4797,7 @@ var require_createComponent_native = __commonJS({
           };
         }
         process.env.NODE_ENV === "development" && time && time`use-state`;
-        let componentNameFinal = props.componentName || componentName2, componentClassName = props.asChild || !componentNameFinal ? "" : `is_${componentNameFinal}`, hasTextAncestor = !!(import_constants4.isWeb && isText && componentContext.inText), isDisabled = props.disabled ?? ((_e = props.accessibilityState) == null ? void 0 : _e.disabled);
+        let hasTextAncestor = !!(import_constants4.isWeb && isText && componentContext.inText), isDisabled = props.disabled ?? ((_e = props.accessibilityState) == null ? void 0 : _e.disabled);
         process.env.NODE_ENV === "development" && time && time`use-context`;
         let element = import_constants4.isWeb && (!Component || typeof Component == "string") && props.tag || Component, elementType = isText ? BaseText || element || "span" : BaseView || element || (hasTextAncestor ? "span" : "div");
         animationsConfig && isAnimated && (elementType = animationsConfig[isText ? "Text" : "View"] || elementType);
@@ -4861,26 +4864,7 @@ var require_createComponent_native = __commonJS({
           style: splitStylesStyle,
           classNames,
           space
-        } = splitStyles, propsWithAnimation = props, animationStyles;
-        if (
-          // if it supports css vars we run it on server too to get matching initial style
-          (supportsCSSVars ? willBeAnimatedClient : willBeAnimated) && useAnimations && !isHOC
-        ) {
-          let animations = useAnimations({
-            props: propsWithAnimation,
-            // if hydrating, send empty style
-            style: splitStylesStyle,
-            presence,
-            componentState: state,
-            styleProps,
-            theme: (_g = themeState.state) == null ? void 0 : _g.theme,
-            pseudos: pseudos || null,
-            staticConfig,
-            stateRef
-          });
-          (isAnimated || supportsCSSVars) && animations && (animationStyles = animations.style), process.env.NODE_ENV === "development" && time && time`animations`;
-        }
-        let {
+        } = splitStyles, propsWithAnimation = props, {
           asChild,
           children,
           themeShallow,
@@ -4907,15 +4891,35 @@ var require_createComponent_native = __commonJS({
           // @ts-ignore
           defaultVariants,
           ...nonTamaguiProps
-        } = viewPropsIn;
+        } = viewPropsIn, viewProps = nonTamaguiProps;
+        hasAnimationProp && props.tag && !props.role && !props.accessibilityRole && (viewProps.role = props.tag), isHOC && _themeProp && (viewProps.theme = _themeProp);
+        let animationStyles;
+        if (
+          // if it supports css vars we run it on server too to get matching initial style
+          (supportsCSSVars ? willBeAnimatedClient : willBeAnimated) && useAnimations && !isHOC
+        ) {
+          let animations = useAnimations({
+            props: propsWithAnimation,
+            // if hydrating, send empty style
+            style: splitStylesStyle,
+            presence,
+            componentState: state,
+            styleProps,
+            theme: (_g = themeState.state) == null ? void 0 : _g.theme,
+            pseudos: pseudos || null,
+            staticConfig,
+            stateRef
+          });
+          (isAnimated || supportsCSSVars) && animations && (animationStyles = animations.style, viewProps.style = animationStyles), process.env.NODE_ENV === "development" && time && time`animations`;
+        }
         process.env.NODE_ENV === "development" && props.untilMeasured && !props.group && console.warn(
           `You set the untilMeasured prop without setting group. This doesn't work, be sure to set untilMeasured on the parent that sets group, not the children that use the $group- prop.
 
 If you meant to do this, you can disable this warning - either change untilMeasured and group at the same time, or do group={conditional ? 'name' : undefined}`
         ), process.env.NODE_ENV === "development" && time && time`destructure`;
         let disabled = ((_h = props.accessibilityState) == null ? void 0 : _h.disabled) || // @ts-expect-error (comes from core)
-        props.accessibilityDisabled, viewProps = nonTamaguiProps;
-        hasAnimationProp && props.tag && !props.role && !props.accessibilityRole && (viewProps.role = props.tag), isHOC && _themeProp && (viewProps.theme = _themeProp), groupName && (nonTamaguiProps.onLayout = (0, import_helpers.composeEventHandlers)(
+        props.accessibilityDisabled;
+        groupName && (nonTamaguiProps.onLayout = (0, import_helpers.composeEventHandlers)(
           nonTamaguiProps.onLayout,
           (e) => {
             stateRef.current.group.emit(groupName, {
@@ -4979,10 +4983,6 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           pseudoGroups ? Object.keys([...pseudoGroups]).join("") : 0,
           mediaGroups ? Object.keys([...mediaGroups]).join("") : 0
         ]);
-        let fontFamily = isText || isInput ? splitStyles.fontFamily || ((_k = staticConfig.defaultProps) == null ? void 0 : _k.fontFamily) : null;
-        fontFamily && fontFamily[0] === "$" && (fontFamily = fontFamily.slice(1));
-        let fontFamilyClassName = fontFamily ? `font_${fontFamily}` : "", style = animationStyles || splitStyles.style, className;
-        asChild === "except-style" || asChild === "except-style-web" || (viewProps.style = style);
         let runtimePressStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusStyle), attachFocus = !!(runtimePressStyle || runtimeFocusStyle || onFocus || onBlur), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onMouseDown || onMouseUp || onLongPress || onClick), runtimeHoverStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = runtimeHoverStyle || onHoverIn || onHoverOut, isHoverable = import_constants4.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), shouldAttach = !!(attachFocus || attachPress || isHoverable || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle);
         process.env.NODE_ENV === "development" && time && time`events-setup`;
         let events = shouldAttach && !isDisabled && !props.asChild ? {
@@ -5035,7 +5035,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           delayPressOut: viewProps.delayPressOut,
           focusable: viewProps.focusable ?? !0,
           minPressDuration: 0
-        }), process.env.NODE_ENV === "development" && time && time`events`, process.env.NODE_ENV === "development" && debugProp === "verbose" && (0, import_log.log)("events", { events, isHoverable, attachPress }), (_m = (_l = import_setupHooks.hooks).useEvents) == null || _m.call(_l, viewProps, events, splitStyles, setStateShallow, staticConfig);
+        }), process.env.NODE_ENV === "development" && time && time`events`, process.env.NODE_ENV === "development" && debugProp === "verbose" && (0, import_log.log)("events", { events, isHoverable, attachPress }), (_l = (_k = import_setupHooks.hooks).useEvents) == null || _l.call(_k, viewProps, events, splitStyles, setStateShallow, staticConfig);
         let direction = props.spaceDirection || "both";
         process.env.NODE_ENV === "development" && time && time`hooks`;
         let content = !children || asChild ? children : spacedChildren2({
@@ -5055,7 +5055,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           events,
           staticConfig
         )), useChildrenResult ? content = useChildrenResult : content = (0, import_react2.createElement)(elementType, viewProps, content);
-        let ResetPresence = (_n = config == null ? void 0 : config.animations) == null ? void 0 : _n.ResetPresence;
+        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)(() => {
           if (!(!groupState || !groupName))
@@ -5081,7 +5081,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
         if (groupName && subGroupContext && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_ComponentContext.ComponentContext.Provider, { ...componentContext, groups: subGroupContext, children: content })), process.env.NODE_ENV === "development" && time && time`group-context`, content = disableTheme ? content : (0, import_Theme.getThemedChildren)(themeState, content, themeStateProps, !1), process.env.NODE_ENV === "development" && time && time`themed-children`, process.env.NODE_ENV === "development" && props.debug === "visualize" && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_ThemeDebug.ThemeDebug, { themeState, themeProps: props, children: content })), staticConfig.context) {
           let contextProps = staticConfig.context.props;
           for (let key in contextProps)
-            (key in style || key in viewProps) && (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = style[key] ?? viewProps[key]);
+            (viewProps.style && key in viewProps.style || key in viewProps) && (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = ((_n = viewProps.style) == null ? void 0 : _n[key]) ?? viewProps[key]);
         }
         if (overriddenContextProps) {
           let Provider = staticConfig.context.Provider;