npm - @tamagui/core - Versions diffs - 1.126.2 → 1.126.4-1746355141077 - Mend

@tamagui/core 1.126.2 → 1.126.4-1746355141077

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

package/dist/native.js CHANGED Viewed

@@ -5898,14 +5898,16 @@ var require_mergeProps_native = __commonJS({
     };
     function mergeProp(out, a, b, key, inverseShorthands) {
       var longhand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null, val = a[key];
-      if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
-        out[key] = {
-          ...out[key],
-          ...val
-        };
-        return;
+      if (!(b && (key in b || longhand && longhand in b))) {
+        if (key in import_pseudoDescriptors.pseudoDescriptors || import_useMedia.mediaKeys.has(key)) {
+          out[key] = {
+            ...out[key],
+            ...val
+          };
+          return;
+        }
+        out[longhand || key] = val;
       }
-      b && (key in b || longhand && longhand in b) || (out[longhand || key] = val);
     }
   }
 });