@tamagui/web 2.7.7 → 3.0.0-beta.1093.1

package/dist/esm/helpers/nativeTransitionTarget.native.js

@@ -0,0 +1,21 @@
+import { Platform } from "react-native";
+
+function detectNativeTransitionTarget() {
+	var _Platform_constants;
+	if (Platform.OS !== "ios" && Platform.OS !== "android") return null;
+	var version = (_Platform_constants = Platform.constants) === null || _Platform_constants === void 0 ? void 0 : _Platform_constants.reactNativeVersion;
+	var minor = version === null || version === void 0 ? void 0 : version.minor;
+	if (typeof minor !== "number" || !Number.isInteger(minor)) return null;
+	var target = {
+		platform: Platform.OS,
+		reactNativeMinor: minor
+	};
+	if (Platform.OS === "android") {
+		var api = Number(Platform.Version);
+		if (Number.isInteger(api)) target.androidApi = api;
+	}
+	return target;
+}
+
+export { detectNativeTransitionTarget };
+//# sourceMappingURL=nativeTransitionTarget.native.js.map

package/dist/esm/helpers/nativeTransitionTarget.native.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeTransitionTarget.native.js","names":[],"sources":["esm/helpers/nativeTransitionTarget.native.js"],"sourcesContent":["import { Platform } from \"react-native\";\nfunction detectNativeTransitionTarget() {\n  var _Platform_constants;\n  if (Platform.OS !== \"ios\" && Platform.OS !== \"android\") return null;\n  var version = (_Platform_constants = Platform.constants) === null || _Platform_constants === void 0 ? void 0 : _Platform_constants.reactNativeVersion;\n  var minor = version === null || version === void 0 ? void 0 : version.minor;\n  if (typeof minor !== \"number\" || !Number.isInteger(minor)) return null;\n  var target = {\n    platform: Platform.OS,\n    reactNativeMinor: minor\n  };\n  if (Platform.OS === \"android\") {\n    var api = Number(Platform.Version);\n    if (Number.isInteger(api)) target.androidApi = api;\n  }\n  return target;\n}\nexport {\n  detectNativeTransitionTarget\n};\n//# sourceMappingURL=nativeTransitionTarget.native.js.map\n"],"mappings":";;;AACA,SAAS,+BAA+B;CACtC,IAAI;CACJ,IAAI,SAAS,OAAO,SAAS,SAAS,OAAO,WAAW,OAAO;CAC/D,IAAI,WAAW,sBAAsB,SAAS,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB;CACnI,IAAI,QAAQ,YAAY,QAAQ,YAAY,KAAK,IAAI,KAAK,IAAI,QAAQ;CACtE,IAAI,OAAO,UAAU,YAAY,CAAC,OAAO,UAAU,KAAK,GAAG,OAAO;CAClE,IAAI,SAAS;EACX,UAAU,SAAS;EACnB,kBAAkB;CACpB;CACA,IAAI,SAAS,OAAO,WAAW;EAC7B,IAAI,MAAM,OAAO,SAAS,OAAO;EACjC,IAAI,OAAO,UAAU,GAAG,GAAG,OAAO,aAAa;CACjD;CACA,OAAO;AACT"}

package/dist/esm/helpers/normalizeColor.mjs

@@ -1,21 +1,14 @@
-import { normalizeCSSColor, rgba } from "@tamagui/normalize-css-color";
 const normalizeColor = (color, opacity) => {
-  if (!color) return;
-  if (typeof color !== "string") return color;
-  if (color === "transparent") {
-    return "rgba(0, 0, 0, 0)";
-  }
-  if (typeof opacity === "number" && opacity < 1) {
-    return `color-mix(in srgb, ${color} ${Math.round(opacity * 100)}%, transparent)`;
-  }
-  return color;
+	if (!color) return;
+	if (typeof color !== "string") return color;
+	if (color === "transparent") {
+		return "rgba(0, 0, 0, 0)";
+	}
+	if (typeof opacity === "number" && opacity < 1) {
+		return `color-mix(in srgb, ${color} ${Math.round(opacity * 100)}%, transparent)`;
+	}
+	return color;
 };
-const getRgba = color => {
-  if (typeof color !== "string") return;
-  const colorNum = normalizeCSSColor(color);
-  if (colorNum != null) {
-    return rgba(colorNum);
-  }
-};
-export { getRgba, normalizeColor };
+
+export { normalizeColor };
 //# sourceMappingURL=normalizeColor.mjs.map

package/dist/esm/helpers/normalizeColor.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["normalizeCSSColor","rgba","normalizeColor","color","opacity","Math","round","getRgba","colorNum"],"sources":["../../../src/helpers/normalizeColor.ts"],"sourcesContent":[null],"mappings":"AAGA,SAASA,iBAAA,EAAmBC,IAAA,QAAY;AAEjC,MAAMC,cAAA,GAAiBA,CAACC,KAAA,EAAuBC,OAAA,KAAqB;EACzE,IAAI,CAACD,KAAA,EAAO;EACZ,IAAI,OAAOA,KAAA,KAAU,UAAU,OAAOA,KAAA;EAEtC,IAAIA,KAAA,KAAU,eAAe;IAC3B,OAAO;EACT;EAEA,IAAI,OAAOC,OAAA,KAAY,YAAYA,OAAA,GAAU,GAAG;IAC9C,OAAO,sBAAsBD,KAAK,IAAIE,IAAA,CAAKC,KAAA,CAAMF,OAAA,GAAU,GAAG,CAAC;EACjE;EAEA,OAAOD,KAAA;AACT;AAEO,MAAMI,OAAA,GACXJ,KAAA,IAC+D;EAC/D,IAAI,OAAOA,KAAA,KAAU,UAAU;EAC/B,MAAMK,QAAA,GAAWR,iBAAA,CAAkBG,KAAK;EACxC,IAAIK,QAAA,IAAY,MAAM;IACpB,OAAOP,IAAA,CAAKO,QAAQ;EACtB;AACF","ignoreList":[]}
+{"version":3,"file":"normalizeColor.js","names":[],"sources":["esm/helpers/normalizeColor.js"],"sourcesContent":["const normalizeColor = (color, opacity) => {\n  if (!color) return;\n  if (typeof color !== \"string\") return color;\n  if (color === \"transparent\") {\n    return \"rgba(0, 0, 0, 0)\";\n  }\n  if (typeof opacity === \"number\" && opacity < 1) {\n    return `color-mix(in srgb, ${color} ${Math.round(opacity * 100)}%, transparent)`;\n  }\n  return color;\n};\nexport {\n  normalizeColor\n};\n//# sourceMappingURL=normalizeColor.js.map\n"],"mappings":";AAAA,MAAM,kBAAkB,OAAO,YAAY;CACzC,IAAI,CAAC,OAAO;CACZ,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,UAAU,eAAe;EAC3B,OAAO;CACT;CACA,IAAI,OAAO,YAAY,YAAY,UAAU,GAAG;EAC9C,OAAO,sBAAsB,MAAM,GAAG,KAAK,MAAM,UAAU,GAAG,EAAE;CAClE;CACA,OAAO;AACT"}

package/dist/esm/helpers/normalizeColor.native.js

@@ -1,23 +1,23 @@
-import { normalizeCSSColor, rgba } from "@tamagui/normalize-css-color";
-import { rgba as rgba2 } from "@tamagui/normalize-css-color";
-var normalizeColor = function (color, opacity) {
-  if (!color) return;
-  if (typeof color !== "string") return color;
-  if (color[0] === "$") return color;
-  var rgbaVal = getRgba(color);
-  if (rgbaVal) {
-    var colors = `${rgbaVal.r},${rgbaVal.g},${rgbaVal.b}`;
-    var _ref;
-    return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${(_ref = opacity !== null && opacity !== void 0 ? opacity : rgbaVal.a) !== null && _ref !== void 0 ? _ref : 1})`;
-  }
-  return color;
+import { normalizeCSSColor, rgba, rgba as rgba2 } from "@tamagui/normalize-css-color";
+
+var normalizeColor = function(color, opacity) {
+	if (!color) return;
+	if (typeof color !== "string") return color;
+	var rgbaVal = getRgba(color);
+	if (rgbaVal) {
+		var colors = `${rgbaVal.r},${rgbaVal.g},${rgbaVal.b}`;
+		var _ref;
+		return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${(_ref = opacity !== null && opacity !== void 0 ? opacity : rgbaVal.a) !== null && _ref !== void 0 ? _ref : 1})`;
+	}
+	return color;
 };
-var getRgba = function (color) {
-  if (typeof color !== "string") return;
-  var colorNum = normalizeCSSColor(color);
-  if (colorNum != null) {
-    return rgba(colorNum);
-  }
+var getRgba = function(color) {
+	if (typeof color !== "string") return;
+	var colorNum = normalizeCSSColor(color);
+	if (colorNum != null) {
+		return rgba(colorNum);
+	}
 };
+
 export { getRgba, normalizeColor, rgba2 as rgba };
 //# sourceMappingURL=normalizeColor.native.js.map

package/dist/esm/helpers/normalizeColor.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["normalizeCSSColor","rgba","rgba2","normalizeColor","color","opacity","rgbaVal","getRgba","colors","r","g","b","_ref","a","colorNum"],"sources":["../../../src/helpers/normalizeColor.native.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,iBAAA,EAAmBC,IAAA,QAAY;AACxC,SAASA,IAAA,IAAAC,KAAA,QAAY;AACd,IAAIC,cAAA,GAAiB,SAAAA,CAASC,KAAA,EAAOC,OAAA,EAAS;EACjD,IAAI,CAACD,KAAA,EAAO;EAEZ,IAAI,OAAOA,KAAA,KAAU,UAAU,OAAOA,KAAA;EACtC,IAAIA,KAAA,CAAM,CAAC,MAAM,KAAK,OAAOA,KAAA;EAC7B,IAAIE,OAAA,GAAUC,OAAA,CAAQH,KAAK;EAC3B,IAAIE,OAAA,EAAS;IACT,IAAIE,MAAA,GAAS,GAAGF,OAAA,CAAQG,CAAC,IAAIH,OAAA,CAAQI,CAAC,IAAIJ,OAAA,CAAQK,CAAC;IACnD,IAAIC,IAAA;IACJ,OAAOP,OAAA,KAAY,IAAI,OAAOG,MAAM,MAAM,QAAQA,MAAM,KAAKI,IAAA,GAAOP,OAAA,KAAY,QAAQA,OAAA,KAAY,SAASA,OAAA,GAAUC,OAAA,CAAQO,CAAA,MAAO,QAAQD,IAAA,KAAS,SAASA,IAAA,GAAO,CAAC;EAC5K;EACA,OAAOR,KAAA;AACX;AACO,IAAIG,OAAA,GAAU,SAAAA,CAASH,KAAA,EAAO;EAEjC,IAAI,OAAOA,KAAA,KAAU,UAAU;EAC/B,IAAIU,QAAA,GAAWd,iBAAA,CAAkBI,KAAK;EACtC,IAAIU,QAAA,IAAY,MAAM;IAClB,OAAOb,IAAA,CAAKa,QAAQ;EACxB;AACJ","ignoreList":[]}
+{"version":3,"file":"normalizeColor.native.js","names":[],"sources":["esm/helpers/normalizeColor.native.js"],"sourcesContent":["import { normalizeCSSColor, rgba } from \"@tamagui/normalize-css-color\";\nimport { rgba as rgba2 } from \"@tamagui/normalize-css-color\";\nvar normalizeColor = function(color, opacity) {\n  if (!color) return;\n  if (typeof color !== \"string\") return color;\n  var rgbaVal = getRgba(color);\n  if (rgbaVal) {\n    var colors = `${rgbaVal.r},${rgbaVal.g},${rgbaVal.b}`;\n    var _ref;\n    return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${(_ref = opacity !== null && opacity !== void 0 ? opacity : rgbaVal.a) !== null && _ref !== void 0 ? _ref : 1})`;\n  }\n  return color;\n};\nvar getRgba = function(color) {\n  if (typeof color !== \"string\") return;\n  var colorNum = normalizeCSSColor(color);\n  if (colorNum != null) {\n    return rgba(colorNum);\n  }\n};\nexport {\n  getRgba,\n  normalizeColor,\n  rgba2 as rgba\n};\n//# sourceMappingURL=normalizeColor.native.js.map\n"],"mappings":";;;AAEA,IAAI,iBAAiB,SAAS,OAAO,SAAS;CAC5C,IAAI,CAAC,OAAO;CACZ,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI,UAAU,QAAQ,KAAK;CAC3B,IAAI,SAAS;EACX,IAAI,SAAS,GAAG,QAAQ,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ;EAClD,IAAI;EACJ,OAAO,YAAY,IAAI,OAAO,OAAO,KAAK,QAAQ,OAAO,IAAI,OAAO,YAAY,QAAQ,YAAY,KAAK,IAAI,UAAU,QAAQ,OAAO,QAAQ,SAAS,KAAK,IAAI,OAAO,EAAE;CAC3K;CACA,OAAO;AACT;AACA,IAAI,UAAU,SAAS,OAAO;CAC5B,IAAI,OAAO,UAAU,UAAU;CAC/B,IAAI,WAAW,kBAAkB,KAAK;CACtC,IAAI,YAAY,MAAM;EACpB,OAAO,KAAK,QAAQ;CACtB;AACF"}

package/dist/esm/helpers/normalizeShadow.mjs

@@ -1,25 +1,17 @@
 import { defaultOffset } from "./defaultOffset.mjs";
-function normalizeShadow({
-  shadowColor,
-  shadowOffset,
-  shadowOpacity,
-  shadowRadius
-}) {
-  const {
-    height,
-    width
-  } = shadowOffset || defaultOffset;
-  return {
-    shadowOffset: {
-      width: width || 0,
-      height: height || 0
-    },
-    shadowRadius: shadowRadius || 0,
-    // pass color through as-is, opacity applied via color-mix in getCSSStylesAtomic
-    shadowColor,
-    // default to 1 if not specified (color-mix will handle the opacity)
-    shadowOpacity: shadowOpacity ?? 1
-  };
+
+function normalizeShadow({ shadowColor, shadowOffset, shadowOpacity, shadowRadius }) {
+	const { height, width } = shadowOffset || defaultOffset;
+	return {
+		shadowOffset: {
+			width: width || 0,
+			height: height || 0
+		},
+		shadowRadius: shadowRadius || 0,
+		shadowColor,
+		shadowOpacity: shadowOpacity ?? 1
+	};
 }
+
 export { normalizeShadow };
 //# sourceMappingURL=normalizeShadow.mjs.map

package/dist/esm/helpers/normalizeShadow.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["defaultOffset","normalizeShadow","shadowColor","shadowOffset","shadowOpacity","shadowRadius","height","width"],"sources":["../../../src/helpers/normalizeShadow.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAA,QAAqB;AAEvB,SAASC,gBAAgB;EAC9BC,WAAA;EACAC,YAAA;EACAC,aAAA;EACAC;AACF,GAAwB;EACtB,MAAM;IAAEC,MAAA;IAAQC;EAAM,IAAIJ,YAAA,IAAgBH,aAAA;EAC1C,OAAO;IACLG,YAAA,EAAc;MACZI,KAAA,EAAOA,KAAA,IAAS;MAChBD,MAAA,EAAQA,MAAA,IAAU;IACpB;IACAD,YAAA,EAAcA,YAAA,IAAgB;IAAA;IAE9BH,WAAA;IAAA;IAEAE,aAAA,EAAeA,aAAA,IAAiB;EAClC;AACF","ignoreList":[]}
+{"version":3,"file":"normalizeShadow.js","names":[],"sources":["esm/helpers/normalizeShadow.js"],"sourcesContent":["import { defaultOffset } from \"./defaultOffset\";\nfunction normalizeShadow({\n  shadowColor,\n  shadowOffset,\n  shadowOpacity,\n  shadowRadius\n}) {\n  const { height, width } = shadowOffset || defaultOffset;\n  return {\n    shadowOffset: {\n      width: width || 0,\n      height: height || 0\n    },\n    shadowRadius: shadowRadius || 0,\n    // pass color through as-is, opacity applied via color-mix in getCSSStylesAtomic\n    shadowColor,\n    // default to 1 if not specified (color-mix will handle the opacity)\n    shadowOpacity: shadowOpacity ?? 1\n  };\n}\nexport {\n  normalizeShadow\n};\n//# sourceMappingURL=normalizeShadow.js.map\n"],"mappings":";;;AACA,SAAS,gBAAgB,EACvB,aACA,cACA,eACA,gBACC;CACD,MAAM,EAAE,QAAQ,UAAU,gBAAgB;CAC1C,OAAO;EACL,cAAc;GACZ,OAAO,SAAS;GAChB,QAAQ,UAAU;EACpB;EACA,cAAc,gBAAgB;EAE9B;EAEA,eAAe,iBAAiB;CAClC;AACF"}

package/dist/esm/helpers/normalizeShadow.native.js

@@ -1,26 +1,20 @@
 import { defaultOffset } from "./defaultOffset.native.js";
 import { getRgba, normalizeColor } from "./normalizeColor.native.js";
+
 function normalizeShadow(param) {
-  var {
-    shadowColor,
-    shadowOffset,
-    shadowOpacity,
-    shadowRadius
-  } = param;
-  var _getRgba;
-  var {
-    height,
-    width
-  } = shadowOffset || defaultOffset;
-  return {
-    shadowOffset: {
-      width: width || 0,
-      height: height || 0
-    },
-    shadowRadius: shadowRadius || 0,
-    shadowColor: normalizeColor(shadowColor, 1),
-    shadowOpacity: shadowOpacity !== null && shadowOpacity !== void 0 ? shadowOpacity : shadowColor ? (_getRgba = getRgba(shadowColor)) === null || _getRgba === void 0 ? void 0 : _getRgba.a : 1
-  };
+	var { shadowColor, shadowOffset, shadowOpacity, shadowRadius } = param;
+	var _getRgba;
+	var { height, width } = shadowOffset || defaultOffset;
+	return {
+		shadowOffset: {
+			width: width || 0,
+			height: height || 0
+		},
+		shadowRadius: shadowRadius || 0,
+		shadowColor: normalizeColor(shadowColor, 1),
+		shadowOpacity: shadowOpacity !== null && shadowOpacity !== void 0 ? shadowOpacity : shadowColor ? (_getRgba = getRgba(shadowColor)) === null || _getRgba === void 0 ? void 0 : _getRgba.a : 1
+	};
 }
+
 export { normalizeShadow };
 //# sourceMappingURL=normalizeShadow.native.js.map

package/dist/esm/helpers/normalizeShadow.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["defaultOffset","getRgba","normalizeColor","normalizeShadow","param","shadowColor","shadowOffset","shadowOpacity","shadowRadius","_getRgba","height","width","a"],"sources":["../../../src/helpers/normalizeShadow.native.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAA,QAAqB;AAC9B,SAASC,OAAA,EAASC,cAAA,QAAsB;AACjC,SAASC,gBAAgBC,KAAA,EAAO;EACnC,IAAI;IAAEC,WAAA;IAAaC,YAAA;IAAcC,aAAA;IAAeC;EAAa,IAAIJ,KAAA;EACjE,IAAIK,QAAA;EACJ,IAAI;IAAEC,MAAA;IAAQC;EAAM,IAAIL,YAAA,IAAgBN,aAAA;EACxC,OAAO;IACHM,YAAA,EAAc;MACVK,KAAA,EAAOA,KAAA,IAAS;MAChBD,MAAA,EAAQA,MAAA,IAAU;IACtB;IACAF,YAAA,EAAcA,YAAA,IAAgB;IAC9BH,WAAA,EAAaH,cAAA,CAAeG,WAAA,EAAa,CAAC;IAC1CE,aAAA,EAAeA,aAAA,KAAkB,QAAQA,aAAA,KAAkB,SAASA,aAAA,GAAgBF,WAAA,IAAeI,QAAA,GAAWR,OAAA,CAAQI,WAAW,OAAO,QAAQI,QAAA,KAAa,SAAS,SAASA,QAAA,CAASG,CAAA,GAAI;EAChM;AACJ","ignoreList":[]}
+{"version":3,"file":"normalizeShadow.native.js","names":[],"sources":["esm/helpers/normalizeShadow.native.js"],"sourcesContent":["import { defaultOffset } from \"./defaultOffset\";\nimport { getRgba, normalizeColor } from \"./normalizeColor.native\";\nfunction normalizeShadow(param) {\n  var { shadowColor, shadowOffset, shadowOpacity, shadowRadius } = param;\n  var _getRgba;\n  var { height, width } = shadowOffset || defaultOffset;\n  return {\n    shadowOffset: {\n      width: width || 0,\n      height: height || 0\n    },\n    shadowRadius: shadowRadius || 0,\n    shadowColor: normalizeColor(shadowColor, 1),\n    shadowOpacity: shadowOpacity !== null && shadowOpacity !== void 0 ? shadowOpacity : shadowColor ? (_getRgba = getRgba(shadowColor)) === null || _getRgba === void 0 ? void 0 : _getRgba.a : 1\n  };\n}\nexport {\n  normalizeShadow\n};\n//# sourceMappingURL=normalizeShadow.native.js.map\n"],"mappings":";;;;AAEA,SAAS,gBAAgB,OAAO;CAC9B,IAAI,EAAE,aAAa,cAAc,eAAe,iBAAiB;CACjE,IAAI;CACJ,IAAI,EAAE,QAAQ,UAAU,gBAAgB;CACxC,OAAO;EACL,cAAc;GACZ,OAAO,SAAS;GAChB,QAAQ,UAAU;EACpB;EACA,cAAc,gBAAgB;EAC9B,aAAa,eAAe,aAAa,CAAC;EAC1C,eAAe,kBAAkB,QAAQ,kBAAkB,KAAK,IAAI,gBAAgB,eAAe,WAAW,QAAQ,WAAW,OAAO,QAAQ,aAAa,KAAK,IAAI,KAAK,IAAI,SAAS,IAAI;CAC9L;AACF"}

package/dist/esm/helpers/normalizeStyle.mjs

@@ -1,50 +1,54 @@
+import { isWeb } from "@tamagui/constants";
+import { stylePropsTransform } from "@tamagui/helpers";
+import { addTransformValue, createTransformAccumulator, finalizeTransformAccumulator } from "@tamagui/style-grammar/runtime";
 import { expandStyle } from "./expandStyle.mjs";
 import { fixStyles } from "./expandStyles.mjs";
-import { isObj } from "./isObj.mjs";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty.mjs";
-import { pseudoDescriptors } from "./pseudoDescriptors.mjs";
 import { styleOriginalValues } from "./styleOriginalValues.mjs";
-function normalizeStyle(style, disableNormalize = false) {
-  const res = {};
-  const originalValues = styleOriginalValues.get(style);
-  let nextOriginalValues;
-  for (let key in style) {
-    const prop = style[key];
-    if (prop == null) continue;
-    const originalValue = originalValues?.[key];
-    if (key in pseudoDescriptors ||
-    // this should capture all parent-based styles like media, group, etc
-    key[0] === "$" && isObj(prop)) {
-      res[key] = normalizeStyle(prop, disableNormalize);
-      if (originalValue !== void 0) {
-        nextOriginalValues ||= {};
-        nextOriginalValues[key] = originalValue;
-      }
-      continue;
-    }
-    const value = disableNormalize ? prop : normalizeValueWithProperty(prop, key);
-    const out = expandStyle(key, value);
-    if (out) {
-      for (const [nextKey, nextValue] of out) {
-        res[nextKey] = nextValue;
-        if (originalValue !== void 0) {
-          nextOriginalValues ||= {};
-          nextOriginalValues[nextKey] = originalValue;
-        }
-      }
-    } else {
-      res[key] = value;
-      if (originalValue !== void 0) {
-        nextOriginalValues ||= {};
-        nextOriginalValues[key] = originalValue;
-      }
-    }
-  }
-  fixStyles(res);
-  if (nextOriginalValues) {
-    styleOriginalValues.set(res, nextOriginalValues);
-  }
-  return res;
+import { transformsToString } from "./transformsToString.mjs";
+
+function normalizeStyle(style, disableNormalize = false, mergeTransforms = false) {
+	const res = {};
+	const originalValues = styleOriginalValues.get(style);
+	let nextOriginalValues;
+	let transformAccumulator;
+	for (let key in style) {
+		const prop = style[key];
+		if (prop == null) continue;
+		const originalValue = originalValues?.[key];
+		if (mergeTransforms && (key === "transform" || key in stylePropsTransform)) {
+			transformAccumulator ||= createTransformAccumulator();
+			addTransformValue(transformAccumulator, key, prop);
+			continue;
+		}
+		const value = disableNormalize ? prop : normalizeValueWithProperty(prop, key);
+		const out = mergeTransforms ? void 0 : expandStyle(key, value);
+		if (out) {
+			for (const [nextKey, nextValue] of out) {
+				res[nextKey] = nextValue;
+				if (originalValue !== void 0) {
+					nextOriginalValues ||= {};
+					nextOriginalValues[nextKey] = originalValue;
+				}
+			}
+		} else {
+			res[key] = value;
+			if (originalValue !== void 0) {
+				nextOriginalValues ||= {};
+				nextOriginalValues[key] = originalValue;
+			}
+		}
+	}
+	if (transformAccumulator) {
+		const transform = finalizeTransformAccumulator(transformAccumulator);
+		res.transform = isWeb && Array.isArray(transform) ? transformsToString(transform) : transform;
+	}
+	fixStyles(res);
+	if (nextOriginalValues) {
+		styleOriginalValues.set(res, nextOriginalValues);
+	}
+	return res;
 }
+
 export { normalizeStyle };
 //# sourceMappingURL=normalizeStyle.mjs.map

package/dist/esm/helpers/normalizeStyle.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["expandStyle","fixStyles","isObj","normalizeValueWithProperty","pseudoDescriptors","styleOriginalValues","normalizeStyle","style","disableNormalize","res","originalValues","get","nextOriginalValues","key","prop","originalValue","value","out","nextKey","nextValue","set"],"sources":["../../../src/helpers/normalizeStyle.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,SAAA,QAAiB;AAC1B,SAASC,KAAA,QAAa;AACtB,SAASC,0BAAA,QAAkC;AAC3C,SAASC,iBAAA,QAAyB;AAClC,SAASC,mBAAA,QAA2B;AAU7B,SAASC,eAAeC,KAAA,EAA4BC,gBAAA,GAAmB,OAAO;EACnF,MAAMC,GAAA,GAA2B,CAAC;EAClC,MAAMC,cAAA,GAAiBL,mBAAA,CAAoBM,GAAA,CAAIJ,KAAK;EACpD,IAAIK,kBAAA;EAEJ,SAASC,GAAA,IAAON,KAAA,EAAO;IACrB,MAAMO,IAAA,GAAOP,KAAA,CAAMM,GAAG;IACtB,IAAIC,IAAA,IAAQ,MAAM;IAClB,MAAMC,aAAA,GAAgBL,cAAA,GAAiBG,GAAG;IAC1C,IACEA,GAAA,IAAOT,iBAAA;IAAA;IAENS,GAAA,CAAI,CAAC,MAAM,OAAOX,KAAA,CAAMY,IAAI,GAC7B;MACAL,GAAA,CAAII,GAAG,IAAIP,cAAA,CAAeQ,IAAA,EAAMN,gBAAgB;MAChD,IAAIO,aAAA,KAAkB,QAAW;QAC/BH,kBAAA,KAAuB,CAAC;QACxBA,kBAAA,CAAmBC,GAAG,IAAIE,aAAA;MAC5B;MACA;IACF;IACA,MAAMC,KAAA,GAAQR,gBAAA,GAAmBM,IAAA,GAAOX,0BAAA,CAA2BW,IAAA,EAAMD,GAAG;IAE5E,MAAMI,GAAA,GAAMjB,WAAA,CAAYa,GAAA,EAAKG,KAAK;IAClC,IAAIC,GAAA,EAAK;MACP,WAAW,CAACC,OAAA,EAASC,SAAS,KAAKF,GAAA,EAAK;QACtCR,GAAA,CAAIS,OAAO,IAAIC,SAAA;QACf,IAAIJ,aAAA,KAAkB,QAAW;UAC/BH,kBAAA,KAAuB,CAAC;UACxBA,kBAAA,CAAmBM,OAAO,IAAIH,aAAA;QAChC;MACF;IACF,OAAO;MACLN,GAAA,CAAII,GAAG,IAAIG,KAAA;MACX,IAAID,aAAA,KAAkB,QAAW;QAC/BH,kBAAA,KAAuB,CAAC;QACxBA,kBAAA,CAAmBC,GAAG,IAAIE,aAAA;MAC5B;IACF;EACF;EAEAd,SAAA,CAAUQ,GAAG;EAEb,IAAIG,kBAAA,EAAoB;IACtBP,mBAAA,CAAoBe,GAAA,CAAIX,GAAA,EAAKG,kBAAkB;EACjD;EAEA,OAAOH,GAAA;AACT","ignoreList":[]}
+{"version":3,"file":"normalizeStyle.js","names":[],"sources":["esm/helpers/normalizeStyle.js"],"sourcesContent":["import { isWeb } from \"@tamagui/constants\";\nimport { stylePropsTransform } from \"@tamagui/helpers\";\nimport {\n  addTransformValue,\n  createTransformAccumulator,\n  finalizeTransformAccumulator\n} from \"@tamagui/style-grammar/runtime\";\nimport { expandStyle } from \"./expandStyle\";\nimport { fixStyles } from \"./expandStyles\";\nimport { normalizeValueWithProperty } from \"./normalizeValueWithProperty\";\nimport { styleOriginalValues } from \"./styleOriginalValues\";\nimport { transformsToString } from \"./transformsToString\";\nfunction normalizeStyle(style, disableNormalize = false, mergeTransforms = false) {\n  const res = {};\n  const originalValues = styleOriginalValues.get(style);\n  let nextOriginalValues;\n  let transformAccumulator;\n  for (let key in style) {\n    const prop = style[key];\n    if (prop == null) continue;\n    const originalValue = originalValues?.[key];\n    if (mergeTransforms && (key === \"transform\" || key in stylePropsTransform)) {\n      transformAccumulator ||= createTransformAccumulator();\n      addTransformValue(transformAccumulator, key, prop);\n      continue;\n    }\n    const value = disableNormalize ? prop : normalizeValueWithProperty(prop, key);\n    const out = mergeTransforms ? void 0 : expandStyle(key, value);\n    if (out) {\n      for (const [nextKey, nextValue] of out) {\n        res[nextKey] = nextValue;\n        if (originalValue !== void 0) {\n          nextOriginalValues ||= {};\n          nextOriginalValues[nextKey] = originalValue;\n        }\n      }\n    } else {\n      res[key] = value;\n      if (originalValue !== void 0) {\n        nextOriginalValues ||= {};\n        nextOriginalValues[key] = originalValue;\n      }\n    }\n  }\n  if (transformAccumulator) {\n    const transform = finalizeTransformAccumulator(transformAccumulator);\n    res.transform = isWeb && Array.isArray(transform) ? transformsToString(transform) : transform;\n  }\n  fixStyles(res);\n  if (nextOriginalValues) {\n    styleOriginalValues.set(res, nextOriginalValues);\n  }\n  return res;\n}\nexport {\n  normalizeStyle\n};\n//# sourceMappingURL=normalizeStyle.js.map\n"],"mappings":";;;;;;;;;;AAYA,SAAS,eAAe,OAAO,mBAAmB,OAAO,kBAAkB,OAAO;CAChF,MAAM,MAAM,CAAC;CACb,MAAM,iBAAiB,oBAAoB,IAAI,KAAK;CACpD,IAAI;CACJ,IAAI;CACJ,KAAK,IAAI,OAAO,OAAO;EACrB,MAAM,OAAO,MAAM;EACnB,IAAI,QAAQ,MAAM;EAClB,MAAM,gBAAgB,iBAAiB;EACvC,IAAI,oBAAoB,QAAQ,eAAe,OAAO,sBAAsB;GAC1E,yBAAyB,2BAA2B;GACpD,kBAAkB,sBAAsB,KAAK,IAAI;GACjD;EACF;EACA,MAAM,QAAQ,mBAAmB,OAAO,2BAA2B,MAAM,GAAG;EAC5E,MAAM,MAAM,kBAAkB,KAAK,IAAI,YAAY,KAAK,KAAK;EAC7D,IAAI,KAAK;GACP,KAAK,MAAM,CAAC,SAAS,cAAc,KAAK;IACtC,IAAI,WAAW;IACf,IAAI,kBAAkB,KAAK,GAAG;KAC5B,uBAAuB,CAAC;KACxB,mBAAmB,WAAW;IAChC;GACF;EACF,OAAO;GACL,IAAI,OAAO;GACX,IAAI,kBAAkB,KAAK,GAAG;IAC5B,uBAAuB,CAAC;IACxB,mBAAmB,OAAO;GAC5B;EACF;CACF;CACA,IAAI,sBAAsB;EACxB,MAAM,YAAY,6BAA6B,oBAAoB;EACnE,IAAI,YAAY,SAAS,MAAM,QAAQ,SAAS,IAAI,mBAAmB,SAAS,IAAI;CACtF;CACA,UAAU,GAAG;CACb,IAAI,oBAAoB;EACtB,oBAAoB,IAAI,KAAK,kBAAkB;CACjD;CACA,OAAO;AACT"}

package/dist/esm/helpers/normalizeStyle.native.js

@@ -1,70 +1,72 @@
+import { isWeb } from "@tamagui/constants";
+import { stylePropsTransform } from "@tamagui/helpers";
+import { addTransformValue, createTransformAccumulator, finalizeTransformAccumulator } from "@tamagui/style-grammar/runtime";
 import { expandStyle } from "./expandStyle.native.js";
 import { fixStyles } from "./expandStyles.native.js";
-import { isObj } from "./isObj.native.js";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty.native.js";
-import { pseudoDescriptors } from "./pseudoDescriptors.native.js";
 import { styleOriginalValues } from "./styleOriginalValues.native.js";
+import { transformsToString } from "./transformsToString.native.js";
+
 function normalizeStyle(style) {
-  var disableNormalize = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-  var res = {};
-  var originalValues = styleOriginalValues.get(style);
-  var nextOriginalValues;
-  for (var key in style) {
-    var prop = style[key];
-    if (prop == null) continue;
-    var originalValue = originalValues === null || originalValues === void 0 ? void 0 : originalValues[key];
-    if (key in pseudoDescriptors ||
-    // this should capture all parent-based styles like media, group, etc
-    key[0] === "$" && isObj(prop)) {
-      res[key] = normalizeStyle(prop, disableNormalize);
-      if (originalValue !== void 0) {
-        nextOriginalValues || (nextOriginalValues = {});
-        nextOriginalValues[key] = originalValue;
-      }
-      continue;
-    }
-    var value = disableNormalize ? prop : normalizeValueWithProperty(prop, key);
-    var out = expandStyle(key, value);
-    if (out) {
-      var _iteratorNormalCompletion = true,
-        _didIteratorError = false,
-        _iteratorError = void 0;
-      try {
-        for (var _iterator = out[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var [nextKey, nextValue] = _step.value;
-          res[nextKey] = nextValue;
-          if (originalValue !== void 0) {
-            nextOriginalValues || (nextOriginalValues = {});
-            nextOriginalValues[nextKey] = originalValue;
-          }
-        }
-      } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
-          }
-        } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-        }
-      }
-    } else {
-      res[key] = value;
-      if (originalValue !== void 0) {
-        nextOriginalValues || (nextOriginalValues = {});
-        nextOriginalValues[key] = originalValue;
-      }
-    }
-  }
-  fixStyles(res);
-  if (nextOriginalValues) {
-    styleOriginalValues.set(res, nextOriginalValues);
-  }
-  return res;
+	var disableNormalize = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, mergeTransforms = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+	var res = {};
+	var originalValues = styleOriginalValues.get(style);
+	var nextOriginalValues;
+	var transformAccumulator;
+	for (var key in style) {
+		var prop = style[key];
+		if (prop == null) continue;
+		var originalValue = originalValues === null || originalValues === void 0 ? void 0 : originalValues[key];
+		if (mergeTransforms && (key === "transform" || key in stylePropsTransform)) {
+			transformAccumulator || (transformAccumulator = createTransformAccumulator());
+			addTransformValue(transformAccumulator, key, prop);
+			continue;
+		}
+		var value = disableNormalize ? prop : normalizeValueWithProperty(prop, key);
+		var out = mergeTransforms ? void 0 : expandStyle(key, value);
+		if (out) {
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = out[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var [nextKey, nextValue] = _step.value;
+					res[nextKey] = nextValue;
+					if (originalValue !== void 0) {
+						nextOriginalValues || (nextOriginalValues = {});
+						nextOriginalValues[nextKey] = originalValue;
+					}
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+		} else {
+			res[key] = value;
+			if (originalValue !== void 0) {
+				nextOriginalValues || (nextOriginalValues = {});
+				nextOriginalValues[key] = originalValue;
+			}
+		}
+	}
+	if (transformAccumulator) {
+		var transform = finalizeTransformAccumulator(transformAccumulator);
+		res.transform = isWeb && Array.isArray(transform) ? transformsToString(transform) : transform;
+	}
+	fixStyles(res);
+	if (nextOriginalValues) {
+		styleOriginalValues.set(res, nextOriginalValues);
+	}
+	return res;
 }
+
 export { normalizeStyle };
 //# sourceMappingURL=normalizeStyle.native.js.map

package/dist/esm/helpers/normalizeStyle.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["expandStyle","fixStyles","isObj","normalizeValueWithProperty","pseudoDescriptors","styleOriginalValues","normalizeStyle","style","disableNormalize","arguments","length","res","originalValues","get","nextOriginalValues","key","prop","originalValue","value","out","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","nextKey","nextValue","err","return"],"sources":["../../../src/helpers/normalizeStyle.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,SAAA,QAAiB;AAC1B,SAASC,KAAA,QAAa;AACtB,SAASC,0BAAA,QAAkC;AAC3C,SAASC,iBAAA,QAAyB;AAClC,SAASC,mBAAA,QAA2B;AAU7B,SAASC,eAAeC,KAAA,EAA4B;EACzD,IAAAC,gBAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAClC,IAAAE,GAAM;EACN,IAAIC,cAAA,GAAAP,mBAAA,CAAAQ,GAAA,CAAAN,KAAA;EAEJ,IAAAO,kBAAgB;EACd,SAAMC,GAAA,IAAOR,KAAM;IACnB,IAAIS,IAAA,GAAAT,KAAQ,CAAMQ,GAAA;IAClB,IAAAC,IAAM;IACN,IACEC,aAAO,GAAAL,cAAA,aAAAA,cAAA,uBAAAA,cAAA,CAAAG,GAAA;IAEN,IAAIA,GAAC,IAAMX,iBAAiB;IAC7B;IACAW,GAAA,GAAI,KAAG,GAAI,IAAAb,KAAA,CAAAc,IAAe;MAC1BL,GAAA,CAAII,GAAA,IAAAT,cAAkB,CAAAU,IAAW,EAAAR,gBAAA;MAC/B,IAAAS,aAAA,UAAwB;QACxBH,kBAAA,KAAsBA,kBAAI;QAC5BA,kBAAA,CAAAC,GAAA,IAAAE,aAAA;MACA;MACF;IACA;IAEA,IAAAC,KAAM,GAAMV,gBAAY,GAAKQ,IAAK,GAAAb,0BAAA,CAAAa,IAAA,EAAAD,GAAA;IAClC,IAAII,GAAA,GAAKnB,WAAA,CAAAe,GAAA,EAAAG,KAAA;IACP,IAAAC,GAAA;MACE,IAAAC,yBAAe;QAAAC,iBAAA;QAAAC,cAAA;MACf;QACE,SAAAC,SAAA,GAAAJ,GAAA,CAAuBK,MAAC,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;UACxB,KAAAS,OAAA,EAAAC,SAAmB,IAAOJ,KAAI,CAAAR,KAAA;UAChCP,GAAA,CAAAkB,OAAA,IAAAC,SAAA;UACF,IAAAb,aAAA;YACKH,kBAAA,KAAAA,kBAAA;YACDA,kBAAO,CAAAe,OAAA,IAAAZ,aAAA;UACP;QACF;MACA,SAAAc,GAAA;QACFV,iBAAA;QACFC,cAAA,GAAAS,GAAA;MACF;QAEA,IAAU;UAEN,KAAAX,yBAAoB,IAAAG,SAAA,CAAAS,MAAA;YACtBT,SAAA,CAAAS,MAAwB;UAC1B;QAEA,CAAO;UACT,IAAAX,iBAAA","ignoreList":[]}
+{"version":3,"file":"normalizeStyle.native.js","names":[],"sources":["esm/helpers/normalizeStyle.native.js"],"sourcesContent":["import { isWeb } from \"@tamagui/constants\";\nimport { stylePropsTransform } from \"@tamagui/helpers\";\nimport { addTransformValue, createTransformAccumulator, finalizeTransformAccumulator } from \"@tamagui/style-grammar/runtime\";\nimport { expandStyle } from \"./expandStyle\";\nimport { fixStyles } from \"./expandStyles\";\nimport { normalizeValueWithProperty } from \"./normalizeValueWithProperty\";\nimport { styleOriginalValues } from \"./styleOriginalValues\";\nimport { transformsToString } from \"./transformsToString\";\nfunction normalizeStyle(style) {\n  var disableNormalize = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, mergeTransforms = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;\n  var res = {};\n  var originalValues = styleOriginalValues.get(style);\n  var nextOriginalValues;\n  var transformAccumulator;\n  for (var key in style) {\n    var prop = style[key];\n    if (prop == null) continue;\n    var originalValue = originalValues === null || originalValues === void 0 ? void 0 : originalValues[key];\n    if (mergeTransforms && (key === \"transform\" || key in stylePropsTransform)) {\n      transformAccumulator || (transformAccumulator = createTransformAccumulator());\n      addTransformValue(transformAccumulator, key, prop);\n      continue;\n    }\n    var value = disableNormalize ? prop : normalizeValueWithProperty(prop, key);\n    var out = mergeTransforms ? void 0 : expandStyle(key, value);\n    if (out) {\n      var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n      try {\n        for (var _iterator = out[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n          var [nextKey, nextValue] = _step.value;\n          res[nextKey] = nextValue;\n          if (originalValue !== void 0) {\n            nextOriginalValues || (nextOriginalValues = {});\n            nextOriginalValues[nextKey] = originalValue;\n          }\n        }\n      } catch (err) {\n        _didIteratorError = true;\n        _iteratorError = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion && _iterator.return != null) {\n            _iterator.return();\n          }\n        } finally {\n          if (_didIteratorError) {\n            throw _iteratorError;\n          }\n        }\n      }\n    } else {\n      res[key] = value;\n      if (originalValue !== void 0) {\n        nextOriginalValues || (nextOriginalValues = {});\n        nextOriginalValues[key] = originalValue;\n      }\n    }\n  }\n  if (transformAccumulator) {\n    var transform = finalizeTransformAccumulator(transformAccumulator);\n    res.transform = isWeb && Array.isArray(transform) ? transformsToString(transform) : transform;\n  }\n  fixStyles(res);\n  if (nextOriginalValues) {\n    styleOriginalValues.set(res, nextOriginalValues);\n  }\n  return res;\n}\nexport {\n  normalizeStyle\n};\n//# sourceMappingURL=normalizeStyle.js.map\n"],"mappings":";;;;;;;;;;AAQA,SAAS,eAAe,OAAO;CAC7B,IAAI,mBAAmB,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK,OAAO,kBAAkB,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK;CAClL,IAAI,MAAM,CAAC;CACX,IAAI,iBAAiB,oBAAoB,IAAI,KAAK;CAClD,IAAI;CACJ,IAAI;CACJ,KAAK,IAAI,OAAO,OAAO;EACrB,IAAI,OAAO,MAAM;EACjB,IAAI,QAAQ,MAAM;EAClB,IAAI,gBAAgB,mBAAmB,QAAQ,mBAAmB,KAAK,IAAI,KAAK,IAAI,eAAe;EACnG,IAAI,oBAAoB,QAAQ,eAAe,OAAO,sBAAsB;GAC1E,yBAAyB,uBAAuB,2BAA2B;GAC3E,kBAAkB,sBAAsB,KAAK,IAAI;GACjD;EACF;EACA,IAAI,QAAQ,mBAAmB,OAAO,2BAA2B,MAAM,GAAG;EAC1E,IAAI,MAAM,kBAAkB,KAAK,IAAI,YAAY,KAAK,KAAK;EAC3D,IAAI,KAAK;GACP,IAAI,4BAA4B,MAAM,oBAAoB,OAAO,iBAAiB,KAAK;GACvF,IAAI;IACF,KAAK,IAAI,YAAY,IAAI,OAAO,SAAS,CAAC,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,EAAC,CAAE,OAAO,4BAA4B,MAAM;KACpJ,IAAI,CAAC,SAAS,aAAa,MAAM;KACjC,IAAI,WAAW;KACf,IAAI,kBAAkB,KAAK,GAAG;MAC5B,uBAAuB,qBAAqB,CAAC;MAC7C,mBAAmB,WAAW;KAChC;IACF;GACF,SAAS,KAAK;IACZ,oBAAoB;IACpB,iBAAiB;GACnB,UAAU;IACR,IAAI;KACF,IAAI,CAAC,6BAA6B,UAAU,UAAU,MAAM;MAC1D,UAAU,OAAO;KACnB;IACF,UAAU;KACR,IAAI,mBAAmB;MACrB,MAAM;KACR;IACF;GACF;EACF,OAAO;GACL,IAAI,OAAO;GACX,IAAI,kBAAkB,KAAK,GAAG;IAC5B,uBAAuB,qBAAqB,CAAC;IAC7C,mBAAmB,OAAO;GAC5B;EACF;CACF;CACA,IAAI,sBAAsB;EACxB,IAAI,YAAY,6BAA6B,oBAAoB;EACjE,IAAI,YAAY,SAAS,MAAM,QAAQ,SAAS,IAAI,mBAAmB,SAAS,IAAI;CACtF;CACA,UAAU,GAAG;CACb,IAAI,oBAAoB;EACtB,oBAAoB,IAAI,KAAK,kBAAkB;CACjD;CACA,OAAO;AACT"}

package/dist/esm/helpers/normalizeValueWithProperty.mjs

@@ -1,29 +1,36 @@
 import { isWeb } from "@tamagui/constants";
 import { stylePropsAll, stylePropsUnitless } from "@tamagui/helpers";
-const stylePropsAllPlusTransforms = {
-  ...stylePropsAll,
-  translateX: true,
-  translateY: true
-};
+
+const unitfulProps = new Set([
+	...Object.keys(stylePropsAll),
+	"translateX",
+	"translateY"
+].filter((key) => !stylePropsUnitless[key]));
+const pxStringRe = /^-?\d*\.?\d+px$/;
 function normalizeValueWithProperty(value, property = "") {
-  if (!isWeb) return value;
-  if (stylePropsUnitless[property] || property && !stylePropsAllPlusTransforms[property] || typeof value === "boolean") {
-    return value;
-  }
-  if (value && typeof value === "object") {
-    if (typeof value.__getValue === "function") {
-      value = value.__getValue();
-    } else {
-      return value;
-    }
-  }
-  let res = value;
-  if (typeof value === "number") {
-    res = `${value}px`;
-  } else if (property) {
-    res = `${res}`;
-  }
-  return res;
+	if (!isWeb) {
+		if (typeof value === "string" && pxStringRe.test(value)) {
+			return Number.parseFloat(value);
+		}
+		return value;
+	}
+	if (property !== "" && !unitfulProps.has(property)) return value;
+	if (typeof value === "boolean") return value;
+	if (value && typeof value === "object") {
+		if (typeof value.__getValue === "function") {
+			value = value.__getValue();
+		} else {
+			return value;
+		}
+	}
+	let res = value;
+	if (typeof value === "number") {
+		res = `${value}px`;
+	} else if (property) {
+		res = `${res}`;
+	}
+	return res;
 }
+
 export { normalizeValueWithProperty };
 //# sourceMappingURL=normalizeValueWithProperty.mjs.map

package/dist/esm/helpers/normalizeValueWithProperty.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isWeb","stylePropsAll","stylePropsUnitless","stylePropsAllPlusTransforms","translateX","translateY","normalizeValueWithProperty","value","property","__getValue","res"],"sources":["../../../src/helpers/normalizeValueWithProperty.ts"],"sourcesContent":[null],"mappings":"AAKA,SAASA,KAAA,QAAa;AACtB,SAASC,aAAA,EAAeC,kBAAA,QAA0B;AAIlD,MAAMC,2BAAA,GAA8B;EAClC,GAAGF,aAAA;EACHG,UAAA,EAAY;EACZC,UAAA,EAAY;AACd;AAEO,SAASC,2BAA2BC,KAAA,EAAYC,QAAA,GAAW,IAAS;EACzE,IAAI,CAACR,KAAA,EAAO,OAAOO,KAAA;EACnB,IACEL,kBAAA,CAAmBM,QAAQ,KAC1BA,QAAA,IAAY,CAACL,2BAAA,CAA4BK,QAAQ,KAClD,OAAOD,KAAA,KAAU,WACjB;IACA,OAAOA,KAAA;EACT;EACA,IAAIA,KAAA,IAAS,OAAOA,KAAA,KAAU,UAAU;IACtC,IAAI,OAAOA,KAAA,CAAME,UAAA,KAAe,YAAY;MAE1CF,KAAA,GAAQA,KAAA,CAAME,UAAA,CAAW;IAC3B,OAAO;MACL,OAAOF,KAAA;IACT;EACF;EACA,IAAIG,GAAA,GAAMH,KAAA;EACV,IAAI,OAAOA,KAAA,KAAU,UAAU;IAC7BG,GAAA,GAAM,GAAGH,KAAK;EAChB,WAAWC,QAAA,EAAU;IACnBE,GAAA,GAAM,GAAGA,GAAG;EACd;EACA,OAAOA,GAAA;AACT","ignoreList":[]}
+{"version":3,"file":"normalizeValueWithProperty.js","names":[],"sources":["esm/helpers/normalizeValueWithProperty.js"],"sourcesContent":["import { isWeb } from \"@tamagui/constants\";\nimport { stylePropsAll, stylePropsUnitless } from \"@tamagui/helpers\";\nconst unitfulProps = new Set(\n  [...Object.keys(stylePropsAll), \"translateX\", \"translateY\"].filter(\n    (key) => !stylePropsUnitless[key]\n  )\n);\nconst pxStringRe = /^-?\\d*\\.?\\d+px$/;\nfunction normalizeValueWithProperty(value, property = \"\") {\n  if (!isWeb) {\n    if (typeof value === \"string\" && pxStringRe.test(value)) {\n      return Number.parseFloat(value);\n    }\n    return value;\n  }\n  if (property !== \"\" && !unitfulProps.has(property)) return value;\n  if (typeof value === \"boolean\") return value;\n  if (value && typeof value === \"object\") {\n    if (typeof value.__getValue === \"function\") {\n      value = value.__getValue();\n    } else {\n      return value;\n    }\n  }\n  let res = value;\n  if (typeof value === \"number\") {\n    res = `${value}px`;\n  } else if (property) {\n    res = `${res}`;\n  }\n  return res;\n}\nexport {\n  normalizeValueWithProperty\n};\n//# sourceMappingURL=normalizeValueWithProperty.js.map\n"],"mappings":";;;;AAEA,MAAM,eAAe,IAAI,IACvB;CAAC,GAAG,OAAO,KAAK,aAAa;CAAG;CAAc;AAAY,CAAC,CAAC,QACzD,QAAQ,CAAC,mBAAmB,IAC/B,CACF;AACA,MAAM,aAAa;AACnB,SAAS,2BAA2B,OAAO,WAAW,IAAI;CACxD,IAAI,CAAC,OAAO;EACV,IAAI,OAAO,UAAU,YAAY,WAAW,KAAK,KAAK,GAAG;GACvD,OAAO,OAAO,WAAW,KAAK;EAChC;EACA,OAAO;CACT;CACA,IAAI,aAAa,MAAM,CAAC,aAAa,IAAI,QAAQ,GAAG,OAAO;CAC3D,IAAI,OAAO,UAAU,WAAW,OAAO;CACvC,IAAI,SAAS,OAAO,UAAU,UAAU;EACtC,IAAI,OAAO,MAAM,eAAe,YAAY;GAC1C,QAAQ,MAAM,WAAW;EAC3B,OAAO;GACL,OAAO;EACT;CACF;CACA,IAAI,MAAM;CACV,IAAI,OAAO,UAAU,UAAU;EAC7B,MAAM,GAAG,MAAM;CACjB,OAAO,IAAI,UAAU;EACnB,MAAM,GAAG;CACX;CACA,OAAO;AACT"}