@tamagui/web 2.7.7 → 3.0.0-beta.643.1

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

@@ -1 +1 @@
-{"version":3,"names":["mergeSlotStyleProps","mergeRenderElementProps","elementProps","viewProps","children","merged"],"sources":["../../../src/helpers/mergeRenderElementProps.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,mBAAA,QAA2B;AAO7B,SAASC,wBACdC,YAAA,EACAC,SAAA,EACAC,QAAA,EACqB;EAErB,IAAAC,MAAM,GAAAL,mBAAS;IACf,GAAAE;EACA,GAAAC,SAAO;EACTE,MAAA,CAAAD,QAAA,GAAAA,QAAA","ignoreList":[]}
+{"version":3,"file":"mergeRenderElementProps.native.js","names":[],"sources":["esm/helpers/mergeRenderElementProps.native.js"],"sourcesContent":["import { mergeSlotStyleProps } from \"./mergeSlotStyleProps\";\nfunction mergeRenderElementProps(elementProps, viewProps, children) {\n  var merged = mergeSlotStyleProps({\n    ...elementProps\n  }, viewProps);\n  merged.children = children;\n  return merged;\n}\nexport {\n  mergeRenderElementProps\n};\n//# sourceMappingURL=mergeRenderElementProps.js.map\n"],"mappings":";;;AACA,SAAS,wBAAwB,cAAc,WAAW,UAAU;CAClE,IAAI,SAAS,oBAAoB,EAC/B,GAAG,aACL,GAAG,SAAS;CACZ,OAAO,WAAW;CAClB,OAAO;AACT"}

package/dist/esm/helpers/mergeSlotStyleProps.mjs

@@ -1,27 +1,29 @@
 import { composeRefs } from "@tamagui/compose-refs";
 import { composeEventHandlers } from "@tamagui/helpers";
+
 const isEventHandler = /^on[A-Z]/;
 function mergeSlotStyleProps(base, overlay) {
-  for (const key in overlay) {
-    const baseVal = base[key];
-    const overlayVal = overlay[key];
-    if (overlayVal === void 0) continue;
-    if (key === "style") {
-      base.style = baseVal && overlayVal ? {
-        ...baseVal,
-        ...overlayVal
-      } : overlayVal || baseVal;
-    } else if (key === "className") {
-      base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal;
-    } else if (key === "ref") {
-      base.ref = baseVal && overlayVal ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal;
-    } else if (isEventHandler.test(key) && typeof baseVal === "function" && typeof overlayVal === "function") {
-      base[key] = composeEventHandlers(baseVal, overlayVal);
-    } else {
-      base[key] = overlayVal;
-    }
-  }
-  return base;
+	for (const key in overlay) {
+		const baseVal = base[key];
+		const overlayVal = overlay[key];
+		if (overlayVal === void 0) continue;
+		if (key === "style") {
+			base.style = baseVal && overlayVal ? {
+				...baseVal,
+				...overlayVal
+			} : overlayVal || baseVal;
+		} else if (key === "className") {
+			base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal;
+		} else if (key === "ref") {
+			base.ref = baseVal && overlayVal ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal;
+		} else if (isEventHandler.test(key) && typeof baseVal === "function" && typeof overlayVal === "function") {
+			base[key] = composeEventHandlers(baseVal, overlayVal);
+		} else {
+			base[key] = overlayVal;
+		}
+	}
+	return base;
 }
+
 export { mergeSlotStyleProps };
 //# sourceMappingURL=mergeSlotStyleProps.mjs.map

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

@@ -1 +1 @@
-{"version":3,"names":["composeRefs","composeEventHandlers","isEventHandler","mergeSlotStyleProps","base","overlay","key","baseVal","overlayVal","style","className","ref","test"],"sources":["../../../src/helpers/mergeSlotStyleProps.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,oBAAA,QAA4B;AAErC,MAAMC,cAAA,GAAiB;AAUhB,SAASC,oBACdC,IAAA,EACAC,OAAA,EACqB;EACrB,WAAWC,GAAA,IAAOD,OAAA,EAAS;IACzB,MAAME,OAAA,GAAUH,IAAA,CAAKE,GAAG;IACxB,MAAME,UAAA,GAAaH,OAAA,CAAQC,GAAG;IAE9B,IAAIE,UAAA,KAAe,QAAW;IAE9B,IAAIF,GAAA,KAAQ,SAAS;MACnBF,IAAA,CAAKK,KAAA,GACHF,OAAA,IAAWC,UAAA,GAAa;QAAE,GAAGD,OAAA;QAAS,GAAGC;MAAW,IAAIA,UAAA,IAAcD,OAAA;IAC1E,WAAWD,GAAA,KAAQ,aAAa;MAC9BF,IAAA,CAAKM,SAAA,GACHH,OAAA,IAAWC,UAAA,GAAa,GAAGD,OAAO,IAAIC,UAAU,KAAKA,UAAA,IAAcD,OAAA;IACvE,WAAWD,GAAA,KAAQ,OAAO;MACxBF,IAAA,CAAKO,GAAA,GACHJ,OAAA,IAAWC,UAAA,GAAaR,WAAA,CAAYO,OAAA,EAASC,UAAU,IAAIA,UAAA,IAAcD,OAAA;IAC7E,WACEL,cAAA,CAAeU,IAAA,CAAKN,GAAG,KACvB,OAAOC,OAAA,KAAY,cACnB,OAAOC,UAAA,KAAe,YACtB;MACAJ,IAAA,CAAKE,GAAG,IAAIL,oBAAA,CAAqBM,OAAA,EAASC,UAAU;IACtD,OAAO;MAELJ,IAAA,CAAKE,GAAG,IAAIE,UAAA;IACd;EACF;EAEA,OAAOJ,IAAA;AACT","ignoreList":[]}
+{"version":3,"file":"mergeSlotStyleProps.js","names":[],"sources":["esm/helpers/mergeSlotStyleProps.js"],"sourcesContent":["import { composeRefs } from \"@tamagui/compose-refs\";\nimport { composeEventHandlers } from \"@tamagui/helpers\";\nconst isEventHandler = /^on[A-Z]/;\nfunction mergeSlotStyleProps(base, overlay) {\n  for (const key in overlay) {\n    const baseVal = base[key];\n    const overlayVal = overlay[key];\n    if (overlayVal === void 0) continue;\n    if (key === \"style\") {\n      base.style = baseVal && overlayVal ? { ...baseVal, ...overlayVal } : overlayVal || baseVal;\n    } else if (key === \"className\") {\n      base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal;\n    } else if (key === \"ref\") {\n      base.ref = baseVal && overlayVal ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal;\n    } else if (isEventHandler.test(key) && typeof baseVal === \"function\" && typeof overlayVal === \"function\") {\n      base[key] = composeEventHandlers(baseVal, overlayVal);\n    } else {\n      base[key] = overlayVal;\n    }\n  }\n  return base;\n}\nexport {\n  mergeSlotStyleProps\n};\n//# sourceMappingURL=mergeSlotStyleProps.js.map\n"],"mappings":";;;;AAEA,MAAM,iBAAiB;AACvB,SAAS,oBAAoB,MAAM,SAAS;CAC1C,KAAK,MAAM,OAAO,SAAS;EACzB,MAAM,UAAU,KAAK;EACrB,MAAM,aAAa,QAAQ;EAC3B,IAAI,eAAe,KAAK,GAAG;EAC3B,IAAI,QAAQ,SAAS;GACnB,KAAK,QAAQ,WAAW,aAAa;IAAE,GAAG;IAAS,GAAG;GAAW,IAAI,cAAc;EACrF,OAAO,IAAI,QAAQ,aAAa;GAC9B,KAAK,YAAY,WAAW,aAAa,GAAG,QAAQ,GAAG,eAAe,cAAc;EACtF,OAAO,IAAI,QAAQ,OAAO;GACxB,KAAK,MAAM,WAAW,aAAa,YAAY,SAAS,UAAU,IAAI,cAAc;EACtF,OAAO,IAAI,eAAe,KAAK,GAAG,KAAK,OAAO,YAAY,cAAc,OAAO,eAAe,YAAY;GACxG,KAAK,OAAO,qBAAqB,SAAS,UAAU;EACtD,OAAO;GACL,KAAK,OAAO;EACd;CACF;CACA,OAAO;AACT"}

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

@@ -1,27 +1,29 @@
 import { composeRefs } from "@tamagui/compose-refs";
 import { composeEventHandlers } from "@tamagui/helpers";
+
 var isEventHandler = /^on[A-Z]/;
 function mergeSlotStyleProps(base, overlay) {
-  for (var key in overlay) {
-    var baseVal = base[key];
-    var overlayVal = overlay[key];
-    if (overlayVal === void 0) continue;
-    if (key === "style") {
-      base.style = baseVal && overlayVal ? {
-        ...baseVal,
-        ...overlayVal
-      } : overlayVal || baseVal;
-    } else if (key === "className") {
-      base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal;
-    } else if (key === "ref") {
-      base.ref = baseVal && overlayVal ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal;
-    } else if (isEventHandler.test(key) && typeof baseVal === "function" && typeof overlayVal === "function") {
-      base[key] = composeEventHandlers(baseVal, overlayVal);
-    } else {
-      base[key] = overlayVal;
-    }
-  }
-  return base;
+	for (var key in overlay) {
+		var baseVal = base[key];
+		var overlayVal = overlay[key];
+		if (overlayVal === void 0) continue;
+		if (key === "style") {
+			base.style = baseVal && overlayVal ? {
+				...baseVal,
+				...overlayVal
+			} : overlayVal || baseVal;
+		} else if (key === "className") {
+			base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal;
+		} else if (key === "ref") {
+			base.ref = baseVal && overlayVal ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal;
+		} else if (isEventHandler.test(key) && typeof baseVal === "function" && typeof overlayVal === "function") {
+			base[key] = composeEventHandlers(baseVal, overlayVal);
+		} else {
+			base[key] = overlayVal;
+		}
+	}
+	return base;
 }
+
 export { mergeSlotStyleProps };
 //# sourceMappingURL=mergeSlotStyleProps.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["composeRefs","composeEventHandlers","isEventHandler","mergeSlotStyleProps","base","overlay","key","baseVal","overlayVal","style","className","ref","test"],"sources":["../../../src/helpers/mergeSlotStyleProps.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,oBAAA,QAA4B;AAErC,IAAAC,cAAM,aAAiB;AAUhB,SAASC,oBACdC,IAAA,EACAC,OAAA,EACqB;EACrB,SAAAC,GAAW,IAAAD,OAAO;IAChB,IAAAE,OAAM,GAAAH,IAAU,CAAAE,GAAK;IACrB,IAAAE,UAAM,GAAAH,OAAa,CAAAC,GAAQ;IAE3B,IAAIE,UAAA,KAAe,QAAW;IAE9B,IAAIF,GAAA,KAAQ,SAAS;MACnBF,IAAA,CAAKK,KAAA,GACHF,OAAA,IAAWC,UAAA,GAAa;QAC5B,GAAAD,OAAW;QACT,GAAKC;MAEP,IAAAA,UAAW,IAAQD,OAAO;IACxB,OAAK,IAAAD,GACH,gBAAW;MACfF,IAAA,CAAAM,SACE,GAAAH,OAAe,IAAAC,UACf,MAAOD,OAAA,IAAAC,UAAY,KACnBA,UAAO,IAAAD,OAAA;IAEP,OAAK,IAAGD,GAAI;MACdF,IAAA,CAAOO,GAAA,GAAAJ,OAAA,IAAAC,UAAA,GAAAR,WAAA,CAAAO,OAAA,EAAAC,UAAA,IAAAA,UAAA,IAAAD,OAAA;IAEL,OAAK,IAAGL,cAAI,CAAAU,IAAA,CAAAN,GAAA,YAAAC,OAAA,0BAAAC,UAAA;MACdJ,IAAA,CAAAE,GAAA,IAAAL,oBAAA,CAAAM,OAAA,EAAAC,UAAA;IACF;MAEAJ,IAAO,CAAAE,GAAA,IAAAE,UAAA;IACT","ignoreList":[]}
+{"version":3,"file":"mergeSlotStyleProps.native.js","names":[],"sources":["esm/helpers/mergeSlotStyleProps.native.js"],"sourcesContent":["import { composeRefs } from \"@tamagui/compose-refs\";\nimport { composeEventHandlers } from \"@tamagui/helpers\";\nvar isEventHandler = /^on[A-Z]/;\nfunction mergeSlotStyleProps(base, overlay) {\n  for (var key in overlay) {\n    var baseVal = base[key];\n    var overlayVal = overlay[key];\n    if (overlayVal === void 0) continue;\n    if (key === \"style\") {\n      base.style = baseVal && overlayVal ? {\n        ...baseVal,\n        ...overlayVal\n      } : overlayVal || baseVal;\n    } else if (key === \"className\") {\n      base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal;\n    } else if (key === \"ref\") {\n      base.ref = baseVal && overlayVal ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal;\n    } else if (isEventHandler.test(key) && typeof baseVal === \"function\" && typeof overlayVal === \"function\") {\n      base[key] = composeEventHandlers(baseVal, overlayVal);\n    } else {\n      base[key] = overlayVal;\n    }\n  }\n  return base;\n}\nexport {\n  mergeSlotStyleProps\n};\n//# sourceMappingURL=mergeSlotStyleProps.js.map\n"],"mappings":";;;;AAEA,IAAI,iBAAiB;AACrB,SAAS,oBAAoB,MAAM,SAAS;CAC1C,KAAK,IAAI,OAAO,SAAS;EACvB,IAAI,UAAU,KAAK;EACnB,IAAI,aAAa,QAAQ;EACzB,IAAI,eAAe,KAAK,GAAG;EAC3B,IAAI,QAAQ,SAAS;GACnB,KAAK,QAAQ,WAAW,aAAa;IACnC,GAAG;IACH,GAAG;GACL,IAAI,cAAc;EACpB,OAAO,IAAI,QAAQ,aAAa;GAC9B,KAAK,YAAY,WAAW,aAAa,GAAG,QAAQ,GAAG,eAAe,cAAc;EACtF,OAAO,IAAI,QAAQ,OAAO;GACxB,KAAK,MAAM,WAAW,aAAa,YAAY,SAAS,UAAU,IAAI,cAAc;EACtF,OAAO,IAAI,eAAe,KAAK,GAAG,KAAK,OAAO,YAAY,cAAc,OAAO,eAAe,YAAY;GACxG,KAAK,OAAO,qBAAqB,SAAS,UAAU;EACtD,OAAO;GACL,KAAK,OAAO;EACd;CACF;CACA,OAAO;AACT"}

package/dist/esm/helpers/mergeVariants.mjs

@@ -1,27 +1,43 @@
+import { mergeFlatValues } from "@tamagui/style-grammar/runtime";
+import { isPlainObject } from "./isObj.mjs";
+
+function mergeStyleBranch(parentBranch, ourBranch) {
+	const out = {};
+	for (const key in parentBranch) {
+		if (key in ourBranch) continue;
+		out[key] = parentBranch[key];
+	}
+	for (const key in ourBranch) {
+		out[key] = key in parentBranch ? mergeFlatValues(parentBranch[key], ourBranch[key]) : ourBranch[key];
+	}
+	return out;
+}
 const mergeVariants = (parentVariants, ourVariants, level = 0) => {
-  const variants = {};
-  for (const key in ourVariants) {
-    const parentVariant = parentVariants?.[key];
-    const ourVariant = ourVariants[key];
-    if (!parentVariant || typeof ourVariant === "function") {
-      variants[key] = ourVariant;
-    } else if (parentVariant && !ourVariant) {
-      variants[key] = parentVariant[key];
-    } else {
-      if (level === 0) {
-        variants[key] = mergeVariants(parentVariant, ourVariant, level + 1);
-      } else {
-        variants[key] = {
-          ...parentVariant,
-          ...ourVariant
-        };
-      }
-    }
-  }
-  return {
-    ...parentVariants,
-    ...variants
-  };
+	if (!ourVariants) {
+		return parentVariants || {};
+	}
+	if (!parentVariants) {
+		return ourVariants || {};
+	}
+	const variants = {};
+	for (const key in ourVariants) {
+		const parentVariant = parentVariants?.[key];
+		const ourVariant = ourVariants[key];
+		if (!isPlainObject(parentVariant) || !isPlainObject(ourVariant)) {
+			variants[key] = ourVariant;
+		} else {
+			if (level === 0) {
+				variants[key] = mergeVariants(parentVariant, ourVariant, level + 1);
+			} else {
+				variants[key] = mergeStyleBranch(parentVariant, ourVariant);
+			}
+		}
+	}
+	return {
+		...parentVariants,
+		...variants
+	};
 };
+
 export { mergeVariants };
 //# sourceMappingURL=mergeVariants.mjs.map

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

@@ -1 +1 @@
-{"version":3,"names":["mergeVariants","parentVariants","ourVariants","level","variants","key","parentVariant","ourVariant"],"sources":["../../../src/helpers/mergeVariants.ts"],"sourcesContent":[null],"mappings":"AAKO,MAAMA,aAAA,GAAgBA,CAC3BC,cAAA,EACAC,WAAA,EACAC,KAAA,GAAQ,MACL;EACH,MAAMC,QAAA,GAAW,CAAC;EAElB,WAAWC,GAAA,IAAOH,WAAA,EAAa;IAC7B,MAAMI,aAAA,GAAgBL,cAAA,GAAiBI,GAAG;IAC1C,MAAME,UAAA,GAAaL,WAAA,CAAYG,GAAG;IAClC,IAAI,CAACC,aAAA,IAAiB,OAAOC,UAAA,KAAe,YAAY;MACtDH,QAAA,CAASC,GAAG,IAAIE,UAAA;IAClB,WAAWD,aAAA,IAAiB,CAACC,UAAA,EAAY;MACvCH,QAAA,CAASC,GAAG,IAAIC,aAAA,CAAcD,GAAG;IACnC,OAAO;MACL,IAAIF,KAAA,KAAU,GAAG;QACfC,QAAA,CAASC,GAAG,IAAIL,aAAA,CACdM,aAAA,EACAC,UAAA,EACAJ,KAAA,GAAQ,CACV;MACF,OAAO;QACLC,QAAA,CAASC,GAAG,IAAI;UACd,GAAGC,aAAA;UACH,GAAGC;QACL;MACF;IACF;EACF;EAEA,OAAO;IACL,GAAGN,cAAA;IACH,GAAGG;EACL;AACF","ignoreList":[]}
+{"version":3,"file":"mergeVariants.js","names":[],"sources":["esm/helpers/mergeVariants.js"],"sourcesContent":["import { mergeFlatValues } from \"@tamagui/style-grammar/runtime\";\nimport { isPlainObject } from \"./isObj\";\nfunction mergeStyleBranch(parentBranch, ourBranch) {\n  const out = {};\n  for (const key in parentBranch) {\n    if (key in ourBranch) continue;\n    out[key] = parentBranch[key];\n  }\n  for (const key in ourBranch) {\n    out[key] = key in parentBranch ? mergeFlatValues(parentBranch[key], ourBranch[key]) : ourBranch[key];\n  }\n  return out;\n}\nconst mergeVariants = (parentVariants, ourVariants, level = 0) => {\n  if (!ourVariants) {\n    return parentVariants || {};\n  }\n  if (!parentVariants) {\n    return ourVariants || {};\n  }\n  const variants = {};\n  for (const key in ourVariants) {\n    const parentVariant = parentVariants?.[key];\n    const ourVariant = ourVariants[key];\n    if (!isPlainObject(parentVariant) || !isPlainObject(ourVariant)) {\n      variants[key] = ourVariant;\n    } else {\n      if (level === 0) {\n        variants[key] = mergeVariants(parentVariant, ourVariant, level + 1);\n      } else {\n        variants[key] = mergeStyleBranch(parentVariant, ourVariant);\n      }\n    }\n  }\n  return {\n    ...parentVariants,\n    ...variants\n  };\n};\nexport {\n  mergeVariants\n};\n//# sourceMappingURL=mergeVariants.js.map\n"],"mappings":";;;;AAEA,SAAS,iBAAiB,cAAc,WAAW;CACjD,MAAM,MAAM,CAAC;CACb,KAAK,MAAM,OAAO,cAAc;EAC9B,IAAI,OAAO,WAAW;EACtB,IAAI,OAAO,aAAa;CAC1B;CACA,KAAK,MAAM,OAAO,WAAW;EAC3B,IAAI,OAAO,OAAO,eAAe,gBAAgB,aAAa,MAAM,UAAU,IAAI,IAAI,UAAU;CAClG;CACA,OAAO;AACT;AACA,MAAM,iBAAiB,gBAAgB,aAAa,QAAQ,MAAM;CAChE,IAAI,CAAC,aAAa;EAChB,OAAO,kBAAkB,CAAC;CAC5B;CACA,IAAI,CAAC,gBAAgB;EACnB,OAAO,eAAe,CAAC;CACzB;CACA,MAAM,WAAW,CAAC;CAClB,KAAK,MAAM,OAAO,aAAa;EAC7B,MAAM,gBAAgB,iBAAiB;EACvC,MAAM,aAAa,YAAY;EAC/B,IAAI,CAAC,cAAc,aAAa,KAAK,CAAC,cAAc,UAAU,GAAG;GAC/D,SAAS,OAAO;EAClB,OAAO;GACL,IAAI,UAAU,GAAG;IACf,SAAS,OAAO,cAAc,eAAe,YAAY,QAAQ,CAAC;GACpE,OAAO;IACL,SAAS,OAAO,iBAAiB,eAAe,UAAU;GAC5D;EACF;CACF;CACA,OAAO;EACL,GAAG;EACH,GAAG;CACL;AACF"}

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

@@ -1,28 +1,44 @@
-var mergeVariants = function (parentVariants, ourVariants) {
-  var level = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
-  var variants = {};
-  for (var key in ourVariants) {
-    var parentVariant = parentVariants === null || parentVariants === void 0 ? void 0 : parentVariants[key];
-    var ourVariant = ourVariants[key];
-    if (!parentVariant || typeof ourVariant === "function") {
-      variants[key] = ourVariant;
-    } else if (parentVariant && !ourVariant) {
-      variants[key] = parentVariant[key];
-    } else {
-      if (level === 0) {
-        variants[key] = mergeVariants(parentVariant, ourVariant, level + 1);
-      } else {
-        variants[key] = {
-          ...parentVariant,
-          ...ourVariant
-        };
-      }
-    }
-  }
-  return {
-    ...parentVariants,
-    ...variants
-  };
+import { mergeFlatValues } from "@tamagui/style-grammar/runtime";
+import { isPlainObject } from "./isObj.native.js";
+
+function mergeStyleBranch(parentBranch, ourBranch) {
+	var out = {};
+	for (var key in parentBranch) {
+		if (key in ourBranch) continue;
+		out[key] = parentBranch[key];
+	}
+	for (var key1 in ourBranch) {
+		out[key1] = key1 in parentBranch ? mergeFlatValues(parentBranch[key1], ourBranch[key1]) : ourBranch[key1];
+	}
+	return out;
+}
+var mergeVariants = function(parentVariants, ourVariants) {
+	var level = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
+	if (!ourVariants) {
+		return parentVariants || {};
+	}
+	if (!parentVariants) {
+		return ourVariants || {};
+	}
+	var variants = {};
+	for (var key in ourVariants) {
+		var parentVariant = parentVariants === null || parentVariants === void 0 ? void 0 : parentVariants[key];
+		var ourVariant = ourVariants[key];
+		if (!isPlainObject(parentVariant) || !isPlainObject(ourVariant)) {
+			variants[key] = ourVariant;
+		} else {
+			if (level === 0) {
+				variants[key] = mergeVariants(parentVariant, ourVariant, level + 1);
+			} else {
+				variants[key] = mergeStyleBranch(parentVariant, ourVariant);
+			}
+		}
+	}
+	return {
+		...parentVariants,
+		...variants
+	};
 };
+
 export { mergeVariants };
 //# sourceMappingURL=mergeVariants.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["mergeVariants","parentVariants","ourVariants","level","arguments","length","variants","key","parentVariant","ourVariant"],"sources":["../../../src/helpers/mergeVariants.ts"],"sourcesContent":[null],"mappings":"AAKO,IAAAA,aAAM,YAAAA,CACXC,cACA,EAAAC,WACA;EAEA,IAAAC,KAAM,GAAAC,SAAY,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAElB,IAAAE,QAAW;EACT,SAAMC,GAAA,IAAAL,WAAgB;IACtB,IAAAM,aAAM,GAAaP,cAAe,aAAAA,cAAA,uBAAAA,cAAA,CAAAM,GAAA;IAClC,IAAIE,UAAC,GAAAP,WAAiB,CAAOK,GAAA;IAC3B,KAAAC,aAAgB,WAAAC,UAAA;MAClBH,QAAA,CAAWC,GAAA,IAAAE,UAAiB;IAC1B,WAASD,aAAO,KAAAC,UAAiB;MACnCH,QAAO,CAAAC,GAAA,IAAAC,aAAA,CAAAD,GAAA;IACL,OAAI;MACF,IAAAJ,KAAA,KAAY;QAAIG,QACd,CAAAC,GAAA,IAAAP,aAAA,CAAAQ,aAAA,EAAAC,UAAA,EAAAN,KAAA;MAAA,OACA;QAAAG,QACA,CAAAC,GAAQ;UACV,GAAAC,aAAA;UACF,GAAOC;QACL;MAAgB;IACX;EACA;EACL,OACF;IACF,GAAAR,cAAA;IACF,GAAAK;EAEA;AAAO;AACF,SAELN,aAAA","ignoreList":[]}
+{"version":3,"file":"mergeVariants.native.js","names":[],"sources":["esm/helpers/mergeVariants.native.js"],"sourcesContent":["import { mergeFlatValues } from \"@tamagui/style-grammar/runtime\";\nimport { isPlainObject } from \"./isObj\";\nfunction mergeStyleBranch(parentBranch, ourBranch) {\n  var out = {};\n  for (var key in parentBranch) {\n    if (key in ourBranch) continue;\n    out[key] = parentBranch[key];\n  }\n  for (var key1 in ourBranch) {\n    out[key1] = key1 in parentBranch ? mergeFlatValues(parentBranch[key1], ourBranch[key1]) : ourBranch[key1];\n  }\n  return out;\n}\nvar mergeVariants = function(parentVariants, ourVariants) {\n  var level = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;\n  if (!ourVariants) {\n    return parentVariants || {};\n  }\n  if (!parentVariants) {\n    return ourVariants || {};\n  }\n  var variants = {};\n  for (var key in ourVariants) {\n    var parentVariant = parentVariants === null || parentVariants === void 0 ? void 0 : parentVariants[key];\n    var ourVariant = ourVariants[key];\n    if (!isPlainObject(parentVariant) || !isPlainObject(ourVariant)) {\n      variants[key] = ourVariant;\n    } else {\n      if (level === 0) {\n        variants[key] = mergeVariants(parentVariant, ourVariant, level + 1);\n      } else {\n        variants[key] = mergeStyleBranch(parentVariant, ourVariant);\n      }\n    }\n  }\n  return {\n    ...parentVariants,\n    ...variants\n  };\n};\nexport {\n  mergeVariants\n};\n//# sourceMappingURL=mergeVariants.js.map\n"],"mappings":";;;;AAEA,SAAS,iBAAiB,cAAc,WAAW;CACjD,IAAI,MAAM,CAAC;CACX,KAAK,IAAI,OAAO,cAAc;EAC5B,IAAI,OAAO,WAAW;EACtB,IAAI,OAAO,aAAa;CAC1B;CACA,KAAK,IAAI,QAAQ,WAAW;EAC1B,IAAI,QAAQ,QAAQ,eAAe,gBAAgB,aAAa,OAAO,UAAU,KAAK,IAAI,UAAU;CACtG;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,SAAS,gBAAgB,aAAa;CACxD,IAAI,QAAQ,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK;CAC7E,IAAI,CAAC,aAAa;EAChB,OAAO,kBAAkB,CAAC;CAC5B;CACA,IAAI,CAAC,gBAAgB;EACnB,OAAO,eAAe,CAAC;CACzB;CACA,IAAI,WAAW,CAAC;CAChB,KAAK,IAAI,OAAO,aAAa;EAC3B,IAAI,gBAAgB,mBAAmB,QAAQ,mBAAmB,KAAK,IAAI,KAAK,IAAI,eAAe;EACnG,IAAI,aAAa,YAAY;EAC7B,IAAI,CAAC,cAAc,aAAa,KAAK,CAAC,cAAc,UAAU,GAAG;GAC/D,SAAS,OAAO;EAClB,OAAO;GACL,IAAI,UAAU,GAAG;IACf,SAAS,OAAO,cAAc,eAAe,YAAY,QAAQ,CAAC;GACpE,OAAO;IACL,SAAS,OAAO,iBAAiB,eAAe,UAAU;GAC5D;EACF;CACF;CACA,OAAO;EACL,GAAG;EACH,GAAG;CACL;AACF"}

package/dist/esm/helpers/nativeOnlyProps.mjs

@@ -1,37 +1,38 @@
 const nativeOnlyProps = {
-  accessibilityElementsHidden: 1,
-  accessibilityIgnoresInvertColors: 1,
-  accessibilityLanguage: 1,
-  adjustsFontSizeToFit: 1,
-  allowFontScaling: 1,
-  android_hyphenationFrequency: 1,
-  dataDetectorType: 1,
-  dynamicTypeRamp: 1,
-  elevationAndroid: 1,
-  ellipsizeMode: 1,
-  hapticFeedback: 1,
-  hapticStyle: 1,
-  hitSlop: 1,
-  importantForAccessibility: 1,
-  lineBreakStrategyIOS: 1,
-  maxFontSizeMultiplier: 1,
-  minimumFontScale: 1,
-  needsOffscreenAlphaCompositing: 1,
-  nextFocusDown: 1,
-  nextFocusForward: 1,
-  nextFocusLeft: 1,
-  nextFocusRight: 1,
-  nextFocusUp: 1,
-  onAccessibilityAction: 1,
-  onAccessibilityEscape: 1,
-  onAccessibilityTap: 1,
-  onMagicTap: 1,
-  onTextLayout: 1,
-  pressRetentionOffset: 1,
-  selectionColor: 1,
-  shouldRasterizeIOS: 1,
-  suppressHighlighting: 1,
-  textBreakStrategy: 1
+	accessibilityElementsHidden: 1,
+	accessibilityIgnoresInvertColors: 1,
+	accessibilityLanguage: 1,
+	adjustsFontSizeToFit: 1,
+	allowFontScaling: 1,
+	android_hyphenationFrequency: 1,
+	dataDetectorType: 1,
+	dynamicTypeRamp: 1,
+	elevationAndroid: 1,
+	ellipsizeMode: 1,
+	hapticFeedback: 1,
+	hapticStyle: 1,
+	hitSlop: 1,
+	importantForAccessibility: 1,
+	lineBreakStrategyIOS: 1,
+	maxFontSizeMultiplier: 1,
+	minimumFontScale: 1,
+	needsOffscreenAlphaCompositing: 1,
+	nextFocusDown: 1,
+	nextFocusForward: 1,
+	nextFocusLeft: 1,
+	nextFocusRight: 1,
+	nextFocusUp: 1,
+	onAccessibilityAction: 1,
+	onAccessibilityEscape: 1,
+	onAccessibilityTap: 1,
+	onMagicTap: 1,
+	onTextLayout: 1,
+	pressRetentionOffset: 1,
+	selectionColor: 1,
+	shouldRasterizeIOS: 1,
+	suppressHighlighting: 1,
+	textBreakStrategy: 1
 };
+
 export { nativeOnlyProps };
 //# sourceMappingURL=nativeOnlyProps.mjs.map

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

@@ -1 +1 @@
-{"version":3,"names":["nativeOnlyProps","accessibilityElementsHidden","accessibilityIgnoresInvertColors","accessibilityLanguage","adjustsFontSizeToFit","allowFontScaling","android_hyphenationFrequency","dataDetectorType","dynamicTypeRamp","elevationAndroid","ellipsizeMode","hapticFeedback","hapticStyle","hitSlop","importantForAccessibility","lineBreakStrategyIOS","maxFontSizeMultiplier","minimumFontScale","needsOffscreenAlphaCompositing","nextFocusDown","nextFocusForward","nextFocusLeft","nextFocusRight","nextFocusUp","onAccessibilityAction","onAccessibilityEscape","onAccessibilityTap","onMagicTap","onTextLayout","pressRetentionOffset","selectionColor","shouldRasterizeIOS","suppressHighlighting","textBreakStrategy"],"sources":["../../../src/helpers/nativeOnlyProps.ts"],"sourcesContent":[null],"mappings":"AAGO,MAAMA,eAAA,GAAkB;EAC7BC,2BAAA,EAA6B;EAC7BC,gCAAA,EAAkC;EAClCC,qBAAA,EAAuB;EACvBC,oBAAA,EAAsB;EACtBC,gBAAA,EAAkB;EAClBC,4BAAA,EAA8B;EAC9BC,gBAAA,EAAkB;EAClBC,eAAA,EAAiB;EACjBC,gBAAA,EAAkB;EAClBC,aAAA,EAAe;EACfC,cAAA,EAAgB;EAChBC,WAAA,EAAa;EACbC,OAAA,EAAS;EACTC,yBAAA,EAA2B;EAC3BC,oBAAA,EAAsB;EACtBC,qBAAA,EAAuB;EACvBC,gBAAA,EAAkB;EAClBC,8BAAA,EAAgC;EAChCC,aAAA,EAAe;EACfC,gBAAA,EAAkB;EAClBC,aAAA,EAAe;EACfC,cAAA,EAAgB;EAChBC,WAAA,EAAa;EACbC,qBAAA,EAAuB;EACvBC,qBAAA,EAAuB;EACvBC,kBAAA,EAAoB;EACpBC,UAAA,EAAY;EACZC,YAAA,EAAc;EACdC,oBAAA,EAAsB;EACtBC,cAAA,EAAgB;EAChBC,kBAAA,EAAoB;EACpBC,oBAAA,EAAsB;EACtBC,iBAAA,EAAmB;AACrB","ignoreList":[]}
+{"version":3,"file":"nativeOnlyProps.js","names":[],"sources":["esm/helpers/nativeOnlyProps.js"],"sourcesContent":["const nativeOnlyProps = {\n  accessibilityElementsHidden: 1,\n  accessibilityIgnoresInvertColors: 1,\n  accessibilityLanguage: 1,\n  adjustsFontSizeToFit: 1,\n  allowFontScaling: 1,\n  android_hyphenationFrequency: 1,\n  dataDetectorType: 1,\n  dynamicTypeRamp: 1,\n  elevationAndroid: 1,\n  ellipsizeMode: 1,\n  hapticFeedback: 1,\n  hapticStyle: 1,\n  hitSlop: 1,\n  importantForAccessibility: 1,\n  lineBreakStrategyIOS: 1,\n  maxFontSizeMultiplier: 1,\n  minimumFontScale: 1,\n  needsOffscreenAlphaCompositing: 1,\n  nextFocusDown: 1,\n  nextFocusForward: 1,\n  nextFocusLeft: 1,\n  nextFocusRight: 1,\n  nextFocusUp: 1,\n  onAccessibilityAction: 1,\n  onAccessibilityEscape: 1,\n  onAccessibilityTap: 1,\n  onMagicTap: 1,\n  onTextLayout: 1,\n  pressRetentionOffset: 1,\n  selectionColor: 1,\n  shouldRasterizeIOS: 1,\n  suppressHighlighting: 1,\n  textBreakStrategy: 1\n};\nexport {\n  nativeOnlyProps\n};\n//# sourceMappingURL=nativeOnlyProps.js.map\n"],"mappings":";AAAA,MAAM,kBAAkB;CACtB,6BAA6B;CAC7B,kCAAkC;CAClC,uBAAuB;CACvB,sBAAsB;CACtB,kBAAkB;CAClB,8BAA8B;CAC9B,kBAAkB;CAClB,iBAAiB;CACjB,kBAAkB;CAClB,eAAe;CACf,gBAAgB;CAChB,aAAa;CACb,SAAS;CACT,2BAA2B;CAC3B,sBAAsB;CACtB,uBAAuB;CACvB,kBAAkB;CAClB,gCAAgC;CAChC,eAAe;CACf,kBAAkB;CAClB,eAAe;CACf,gBAAgB;CAChB,aAAa;CACb,uBAAuB;CACvB,uBAAuB;CACvB,oBAAoB;CACpB,YAAY;CACZ,cAAc;CACd,sBAAsB;CACtB,gBAAgB;CAChB,oBAAoB;CACpB,sBAAsB;CACtB,mBAAmB;AACrB"}

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

@@ -1,37 +1,38 @@
 var nativeOnlyProps = {
-  accessibilityElementsHidden: 1,
-  accessibilityIgnoresInvertColors: 1,
-  accessibilityLanguage: 1,
-  adjustsFontSizeToFit: 1,
-  allowFontScaling: 1,
-  android_hyphenationFrequency: 1,
-  dataDetectorType: 1,
-  dynamicTypeRamp: 1,
-  elevationAndroid: 1,
-  ellipsizeMode: 1,
-  hapticFeedback: 1,
-  hapticStyle: 1,
-  hitSlop: 1,
-  importantForAccessibility: 1,
-  lineBreakStrategyIOS: 1,
-  maxFontSizeMultiplier: 1,
-  minimumFontScale: 1,
-  needsOffscreenAlphaCompositing: 1,
-  nextFocusDown: 1,
-  nextFocusForward: 1,
-  nextFocusLeft: 1,
-  nextFocusRight: 1,
-  nextFocusUp: 1,
-  onAccessibilityAction: 1,
-  onAccessibilityEscape: 1,
-  onAccessibilityTap: 1,
-  onMagicTap: 1,
-  onTextLayout: 1,
-  pressRetentionOffset: 1,
-  selectionColor: 1,
-  shouldRasterizeIOS: 1,
-  suppressHighlighting: 1,
-  textBreakStrategy: 1
+	accessibilityElementsHidden: 1,
+	accessibilityIgnoresInvertColors: 1,
+	accessibilityLanguage: 1,
+	adjustsFontSizeToFit: 1,
+	allowFontScaling: 1,
+	android_hyphenationFrequency: 1,
+	dataDetectorType: 1,
+	dynamicTypeRamp: 1,
+	elevationAndroid: 1,
+	ellipsizeMode: 1,
+	hapticFeedback: 1,
+	hapticStyle: 1,
+	hitSlop: 1,
+	importantForAccessibility: 1,
+	lineBreakStrategyIOS: 1,
+	maxFontSizeMultiplier: 1,
+	minimumFontScale: 1,
+	needsOffscreenAlphaCompositing: 1,
+	nextFocusDown: 1,
+	nextFocusForward: 1,
+	nextFocusLeft: 1,
+	nextFocusRight: 1,
+	nextFocusUp: 1,
+	onAccessibilityAction: 1,
+	onAccessibilityEscape: 1,
+	onAccessibilityTap: 1,
+	onMagicTap: 1,
+	onTextLayout: 1,
+	pressRetentionOffset: 1,
+	selectionColor: 1,
+	shouldRasterizeIOS: 1,
+	suppressHighlighting: 1,
+	textBreakStrategy: 1
 };
+
 export { nativeOnlyProps };
 //# sourceMappingURL=nativeOnlyProps.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["nativeOnlyProps","accessibilityElementsHidden","accessibilityIgnoresInvertColors","accessibilityLanguage","adjustsFontSizeToFit","allowFontScaling","android_hyphenationFrequency","dataDetectorType","dynamicTypeRamp","elevationAndroid","ellipsizeMode","hapticFeedback","hapticStyle","hitSlop","importantForAccessibility","lineBreakStrategyIOS","maxFontSizeMultiplier","minimumFontScale","needsOffscreenAlphaCompositing","nextFocusDown","nextFocusForward","nextFocusLeft","nextFocusRight","nextFocusUp","onAccessibilityAction","onAccessibilityEscape","onAccessibilityTap","onMagicTap","onTextLayout","pressRetentionOffset","selectionColor","shouldRasterizeIOS","suppressHighlighting","textBreakStrategy"],"sources":["../../../src/helpers/nativeOnlyProps.ts"],"sourcesContent":[null],"mappings":"AAGO,IAAAA,eAAM;EACXC,2BAAA,EAA6B;EAC7BC,gCAAA,EAAkC;EAClCC,qBAAA,EAAuB;EACvBC,oBAAA,EAAsB;EACtBC,gBAAA,EAAkB;EAClBC,4BAAA,EAA8B;EAC9BC,gBAAA,EAAkB;EAClBC,eAAA,EAAiB;EACjBC,gBAAA,EAAkB;EAClBC,aAAA,EAAe;EACfC,cAAA,EAAgB;EAChBC,WAAA,EAAa;EACbC,OAAA,EAAS;EACTC,yBAAA,EAA2B;EAC3BC,oBAAA,EAAsB;EACtBC,qBAAA,EAAuB;EACvBC,gBAAA,EAAkB;EAClBC,8BAAA,EAAgC;EAChCC,aAAA,EAAe;EACfC,gBAAA,EAAkB;EAClBC,aAAA,EAAe;EACfC,cAAA,EAAgB;EAChBC,WAAA,EAAa;EACbC,qBAAA,EAAuB;EACvBC,qBAAA,EAAuB;EACvBC,kBAAA,EAAoB;EACpBC,UAAA,EAAY;EACZC,YAAA,EAAc;EACdC,oBAAA,EAAsB;EACtBC,cAAA,EAAgB;EAChBC,kBAAA,EAAoB;EACpBC,oBAAA,EAAsB;EACtBC,iBAAA,EAAmB;AACrB","ignoreList":[]}
+{"version":3,"file":"nativeOnlyProps.native.js","names":[],"sources":["esm/helpers/nativeOnlyProps.native.js"],"sourcesContent":["var nativeOnlyProps = {\n  accessibilityElementsHidden: 1,\n  accessibilityIgnoresInvertColors: 1,\n  accessibilityLanguage: 1,\n  adjustsFontSizeToFit: 1,\n  allowFontScaling: 1,\n  android_hyphenationFrequency: 1,\n  dataDetectorType: 1,\n  dynamicTypeRamp: 1,\n  elevationAndroid: 1,\n  ellipsizeMode: 1,\n  hapticFeedback: 1,\n  hapticStyle: 1,\n  hitSlop: 1,\n  importantForAccessibility: 1,\n  lineBreakStrategyIOS: 1,\n  maxFontSizeMultiplier: 1,\n  minimumFontScale: 1,\n  needsOffscreenAlphaCompositing: 1,\n  nextFocusDown: 1,\n  nextFocusForward: 1,\n  nextFocusLeft: 1,\n  nextFocusRight: 1,\n  nextFocusUp: 1,\n  onAccessibilityAction: 1,\n  onAccessibilityEscape: 1,\n  onAccessibilityTap: 1,\n  onMagicTap: 1,\n  onTextLayout: 1,\n  pressRetentionOffset: 1,\n  selectionColor: 1,\n  shouldRasterizeIOS: 1,\n  suppressHighlighting: 1,\n  textBreakStrategy: 1\n};\nexport {\n  nativeOnlyProps\n};\n//# sourceMappingURL=nativeOnlyProps.js.map\n"],"mappings":";AAAA,IAAI,kBAAkB;CACpB,6BAA6B;CAC7B,kCAAkC;CAClC,uBAAuB;CACvB,sBAAsB;CACtB,kBAAkB;CAClB,8BAA8B;CAC9B,kBAAkB;CAClB,iBAAiB;CACjB,kBAAkB;CAClB,eAAe;CACf,gBAAgB;CAChB,aAAa;CACb,SAAS;CACT,2BAA2B;CAC3B,sBAAsB;CACtB,uBAAuB;CACvB,kBAAkB;CAClB,gCAAgC;CAChC,eAAe;CACf,kBAAkB;CAClB,eAAe;CACf,gBAAgB;CAChB,aAAa;CACb,uBAAuB;CACvB,uBAAuB;CACvB,oBAAoB;CACpB,YAAY;CACZ,cAAc;CACd,sBAAsB;CACtB,gBAAgB;CAChB,oBAAoB;CACpB,sBAAsB;CACtB,mBAAmB;AACrB"}