tamagui 3.1.3 → 3.1.5

package/dist/native.cjs

@@ -14314,7 +14314,11 @@ function constructCSSVariableName(name) {
 }
 function variableToString(vrble) {
 	arguments.length > 1 && arguments[1] !== void 0 && arguments[1];
-	if (isVariable(vrble)) return `${vrble.val}`;
+	if (isVariable(vrble)) {
+		var value = vrble.val;
+		return value && typeof value === "object" ? value : `${value}`;
+	}
+	if (vrble && typeof vrble === "object") return vrble;
 	return `${vrble || ""}`;
 }
 function isVariable(v) {
@@ -14324,7 +14328,7 @@ function getVariable(nameOrVariable) {
 	var group = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "size";
 	var _ref;
 	var _tokens_group;
-	if (nameOrVariable === null || nameOrVariable === void 0 ? void 0 : nameOrVariable.dynamic) return nameOrVariable;
+	if ((nameOrVariable === null || nameOrVariable === void 0 ? void 0 : nameOrVariable.dynamic) || nameOrVariable && typeof nameOrVariable === "object" && !isVariable(nameOrVariable)) return nameOrVariable;
 	setDidGetVariableValue(true);
 	if (isVariable(nameOrVariable)) return variableToString(nameOrVariable);
 	var tokens = getConfig().tokensParsed;

package/dist/test.cjs

@@ -14527,7 +14527,11 @@ function constructCSSVariableName(name) {
 }
 function variableToString(vrble) {
 	arguments.length > 1 && arguments[1] !== void 0 && arguments[1];
-	if (isVariable(vrble)) return `${vrble.val}`;
+	if (isVariable(vrble)) {
+		var value = vrble.val;
+		return value && typeof value === "object" ? value : `${value}`;
+	}
+	if (vrble && typeof vrble === "object") return vrble;
 	return `${vrble || ""}`;
 }
 function isVariable(v) {
@@ -14537,7 +14541,7 @@ function getVariable(nameOrVariable) {
 	var group = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "size";
 	var _ref;
 	var _tokens_group;
-	if (nameOrVariable === null || nameOrVariable === void 0 ? void 0 : nameOrVariable.dynamic) return nameOrVariable;
+	if ((nameOrVariable === null || nameOrVariable === void 0 ? void 0 : nameOrVariable.dynamic) || nameOrVariable && typeof nameOrVariable === "object" && !isVariable(nameOrVariable)) return nameOrVariable;
 	setDidGetVariableValue(true);
 	if (isVariable(nameOrVariable)) return variableToString(nameOrVariable);
 	var tokens = getConfig().tokensParsed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "license": "MIT",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
@@ -315,73 +315,73 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "3.1.3",
-    "@tamagui/adapt": "3.1.3",
-    "@tamagui/alert-dialog": "3.1.3",
-    "@tamagui/animate": "3.1.3",
-    "@tamagui/animate-presence": "3.1.3",
-    "@tamagui/avatar": "3.1.3",
-    "@tamagui/button": "3.1.3",
-    "@tamagui/card": "3.1.3",
-    "@tamagui/checkbox": "3.1.3",
-    "@tamagui/collapsible": "3.1.3",
-    "@tamagui/compose-refs": "3.1.3",
-    "@tamagui/constants": "3.1.3",
-    "@tamagui/context-menu": "3.1.3",
-    "@tamagui/core": "3.1.3",
-    "@tamagui/create-context": "3.1.3",
-    "@tamagui/create-menu": "3.1.3",
-    "@tamagui/dialog": "3.1.3",
-    "@tamagui/element": "3.1.3",
-    "@tamagui/fake-react-native": "3.1.3",
-    "@tamagui/field": "3.1.3",
-    "@tamagui/focusable": "3.1.3",
-    "@tamagui/font-size": "3.1.3",
-    "@tamagui/form": "3.1.3",
-    "@tamagui/get-font-sized": "3.1.3",
-    "@tamagui/get-token": "3.1.3",
-    "@tamagui/group": "3.1.3",
-    "@tamagui/helpers-tamagui": "3.1.3",
-    "@tamagui/image": "3.1.3",
-    "@tamagui/input": "3.1.3",
-    "@tamagui/label": "3.1.3",
-    "@tamagui/linear-gradient": "3.1.3",
-    "@tamagui/list-item": "3.1.3",
-    "@tamagui/menu": "3.1.3",
-    "@tamagui/polyfill-dev": "3.1.3",
-    "@tamagui/popover": "3.1.3",
-    "@tamagui/popper": "3.1.3",
-    "@tamagui/portal": "3.1.3",
-    "@tamagui/progress": "3.1.3",
-    "@tamagui/radio-group": "3.1.3",
-    "@tamagui/react-native-media-driver": "3.1.3",
-    "@tamagui/react-native-types": "3.1.3",
-    "@tamagui/scroll-view": "3.1.3",
-    "@tamagui/select": "3.1.3",
-    "@tamagui/separator": "3.1.3",
-    "@tamagui/shapes": "3.1.3",
-    "@tamagui/sheet": "3.1.3",
-    "@tamagui/slider": "3.1.3",
-    "@tamagui/spacer": "3.1.3",
-    "@tamagui/spinner": "3.1.3",
-    "@tamagui/stacks": "3.1.3",
-    "@tamagui/switch": "3.1.3",
-    "@tamagui/tabs": "3.1.3",
-    "@tamagui/text": "3.1.3",
-    "@tamagui/theme": "3.1.3",
-    "@tamagui/toast": "3.1.3",
-    "@tamagui/toggle-group": "3.1.3",
-    "@tamagui/tooltip": "3.1.3",
-    "@tamagui/ui": "3.1.3",
-    "@tamagui/use-controllable-state": "3.1.3",
-    "@tamagui/use-debounce": "3.1.3",
-    "@tamagui/use-force-update": "3.1.3",
-    "@tamagui/use-window-dimensions": "3.1.3",
-    "@tamagui/visually-hidden": "3.1.3",
-    "@tamagui/z-index-stack": "3.1.3"
+    "@tamagui/accordion": "3.1.5",
+    "@tamagui/adapt": "3.1.5",
+    "@tamagui/alert-dialog": "3.1.5",
+    "@tamagui/animate": "3.1.5",
+    "@tamagui/animate-presence": "3.1.5",
+    "@tamagui/avatar": "3.1.5",
+    "@tamagui/button": "3.1.5",
+    "@tamagui/card": "3.1.5",
+    "@tamagui/checkbox": "3.1.5",
+    "@tamagui/collapsible": "3.1.5",
+    "@tamagui/compose-refs": "3.1.5",
+    "@tamagui/constants": "3.1.5",
+    "@tamagui/context-menu": "3.1.5",
+    "@tamagui/core": "3.1.5",
+    "@tamagui/create-context": "3.1.5",
+    "@tamagui/create-menu": "3.1.5",
+    "@tamagui/dialog": "3.1.5",
+    "@tamagui/element": "3.1.5",
+    "@tamagui/fake-react-native": "3.1.5",
+    "@tamagui/field": "3.1.5",
+    "@tamagui/focusable": "3.1.5",
+    "@tamagui/font-size": "3.1.5",
+    "@tamagui/form": "3.1.5",
+    "@tamagui/get-font-sized": "3.1.5",
+    "@tamagui/get-token": "3.1.5",
+    "@tamagui/group": "3.1.5",
+    "@tamagui/helpers-tamagui": "3.1.5",
+    "@tamagui/image": "3.1.5",
+    "@tamagui/input": "3.1.5",
+    "@tamagui/label": "3.1.5",
+    "@tamagui/linear-gradient": "3.1.5",
+    "@tamagui/list-item": "3.1.5",
+    "@tamagui/menu": "3.1.5",
+    "@tamagui/polyfill-dev": "3.1.5",
+    "@tamagui/popover": "3.1.5",
+    "@tamagui/popper": "3.1.5",
+    "@tamagui/portal": "3.1.5",
+    "@tamagui/progress": "3.1.5",
+    "@tamagui/radio-group": "3.1.5",
+    "@tamagui/react-native-media-driver": "3.1.5",
+    "@tamagui/react-native-types": "3.1.5",
+    "@tamagui/scroll-view": "3.1.5",
+    "@tamagui/select": "3.1.5",
+    "@tamagui/separator": "3.1.5",
+    "@tamagui/shapes": "3.1.5",
+    "@tamagui/sheet": "3.1.5",
+    "@tamagui/slider": "3.1.5",
+    "@tamagui/spacer": "3.1.5",
+    "@tamagui/spinner": "3.1.5",
+    "@tamagui/stacks": "3.1.5",
+    "@tamagui/switch": "3.1.5",
+    "@tamagui/tabs": "3.1.5",
+    "@tamagui/text": "3.1.5",
+    "@tamagui/theme": "3.1.5",
+    "@tamagui/toast": "3.1.5",
+    "@tamagui/toggle-group": "3.1.5",
+    "@tamagui/tooltip": "3.1.5",
+    "@tamagui/ui": "3.1.5",
+    "@tamagui/use-controllable-state": "3.1.5",
+    "@tamagui/use-debounce": "3.1.5",
+    "@tamagui/use-force-update": "3.1.5",
+    "@tamagui/use-window-dimensions": "3.1.5",
+    "@tamagui/visually-hidden": "3.1.5",
+    "@tamagui/z-index-stack": "3.1.5"
   },
   "devDependencies": {
-    "@tamagui/build": "3.1.3",
+    "@tamagui/build": "3.1.5",
     "react": "19.3.0",
     "react-native": "0.88.0",
     "react-native-web": "~0.21.4"
@@ -400,5 +400,5 @@
   ],
   "module:jsx": "dist/jsx",
   "removeSideEffects": true,
-  "releaseSourceCommit": "c95f4998d3859dcc34f1ce4026e434ad864e1422"
+  "releaseSourceCommit": "11f32458a825e58f6c5038491924c399c4439c51"
 }

package/types/components/Accordion.d.ts

@@ -19,7 +19,7 @@ export declare const Accordion: import("@tamagui/core").Combined<import("@tamagu
     }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").TextStylePropsBase>>, keyof import("@tamagui/core").TextNonStyleProps> & {
         ref?: React.Ref<import("@tamagui/core").TamaguiTextElement> | undefined;
     }, "ref">>;
-    Item: import("@tamagui/core").RefComponent<import("@tamagui/react-native-types/src").ViewInstance | (HTMLElement & import("@tamagui/core").TamaguiElementMethods), import("@tamagui/accordion").AccordionItemProps>;
+    Item: import("@tamagui/core").RefComponent<import("@tamagui/react-native-types").ViewInstance | (HTMLElement & import("@tamagui/core").TamaguiElementMethods), import("@tamagui/accordion").AccordionItemProps>;
     HeightAnimator: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {}, {}>;
     Trigger: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, TamaguiElement, Omit<Omit<import("@tamagui/core").StackNonStyleProps, "__scopeCollapsible" | keyof import("@tamagui/core").StackNonStyleProps | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").StackNonStyleProps & import("@tamagui/core").WithThemeValues<Omit<import("@tamagui/core").StackStyleBase, never>> & import("@tamagui/core").WithFlatVariantValues<{}> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & {
         __scopeCollapsible?: string;

package/types/components/Sheet.d.ts

@@ -20,7 +20,7 @@ export declare const SheetBackground: import("@tamagui/core").TamaguiComponent<i
 }, "scope"> & {
     scope?: import("@tamagui/sheet").SheetScopes;
 }, import("@tamagui/core").StackStyleBase, Omit<{}, "disableHideBottomOverflow" | "scope">, import("@tamagui/core").StaticConfigPublic>;
-export declare const SheetScrollView: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/scroll-view").ScrollViewRef, Omit<import("@tamagui/core").TamaguiComponentPropsBaseBase & Omit<import("@tamagui/core").StackNonStyleProps, "onScroll" | "style"> & import("@tamagui/core").RNViewProps & Omit<import("@tamagui/react-native-types/src").ScrollViewProps, "contentContainerStyle" | "keyboardShouldPersistTaps" | "onMomentumScrollBegin" | "onMomentumScrollEnd" | "onScrollBeginDrag" | "onScrollEndDrag" | "onScrollToTop" | "refreshControl" | keyof import("@tamagui/core").RNViewProps | keyof import("@tamagui/core").StackNonStyleProps> & {
+export declare const SheetScrollView: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/scroll-view").ScrollViewRef, Omit<import("@tamagui/core").TamaguiComponentPropsBaseBase & Omit<import("@tamagui/core").StackNonStyleProps, "onScroll" | "style"> & import("@tamagui/core").RNViewProps & Omit<import("@tamagui/react-native-types").ScrollViewProps, "contentContainerStyle" | "keyboardShouldPersistTaps" | "onMomentumScrollBegin" | "onMomentumScrollEnd" | "onScrollBeginDrag" | "onScrollEndDrag" | "onScrollToTop" | "refreshControl" | keyof import("@tamagui/core").RNViewProps | keyof import("@tamagui/core").StackNonStyleProps> & {
     style?: import("@tamagui/core").StackNonStyleProps['style'];
     contentContainerStyle?: import("@tamagui/core").StylePiece | import("@tamagui/core").StackNonStyleProps['style'];
     refreshControl?: React.ReactElement<{
@@ -60,7 +60,7 @@ declare const sheetParts: {
     }, import("@tamagui/core").StackStyleBase, {
         open?: boolean | undefined;
     }>>;
-    ScrollView: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/scroll-view").ScrollViewRef, Omit<import("@tamagui/core").TamaguiComponentPropsBaseBase & Omit<import("@tamagui/core").StackNonStyleProps, "onScroll" | "style"> & import("@tamagui/core").RNViewProps & Omit<import("@tamagui/react-native-types/src").ScrollViewProps, "contentContainerStyle" | "keyboardShouldPersistTaps" | "onMomentumScrollBegin" | "onMomentumScrollEnd" | "onScrollBeginDrag" | "onScrollEndDrag" | "onScrollToTop" | "refreshControl" | keyof import("@tamagui/core").RNViewProps | keyof import("@tamagui/core").StackNonStyleProps> & {
+    ScrollView: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/scroll-view").ScrollViewRef, Omit<import("@tamagui/core").TamaguiComponentPropsBaseBase & Omit<import("@tamagui/core").StackNonStyleProps, "onScroll" | "style"> & import("@tamagui/core").RNViewProps & Omit<import("@tamagui/react-native-types").ScrollViewProps, "contentContainerStyle" | "keyboardShouldPersistTaps" | "onMomentumScrollBegin" | "onMomentumScrollEnd" | "onScrollBeginDrag" | "onScrollEndDrag" | "onScrollToTop" | "refreshControl" | keyof import("@tamagui/core").RNViewProps | keyof import("@tamagui/core").StackNonStyleProps> & {
         style?: import("@tamagui/core").StackNonStyleProps['style'];
         contentContainerStyle?: import("@tamagui/core").StylePiece | import("@tamagui/core").StackNonStyleProps['style'];
         refreshControl?: React.ReactElement<{
@@ -80,8 +80,8 @@ declare const sheetParts: {
         neverFlatten: true;
     } & import("@tamagui/core").StaticConfigPublic>;
 };
-export declare const SheetRoot: import("@tamagui/core").RefComponent<import("@tamagui/react-native-types/src").ViewInstance, SheetProps>;
-export declare const SheetControlled: Combined<import("@tamagui/core").RefComponent<import("@tamagui/react-native-types/src").ViewInstance, Omit<SheetProps, "onOpenChange" | "open">>, {
+export declare const SheetRoot: import("@tamagui/core").RefComponent<import("@tamagui/react-native-types").ViewInstance, SheetProps>;
+export declare const SheetControlled: Combined<import("@tamagui/core").RefComponent<import("@tamagui/react-native-types").ViewInstance, Omit<SheetProps, "onOpenChange" | "open">>, {
     Container: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/core").TamaguiElement, Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "adjustPaddingForOffscreenContent" | "scope"> & Omit<{
         adjustPaddingForOffscreenContent?: boolean;
     }, "scope"> & {
@@ -102,7 +102,7 @@ export declare const SheetControlled: Combined<import("@tamagui/core").RefCompon
     }, import("@tamagui/core").StackStyleBase, {
         open?: boolean | undefined;
     }>>;
-    ScrollView: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/scroll-view").ScrollViewRef, Omit<import("@tamagui/core").TamaguiComponentPropsBaseBase & Omit<import("@tamagui/core").StackNonStyleProps, "onScroll" | "style"> & import("@tamagui/core").RNViewProps & Omit<import("@tamagui/react-native-types/src").ScrollViewProps, "contentContainerStyle" | "keyboardShouldPersistTaps" | "onMomentumScrollBegin" | "onMomentumScrollEnd" | "onScrollBeginDrag" | "onScrollEndDrag" | "onScrollToTop" | "refreshControl" | keyof import("@tamagui/core").RNViewProps | keyof import("@tamagui/core").StackNonStyleProps> & {
+    ScrollView: import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/scroll-view").ScrollViewRef, Omit<import("@tamagui/core").TamaguiComponentPropsBaseBase & Omit<import("@tamagui/core").StackNonStyleProps, "onScroll" | "style"> & import("@tamagui/core").RNViewProps & Omit<import("@tamagui/react-native-types").ScrollViewProps, "contentContainerStyle" | "keyboardShouldPersistTaps" | "onMomentumScrollBegin" | "onMomentumScrollEnd" | "onScrollBeginDrag" | "onScrollEndDrag" | "onScrollToTop" | "refreshControl" | keyof import("@tamagui/core").RNViewProps | keyof import("@tamagui/core").StackNonStyleProps> & {
         style?: import("@tamagui/core").StackNonStyleProps['style'];
         contentContainerStyle?: import("@tamagui/core").StylePiece | import("@tamagui/core").StackNonStyleProps['style'];
         refreshControl?: React.ReactElement<{

package/types/components/Switch.d.ts

@@ -13,7 +13,7 @@ export declare const SwitchThumbFrame: import("@tamagui/core").TamaguiComponent<
 }, import("@tamagui/core").StaticConfigPublic>;
 export declare const Switch: import("@tamagui/core").Combined<import("@tamagui/core").TamaguiComponent<import("@tamagui/core").TamaDefer, import("@tamagui/core").TamaguiElement, Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "native" | "nativeProps" | "size" | keyof import("@tamagui/switch-headless").SwitchExtraProps | keyof import("@tamagui/switch").SwitchFrameActiveStyleProps> & import("@tamagui/switch-headless").SwitchExtraProps & {
     native?: import("@tamagui/core").NativeValue<'mobile' | 'ios' | 'android'>;
-    nativeProps?: import("@tamagui/react-native-types/src").SwitchProps;
+    nativeProps?: import("@tamagui/react-native-types").SwitchProps;
 } & import("@tamagui/switch").SwitchFrameActiveStyleProps & import("@tamagui/switch").SwitchSharedProps, import("@tamagui/core").StackStyleBase, Omit<{
     active?: boolean | undefined;
     frameWidth?: number | undefined;