tamagui 2.5.1 → 2.5.3

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built tamagui in 1020 ms
+built tamagui in 2143 ms
 Running afterBuild script...
-afterBuild completed in 283 ms
+afterBuild completed in 428 ms

package/dist/native.cjs

@@ -22062,6 +22062,7 @@ init_objectWithoutProperties();
 init_objectSpread2();
 var _excluded$41 = [
 	"src",
+	"source",
 	"width",
 	"height",
 	"borderRadius",
@@ -22087,18 +22088,15 @@ var defaultObjectFitMap = function(objectFit) {
 	}
 };
 var defaultTransformSource = function(props) {
-	var { src, source, width, height } = props;
-	if (source) return source;
-	if (src && typeof src !== "string") return src;
-	return {
-		uri: src,
-		width,
-		height
-	};
+	var { src, source } = props;
+	if (typeof src === "string") return { uri: src };
+	if (source !== void 0 && source !== null) return source;
+	if (src !== void 0 && src !== null) return src;
+	return { uri: src };
 };
 function createImage(options) {
 	var { Component, mapObjectFitToResizeMode = defaultObjectFitMap, resizeModePropName = "resizeMode", objectPositionPropName, transformSource = defaultTransformSource } = options;
-	var ImageComponent = styledExport(Component, { name: "Image" }, { inlineProps: /* @__PURE__ */ new Set([
+	var StyledImage = styledExport(Component, { name: "Image" }, { inlineProps: /* @__PURE__ */ new Set([
 		"source",
 		"placeholder",
 		"transition",
@@ -22115,13 +22113,15 @@ function createImage(options) {
 		"onLoadStart",
 		"onProgress",
 		"onLoadEnd"
-	]) }).styleable(function(incomingProps, ref) {
+	]) });
+	var ImageComponent = StyledImage.styleable(function(incomingProps, ref) {
 		var props = incomingProps;
-		var { src, width, height, borderRadius, objectFit, objectPosition, decoding, elementTiming, fetchpriority, isMap, loading, sizes, useMap, onLoad, onError } = props, rest = _objectWithoutProperties(props, _excluded$41);
+		var { src, source, width, height, borderRadius, objectFit, objectPosition, decoding, elementTiming, fetchpriority, isMap, loading, sizes, useMap, onLoad, onError } = props, rest = _objectWithoutProperties(props, _excluded$41);
 		var resolvedWidth = typeof width === "string" && width[0] === "$" ? getTokenValue(width, "size") : width;
 		var resolvedHeight = typeof height === "string" && height[0] === "$" ? getTokenValue(height, "size") : height;
 		var finalSource = transformSource({
 			src,
+			source,
 			width: resolvedWidth,
 			height: resolvedHeight
 		});
@@ -22135,11 +22135,11 @@ function createImage(options) {
 		if (objectPositionPropName && objectPosition) finalProps[objectPositionPropName] = objectPosition;
 		if (onLoad) finalProps.onLoad = function(e) {
 			var _e_nativeEvent;
-			var source = (e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.source) || (e === null || e === void 0 ? void 0 : e.source) || {};
+			var source2 = (e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.source) || (e === null || e === void 0 ? void 0 : e.source) || {};
 			onLoad({
 				target: {
-					naturalHeight: source === null || source === void 0 ? void 0 : source.height,
-					naturalWidth: source === null || source === void 0 ? void 0 : source.width
+					naturalHeight: source2 === null || source2 === void 0 ? void 0 : source2.height,
+					naturalWidth: source2 === null || source2 === void 0 ? void 0 : source2.width
 				},
 				type: "load"
 			});
@@ -22147,7 +22147,7 @@ function createImage(options) {
 		if (onError) finalProps.onError = function() {
 			onError({ type: "error" });
 		};
-		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Component, _objectSpread2({ ref }, finalProps));
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StyledImage, _objectSpread2({ ref }, finalProps));
 	});
 	var comp = Component;
 	ImageComponent.getSize = comp.getSize || function() {};

package/dist/test.cjs

@@ -22129,6 +22129,7 @@ init_objectWithoutProperties();
 init_objectSpread2();
 var _excluded$41 = [
 	"src",
+	"source",
 	"width",
 	"height",
 	"borderRadius",
@@ -22154,18 +22155,15 @@ var defaultObjectFitMap = function(objectFit) {
 	}
 };
 var defaultTransformSource = function(props) {
-	var { src, source, width, height } = props;
-	if (source) return source;
-	if (src && typeof src !== "string") return src;
-	return {
-		uri: src,
-		width,
-		height
-	};
+	var { src, source } = props;
+	if (typeof src === "string") return { uri: src };
+	if (source !== void 0 && source !== null) return source;
+	if (src !== void 0 && src !== null) return src;
+	return { uri: src };
 };
 function createImage(options) {
 	var { Component, mapObjectFitToResizeMode = defaultObjectFitMap, resizeModePropName = "resizeMode", objectPositionPropName, transformSource = defaultTransformSource } = options;
-	var ImageComponent = styledExport(Component, { name: "Image" }, { inlineProps: /* @__PURE__ */ new Set([
+	var StyledImage = styledExport(Component, { name: "Image" }, { inlineProps: /* @__PURE__ */ new Set([
 		"source",
 		"placeholder",
 		"transition",
@@ -22182,13 +22180,15 @@ function createImage(options) {
 		"onLoadStart",
 		"onProgress",
 		"onLoadEnd"
-	]) }).styleable(function(incomingProps, ref) {
+	]) });
+	var ImageComponent = StyledImage.styleable(function(incomingProps, ref) {
 		var props = incomingProps;
-		var { src, width, height, borderRadius, objectFit, objectPosition, decoding, elementTiming, fetchpriority, isMap, loading, sizes, useMap, onLoad, onError } = props, rest = _objectWithoutProperties(props, _excluded$41);
+		var { src, source, width, height, borderRadius, objectFit, objectPosition, decoding, elementTiming, fetchpriority, isMap, loading, sizes, useMap, onLoad, onError } = props, rest = _objectWithoutProperties(props, _excluded$41);
 		var resolvedWidth = typeof width === "string" && width[0] === "$" ? getTokenValue(width, "size") : width;
 		var resolvedHeight = typeof height === "string" && height[0] === "$" ? getTokenValue(height, "size") : height;
 		var finalSource = transformSource({
 			src,
+			source,
 			width: resolvedWidth,
 			height: resolvedHeight
 		});
@@ -22202,11 +22202,11 @@ function createImage(options) {
 		if (objectPositionPropName && objectPosition) finalProps[objectPositionPropName] = objectPosition;
 		if (onLoad) finalProps.onLoad = function(e) {
 			var _e_nativeEvent;
-			var source = (e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.source) || (e === null || e === void 0 ? void 0 : e.source) || {};
+			var source2 = (e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.source) || (e === null || e === void 0 ? void 0 : e.source) || {};
 			onLoad({
 				target: {
-					naturalHeight: source === null || source === void 0 ? void 0 : source.height,
-					naturalWidth: source === null || source === void 0 ? void 0 : source.width
+					naturalHeight: source2 === null || source2 === void 0 ? void 0 : source2.height,
+					naturalWidth: source2 === null || source2 === void 0 ? void 0 : source2.width
 				},
 				type: "load"
 			});
@@ -22214,7 +22214,7 @@ function createImage(options) {
 		if (onError) finalProps.onError = function() {
 			onError({ type: "error" });
 		};
-		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Component, _objectSpread2({ ref }, finalProps));
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StyledImage, _objectSpread2({ ref }, finalProps));
 	});
 	var comp = Component;
 	ImageComponent.getSize = comp.getSize || function() {};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "tamagui",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "repository": {
     "type": "git",
-    "url": "https://github.com/tamagui/tamagui.git",
+    "url": "git+https://github.com/tamagui/tamagui.git",
     "directory": "code/ui/tamagui"
   },
   "source": "src/index.ts",
@@ -77,72 +77,72 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "2.5.1",
-    "@tamagui/adapt": "2.5.1",
-    "@tamagui/alert-dialog": "2.5.1",
-    "@tamagui/animate": "2.5.1",
-    "@tamagui/animate-presence": "2.5.1",
-    "@tamagui/avatar": "2.5.1",
-    "@tamagui/button": "2.5.1",
-    "@tamagui/card": "2.5.1",
-    "@tamagui/checkbox": "2.5.1",
-    "@tamagui/collapsible": "2.5.1",
-    "@tamagui/compose-refs": "2.5.1",
-    "@tamagui/constants": "2.5.1",
-    "@tamagui/context-menu": "2.5.1",
-    "@tamagui/core": "2.5.1",
-    "@tamagui/create-context": "2.5.1",
-    "@tamagui/create-menu": "2.5.1",
-    "@tamagui/dialog": "2.5.1",
-    "@tamagui/element": "2.5.1",
-    "@tamagui/elements": "2.5.1",
-    "@tamagui/fake-react-native": "2.5.1",
-    "@tamagui/focusable": "2.5.1",
-    "@tamagui/form": "2.5.1",
-    "@tamagui/get-button-sized": "2.5.1",
-    "@tamagui/get-font-sized": "2.5.1",
-    "@tamagui/get-token": "2.5.1",
-    "@tamagui/group": "2.5.1",
-    "@tamagui/helpers-tamagui": "2.5.1",
-    "@tamagui/image": "2.5.1",
-    "@tamagui/input": "2.5.1",
-    "@tamagui/label": "2.5.1",
-    "@tamagui/linear-gradient": "2.5.1",
-    "@tamagui/list-item": "2.5.1",
-    "@tamagui/menu": "2.5.1",
-    "@tamagui/polyfill-dev": "2.5.1",
-    "@tamagui/popover": "2.5.1",
-    "@tamagui/popper": "2.5.1",
-    "@tamagui/portal": "2.5.1",
-    "@tamagui/progress": "2.5.1",
-    "@tamagui/radio-group": "2.5.1",
-    "@tamagui/react-native-media-driver": "2.5.1",
-    "@tamagui/scroll-view": "2.5.1",
-    "@tamagui/select": "2.5.1",
-    "@tamagui/separator": "2.5.1",
-    "@tamagui/shapes": "2.5.1",
-    "@tamagui/sheet": "2.5.1",
-    "@tamagui/slider": "2.5.1",
-    "@tamagui/spacer": "2.5.1",
-    "@tamagui/spinner": "2.5.1",
-    "@tamagui/stacks": "2.5.1",
-    "@tamagui/switch": "2.5.1",
-    "@tamagui/tabs": "2.5.1",
-    "@tamagui/text": "2.5.1",
-    "@tamagui/theme": "2.5.1",
-    "@tamagui/toast": "2.5.1",
-    "@tamagui/toggle-group": "2.5.1",
-    "@tamagui/tooltip": "2.5.1",
-    "@tamagui/use-controllable-state": "2.5.1",
-    "@tamagui/use-debounce": "2.5.1",
-    "@tamagui/use-force-update": "2.5.1",
-    "@tamagui/use-window-dimensions": "2.5.1",
-    "@tamagui/visually-hidden": "2.5.1",
-    "@tamagui/font-size": "2.5.1",
-    "@tamagui/z-index-stack": "2.5.1"
+    "@tamagui/accordion": "2.5.3",
+    "@tamagui/adapt": "2.5.3",
+    "@tamagui/alert-dialog": "2.5.3",
+    "@tamagui/animate": "2.5.3",
+    "@tamagui/animate-presence": "2.5.3",
+    "@tamagui/avatar": "2.5.3",
+    "@tamagui/button": "2.5.3",
+    "@tamagui/card": "2.5.3",
+    "@tamagui/checkbox": "2.5.3",
+    "@tamagui/collapsible": "2.5.3",
+    "@tamagui/compose-refs": "2.5.3",
+    "@tamagui/constants": "2.5.3",
+    "@tamagui/context-menu": "2.5.3",
+    "@tamagui/core": "2.5.3",
+    "@tamagui/create-context": "2.5.3",
+    "@tamagui/create-menu": "2.5.3",
+    "@tamagui/dialog": "2.5.3",
+    "@tamagui/element": "2.5.3",
+    "@tamagui/elements": "2.5.3",
+    "@tamagui/fake-react-native": "2.5.3",
+    "@tamagui/focusable": "2.5.3",
+    "@tamagui/form": "2.5.3",
+    "@tamagui/get-button-sized": "2.5.3",
+    "@tamagui/get-font-sized": "2.5.3",
+    "@tamagui/get-token": "2.5.3",
+    "@tamagui/group": "2.5.3",
+    "@tamagui/helpers-tamagui": "2.5.3",
+    "@tamagui/image": "2.5.3",
+    "@tamagui/input": "2.5.3",
+    "@tamagui/label": "2.5.3",
+    "@tamagui/linear-gradient": "2.5.3",
+    "@tamagui/list-item": "2.5.3",
+    "@tamagui/menu": "2.5.3",
+    "@tamagui/polyfill-dev": "2.5.3",
+    "@tamagui/popover": "2.5.3",
+    "@tamagui/popper": "2.5.3",
+    "@tamagui/portal": "2.5.3",
+    "@tamagui/progress": "2.5.3",
+    "@tamagui/radio-group": "2.5.3",
+    "@tamagui/react-native-media-driver": "2.5.3",
+    "@tamagui/scroll-view": "2.5.3",
+    "@tamagui/select": "2.5.3",
+    "@tamagui/separator": "2.5.3",
+    "@tamagui/shapes": "2.5.3",
+    "@tamagui/sheet": "2.5.3",
+    "@tamagui/slider": "2.5.3",
+    "@tamagui/spacer": "2.5.3",
+    "@tamagui/spinner": "2.5.3",
+    "@tamagui/stacks": "2.5.3",
+    "@tamagui/switch": "2.5.3",
+    "@tamagui/tabs": "2.5.3",
+    "@tamagui/text": "2.5.3",
+    "@tamagui/theme": "2.5.3",
+    "@tamagui/toast": "2.5.3",
+    "@tamagui/toggle-group": "2.5.3",
+    "@tamagui/tooltip": "2.5.3",
+    "@tamagui/use-controllable-state": "2.5.3",
+    "@tamagui/use-debounce": "2.5.3",
+    "@tamagui/use-force-update": "2.5.3",
+    "@tamagui/use-window-dimensions": "2.5.3",
+    "@tamagui/visually-hidden": "2.5.3",
+    "@tamagui/font-size": "2.5.3",
+    "@tamagui/z-index-stack": "2.5.3"
   },
   "devDependencies": {
-    "@tamagui/build": "2.5.1",
+    "@tamagui/build": "2.5.3",
     "react": ">=19",
     "react-native": "0.83.2",
     "react-native-web": "^0.21.0"