tamagui 1.135.1 → 1.135.2
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.
- package/dist/native.js +4 -1
- package/dist/native.js.map +2 -2
- package/dist/test.native.js +4 -1
- package/dist/test.native.js.map +2 -2
- package/package.json +55 -55
package/dist/test.native.js
CHANGED
|
@@ -3401,7 +3401,10 @@ var require_mergeProps_native = __commonJS({
|
|
|
3401
3401
|
];
|
|
3402
3402
|
var out = {};
|
|
3403
3403
|
for (var key in defaultProps) key in props || (out[key] = defaultProps[key]);
|
|
3404
|
-
for (var key1 in contextProps) key1 in props
|
|
3404
|
+
for (var key1 in contextProps) if (!(key1 in props)) {
|
|
3405
|
+
var contextValue = contextProps[key1];
|
|
3406
|
+
contextValue !== void 0 && (out[key1] = contextValue);
|
|
3407
|
+
}
|
|
3405
3408
|
for (var key2 in props) mergeProp(out, defaultProps, props, key2), contextProps && key2 in contextProps && (overriddenContext || (overriddenContext = {}), overriddenContext[key2] = props[key2]);
|
|
3406
3409
|
return [
|
|
3407
3410
|
out,
|