@tamagui/core 1.126.4 → 1.126.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/native.js +9 -7
  2. package/dist/native.js.map +1 -1
  3. package/dist/test.native.js +9 -7
  4. package/dist/test.native.js.map +1 -1
  5. package/package.json +7 -7
package/dist/test.native.js CHANGED
@@ -5529,14 +5529,16 @@ var require_mergeProps_native = __commonJS({
5529
5529
  };
5530
5530
  function mergeProp(out, a, b, key, inverseShorthands) {
5531
5531
  var longhand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null, val = a[key];
5532
- if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
5533
- out[key] = {
5534
- ...out[key],
5535
- ...val
5536
- };
5537
- return;
5532
+ if (!(b && (key in b || longhand && longhand in b))) {
5533
+ if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
5534
+ out[key] = {
5535
+ ...out[key],
5536
+ ...val
5537
+ };
5538
+ return;
5539
+ }
5540
+ out[longhand || key] = val;
5538
5541
  }
5539
- b && (key in b || longhand && longhand in b) || (out[longhand || key] = val);
5540
5542
  }
5541
5543
  }
5542
5544
  });