tamagui 1.129.13 → 1.129.15

package/dist/native.js

@@ -2981,39 +2981,39 @@ var require_pseudoDescriptors_native = __commonJS({
       // order of keys here important! in priority order
       hoverStyle: {
         name: "hover",
-        priority: 1
+        priority: 2
       },
       pressStyle: {
         name: "active",
         stateKey: "press",
-        priority: 2
+        priority: 3
       },
       focusVisibleStyle: {
         name: "focus-visible",
-        priority: 3,
+        priority: 4,
         stateKey: "focusVisible"
       },
       focusStyle: {
         name: "focus",
-        priority: 3
+        priority: 4
       },
       focusWithinStyle: {
         name: "focus-within",
-        priority: 3,
+        priority: 4,
         stateKey: "focusWithin"
       },
       disabledStyle: {
         name: "disabled",
-        priority: 4,
+        priority: 5,
         stateKey: "disabled"
       }
     }, pseudoPriorities = {
-      hover: 1,
-      press: 2,
-      focus: 3,
-      focusVisible: 3,
-      focusWithin: 3,
-      disabled: 4
+      hover: pseudoDescriptorsBase.hoverStyle.priority,
+      press: pseudoDescriptorsBase.pressStyle.priority,
+      focus: pseudoDescriptorsBase.focusStyle.priority,
+      focusVisible: pseudoDescriptorsBase.focusVisibleStyle.priority,
+      focusWithin: pseudoDescriptorsBase.focusWithinStyle.priority,
+      disabled: pseudoDescriptorsBase.disabledStyle.priority
     }, pseudoDescriptors = {
       ...pseudoDescriptorsBase,
       enterStyle: {
@@ -3258,9 +3258,9 @@ var require_useMedia_native = __commonJS({
       }
       return res;
     }
-    var getMediaImportanceIfMoreImportant = function(mediaKey, key, importancesUsed, isSizeMedia) {
-      var importance = isSizeMedia && !(0, import_config.getSetting)("mediaPropOrder") ? getMediaKeyImportance(mediaKey) : defaultMediaImportance;
-      return !importancesUsed[key] || importance > importancesUsed[key] ? importance : null;
+    var getMediaImportanceIfMoreImportant = function(mediaKey, key, styleState, isSizeMedia) {
+      var importance = isSizeMedia && !(0, import_config.getSetting)("mediaPropOrder") ? getMediaKeyImportance(mediaKey) : defaultMediaImportance, usedKeys = styleState.usedKeys;
+      return !usedKeys[key] || importance > usedKeys[key] ? importance : null;
     };
     function camelToHyphen(str) {
       return str.replace(/[A-Z]/g, function(m) {
@@ -6541,7 +6541,7 @@ var require_getSplitStyles_native = __commonJS({
           if (keyInit === "group" && !1) var identifier2, containerType, containerCSS;
           return "continue";
         }
-        var valInitType = typeof valInit, isValidStyleKeyInit = isValidStyleKey(keyInit, validStyles, accept);
+        var isValidStyleKeyInit = isValidStyleKey(keyInit, validStyles, accept);
         if (0) var _viewProps2, _dataSet;
         if (!isValidStyleKeyInit) {
           if (!import_constants4.isAndroid && keyInit === "elevationAndroid") return "continue";
@@ -6555,13 +6555,13 @@ var require_getSplitStyles_native = __commonJS({
         if (0) var didUseKeyInit;
         var isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo = !!(isMedia || isPseudo);
         if (isMediaOrPseudo && keyInit.startsWith("$group-")) {
-          var parts = keyInit.split("-");
+          var parts = keyInit.split("-"), plen = parts.length;
           if (
             // check if its actually a simple group selector to avoid breaking selectors
-            parts.length === 2 || parts.length === 3 && import_pseudoDescriptors.pseudoPriorities[parts[parts.length - 1]]
+            plen === 2 || plen === 3 && import_pseudoDescriptors.pseudoPriorities[parts[parts.length - 1]]
           ) {
             var name2 = parts[1];
-            groupContext != null && groupContext[name2] || (keyInit = keyInit.replace("$group-", "$group-true-"));
+            groupContext && !(groupContext != null && groupContext[name2]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
           }
         }
         var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !noExpand;
@@ -6577,6 +6577,9 @@ var require_getSplitStyles_native = __commonJS({
           variant: variants == null ? void 0 : variants[keyInit],
           isVariant,
           isHOCShouldPassThrough,
+          usedKeys: {
+            ...styleState.usedKeys
+          },
           parentStaticConfig
         })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !isVariant) || !noSkip && keyInit in import_skipProps.skipProps) return "continue";
         (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
@@ -6656,7 +6659,7 @@ var require_getSplitStyles_native = __commonJS({
                   var _$val = pseudoStyleObject[pkey];
                   if (isDisabled) applyDefaultStyle(pkey, styleState);
                   else {
-                    var curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
+                    var curImportance = styleState.usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
                     if (shouldMerge) {
                       if (process.env.IS_STATIC === "is_static") {
                         var _pseudos1, _key1;
@@ -6674,7 +6677,7 @@ var require_getSplitStyles_native = __commonJS({
                 }
                 if (!isDisabled) for (var _$key in val2) {
                   var k = shorthands[_$key] || _$key;
-                  usedKeys[k] = Math.max(importance, usedKeys[k] || 0);
+                  styleState.usedKeys[k] = Math.max(importance, styleState.usedKeys[k] || 0);
                 }
               }
               return;
@@ -6696,8 +6699,8 @@ var require_getSplitStyles_native = __commonJS({
               if (mediaStylesSeen += 1, shouldDoClasses) {
                 var mediaStyle = getSubStyle(styleState, key4, val2, !1);
                 if (hasSpace && (delete mediaStyle.space, mediaState3[mediaKeyShort])) {
-                  var importance1 = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKeyShort, "space", usedKeys, !0);
-                  importance1 && (space = val2.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`Found more important space for current media ${mediaKeyShort}: ${val2} (importance: ${importance1})`));
+                  var importance1 = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKeyShort, "space", styleState, !0);
+                  importance1 && (space = val2.space, styleState.usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`Found more important space for current media ${mediaKeyShort}: ${val2} (importance: ${importance1})`));
                 }
                 var mediaStyles = (0, import_getCSSStylesAtomic.getCSSStylesAtomic)(mediaStyle), _iteratorNormalCompletion12 = !0, _didIteratorError12 = !1, _iteratorError12 = void 0;
                 try {
@@ -6723,7 +6726,7 @@ var require_getSplitStyles_native = __commonJS({
                 var mergeMediaStyle2 = function(key5, val3) {
                   var _styleState4;
                   (_styleState4 = styleState).style || (_styleState4.style = {});
-                  var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, usedKeys, mediaState3[mediaKeyShort], importanceBump, debug);
+                  var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState3[mediaKeyShort], importanceBump, debug);
                   didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
                 }, mergeMediaStyle = mergeMediaStyle2, isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
                 if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
@@ -6823,7 +6826,7 @@ var require_getSplitStyles_native = __commonJS({
       conf = conf || (0, import_config.getConfig)();
       var animationDriver = (componentContext == null ? void 0 : componentContext.animationDriver) || conf.animations;
       import_constants4.isWeb && styleProps.isAnimated && animationDriver.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
-      var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClass && !styleProps.isAnimated, rulesToInsert = void 0, classNames = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, validStyles = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
+      var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClass && !styleProps.isAnimated, rulesToInsert = void 0, classNames = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, validStyles = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-setup`;
       var styleState = {
         classNames,
@@ -6834,7 +6837,7 @@ var require_getSplitStyles_native = __commonJS({
         staticConfig,
         style: null,
         theme,
-        usedKeys,
+        usedKeys: {},
         viewProps,
         context: componentContext,
         debug
@@ -6968,10 +6971,10 @@ var require_getSplitStyles_native = __commonJS({
       });
     }
     function mergeStyle(styleState, key, val, importance) {
-      var disableNormalize = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !1, { viewProps, styleProps, staticConfig } = styleState, existingImportance = styleState.usedKeys[key];
-      if (!(importance < existingImportance)) if (key in import_helpers.stylePropsTransform) {
-        var _styleState, _styleState_usedKeys, _key;
-        (_styleState = styleState).flatTransforms || (_styleState.flatTransforms = {}), (_styleState_usedKeys = styleState.usedKeys)[_key = key] || (_styleState_usedKeys[_key] = 1), styleState.flatTransforms[key] = val;
+      var disableNormalize = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !1, { viewProps, styleProps, staticConfig, usedKeys } = styleState, existingImportance = usedKeys[key] || 0;
+      if (!(existingImportance > importance)) if (key in import_helpers.stylePropsTransform) {
+        var _styleState;
+        (_styleState = styleState).flatTransforms || (_styleState.flatTransforms = {}), usedKeys[key] = importance, styleState.flatTransforms[key] = val;
       } else {
         var shouldNormalize = import_constants4.isWeb && !disableNormalize && !styleProps.noNormalize, out = shouldNormalize ? (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key) : val;
         if (
@@ -6979,8 +6982,8 @@ var require_getSplitStyles_native = __commonJS({
           staticConfig.accept && key in staticConfig.accept
         ) viewProps[key] = out;
         else {
-          var _styleState1, _styleState_usedKeys1, _key1;
-          (_styleState1 = styleState).style || (_styleState1.style = {}), (_styleState_usedKeys1 = styleState.usedKeys)[_key1 = key] || (_styleState_usedKeys1[_key1] = 1), styleState.style[key] = // if you dont do this you'll be passing props.transform arrays directly here and then mutating them
+          var _styleState1;
+          (_styleState1 = styleState).style || (_styleState1.style = {}), usedKeys[key] = importance, styleState.style[key] = // if you dont do this you'll be passing props.transform arrays directly here and then mutating them
           // if theres any flatTransforms later, causing issues (mutating props is bad, in strict mode styles get borked)
           key === "transform" && Array.isArray(out) ? [
             ...out
@@ -7057,10 +7060,10 @@ var require_getSplitStyles_native = __commonJS({
         delete viewProps[key], viewProps[key] = next;
       } else viewProps[key] = val;
     }
-    function mergeMediaByImportance(styleState, mediaKey, key, value, usedKeys, isSizeMedia, importanceBump, debugProp) {
-      var importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKey, key, usedKeys, isSizeMedia);
+    function mergeMediaByImportance(styleState, mediaKey, key, value, isSizeMedia, importanceBump, debugProp) {
+      var usedKeys = styleState.usedKeys, importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKey, key, styleState, isSizeMedia);
       if (importanceBump && (importance = (importance || 0) + importanceBump), process.env.NODE_ENV === "development" && debugProp === "verbose" && (0, import_log.log)(`mergeMediaByImportance ${key} importance usedKey ${usedKeys[key]} next ${importance}`), importance === null) return !1;
-      if (usedKeys[key] = importance, key in import_pseudoDescriptors.pseudoDescriptors) {
+      if (key in import_pseudoDescriptors.pseudoDescriptors) {
         var descriptor = import_pseudoDescriptors.pseudoDescriptors[key], descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = styleState.componentState[descriptorKey] === !1;
         if (isDisabled) return !1;
         for (var subKey in value) mergeStyle(styleState, subKey, value[subKey], importance);
@@ -8315,9 +8318,7 @@ var require_useComponentState_native = __commonJS({
       var states = (0, import_react3.useState)(initialState), state = props.forceStyle ? {
         ...states[0],
         [props.forceStyle]: !0
-      } : states[0], setState = states[1];
-      stateRef.current.nextComponentState && Object.assign(state, stateRef.current.nextComponentState);
-      var isAnimated = willBeAnimated;
+      } : states[0], setState = states[1], isAnimated = willBeAnimated;
       import_constants4.isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && !isHydrated && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (disabled && Object.assign(state, import_defaultComponentState.defaultComponentStateMounted), state.disabled = disabled, setState(function(_) {
         return {
           ...state
@@ -8589,7 +8590,7 @@ var require_createComponent_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(createComponent_exports);
-    var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native11(), import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_is_equal_shallow = require_index_native12(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_ComponentContext = require_ComponentContext_native(), import_GroupContext = require_GroupContext_native(), import_createVariable = require_createVariable_native(), import_defaultComponentState = require_defaultComponentState_native(), import_getShorthandValue = require_getShorthandValue_native(), import_getSplitStyles = require_getSplitStyles_native(), import_log = require_log_native(), import_mergeProps = require_mergeProps_native(), import_setElementProps = require_setElementProps_native(), import_subscribeToContextGroup = require_subscribeToContextGroup_native(), import_themeable = require_themeable_native(), import_wrapStyleTags = require_wrapStyleTags_native(), import_useComponentState = require_useComponentState_native(), import_useMedia = require_useMedia_native(), import_useTheme = require_useTheme_native(), import_setupHooks = require_setupHooks_native(), import_Slot = require_Slot_native(), import_Theme = require_Theme_native(), time2, debugKeyListeners, startVisualizer, componentSetStates = /* @__PURE__ */ new Set(), avoidReRenderKeys = /* @__PURE__ */ new Set([
+    var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native11(), import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_is_equal_shallow = require_index_native12(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_ComponentContext = require_ComponentContext_native(), import_GroupContext = require_GroupContext_native(), import_createVariable = require_createVariable_native(), import_defaultComponentState = require_defaultComponentState_native(), import_getShorthandValue = require_getShorthandValue_native(), import_getSplitStyles = require_getSplitStyles_native(), import_log = require_log_native(), import_mergeProps = require_mergeProps_native(), import_setElementProps = require_setElementProps_native(), import_subscribeToContextGroup = require_subscribeToContextGroup_native(), import_themeable = require_themeable_native(), import_wrapStyleTags = require_wrapStyleTags_native(), import_useComponentState = require_useComponentState_native(), import_useMedia = require_useMedia_native(), import_useTheme = require_useTheme_native(), import_setupHooks = require_setupHooks_native(), import_Slot = require_Slot_native(), import_Theme = require_Theme_native(), time2, NextState = /* @__PURE__ */ new WeakMap(), debugKeyListeners, startVisualizer, componentSetStates = /* @__PURE__ */ new Set(), avoidReRenderKeys = /* @__PURE__ */ new Set([
       "hover",
       "press",
       "pressIn",
@@ -8603,7 +8604,7 @@ var require_createComponent_native = __commonJS({
     var BaseText, BaseView, hasSetupBaseViews = !1, lastInteractionWasKeyboard = {
       value: !1
     };
-    import_constants4.isWeb && globalThis.document && (document.addEventListener("keydown", function() {
+    import_constants4.isWeb && typeof document < "u" && (document.addEventListener("keydown", function() {
       lastInteractionWasKeyboard.value || (lastInteractionWasKeyboard.value = !0);
     }), document.addEventListener("mousedown", function() {
       lastInteractionWasKeyboard.value && (lastInteractionWasKeyboard.value = !1);
@@ -8677,7 +8678,12 @@ var require_createComponent_native = __commonJS({
         }, [
           componentName2
         ]);
-        var componentContext = import_react3.default.useContext(import_ComponentContext.ComponentContext), groupContextParent = import_react3.default.useContext(import_GroupContext.GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = (0, import_useComponentState.useComponentState)(props, animationDriver, staticConfig, config), { disabled, groupName, hasAnimationProp, hasEnterStyle, isAnimated, isExiting, isHydrated, presence, presenceState, setState, noClass, state, stateRef, supportsCSS, willBeAnimated, willBeAnimatedClient, startedUnhydrated } = componentState, allGroupContexts = (0, import_react3.useMemo)(function() {
+        var componentContext = import_react3.default.useContext(import_ComponentContext.ComponentContext), groupContextParent = import_react3.default.useContext(import_GroupContext.GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = (0, import_useComponentState.useComponentState)(props, animationDriver, staticConfig, config), { disabled, groupName, hasAnimationProp, hasEnterStyle, isAnimated, isExiting, isHydrated, presence, presenceState, setState, noClass, state, stateRef, supportsCSS, willBeAnimated, willBeAnimatedClient, startedUnhydrated } = componentState;
+        hasAnimationProp && animationDriver != null && animationDriver.avoidReRenders && (0, import_constants4.useIsomorphicLayoutEffect)(function() {
+          var pendingState = NextState.get(stateRef);
+          pendingState && (setStateShallow(pendingState), NextState.set(stateRef, void 0));
+        });
+        var allGroupContexts = (0, import_react3.useMemo)(function() {
           var _stateRef_current_group;
           if (!groupName) return groupContextParent;
           (_stateRef_current_group = stateRef.current.group) === null || _stateRef_current_group === void 0 || _stateRef_current_group.listeners.clear();
@@ -8716,13 +8722,8 @@ var require_createComponent_native = __commonJS({
           stateRef,
           groupName,
           groupContextParent
-        ]), setStateShallow = componentState.setStateShallow, pendingState = stateRef.current.nextComponentState;
-        pendingState && (stateRef.current.nextComponentState = void 0, componentState.setState(function(prev) {
-          return {
-            ...prev,
-            ...pendingState
-          };
-        })), process.env.NODE_ENV === "development" && time2 && time2`use-state`;
+        ]), setStateShallow = componentState.setStateShallow;
+        process.env.NODE_ENV === "development" && time2 && time2`use-state`;
         var hasTextAncestor = !!(import_constants4.isWeb && isText && componentContext.inText), isTaggable = !Component || typeof Component == "string", tagProp = props.tag, element = import_constants4.isWeb && isTaggable && tagProp || Component, BaseTextComponent = BaseText || element || "span", BaseViewComponent = BaseView || element || (hasTextAncestor ? "span" : "div"), elementType = isText ? BaseTextComponent : BaseViewComponent;
         animationDriver && isAnimated && // this should really be behind another prop as it's not really related to
         // "needsWebStyles" basically with motion we just animate a plain div, but
@@ -8801,7 +8802,7 @@ var require_createComponent_native = __commonJS({
         if ((hasAnimationProp || groupName) && animationDriver != null && animationDriver.avoidReRenders) {
           var styleListener = stateRef.current.useStyleListener, ogSetStateShallow = setStateShallow;
           stateRef.current.setStateShallow = function(nextOrGetNext) {
-            var prev = stateRef.current.nextComponentState || state, next = typeof nextOrGetNext == "function" ? nextOrGetNext(prev) : nextOrGetNext;
+            var prev = NextState.get(stateRef) || state, next = typeof nextOrGetNext == "function" ? nextOrGetNext(prev) : nextOrGetNext;
             if (!(next === prev || (0, import_is_equal_shallow.isEqualShallow)(prev, next))) {
               var canAvoidReRender = Object.keys(next).every(function(key3) {
                 return avoidReRenderKeys.has(key3);
@@ -8811,7 +8812,7 @@ var require_createComponent_native = __commonJS({
                   ...prev,
                   ...next
                 };
-                stateRef.current.nextComponentState = updatedState, process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile" && (console.groupCollapsed("[\u26A1\uFE0F] avoid setState", next, {
+                NextState.set(stateRef, updatedState), process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile" && (console.groupCollapsed("[\u26A1\uFE0F] avoid setState", next, {
                   updatedState,
                   props
                 }), console.info(stateRef.current.host), console.groupEnd());
@@ -8963,9 +8964,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           mediaGroups ? Object.keys([
             ...mediaGroups
           ]).join("") : 0
-        ]), hasAnimationProp && animationDriver != null && animationDriver.avoidReRenders && (0, import_react3.useEffect)(function() {
-          stateRef.current.nextComponentState = void 0;
-        });
+        ]);
         var groupEmitter = stateRef.current.group;
         (0, import_constants4.useIsomorphicLayoutEffect)(function() {
           !groupContext || !groupEmitter || notifyGroupSubscribers(groupContext, groupEmitter, state);
@@ -9017,24 +9016,16 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           },
           ...attachFocus && {
             onFocus: function(e) {
-              componentContext.setParentFocusState && componentContext.setParentFocusState({
-                focusWithin: !0
-              }), pseudos != null && pseudos.focusVisibleStyle ? setTimeout(function() {
-                setStateShallow({
-                  focus: !0,
-                  focusVisible: !!lastInteractionWasKeyboard.value
-                });
-              }, 0) : setStateShallow({
-                focus: !0,
-                focusVisible: !1
-              }), onFocus == null || onFocus(e);
+              var next = {};
+              componentContext.setParentFocusState && (next.focusWithin = !0), pseudos != null && pseudos.focusVisibleStyle && lastInteractionWasKeyboard.value ? next.focusVisible = !0 : next.focus = !0, setStateShallow(next), onFocus == null || onFocus(e);
             },
             onBlur: function(e) {
               componentContext.setParentFocusState && componentContext.setParentFocusState({
                 focusWithin: !1
               }), setStateShallow({
                 focus: !1,
-                focusVisible: !1
+                focusVisible: !1,
+                focusWithin: !1
               }), onBlur == null || onBlur(e);
             }
           }
@@ -9082,7 +9073,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           ...componentContext,
           setParentFocusState: setStateShallow,
           children: content
-        })), "group" in propsIn && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_GroupContext.GroupContext.Provider, {
+        })), "group" in props && (content = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_GroupContext.GroupContext.Provider, {
           value: allGroupContexts,
           children: content
         })), process.env.NODE_ENV === "development" && time2 && time2`group-context`, content = disableTheme ? content : (0, import_Theme.getThemedChildren)(themeState, content, themeStateProps, !1, stateRef), process.env.NODE_ENV === "development" && time2 && time2`themed-children`, staticConfig.context) {