@tamagui/core 1.138.3 → 1.138.4

package/dist/native.cjs

@@ -2662,12 +2662,12 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
   for (var _key in value) {
     var subKey = conf2.shorthands[_key] || _key, val = value[_key];
     if (!(!styleProps.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 (styleProps.noExpand) res[subKey] = val;
       else if (variants && subKey in variants) {
-        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, styleProps, styleState) : val;
         else {
@@ -3109,6 +3109,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;
@@ -3129,7 +3133,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 (!styleProps.noMergeStyle && !asChildExceptStyleLike) {
     var style2 = styleState.style;
@@ -3147,26 +3151,33 @@ function mergeFlatTransforms(target, flatTransforms) {
   });
 }
 function mergeStyle(styleState, key, val, importance) {
-  var {
+  var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
     viewProps,
     styleProps,
     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(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(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;
+      }
     }
   }
 }
@@ -3689,11 +3700,11 @@ function createComponent(staticConfig) {
       styledContext: styledContextValue
     }, themeName = (themeState == null ? void 0 : themeState.name) || "";
     var splitStyles = useSplitStyles(props, staticConfig, theme, themeName, state, styleProps, 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;

package/dist/test.native.cjs

@@ -2487,12 +2487,12 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVar
   for (var _key in value) {
     var subKey = conf2.shorthands[_key] || _key, val = value[_key];
     if (!(!styleProps.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 (styleProps.noExpand) res[subKey] = val;
       else if (variants && subKey in variants) {
-        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, styleProps, styleState) : val;
         else {
@@ -2935,6 +2935,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;
@@ -2955,7 +2959,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 (!styleProps.noMergeStyle && !asChildExceptStyleLike) {
     var style2 = styleState.style;
@@ -2973,26 +2977,33 @@ function mergeFlatTransforms(target, flatTransforms) {
   });
 }
 function mergeStyle(styleState, key, val, importance) {
-  var {
+  var _staticConfig_context, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig, {
     viewProps,
     styleProps,
     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(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(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;
+      }
     }
   }
 }
@@ -3519,11 +3530,11 @@ function createComponent(staticConfig) {
       styledContext: styledContextValue
     }, themeName = (themeState == null ? void 0 : themeState.name) || "";
     var splitStyles = useSplitStyles(props, staticConfig, theme, themeName, state, styleProps, 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.138.3",
+  "version": "1.138.4",
   "type": "module",
   "source": "src/index.tsx",
   "main": "dist/cjs",
@@ -33,18 +33,18 @@
     "native-test.d.ts"
   ],
   "dependencies": {
-    "@tamagui/helpers": "1.138.3",
-    "@tamagui/react-native-media-driver": "1.138.3",
-    "@tamagui/react-native-use-pressable": "1.138.3",
-    "@tamagui/react-native-use-responder-events": "1.138.3",
-    "@tamagui/use-element-layout": "1.138.3",
-    "@tamagui/use-event": "1.138.3",
-    "@tamagui/web": "1.138.3"
+    "@tamagui/helpers": "1.138.4",
+    "@tamagui/react-native-media-driver": "1.138.4",
+    "@tamagui/react-native-use-pressable": "1.138.4",
+    "@tamagui/react-native-use-responder-events": "1.138.4",
+    "@tamagui/use-element-layout": "1.138.4",
+    "@tamagui/use-event": "1.138.4",
+    "@tamagui/web": "1.138.4"
   },
   "devDependencies": {
-    "@tamagui/build": "1.138.3",
-    "@tamagui/native-bundle": "1.138.3",
-    "@tamagui/react-native-web-lite": "1.138.3",
+    "@tamagui/build": "1.138.4",
+    "@tamagui/native-bundle": "1.138.4",
+    "@tamagui/react-native-web-lite": "1.138.4",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",