@tamagui/core 1.125.14 → 1.125.15

package/dist/test.native.js

@@ -5561,21 +5561,19 @@ var require_createShallowSetState_native = __commonJS({
     var import_react3 = require("react"), callImmediate = function(cb) {
       return cb();
     };
-    function createShallowSetState(setter, onlyAllow, transition, debugIn, callback) {
+    function createShallowSetState(setter, onlyAllow, transition, debugIn) {
       return (0, import_react3.useCallback)(function(next) {
         var wrap = transition ? import_react3.startTransition : callImmediate;
         wrap(function() {
           setter(function(prev) {
-            var out = mergeIfNotShallowEqual(prev, next, onlyAllow, debugIn);
-            return callback == null || callback(out), out;
+            return mergeIfNotShallowEqual(prev, next, onlyAllow, debugIn);
           });
         });
       }, [
         setter,
         onlyAllow ? onlyAllow.join("") : "",
         transition,
-        debugIn,
-        callback
+        debugIn
       ]);
     }
     function mergeIfNotShallowEqual(prev, next, onlyAllow, debug) {
@@ -5639,15 +5637,15 @@ var require_subscribeToContextGroup_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(subscribeToContextGroup_exports);
-    var import_createShallowSetState = require_createShallowSetState_native(), import_useMedia = require_useMedia_native(), subscribeToContextGroup = function(param) {
+    var import_useMedia = require_useMedia_native(), import_createShallowSetState = require_createShallowSetState_native(), subscribeToContextGroup = function(param) {
       var { setStateShallow, pseudoGroups, mediaGroups, componentContext, state } = param;
       if (pseudoGroups || mediaGroups) {
-        var _componentContext_groups_subscribe, _componentContext_groups, current = {
-          pseudo: {},
-          media: {}
-        };
+        var _componentContext_groups_subscribe, _componentContext_groups;
         return (_componentContext_groups = componentContext.groups) === null || _componentContext_groups === void 0 || (_componentContext_groups_subscribe = _componentContext_groups.subscribe) === null || _componentContext_groups_subscribe === void 0 ? void 0 : _componentContext_groups_subscribe.call(_componentContext_groups, function(name, param2) {
-          var { layout, pseudo } = param2;
+          var { layout, pseudo } = param2, _state_group, current = ((_state_group = state.group) === null || _state_group === void 0 ? void 0 : _state_group[name]) || {
+            pseudo: {},
+            media: {}
+          };
           if (pseudo && pseudoGroups != null && pseudoGroups.has(String(name))) Object.assign(current.pseudo, pseudo), persist();
           else if (layout && mediaGroups) {
             var mediaState2 = (0, import_useMedia.getMediaState)(mediaGroups, layout), next = (0, import_createShallowSetState.mergeIfNotShallowEqual)(current.media, mediaState2);
@@ -6558,7 +6556,7 @@ var require_useComponentState_native = __commonJS({
     });
     module2.exports = __toCommonJS2(useComponentState_exports);
     var import_constants2 = require_index_native2(), import_use_did_finish_ssr = require_index_native6(), import_react3 = require("react"), import_defaultComponentState = require_defaultComponentState_native(), import_createShallowSetState = require_createShallowSetState_native(), import_isObj = require_isObj_native(), import_log = require_log_native(), useComponentState = function(props, param, staticConfig, config) {
-      var { animationDriver, groups } = param, _animationDriver_usePresence, isHydrated = (0, import_use_did_finish_ssr.useDidFinishSSR)(), useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, stateRef = (0, import_react3.useRef)(void 0);
+      var { animationDriver } = param, _animationDriver_usePresence, isHydrated = (0, import_use_did_finish_ssr.useDidFinishSSR)(), useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, stateRef = (0, import_react3.useRef)(void 0);
       stateRef.current || (stateRef.current = {});
       var hasAnimationProp = !!("animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSSVars = animationDriver == null ? void 0 : animationDriver.supportsCSSVars, curStateRef = stateRef.current, willBeAnimatedClient = function() {
         var next = !!(hasAnimationProp && !staticConfig.isHOC && useAnimations);
@@ -6583,24 +6581,9 @@ var require_useComponentState_native = __commonJS({
       import_constants2.isWeb && hasAnimationThatNeedsHydrate && !staticConfig.isHOC && !isHydrated && (isAnimated = !1, curStateRef.willHydrate = !0), disabled !== state.disabled && (state.disabled = disabled, disabled && Object.assign(state, import_defaultComponentState.defaultComponentStateMounted), setState({
         ...state
       }));
-      var groupName = props.group, groupContextState = groups == null ? void 0 : groups.state, setStateWrapper = (0, import_react3.useMemo)(function() {
-        if (groupContextState && groupName) return function(state2) {
-          curStateRef.group.emit(groupName, {
-            pseudo: state2
-          });
-          var next = {
-            ...groupContextState[groupName],
-            ...state2
-          };
-          groupContextState[groupName] = next;
-        };
-      }, [
-        groupContextState,
-        curStateRef,
-        groupName
-      ]), setStateShallow = (0, import_createShallowSetState.createShallowSetState)(setState, disabled ? [
+      var groupName = props.group, setStateShallow = (0, import_createShallowSetState.createShallowSetState)(setState, disabled ? [
         "disabled"
-      ] : void 0, !1, props.debug, setStateWrapper);
+      ] : void 0, !1, props.debug);
       if (presenceState && isAnimated && isHydrated && staticConfig.variants) {
         var { enterVariant, exitVariant, enterExitVariant, custom } = presenceState;
         (0, import_isObj.isObj)(custom) && Object.assign(props, custom);
@@ -7025,8 +7008,9 @@ var require_createComponent_native = __commonJS({
           (isAnimated || supportsCSSVars) && animations && (animationStyles = animations.style, viewProps.style = animationStyles, animations.className && (viewProps.className = `${state.unmounted === "should-enter" ? "t_unmounted " : ""}${viewProps.className || ""} ${animations.className}`));
         }
         groupName && (nonTamaguiProps.onLayout = (0, import_helpers2.composeEventHandlers)(nonTamaguiProps.onLayout, function(e) {
-          stateRef.current.group.emit(groupName, {
-            layout: e.nativeEvent.layout
+          var layout = e.nativeEvent.layout;
+          stateRef.current.group.layout = layout, stateRef.current.group.emit(groupName, {
+            layout
           }), !stateRef.current.hasMeasured && props.untilMeasured === "hide" && setState(function(prev) {
             return {
               ...prev
@@ -7075,6 +7059,25 @@ var require_createComponent_native = __commonJS({
           mediaGroups ? Object.keys([
             ...mediaGroups
           ]).join("") : 0
+        ]), (0, import_constants2.useIsomorphicLayoutEffect)(function() {
+          var _curStateRef_group;
+          if (groupName) {
+            curStateRef.group.emit(groupName, {
+              pseudo: state,
+              layout: (_curStateRef_group = curStateRef.group) === null || _curStateRef_group === void 0 ? void 0 : _curStateRef_group.layout
+            });
+            var groupContextState = componentContext == null ? void 0 : componentContext.groups;
+            if (groupContextState) {
+              var next = {
+                ...groupContextState[groupName],
+                ...state
+              };
+              groupContextState[groupName] = next;
+            }
+          }
+        }, [
+          groupName,
+          state
         ]);
         var runtimePressStyle = !disabled && noClass && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClass && (pseudos == null ? void 0 : pseudos.focusStyle), runtimeFocusVisibleStyle = !disabled && noClass && (pseudos == null ? void 0 : pseudos.focusVisibleStyle), attachFocus = !!(runtimePressStyle || runtimeFocusStyle || runtimeFocusVisibleStyle || onFocus || onBlur || componentContext.setParentFocusState), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onMouseDown || onMouseUp || onLongPress || onClick || pseudos != null && pseudos.focusVisibleStyle), runtimeHoverStyle = !disabled && noClass && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = !!(groupName || runtimeHoverStyle || onHoverIn || onHoverOut), attachHover = import_constants2.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), shouldAttach = !disabled && !props.asChild && !!(attachFocus || attachPress || attachHover || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle), needsPressState = !!(groupName || runtimePressStyle), events = shouldAttach ? {
           onPressOut: attachPress ? function(e) {
@@ -7184,7 +7187,7 @@ var require_createComponent_native = __commonJS({
         }, [
           groupName
         ]);
-        if ((groupName || propsIn.focusWithinStyle) && (content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ComponentContext.ComponentContext.Provider, {
+        if (("group" in props || propsIn.focusWithinStyle) && (content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ComponentContext.ComponentContext.Provider, {
           ...componentContext,
           groups: subGroupContext,
           setParentFocusState: setStateShallow,