@tamagui/core 3.0.0-beta.1577.1 → 3.0.0-beta.1598.1

package/dist/native.cjs

@@ -12508,49 +12508,45 @@ function useMedia(componentContext, debug, uid) {
 			};
 			r.proxy = tracker;
 		}
-		r.getSnapshot = function() {
-			if (r.optimizeForFirstRender) {
-				var _r_componentContext;
-				var ms = getMedia();
-				if (ms === r.lastState) return r.lastState;
-				if ((_r_componentContext = r.componentContext) === null || _r_componentContext === void 0 ? void 0 : _r_componentContext.mediaEmit) {
-					r.componentContext.mediaEmit(ms);
-					r.pendingState = ms;
-					return r.lastState;
-				}
-				r.lastState = ms;
-				return ms;
-			}
+		r.getSnapshot = function(inRender) {
+			var _r_componentContext;
+			var { lastState } = r;
 			var curKeys = mediaListenKeys(r);
-			var { lastState, pendingState } = r;
-			if (!curKeys.size) return lastState;
-			var ms1 = getMedia();
-			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-			try {
-				for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var key = _step.value;
-					if (ms1[key] !== (pendingState || lastState)[key]) {
-						var _r_componentContext1;
-						if ((_r_componentContext1 = r.componentContext) === null || _r_componentContext1 === void 0 ? void 0 : _r_componentContext1.mediaEmit) {
-							r.componentContext.mediaEmit(ms1);
-							r.pendingState = ms1;
-							return lastState;
+			var ms = getMedia();
+			if (curKeys) {
+				var changed = false;
+				var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+				try {
+					for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+						var key = _step.value;
+						if (ms[key] !== (r.pendingState || lastState)[key]) {
+							changed = true;
+							break;
 						}
-						r.lastState = ms1;
-						return ms1;
 					}
-				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+				} catch (err) {
+					_didIteratorError = true;
+					_iteratorError = err;
 				} finally {
-					if (_didIteratorError) throw _iteratorError;
+					try {
+						if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+					} finally {
+						if (_didIteratorError) throw _iteratorError;
+					}
 				}
+				if (!changed) return lastState;
+			} else if (ms === lastState) return lastState;
+			var mediaEmit = (_r_componentContext = r.componentContext) === null || _r_componentContext === void 0 ? void 0 : _r_componentContext.mediaEmit;
+			if (mediaEmit) {
+				if (inRender) queueMicrotask(function() {
+					return mediaEmit(ms);
+				});
+				else mediaEmit(ms);
+				r.pendingState = ms;
+				return lastState;
 			}
-			return lastState;
+			r.lastState = ms;
+			return ms;
 		};
 		internalRef.current = r;
 	} else {
@@ -12566,7 +12562,7 @@ function useMedia(componentContext, debug, uid) {
 	}
 	if ((_ref_keys = ref.keys) === null || _ref_keys === void 0 ? void 0 : _ref_keys.size) ref.keys.clear();
 	var [, forceUpdate] = (0, react.useReducer)(incReducer$1, 0);
-	var state = ref.optimizeForFirstRender && ref.renderVersion === 1 ? ref.lastState : ref.getSnapshot();
+	var state = ref.optimizeForFirstRender && ref.renderVersion === 1 ? ref.lastState : ref.getSnapshot(true);
 	ref.proxyTarget = state;
 	if (!ref.optimizeForFirstRender) ref.proxy[refSlot].proxyTarget = state;
 	useIsomorphicLayoutEffect(function() {
@@ -15217,9 +15213,10 @@ function contributeProp(pass, keyOg, valOg) {
 				continue;
 			}
 			var styleOriginals = shouldTrackStyleTokenProvenance ? styleOriginalValues.get(style) : void 0;
-			for (var key1 in style) {
-				var value1 = style[key1];
+			for (var authoredKey in style) {
+				var value1 = style[authoredKey];
 				if (value1 == null) continue;
+				var key1 = disableExpandShorthands ? authoredKey : shorthands[authoredKey] || authoredKey;
 				var inline = !styleState.styleProps.stylePieceEntries;
 				if (inline) {
 					if (typeof value1 === "string") {
@@ -15231,7 +15228,7 @@ function contributeProp(pass, keyOg, valOg) {
 					} else if (value1 && typeof value1 === "object" && !Array.isArray(value1) && !isVariable(value1) && classifyConditionalObject(value1, styleState) !== 0) inline = false;
 				}
 				styleState.flatInlineStyleProp = inline;
-				contributeValue(styleState, key1, value1, styleOriginals === null || styleOriginals === void 0 ? void 0 : styleOriginals[key1]);
+				contributeValue(styleState, key1, value1, styleOriginals === null || styleOriginals === void 0 ? void 0 : styleOriginals[authoredKey]);
 				styleState.flatInlineStyleProp = false;
 			}
 		}

package/dist/test.native.cjs

@@ -2754,50 +2754,46 @@ function useMedia(componentContext, debug, uid) {
 			};
 			r.proxy = tracker;
 		}
-		r.getSnapshot = function() {
-			if (r.optimizeForFirstRender) {
-				var _r_componentContext;
-				var ms = getMedia();
-				if (ms === r.lastState) return r.lastState;
-				if ((_r_componentContext = r.componentContext) === null || _r_componentContext === void 0 ? void 0 : _r_componentContext.mediaEmit) {
-					r.componentContext.mediaEmit(ms);
-					r.pendingState = ms;
-					return r.lastState;
-				}
-				r.lastState = ms;
-				return ms;
-			}
+		r.getSnapshot = function(inRender) {
+			var _r_componentContext;
+			var { lastState } = r;
 			var curKeys = mediaListenKeys(r);
-			var { lastState, pendingState } = r;
-			if (!curKeys.size) return lastState;
-			var ms1 = getMedia();
-			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-			try {
-				for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var key = _step.value;
-					if (ms1[key] !== (pendingState || lastState)[key]) {
-						var _r_componentContext1;
-						if (globalThis.process.env.NODE_ENV === "development" && r.debug) console.warn(`useMedia() \u270D\uFE0F`, key, lastState[key], "=>", ms1[key]);
-						if ((_r_componentContext1 = r.componentContext) === null || _r_componentContext1 === void 0 ? void 0 : _r_componentContext1.mediaEmit) {
-							r.componentContext.mediaEmit(ms1);
-							r.pendingState = ms1;
-							return lastState;
+			var ms = getMedia();
+			if (curKeys) {
+				var changed = false;
+				var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+				try {
+					for (var _iterator = curKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+						var key = _step.value;
+						if (ms[key] !== (r.pendingState || lastState)[key]) {
+							if (globalThis.process.env.NODE_ENV === "development" && r.debug) console.warn(`useMedia() \u270D\uFE0F`, key, lastState[key], "=>", ms[key]);
+							changed = true;
+							break;
 						}
-						r.lastState = ms1;
-						return ms1;
 					}
-				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+				} catch (err) {
+					_didIteratorError = true;
+					_iteratorError = err;
 				} finally {
-					if (_didIteratorError) throw _iteratorError;
+					try {
+						if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+					} finally {
+						if (_didIteratorError) throw _iteratorError;
+					}
 				}
+				if (!changed) return lastState;
+			} else if (ms === lastState) return lastState;
+			var mediaEmit = (_r_componentContext = r.componentContext) === null || _r_componentContext === void 0 ? void 0 : _r_componentContext.mediaEmit;
+			if (mediaEmit) {
+				if (inRender) queueMicrotask(function() {
+					return mediaEmit(ms);
+				});
+				else mediaEmit(ms);
+				r.pendingState = ms;
+				return lastState;
 			}
-			return lastState;
+			r.lastState = ms;
+			return ms;
 		};
 		internalRef.current = r;
 	} else {
@@ -2813,7 +2809,7 @@ function useMedia(componentContext, debug, uid) {
 	}
 	if ((_ref_keys = ref.keys) === null || _ref_keys === void 0 ? void 0 : _ref_keys.size) ref.keys.clear();
 	var [, forceUpdate] = (0, react.useReducer)(incReducer$1, 0);
-	var state = ref.optimizeForFirstRender && ref.renderVersion === 1 ? ref.lastState : ref.getSnapshot();
+	var state = ref.optimizeForFirstRender && ref.renderVersion === 1 ? ref.lastState : ref.getSnapshot(true);
 	ref.proxyTarget = state;
 	if (!ref.optimizeForFirstRender) ref.proxy[refSlot].proxyTarget = state;
 	useIsomorphicLayoutEffect(function() {
@@ -5926,9 +5922,10 @@ function contributeProp(pass, keyOg, valOg) {
 				continue;
 			}
 			var styleOriginals = shouldTrackStyleTokenProvenance ? styleOriginalValues.get(style) : void 0;
-			for (var key1 in style) {
-				var value1 = style[key1];
+			for (var authoredKey in style) {
+				var value1 = style[authoredKey];
 				if (value1 == null) continue;
+				var key1 = disableExpandShorthands ? authoredKey : shorthands[authoredKey] || authoredKey;
 				var inline = !styleState.styleProps.stylePieceEntries;
 				if (inline) {
 					if (typeof value1 === "string") {
@@ -5940,7 +5937,7 @@ function contributeProp(pass, keyOg, valOg) {
 					} else if (value1 && typeof value1 === "object" && !Array.isArray(value1) && !isVariable(value1) && classifyConditionalObject(value1, styleState) !== 0) inline = false;
 				}
 				styleState.flatInlineStyleProp = inline;
-				contributeValue(styleState, key1, value1, styleOriginals === null || styleOriginals === void 0 ? void 0 : styleOriginals[key1]);
+				contributeValue(styleState, key1, value1, styleOriginals === null || styleOriginals === void 0 ? void 0 : styleOriginals[authoredKey]);
 				styleState.flatInlineStyleProp = false;
 			}
 		}

package/package.json

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