@tamagui/core 3.0.0-beta.1342.1 → 3.0.0-beta.1348.1

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 (3) hide show
  1. package/dist/native.cjs +17 -23
  2. package/dist/test.native.cjs +17 -23
  3. package/package.json +12 -12
package/dist/native.cjs CHANGED
@@ -94,38 +94,32 @@ function isPlainObject(value) {
94
94
  }
95
95
  //#endregion
96
96
  //#region ../web/dist/esm/helpers/mergeProps.native.js
97
+ var mergeLayer = function(out, layer) {
98
+ for (var key in layer) {
99
+ var value = layer[key];
100
+ if (value === void 0 && key in out) continue;
101
+ out[key] = value;
102
+ }
103
+ };
97
104
  var mergeProps = function(defaultProps, props) {
98
105
  var out = {};
99
- for (var key in defaultProps) {
100
- if (key in props && props[key] !== void 0) continue;
101
- out[key] = defaultProps[key];
102
- }
103
- for (var key1 in props) {
104
- if (props[key1] === void 0 && key1 in defaultProps) continue;
105
- out[key1] = props[key1];
106
- }
106
+ mergeLayer(out, defaultProps);
107
+ mergeLayer(out, props);
107
108
  return out;
108
109
  };
109
110
  var mergeComponentProps = function(defaultProps, contextProps, props) {
110
111
  var overriddenContext = null;
111
112
  if (!defaultProps && !contextProps) return [props, overriddenContext];
112
- if (defaultProps && !contextProps) return [mergeProps(defaultProps, props), overriddenContext];
113
113
  var out = {};
114
- for (var key in defaultProps) {
115
- if (key in props && props[key] !== void 0) continue;
116
- out[key] = defaultProps[key];
117
- }
118
- for (var key1 in contextProps) {
119
- if (key1 in props && props[key1] !== void 0) continue;
120
- var contextValue = contextProps[key1];
121
- if (contextValue !== void 0) out[key1] = contextValue;
122
- }
123
- for (var key2 in props) {
124
- if (props[key2] === void 0 && (defaultProps && key2 in defaultProps || contextProps && key2 in contextProps)) continue;
125
- out[key2] = props[key2];
126
- if (contextProps && key2 in contextProps) {
114
+ if (defaultProps) mergeLayer(out, defaultProps);
115
+ if (contextProps) mergeLayer(out, contextProps);
116
+ for (var key in props) {
117
+ var value = props[key];
118
+ if (value === void 0 && key in out) continue;
119
+ out[key] = value;
120
+ if (contextProps && key in contextProps) {
127
121
  overriddenContext || (overriddenContext = {});
128
- overriddenContext[key2] = props[key2];
122
+ overriddenContext[key] = value;
129
123
  }
130
124
  }
131
125
  return [out, overriddenContext];
package/dist/test.native.cjs CHANGED
@@ -96,38 +96,32 @@ function isPlainObject(value) {
96
96
  }
97
97
  //#endregion
98
98
  //#region ../web/dist/esm/helpers/mergeProps.native.js
99
+ var mergeLayer = function(out, layer) {
100
+ for (var key in layer) {
101
+ var value = layer[key];
102
+ if (value === void 0 && key in out) continue;
103
+ out[key] = value;
104
+ }
105
+ };
99
106
  var mergeProps = function(defaultProps, props) {
100
107
  var out = {};
101
- for (var key in defaultProps) {
102
- if (key in props && props[key] !== void 0) continue;
103
- out[key] = defaultProps[key];
104
- }
105
- for (var key1 in props) {
106
- if (props[key1] === void 0 && key1 in defaultProps) continue;
107
- out[key1] = props[key1];
108
- }
108
+ mergeLayer(out, defaultProps);
109
+ mergeLayer(out, props);
109
110
  return out;
110
111
  };
111
112
  var mergeComponentProps = function(defaultProps, contextProps, props) {
112
113
  var overriddenContext = null;
113
114
  if (!defaultProps && !contextProps) return [props, overriddenContext];
114
- if (defaultProps && !contextProps) return [mergeProps(defaultProps, props), overriddenContext];
115
115
  var out = {};
116
- for (var key in defaultProps) {
117
- if (key in props && props[key] !== void 0) continue;
118
- out[key] = defaultProps[key];
119
- }
120
- for (var key1 in contextProps) {
121
- if (key1 in props && props[key1] !== void 0) continue;
122
- var contextValue = contextProps[key1];
123
- if (contextValue !== void 0) out[key1] = contextValue;
124
- }
125
- for (var key2 in props) {
126
- if (props[key2] === void 0 && (defaultProps && key2 in defaultProps || contextProps && key2 in contextProps)) continue;
127
- out[key2] = props[key2];
128
- if (contextProps && key2 in contextProps) {
116
+ if (defaultProps) mergeLayer(out, defaultProps);
117
+ if (contextProps) mergeLayer(out, contextProps);
118
+ for (var key in props) {
119
+ var value = props[key];
120
+ if (value === void 0 && key in out) continue;
121
+ out[key] = value;
122
+ if (contextProps && key in contextProps) {
129
123
  overriddenContext || (overriddenContext = {});
130
- overriddenContext[key2] = props[key2];
124
+ overriddenContext[key] = value;
131
125
  }
132
126
  }
133
127
  return [out, overriddenContext];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/core",
3
- "version": "3.0.0-beta.1342.1",
3
+ "version": "3.0.0-beta.1348.1",
4
4
  "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
5
5
  "license": "MIT",
6
6
  "author": {
@@ -137,19 +137,19 @@
137
137
  "clean:build": "tamagui-build clean:build"
138
138
  },
139
139
  "dependencies": {
140
- "@tamagui/compose-refs": "3.0.0-beta.1342.1",
141
- "@tamagui/constants": "3.0.0-beta.1342.1",
142
- "@tamagui/helpers": "3.0.0-beta.1342.1",
143
- "@tamagui/react-native-media-driver": "3.0.0-beta.1342.1",
144
- "@tamagui/react-native-use-pressable": "3.0.0-beta.1342.1",
145
- "@tamagui/use-element-layout": "3.0.0-beta.1342.1",
146
- "@tamagui/use-event": "3.0.0-beta.1342.1",
147
- "@tamagui/web": "3.0.0-beta.1342.1"
140
+ "@tamagui/compose-refs": "3.0.0-beta.1348.1",
141
+ "@tamagui/constants": "3.0.0-beta.1348.1",
142
+ "@tamagui/helpers": "3.0.0-beta.1348.1",
143
+ "@tamagui/react-native-media-driver": "3.0.0-beta.1348.1",
144
+ "@tamagui/react-native-use-pressable": "3.0.0-beta.1348.1",
145
+ "@tamagui/use-element-layout": "3.0.0-beta.1348.1",
146
+ "@tamagui/use-event": "3.0.0-beta.1348.1",
147
+ "@tamagui/web": "3.0.0-beta.1348.1"
148
148
  },
149
149
  "devDependencies": {
150
- "@tamagui/build": "3.0.0-beta.1342.1",
151
- "@tamagui/native-bundle": "3.0.0-beta.1342.1",
152
- "@tamagui/react-native-web-lite": "3.0.0-beta.1342.1",
150
+ "@tamagui/build": "3.0.0-beta.1348.1",
151
+ "@tamagui/native-bundle": "3.0.0-beta.1348.1",
152
+ "@tamagui/react-native-web-lite": "3.0.0-beta.1348.1",
153
153
  "@testing-library/react": "^16.1.0",
154
154
  "csstype": "^3.0.10",
155
155
  "react": "19.2.3",