tamagui 1.138.4 → 1.138.6

package/dist/native.cjs

@@ -3050,14 +3050,16 @@ var propMapper = function(key, value, styleState, disabled, map) {
         return;
       }
     }
-    if (styleProps2.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : isVariable(value) && (value = resolveVariableValue(key, value, styleProps2.resolveValues))), value != null) {
+    styleProps2.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]);
+    var originalValue = value;
+    if (value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : isVariable(value) && (value = resolveVariableValue(key, value, styleProps2.resolveValues))), value != null) {
       key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
       var expanded = styleProps2.noExpand ? null : expandStyle(key, value);
       if (expanded) for (var max2 = expanded.length, i = 0; i < max2; i++) {
         var [nkey, nvalue] = expanded[i];
-        map(nkey, nvalue);
+        map(nkey, nvalue, originalValue);
       }
-      else map(key, value);
+      else map(key, value, originalValue);
     }
   }
 }, resolveVariants = function(key, value, styleProps2, styleState, parentVariantKey) {
@@ -3117,7 +3119,10 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
     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 (contextProps && subKey in contextProps) {
+          var _styleState, _styleState1;
+          (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {}), styleState.overriddenContextProps[subKey] = val, (_styleState1 = styleState).originalContextPropValues || (_styleState1.originalContextPropValues = {}), styleState.originalContextPropValues[subKey] = val;
+        }
       }
       if (styleProps2.noExpand) res[subKey] = val;
       else if (variants2 && subKey in variants2) {
@@ -3282,7 +3287,7 @@ function _type_of$5(obj) {
   "@swc/helpers - typeof";
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-var conf;
+var conf, styleOriginalValues = /* @__PURE__ */ new WeakMap();
 function normalizeGroupKey(key, groupContext) {
   var parts = key.split("-"), plen = parts.length;
   if (
@@ -3329,7 +3334,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     if (!noSkip && keyInit in skipProps) return "continue";
     (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
     var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
-    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key4, val2) {
+    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key4, val2, originalVal) {
       var _parentStaticConfig_variants, isStyledContextProp = styledContext && key4 in styledContext;
       if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
         viewProps[key4] = val2;
@@ -3341,7 +3346,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           return;
         }
         if (!isHOC && isValidStyleKey(key4, validStyles$1, accept) || isAndroid && key4 === "elevation") {
-          mergeStyle(styleState, key4, val2, 1);
+          mergeStyle(styleState, key4, val2, 1, false, originalVal);
           return;
         }
         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))) {
@@ -3368,7 +3373,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           {
             var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled2 = componentState[descriptorKey] === false;
             isExit && (isDisabled2 = !styleProps2.isExiting), isEnter && componentState.unmounted === false && (isDisabled2 = true);
-            var importance = descriptor.priority;
+            var importance = descriptor.priority, pseudoOriginalValues = styleOriginalValues.get(pseudoStyleObject);
             for (var pkey in pseudoStyleObject) {
               var _$val = pseudoStyleObject[pkey];
               if (isDisabled2) applyDefaultStyle(pkey, styleState);
@@ -3379,7 +3384,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                     var _pseudos1, _key1;
                     pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = _$val;
                   }
-                  mergeStyle(styleState, pkey, _$val, importance);
+                  mergeStyle(styleState, pkey, _$val, importance, false, pseudoOriginalValues == null ? void 0 : pseudoOriginalValues[pkey]);
                 }
               }
             }
@@ -3398,10 +3403,10 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           var priority = mediaStylesSeen;
           if (mediaStylesSeen += 1, shouldDoClasses) ;
           else {
-            let mergeMediaStyle2 = function(key5, val3) {
+            let mergeMediaStyle2 = function(key5, val3, originalVal2) {
               var _styleState4;
               (_styleState4 = styleState).style || (_styleState4.style = {});
-              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState[mediaKeyShort], importanceBump);
+              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState[mediaKeyShort], importanceBump, debug, originalVal2);
               didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
             };
             var isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
@@ -3415,14 +3420,14 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               if (dynamicThemeAccess = true, isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
                 (_styleState3 = styleState).style || (_styleState3.style = {});
-                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort);
+                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1);
                 for (var subKey1 in mediaStyle1) {
                   var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), oppositeVal = extractValueFromDynamic(styleState.style[subKey1], oppositeScheme);
                   mediaStyle1[subKey1] = getDynamicVal({
                     scheme,
                     val: _$val1,
                     oppositeVal
-                  }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority);
+                  }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
                 }
               } else if (!(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
             } else if (isGroupMedia) {
@@ -3452,6 +3457,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                 importanceBump = priority1;
               }
             }
+            var mediaOriginalValues = styleOriginalValues.get(mediaStyle1);
             for (var subKey2 in mediaStyle1) {
               if (subKey2 === "space") {
                 space = valInit.space;
@@ -3459,8 +3465,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               }
               if (subKey2[0] === "$") {
                 if (!isActivePlatform(subKey2) || !isActiveTheme(subKey2, themeName)) continue;
-                for (var subSubKey in mediaStyle1[subKey2]) mergeMediaStyle2(subSubKey, mediaStyle1[subKey2][subSubKey]);
-              } else mergeMediaStyle2(subKey2, mediaStyle1[subKey2]);
+                var subOriginalValues = styleOriginalValues.get(mediaStyle1[subKey2]);
+                for (var subSubKey in mediaStyle1[subKey2]) mergeMediaStyle2(subSubKey, mediaStyle1[subKey2][subSubKey], subOriginalValues == null ? void 0 : subOriginalValues[subSubKey]);
+              } else mergeMediaStyle2(subKey2, mediaStyle1[subKey2], mediaOriginalValues == null ? void 0 : mediaOriginalValues[subKey2]);
             }
           }
           return;
@@ -3586,7 +3593,7 @@ function mergeFlatTransforms(target, flatTransforms) {
   });
 }
 function mergeStyle(styleState, key, val, importance) {
-  var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
+  var originalVal = arguments.length > 5 ? arguments[5] : void 0, _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
     viewProps,
     styleProps: styleProps2,
     staticConfig,
@@ -3595,8 +3602,10 @@ function mergeStyle(styleState, key, val, importance) {
   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;
+      var _styleState_originalContextPropValues, _styleState;
+      (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {});
+      var originalFromState = (_styleState_originalContextPropValues = styleState.originalContextPropValues) === null || _styleState_originalContextPropValues === void 0 ? void 0 : _styleState_originalContextPropValues[key], _ref;
+      styleState.overriddenContextProps[key] = (_ref = originalVal != null ? originalVal : originalFromState) !== null && _ref !== void 0 ? _ref : val;
     }
     if (key in stylePropsTransform) {
       var _styleState1;
@@ -3622,14 +3631,14 @@ var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
     key1 = conf2.shorthands[key1] || key1;
     var shouldSkip = !staticConfig.isHOC && key1 in skipProps && !styleProps2.noSkip;
     if (shouldSkip) return key = key1, "continue";
-    propMapper(key1, val, styleState, false, function(skey, sval) {
-      skey in validPseudoKeys && (sval = getSubStyle(styleState, skey, sval, avoidMergeTransform)), !avoidMergeTransform && skey in stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps2.noNormalize ? sval : normalizeValueWithProperty$1(sval);
+    propMapper(key1, val, styleState, false, function(skey, sval, originalVal) {
+      originalVal !== void 0 && (originalValues || (originalValues = {}), originalValues[skey] = originalVal), skey in validPseudoKeys && (sval = getSubStyle(styleState, skey, sval, avoidMergeTransform)), !avoidMergeTransform && skey in stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps2.noNormalize ? sval : normalizeValueWithProperty$1(sval);
     }), key = key1;
   }, {
     staticConfig,
     conf: conf2,
     styleProps: styleProps2
-  } = styleState, styleOut = {};
+  } = styleState, styleOut = {}, originalValues;
   for (var key in styleIn) _loop2(key);
   if (!avoidMergeTransform) {
     if (Array.isArray(styleOut.transform)) {
@@ -3638,7 +3647,7 @@ var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
     }
     styleState.flatTransforms && mergeFlatTransforms(styleOut, styleState.flatTransforms);
   }
-  return styleProps2.noNormalize || fixStyles(styleOut), styleOut;
+  return styleProps2.noNormalize || fixStyles(styleOut), originalValues && styleOriginalValues.set(styleOut, originalValues), styleOut;
 }, useSplitStyles = function(a, b2, c, d, e2, f, g, h2, i, j, k, l) {
   var res = getSplitStyles(a, b2, c, d, e2, f, g, h2, i, j, k, l);
   return res;
@@ -3675,15 +3684,16 @@ function passDownProp(viewProps, key, val) {
     delete viewProps[key], viewProps[key] = next;
   } else viewProps[key] = val;
 }
-function mergeMediaByImportance(styleState, mediaKey, key, value, isSizeMedia, importanceBump, debugProp) {
+function mergeMediaByImportance(styleState, mediaKey, key, value, isSizeMedia, importanceBump, debugProp, originalVal) {
   styleState.usedKeys;
   var importance = getMediaImportanceIfMoreImportant(mediaKey, key, styleState, isSizeMedia);
   if (importanceBump && (importance = (importance || 0) + importanceBump), importance === null) return false;
   if (key in pseudoDescriptors) {
     var descriptor = pseudoDescriptors[key], descriptorKey = descriptor.stateKey || descriptor.name, isDisabled2 = styleState.componentState[descriptorKey] === false;
     if (isDisabled2) return false;
-    for (var subKey in value) mergeStyle(styleState, subKey, value[subKey], importance);
-  } else mergeStyle(styleState, key, value, importance);
+    var pseudoOriginalValues = styleOriginalValues.get(value);
+    for (var subKey in value) mergeStyle(styleState, subKey, value[subKey], importance, false, pseudoOriginalValues == null ? void 0 : pseudoOriginalValues[subKey]);
+  } else mergeStyle(styleState, key, value, importance, false, originalVal);
   return true;
 }
 function normalizeStyle(style) {
@@ -11003,8 +11013,8 @@ var AlertDialogPortal = function(props) {
       scope,
       cancelRef,
       children: /* @__PURE__ */ jsxRuntimeExports.jsxs(DialogContent, __spreadProps(__spreadValues({
-        // @ts-ignore
         role: "alertdialog",
+        "aria-modal": true,
         scope: dialogScope
       }, contentProps), {
         ref: composedRefs,
@@ -11266,10 +11276,10 @@ var AVATAR_NAME = "Avatar", [createAvatarContext, createAvatarScope] = createCon
     }
   )) === null || _getShapeSize === void 0 ? void 0 : _getShapeSize.width);
   return React__namespace.useEffect(function() {
-    setStatus("idle");
+    setStatus(src ? "idle" : "error");
   }, [JSON.stringify(src)]), React__namespace.useEffect(function() {
     onLoadingStatusChange(status), context2.onImageLoadingStatusChange(status);
-  }, [status]), /* @__PURE__ */ jsxRuntimeExports.jsx(YStack, {
+  }, [status]), src ? /* @__PURE__ */ jsxRuntimeExports.jsx(YStack, {
     fullscreen: true,
     zIndex: 1,
     children: /* @__PURE__ */ jsxRuntimeExports.jsx(Image, __spreadProps(__spreadValues(__spreadValues({
@@ -11292,7 +11302,7 @@ var AVATAR_NAME = "Avatar", [createAvatarContext, createAvatarScope] = createCon
         setStatus("loaded");
       }
     }))
-  });
+  }) : null;
 });
 AvatarImage.displayName = IMAGE_NAME;
 var FALLBACK_NAME = "AvatarFallback", AvatarFallbackFrame = styled(YStack, {
@@ -16395,16 +16405,6 @@ var TABS_NAME = "Tabs", DefaultTabsFrame = styled(SizableStack, {
         pointerEvents: "none"
       }
     },
-    active: {
-      true: {
-        hoverStyle: {
-          backgroundColor: "$background"
-        },
-        focusStyle: {
-          backgroundColor: "$background"
-        }
-      }
-    },
     unstyled: {
       false: {
         borderWidth: 0,

package/dist/test.cjs

@@ -3291,14 +3291,16 @@ var propMapper = function(key, value, styleState, disabled, map) {
         return;
       }
     }
-    if (styleProps2.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : isVariable(value) && (value = resolveVariableValue(key, value, styleProps2.resolveValues))), value != null) {
+    styleProps2.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]);
+    var originalValue = value;
+    if (value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : isVariable(value) && (value = resolveVariableValue(key, value, styleProps2.resolveValues))), value != null) {
       key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
       var expanded = styleProps2.noExpand ? null : expandStyle(key, value);
       if (expanded) for (var max2 = expanded.length, i = 0; i < max2; i++) {
         var [nkey, nvalue] = expanded[i];
-        map(nkey, nvalue);
+        map(nkey, nvalue, originalValue);
       }
-      else map(key, value);
+      else map(key, value, originalValue);
     }
   }
 }, resolveVariants = function(key, value, styleProps2, styleState, parentVariantKey) {
@@ -3358,7 +3360,10 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
     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 (contextProps && subKey in contextProps) {
+          var _styleState, _styleState1;
+          (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {}), styleState.overriddenContextProps[subKey] = val, (_styleState1 = styleState).originalContextPropValues || (_styleState1.originalContextPropValues = {}), styleState.originalContextPropValues[subKey] = val;
+        }
       }
       if (styleProps2.noExpand) res[subKey] = val;
       else if (variants2 && subKey in variants2) {
@@ -3523,7 +3528,7 @@ function _type_of$5(obj) {
   "@swc/helpers - typeof";
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-var conf;
+var conf, styleOriginalValues = /* @__PURE__ */ new WeakMap();
 function normalizeGroupKey(key, groupContext) {
   var parts = key.split("-"), plen = parts.length;
   if (
@@ -3571,7 +3576,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     if (!noSkip && keyInit in skipProps) return "continue";
     (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
     var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
-    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key4, val2) {
+    if (propMapper(keyInit, valInit, styleState, disablePropMap, function(key4, val2, originalVal) {
       var _parentStaticConfig_variants, isStyledContextProp = styledContext && key4 in styledContext;
       if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
         viewProps[key4] = val2;
@@ -3583,7 +3588,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           return;
         }
         if (!isHOC && isValidStyleKey(key4, validStyles$1, accept) || isAndroid && key4 === "elevation") {
-          mergeStyle(styleState, key4, val2, 1);
+          mergeStyle(styleState, key4, val2, 1, false, originalVal);
           return;
         }
         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))) {
@@ -3610,7 +3615,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           {
             var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled2 = componentState[descriptorKey] === false;
             isExit && (isDisabled2 = !styleProps2.isExiting), isEnter && componentState.unmounted === false && (isDisabled2 = true);
-            var importance = descriptor.priority;
+            var importance = descriptor.priority, pseudoOriginalValues = styleOriginalValues.get(pseudoStyleObject);
             for (var pkey in pseudoStyleObject) {
               var _$val = pseudoStyleObject[pkey];
               if (isDisabled2) applyDefaultStyle(pkey, styleState);
@@ -3621,7 +3626,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                     var _pseudos1, _key1;
                     pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = _$val;
                   }
-                  mergeStyle(styleState, pkey, _$val, importance);
+                  mergeStyle(styleState, pkey, _$val, importance, false, pseudoOriginalValues == null ? void 0 : pseudoOriginalValues[pkey]);
                 }
               }
             }
@@ -3640,10 +3645,10 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           var priority = mediaStylesSeen;
           if (mediaStylesSeen += 1, shouldDoClasses) ;
           else {
-            let mergeMediaStyle2 = function(key5, val3) {
+            let mergeMediaStyle2 = function(key5, val3, originalVal2) {
               var _styleState4;
               (_styleState4 = styleState).style || (_styleState4.style = {});
-              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState[mediaKeyShort], importanceBump);
+              var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, mediaState[mediaKeyShort], importanceBump, debug, originalVal2);
               didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
             };
             var isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
@@ -3657,14 +3662,14 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               if (dynamicThemeAccess = true, isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
                 (_styleState3 = styleState).style || (_styleState3.style = {});
-                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort);
+                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1);
                 for (var subKey1 in mediaStyle1) {
                   var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), oppositeVal = extractValueFromDynamic(styleState.style[subKey1], oppositeScheme);
                   mediaStyle1[subKey1] = getDynamicVal({
                     scheme,
                     val: _$val1,
                     oppositeVal
-                  }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority);
+                  }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
                 }
               } else if (!(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
             } else if (isGroupMedia) {
@@ -3694,6 +3699,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                 importanceBump = priority1;
               }
             }
+            var mediaOriginalValues = styleOriginalValues.get(mediaStyle1);
             for (var subKey2 in mediaStyle1) {
               if (subKey2 === "space") {
                 space = valInit.space;
@@ -3701,8 +3707,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               }
               if (subKey2[0] === "$") {
                 if (!isActivePlatform(subKey2) || !isActiveTheme(subKey2, themeName)) continue;
-                for (var subSubKey in mediaStyle1[subKey2]) mergeMediaStyle2(subSubKey, mediaStyle1[subKey2][subSubKey]);
-              } else mergeMediaStyle2(subKey2, mediaStyle1[subKey2]);
+                var subOriginalValues = styleOriginalValues.get(mediaStyle1[subKey2]);
+                for (var subSubKey in mediaStyle1[subKey2]) mergeMediaStyle2(subSubKey, mediaStyle1[subKey2][subSubKey], subOriginalValues == null ? void 0 : subOriginalValues[subSubKey]);
+              } else mergeMediaStyle2(subKey2, mediaStyle1[subKey2], mediaOriginalValues == null ? void 0 : mediaOriginalValues[subKey2]);
             }
           }
           return;
@@ -3828,7 +3835,7 @@ function mergeFlatTransforms(target, flatTransforms) {
   });
 }
 function mergeStyle(styleState, key, val, importance) {
-  var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
+  var originalVal = arguments.length > 5 ? arguments[5] : void 0, _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
     viewProps,
     styleProps: styleProps2,
     staticConfig,
@@ -3837,8 +3844,10 @@ function mergeStyle(styleState, key, val, importance) {
   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;
+      var _styleState_originalContextPropValues, _styleState;
+      (_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {});
+      var originalFromState = (_styleState_originalContextPropValues = styleState.originalContextPropValues) === null || _styleState_originalContextPropValues === void 0 ? void 0 : _styleState_originalContextPropValues[key], _ref;
+      styleState.overriddenContextProps[key] = (_ref = originalVal != null ? originalVal : originalFromState) !== null && _ref !== void 0 ? _ref : val;
     }
     if (key in stylePropsTransform) {
       var _styleState1;
@@ -3864,14 +3873,14 @@ var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
     key1 = conf2.shorthands[key1] || key1;
     var shouldSkip = !staticConfig.isHOC && key1 in skipProps && !styleProps2.noSkip;
     if (shouldSkip) return key = key1, "continue";
-    propMapper(key1, val, styleState, false, function(skey, sval) {
-      skey in validPseudoKeys && (sval = getSubStyle(styleState, skey, sval, avoidMergeTransform)), !avoidMergeTransform && skey in stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps2.noNormalize ? sval : normalizeValueWithProperty$1(sval);
+    propMapper(key1, val, styleState, false, function(skey, sval, originalVal) {
+      originalVal !== void 0 && (originalValues || (originalValues = {}), originalValues[skey] = originalVal), skey in validPseudoKeys && (sval = getSubStyle(styleState, skey, sval, avoidMergeTransform)), !avoidMergeTransform && skey in stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps2.noNormalize ? sval : normalizeValueWithProperty$1(sval);
     }), key = key1;
   }, {
     staticConfig,
     conf: conf2,
     styleProps: styleProps2
-  } = styleState, styleOut = {};
+  } = styleState, styleOut = {}, originalValues;
   for (var key in styleIn) _loop2(key);
   if (!avoidMergeTransform) {
     if (Array.isArray(styleOut.transform)) {
@@ -3880,7 +3889,7 @@ var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
     }
     styleState.flatTransforms && mergeFlatTransforms(styleOut, styleState.flatTransforms);
   }
-  return styleProps2.noNormalize || fixStyles(styleOut), styleOut;
+  return styleProps2.noNormalize || fixStyles(styleOut), originalValues && styleOriginalValues.set(styleOut, originalValues), styleOut;
 }, useSplitStyles = function(a, b2, c, d, e2, f, g, h2, i, j, k, l) {
   var res = getSplitStyles(a, b2, c, d, e2, f, g, h2, i, j, k, l);
   return res;
@@ -3917,15 +3926,16 @@ function passDownProp(viewProps, key, val) {
     delete viewProps[key], viewProps[key] = next;
   } else viewProps[key] = val;
 }
-function mergeMediaByImportance(styleState, mediaKey, key, value, isSizeMedia, importanceBump, debugProp) {
+function mergeMediaByImportance(styleState, mediaKey, key, value, isSizeMedia, importanceBump, debugProp, originalVal) {
   styleState.usedKeys;
   var importance = getMediaImportanceIfMoreImportant(mediaKey, key, styleState, isSizeMedia);
   if (importanceBump && (importance = (importance || 0) + importanceBump), importance === null) return false;
   if (key in pseudoDescriptors) {
     var descriptor = pseudoDescriptors[key], descriptorKey = descriptor.stateKey || descriptor.name, isDisabled2 = styleState.componentState[descriptorKey] === false;
     if (isDisabled2) return false;
-    for (var subKey in value) mergeStyle(styleState, subKey, value[subKey], importance);
-  } else mergeStyle(styleState, key, value, importance);
+    var pseudoOriginalValues = styleOriginalValues.get(value);
+    for (var subKey in value) mergeStyle(styleState, subKey, value[subKey], importance, false, pseudoOriginalValues == null ? void 0 : pseudoOriginalValues[subKey]);
+  } else mergeStyle(styleState, key, value, importance, false, originalVal);
   return true;
 }
 function normalizeStyle(style) {
@@ -11151,8 +11161,8 @@ var AlertDialogPortal = function(props) {
       scope,
       cancelRef,
       children: /* @__PURE__ */ jsxRuntimeExports.jsxs(DialogContent, __spreadProps(__spreadValues({
-        // @ts-ignore
         role: "alertdialog",
+        "aria-modal": true,
         scope: dialogScope
       }, contentProps), {
         ref: composedRefs,
@@ -11414,10 +11424,10 @@ var AVATAR_NAME = "Avatar", [createAvatarContext, createAvatarScope] = createCon
     }
   )) === null || _getShapeSize === void 0 ? void 0 : _getShapeSize.width);
   return React__namespace.useEffect(function() {
-    setStatus("idle");
+    setStatus(src ? "idle" : "error");
   }, [JSON.stringify(src)]), React__namespace.useEffect(function() {
     onLoadingStatusChange(status), context2.onImageLoadingStatusChange(status);
-  }, [status]), /* @__PURE__ */ jsxRuntimeExports.jsx(YStack, {
+  }, [status]), src ? /* @__PURE__ */ jsxRuntimeExports.jsx(YStack, {
     fullscreen: true,
     zIndex: 1,
     children: /* @__PURE__ */ jsxRuntimeExports.jsx(Image, __spreadProps(__spreadValues(__spreadValues({
@@ -11440,7 +11450,7 @@ var AVATAR_NAME = "Avatar", [createAvatarContext, createAvatarScope] = createCon
         setStatus("loaded");
       }
     }))
-  });
+  }) : null;
 });
 AvatarImage.displayName = IMAGE_NAME;
 var FALLBACK_NAME = "AvatarFallback", AvatarFallbackFrame = styled(YStack, {
@@ -16543,16 +16553,6 @@ var TABS_NAME = "Tabs", DefaultTabsFrame = styled(SizableStack, {
         pointerEvents: "none"
       }
     },
-    active: {
-      true: {
-        hoverStyle: {
-          backgroundColor: "$background"
-        },
-        focusStyle: {
-          backgroundColor: "$background"
-        }
-      }
-    },
     unstyled: {
       false: {
         borderWidth: 0,

package/package.json

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