tamagui 1.133.0 → 1.134.0

package/dist/native.js

@@ -3660,10 +3660,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;
     }
   }
 });
@@ -6533,7 +6534,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;
@@ -6799,7 +6800,7 @@ var require_getSplitStyles_native = __commonJS({
           }
         }));
       }
-      process.env.NODE_ENV === "development" && debug === "profile" && time`style-state`, process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants4.isClient && import_isDevTools.isDevTools && (console.groupCollapsed("\u{1F539} getSplitStyles \u{1F447}"), (0, import_log.log)({
+      process.env.NODE_ENV === "development" && debug === "profile" && time`style-state`, process.env.NODE_ENV === "development" && debug === "verbose" && import_constants4.isClient && import_isDevTools.isDevTools && (console.groupCollapsed("\u{1F539} getSplitStyles \u{1F447}"), (0, import_log.log)({
         props,
         staticConfig,
         shouldDoClasses,
@@ -6811,7 +6812,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;
@@ -6892,7 +6893,7 @@ var require_getSplitStyles_native = __commonJS({
           }
         } else style2 && (viewProps.style = style2);
       }
-      if (process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants4.isClient && import_isDevTools.isDevTools) {
+      if (process.env.NODE_ENV === "development" && debug === "verbose" && import_constants4.isClient && import_isDevTools.isDevTools) {
         console.groupEnd(), console.groupCollapsed("\u{1F539} getSplitStyles ===>");
         try {
           var logs = {
@@ -7279,7 +7280,7 @@ var require_useThemeState_native = __commonJS({
         var _keys_current, _props_needsUpdate, local = localStates.get(id), needsUpdate = props.passThrough ? !1 : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? !0 : HasRenderedOnce.get(keys) ? !(keys == null || (_keys_current = keys.current) === null || _keys_current === void 0) && _keys_current.size ? !0 : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props) : !0, [rerender, next] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
         return PendingUpdate.delete(id), (!local || rerender) && (local = {
           ...next
-        }, localStates.set(id, local)), process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` ${id} getSnapshot ${rerender}`, local.name, ">", next.name), console.info({
+        }, localStates.set(id, local)), process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(` ${id} getSnapshot ${rerender}`, local.name, ">", next.name), console.info({
           props,
           propsKey,
           isRoot,
@@ -7300,7 +7301,7 @@ var require_useThemeState_native = __commonJS({
           HadTheme.get(keys) && scheduleUpdate(id), HadTheme.set(keys, !1);
           return;
         }
-        if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
+        if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
           var _states_get;
           console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, (_states_get = states.get(id)) === null || _states_get === void 0 ? void 0 : _states_get.name);
         }
@@ -7319,7 +7320,7 @@ var require_useThemeState_native = __commonJS({
       ];
       themes || (themes = (0, import_config.getConfig)().themes);
       var name = !propsKey && (!lastState || !(lastState != null && lastState.isNew)) ? null : getNewThemeName(parentState == null ? void 0 : parentState.name, props, pendingUpdate === "force" ? !0 : !!needsUpdate), isSameAsParent = parentState && (!name || name === parentState.name), shouldRerender = !!(needsUpdate && (pendingUpdate || (lastState == null ? void 0 : lastState.name) !== (parentState == null ? void 0 : parentState.name)));
-      if (process.env.NODE_ENV === "development" && debug && debug !== "profile") {
+      if (process.env.NODE_ENV === "development" && debug === "verbose") {
         var message = ` \xB7 useTheme(${id}) getNextState => ${name} needsUpdate ${needsUpdate} shouldRerender ${shouldRerender}`;
         console.info(message);
       }
@@ -7363,7 +7364,7 @@ var require_useThemeState_native = __commonJS({
         nextState
       ];
       var shouldAvoidRerender = pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name;
-      return process.env.NODE_ENV === "development" && debug && debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name} shouldAvoidRerender: ${shouldAvoidRerender}`), console.info({
+      return process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name} shouldAvoidRerender: ${shouldAvoidRerender}`), console.info({
         lastState,
         needsUpdate,
         nextState,
@@ -8240,7 +8241,7 @@ var require_useComponentState_native = __commonJS({
       if (!isHydrated) noClass = !1;
       else if (import_constants4.isWeb && isHydrated) {
         var isAnimatedAndHydrated = isAnimated && isHydrated, isClassNameDisabled = !staticConfig.acceptsClassName && (config.disableSSR || !state.unmounted), isDisabledManually = disableClassName && !state.unmounted;
-        (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (noClass = !0, process.env.NODE_ENV === "development" && props.debug && (0, import_log.log)("avoiding className", {
+        (isAnimatedAndHydrated || isDisabledManually || isClassNameDisabled) && (noClass = !0, process.env.NODE_ENV === "development" && props.debug === "verbose" && (0, import_log.log)("avoiding className", {
           isAnimatedAndHydrated,
           isDisabledManually,
           isClassNameDisabled
@@ -8545,7 +8546,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)`;
@@ -8681,7 +8682,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;
@@ -24459,7 +24460,8 @@ var require_Popper_native = __commonJS({
         update: context.update,
         context: context.context,
         getFloatingProps: context.getFloatingProps,
-        getReferenceProps: context.getReferenceProps
+        getReferenceProps: context.getReferenceProps,
+        open: context.open
       };
     }
     var checkFloating = {
@@ -24528,9 +24530,11 @@ var require_Popper_native = __commonJS({
           arrowStyle: middlewareData.arrow,
           onArrowSize: setArrowSize,
           hasFloating: (_middlewareData_checkFloating = middlewareData.checkFloating) === null || _middlewareData_checkFloating === void 0 ? void 0 : _middlewareData_checkFloating.hasFloating,
+          open: !!open,
           ...floating
         };
       }, [
+        open,
         size2,
         floating.x,
         floating.y,
@@ -24602,7 +24606,7 @@ var require_Popper_native = __commonJS({
         unstyled: process.env.TAMAGUI_HEADLESS === "1"
       }
     }), PopperContent = /* @__PURE__ */ React4.forwardRef(function(props, forwardedRef) {
-      var { scope, enableAnimationForPositionChange, children, passThrough, ...rest } = props, { strategy, placement, refs, x, y, getFloatingProps, size: size2 } = usePopperContext(scope), contentRefs = (0, import_compose_refs.useComposedRefs)(refs.setFloating, forwardedRef), [needsMeasure, setNeedsMeasure] = React4.useState(enableAnimationForPositionChange);
+      var { scope, enableAnimationForPositionChange, children, passThrough, ...rest } = props, context = usePopperContext(scope), { strategy, placement, refs, x, y, getFloatingProps, size: size2, isPositioned } = context, contentRefs = (0, import_compose_refs.useComposedRefs)(refs.setFloating, forwardedRef), [needsMeasure, setNeedsMeasure] = React4.useState(enableAnimationForPositionChange);
       (0, import_constants4.useIsomorphicLayoutEffect)(function() {
         needsMeasure && x && y && setNeedsMeasure(!1);
       }, [
@@ -24611,7 +24615,16 @@ var require_Popper_native = __commonJS({
         x,
         y
       ]);
-      var hide2 = x === 0 && y === 0, frameProps = {
+      var hide2 = x === 0 && y === 0, disableAnimationProp = (
+        // if they want to animate also when re-positioning allow it
+        enableAnimationForPositionChange === "even-when-repositioning" ? needsMeasure : !isPositioned || needsMeasure
+      ), [disableAnimation, setDisableAnimation] = React4.useState(disableAnimationProp);
+      React4.useEffect(function() {
+        setDisableAnimation(disableAnimationProp);
+      }, [
+        disableAnimationProp
+      ]);
+      var frameProps = {
         ref: contentRefs,
         x: x || 0,
         y: y || 0,
@@ -24621,7 +24634,7 @@ var require_Popper_native = __commonJS({
         opacity: 1,
         ...enableAnimationForPositionChange && {
           animation: rest.animation,
-          animateOnly: needsMeasure ? [] : rest.animateOnly,
+          animateOnly: disableAnimation ? [] : rest.animateOnly,
           // apply animation but disable it on initial render to avoid animating from 0 to the first position
           animatePresence: !1
         },