@tamagui/web 1.135.0 → 1.135.2

package/dist/cjs/helpers/mergeProps.cjs

@@ -37,7 +37,11 @@ const mergeProps = (defaultProps, props) => {
     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) key in props || (out[key] = contextProps[key]);
+    for (const key in contextProps) {
+      if (key in props) continue;
+      const contextValue = contextProps[key];
+      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];
   };

package/dist/cjs/helpers/mergeProps.js

@@ -35,8 +35,11 @@ const mergeProps = (defaultProps, props) => {
   const out = {};
   for (const key in defaultProps)
     key in props || (out[key] = defaultProps[key]);
-  for (const key in contextProps)
-    key in props || (out[key] = contextProps[key]);
+  for (const key in contextProps) {
+    if (key in props) continue;
+    const contextValue = contextProps[key];
+    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];

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/mergeProps.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBA,+BAAkC;AAI3B,MAAM,aAAa,CAAC,cAAsB,UAAkB;AACjE,QAAM,MAAoB,CAAC;AAU3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG7B,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG;AAGzC,SAAO;AACT,GAGa,sBAAsB,CAEjC,cACA,cAEA,UACG;AACH,MAAI,oBAAyC;AAE7C,MAAI,CAAC,gBAAgB,CAAC;AACpB,WAAO,CAAC,OAAO,iBAAiB;AAGlC,MAAI,gBAAgB,CAAC;AACnB,WAAO,CAAC,WAAW,cAAc,KAAK,GAAG,iBAAiB;AAM5D,QAAM,MAAoB,CAAC;AAK3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAI7B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG7B,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG,GACnC,gBAAgB,OAAO,iBACzB,sBAAsB,CAAC,GACvB,kBAAkB,GAAG,IAAI,MAAM,GAAG;AAItC,SAAO,CAAC,KAAK,iBAAiB;AAChC;AAEA,SAAS,UACP,KACA,cACA,OACA,KACA;AACA,MAAI,MAAM,MAAM,GAAG;AAGnB,MACE,gBACA,OAAO,iBACN,OAAO,8CAAqB,IAAI,CAAC,MAAM,QACxC,OACA,OAAO,OAAQ,UACf;AACA,UAAM,aAAa,aAAa,GAAG;AACnC,IAAI,cAAc,OAAO,cAAe,aAEtC,MAAM,WAAW,YAAY,GAAG;AAAA,EAEpC;AAEA,MAAI,GAAG,IAAI;AACb;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBA,+BAAkC;AAI3B,MAAM,aAAa,CAAC,cAAsB,UAAkB;AACjE,QAAM,MAAoB,CAAC;AAU3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG7B,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG;AAGzC,SAAO;AACT,GAGa,sBAAsB,CAEjC,cACA,cAEA,UACG;AACH,MAAI,oBAAyC;AAE7C,MAAI,CAAC,gBAAgB,CAAC;AACpB,WAAO,CAAC,OAAO,iBAAiB;AAGlC,MAAI,gBAAgB,CAAC;AACnB,WAAO,CAAC,WAAW,cAAc,KAAK,GAAG,iBAAiB;AAM5D,QAAM,MAAoB,CAAC;AAK3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAI7B,aAAW,OAAO,cAAc;AAC9B,QAAI,OAAO,MAAO;AAClB,UAAM,eAAe,aAAa,GAAG;AAErC,IAAI,iBAAiB,WACnB,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG,GACnC,gBAAgB,OAAO,iBACzB,sBAAsB,CAAC,GACvB,kBAAkB,GAAG,IAAI,MAAM,GAAG;AAItC,SAAO,CAAC,KAAK,iBAAiB;AAChC;AAEA,SAAS,UACP,KACA,cACA,OACA,KACA;AACA,MAAI,MAAM,MAAM,GAAG;AAGnB,MACE,gBACA,OAAO,iBACN,OAAO,8CAAqB,IAAI,CAAC,MAAM,QACxC,OACA,OAAO,OAAQ,UACf;AACA,UAAM,aAAa,aAAa,GAAG;AACnC,IAAI,cAAc,OAAO,cAAe,aAEtC,MAAM,WAAW,YAAY,GAAG;AAAA,EAEpC;AAEA,MAAI,GAAG,IAAI;AACb;",
   "names": []
 }

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

@@ -42,7 +42,10 @@ var import_pseudoDescriptors = require("./pseudoDescriptors"), mergeProps = func
   for (var key in defaultProps)
     key in props || (out[key] = defaultProps[key]);
   for (var key1 in contextProps)
-    key1 in props || (out[key1] = contextProps[key1]);
+    if (!(key1 in props)) {
+      var contextValue = contextProps[key1];
+      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 [

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/mergeProps.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAeI,+BAAkC,gCAC3B,aAAa,SAAS,cAAc,OAAO;AAClD,MAAI,MAAM,CAAC;AAOX,WAAQ,OAAO;AACX,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAE/B,WAAQ,QAAQ;AACZ,cAAU,KAAK,cAAc,OAAO,IAAI;AAE5C,SAAO;AACX,GAEW,sBAAsB,SACjC,cAAc,cACd,OAAO;AACH,MAAI,oBAAoB;AACxB,MAAI,CAAC,gBAAgB,CAAC;AAClB,WAAO;AAAA,MACH;AAAA,MACA;AAAA,IACJ;AAEJ,MAAI,gBAAgB,CAAC;AACjB,WAAO;AAAA,MACH,WAAW,cAAc,KAAK;AAAA,MAC9B;AAAA,IACJ;AAIJ,MAAI,MAAM,CAAC;AAGX,WAAQ,OAAO;AACX,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG/B,WAAQ,QAAQ;AACZ,IAAI,QAAQ,UACZ,IAAI,IAAI,IAAI,aAAa,IAAI;AAEjC,WAAQ,QAAQ;AACZ,cAAU,KAAK,cAAc,OAAO,IAAI,GACpC,gBAAgB,QAAQ,iBACxB,sBAAsB,oBAAoB,CAAC,IAC3C,kBAAkB,IAAI,IAAI,MAAM,IAAI;AAG5C,SAAO;AAAA,IACH;AAAA,IACA;AAAA,EACJ;AACJ;AACA,SAAS,UAAU,KAAK,cAAc,OAAO,KAAK;AAC9C,MAAI,MAAM,MAAM,GAAG;AAEnB,MAAI,gBAAgB,OAAO,iBAAiB,OAAO,8CAAqB,IAAI,CAAC,MAAM,QAAQ,OAAO,OAAO,OAAQ,UAAU;AACvH,QAAI,aAAa,aAAa,GAAG;AACjC,IAAI,cAAc,OAAO,cAAe,aAEpC,MAAM,WAAW,YAAY,GAAG;AAAA,EAExC;AACA,MAAI,GAAG,IAAI;AACf;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAeI,+BAAkC,gCAC3B,aAAa,SAAS,cAAc,OAAO;AAClD,MAAI,MAAM,CAAC;AAOX,WAAQ,OAAO;AACX,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAE/B,WAAQ,QAAQ;AACZ,cAAU,KAAK,cAAc,OAAO,IAAI;AAE5C,SAAO;AACX,GAEW,sBAAsB,SACjC,cAAc,cACd,OAAO;AACH,MAAI,oBAAoB;AACxB,MAAI,CAAC,gBAAgB,CAAC;AAClB,WAAO;AAAA,MACH;AAAA,MACA;AAAA,IACJ;AAEJ,MAAI,gBAAgB,CAAC;AACjB,WAAO;AAAA,MACH,WAAW,cAAc,KAAK;AAAA,MAC9B;AAAA,IACJ;AAIJ,MAAI,MAAM,CAAC;AAGX,WAAQ,OAAO;AACX,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG/B,WAAQ,QAAQ;AACZ,QAAI,UAAQ,QACZ;AAAA,UAAI,eAAe,aAAa,IAAI;AAEpC,MAAI,iBAAiB,WACjB,IAAI,IAAI,IAAI;AAAA;AAGpB,WAAQ,QAAQ;AACZ,cAAU,KAAK,cAAc,OAAO,IAAI,GACpC,gBAAgB,QAAQ,iBACxB,sBAAsB,oBAAoB,CAAC,IAC3C,kBAAkB,IAAI,IAAI,MAAM,IAAI;AAG5C,SAAO;AAAA,IACH;AAAA,IACA;AAAA,EACJ;AACJ;AACA,SAAS,UAAU,KAAK,cAAc,OAAO,KAAK;AAC9C,MAAI,MAAM,MAAM,GAAG;AAEnB,MAAI,gBAAgB,OAAO,iBAAiB,OAAO,8CAAqB,IAAI,CAAC,MAAM,QAAQ,OAAO,OAAO,OAAQ,UAAU;AACvH,QAAI,aAAa,aAAa,GAAG;AACjC,IAAI,cAAc,OAAO,cAAe,aAEpC,MAAM,WAAW,YAAY,GAAG;AAAA,EAExC;AACA,MAAI,GAAG,IAAI;AACf;",
   "names": []
 }

package/dist/esm/helpers/mergeProps.js

@@ -15,8 +15,11 @@ const mergeProps = (defaultProps, props) => {
   const out = {};
   for (const key in defaultProps)
     key in props || (out[key] = defaultProps[key]);
-  for (const key in contextProps)
-    key in props || (out[key] = contextProps[key]);
+  for (const key in contextProps) {
+    if (key in props) continue;
+    const contextValue = contextProps[key];
+    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];

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/mergeProps.ts"],
-  "mappings": "AAiBA,SAAS,yBAAyB;AAI3B,MAAM,aAAa,CAAC,cAAsB,UAAkB;AACjE,QAAM,MAAoB,CAAC;AAU3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG7B,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG;AAGzC,SAAO;AACT,GAGa,sBAAsB,CAEjC,cACA,cAEA,UACG;AACH,MAAI,oBAAyC;AAE7C,MAAI,CAAC,gBAAgB,CAAC;AACpB,WAAO,CAAC,OAAO,iBAAiB;AAGlC,MAAI,gBAAgB,CAAC;AACnB,WAAO,CAAC,WAAW,cAAc,KAAK,GAAG,iBAAiB;AAM5D,QAAM,MAAoB,CAAC;AAK3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAI7B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG7B,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG,GACnC,gBAAgB,OAAO,iBACzB,sBAAsB,CAAC,GACvB,kBAAkB,GAAG,IAAI,MAAM,GAAG;AAItC,SAAO,CAAC,KAAK,iBAAiB;AAChC;AAEA,SAAS,UACP,KACA,cACA,OACA,KACA;AACA,MAAI,MAAM,MAAM,GAAG;AAGnB,MACE,gBACA,OAAO,iBACN,OAAO,qBAAqB,IAAI,CAAC,MAAM,QACxC,OACA,OAAO,OAAQ,UACf;AACA,UAAM,aAAa,aAAa,GAAG;AACnC,IAAI,cAAc,OAAO,cAAe,aAEtC,MAAM,WAAW,YAAY,GAAG;AAAA,EAEpC;AAEA,MAAI,GAAG,IAAI;AACb;",
+  "mappings": "AAiBA,SAAS,yBAAyB;AAI3B,MAAM,aAAa,CAAC,cAAsB,UAAkB;AACjE,QAAM,MAAoB,CAAC;AAU3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAG7B,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG;AAGzC,SAAO;AACT,GAGa,sBAAsB,CAEjC,cACA,cAEA,UACG;AACH,MAAI,oBAAyC;AAE7C,MAAI,CAAC,gBAAgB,CAAC;AACpB,WAAO,CAAC,OAAO,iBAAiB;AAGlC,MAAI,gBAAgB,CAAC;AACnB,WAAO,CAAC,WAAW,cAAc,KAAK,GAAG,iBAAiB;AAM5D,QAAM,MAAoB,CAAC;AAK3B,aAAW,OAAO;AAChB,IAAI,OAAO,UACX,IAAI,GAAG,IAAI,aAAa,GAAG;AAI7B,aAAW,OAAO,cAAc;AAC9B,QAAI,OAAO,MAAO;AAClB,UAAM,eAAe,aAAa,GAAG;AAErC,IAAI,iBAAiB,WACnB,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,aAAW,OAAO;AAChB,cAAU,KAAK,cAAc,OAAO,GAAG,GACnC,gBAAgB,OAAO,iBACzB,sBAAsB,CAAC,GACvB,kBAAkB,GAAG,IAAI,MAAM,GAAG;AAItC,SAAO,CAAC,KAAK,iBAAiB;AAChC;AAEA,SAAS,UACP,KACA,cACA,OACA,KACA;AACA,MAAI,MAAM,MAAM,GAAG;AAGnB,MACE,gBACA,OAAO,iBACN,OAAO,qBAAqB,IAAI,CAAC,MAAM,QACxC,OACA,OAAO,OAAQ,UACf;AACA,UAAM,aAAa,aAAa,GAAG;AACnC,IAAI,cAAc,OAAO,cAAe,aAEtC,MAAM,WAAW,YAAY,GAAG;AAAA,EAEpC;AAEA,MAAI,GAAG,IAAI;AACb;",
   "names": []
 }

package/dist/esm/helpers/mergeProps.mjs

@@ -11,7 +11,11 @@ const mergeProps = (defaultProps, props) => {
     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) key in props || (out[key] = contextProps[key]);
+    for (const key in contextProps) {
+      if (key in props) continue;
+      const contextValue = contextProps[key];
+      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];
   };

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

@@ -1 +1 @@
-{"version":3,"names":["pseudoDescriptors","mergeProps","defaultProps","props","out","key","mergeProp","mergeComponentProps","contextProps","overriddenContext","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,EACZH,GAAA,IAAOF,KAAA,KACXC,GAAA,CAAIC,GAAG,IAAIG,YAAA,CAAaH,GAAG;IAG7B,WAAWA,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,IAAIK,GAAA,GAAMP,KAAA,CAAME,GAAG;EAGnB,IACEH,YAAA,IACAG,GAAA,IAAOH,YAAA,KACNG,GAAA,IAAOL,iBAAA,IAAqBK,GAAA,CAAI,CAAC,MAAM,QACxCK,GAAA,IACA,OAAOA,GAAA,IAAQ,UACf;IACA,MAAMC,UAAA,GAAaT,YAAA,CAAaG,GAAG;IAC/BM,UAAA,IAAc,OAAOA,UAAA,IAAe,aAEtCD,GAAA,GAAMT,UAAA,CAAWU,UAAA,EAAYD,GAAG;EAEpC;EAEAN,GAAA,CAAIC,GAAG,IAAIK,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;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":[]}

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

@@ -11,7 +11,10 @@ var mergeProps = function (defaultProps, props) {
     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) key1 in props || (out[key1] = contextProps[key1]);
+    for (var key1 in contextProps) if (!(key1 in props)) {
+      var contextValue = contextProps[key1];
+      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];
   };

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

@@ -1 +1 @@
-{"version":3,"names":["pseudoDescriptors","mergeProps","defaultProps","props","out","key","key1","mergeProp","mergeComponentProps","contextProps","overriddenContext","key2"],"sources":["../../../src/helpers/mergeProps.ts"],"sourcesContent":[null],"mappings":"AAiBA,SAASA,iBAAA,QAAyB;AAI3B,IAAAC,UAAM,YAAAA,CAAcC,YAAsB,EAAAC,KAAkB;IACjE,IAAAC,GAAM,KAAoB;IAU1B,SAAAC,GAAW,IAAAH,YAAO,EACZG,GAAA,IAAOF,KAAA,KACXC,GAAA,CAAIC,GAAG,IAAIH,YAAA,CAAaG,GAAG;IAG7B,SAAAC,IAAW,IAAAH,KAAO,EAChBI,SAAA,CAAUH,GAAA,EAAKF,YAAA,EAAcC,KAAA,EAAOG,IAAG;IAGzC,OAAOF,GAAA;EACT;EAGaI,mBAAA,GAAsB,SAAAA,CAEjCN,YACA,EAAAO,YAEA,EAAAN,KACG;IACH,IAAIO,iBAAA,GAAyC;IAE7C,IAAI,CAACR,YAAA,IAAgB,CAACO,YAAA,EACpB,OAAO,CAGLN,KAAA,EACFO,iBAAmB,CAMrB;IAKA,IAAAR,YAAW,IAAO,CAAAO,YAAA,EACZ,OAAO,CAKbR,UAAW,CAAAC,YAAO,EAAAC,KAAA,GACZO,iBACJ,CAGF;IACE,IAAAN,GAAA,KAAU;IAOZ,SAAQC,GAAA,IAAKH,YAAA,EACfG,GAAA,IAAAF,KAAA,KAAAC,GAAA,CAAAC,GAAA,IAAAH,YAAA,CAAAG,GAAA;IAEA,SAASC,IAAA,IACPG,YACA,EAIAH,IAAI,IAAMH,KAAA,KAASC,GAAA,CAAAE,IAAA,IAAAG,YAAA,CAAAH,IAAA;IAGnB,KACE,IAAAK,IAAA,IAAAR,KACA,EAKAI,SAAM,CAAAH,GAAA,EAAAF,YAAa,EAAAC,KAAa,EAAGQ,IAAA,GAAAF,YAAA,IAAAE,IAAA,IAAAF,YAAA,KAAAC,iBAAA,KAAAA,iBAAA,QAAAA,iBAAA,CAAAC,IAAA,IAAAR,KAAA,CAAAQ,IAAA;IACnC,OAAI,CAINP,GAAA,EAEAM,iBAAW,CACb","ignoreList":[]}
+{"version":3,"names":["pseudoDescriptors","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,IAAAC,UAAM,YAAAA,CAAcC,YAAsB,EAAAC,KAAkB;IACjE,IAAAC,GAAM,KAAoB;IAU1B,SAAAC,GAAW,IAAAH,YAAO,EACZG,GAAA,IAAOF,KAAA,KACXC,GAAA,CAAIC,GAAG,IAAIH,YAAA,CAAaG,GAAG;IAG7B,SAAAC,IAAW,IAAAH,KAAO,EAChBI,SAAA,CAAUH,GAAA,EAAKF,YAAA,EAAcC,KAAA,EAAOG,IAAG;IAGzC,OAAOF,GAAA;EACT;EAGaI,mBAAA,GAAsB,SAAAA,CAEjCN,YACA,EAAAO,YAEA,EAAAN,KACG;IACH,IAAIO,iBAAA,GAAyC;IAE7C,IAAI,CAACR,YAAA,IAAgB,CAACO,YAAA,EACpB,OAAO,CAGLN,KAAA,EACFO,iBAAmB,CAMrB;IAKA,IAAAR,YAAW,IAAO,CAAAO,YAAA,EACZ,OAAO,CAKbR,UAAW,CAAAC,YAAO,EAAAC,KAAc,GAC9BO,iBAAkB,CAClB;IAEA,IAAIN,GAAA;IAGN,SAAAC,GAAA,IAAAH,YAAA,EAEAG,GAAA,IAAAF,KAAW,KAAOC,GAAA,CAAAC,GAAA,IAAAH,YAAA,CAAAG,GAAA;IAChB,SAAAC,IAAU,IAAKG,YAAA,EAOjB,MAAQH,IAAA,IAAKH,KAAA;MACf,IAAAQ,YAAA,GAAAF,YAAA,CAAAH,IAAA;MAEAK,YAAS,KACP,KACA,MAAAP,GAAA,CACAE,IAAA,IACAK,YACA;IACA;IAGA,KACE,IAAAC,IAAA,IAAAT,KACA,EAKAI,SAAM,CAAAH,GAAA,EAAAF,YAAa,EAAAC,KAAa,EAAGS,IAAA,GAAAH,YAAA,IAAAG,IAAA,IAAAH,YAAA,KAAAC,iBAAA,KAAAA,iBAAA,QAAAA,iBAAA,CAAAE,IAAA,IAAAT,KAAA,CAAAS,IAAA;IACnC,OAAI,CAINR,GAAA,EAEAM,iBAAW,CACb","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.135.0",
+  "version": "1.135.2",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,16 +27,16 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.135.0",
-    "@tamagui/constants": "1.135.0",
-    "@tamagui/helpers": "1.135.0",
-    "@tamagui/is-equal-shallow": "1.135.0",
-    "@tamagui/normalize-css-color": "1.135.0",
-    "@tamagui/timer": "1.135.0",
-    "@tamagui/types": "1.135.0",
-    "@tamagui/use-did-finish-ssr": "1.135.0",
-    "@tamagui/use-event": "1.135.0",
-    "@tamagui/use-force-update": "1.135.0"
+    "@tamagui/compose-refs": "1.135.2",
+    "@tamagui/constants": "1.135.2",
+    "@tamagui/helpers": "1.135.2",
+    "@tamagui/is-equal-shallow": "1.135.2",
+    "@tamagui/normalize-css-color": "1.135.2",
+    "@tamagui/timer": "1.135.2",
+    "@tamagui/types": "1.135.2",
+    "@tamagui/use-did-finish-ssr": "1.135.2",
+    "@tamagui/use-event": "1.135.2",
+    "@tamagui/use-force-update": "1.135.2"
   },
   "peerDependencies": {
     "react": "*",
@@ -44,7 +44,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.135.0",
+    "@tamagui/build": "1.135.2",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",

package/src/helpers/mergeProps.ts

@@ -76,7 +76,11 @@ export const mergeComponentProps = (
   // styled context props go after defaultProps but before props
   for (const key in contextProps) {
     if (key in props) continue
-    out[key] = contextProps[key]
+    const contextValue = contextProps[key]
+    // don't merge undefined context values to preserve inheritance
+    if (contextValue !== undefined) {
+      out[key] = contextValue
+    }
   }
 
   for (const key in props) {

package/types/helpers/mergeProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE9C,eAAO,MAAM,UAAU,GAAI,cAAc,MAAM,EAAE,OAAO,MAAM,iBAqB7D,CAAA;AAGD,eAAO,MAAM,mBAAmB,GAE9B,cAAc,MAAM,GAAG,IAAI,GAAG,SAAS,EACvC,cAAc,MAAM,GAAG,SAAS,EAEhC,OAAO,MAAM,2EAwCd,CAAA"}
+{"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAE9C,eAAO,MAAM,UAAU,GAAI,cAAc,MAAM,EAAE,OAAO,MAAM,iBAqB7D,CAAA;AAGD,eAAO,MAAM,mBAAmB,GAE9B,cAAc,MAAM,GAAG,IAAI,GAAG,SAAS,EACvC,cAAc,MAAM,GAAG,SAAS,EAEhC,OAAO,MAAM,2EA4Cd,CAAA"}