@tamagui/core 3.0.0-beta.1434.1 → 3.0.0-beta.1449.1

package/dist/native.cjs

@@ -10892,7 +10892,7 @@ var stateModifierSelectors = Object.freeze([
 	":focus",
 	":focus-visible",
 	":active",
-	"[aria-disabled]",
+	"[aria-disabled=\"true\"]",
 	".t_unmounted",
 	".t_exiting"
 ]);
@@ -15049,6 +15049,7 @@ var passFrontendContainerType = 27;
 var passSourceLayer = 28;
 var passParentCursor = 29;
 var passMapSourceKey = 30;
+var passVariantOutput = 31;
 var passFlags = 13;
 var sourceLayerBase = 0;
 var sourceLayerVariant = 1;
@@ -15298,6 +15299,7 @@ function contributeProp(pass, keyOg, valOg) {
 			return;
 		} else if (keyInit.startsWith("data-")) return;
 	}
+	if (pass[passVariantOutput] && !isValidStyleKeyInit && !keyInit.startsWith("aria-") && !(keyInit in stylePropsAll) && !(keyInit in skipProps) && !(variants && keyInit in variants) && !(parentVariants && keyInit in parentVariants) && !(styledContextKeys === null || styledContextKeys === void 0 ? void 0 : styledContextKeys.has(keyInit)) && !(styledContext && keyInit in styledContext)) return;
 	var isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
 	var isStyleProp = isValidStyleKeyInit || isVariant && !noExpand;
 	if (isStyleProp && asChildExceptStyleLike) return;
@@ -16537,9 +16539,12 @@ function emitVariantStyle(state, key, value, original, condition, disabled) {
 		((_state = state).overriddenContextProps || (_state.overriddenContextProps = {}))[key] = ((_state1 = state).originalContextPropValues || (_state1.originalContextPropValues = {}))[key] = original;
 	}
 	var parent = pass[passParentCursor];
+	var parentVariantOutput = pass[passVariantOutput];
 	pass[passParentCursor] = condition;
+	pass[passVariantOutput] = true;
 	contributeProp(pass, key, value, original, disabled);
 	pass[passParentCursor] = parent;
+	pass[passVariantOutput] = parentVariantOutput;
 }
 //#endregion
 //#region ../web/dist/esm/helpers/NativeTextBinding.native.js
@@ -17092,7 +17097,6 @@ var _excluded2$2 = [
 	"asChild",
 	"children",
 	"themeShallow",
-	"spaceDirection",
 	"onPress",
 	"onLongPress",
 	"onPressIn",
@@ -17228,7 +17232,9 @@ function createComponent(staticConfig) {
 		var elementType = BaseComponent;
 		var isAnimatedCustomComponent = animationDriver && isAnimated && animationDriver.needsCustomComponent;
 		if (isAnimatedCustomComponent) elementType = animationDriver[isText ? "Text" : "View"] || elementType;
-		var disableTheme = isHOC;
+		var disableThemeProp = false;
+		var hocThemesSelf = isHOC && "theme" in props;
+		var disableTheme = disableThemeProp || isHOC && !hocThemesSelf;
 		var themeStateProps = {
 			disable: disableTheme,
 			shallow: props.themeShallow,
@@ -17533,11 +17539,11 @@ function createComponent(staticConfig) {
 		var groupSetRevision = useGroupSetRevision(pseudoGroups, mediaGroups);
 		stateRef.current.prevStyle = splitStylesStyle || null;
 		var propsWithAnimation = props;
-		var _ref6 = viewPropsIn || {}, { asChild, children, themeShallow, spaceDirection: _spaceDirection, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onTransition, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref6, nonTamaguiProps = _objectWithoutProperties(_ref6, _excluded2$2);
+		var _ref6 = viewPropsIn || {}, { asChild, children, themeShallow, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onTransition, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref6, nonTamaguiProps = _objectWithoutProperties(_ref6, _excluded2$2);
 		var viewProps = nonTamaguiProps;
 		if (props.forceStyle) viewProps.forceStyle = props.forceStyle;
 		if (isHOC) {
-			if (typeof _themeProp !== "undefined") viewProps.theme = _themeProp;
+			if (typeof _themeProp !== "undefined" && !hocThemesSelf) viewProps.theme = _themeProp;
 			if (typeof passThrough !== "undefined") viewProps.passThrough = passThrough;
 			if (typeof asChild !== "undefined") viewProps.asChild = asChild;
 			if (typeof onTransition !== "undefined") viewProps.onTransition = onTransition;

package/dist/test.native.cjs

@@ -937,7 +937,7 @@ var stateModifierSelectors = Object.freeze([
 	":focus",
 	":focus-visible",
 	":active",
-	"[aria-disabled]",
+	"[aria-disabled=\"true\"]",
 	".t_unmounted",
 	".t_exiting"
 ]);
@@ -5753,6 +5753,7 @@ var passFrontendContainerType = 27;
 var passSourceLayer = 28;
 var passParentCursor = 29;
 var passMapSourceKey = 30;
+var passVariantOutput = 31;
 var passFlags = 13;
 var sourceLayerBase = 0;
 var sourceLayerVariant = 1;
@@ -6020,6 +6021,10 @@ function contributeProp(pass, keyOg, valOg) {
 			return;
 		} else if (keyInit.startsWith("data-")) return;
 	}
+	if (pass[passVariantOutput] && !isValidStyleKeyInit && !keyInit.startsWith("aria-") && !(keyInit in stylePropsAll) && !(keyInit in skipProps) && !(variants && keyInit in variants) && !(parentVariants && keyInit in parentVariants) && !(styledContextKeys === null || styledContextKeys === void 0 ? void 0 : styledContextKeys.has(keyInit)) && !(styledContext && keyInit in styledContext)) {
+		if (globalThis.process.env.NODE_ENV === "development") warnOnce(`variant-non-style:${keyInit}`, `a variant set "${keyInit}", which is not a style. Variants hold styles and aria/data attributes only: set "${keyInit}" on the component one level up.`);
+		return;
+	}
 	var isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
 	var isStyleProp = isValidStyleKeyInit || isVariant && !noExpand;
 	if (isStyleProp && asChildExceptStyleLike) return;
@@ -7451,9 +7456,12 @@ function emitVariantStyle(state, key, value, original, condition, disabled) {
 		((_state = state).overriddenContextProps || (_state.overriddenContextProps = {}))[key] = ((_state1 = state).originalContextPropValues || (_state1.originalContextPropValues = {}))[key] = original;
 	}
 	var parent = pass[passParentCursor];
+	var parentVariantOutput = pass[passVariantOutput];
 	pass[passParentCursor] = condition;
+	pass[passVariantOutput] = true;
 	contributeProp(pass, key, value, original, disabled);
 	pass[passParentCursor] = parent;
+	pass[passVariantOutput] = parentVariantOutput;
 }
 //#endregion
 //#region ../web/dist/esm/helpers/NativeTextBinding.native.js
@@ -8046,7 +8054,6 @@ var _excluded2$2 = [
 	"asChild",
 	"children",
 	"themeShallow",
-	"spaceDirection",
 	"onPress",
 	"onLongPress",
 	"onPressIn",
@@ -8251,7 +8258,9 @@ function createComponent(staticConfig) {
 		var elementType = BaseComponent;
 		var isAnimatedCustomComponent = animationDriver && isAnimated && animationDriver.needsCustomComponent;
 		if (isAnimatedCustomComponent) elementType = animationDriver[isText ? "Text" : "View"] || elementType;
-		var disableTheme = isHOC;
+		var disableThemeProp = false;
+		var hocThemesSelf = isHOC && "theme" in props;
+		var disableTheme = disableThemeProp || isHOC && !hocThemesSelf;
 		if (globalThis.process.env.NODE_ENV === "development" && time$1) time$1`theme-props`;
 		var themeStateProps = {
 			disable: disableTheme,
@@ -8605,11 +8614,11 @@ ${banner}
 		var groupSetRevision = useGroupSetRevision(pseudoGroups, mediaGroups);
 		stateRef.current.prevStyle = splitStylesStyle || null;
 		var propsWithAnimation = props;
-		var _ref6 = viewPropsIn || {}, { asChild, children, themeShallow, spaceDirection: _spaceDirection, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onTransition, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref6, nonTamaguiProps = _objectWithoutProperties(_ref6, _excluded2$2);
+		var _ref6 = viewPropsIn || {}, { asChild, children, themeShallow, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onTransition, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref6, nonTamaguiProps = _objectWithoutProperties(_ref6, _excluded2$2);
 		var viewProps = nonTamaguiProps;
 		if (props.forceStyle) viewProps.forceStyle = props.forceStyle;
 		if (isHOC) {
-			if (typeof _themeProp !== "undefined") viewProps.theme = _themeProp;
+			if (typeof _themeProp !== "undefined" && !hocThemesSelf) viewProps.theme = _themeProp;
 			if (typeof passThrough !== "undefined") viewProps.passThrough = passThrough;
 			if (typeof asChild !== "undefined") viewProps.asChild = asChild;
 			if (typeof onTransition !== "undefined") viewProps.onTransition = onTransition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "3.0.0-beta.1434.1",
+  "version": "3.0.0-beta.1449.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -137,19 +137,19 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "3.0.0-beta.1434.1",
-    "@tamagui/constants": "3.0.0-beta.1434.1",
-    "@tamagui/helpers": "3.0.0-beta.1434.1",
-    "@tamagui/react-native-media-driver": "3.0.0-beta.1434.1",
-    "@tamagui/react-native-use-pressable": "3.0.0-beta.1434.1",
-    "@tamagui/use-element-layout": "3.0.0-beta.1434.1",
-    "@tamagui/use-event": "3.0.0-beta.1434.1",
-    "@tamagui/web": "3.0.0-beta.1434.1"
+    "@tamagui/compose-refs": "3.0.0-beta.1449.1",
+    "@tamagui/constants": "3.0.0-beta.1449.1",
+    "@tamagui/helpers": "3.0.0-beta.1449.1",
+    "@tamagui/react-native-media-driver": "3.0.0-beta.1449.1",
+    "@tamagui/react-native-use-pressable": "3.0.0-beta.1449.1",
+    "@tamagui/use-element-layout": "3.0.0-beta.1449.1",
+    "@tamagui/use-event": "3.0.0-beta.1449.1",
+    "@tamagui/web": "3.0.0-beta.1449.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1434.1",
-    "@tamagui/native-bundle": "3.0.0-beta.1434.1",
-    "@tamagui/react-native-web-lite": "3.0.0-beta.1434.1",
+    "@tamagui/build": "3.0.0-beta.1449.1",
+    "@tamagui/native-bundle": "3.0.0-beta.1449.1",
+    "@tamagui/react-native-web-lite": "3.0.0-beta.1449.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",