tamagui 1.129.17 → 1.129.19

package/dist/test.native.js

@@ -289,8 +289,9 @@ var require_PresenceContext_native = __commonJS({
     });
     module2.exports = __toCommonJS2(PresenceContext_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), React4 = __toESM2(require("react")), PresenceContext2 = /* @__PURE__ */ React4.createContext(null), ResetPresence2 = function(props) {
+      var parent = React4.useContext(PresenceContext2);
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PresenceContext2.Provider, {
-        value: null,
+        value: props.disable ? parent : null,
         children: props.children
       });
     };
@@ -8275,8 +8276,7 @@ var require_createComponent_native = __commonJS({
           isExiting,
           isAnimated,
           willBeAnimated,
-          styledContextProps,
-          noMergeStyle: isAnimated && (animationDriver == null ? void 0 : animationDriver.needsWebStyles)
+          styledContextProps
         }, themeName = (themeState == null ? void 0 : themeState.name) || "", splitStyles = (0, import_getSplitStyles.useSplitStyles)(props, staticConfig, theme, themeName, state, styleProps, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp), groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
         if (groupContext) {
           var groupState = groupContext == null ? void 0 : groupContext.state;
@@ -8368,7 +8368,7 @@ var require_createComponent_native = __commonJS({
             staticConfig,
             stateRef
           });
-          isHydrated && animations && (animationStyles = animations.style, viewProps.style = animationStyles, animations.className && (viewProps.className = `${state.unmounted === "should-enter" ? "t_unmounted " : ""}${viewProps.className || ""} ${animations.className}`), animations.ref && (animatedRef = animations.ref));
+          animations && (animations.ref && (animatedRef = animations.ref), isHydrated && animations && (animationStyles = animations.style, viewProps.style = animationStyles, animations.className && (viewProps.className = `${state.unmounted === "should-enter" ? "t_unmounted " : ""}${viewProps.className || ""} ${animations.className}`)));
         }
         groupContext && (nonTamaguiProps.onLayout = (0, import_helpers.composeEventHandlers)(nonTamaguiProps.onLayout, function(e) {
           var _stateRef_current_group, layout = e.nativeEvent.layout;
@@ -8513,8 +8513,11 @@ var require_createComponent_native = __commonJS({
         });
         var useChildrenResult;
         import_setupHooks.hooks.useChildren && (useChildrenResult = import_setupHooks.hooks.useChildren(elementType, content, viewProps)), useChildrenResult ? content = useChildrenResult : content = /* @__PURE__ */ import_react3.default.createElement(elementType, viewProps, content);
-        var ResetPresence2 = config == null || (_config_animations = config.animations) === null || _config_animations === void 0 ? void 0 : _config_animations.ResetPresence;
-        if (ResetPresence2 && willBeAnimated && (hasEnterStyle || presenceState) && content && typeof content != "string" && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ResetPresence2, {
+        var ResetPresence2 = config == null || (_config_animations = config.animations) === null || _config_animations === void 0 ? void 0 : _config_animations.ResetPresence, needsReset = !!(!isHOC && ResetPresence2 && willBeAnimated && (hasEnterStyle || presenceState)), hasEverReset = stateRef.current.hasEverResetPresence;
+        needsReset && !hasEverReset && (stateRef.current.hasEverResetPresence = !0);
+        var renderReset = needsReset || hasEverReset;
+        if (renderReset && ResetPresence2 && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ResetPresence2, {
+          disabled: !needsReset,
           children: content
         })), "focusWithinStyle" in propsIn && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_ComponentContext.ComponentContext.Provider, {
           ...componentContext,