@tamagui/web 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/cjs/helpers/mediaState.native.js

@@ -0,0 +1,54 @@
+"use strict";
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
+  return to;
+};
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
+var mediaState_exports = {};
+__export(mediaState_exports, {
+  getMedia: () => getMedia,
+  mediaKeys: () => mediaKeys,
+  mediaQueryConfig: () => mediaQueryConfig,
+  mediaState: () => mediaState,
+  setMediaState: () => setMediaState
+});
+module.exports = __toCommonJS(mediaState_exports);
+var mediaState =
+// development only safeguard
+process.env.NODE_ENV === "development" ? new Proxy({}, {
+  get(target, key) {
+    if (typeof key === "string" && key[0] === "$" &&
+    // dont error on $$typeof
+    key[1] !== "$") {
+      throw new Error(`Access mediaState should not use "$": ${key}`);
+    }
+    return Reflect.get(target, key);
+  }
+}) : {};
+var setMediaState = function (next) {
+  mediaState = next;
+};
+var mediaQueryConfig = {};
+var getMedia = function () {
+  return mediaState;
+};
+var mediaKeys = /* @__PURE__ */new Set();
+//# sourceMappingURL=mediaState.native.js.map

package/dist/cjs/helpers/mediaState.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mediaState_exports","__export","getMedia","mediaKeys","mediaQueryConfig","mediaState","setMediaState","module","exports","process","env","NODE_ENV","Proxy","get","target","key","Error","Reflect","next","Set"],"sources":["../../../src/helpers/mediaState.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,QAAA,EAAAA,CAAA,KAAAA,QAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,UAAA,EAAAA,CAAA,KAAAA,UAAA;EAAAC,aAAA,EAAAA,CAAA,KAAAA;AAAA;AAEOC,MAAI,CAAAC,OAAA,GAAAb,YAAA,CAAAK,kBAAA;AAAA,IAAAK,UAAA;AAET;AACQI,OACD,CAAAC,GAAA,CAAAC,QAAA,yBAAAC,KAAA;EACDC,IAAAC,MAAA,EAAAC,GAAA;IACE,IAAI,OAAAA,GAAQ,KAAK,YAAAA,GAAA;IAAA;IACfA,GAAA,GACE,QAAO;MAGP,MAAK,IAAAC,KAAM,CACX,yCAAAD,GAAA;IACA;IAA8D,OAChEE,OAAA,CAAAJ,GAAA,CAAAC,MAAA,EAAAC,GAAA;EACA;AAA8B,KAChC;AACF,IACFT,aACE,YAAAA,CAAAY,IAAA;EAAAb,UAAA,GAAAa,IAAA;AAED;AACL,IAAAd,gBAAa;AACf,IAAAF,QAAA,YAAAA,CAAA;EAEO,OAAMG,UAAA;AAEN;AAEA,IAAAF,SAAM,kBAAY,IAAAgB,GAAI","ignoreList":[]}

package/dist/cjs/helpers/mergeProps.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeProps_exports = {};
 __export(mergeProps_exports, {
@@ -26,30 +28,52 @@ __export(mergeProps_exports, {
 module.exports = __toCommonJS(mergeProps_exports);
 var import_pseudoDescriptors = require("./pseudoDescriptors.cjs");
 const mergeProps = (defaultProps, props) => {
-    const out = {};
-    for (const key in defaultProps) key in props || (out[key] = defaultProps[key]);
-    for (const key in props) mergeProp(out, defaultProps, props, key);
-    return out;
-  },
-  mergeComponentProps = (defaultProps, contextProps, props) => {
-    let overriddenContext = null;
-    if (!defaultProps && !contextProps) return [props, overriddenContext];
-    if (defaultProps && !contextProps) return [mergeProps(defaultProps, props), overriddenContext];
-    const out = {};
-    for (const key in defaultProps) key in props || (out[key] = defaultProps[key]);
-    for (const key in contextProps) {
-      if (key in props) continue;
-      const contextValue = contextProps[key];
-      contextValue !== void 0 && (out[key] = contextValue);
+  const out = {};
+  for (const key in defaultProps) {
+    if (key in props) continue;
+    out[key] = defaultProps[key];
+  }
+  for (const key in props) {
+    mergeProp(out, defaultProps, props, key);
+  }
+  return out;
+};
+const mergeComponentProps = (defaultProps, contextProps, props) => {
+  let overriddenContext = null;
+  if (!defaultProps && !contextProps) {
+    return [props, overriddenContext];
+  }
+  if (defaultProps && !contextProps) {
+    return [mergeProps(defaultProps, props), overriddenContext];
+  }
+  const out = {};
+  for (const key in defaultProps) {
+    if (key in props) continue;
+    out[key] = defaultProps[key];
+  }
+  for (const key in contextProps) {
+    if (key in props) continue;
+    const contextValue = contextProps[key];
+    if (contextValue !== void 0) {
+      out[key] = contextValue;
+    }
+  }
+  for (const key in props) {
+    mergeProp(out, defaultProps, props, key);
+    if (contextProps && key in contextProps) {
+      overriddenContext ||= {};
+      overriddenContext[key] = props[key];
     }
-    for (const key in props) mergeProp(out, defaultProps, props, key), contextProps && key in contextProps && (overriddenContext ||= {}, overriddenContext[key] = props[key]);
-    return [out, overriddenContext];
-  };
+  }
+  return [out, overriddenContext];
+};
 function mergeProp(out, defaultProps, props, key) {
   let val = props[key];
-  if (defaultProps && key in defaultProps && (key in import_pseudoDescriptors.pseudoDescriptors || key[0] === "$") && val && typeof val == "object") {
+  if (defaultProps && key in defaultProps && (key in import_pseudoDescriptors.pseudoDescriptors || key[0] === "$") && val && typeof val === "object") {
     const defaultVal = defaultProps[key];
-    defaultVal && typeof defaultVal == "object" && (val = mergeProps(defaultVal, val));
+    if (defaultVal && typeof defaultVal === "object") {
+      val = mergeProps(defaultVal, val);
+    }
   }
   out[key] = val;
 }

package/dist/cjs/helpers/mergeProps.native.js

@@ -5,20 +5,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeProps_exports = {};
 __export(mergeProps_exports, {
@@ -30,32 +32,55 @@ var import_pseudoDescriptors = require("./pseudoDescriptors.native.js");
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
-  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var mergeProps = function (defaultProps, props) {
-    var out = {};
-    for (var key in defaultProps) key in props || (out[key] = defaultProps[key]);
-    for (var key1 in props) mergeProp(out, defaultProps, props, key1);
-    return out;
-  },
-  mergeComponentProps = function (defaultProps, contextProps, props) {
-    var overriddenContext = null;
-    if (!defaultProps && !contextProps) return [props, overriddenContext];
-    if (defaultProps && !contextProps) return [mergeProps(defaultProps, props), overriddenContext];
-    var out = {};
-    for (var key in defaultProps) key in props || (out[key] = defaultProps[key]);
-    for (var key1 in contextProps) if (!(key1 in props)) {
-      var contextValue = contextProps[key1];
-      contextValue !== void 0 && (out[key1] = contextValue);
+  var out = {};
+  for (var key in defaultProps) {
+    if (key in props) continue;
+    out[key] = defaultProps[key];
+  }
+  for (var key1 in props) {
+    mergeProp(out, defaultProps, props, key1);
+  }
+  return out;
+};
+var mergeComponentProps = function (defaultProps, contextProps, props) {
+  var overriddenContext = null;
+  if (!defaultProps && !contextProps) {
+    return [props, overriddenContext];
+  }
+  if (defaultProps && !contextProps) {
+    return [mergeProps(defaultProps, props), overriddenContext];
+  }
+  var out = {};
+  for (var key in defaultProps) {
+    if (key in props) continue;
+    out[key] = defaultProps[key];
+  }
+  for (var key1 in contextProps) {
+    if (key1 in props) continue;
+    var contextValue = contextProps[key1];
+    if (contextValue !== void 0) {
+      out[key1] = contextValue;
+    }
+  }
+  for (var key2 in props) {
+    mergeProp(out, defaultProps, props, key2);
+    if (contextProps && key2 in contextProps) {
+      overriddenContext || (overriddenContext = {});
+      overriddenContext[key2] = props[key2];
     }
-    for (var key2 in props) mergeProp(out, defaultProps, props, key2), contextProps && key2 in contextProps && (overriddenContext || (overriddenContext = {}), overriddenContext[key2] = props[key2]);
-    return [out, overriddenContext];
-  };
+  }
+  return [out, overriddenContext];
+};
 function mergeProp(out, defaultProps, props, key) {
   var val = props[key];
-  if (defaultProps && key in defaultProps && (key in import_pseudoDescriptors.pseudoDescriptors || key[0] === "$") && val && (typeof val > "u" ? "undefined" : _type_of(val)) === "object") {
+  if (defaultProps && key in defaultProps && (key in import_pseudoDescriptors.pseudoDescriptors || key[0] === "$") && val && (typeof val === "undefined" ? "undefined" : _type_of(val)) === "object") {
     var defaultVal = defaultProps[key];
-    defaultVal && (typeof defaultVal > "u" ? "undefined" : _type_of(defaultVal)) === "object" && (val = mergeProps(defaultVal, val));
+    if (defaultVal && (typeof defaultVal === "undefined" ? "undefined" : _type_of(defaultVal)) === "object") {
+      val = mergeProps(defaultVal, val);
+    }
   }
   out[key] = val;
 }

package/dist/cjs/helpers/mergeProps.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mergeProps_exports","__export","mergeComponentProps","mergeProps","module","exports","import_pseudoDescriptors","require","_type_of","obj","Symbol","constructor","defaultProps","props","out","key","key1","mergeProp","contextProps","overriddenContext","contextValue","key2"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA,mBAAA;EAAAC,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAiBAC,MAAA,CAAAC,OAAA,GAAAV,YAAA,CAAAK,kBAAkC;AAI3B,IAAAM,wBAAoB,GAAAC,OAAsB,gCAAkB;AACjE,SAAMC,QAAqBA,CAAAC,GAAA;EAU3B,uBAAkB;;EAChB,OAAIA,GAAO,WACXC,MAAO,GAAI,OAAAD,GAAA,CAAAE,WAAgB,KAAAD,MAAA,qBAAAD,GAAA;AAG7B;AACE,IAAAN,UAAU,YAAAA,CAAKS,YAAc,EAAOC,KAAG;IAGzC,IAAAC,GAAO;IACT,KAGa,IAAAC,GAAA,IAAAH,YAEX,EAKAG,GAAI,IAAAF,KAAA,KAAAC,GAAA,CAAAC,GAAyC,IAAAH,YAAA,CAAAG,GAAA;IAE7C,KAAK,IAAAC,IAAA,IAAAH,KAAiB,EACpBI,SAAQ,CAAAH,GAAA,EAAOF,YAAA,EAAAC,KAAiB,EAAAG,IAAA;IAGlC,OAAIF,GAAA;EACF;EAAAZ,mBAAQ,GAAW,SAAAA,CAAAU,YAAsB,EAAAM,YAAA,EAAiBL,KAAA;IAM5D,IAAAM,iBAA2B;IAK3B,KAAAP,YAAW,IAAO,CAAAM,YAAA,EACZ,OAAO,CAKbL,KAAA,EACEM,iBAAkB,CAClB;IAEA,IAAIP,YAAA,IAAiB,CAAAM,YACnB,EAEJ,QAEAf,UAAW,CAAAS,YAAO,EAAAC,KAAA,GAChBM,iBAAe,CAOjB;IACF,IAAAL,GAAA;IAEA,SAASC,GAAA,IAAAH,YAEP,EAIAG,GAAI,IAAAF,KAAM,KAASC,GAAA,CAAAC,GAAA,IAAAH,YAAA,CAAAG,GAAA;IAGnB,KACE,IAAAC,IAAA,IAAAE,YACO,EAKP,MAAMF,IAAA,IAAAH,KAAa;MACf,IAAAO,YAAc,GAAOF,YAAA,CAAAF,IAAe;MAI1CI,YAAA,gBAAAN,GAAA,CAAAE,IAAA,IAAAI,YAAA;IAEA;IACF,SAAAC,IAAA,IAAAR,KAAA,E","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mergeProps_exports","__export","mergeComponentProps","mergeProps","module","exports","import_pseudoDescriptors","require","_type_of","obj","Symbol","constructor","defaultProps","props","out","key","key1","mergeProp","contextProps","overriddenContext","contextValue","key2"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA,mBAAA;EAAAC,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAiBAC,MAAA,CAAAC,OAAA,GAAAV,YAAA,CAAAK,kBAAkC;AAI3B,IAAAM,wBAAoB,GAAAC,OAAsB,gCAAkB;AACjE,SAAMC,QAAqBA,CAAAC,GAAA;EAU3B,uBAAkB;;EAChB,OAAIA,GAAA,IAAO,OAAOC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAClB;AAA2B,IAC7BN,UAAA,YAAAA,CAAAS,YAAA,EAAAC,KAAA;EAEA,IAAAC,GAAA,IAAW;EACT,SAAAC,GAAU,IAAAH,YAAK;IACjB,IAAAG,GAAA,IAAAF,KAAA;IAEAC,GAAA,CAAAC,GAAO,IAAAH,YAAA,CAAAG,GAAA;EACT;EAGO,KAAM,IAAAC,IAAA,IAAAH,KAAA;IAOXI,SAAI,CAAAH,GAAA,EAAAF,YAAyC,EAAAC,KAAA,EAAAG,IAAA;EAE7C;EACE,OAAAF,GAAQ;AAAwB;AAGlC,IAAAZ,mBAAqB,YAAAA,CAAAU,YAAc,EAAAM,YAAA,EAAAL,KAAA;EACjC,IAAAM,iBAAmB;EACrB,KAAAP,YAAA,KAAAM,YAAA;IAKA,OAAM,CAKNL,KAAA,EACEM,iBAAkB,CAClB;EACF;EAGA,IAAAP,YAAW,IAAO,CAAAM,YAAc;IAC9B,OAAI,CACJf,UAAM,CAAAS,YAAe,EAAAC,KAAA,GAErBM,iBAAI,CACF;EAAW;EAEf,IAAAL,GAAA;EAEA,SAAAC,GAAW,IAAAH,YAAc;IACvB,IAAAG,GAAA,IAAUF,KAAK;IACfC,GAAA,CAAIC,GAAA,IAAAH,YAAgB,CAAAG,GAAO;EACzB;EACA,SAAAC,IAAA,IAAAE,YAAyB;IAC3B,IAAAF,IAAA,IAAAH,KAAA;IACF,IAAAO,YAAA,GAAAF,YAAA,CAAAF,IAAA;IAEA,IAAAI,YAAa,aAAiB;MAChCN,GAAA,CAAAE,IAAA,IAAAI,YAAA;IAEA;EAME;EAGA,KACE,IAAAC,IAAA,IAAAR,KACA;IAKAI,SAAM,CAAAH,GAAA,EAAAF,YAAa,EAAAC,KAAa,EAAGQ,IAAA;IACnC,IAAIH,YAAA,IAAcG,IAAA,IAAOH,YAAe;MAEtCC,iBAAiB,KAAAA,iBAAe;MAClCA,iBAAA,CAAAE,IAAA,IAAAR,KAAA,CAAAQ,IAAA;IACF;EAEA;EACF,Q","ignoreList":[]}

package/dist/cjs/helpers/mergeRenderElementProps.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeRenderElementProps_exports = {};
 __export(mergeRenderElementProps_exports, {
@@ -28,5 +30,6 @@ function mergeRenderElementProps(elementProps, viewProps, children) {
   const merged = (0, import_mergeSlotStyleProps.mergeSlotStyleProps)({
     ...elementProps
   }, viewProps);
-  return merged.children = children, merged;
+  merged.children = children;
+  return merged;
 }

package/dist/cjs/helpers/mergeRenderElementProps.native.js

@@ -5,20 +5,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeRenderElementProps_exports = {};
 __export(mergeRenderElementProps_exports, {
@@ -30,6 +32,7 @@ function mergeRenderElementProps(elementProps, viewProps, children) {
   var merged = (0, import_mergeSlotStyleProps.mergeSlotStyleProps)({
     ...elementProps
   }, viewProps);
-  return merged.children = children, merged;
+  merged.children = children;
+  return merged;
 }
 //# sourceMappingURL=mergeRenderElementProps.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mergeRenderElementProps_exports","__export","mergeRenderElementProps","module","exports","import_mergeSlotStyleProps","require","elementProps","viewProps","children","merged","mergeSlotStyleProps"],"sources":["../../../src/helpers/mergeRenderElementProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,+BAAA;AAAAC,QAAA,CAAAD,+BAAA;EAAAE,uBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAA,CAAAK,+BAAoC;AAO7B,IAAAK,0BAAS,GACdC,OAAA,kCAEA;AAGA,SAAMJ,uBAASA,CAAAK,YAAA,EAAAC,SAAA,EAAAC,QAAA;EACf,IAAAC,MAAA,IAAO,GAAAL,0BACA,CAAAM,mBAAA;IACT,GAAAJ","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mergeRenderElementProps_exports","__export","mergeRenderElementProps","module","exports","import_mergeSlotStyleProps","require","elementProps","viewProps","children","merged","mergeSlotStyleProps"],"sources":["../../../src/helpers/mergeRenderElementProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,+BAAA;AAAAC,QAAA,CAAAD,+BAAA;EAAAE,uBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAA,CAAAK,+BAAoC;AAO7B,IAAAK,0BAAS,GACdC,OAAA,kCAEA;AAGA,SAAMJ,uBAASA,CAAAK,YAAA,EAAAC,SAAA,EAAAC,QAAA;EACf,IAAAC,MAAO,OAAAL,0BAAW,CAAAM,mBAAA;IAClB,GAAAJ;EACF,GAAAC,SAAA","ignoreList":[]}

package/dist/cjs/helpers/mergeSlotStyleProps.cjs

@@ -3,37 +3,50 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeSlotStyleProps_exports = {};
 __export(mergeSlotStyleProps_exports, {
   mergeSlotStyleProps: () => mergeSlotStyleProps
 });
 module.exports = __toCommonJS(mergeSlotStyleProps_exports);
-var import_compose_refs = require("@tamagui/compose-refs"),
-  import_helpers = require("@tamagui/helpers");
+var import_compose_refs = require("@tamagui/compose-refs");
+var import_helpers = require("@tamagui/helpers");
 const isEventHandler = /^on[A-Z]/;
 function mergeSlotStyleProps(base, overlay) {
   for (const key in overlay) {
-    const baseVal = base[key],
-      overlayVal = overlay[key];
-    overlayVal !== void 0 && (key === "style" ? base.style = baseVal && overlayVal ? {
-      ...baseVal,
-      ...overlayVal
-    } : overlayVal || baseVal : key === "className" ? base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal : key === "ref" ? base.ref = baseVal && overlayVal ? (0, import_compose_refs.composeRefs)(baseVal, overlayVal) : overlayVal || baseVal : isEventHandler.test(key) && typeof baseVal == "function" && typeof overlayVal == "function" ? base[key] = (0, import_helpers.composeEventHandlers)(baseVal, overlayVal) : base[key] = overlayVal);
+    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 ? (0, import_compose_refs.composeRefs)(baseVal, overlayVal) : overlayVal || baseVal;
+    } else if (isEventHandler.test(key) && typeof baseVal === "function" && typeof overlayVal === "function") {
+      base[key] = (0, import_helpers.composeEventHandlers)(baseVal, overlayVal);
+    } else {
+      base[key] = overlayVal;
+    }
   }
   return base;
 }

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

@@ -5,37 +5,50 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeSlotStyleProps_exports = {};
 __export(mergeSlotStyleProps_exports, {
   mergeSlotStyleProps: () => mergeSlotStyleProps
 });
 module.exports = __toCommonJS(mergeSlotStyleProps_exports);
-var import_compose_refs = require("@tamagui/compose-refs"),
-  import_helpers = require("@tamagui/helpers"),
-  isEventHandler = /^on[A-Z]/;
+var import_compose_refs = require("@tamagui/compose-refs");
+var import_helpers = require("@tamagui/helpers");
+var isEventHandler = /^on[A-Z]/;
 function mergeSlotStyleProps(base, overlay) {
   for (var key in overlay) {
-    var baseVal = base[key],
-      overlayVal = overlay[key];
-    overlayVal !== void 0 && (key === "style" ? base.style = baseVal && overlayVal ? {
-      ...baseVal,
-      ...overlayVal
-    } : overlayVal || baseVal : key === "className" ? base.className = baseVal && overlayVal ? `${baseVal} ${overlayVal}` : overlayVal || baseVal : key === "ref" ? base.ref = baseVal && overlayVal ? (0, import_compose_refs.composeRefs)(baseVal, overlayVal) : overlayVal || baseVal : isEventHandler.test(key) && typeof baseVal == "function" && typeof overlayVal == "function" ? base[key] = (0, import_helpers.composeEventHandlers)(baseVal, overlayVal) : base[key] = overlayVal);
+    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 ? (0, import_compose_refs.composeRefs)(baseVal, overlayVal) : overlayVal || baseVal;
+    } else if (isEventHandler.test(key) && typeof baseVal === "function" && typeof overlayVal === "function") {
+      base[key] = (0, import_helpers.composeEventHandlers)(baseVal, overlayVal);
+    } else {
+      base[key] = overlayVal;
+    }
   }
   return base;
 }

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mergeSlotStyleProps_exports","__export","mergeSlotStyleProps","module","exports","import_compose_refs","require","import_helpers","isEventHandler","base","overlay","key","baseVal","overlayVal","style","className","ref","composeRefs","test","composeEventHandlers"],"sources":["../../../src/helpers/mergeSlotStyleProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA4B,CAAAK,2BAAA;AAG5B,IAAAK,mBAAuB,GAAAC,OAAA;EAAAC,cAAA,GAAAD,OAAA;EAAAE,cAAA;AAUhB,SAASN,oBACdO,IAAA,EACAC,OAAA,EACqB;EACrB,SAAAC,GAAW,IAAAD,OAAO;IAChB,IAAAE,OAAM,GAAAH,IAAU,CAAAE,GAAK;MAAGE,UAClB,GAAAH,OAAa,CAAAC,GAAQ;IAEvBE,UAAA,KAAe,WAEfF,GAAA,KAAQ,UACVF,IAAA,CAAKK,KAAA,GACHF,OAAA,IAAWC,UAAA,GAAa;MAiB9B,GAAAD,OAAA;MAEA,GAAOC;IACT,IAAAA,UAAA,IAAAD,OAAA,GAAAD,GAAA,mBAAAF,IAAA,CAAAM,SAAA,GAAAH,OAAA,IAAAC,UAAA,MAAAD,OAAA,IAAAC,UAAA,KAAAA,UAAA,IAAAD,OAAA,GAAAD,GAAA,aAAAF,IAAA,CAAAO,GAAA,GAAAJ,OAAA,IAAAC,UAAA,OAAAR,mBAAA,CAAAY,WAAA,EAAAL,OAAA,EAAAC,UAAA,IAAAA,UAAA,IAAAD,OAAA,GAAAJ,cAAA,CAAAU,IAAA,CAAAP,GAAA,YAAAC,OAAA,yBAAAC,UAAA,iBAAAJ,IAAA,CAAAE,GAAA,QAAAJ,cAAA,CAAAY,oBAAA,EAAAP,OAAA,EAAAC,UAAA,IAAAJ,IAAA,CAAAE,GAAA,IAAAE,UAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","mergeSlotStyleProps_exports","__export","mergeSlotStyleProps","module","exports","import_compose_refs","require","import_helpers","isEventHandler","base","overlay","key","baseVal","overlayVal","style","className","ref","composeRefs","test","composeEventHandlers"],"sources":["../../../src/helpers/mergeSlotStyleProps.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA4B,CAAAK,2BAAA;AAC5B,IAAAK,mBAAqC,GAAAC,OAAA;AAErC,IAAAC,cAAM,GAAAD,OAAiB;AAUhB,IAAAE,cAAS,aACd;AAGA,SAAAN,mBAAkBA,CAASO,IAAA,EAAAC,OAAA;EACzB,SAAMC,GAAA,IAAAD,OAAe;IACrB,IAAAE,OAAM,GAAAH,IAAA,CAAaE,GAAA;IAEnB,IAAIE,UAAA,GAAAH,OAAe,CAAAC,GAAW;IAE9B,IAAIE,UAAQ,UAAS;IACnB,IAAAF,GAAK,YACH;MACJF,IAAA,CAAAK,KAAW,GAAAF,OAAQ,IAAAC,UAAa;QAC9B,GAAKD,OAAA;QAEP,GAAAC;MACE,IAAAA,UACE,IAAAD,OAAW;IACf,WACED,GAAA,gBAAe,EAAK;MAIpBF,IAAA,CAAKM,SAAG,GAAIH,OAAA,IAAAC,UAAA,MAAAD,OAAA,IAAqBC,UAAS,KAAAA,UAAU,IAAAD,OAAA;IACtD,OAAO,IAAAD,GAAA;MAELF,IAAA,CAAKO,GAAG,GAAAJ,OAAI,IAAAC,UAAA,OAAAR,mBAAA,CAAAY,WAAA,EAAAL,OAAA,EAAAC,UAAA,IAAAA,UAAA,IAAAD,OAAA;IACd,WAAAJ,cAAA,CAAAU,IAAA,CAAAP,GAAA,YAAAC,OAAA,0BAAAC,UAAA;MACFJ,IAAA,CAAAE,GAAA,QAAAJ,cAAA,CAAAY,oBAAA,EAAAP,OAAA,EAAAC,UAAA;IAEA,OAAO;MACTJ,IAAA,CAAAE,GAAA,IAAAE,UAAA","ignoreList":[]}

package/dist/cjs/helpers/mergeVariants.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var mergeVariants_exports = {};
 __export(mergeVariants_exports, {
@@ -26,12 +28,22 @@ module.exports = __toCommonJS(mergeVariants_exports);
 const mergeVariants = (parentVariants, ourVariants, level = 0) => {
   const variants = {};
   for (const key in ourVariants) {
-    const parentVariant = parentVariants?.[key],
-      ourVariant = ourVariants[key];
-    !parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(parentVariant, ourVariant, level + 1) : variants[key] = {
-      ...parentVariant,
-      ...ourVariant
-    };
+    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,