@hanzogui/web 3.0.6 → 4.3.1

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

@@ -5,13 +5,25 @@ function camelToHyphen(str) {
 }
 var cache = /* @__PURE__ */new WeakMap();
 function mediaObjectToString(query) {
-  if (typeof query == "string") return query;
-  if (cache.has(query)) return cache.get(query);
+  if (typeof query === "string") {
+    return query;
+  }
+  if (cache.has(query)) {
+    return cache.get(query);
+  }
   var res = Object.entries(query).map(function (param) {
     var [feature, value] = param;
-    return feature = camelToHyphen(feature), typeof value == "string" ? `(${feature}: ${value})` : (typeof value == "number" && /[height|width]$/.test(feature) && (value = `${value}px`), `(${feature}: ${value})`);
+    feature = camelToHyphen(feature);
+    if (typeof value === "string") {
+      return `(${feature}: ${value})`;
+    }
+    if (typeof value === "number" && /[height|width]$/.test(feature)) {
+      value = `${value}px`;
+    }
+    return `(${feature}: ${value})`;
   }).join(" and ");
-  return cache.set(query, res), res;
+  cache.set(query, res);
+  return res;
 }
 export { mediaObjectToString };
 //# sourceMappingURL=mediaObjectToString.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["camelToHyphen","str","replace","m","toLowerCase","cache","WeakMap","mediaObjectToString","query","has","get","res","Object","entries","map","param"],"sources":["../../../src/helpers/mediaObjectToString.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,cAAcC,GAAA,EAAa;EAClC,OAAOA,GAAA,CAAIC,OAAA,CAAQ,UAAU,UAAOC,CAAA,EAAI;IAC1C,WAAAA,CAAA,CAAAC,WAAA;EAEA,GAAAA,WAAc;AAEP;AACL,IAAAC,KAAI,kBAAiB,IAAAC,OAAA;AACnB,SAAAC,mBAAOA,CAAAC,KAAA;EAET,IAAI,OAAMA,KAAI,IAAK,UACjB,OAAOA,KAAA;EAET,IAAAH,KAAM,CAAAI,GAAM,CAAAD,KAAO,GAYnB,OAAAH,KAAM,CAAAK,GAAI,CAAAF,KAAO;EAEnB,IAAAG,GAAA,GAAAC,MAAA,CAAAC,OAAA,CAAAL,KAAA,EAAAM,GAAA,WAAAC,KAAA","ignoreList":[]}
+{"version":3,"names":["camelToHyphen","str","replace","m","toLowerCase","cache","WeakMap","mediaObjectToString","query","has","get","res","Object","entries","map","param","feature","value","test","join"],"sources":["../../../src/helpers/mediaObjectToString.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,cAAcC,GAAA,EAAa;EAClC,OAAOA,GAAA,CAAIC,OAAA,CAAQ,UAAU,UAAOC,CAAA,EAAI;IAC1C,WAAAA,CAAA,CAAAC,WAAA;EAEA,GAAAA,WAAc;AAEP;AACL,IAAAC,KAAI,kBAAiB,IAAAC,OAAU;AAC7B,SAAAC,mBAAOA,CAAAC,KAAA;EACT,WAAAA,KAAA;IACA,OAAIA,KAAU;EACZ;EACF,IAAAH,KAAA,CAAAI,GAAA,CAAAD,KAAA;IACA,OAAMH,KAAM,CAAAK,GAAA,CAAOF,KAAA;EAEf;EACA,IAAAG,GAAI,GAAAC,MAAO,CAAAC,OAAU,CAAAL,KAAA,EAAAM,GAAU,WAAAC,KAAA;IAC7B,KAAAC,OAAO,EAAIC,KAAA,CAAO,GAAAF,KAAK;IACzBC,OAAA,GAAAhB,aAAA,CAAAgB,OAAA;IACA,IAAI,OAAOC,KAAA,KAAU;MACnB,WAAWD,OAAK,KAAAC,KAAA;IAClB;IACA,WAAWA,KAAA,KAAO,QAAU,sBAAAC,IAAA,CAAAF,OAAA;MAE7BC,KAAK,MAAOA,KAAA;IACf;IACA,OAAO,IAAAD,OAAA,KAAAC,KAAA;EACT,GAAAE,IAAA","ignoreList":[]}

package/dist/esm/helpers/mediaState.mjs

@@ -2,17 +2,19 @@ let mediaState =
 // development only safeguard
 process.env.NODE_ENV === "development" ? new Proxy({}, {
   get(target, key) {
-    if (typeof key == "string" && key[0] === "$" &&
+    if (typeof key === "string" && key[0] === "$" &&
     // dont error on $$typeof
-    key[1] !== "$") throw new Error(`Access mediaState should not use "$": ${key}`);
+    key[1] !== "$") {
+      throw new Error(`Access mediaState should not use "$": ${key}`);
+    }
     return Reflect.get(target, key);
   }
 }) : {};
 const setMediaState = next => {
-    mediaState = next;
-  },
-  mediaQueryConfig = {},
-  getMedia = () => mediaState,
-  mediaKeys = /* @__PURE__ */new Set();
+  mediaState = next;
+};
+const mediaQueryConfig = {};
+const getMedia = () => mediaState;
+const mediaKeys = /* @__PURE__ */new Set();
 export { getMedia, mediaKeys, mediaQueryConfig, mediaState, setMediaState };
 //# sourceMappingURL=mediaState.mjs.map

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

@@ -1 +1 @@
-{"version":3,"names":["mediaState","process","env","NODE_ENV","Proxy","get","target","key","Error","Reflect","setMediaState","next","mediaQueryConfig","getMedia","mediaKeys","Set"],"sources":["../../../src/helpers/mediaState.ts"],"sourcesContent":[null],"mappings":"AAEO,IAAIA,UAAA;AAAA;AAETC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBACrB,IAAIC,KAAA,CACF,CAAC,GACD;EACEC,IAAIC,MAAA,EAAQC,GAAA,EAAK;IACf,IACE,OAAOA,GAAA,IAAQ,YACfA,GAAA,CAAI,CAAC,MAAM;IAAA;IAEXA,GAAA,CAAI,CAAC,MAAM,KAEX,MAAM,IAAIC,KAAA,CAAM,yCAAyCD,GAAG,EAAE;IAEhE,OAAOE,OAAA,CAAQJ,GAAA,CAAIC,MAAA,EAAQC,GAAG;EAChC;AACF,CACF,IACC,CAAC;AAED,MAAMG,aAAA,GAAiBC,IAAA,IAA0B;IACtDX,UAAA,GAAaW,IAAA;EACf;EAEaC,gBAAA,GAAiC,CAAC;EAElCC,QAAA,GAAWA,CAAA,KAAMb,UAAA;EAEjBc,SAAA,GAAY,mBAAIC,GAAA,CAAY","ignoreList":[]}
+{"version":3,"names":["mediaState","process","env","NODE_ENV","Proxy","get","target","key","Error","Reflect","setMediaState","next","mediaQueryConfig","getMedia","mediaKeys","Set"],"sources":["../../../src/helpers/mediaState.ts"],"sourcesContent":[null],"mappings":"AAEO,IAAIA,UAAA;AAAA;AAETC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBACrB,IAAIC,KAAA,CACF,CAAC,GACD;EACEC,IAAIC,MAAA,EAAQC,GAAA,EAAK;IACf,IACE,OAAOA,GAAA,KAAQ,YACfA,GAAA,CAAI,CAAC,MAAM;IAAA;IAEXA,GAAA,CAAI,CAAC,MAAM,KACX;MACA,MAAM,IAAIC,KAAA,CAAM,yCAAyCD,GAAG,EAAE;IAChE;IACA,OAAOE,OAAA,CAAQJ,GAAA,CAAIC,MAAA,EAAQC,GAAG;EAChC;AACF,CACF,IACC,CAAC;AAED,MAAMG,aAAA,GAAiBC,IAAA,IAA0B;EACtDX,UAAA,GAAaW,IAAA;AACf;AAEO,MAAMC,gBAAA,GAAiC,CAAC;AAExC,MAAMC,QAAA,GAAWA,CAAA,KAAMb,UAAA;AAEvB,MAAMc,SAAA,GAAY,mBAAIC,GAAA,CAAY","ignoreList":[]}

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

@@ -1,20 +1,22 @@
 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);
+// 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}`);
     }
-  }) : {},
-  setMediaState = function (next) {
-    mediaState = next;
-  },
-  mediaQueryConfig = {},
-  getMedia = function () {
-    return mediaState;
-  },
-  mediaKeys = /* @__PURE__ */new Set();
+    return Reflect.get(target, key);
+  }
+}) : {};
+var setMediaState = function (next) {
+  mediaState = next;
+};
+var mediaQueryConfig = {};
+var getMedia = function () {
+  return mediaState;
+};
+var mediaKeys = /* @__PURE__ */new Set();
 export { getMedia, mediaKeys, mediaQueryConfig, mediaState, setMediaState };
 //# sourceMappingURL=mediaState.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["mediaState","process","env","NODE_ENV","Proxy","get","target","key","Error","Reflect","setMediaState","next","mediaQueryConfig","getMedia","mediaKeys","Set"],"sources":["../../../src/helpers/mediaState.ts"],"sourcesContent":[null],"mappings":"AAEO,IAAIA,UAAA;EAAA;EAETC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBACrB,IAAIC,KAAA;IACFC,GAACA,CAAAC,MAAA,EAAAC,GAAA;MACD,WAAAA,GAAA,gBAAAA,GAAA;MAAA;MACEA,GAAA,CAAI,UAAQ,EACV,MACE,IAAAC,KAAO,0CACID,GAAA;MAAA,OAENE,OAAM,CAAAJ,GAAA,CAAAC,MAAA,EAAAC,GAAA;IAEX;EAEF,OAA8B;EAAAG,aAChC,YAAAA,CAAAC,IAAA;IAAAX,UACF,GAAAW,IAAA;EAAA;EACFC,gBACE;EAAAC,QAAA,YAAAA,CAAA;IAAA,OAAAb,UAAA;EAED;EAAAc,SAAM,kBAAiB,IAA0BC,GAAA;AACtD,SACFF,QAEa,E","ignoreList":[]}
+{"version":3,"names":["mediaState","process","env","NODE_ENV","Proxy","get","target","key","Error","Reflect","setMediaState","next","mediaQueryConfig","getMedia","mediaKeys","Set"],"sources":["../../../src/helpers/mediaState.ts"],"sourcesContent":[null],"mappings":"AAEO,IAAIA,UAAA;AAAA;AAETC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBACrB,IAAIC,KAAA;EACFC,GAACA,CAAAC,MAAA,EAAAC,GAAA;IACD,WAAAA,GAAA,iBAAAA,GAAA;IAAA;IACEA,GAAA,CAAI,UAAQ;MACV,MACE,IAAAC,KAAO,0CACID,GAAA;IAAA;IAIX,OAAAE,OAAU,CAAAJ,GAAA,CAAAC,MAAM,EAAAC,GAAA;EAA8C;AAEhE,OAA8B;AAChC,IACFG,aAAA,YAAAA,CAAAC,IAAA;EACFX,UACE,GAAAW,IAAA;AAAA;AAED,IAAAC,gBAAM,GAAiB;AAC5B,IAAAC,QAAA,GAAa,SAAAA,CAAA;EACf,OAAAb,UAAA;AAEO;AAEA,IAAAc,SAAM,kBAAiB,IAAAC,GAAA;AAEvB,S","ignoreList":[]}

package/dist/esm/helpers/mergeProps.mjs

@@ -1,29 +1,51 @@
 import { pseudoDescriptors } from "./pseudoDescriptors.mjs";
 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), contextProps && key in contextProps && (overriddenContext ||= {}, overriddenContext[key] = props[key]);
-    return [out, overriddenContext];
-  };
+  }
+  for (const key in props) {
+    mergeProp(out, defaultProps, props, key);
+    if (contextProps && key in contextProps) {
+      overriddenContext ||= {};
+      overriddenContext[key] = props[key];
+    }
+  }
+  return [out, overriddenContext];
+};
 function mergeProp(out, defaultProps, props, key) {
   let val = props[key];
-  if (defaultProps && key in defaultProps && (key in pseudoDescriptors || key[0] === "$") && val && typeof val == "object") {
+  if (defaultProps && key in defaultProps && (key in 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/esm/helpers/mergeProps.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["pseudoDescriptors","mergeProps","defaultProps","props","out","key","mergeProp","mergeComponentProps","contextProps","overriddenContext","contextValue","val","defaultVal"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":"AAiBA,SAASA,iBAAA,QAAyB;AAI3B,MAAMC,UAAA,GAAaA,CAACC,YAAA,EAAsBC,KAAA,KAAkB;IACjE,MAAMC,GAAA,GAAoB,CAAC;IAU3B,WAAWC,GAAA,IAAOH,YAAA,EACZG,GAAA,IAAOF,KAAA,KACXC,GAAA,CAAIC,GAAG,IAAIH,YAAA,CAAaG,GAAG;IAG7B,WAAWA,GAAA,IAAOF,KAAA,EAChBG,SAAA,CAAUF,GAAA,EAAKF,YAAA,EAAcC,KAAA,EAAOE,GAAG;IAGzC,OAAOD,GAAA;EACT;EAGaG,mBAAA,GAAsBA,CAEjCL,YAAA,EACAM,YAAA,EAEAL,KAAA,KACG;IACH,IAAIM,iBAAA,GAAyC;IAE7C,IAAI,CAACP,YAAA,IAAgB,CAACM,YAAA,EACpB,OAAO,CAACL,KAAA,EAAOM,iBAAiB;IAGlC,IAAIP,YAAA,IAAgB,CAACM,YAAA,EACnB,OAAO,CAACP,UAAA,CAAWC,YAAA,EAAcC,KAAK,GAAGM,iBAAiB;IAM5D,MAAML,GAAA,GAAoB,CAAC;IAK3B,WAAWC,GAAA,IAAOH,YAAA,EACZG,GAAA,IAAOF,KAAA,KACXC,GAAA,CAAIC,GAAG,IAAIH,YAAA,CAAaG,GAAG;IAI7B,WAAWA,GAAA,IAAOG,YAAA,EAAc;MAC9B,IAAIH,GAAA,IAAOF,KAAA,EAAO;MAClB,MAAMO,YAAA,GAAeF,YAAA,CAAaH,GAAG;MAEjCK,YAAA,KAAiB,WACnBN,GAAA,CAAIC,GAAG,IAAIK,YAAA;IAEf;IAEA,WAAWL,GAAA,IAAOF,KAAA,EAChBG,SAAA,CAAUF,GAAA,EAAKF,YAAA,EAAcC,KAAA,EAAOE,GAAG,GACnCG,YAAA,IAAgBH,GAAA,IAAOG,YAAA,KACzBC,iBAAA,KAAsB,CAAC,GACvBA,iBAAA,CAAkBJ,GAAG,IAAIF,KAAA,CAAME,GAAG;IAItC,OAAO,CAACD,GAAA,EAAKK,iBAAiB;EAChC;AAEA,SAASH,UACPF,GAAA,EACAF,YAAA,EACAC,KAAA,EACAE,GAAA,EACA;EACA,IAAIM,GAAA,GAAMR,KAAA,CAAME,GAAG;EAGnB,IACEH,YAAA,IACAG,GAAA,IAAOH,YAAA,KACNG,GAAA,IAAOL,iBAAA,IAAqBK,GAAA,CAAI,CAAC,MAAM,QACxCM,GAAA,IACA,OAAOA,GAAA,IAAQ,UACf;IACA,MAAMC,UAAA,GAAaV,YAAA,CAAaG,GAAG;IAC/BO,UAAA,IAAc,OAAOA,UAAA,IAAe,aAEtCD,GAAA,GAAMV,UAAA,CAAWW,UAAA,EAAYD,GAAG;EAEpC;EAEAP,GAAA,CAAIC,GAAG,IAAIM,GAAA;AACb","ignoreList":[]}
+{"version":3,"names":["pseudoDescriptors","mergeProps","defaultProps","props","out","key","mergeProp","mergeComponentProps","contextProps","overriddenContext","contextValue","val","defaultVal"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":"AAiBA,SAASA,iBAAA,QAAyB;AAI3B,MAAMC,UAAA,GAAaA,CAACC,YAAA,EAAsBC,KAAA,KAAkB;EACjE,MAAMC,GAAA,GAAoB,CAAC;EAU3B,WAAWC,GAAA,IAAOH,YAAA,EAAc;IAC9B,IAAIG,GAAA,IAAOF,KAAA,EAAO;IAClBC,GAAA,CAAIC,GAAG,IAAIH,YAAA,CAAaG,GAAG;EAC7B;EAEA,WAAWA,GAAA,IAAOF,KAAA,EAAO;IACvBG,SAAA,CAAUF,GAAA,EAAKF,YAAA,EAAcC,KAAA,EAAOE,GAAG;EACzC;EAEA,OAAOD,GAAA;AACT;AAGO,MAAMG,mBAAA,GAAsBA,CAEjCL,YAAA,EACAM,YAAA,EAEAL,KAAA,KACG;EACH,IAAIM,iBAAA,GAAyC;EAE7C,IAAI,CAACP,YAAA,IAAgB,CAACM,YAAA,EAAc;IAClC,OAAO,CAACL,KAAA,EAAOM,iBAAiB;EAClC;EAEA,IAAIP,YAAA,IAAgB,CAACM,YAAA,EAAc;IACjC,OAAO,CAACP,UAAA,CAAWC,YAAA,EAAcC,KAAK,GAAGM,iBAAiB;EAC5D;EAKA,MAAML,GAAA,GAAoB,CAAC;EAK3B,WAAWC,GAAA,IAAOH,YAAA,EAAc;IAC9B,IAAIG,GAAA,IAAOF,KAAA,EAAO;IAClBC,GAAA,CAAIC,GAAG,IAAIH,YAAA,CAAaG,GAAG;EAC7B;EAGA,WAAWA,GAAA,IAAOG,YAAA,EAAc;IAC9B,IAAIH,GAAA,IAAOF,KAAA,EAAO;IAClB,MAAMO,YAAA,GAAeF,YAAA,CAAaH,GAAG;IAErC,IAAIK,YAAA,KAAiB,QAAW;MAC9BN,GAAA,CAAIC,GAAG,IAAIK,YAAA;IACb;EACF;EAEA,WAAWL,GAAA,IAAOF,KAAA,EAAO;IACvBG,SAAA,CAAUF,GAAA,EAAKF,YAAA,EAAcC,KAAA,EAAOE,GAAG;IACvC,IAAIG,YAAA,IAAgBH,GAAA,IAAOG,YAAA,EAAc;MACvCC,iBAAA,KAAsB,CAAC;MACvBA,iBAAA,CAAkBJ,GAAG,IAAIF,KAAA,CAAME,GAAG;IACpC;EACF;EAEA,OAAO,CAACD,GAAA,EAAKK,iBAAiB;AAChC;AAEA,SAASH,UACPF,GAAA,EACAF,YAAA,EACAC,KAAA,EACAE,GAAA,EACA;EACA,IAAIM,GAAA,GAAMR,KAAA,CAAME,GAAG;EAGnB,IACEH,YAAA,IACAG,GAAA,IAAOH,YAAA,KACNG,GAAA,IAAOL,iBAAA,IAAqBK,GAAA,CAAI,CAAC,MAAM,QACxCM,GAAA,IACA,OAAOA,GAAA,KAAQ,UACf;IACA,MAAMC,UAAA,GAAaV,YAAA,CAAaG,GAAG;IACnC,IAAIO,UAAA,IAAc,OAAOA,UAAA,KAAe,UAAU;MAEhDD,GAAA,GAAMV,UAAA,CAAWW,UAAA,EAAYD,GAAG;IAClC;EACF;EAEAP,GAAA,CAAIC,GAAG,IAAIM,GAAA;AACb","ignoreList":[]}

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

@@ -2,32 +2,55 @@ import { pseudoDescriptors } from "./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), contextProps && key2 in contextProps && (overriddenContext || (overriddenContext = {}), overriddenContext[key2] = props[key2]);
-    return [out, overriddenContext];
-  };
+  }
+  for (var key2 in props) {
+    mergeProp(out, defaultProps, props, key2);
+    if (contextProps && key2 in contextProps) {
+      overriddenContext || (overriddenContext = {});
+      overriddenContext[key2] = props[key2];
+    }
+  }
+  return [out, overriddenContext];
+};
 function mergeProp(out, defaultProps, props, key) {
   var val = props[key];
-  if (defaultProps && key in defaultProps && (key in pseudoDescriptors || key[0] === "$") && val && (typeof val > "u" ? "undefined" : _type_of(val)) === "object") {
+  if (defaultProps && key in defaultProps && (key in 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/esm/helpers/mergeProps.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["pseudoDescriptors","_type_of","obj","Symbol","constructor","mergeProps","defaultProps","props","out","key","key1","mergeProp","mergeComponentProps","contextProps","overriddenContext","contextValue","key2"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":"AAiBA,SAASA,iBAAA,QAAyB;AAI3B,SAAMC,SAAAC,GAAc;EACzB,uBAA2B;;EAU3B,OAAAA,GAAA,IAAW,OAAOC,MAAA,UAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAChB;AAIF,IAAAG,UAAW,YAAAA,CAAOC,YAAA,EAAAC,KAAA;IAChB,IAAAC,GAAA,KAAU;IAGZ,SAAOC,GAAA,IAAAH,YAAA,EAIIG,GAAA,IAAAF,KAAA,KAAAC,GAAA,CAAsBC,GAEjC,IAAAH,YACA,CAAAG,GAAA;IAIA,KAAI,IAAAC,IAAA,IAAAH,KAAA,EAEJI,SAAK,CAAAH,GAAA,EAAAF,YAAiB,EAAAC,KAAA,EAAAG,IAAA;IACpB,OAAAF,GAAQ;EAGV;EAAAI,mBAAoB,GAAC,SAAAA,CAAAN,YAAA,EAAAO,YAAA,EAAAN,KAAA;IACnB,IAAAO,iBAAmB;IAMrB,KAAAR,YAA2B,KAAAO,YAAA,EAK3B,QACMN,KAAO,EAKbO,iBAAkB,CAChB;IACA,IAAAR,YAAM,KAAAO,YAAe,EAEjB,QAGNR,UAAA,CAAAC,YAAA,EAAAC,KAAA,GAEAO,iBAAkB,CAChB;IAOF,IAAAN,GAAO,GAAC;IACV,SAAAC,GAAA,IAAAH,YAAA,EAEAG,GAAA,IAASF,KAAA,KACPC,GACA,CAAAC,GAAA,IAAAH,YACA,CACAG,GAAA,EACA;IACA,KAAI,IAAAC,IAAM,IAAMG,YAAG,EAGnB,IACE,EAAAH,IAAA,IAAAH,KACA;MAKA,IAAMQ,YAAA,GAAaF,YAAa,CAAAH,IAAG;MAC/BK,YAAc,UAAO,MAAAP,GAAA,CAAAE,IAAe,IAAAK,YAEhC;IAEV;IAEA,KAAI,IAAGC,IAAI,IAAAT,KAAA,EACbI,SAAA,CAAAH,GAAA,EAAAF,YAAA,EAAAC,KAAA,EAAAS,IAAA,GAAAH,YAAA,IAAAG,IAAA,IAAAH,YAAA,KAAAC,iBAAA,KAAAA,iBAAA,QAAAA,iBAAA,CAAAE,IAAA,IAAAT,KAAA,CAAAS,IAAA","ignoreList":[]}
+{"version":3,"names":["pseudoDescriptors","_type_of","obj","Symbol","constructor","mergeProps","defaultProps","props","out","key","key1","mergeProp","mergeComponentProps","contextProps","overriddenContext","contextValue","key2"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":"AAiBA,SAASA,iBAAA,QAAyB;AAI3B,SAAMC,SAAAC,GAAc;EACzB,uBAA2B;;EAU3B,OAAAA,GAAA,IAAW,OAAOC,MAAA,KAAc,eAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAC9B;AACA,IAAAG,UAAO,GAAI,SAAAA,CAAAC,YAAgB,EAAAC,KAAA;EAC7B,IAAAC,GAAA;EAEA,SAAAC,GAAW,IAAAH,YAAc;IACvB,IAAAG,GAAA,IAAUF,KAAK;IACjBC,GAAA,CAAAC,GAAA,IAAAH,YAAA,CAAAG,GAAA;EAEA;EACF,SAAAC,IAAA,IAAAH,KAAA;IAGOI,SAAM,CAAAH,GAAA,EAAAF,YAEX,EAAAC,KAAA,EAAAG,IACA;EAIA;EAEA,OAAKF,GAAA;AACH;AAAgC,IAClCI,mBAAA,YAAAA,CAAAN,YAAA,EAAAO,YAAA,EAAAN,KAAA;EAEA,IAAIO,iBAAiB;EACnB,KAAAR,YAAQ,IAAW,CAAAO,YAAA,EAAc;IACnC,QAKAN,KAAM,EAKNO,iBAAkB,CAChB;EACA;EACF,IAAAR,YAAA,KAAAO,YAAA;IAGA,QACER,UAAW,CAAAC,YAAO,EAAAC,KAAA,GAClBO,iBAAM,CAEN;EACE;EAAW,IACbN,GAAA;EACF,SAAAC,GAAA,IAAAH,YAAA;IAEA,IAAAG,GAAA,IAAWF,KAAO;IAChBC,GAAA,CAAAC,GAAA,IAAUH,YAAK,CAAAG,GAAA;EACf;EACE,SAAAC,IAAA,IAAAG,YAAuB;IACvB,IAAAH,IAAA,IAAAH,KAAA;IACF,IAAAQ,YAAA,GAAAF,YAAA,CAAAH,IAAA;IACF,IAAAK,YAAA;MAEAP,GAAO,CAACE,IAAA,CAAK,GAAAK,YAAA;IACf;EAEA;EAME,KAAI,IAAAC,IAAM,IAAMT,KAAG;IAGnBI,SACE,CAAAH,GAAA,EAAAF,YACO,EAAAC,KAAA,EAAAS,IAAA;IAKP,IAAAH,YAAM,IAAaG,IAAA,IAAAH,YAAgB;MACnCC,iBAAkB,KAAAA,iBAAsB;MAEtCA,iBAAiB,CAAAE,IAAA,IAAAT,KAAY,CAAGS,IAAA;IAClC;EACF;EAEA,OAAO,CACTR,GAAA,E","ignoreList":[]}

package/dist/esm/helpers/mergeRenderElementProps.mjs

@@ -3,7 +3,8 @@ function mergeRenderElementProps(elementProps, viewProps, children) {
   const merged = mergeSlotStyleProps({
     ...elementProps
   }, viewProps);
-  return merged.children = children, merged;
+  merged.children = children;
+  return merged;
 }
 export { mergeRenderElementProps };
 //# sourceMappingURL=mergeRenderElementProps.mjs.map

package/dist/esm/helpers/mergeRenderElementProps.mjs.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,MAAMC,MAAA,GAASL,mBAAA,CAAoB;IAAE,GAAGE;EAAa,GAAGC,SAAS;EACjE,OAAAE,MAAA,CAAOD,QAAA,GAAWA,QAAA,EACXC,MAAA;AACT","ignoreList":[]}
+{"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,MAAMC,MAAA,GAASL,mBAAA,CAAoB;IAAE,GAAGE;EAAa,GAAGC,SAAS;EACjEE,MAAA,CAAOD,QAAA,GAAWA,QAAA;EAClB,OAAOC,MAAA;AACT","ignoreList":[]}

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

@@ -3,7 +3,8 @@ function mergeRenderElementProps(elementProps, viewProps, children) {
   var merged = mergeSlotStyleProps({
     ...elementProps
   }, viewProps);
-  return merged.children = children, merged;
+  merged.children = children;
+  return merged;
 }
 export { mergeRenderElementProps };
 //# sourceMappingURL=mergeRenderElementProps.native.js.map

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;EAEF,GAAAC,SAAA","ignoreList":[]}
+{"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":[]}

package/dist/esm/helpers/mergeSlotStyleProps.mjs

@@ -3,12 +3,23 @@ import { composeEventHandlers } from "@hanzogui/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 ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal : isEventHandler.test(key) && typeof baseVal == "function" && typeof overlayVal == "function" ? base[key] = 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 ? 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;
 }

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;MAClBE,UAAA,GAAaH,OAAA,CAAQC,GAAG;IAE1BE,UAAA,KAAe,WAEfF,GAAA,KAAQ,UACVF,IAAA,CAAKK,KAAA,GACHF,OAAA,IAAWC,UAAA,GAAa;MAAE,GAAGD,OAAA;MAAS,GAAGC;IAAW,IAAIA,UAAA,IAAcD,OAAA,GAC/DD,GAAA,KAAQ,cACjBF,IAAA,CAAKM,SAAA,GACHH,OAAA,IAAWC,UAAA,GAAa,GAAGD,OAAO,IAAIC,UAAU,KAAKA,UAAA,IAAcD,OAAA,GAC5DD,GAAA,KAAQ,QACjBF,IAAA,CAAKO,GAAA,GACHJ,OAAA,IAAWC,UAAA,GAAaR,WAAA,CAAYO,OAAA,EAASC,UAAU,IAAIA,UAAA,IAAcD,OAAA,GAE3EL,cAAA,CAAeU,IAAA,CAAKN,GAAG,KACvB,OAAOC,OAAA,IAAY,cACnB,OAAOC,UAAA,IAAe,aAEtBJ,IAAA,CAAKE,GAAG,IAAIL,oBAAA,CAAqBM,OAAA,EAASC,UAAU,IAGpDJ,IAAA,CAAKE,GAAG,IAAIE,UAAA;EAEhB;EAEA,OAAOJ,IAAA;AACT","ignoreList":[]}
+{"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":[]}

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

@@ -3,12 +3,23 @@ import { composeEventHandlers } from "@hanzogui/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 ? composeRefs(baseVal, overlayVal) : overlayVal || baseVal : isEventHandler.test(key) && typeof baseVal == "function" && typeof overlayVal == "function" ? base[key] = 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 ? 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;
 }

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;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,GAAAR,WAAA,CAAAO,OAAA,EAAAC,UAAA,IAAAA,UAAA,IAAAD,OAAA,GAAAL,cAAA,CAAAU,IAAA,CAAAN,GAAA,YAAAC,OAAA,yBAAAC,UAAA,iBAAAJ,IAAA,CAAAE,GAAA,IAAAL,oBAAA,CAAAM,OAAA,EAAAC,UAAA,IAAAJ,IAAA,CAAAE,GAAA,IAAAE,UAAA","ignoreList":[]}
+{"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":[]}

package/dist/esm/helpers/mergeVariants.mjs

@@ -1,12 +1,22 @@
 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,

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;MACpCE,UAAA,GAAaL,WAAA,CAAYG,GAAG;IAC9B,CAACC,aAAA,IAAiB,OAAOC,UAAA,IAAe,aAC1CH,QAAA,CAASC,GAAG,IAAIE,UAAA,GACPD,aAAA,IAAiB,CAACC,UAAA,GAC3BH,QAAA,CAASC,GAAG,IAAIC,aAAA,CAAcD,GAAG,IAE7BF,KAAA,KAAU,IACZC,QAAA,CAASC,GAAG,IAAIL,aAAA,CACdM,aAAA,EACAC,UAAA,EACAJ,KAAA,GAAQ,CACV,IAEAC,QAAA,CAASC,GAAG,IAAI;MACd,GAAGC,aAAA;MACH,GAAGC;IACL;EAGN;EAEA,OAAO;IACL,GAAGN,cAAA;IACH,GAAGG;EACL;AACF","ignoreList":[]}
+{"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":[]}

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

@@ -1,13 +1,23 @@
 var mergeVariants = function (parentVariants, ourVariants) {
-  var level = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0,
-    variants = {};
+  var level = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
+  var variants = {};
   for (var key in ourVariants) {
-    var 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
-    };
+    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,

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;IAAAE,QAAA;EAElB,SAAAC,GAAW,IAAAL,WAAO;IAChB,IAAAM,aAAM,GAAAP,cAAgB,GAAAM,GAAiB;MAAGE,UACpC,GAAAP,WAAa,CAAAK,GAAY;IAC3B,CAACC,aAAA,IAAiB,OAAOC,UAAA,IAAe,aAC1CH,QAAA,CAASC,GAAG,IAAIE,UAAA,GACPD,aAAA,IAAiB,CAACC,UAAA,GAC3BH,QAAA,CAASC,GAAG,IAAIC,aAAA,CAAcD,GAAG,IAE7BJ,KAAA,KAAU,IACZG,QAAA,CAASC,GAAG,IAAIP,aAAA,CAAAQ,aAAA,EAAAC,UAAA,EAAAN,KAAA,QAAAG,QAAA,CAAAC,GAAA;MACd,GAAAC,aAAA;MACA,GAAAC;IAAA;EACQ;EAGM,OACX;IAAA,GACHR,cAAG;IACL,GAAAK;EAGN;AAEA;AAAO,SACFN,aACA","ignoreList":[]}
+{"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":[]}

package/dist/esm/helpers/normalizeColor.mjs

@@ -1,11 +1,21 @@
 import { normalizeCSSColor, rgba } from "@hanzogui/normalize-css-color";
 const normalizeColor = (color, opacity) => {
-    if (color) return typeof color != "string" ? color : color === "transparent" ? "rgba(0, 0, 0, 0)" : typeof opacity == "number" && opacity < 1 ? `color-mix(in srgb, ${color} ${Math.round(opacity * 100)}%, transparent)` : color;
-  },
-  getRgba = color => {
-    if (typeof color != "string") return;
-    const colorNum = normalizeCSSColor(color);
-    if (colorNum != null) return rgba(colorNum);
-  };
+  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 };
 //# 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;IACzE,IAAKD,KAAA,EACL,OAAI,OAAOA,KAAA,IAAU,WAAiBA,KAAA,GAElCA,KAAA,KAAU,gBACL,qBAGL,OAAOC,OAAA,IAAY,YAAYA,OAAA,GAAU,IACpC,sBAAsBD,KAAK,IAAIE,IAAA,CAAKC,KAAA,CAAMF,OAAA,GAAU,GAAG,CAAC,oBAG1DD,KAAA;EACT;EAEaI,OAAA,GACXJ,KAAA,IAC+D;IAC/D,IAAI,OAAOA,KAAA,IAAU,UAAU;IAC/B,MAAMK,QAAA,GAAWR,iBAAA,CAAkBG,KAAK;IACxC,IAAIK,QAAA,IAAY,MACd,OAAOP,IAAA,CAAKO,QAAQ;EAExB","ignoreList":[]}
+{"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":[]}

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

@@ -1,22 +1,23 @@
 import { normalizeCSSColor, rgba } from "@hanzogui/normalize-css-color";
 import { rgba as rgba2 } from "@hanzogui/normalize-css-color";
 var normalizeColor = function (color, opacity) {
-    if (color) {
-      if (typeof color != "string" || color[0] === "$") return color;
-      var rgbaVal = getRgba(color);
-      if (rgbaVal) {
-        var colors = `${rgbaVal.r},${rgbaVal.g},${rgbaVal.b}`,
-          _ref;
-        return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${(_ref = opacity ?? rgbaVal.a) !== null && _ref !== void 0 ? _ref : 1})`;
-      }
-      return color;
-    }
-  },
-  getRgba = function (color) {
-    if (typeof color == "string") {
-      var colorNum = normalizeCSSColor(color);
-      if (colorNum != null) return rgba(colorNum);
-    }
-  };
+  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;
+};
+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;IACjD,IAAKD,KAAA,EAGL;MAAA,IADI,OAAOA,KAAA,IAAU,YACjBA,KAAA,CAAM,CAAC,MAAM,KAAK,OAAOA,KAAA;MAC7B,IAAIE,OAAA,GAAUC,OAAA,CAAQH,KAAK;MAC3B,IAAIE,OAAA,EAAS;QACT,IAAIE,MAAA,GAAS,GAAGF,OAAA,CAAQG,CAAC,IAAIH,OAAA,CAAQI,CAAC,IAAIJ,OAAA,CAAQK,CAAC;UAC/CC,IAAA;QACJ,OAAOP,OAAA,KAAY,IAAI,OAAOG,MAAM,MAAM,QAAQA,MAAM,KAAKI,IAAA,GAAOP,OAAA,IAAmDC,OAAA,CAAQO,CAAA,MAAO,QAAQD,IAAA,KAAS,SAASA,IAAA,GAAO,CAAC;MAC5K;MACA,OAAOR,KAAA;IAAA;EACX;EACWG,OAAA,GAAU,SAAAA,CAASH,KAAA,EAAO;IAEjC,IAAI,OAAOA,KAAA,IAAU,UACrB;MAAA,IAAIU,QAAA,GAAWd,iBAAA,CAAkBI,KAAK;MACtC,IAAIU,QAAA,IAAY,MACZ,OAAOb,IAAA,CAAKa,QAAQ;IAAA;EAE5B","ignoreList":[]}
+{"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":[]}