tamagui 1.138.3 → 1.138.4

package/dist/native.cjs

@@ -3115,12 +3115,12 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
   for (var _key in value) {
     var subKey = conf2.shorthands[_key] || _key, val = value[_key];
     if (!(!styleProps2.noSkip && subKey in skipProps)) {
+      if (staticConfig) {
+        var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 || (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
+        contextProps && subKey in contextProps && (styleState.overriddenContextProps || (styleState.overriddenContextProps = {}), styleState.overriddenContextProps[subKey] = val);
+      }
       if (styleProps2.noExpand) res[subKey] = val;
       else if (variants2 && subKey in variants2) {
-        if (staticConfig) {
-          var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 || (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
-          contextProps && subKey in contextProps && (styleState.resolvedContextVariants || (styleState.resolvedContextVariants = {}), styleState.resolvedContextVariants[subKey] = val);
-        }
         if (parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
         val[0] === "$" ? getTokenForKey(subKey, val, styleProps2, styleState) : val;
         else {
@@ -3544,6 +3544,10 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       (_styleState2 = styleState).style || (_styleState2.style = {}), Object.assign(styleState.style, normalizeStyle(style));
     }
   }
+  if (viewProps.tabIndex === 0) {
+    var _viewProps1, _accessible1;
+    (_accessible1 = (_viewProps1 = viewProps).accessible) !== null && _accessible1 !== void 0 || (_viewProps1.accessible = true);
+  }
   var style1 = styleState.style;
   if (style1 == null ? void 0 : style1.fontFamily) {
     var _getFont, faceInfo = (_getFont = getFont(style1.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
@@ -3564,7 +3568,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     dynamicThemeAccess,
     pseudoGroups,
     mediaGroups,
-    resolvedContextVariants: styleState.resolvedContextVariants
+    overriddenContextProps: styleState.overriddenContextProps
   }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
   if (!styleProps2.noMergeStyle && !asChildExceptStyleLike) {
     var style2 = styleState.style;
@@ -3582,26 +3586,33 @@ function mergeFlatTransforms(target, flatTransforms) {
   });
 }
 function mergeStyle(styleState, key, val, importance) {
-  var {
+  var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
     viewProps,
     styleProps: styleProps2,
     staticConfig,
     usedKeys
   } = styleState, existingImportance = usedKeys[key] || 0;
-  if (!(existingImportance > importance)) if (key in stylePropsTransform) {
-    var _styleState;
-    (_styleState = styleState).flatTransforms || (_styleState.flatTransforms = {}), usedKeys[key] = importance, styleState.flatTransforms[key] = val;
-  } else {
-    var shouldNormalize = isWeb, out = shouldNormalize ? normalizeValueWithProperty$1(val) : val;
-    if (
-      // accept is for props not styles
-      staticConfig.accept && key in staticConfig.accept
-    ) viewProps[key] = out;
-    else {
+  if (!(existingImportance > importance)) {
+    var contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 || (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
+    if (contextProps && key in contextProps) {
+      var _styleState;
+      (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {}), styleState.overriddenContextProps[key] = val;
+    }
+    if (key in stylePropsTransform) {
       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] : out;
+      (_styleState1 = styleState).flatTransforms || (_styleState1.flatTransforms = {}), usedKeys[key] = importance, styleState.flatTransforms[key] = val;
+    } else {
+      var shouldNormalize = isWeb, out = shouldNormalize ? normalizeValueWithProperty$1(val) : val;
+      if (
+        // accept is for props not styles
+        staticConfig.accept && key in staticConfig.accept
+      ) viewProps[key] = out;
+      else {
+        var _styleState2;
+        (_styleState2 = styleState).style || (_styleState2.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] : out;
+      }
     }
   }
 }
@@ -4120,11 +4131,11 @@ function createComponent(staticConfig) {
       styledContext: styledContextValue
     }, themeName = (themeState == null ? void 0 : themeState.name) || "";
     var splitStyles = useSplitStyles(props, staticConfig, theme, themeName, state, styleProps2, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp), isPassthrough = !splitStyles, contextForOverride = staticConfig.context;
-    if (splitStyles == null ? void 0 : splitStyles.resolvedContextVariants) {
-      var _staticConfig_parentStaticConfig, contextForVariants = staticConfig.context || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : _staticConfig_parentStaticConfig.context);
-      if (contextForVariants) {
-        for (var key in splitStyles.resolvedContextVariants) overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = splitStyles.resolvedContextVariants[key];
-        staticConfig.context || (contextForOverride = contextForVariants);
+    if (splitStyles == null ? void 0 : splitStyles.overriddenContextProps) {
+      var _staticConfig_parentStaticConfig, contextForProps = staticConfig.context || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : _staticConfig_parentStaticConfig.context);
+      if (contextForProps) {
+        for (var key in splitStyles.overriddenContextProps) overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = splitStyles.overriddenContextProps[key];
+        staticConfig.context || (contextForOverride = contextForProps);
       }
     }
     var groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
@@ -9855,11 +9866,18 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
   })(), [isShowingInnerSheet, setIsShowingInnerSheet] = React.useState(false), shouldHideParentSheet = modal && isShowingInnerSheet && // if not using weird portal limitation we dont need to hide parent sheet
   USE_NATIVE_PORTAL, sheetInsideSheet = React.useContext(SheetInsideSheetContext), onInnerSheet = React.useCallback(function(hasChild) {
     setIsShowingInnerSheet(hasChild);
-  }, []), positions = React.useMemo(function() {
+  }, []), stableFrameSize = React.useRef(frameSize);
+  React.useEffect(function() {
+    open2 && frameSize && (stableFrameSize.current = frameSize);
+  }, [open2, frameSize]);
+  var positions = React.useMemo(function() {
     return snapPoints.map(function(point) {
-      return getYPositions(snapPointsMode, point, screenSize, frameSize);
+      return (
+        // FIX: Use stable frameSize when closing to prevent position jumps
+        getYPositions(snapPointsMode, point, screenSize, open2 ? frameSize : stableFrameSize.current)
+      );
     });
-  }, [screenSize, frameSize, snapPoints, snapPointsMode]), {
+  }, [screenSize, frameSize, snapPoints, snapPointsMode, open2]), {
     useAnimatedNumber,
     useAnimatedNumberStyle,
     useAnimatedNumberReaction
@@ -9974,9 +9992,12 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
       onPanResponderRelease: finish
     });
   }, [disableDrag, isShowingInnerSheet, animateTo, frameSize, positions, setPosition]), handleAnimationViewLayout = React.useCallback(function(e2) {
-    var _e_nativeEvent, next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions.get(relativeDimensionTo).height);
-    next && setFrameSize(next);
-  }, []), handleMaxContentViewLayout = React.useCallback(function(e2) {
+    var _e_nativeEvent;
+    if (!(!open2 && stableFrameSize.current !== 0)) {
+      var next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions.get(relativeDimensionTo).height);
+      next && setFrameSize(next);
+    }
+  }, [open2]), handleMaxContentViewLayout = React.useCallback(function(e2) {
     var _e_nativeEvent, next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions.get(relativeDimensionTo).height);
     next && setMaxContentSize(next);
   }, []), animatedStyle = useAnimatedNumberStyle(animatedNumber, function(val) {
@@ -10324,13 +10345,18 @@ function createSheet(param) {
       frameSize,
       contentRef,
       open: open2
-    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), sheetContents = React.useMemo(function() {
+    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), stableFrameSize = React.useRef(frameSize);
+    React.useEffect(function() {
+      open2 && frameSize && (stableFrameSize.current = frameSize);
+    }, [open2, frameSize]);
+    var sheetContents = React.useMemo(function() {
+      var shouldUseFixedHeight = hasFit && !open2 && stableFrameSize.current;
       return (
         // @ts-expect-error
         /* @__PURE__ */ jsxRuntimeExports.jsxs(Frame2, __spreadProps(__spreadValues({
           ref: composedContentRef,
-          flex: hasFit ? 0 : 1,
-          height: hasFit ? void 0 : frameSize,
+          flex: hasFit && open2 ? 0 : 1,
+          height: shouldUseFixedHeight ? stableFrameSize.current : hasFit ? void 0 : frameSize,
           pointerEvents: open2 ? "auto" : "none"
         }, props), {
           children: [/* @__PURE__ */ jsxRuntimeExports.jsx(StackZIndexContext, {
@@ -11374,6 +11400,8 @@ var ButtonContext = createStyledContext({
   context: ButtonContext,
   role: "button",
   focusable: true,
+  // forces runtime pressStyle so it passes through context text colors
+  disableClassName: true,
   variants: {
     unstyled: {
       false: {

package/dist/test.cjs

@@ -3356,12 +3356,12 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
   for (var _key in value) {
     var subKey = conf2.shorthands[_key] || _key, val = value[_key];
     if (!(!styleProps2.noSkip && subKey in skipProps)) {
+      if (staticConfig) {
+        var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 || (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
+        contextProps && subKey in contextProps && (styleState.overriddenContextProps || (styleState.overriddenContextProps = {}), styleState.overriddenContextProps[subKey] = val);
+      }
       if (styleProps2.noExpand) res[subKey] = val;
       else if (variants2 && subKey in variants2) {
-        if (staticConfig) {
-          var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 || (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
-          contextProps && subKey in contextProps && (styleState.resolvedContextVariants || (styleState.resolvedContextVariants = {}), styleState.resolvedContextVariants[subKey] = val);
-        }
         if (parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
         val[0] === "$" ? getTokenForKey(subKey, val, styleProps2, styleState) : val;
         else {
@@ -3786,6 +3786,10 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       (_styleState2 = styleState).style || (_styleState2.style = {}), Object.assign(styleState.style, normalizeStyle(style));
     }
   }
+  if (viewProps.tabIndex === 0) {
+    var _viewProps1, _accessible1;
+    (_accessible1 = (_viewProps1 = viewProps).accessible) !== null && _accessible1 !== void 0 || (_viewProps1.accessible = true);
+  }
   var style1 = styleState.style;
   if (style1 == null ? void 0 : style1.fontFamily) {
     var _getFont, faceInfo = (_getFont = getFont(style1.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
@@ -3806,7 +3810,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     dynamicThemeAccess,
     pseudoGroups,
     mediaGroups,
-    resolvedContextVariants: styleState.resolvedContextVariants
+    overriddenContextProps: styleState.overriddenContextProps
   }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
   if (!styleProps2.noMergeStyle && !asChildExceptStyleLike) {
     var style2 = styleState.style;
@@ -3824,26 +3828,33 @@ function mergeFlatTransforms(target, flatTransforms) {
   });
 }
 function mergeStyle(styleState, key, val, importance) {
-  var {
+  var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
     viewProps,
     styleProps: styleProps2,
     staticConfig,
     usedKeys
   } = styleState, existingImportance = usedKeys[key] || 0;
-  if (!(existingImportance > importance)) if (key in stylePropsTransform) {
-    var _styleState;
-    (_styleState = styleState).flatTransforms || (_styleState.flatTransforms = {}), usedKeys[key] = importance, styleState.flatTransforms[key] = val;
-  } else {
-    var shouldNormalize = isWeb, out = shouldNormalize ? normalizeValueWithProperty$1(val) : val;
-    if (
-      // accept is for props not styles
-      staticConfig.accept && key in staticConfig.accept
-    ) viewProps[key] = out;
-    else {
+  if (!(existingImportance > importance)) {
+    var contextProps = ((_staticConfig_context = staticConfig.context) === null || _staticConfig_context === void 0 ? void 0 : _staticConfig_context.props) || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 || (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.props);
+    if (contextProps && key in contextProps) {
+      var _styleState;
+      (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {}), styleState.overriddenContextProps[key] = val;
+    }
+    if (key in stylePropsTransform) {
       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] : out;
+      (_styleState1 = styleState).flatTransforms || (_styleState1.flatTransforms = {}), usedKeys[key] = importance, styleState.flatTransforms[key] = val;
+    } else {
+      var shouldNormalize = isWeb, out = shouldNormalize ? normalizeValueWithProperty$1(val) : val;
+      if (
+        // accept is for props not styles
+        staticConfig.accept && key in staticConfig.accept
+      ) viewProps[key] = out;
+      else {
+        var _styleState2;
+        (_styleState2 = styleState).style || (_styleState2.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] : out;
+      }
     }
   }
 }
@@ -4366,11 +4377,11 @@ function createComponent(staticConfig) {
       styledContext: styledContextValue
     }, themeName = (themeState == null ? void 0 : themeState.name) || "";
     var splitStyles = useSplitStyles(props, staticConfig, theme, themeName, state, styleProps2, null, componentContext, allGroupContexts, elementType, startedUnhydrated, debugProp), isPassthrough = !splitStyles, contextForOverride = staticConfig.context;
-    if (splitStyles == null ? void 0 : splitStyles.resolvedContextVariants) {
-      var _staticConfig_parentStaticConfig, contextForVariants = staticConfig.context || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : _staticConfig_parentStaticConfig.context);
-      if (contextForVariants) {
-        for (var key in splitStyles.resolvedContextVariants) overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = splitStyles.resolvedContextVariants[key];
-        staticConfig.context || (contextForOverride = contextForVariants);
+    if (splitStyles == null ? void 0 : splitStyles.overriddenContextProps) {
+      var _staticConfig_parentStaticConfig, contextForProps = staticConfig.context || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : _staticConfig_parentStaticConfig.context);
+      if (contextForProps) {
+        for (var key in splitStyles.overriddenContextProps) overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = splitStyles.overriddenContextProps[key];
+        staticConfig.context || (contextForOverride = contextForProps);
       }
     }
     var groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
@@ -10003,11 +10014,18 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
   })(), [isShowingInnerSheet, setIsShowingInnerSheet] = React.useState(false), shouldHideParentSheet = modal && isShowingInnerSheet && // if not using weird portal limitation we dont need to hide parent sheet
   USE_NATIVE_PORTAL, sheetInsideSheet = React.useContext(SheetInsideSheetContext), onInnerSheet = React.useCallback(function(hasChild) {
     setIsShowingInnerSheet(hasChild);
-  }, []), positions = React.useMemo(function() {
+  }, []), stableFrameSize = React.useRef(frameSize);
+  React.useEffect(function() {
+    open2 && frameSize && (stableFrameSize.current = frameSize);
+  }, [open2, frameSize]);
+  var positions = React.useMemo(function() {
     return snapPoints.map(function(point) {
-      return getYPositions(snapPointsMode, point, screenSize, frameSize);
+      return (
+        // FIX: Use stable frameSize when closing to prevent position jumps
+        getYPositions(snapPointsMode, point, screenSize, open2 ? frameSize : stableFrameSize.current)
+      );
     });
-  }, [screenSize, frameSize, snapPoints, snapPointsMode]), {
+  }, [screenSize, frameSize, snapPoints, snapPointsMode, open2]), {
     useAnimatedNumber,
     useAnimatedNumberStyle,
     useAnimatedNumberReaction
@@ -10122,9 +10140,12 @@ var hiddenSize = 10000.1, relativeDimensionTo = "screen", SheetImplementationCus
       onPanResponderRelease: finish
     });
   }, [disableDrag, isShowingInnerSheet, animateTo, frameSize, positions, setPosition]), handleAnimationViewLayout = React.useCallback(function(e2) {
-    var _e_nativeEvent, next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions.get(relativeDimensionTo).height);
-    next && setFrameSize(next);
-  }, []), handleMaxContentViewLayout = React.useCallback(function(e2) {
+    var _e_nativeEvent;
+    if (!(!open2 && stableFrameSize.current !== 0)) {
+      var next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions.get(relativeDimensionTo).height);
+      next && setFrameSize(next);
+    }
+  }, [open2]), handleMaxContentViewLayout = React.useCallback(function(e2) {
     var _e_nativeEvent, next = Math.min((_e_nativeEvent = e2.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.layout.height, Dimensions.get(relativeDimensionTo).height);
     next && setMaxContentSize(next);
   }, []), animatedStyle = useAnimatedNumberStyle(animatedNumber, function(val) {
@@ -10472,13 +10493,18 @@ function createSheet(param) {
       frameSize,
       contentRef,
       open: open2
-    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), sheetContents = React.useMemo(function() {
+    } = context2, composedContentRef = useComposedRefs(forwardedRef, contentRef), offscreenSize = useSheetOffscreenSize(context2), stableFrameSize = React.useRef(frameSize);
+    React.useEffect(function() {
+      open2 && frameSize && (stableFrameSize.current = frameSize);
+    }, [open2, frameSize]);
+    var sheetContents = React.useMemo(function() {
+      var shouldUseFixedHeight = hasFit && !open2 && stableFrameSize.current;
       return (
         // @ts-expect-error
         /* @__PURE__ */ jsxRuntimeExports.jsxs(Frame2, __spreadProps(__spreadValues({
           ref: composedContentRef,
-          flex: hasFit ? 0 : 1,
-          height: hasFit ? void 0 : frameSize,
+          flex: hasFit && open2 ? 0 : 1,
+          height: shouldUseFixedHeight ? stableFrameSize.current : hasFit ? void 0 : frameSize,
           pointerEvents: open2 ? "auto" : "none"
         }, props), {
           children: [/* @__PURE__ */ jsxRuntimeExports.jsx(StackZIndexContext, {
@@ -11522,6 +11548,8 @@ var ButtonContext = createStyledContext({
   context: ButtonContext,
   role: "button",
   focusable: true,
+  // forces runtime pressStyle so it passes through context text colors
+  disableClassName: true,
   variants: {
     unstyled: {
       false: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "1.138.3",
+  "version": "1.138.4",
   "type": "module",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "removeSideEffects": true,
@@ -81,62 +81,62 @@
     }
   },
   "dependencies": {
-    "@tamagui/accordion": "1.138.3",
-    "@tamagui/adapt": "1.138.3",
-    "@tamagui/alert-dialog": "1.138.3",
-    "@tamagui/animate-presence": "1.138.3",
-    "@tamagui/avatar": "1.138.3",
-    "@tamagui/button": "1.138.3",
-    "@tamagui/card": "1.138.3",
-    "@tamagui/checkbox": "1.138.3",
-    "@tamagui/compose-refs": "1.138.3",
-    "@tamagui/constants": "1.138.3",
-    "@tamagui/core": "1.138.3",
-    "@tamagui/create-context": "1.138.3",
-    "@tamagui/dialog": "1.138.3",
-    "@tamagui/elements": "1.138.3",
-    "@tamagui/fake-react-native": "1.138.3",
-    "@tamagui/focusable": "1.138.3",
-    "@tamagui/font-size": "1.138.3",
-    "@tamagui/form": "1.138.3",
-    "@tamagui/get-button-sized": "1.138.3",
-    "@tamagui/get-font-sized": "1.138.3",
-    "@tamagui/get-token": "1.138.3",
-    "@tamagui/group": "1.138.3",
-    "@tamagui/helpers-tamagui": "1.138.3",
-    "@tamagui/image": "1.138.3",
-    "@tamagui/label": "1.138.3",
-    "@tamagui/linear-gradient": "1.138.3",
-    "@tamagui/list-item": "1.138.3",
-    "@tamagui/polyfill-dev": "1.138.3",
-    "@tamagui/popover": "1.138.3",
-    "@tamagui/popper": "1.138.3",
-    "@tamagui/portal": "1.138.3",
-    "@tamagui/progress": "1.138.3",
-    "@tamagui/radio-group": "1.138.3",
-    "@tamagui/react-native-media-driver": "1.138.3",
-    "@tamagui/scroll-view": "1.138.3",
-    "@tamagui/select": "1.138.3",
-    "@tamagui/separator": "1.138.3",
-    "@tamagui/shapes": "1.138.3",
-    "@tamagui/sheet": "1.138.3",
-    "@tamagui/slider": "1.138.3",
-    "@tamagui/stacks": "1.138.3",
-    "@tamagui/switch": "1.138.3",
-    "@tamagui/tabs": "1.138.3",
-    "@tamagui/text": "1.138.3",
-    "@tamagui/theme": "1.138.3",
-    "@tamagui/toggle-group": "1.138.3",
-    "@tamagui/tooltip": "1.138.3",
-    "@tamagui/use-controllable-state": "1.138.3",
-    "@tamagui/use-debounce": "1.138.3",
-    "@tamagui/use-force-update": "1.138.3",
-    "@tamagui/use-window-dimensions": "1.138.3",
-    "@tamagui/visually-hidden": "1.138.3",
-    "@tamagui/z-index-stack": "1.138.3"
+    "@tamagui/accordion": "1.138.4",
+    "@tamagui/adapt": "1.138.4",
+    "@tamagui/alert-dialog": "1.138.4",
+    "@tamagui/animate-presence": "1.138.4",
+    "@tamagui/avatar": "1.138.4",
+    "@tamagui/button": "1.138.4",
+    "@tamagui/card": "1.138.4",
+    "@tamagui/checkbox": "1.138.4",
+    "@tamagui/compose-refs": "1.138.4",
+    "@tamagui/constants": "1.138.4",
+    "@tamagui/core": "1.138.4",
+    "@tamagui/create-context": "1.138.4",
+    "@tamagui/dialog": "1.138.4",
+    "@tamagui/elements": "1.138.4",
+    "@tamagui/fake-react-native": "1.138.4",
+    "@tamagui/focusable": "1.138.4",
+    "@tamagui/font-size": "1.138.4",
+    "@tamagui/form": "1.138.4",
+    "@tamagui/get-button-sized": "1.138.4",
+    "@tamagui/get-font-sized": "1.138.4",
+    "@tamagui/get-token": "1.138.4",
+    "@tamagui/group": "1.138.4",
+    "@tamagui/helpers-tamagui": "1.138.4",
+    "@tamagui/image": "1.138.4",
+    "@tamagui/label": "1.138.4",
+    "@tamagui/linear-gradient": "1.138.4",
+    "@tamagui/list-item": "1.138.4",
+    "@tamagui/polyfill-dev": "1.138.4",
+    "@tamagui/popover": "1.138.4",
+    "@tamagui/popper": "1.138.4",
+    "@tamagui/portal": "1.138.4",
+    "@tamagui/progress": "1.138.4",
+    "@tamagui/radio-group": "1.138.4",
+    "@tamagui/react-native-media-driver": "1.138.4",
+    "@tamagui/scroll-view": "1.138.4",
+    "@tamagui/select": "1.138.4",
+    "@tamagui/separator": "1.138.4",
+    "@tamagui/shapes": "1.138.4",
+    "@tamagui/sheet": "1.138.4",
+    "@tamagui/slider": "1.138.4",
+    "@tamagui/stacks": "1.138.4",
+    "@tamagui/switch": "1.138.4",
+    "@tamagui/tabs": "1.138.4",
+    "@tamagui/text": "1.138.4",
+    "@tamagui/theme": "1.138.4",
+    "@tamagui/toggle-group": "1.138.4",
+    "@tamagui/tooltip": "1.138.4",
+    "@tamagui/use-controllable-state": "1.138.4",
+    "@tamagui/use-debounce": "1.138.4",
+    "@tamagui/use-force-update": "1.138.4",
+    "@tamagui/use-window-dimensions": "1.138.4",
+    "@tamagui/visually-hidden": "1.138.4",
+    "@tamagui/z-index-stack": "1.138.4"
   },
   "devDependencies": {
-    "@tamagui/build": "1.138.3",
+    "@tamagui/build": "1.138.4",
     "react": "*",
     "react-native": "0.81.5",
     "react-native-web": "^0.21.0"