tamagui 1.138.1 → 1.138.3

package/dist/native.cjs

@@ -3117,6 +3117,10 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
     if (!(!styleProps2.noSkip && subKey in skipProps)) {
       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 {
@@ -3279,6 +3283,17 @@ function _type_of$5(obj) {
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var conf;
+function normalizeGroupKey(key, groupContext) {
+  var parts = key.split("-"), plen = parts.length;
+  if (
+    // check if its actually a simple group selector to avoid breaking selectors
+    plen === 2 || plen === 3 && pseudoPriorities[parts[parts.length - 1]]
+  ) {
+    var name = parts[1];
+    if (groupContext && !groupContext[name]) return key.replace("$group-", "$group-true-");
+  }
+  return key;
+}
 function isValidStyleKey(key, validStyles2, accept) {
   return key in validStyles2 ? true : accept && key in accept;
 }
@@ -3305,16 +3320,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       return "continue";
     }
     var isVariant = !isValidStyleKeyInit && variants2 && keyInit in variants2, isStyleLikeKey = isValidStyleKeyInit || isVariant, isPseudo = keyInit in validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo ? getMediaKey(keyInit) : false, isMediaOrPseudo = !!(isMedia || isPseudo);
-    if (isMediaOrPseudo && isMedia === "group") {
-      var parts = keyInit.split("-"), plen = parts.length;
-      if (
-        // check if its actually a simple group selector to avoid breaking selectors
-        plen === 2 || plen === 3 && pseudoPriorities[parts[parts.length - 1]]
-      ) {
-        var name2 = parts[1];
-        groupContext && !(groupContext == null ? void 0 : groupContext[name2]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
-      }
-    }
+    isMediaOrPseudo && isMedia === "group" && (keyInit = normalizeGroupKey(keyInit, groupContext));
     var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !noExpand;
     if (isStyleProp && (asChild === "except-style" || asChild === "except-style-web")) return "continue";
     var shouldPassProp = !isStyleProp && isHOC || // is in parent variants
@@ -3338,7 +3344,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           mergeStyle(styleState, key4, val2, 1);
           return;
         }
-        if (isPseudo = key4 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key4), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants2 && key4 in variants2, (inlineProps == null ? void 0 : inlineProps.has(key4)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key4))) {
+        if (isPseudo = key4 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key4), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants2 && key4 in variants2, isMedia === "group" && (key4 = normalizeGroupKey(key4, groupContext)), (inlineProps == null ? void 0 : inlineProps.has(key4)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key4))) {
           var _props_key;
           viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
         }
@@ -3557,7 +3563,8 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     rulesToInsert,
     dynamicThemeAccess,
     pseudoGroups,
-    mediaGroups
+    mediaGroups,
+    resolvedContextVariants: styleState.resolvedContextVariants
   }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
   if (!styleProps2.noMergeStyle && !asChildExceptStyleLike) {
     var style2 = styleState.style;
@@ -3865,9 +3872,16 @@ function _type_of$4(obj) {
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var useComponentState = function(props, animationDriver, staticConfig, config) {
-  var _animationDriver_usePresence, isHydrated = useDidFinishSSR(), needsHydration = !useIsClientOnly(), [startedUnhydrated] = React.useState(needsHydration && !isHydrated), useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, {
+  var _animationDriver_usePresence, isHydrated = useDidFinishSSR(), needsHydration = !useIsClientOnly(), useAnimations = (animationDriver == null ? void 0 : animationDriver.isStub) ? void 0 : animationDriver == null ? void 0 : animationDriver.useAnimations, {
     isHOC
-  } = staticConfig, stateRef = React.useRef({}), hasAnimationProp = !!(!isHOC && "animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSS = animationDriver == null ? void 0 : animationDriver.supportsCSS, curStateRef = stateRef.current;
+  } = staticConfig, stateRef = React.useRef(
+    // performance: avoid creating object every render
+    void 0
+  );
+  stateRef.current || (stateRef.current = {
+    startedUnhydrated: needsHydration && !isHydrated
+  });
+  var hasAnimationProp = !!(!isHOC && "animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSS = animationDriver == null ? void 0 : animationDriver.supportsCSS, curStateRef = stateRef.current;
   !needsHydration && hasAnimationProp && (curStateRef.hasAnimated = true);
   var willBeAnimatedClient = (function() {
     var next = !!(hasAnimationProp && !isHOC && useAnimations);
@@ -3907,7 +3921,7 @@ var useComponentState = function(props, animationDriver, staticConfig, config) {
   }
   var noClass = !isWeb;
   return {
-    startedUnhydrated,
+    startedUnhydrated: curStateRef.startedUnhydrated,
     curStateRef,
     disabled,
     groupName,
@@ -4015,7 +4029,7 @@ function createComponent(staticConfig) {
       nextProps && (props = nextProps), overriddenContextProps = overrides;
     }
     var componentName2 = props.componentName || staticConfig.componentName;
-    var componentContext = React.useContext(ComponentContext), groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, animationDriver, staticConfig), {
+    var componentContext = React.useContext(ComponentContext), groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, (animationDriver == null ? void 0 : animationDriver.isStub) ? null : animationDriver, staticConfig), {
       disabled,
       groupName,
       hasAnimationProp,
@@ -4105,7 +4119,15 @@ function createComponent(staticConfig) {
       willBeAnimated,
       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, groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
+    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);
+      }
+    }
+    var groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
     if (!isPassthrough && groupContext && // avoids onLayout if we don't need it
     props.containerType !== "normal") {
       var groupState = groupContext == null ? void 0 : groupContext.state;
@@ -4147,8 +4169,8 @@ function createComponent(staticConfig) {
       }), stateRef.current.setStateShallow = function(nextOrGetNext) {
         var prev = stateRef.current.nextState || state, next = typeof nextOrGetNext == "function" ? nextOrGetNext(prev) : nextOrGetNext;
         if (!(next === prev || isEqualShallow(prev, next))) {
-          var canAvoidReRender = Object.keys(next).every(function(key2) {
-            return avoidReRenderKeys.has(key2);
+          var canAvoidReRender = Object.keys(next).every(function(key3) {
+            return avoidReRenderKeys.has(key3);
           }), updatedState = __spreadValues(__spreadValues({}, prev), next);
           if (stateRef.current.nextState = updatedState, canAvoidReRender) {
             var _stateRef_current_updateStyleListener, _stateRef_current;
@@ -4394,9 +4416,9 @@ function createComponent(staticConfig) {
     }))), "group" in props && (content = /* @__PURE__ */ jsxRuntimeExports.jsx(GroupContext.Provider, {
       value: allGroupContexts,
       children: content
-    })), content = disableTheme || !splitStyles ? content : getThemedChildren(themeState, content, themeStateProps, false, stateRef), overriddenContextProps) {
-      var Provider = staticConfig.context.Provider;
-      for (var key in styledContextValue) key in overriddenContextProps || (overriddenContextProps[key] = styledContextValue[key]);
+    })), content = disableTheme || !splitStyles ? content : getThemedChildren(themeState, content, themeStateProps, false, stateRef), overriddenContextProps && contextForOverride) {
+      var Provider = contextForOverride.Provider;
+      for (var key1 in styledContextValue) key1 in overriddenContextProps || (overriddenContextProps[key1] = styledContextValue[key1]);
       debugProp && console.info("overriddenContextProps", overriddenContextProps), content = /* @__PURE__ */ jsxRuntimeExports.jsx(Provider, __spreadProps(__spreadValues({
         __disableMergeDefaultValues: true
       }, overriddenContextProps), {
@@ -4742,6 +4764,35 @@ var cache$1 = /* @__PURE__ */ new WeakMap(), createVariables = function(tokens)
   }
   return cache$1.set(res, true), res;
 };
+var noAnimationDriver = function(method) {
+  console.warn(`No animation driver configured. To use ${method}, you must pass \`animations\` to createTamagui. See: https://tamagui.dev/docs/core/animations`);
+}, createEmptyAnimationDriver = function() {
+  return {
+    isReactNative: false,
+    supportsCSS: true,
+    classNameAnimation: true,
+    isStub: true,
+    animations: {},
+    useAnimations: function() {
+      return noAnimationDriver("animations");
+    },
+    usePresence: function() {
+      return noAnimationDriver("usePresence");
+    },
+    ResetPresence: function() {
+      return noAnimationDriver("ResetPresence");
+    },
+    useAnimatedNumber: function() {
+      return noAnimationDriver("useAnimatedNumber");
+    },
+    useAnimatedNumberStyle: function() {
+      return noAnimationDriver("useAnimatedNumberStyle");
+    },
+    useAnimatedNumberReaction: function() {
+      return noAnimationDriver("useAnimatedNumberReaction");
+    }
+  };
+}, defaultAnimationDriver = createEmptyAnimationDriver();
 function insertFont(name, fontIn) {
   var font = createFont(fontIn), tokened = createVariables(font, name), parsed = parseFont(tokened);
   return setConfigFont(name, tokened, parsed), parsed;
@@ -4824,7 +4875,7 @@ function createTamagui$2(configIn) {
     fonts: {},
     onlyAllowShorthands: false,
     fontLanguages: [],
-    animations: {},
+    animations: defaultAnimationDriver,
     media: {}
   }, configIn), {
     unset,
@@ -4874,8 +4925,7 @@ function getThemesDeduped(themes2, colorTokens) {
       e2.names.push(themeName);
       continue;
     }
-    var theme = __spreadValues({}, rawTheme);
-    colorTokens && Object.assign(theme, colorTokens);
+    var theme = __spreadValues(__spreadValues({}, colorTokens), rawTheme);
     for (var key1 in theme) ensureThemeVariable(theme, key1);
     var deduped = {
       names: [themeName],
@@ -10491,7 +10541,9 @@ var DialogContext = createStyledContext(
           height: "auto",
           // ensure always in frame and right height
           maxHeight: "100vh",
-          position: "fixed"
+          position: "fixed",
+          // ensure dialog inherits stacking context from portal wrapper
+          zIndex: 1
         }
       }
     }
@@ -13931,7 +13983,7 @@ var needsRepropagation = isAndroid || isIos && !USE_NATIVE_PORTAL, PopoverContex
     virtualRef
   }), {
     scope,
-    asChild: rest.asChild,
+    asChild: true,
     children: trigger
   }));
 }), PopoverContentFrame = styled(PopperContentFrame, {

package/dist/test.cjs

@@ -3358,6 +3358,10 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
     if (!(!styleProps2.noSkip && subKey in skipProps)) {
       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 {
@@ -3520,6 +3524,17 @@ function _type_of$5(obj) {
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var conf;
+function normalizeGroupKey(key, groupContext) {
+  var parts = key.split("-"), plen = parts.length;
+  if (
+    // check if its actually a simple group selector to avoid breaking selectors
+    plen === 2 || plen === 3 && pseudoPriorities[parts[parts.length - 1]]
+  ) {
+    var name = parts[1];
+    if (groupContext && !groupContext[name]) return key.replace("$group-", "$group-true-");
+  }
+  return key;
+}
 function isValidStyleKey(key, validStyles2, accept) {
   return key in validStyles2 ? true : accept && key in accept;
 }
@@ -3547,16 +3562,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       return "continue";
     }
     var isVariant = !isValidStyleKeyInit && variants2 && keyInit in variants2, isStyleLikeKey = isValidStyleKeyInit || isVariant, isPseudo = keyInit in validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo ? getMediaKey(keyInit) : false, isMediaOrPseudo = !!(isMedia || isPseudo);
-    if (isMediaOrPseudo && isMedia === "group") {
-      var parts = keyInit.split("-"), plen = parts.length;
-      if (
-        // check if its actually a simple group selector to avoid breaking selectors
-        plen === 2 || plen === 3 && pseudoPriorities[parts[parts.length - 1]]
-      ) {
-        var name2 = parts[1];
-        groupContext && !(groupContext == null ? void 0 : groupContext[name2]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
-      }
-    }
+    isMediaOrPseudo && isMedia === "group" && (keyInit = normalizeGroupKey(keyInit, groupContext));
     var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !noExpand;
     if (isStyleProp && (asChild === "except-style" || asChild === "except-style-web")) return "continue";
     var shouldPassProp = !isStyleProp && isHOC || // is in parent variants
@@ -3580,7 +3586,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           mergeStyle(styleState, key4, val2, 1);
           return;
         }
-        if (isPseudo = key4 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key4), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants2 && key4 in variants2, (inlineProps == null ? void 0 : inlineProps.has(key4)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key4))) {
+        if (isPseudo = key4 in validPseudoKeys, isMedia = isPseudo ? false : getMediaKey(key4), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants2 && key4 in variants2, isMedia === "group" && (key4 = normalizeGroupKey(key4, groupContext)), (inlineProps == null ? void 0 : inlineProps.has(key4)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key4))) {
           var _props_key;
           viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
         }
@@ -3799,7 +3805,8 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     rulesToInsert,
     dynamicThemeAccess,
     pseudoGroups,
-    mediaGroups
+    mediaGroups,
+    resolvedContextVariants: styleState.resolvedContextVariants
   }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
   if (!styleProps2.noMergeStyle && !asChildExceptStyleLike) {
     var style2 = styleState.style;
@@ -4107,9 +4114,16 @@ function _type_of$4(obj) {
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var useComponentState = function(props, animationDriver, staticConfig, config) {
-  var _animationDriver_usePresence, isHydrated = useDidFinishSSR(), needsHydration = !useIsClientOnly(), [startedUnhydrated] = React.useState(needsHydration && !isHydrated), useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, {
+  var _animationDriver_usePresence, isHydrated = useDidFinishSSR(), needsHydration = !useIsClientOnly(), useAnimations = (animationDriver == null ? void 0 : animationDriver.isStub) ? void 0 : animationDriver == null ? void 0 : animationDriver.useAnimations, {
     isHOC
-  } = staticConfig, stateRef = React.useRef({}), hasAnimationProp = !!(!isHOC && "animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSS = animationDriver == null ? void 0 : animationDriver.supportsCSS, curStateRef = stateRef.current;
+  } = staticConfig, stateRef = React.useRef(
+    // performance: avoid creating object every render
+    void 0
+  );
+  stateRef.current || (stateRef.current = {
+    startedUnhydrated: needsHydration && !isHydrated
+  });
+  var hasAnimationProp = !!(!isHOC && "animation" in props || props.style && hasAnimatedStyleValue(props.style)), supportsCSS = animationDriver == null ? void 0 : animationDriver.supportsCSS, curStateRef = stateRef.current;
   !needsHydration && hasAnimationProp && (curStateRef.hasAnimated = true);
   var willBeAnimatedClient = (function() {
     var next = !!(hasAnimationProp && !isHOC && useAnimations);
@@ -4149,7 +4163,7 @@ var useComponentState = function(props, animationDriver, staticConfig, config) {
   }
   var noClass = !isWeb;
   return {
-    startedUnhydrated,
+    startedUnhydrated: curStateRef.startedUnhydrated,
     curStateRef,
     disabled,
     groupName,
@@ -4261,7 +4275,7 @@ function createComponent(staticConfig) {
       nextProps && (props = nextProps), overriddenContextProps = overrides;
     }
     var componentName2 = props.componentName || staticConfig.componentName;
-    var componentContext = React.useContext(ComponentContext), groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, animationDriver, staticConfig), {
+    var componentContext = React.useContext(ComponentContext), groupContextParent = React.useContext(GroupContext), animationDriver = componentContext.animationDriver, useAnimations = animationDriver == null ? void 0 : animationDriver.useAnimations, componentState = useComponentState(props, (animationDriver == null ? void 0 : animationDriver.isStub) ? null : animationDriver, staticConfig), {
       disabled,
       groupName,
       hasAnimationProp,
@@ -4351,7 +4365,15 @@ function createComponent(staticConfig) {
       willBeAnimated,
       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, groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
+    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);
+      }
+    }
+    var groupContext = groupName && (allGroupContexts == null ? void 0 : allGroupContexts[groupName]) || null;
     if (!isPassthrough && groupContext && // avoids onLayout if we don't need it
     props.containerType !== "normal") {
       var groupState = groupContext == null ? void 0 : groupContext.state;
@@ -4393,8 +4415,8 @@ function createComponent(staticConfig) {
       }), stateRef.current.setStateShallow = function(nextOrGetNext) {
         var prev = stateRef.current.nextState || state, next = typeof nextOrGetNext == "function" ? nextOrGetNext(prev) : nextOrGetNext;
         if (!(next === prev || isEqualShallow(prev, next))) {
-          var canAvoidReRender = Object.keys(next).every(function(key2) {
-            return avoidReRenderKeys.has(key2);
+          var canAvoidReRender = Object.keys(next).every(function(key3) {
+            return avoidReRenderKeys.has(key3);
           }), updatedState = __spreadValues(__spreadValues({}, prev), next);
           if (stateRef.current.nextState = updatedState, canAvoidReRender) {
             var _stateRef_current_updateStyleListener, _stateRef_current;
@@ -4640,9 +4662,9 @@ function createComponent(staticConfig) {
     }))), "group" in props && (content = /* @__PURE__ */ jsxRuntimeExports.jsx(GroupContext.Provider, {
       value: allGroupContexts,
       children: content
-    })), content = disableTheme || !splitStyles ? content : getThemedChildren(themeState, content, themeStateProps, false, stateRef), overriddenContextProps) {
-      var Provider = staticConfig.context.Provider;
-      for (var key in styledContextValue) key in overriddenContextProps || (overriddenContextProps[key] = styledContextValue[key]);
+    })), content = disableTheme || !splitStyles ? content : getThemedChildren(themeState, content, themeStateProps, false, stateRef), overriddenContextProps && contextForOverride) {
+      var Provider = contextForOverride.Provider;
+      for (var key1 in styledContextValue) key1 in overriddenContextProps || (overriddenContextProps[key1] = styledContextValue[key1]);
       debugProp && console.info("overriddenContextProps", overriddenContextProps), content = /* @__PURE__ */ jsxRuntimeExports.jsx(Provider, __spreadProps(__spreadValues({
         __disableMergeDefaultValues: true
       }, overriddenContextProps), {
@@ -4988,6 +5010,35 @@ var cache$1 = /* @__PURE__ */ new WeakMap(), createVariables = function(tokens)
   }
   return cache$1.set(res, true), res;
 };
+var noAnimationDriver = function(method) {
+  console.warn(`No animation driver configured. To use ${method}, you must pass \`animations\` to createTamagui. See: https://tamagui.dev/docs/core/animations`);
+}, createEmptyAnimationDriver = function() {
+  return {
+    isReactNative: false,
+    supportsCSS: true,
+    classNameAnimation: true,
+    isStub: true,
+    animations: {},
+    useAnimations: function() {
+      return noAnimationDriver("animations");
+    },
+    usePresence: function() {
+      return noAnimationDriver("usePresence");
+    },
+    ResetPresence: function() {
+      return noAnimationDriver("ResetPresence");
+    },
+    useAnimatedNumber: function() {
+      return noAnimationDriver("useAnimatedNumber");
+    },
+    useAnimatedNumberStyle: function() {
+      return noAnimationDriver("useAnimatedNumberStyle");
+    },
+    useAnimatedNumberReaction: function() {
+      return noAnimationDriver("useAnimatedNumberReaction");
+    }
+  };
+}, defaultAnimationDriver = createEmptyAnimationDriver();
 function insertFont(name, fontIn) {
   var font = createFont(fontIn), tokened = createVariables(font, name), parsed = parseFont(tokened);
   return setConfigFont(name, tokened, parsed), parsed;
@@ -5071,7 +5122,7 @@ function createTamagui$2(configIn) {
     fonts: {},
     onlyAllowShorthands: false,
     fontLanguages: [],
-    animations: {},
+    animations: defaultAnimationDriver,
     media: {}
   }, configIn), {
     unset,
@@ -5121,8 +5172,7 @@ function getThemesDeduped(themes2, colorTokens) {
       e2.names.push(themeName);
       continue;
     }
-    var theme = __spreadValues({}, rawTheme);
-    colorTokens && Object.assign(theme, colorTokens);
+    var theme = __spreadValues(__spreadValues({}, colorTokens), rawTheme);
     for (var key1 in theme) ensureThemeVariable(theme, key1);
     var deduped = {
       names: [themeName],
@@ -10639,7 +10689,9 @@ var DialogContext = createStyledContext(
           height: "auto",
           // ensure always in frame and right height
           maxHeight: "100vh",
-          position: "fixed"
+          position: "fixed",
+          // ensure dialog inherits stacking context from portal wrapper
+          zIndex: 1
         }
       }
     }
@@ -14079,7 +14131,7 @@ var needsRepropagation = isAndroid || isIos && !USE_NATIVE_PORTAL, PopoverContex
     virtualRef
   }), {
     scope,
-    asChild: rest.asChild,
+    asChild: true,
     children: trigger
   }));
 }), PopoverContentFrame = styled(PopperContentFrame, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "1.138.1",
+  "version": "1.138.3",
   "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.1",
-    "@tamagui/adapt": "1.138.1",
-    "@tamagui/alert-dialog": "1.138.1",
-    "@tamagui/animate-presence": "1.138.1",
-    "@tamagui/avatar": "1.138.1",
-    "@tamagui/button": "1.138.1",
-    "@tamagui/card": "1.138.1",
-    "@tamagui/checkbox": "1.138.1",
-    "@tamagui/compose-refs": "1.138.1",
-    "@tamagui/constants": "1.138.1",
-    "@tamagui/core": "1.138.1",
-    "@tamagui/create-context": "1.138.1",
-    "@tamagui/dialog": "1.138.1",
-    "@tamagui/elements": "1.138.1",
-    "@tamagui/fake-react-native": "1.138.1",
-    "@tamagui/focusable": "1.138.1",
-    "@tamagui/font-size": "1.138.1",
-    "@tamagui/form": "1.138.1",
-    "@tamagui/get-button-sized": "1.138.1",
-    "@tamagui/get-font-sized": "1.138.1",
-    "@tamagui/get-token": "1.138.1",
-    "@tamagui/group": "1.138.1",
-    "@tamagui/helpers-tamagui": "1.138.1",
-    "@tamagui/image": "1.138.1",
-    "@tamagui/label": "1.138.1",
-    "@tamagui/linear-gradient": "1.138.1",
-    "@tamagui/list-item": "1.138.1",
-    "@tamagui/polyfill-dev": "1.138.1",
-    "@tamagui/popover": "1.138.1",
-    "@tamagui/popper": "1.138.1",
-    "@tamagui/portal": "1.138.1",
-    "@tamagui/progress": "1.138.1",
-    "@tamagui/radio-group": "1.138.1",
-    "@tamagui/react-native-media-driver": "1.138.1",
-    "@tamagui/scroll-view": "1.138.1",
-    "@tamagui/select": "1.138.1",
-    "@tamagui/separator": "1.138.1",
-    "@tamagui/shapes": "1.138.1",
-    "@tamagui/sheet": "1.138.1",
-    "@tamagui/slider": "1.138.1",
-    "@tamagui/stacks": "1.138.1",
-    "@tamagui/switch": "1.138.1",
-    "@tamagui/tabs": "1.138.1",
-    "@tamagui/text": "1.138.1",
-    "@tamagui/theme": "1.138.1",
-    "@tamagui/toggle-group": "1.138.1",
-    "@tamagui/tooltip": "1.138.1",
-    "@tamagui/use-controllable-state": "1.138.1",
-    "@tamagui/use-debounce": "1.138.1",
-    "@tamagui/use-force-update": "1.138.1",
-    "@tamagui/use-window-dimensions": "1.138.1",
-    "@tamagui/visually-hidden": "1.138.1",
-    "@tamagui/z-index-stack": "1.138.1"
+    "@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"
   },
   "devDependencies": {
-    "@tamagui/build": "1.138.1",
+    "@tamagui/build": "1.138.3",
     "react": "*",
     "react-native": "0.81.5",
     "react-native-web": "^0.21.0"