@tamagui/core 1.81.2 → 1.81.4

package/dist/native.js

@@ -4058,7 +4058,7 @@ var require_mergeProps_native = __commonJS({
       mergeProps: () => mergeProps
     });
     module2.exports = __toCommonJS2(mergeProps_exports);
-    var import_pseudoDescriptors = require_pseudoDescriptors_native(), mergeProps = (a, b, inverseShorthands) => {
+    var import_useMedia = require_useMedia_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), mergeProps = (a, b, inverseShorthands) => {
       let out = {};
       for (let key in a)
         mergeProp(out, a, b, key, inverseShorthands);
@@ -4068,18 +4068,15 @@ var require_mergeProps_native = __commonJS({
       return out;
     };
     function mergeProp(out, a, b, key, inverseShorthands) {
-      let shorthand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null;
-      if (b && (key in b || shorthand && shorthand in b))
-        return;
-      let val = a[key];
-      if (key in import_pseudoDescriptors.pseudoDescriptors) {
+      let longhand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null, val = a[key];
+      if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
         out[key] = {
           ...out[key],
           ...val
         };
         return;
       }
-      out[shorthand || key] = val;
+      b && (key in b || longhand && longhand in b) || (out[longhand || key] = val);
     }
   }
 });
@@ -4958,7 +4955,7 @@ var require_createComponent_native = __commonJS({
         let componentClassName = props.asChild ? "" : props.componentName ? `is_${props.componentName}` : defaultComponentClassName, hasTextAncestor = !!(import_constants3.isWeb && isText && componentContext.inText), isDisabled = props.disabled ?? ((_c = props.accessibilityState) == null ? void 0 : _c.disabled);
         process.env.NODE_ENV === "development" && time && time`use-context`;
         let element = import_constants3.isWeb && (!Component || typeof Component == "string") && props.tag || Component, elementType = isText ? BaseText || element || "span" : BaseView || element || (hasTextAncestor ? "span" : "div");
-        if (animationsConfig && willBeAnimated && (animationsConfig.Text && (elementType = animationsConfig.Text), animationsConfig.View && (elementType = animationsConfig.View)), isAnimated && presence) {
+        if (animationsConfig && willBeAnimated && (elementType = animationsConfig[isText ? "Text" : "View"] || elementType), isAnimated && presence) {
           let presenceState = presence[2];
           if (presenceState) {
             let isEntering = state.unmounted, isExiting2 = !presenceState.isPresent, enterExitVariant = presenceState.enterExitVariant, enterVariant = enterExitVariant ?? presenceState.enterVariant, exitVariant = enterExitVariant ?? presenceState.exitVariant;
@@ -5225,8 +5222,8 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           direction,
           isZStack,
           debug: debugProp
-        }), ResetPresence = (_l = config == null ? void 0 : config.animations) == null ? void 0 : _l.ResetPresence;
-        willBeAnimated && presence && ResetPresence && (content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ResetPresence, { children: content })), asChild && (elementType = import_Slot.Slot, Object.assign(viewProps, { onPress, onLongPress })), process.env.NODE_ENV === "development" && time && time`spaced-as-child`;
+        });
+        asChild && (elementType = import_Slot.Slot, Object.assign(viewProps, { onPress, onLongPress })), process.env.NODE_ENV === "development" && time && time`spaced-as-child`;
         let useChildrenResult;
         import_setupHooks.hooks.useChildren && (useChildrenResult = import_setupHooks.hooks.useChildren(
           elementType,
@@ -5234,7 +5231,9 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           viewProps,
           events,
           staticConfig
-        )), useChildrenResult ? content = useChildrenResult : content = (0, import_react3.createElement)(elementType, viewProps, content), process.env.NODE_ENV === "development" && time && time`create-element`;
+        )), useChildrenResult ? content = useChildrenResult : content = (0, import_react3.createElement)(elementType, viewProps, content);
+        let ResetPresence = (_l = config == null ? void 0 : config.animations) == null ? void 0 : _l.ResetPresence;
+        willBeAnimated && presence && ResetPresence && typeof content != "string" && (content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ResetPresence, { children: content })), process.env.NODE_ENV === "development" && time && time`create-element`;
         let groupState = stateRef.current.group, subGroupContext = (0, import_react3.useMemo)(() => {
           if (!(!groupState || !groupName))
             return groupState.listeners.clear(), {