@tamagui/core 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 +10 -10
package/dist/test.native.js
CHANGED
|
@@ -2296,7 +2296,10 @@ var require_mergeProps_native = __commonJS({
|
|
|
2296
2296
|
];
|
|
2297
2297
|
var out = {};
|
|
2298
2298
|
for (var key in defaultProps) key in props || (out[key] = defaultProps[key]);
|
|
2299
|
-
for (var key1 in contextProps) key1 in props
|
|
2299
|
+
for (var key1 in contextProps) if (!(key1 in props)) {
|
|
2300
|
+
var contextValue = contextProps[key1];
|
|
2301
|
+
contextValue !== void 0 && (out[key1] = contextValue);
|
|
2302
|
+
}
|
|
2300
2303
|
for (var key2 in props) mergeProp(out, defaultProps, props, key2), contextProps && key2 in contextProps && (overriddenContext || (overriddenContext = {}), overriddenContext[key2] = props[key2]);
|
|
2301
2304
|
return [
|
|
2302
2305
|
out,
|