react-native-windows 0.74.10 → 0.74.12

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 (50) hide show
  1. package/Common/Common.vcxproj +8 -0
  2. package/Directory.Build.targets +5 -0
  3. package/Folly/Folly.vcxproj +10 -2
  4. package/Folly/Folly.vcxproj.filters +0 -7
  5. package/Libraries/Components/TextInput/TextInput.js +6 -3
  6. package/Libraries/Components/TextInput/TextInput.windows.js +6 -3
  7. package/Libraries/Core/ReactNativeVersion.js +1 -1
  8. package/Libraries/Text/Text.windows.js +1 -0
  9. package/Microsoft.ReactNative/Composition.Input.idl +3 -3
  10. package/Microsoft.ReactNative/CompositionSwitcher.idl +1 -0
  11. package/Microsoft.ReactNative/Fabric/Composition/ComponentViewRegistry.cpp +3 -0
  12. package/Microsoft.ReactNative/Fabric/Composition/Composition.Input.cpp +2 -2
  13. package/Microsoft.ReactNative/Fabric/Composition/Composition.Input.h +4 -4
  14. package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp +10 -0
  15. package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.cpp +16 -27
  16. package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.h +1 -1
  17. package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp +85 -48
  18. package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h +4 -0
  19. package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.cpp +19 -15
  20. package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.h +4 -2
  21. package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.cpp +10 -0
  22. package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.h +3 -0
  23. package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp +42 -17
  24. package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.h +3 -1
  25. package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +42 -5
  26. package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +22 -16
  27. package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp +30 -6
  28. package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h +2 -0
  29. package/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp +5 -0
  30. package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +3 -2
  31. package/Microsoft.ReactNative/packages.lock.json +10 -0
  32. package/PropertySheets/ARM64EC.props +13 -0
  33. package/PropertySheets/Application/ARM64EC.props +13 -0
  34. package/PropertySheets/DynamicLibrary/ARM64EC.props +13 -0
  35. package/PropertySheets/Generated/PackageVersion.g.props +3 -3
  36. package/PropertySheets/JSEngine.props +2 -0
  37. package/PropertySheets/StaticLibrary/ARM64EC.props +13 -0
  38. package/ReactCommon/ReactCommon.vcxproj +9 -1
  39. package/ReactCommon/ReactCommon.vcxproj.filters +16 -12
  40. package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/algorithm/CalculateLayout.cpp +2 -0
  41. package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/config/Config.cpp +140 -0
  42. package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/config/Config.h +92 -0
  43. package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/node/LayoutResults.cpp +48 -0
  44. package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/node/LayoutResults.h +122 -0
  45. package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/node/Node.cpp +366 -0
  46. package/Scripts/OfficeReact.Win32.nuspec +16 -18
  47. package/Scripts/StripAdditionalPlatformsFromNuspec.ps1 +1 -1
  48. package/Scripts/Tfs/Layout-MSRN-Headers.ps1 +6 -6
  49. package/fmt/fmt.vcxproj +9 -1
  50. package/package.json +13 -13
@@ -0,0 +1,366 @@
1
+ /*
2
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
3
+ *
4
+ * This source code is licensed under the MIT license found in the
5
+ * LICENSE file in the root directory of this source tree.
6
+ */
7
+
8
+ #include <algorithm>
9
+ #include <cstddef>
10
+ #include <iostream>
11
+
12
+ #include <yoga/debug/AssertFatal.h>
13
+ #include <yoga/node/Node.h>
14
+ #include <yoga/numeric/Comparison.h>
15
+
16
+ namespace facebook::yoga {
17
+
18
+ Node::Node() : Node{&Config::getDefault()} {}
19
+
20
+ Node::Node(const yoga::Config* config) : config_{config} {
21
+ yoga::assertFatal(
22
+ config != nullptr, "Attempting to construct Node with null config");
23
+
24
+ if (config->useWebDefaults()) {
25
+ useWebDefaults();
26
+ }
27
+ }
28
+
29
+ Node::Node(Node&& node) {
30
+ hasNewLayout_ = node.hasNewLayout_;
31
+ isReferenceBaseline_ = node.isReferenceBaseline_;
32
+ isDirty_ = node.isDirty_;
33
+ alwaysFormsContainingBlock_ = node.alwaysFormsContainingBlock_;
34
+ nodeType_ = node.nodeType_;
35
+ context_ = node.context_;
36
+ measureFunc_ = node.measureFunc_;
37
+ baselineFunc_ = node.baselineFunc_;
38
+ dirtiedFunc_ = node.dirtiedFunc_;
39
+ style_ = node.style_;
40
+ layout_ = node.layout_;
41
+ lineIndex_ = node.lineIndex_;
42
+ owner_ = node.owner_;
43
+ children_ = std::move(node.children_);
44
+ config_ = node.config_;
45
+ resolvedDimensions_ = node.resolvedDimensions_;
46
+ for (auto c : children_) {
47
+ c->setOwner(this);
48
+ }
49
+ }
50
+
51
+ YGSize Node::measure(
52
+ float width,
53
+ MeasureMode widthMode,
54
+ float height,
55
+ MeasureMode heightMode) {
56
+ return measureFunc_(
57
+ this, width, unscopedEnum(widthMode), height, unscopedEnum(heightMode));
58
+ }
59
+
60
+ float Node::baseline(float width, float height) const {
61
+ return baselineFunc_(this, width, height);
62
+ }
63
+
64
+ float Node::dimensionWithMargin(
65
+ const FlexDirection axis,
66
+ const float widthSize) {
67
+ return getLayout().measuredDimension(dimension(axis)) +
68
+ style_.computeMarginForAxis(axis, widthSize);
69
+ }
70
+
71
+ bool Node::isLayoutDimensionDefined(const FlexDirection axis) {
72
+ const float value = getLayout().measuredDimension(dimension(axis));
73
+ return yoga::isDefined(value) && value >= 0.0f;
74
+ }
75
+
76
+ // Setters
77
+
78
+ void Node::setMeasureFunc(YGMeasureFunc measureFunc) {
79
+ if (measureFunc == nullptr) {
80
+ // TODO: t18095186 Move nodeType to opt-in function and mark appropriate
81
+ // places in Litho
82
+ setNodeType(NodeType::Default);
83
+ } else {
84
+ yoga::assertFatalWithNode(
85
+ this,
86
+ children_.size() == 0,
87
+ "Cannot set measure function: Nodes with measure functions cannot have "
88
+ "children.");
89
+ // TODO: t18095186 Move nodeType to opt-in function and mark appropriate
90
+ // places in Litho
91
+ setNodeType(NodeType::Text);
92
+ }
93
+
94
+ measureFunc_ = measureFunc;
95
+ }
96
+
97
+ void Node::replaceChild(Node* child, size_t index) {
98
+ children_[index] = child;
99
+ }
100
+
101
+ void Node::replaceChild(Node* oldChild, Node* newChild) {
102
+ std::replace(children_.begin(), children_.end(), oldChild, newChild);
103
+ }
104
+
105
+ void Node::insertChild(Node* child, size_t index) {
106
+ children_.insert(children_.begin() + static_cast<ptrdiff_t>(index), child);
107
+ }
108
+
109
+ void Node::setConfig(yoga::Config* config) {
110
+ yoga::assertFatal(
111
+ config != nullptr, "Attempting to set a null config on a Node");
112
+ yoga::assertFatalWithConfig(
113
+ config,
114
+ config->useWebDefaults() == config_->useWebDefaults(),
115
+ "UseWebDefaults may not be changed after constructing a Node");
116
+
117
+ if (yoga::configUpdateInvalidatesLayout(*config_, *config)) {
118
+ markDirtyAndPropagate();
119
+ layout_.configVersion = 0; // [Windows #13409]
120
+ } else { // [Windows #13409]
121
+ // If the config is functionally the same, then align the configVersion so
122
+ // that we can reuse the layout cache
123
+ layout_.configVersion = config->getVersion(); // [Windows #13409]
124
+ }
125
+ config_ = config;
126
+ }
127
+
128
+ void Node::setDirty(bool isDirty) {
129
+ if (isDirty == isDirty_) {
130
+ return;
131
+ }
132
+ isDirty_ = isDirty;
133
+ if (isDirty && dirtiedFunc_) {
134
+ dirtiedFunc_(this);
135
+ }
136
+ }
137
+
138
+ bool Node::removeChild(Node* child) {
139
+ std::vector<Node*>::iterator p =
140
+ std::find(children_.begin(), children_.end(), child);
141
+ if (p != children_.end()) {
142
+ children_.erase(p);
143
+ return true;
144
+ }
145
+ return false;
146
+ }
147
+
148
+ void Node::removeChild(size_t index) {
149
+ children_.erase(children_.begin() + static_cast<ptrdiff_t>(index));
150
+ }
151
+
152
+ void Node::setLayoutDirection(Direction direction) {
153
+ layout_.setDirection(direction);
154
+ }
155
+
156
+ void Node::setLayoutMargin(float margin, PhysicalEdge edge) {
157
+ layout_.setMargin(edge, margin);
158
+ }
159
+
160
+ void Node::setLayoutBorder(float border, PhysicalEdge edge) {
161
+ layout_.setBorder(edge, border);
162
+ }
163
+
164
+ void Node::setLayoutPadding(float padding, PhysicalEdge edge) {
165
+ layout_.setPadding(edge, padding);
166
+ }
167
+
168
+ void Node::setLayoutLastOwnerDirection(Direction direction) {
169
+ layout_.lastOwnerDirection = direction;
170
+ }
171
+
172
+ void Node::setLayoutComputedFlexBasis(const FloatOptional computedFlexBasis) {
173
+ layout_.computedFlexBasis = computedFlexBasis;
174
+ }
175
+
176
+ void Node::setLayoutPosition(float position, PhysicalEdge edge) {
177
+ layout_.setPosition(edge, position);
178
+ }
179
+
180
+ void Node::setLayoutComputedFlexBasisGeneration(
181
+ uint32_t computedFlexBasisGeneration) {
182
+ layout_.computedFlexBasisGeneration = computedFlexBasisGeneration;
183
+ }
184
+
185
+ void Node::setLayoutMeasuredDimension(
186
+ float measuredDimension,
187
+ Dimension dimension) {
188
+ layout_.setMeasuredDimension(dimension, measuredDimension);
189
+ }
190
+
191
+ void Node::setLayoutHadOverflow(bool hadOverflow) {
192
+ layout_.setHadOverflow(hadOverflow);
193
+ }
194
+
195
+ void Node::setLayoutDimension(float LengthValue, Dimension dimension) {
196
+ layout_.setDimension(dimension, LengthValue);
197
+ }
198
+
199
+ // If both left and right are defined, then use left. Otherwise return +left or
200
+ // -right depending on which is defined. Ignore statically positioned nodes as
201
+ // insets do not apply to them.
202
+ float Node::relativePosition(
203
+ FlexDirection axis,
204
+ Direction direction,
205
+ float axisSize) const {
206
+ if (style_.positionType() == PositionType::Static) {
207
+ return 0;
208
+ }
209
+ if (style_.isInlineStartPositionDefined(axis, direction)) {
210
+ return style_.computeInlineStartPosition(axis, direction, axisSize);
211
+ }
212
+
213
+ return -1 * style_.computeInlineEndPosition(axis, direction, axisSize);
214
+ }
215
+
216
+ void Node::setPosition(
217
+ const Direction direction,
218
+ const float mainSize,
219
+ const float crossSize,
220
+ const float ownerWidth) {
221
+ /* Root nodes should be always layouted as LTR, so we don't return negative
222
+ * values. */
223
+ const Direction directionRespectingRoot =
224
+ owner_ != nullptr ? direction : Direction::LTR;
225
+ const FlexDirection mainAxis =
226
+ yoga::resolveDirection(style_.flexDirection(), directionRespectingRoot);
227
+ const FlexDirection crossAxis =
228
+ yoga::resolveCrossDirection(mainAxis, directionRespectingRoot);
229
+
230
+ // In the case of position static these are just 0. See:
231
+ // https://www.w3.org/TR/css-position-3/#valdef-position-static
232
+ const float relativePositionMain =
233
+ relativePosition(mainAxis, directionRespectingRoot, mainSize);
234
+ const float relativePositionCross =
235
+ relativePosition(crossAxis, directionRespectingRoot, crossSize);
236
+
237
+ const auto mainAxisLeadingEdge = inlineStartEdge(mainAxis, direction);
238
+ const auto mainAxisTrailingEdge = inlineEndEdge(mainAxis, direction);
239
+ const auto crossAxisLeadingEdge = inlineStartEdge(crossAxis, direction);
240
+ const auto crossAxisTrailingEdge = inlineEndEdge(crossAxis, direction);
241
+
242
+ setLayoutPosition(
243
+ (style_.computeInlineStartMargin(mainAxis, direction, ownerWidth) +
244
+ relativePositionMain),
245
+ mainAxisLeadingEdge);
246
+ setLayoutPosition(
247
+ (style_.computeInlineEndMargin(mainAxis, direction, ownerWidth) +
248
+ relativePositionMain),
249
+ mainAxisTrailingEdge);
250
+ setLayoutPosition(
251
+ (style_.computeInlineStartMargin(crossAxis, direction, ownerWidth) +
252
+ relativePositionCross),
253
+ crossAxisLeadingEdge);
254
+ setLayoutPosition(
255
+ (style_.computeInlineEndMargin(crossAxis, direction, ownerWidth) +
256
+ relativePositionCross),
257
+ crossAxisTrailingEdge);
258
+ }
259
+
260
+ Style::Length Node::resolveFlexBasisPtr() const {
261
+ Style::Length flexBasis = style_.flexBasis();
262
+ if (flexBasis.unit() != Unit::Auto && flexBasis.unit() != Unit::Undefined) {
263
+ return flexBasis;
264
+ }
265
+ if (style_.flex().isDefined() && style_.flex().unwrap() > 0.0f) {
266
+ return config_->useWebDefaults() ? value::ofAuto() : value::points(0);
267
+ }
268
+ return value::ofAuto();
269
+ }
270
+
271
+ void Node::resolveDimension() {
272
+ for (auto dim : {Dimension::Width, Dimension::Height}) {
273
+ if (style_.maxDimension(dim).isDefined() &&
274
+ yoga::inexactEquals(
275
+ style_.maxDimension(dim), style_.minDimension(dim))) {
276
+ resolvedDimensions_[yoga::to_underlying(dim)] = style_.maxDimension(dim);
277
+ } else {
278
+ resolvedDimensions_[yoga::to_underlying(dim)] = style_.dimension(dim);
279
+ }
280
+ }
281
+ }
282
+
283
+ Direction Node::resolveDirection(const Direction ownerDirection) {
284
+ if (style_.direction() == Direction::Inherit) {
285
+ return ownerDirection != Direction::Inherit ? ownerDirection
286
+ : Direction::LTR;
287
+ } else {
288
+ return style_.direction();
289
+ }
290
+ }
291
+
292
+ void Node::clearChildren() {
293
+ children_.clear();
294
+ children_.shrink_to_fit();
295
+ }
296
+
297
+ // Other Methods
298
+
299
+ void Node::cloneChildrenIfNeeded() {
300
+ size_t i = 0;
301
+ for (Node*& child : children_) {
302
+ if (child->getOwner() != this) {
303
+ child = resolveRef(config_->cloneNode(child, this, i));
304
+ child->setOwner(this);
305
+ }
306
+ i += 1;
307
+ }
308
+ }
309
+
310
+ void Node::markDirtyAndPropagate() {
311
+ if (!isDirty_) {
312
+ setDirty(true);
313
+ setLayoutComputedFlexBasis(FloatOptional());
314
+ if (owner_) {
315
+ owner_->markDirtyAndPropagate();
316
+ }
317
+ }
318
+ }
319
+
320
+ float Node::resolveFlexGrow() const {
321
+ // Root nodes flexGrow should always be 0
322
+ if (owner_ == nullptr) {
323
+ return 0.0;
324
+ }
325
+ if (style_.flexGrow().isDefined()) {
326
+ return style_.flexGrow().unwrap();
327
+ }
328
+ if (style_.flex().isDefined() && style_.flex().unwrap() > 0.0f) {
329
+ return style_.flex().unwrap();
330
+ }
331
+ return Style::DefaultFlexGrow;
332
+ }
333
+
334
+ float Node::resolveFlexShrink() const {
335
+ if (owner_ == nullptr) {
336
+ return 0.0;
337
+ }
338
+ if (style_.flexShrink().isDefined()) {
339
+ return style_.flexShrink().unwrap();
340
+ }
341
+ if (!config_->useWebDefaults() && style_.flex().isDefined() &&
342
+ style_.flex().unwrap() < 0.0f) {
343
+ return -style_.flex().unwrap();
344
+ }
345
+ return config_->useWebDefaults() ? Style::WebDefaultFlexShrink
346
+ : Style::DefaultFlexShrink;
347
+ }
348
+
349
+ bool Node::isNodeFlexible() {
350
+ return (
351
+ (style_.positionType() != PositionType::Absolute) &&
352
+ (resolveFlexGrow() != 0 || resolveFlexShrink() != 0));
353
+ }
354
+
355
+ void Node::reset() {
356
+ yoga::assertFatalWithNode(
357
+ this,
358
+ children_.size() == 0,
359
+ "Cannot reset a node which still has children attached");
360
+ yoga::assertFatalWithNode(
361
+ this, owner_ == nullptr, "Cannot reset a node still attached to a owner");
362
+
363
+ *this = Node{getConfig()};
364
+ }
365
+
366
+ } // namespace facebook::yoga
@@ -15,25 +15,23 @@
15
15
  </metadata>
16
16
  <files>
17
17
 
18
- <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
19
- <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
20
- <file src="$nugetroot$\ARM64\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\ARM64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
21
- <file src="$nugetroot$\x86\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
22
- <file src="$nugetroot$\x64\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
23
- <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\ARM64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
24
- <file src="$nugetroot$\x86\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x86"/>
25
- <file src="$nugetroot$\x64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x64"/>
26
- <file src="$nugetroot$\ARM64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\ARM64"/>
27
- <file src="$nugetroot$\x86\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x86"/>
28
- <file src="$nugetroot$\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x64"/>
29
- <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64"/>
18
+ <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
19
+ <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
20
+ <file src="$nugetroot$\ARM64EC\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\ARM64EC" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
21
+ <file src="$nugetroot$\x86\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
22
+ <file src="$nugetroot$\x64\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
23
+ <file src="$nugetroot$\ARM64EC\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\ARM64EC" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
24
+ <file src="$nugetroot$\x86\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x86"/>
25
+ <file src="$nugetroot$\x64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x64"/>
26
+ <file src="$nugetroot$\ARM64EC\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\ARM64EC"/>
27
+ <file src="$nugetroot$\x86\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x86"/>
28
+ <file src="$nugetroot$\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x64"/>
29
+ <file src="$nugetroot$\ARM64EC\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64EC"/>
30
30
 
31
- <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
32
- <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
33
- <file src="$nugetroot$\ARM64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\ARM64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
34
- <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
35
- <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
36
- <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\ARM64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
31
+ <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
32
+ <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
33
+ <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
34
+ <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
37
35
 
38
36
  <file src="$nugetroot$\inc\callinvoker\ReactCommon\CallInvoker.h" target="inc\ReactCommon"/>
39
37
  <file src="$nugetroot$\inc\callinvoker\ReactCommon\SchedulerPriority.h" target="inc\ReactCommon"/>
@@ -16,7 +16,7 @@ If ($PSBoundParameters['Debug']) {
16
16
  Write-Output "Creating filtered version of : $nuspec"
17
17
  $xml = [xml](gc $nuspec)
18
18
 
19
- $allSlices = @("x64.Release", "x64.Debug", "x86.Release", "x86.Debug", "ARM64.Release", "ARM64.Debug")
19
+ $allSlices = @("x64.Release", "x64.Debug", "x86.Release", "x86.Debug", "ARM64.Release", "ARM64.Debug", "ARM64EC.Debug", "ARM64EC.Release")
20
20
 
21
21
  $nodesToRemove = @();
22
22
 
@@ -49,12 +49,12 @@ Copy-Item -Force -Recurse -Path $ReactWindowsRoot\codegen -Destination $TargetRo
49
49
  Copy-Item -Force -Recurse -Path $ReactCommonOverrideRoot\* -Destination $ReactNativeRoot\ReactCommon\
50
50
 
51
51
  # Microsoft.ReactNative.CXX project JSI files
52
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\decorator.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
53
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\instrumentation.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
54
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
55
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
56
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi-inl.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
57
- Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\threadsafe.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
52
+ Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\decorator.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
53
+ Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\instrumentation.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
54
+ Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
55
+ Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
56
+ Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi-inl.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
57
+ Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\threadsafe.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
58
58
 
59
59
  # Microsoft.ReactNative.CXX project Node-API files
60
60
  New-Item $TargetRoot\Microsoft.ReactNative.Cxx\node-api -ItemType Directory -Force
package/fmt/fmt.vcxproj CHANGED
@@ -17,6 +17,10 @@
17
17
  <Configuration>Debug</Configuration>
18
18
  <Platform>ARM64</Platform>
19
19
  </ProjectConfiguration>
20
+ <ProjectConfiguration Include="Debug|ARM64EC">
21
+ <Configuration>Debug</Configuration>
22
+ <Platform>ARM64EC</Platform>
23
+ </ProjectConfiguration>
20
24
  <ProjectConfiguration Include="Release|ARM64">
21
25
  <Configuration>Release</Configuration>
22
26
  <Platform>ARM64</Platform>
@@ -25,6 +29,10 @@
25
29
  <Configuration>Debug</Configuration>
26
30
  <Platform>x64</Platform>
27
31
  </ProjectConfiguration>
32
+ <ProjectConfiguration Include="Release|ARM64EC">
33
+ <Configuration>Release</Configuration>
34
+ <Platform>ARM64EC</Platform>
35
+ </ProjectConfiguration>
28
36
  <ProjectConfiguration Include="Release|x64">
29
37
  <Configuration>Release</Configuration>
30
38
  <Platform>x64</Platform>
@@ -110,7 +118,7 @@
110
118
  Retries="10" />
111
119
  </Target>
112
120
  <Target Name="UnzipFmt" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFmt">
113
- <Message Condition="!Exists('$(FmtDir)src\format.cc')" Importance="High" Text="Unzipping fmt to $([MSBuild]::NormalizePath($(FmtDir)..))."/>
121
+ <Message Condition="!Exists('$(FmtDir)src\format.cc')" Importance="High" Text="Unzipping fmt to $([MSBuild]::NormalizePath($(FmtDir)..))." />
114
122
  <Unzip
115
123
  Condition="!Exists('$(FmtDir)src\format.cc')"
116
124
  SourceFiles="$(FmtZipFile)"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.74.10",
3
+ "version": "0.74.12",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -23,18 +23,18 @@
23
23
  "dependencies": {
24
24
  "@babel/runtime": "^7.0.0",
25
25
  "@jest/create-cache-key-function": "^29.6.3",
26
- "@react-native-community/cli": "13.6.6",
27
- "@react-native-community/cli-platform-android": "13.6.6",
28
- "@react-native-community/cli-platform-ios": "13.6.6",
26
+ "@react-native-community/cli": "13.6.9",
27
+ "@react-native-community/cli-platform-android": "13.6.9",
28
+ "@react-native-community/cli-platform-ios": "13.6.9",
29
29
  "@react-native-windows/cli": "0.74.1",
30
30
  "@react-native/assets": "1.0.0",
31
- "@react-native/assets-registry": "0.74.83",
32
- "@react-native/codegen": "0.74.83",
33
- "@react-native/community-cli-plugin": "0.74.83",
34
- "@react-native/gradle-plugin": "0.74.83",
35
- "@react-native/js-polyfills": "0.74.83",
36
- "@react-native/normalize-colors": "0.74.83",
37
- "@react-native/virtualized-lists": "0.74.83",
31
+ "@react-native/assets-registry": "0.74.85",
32
+ "@react-native/codegen": "0.74.85",
33
+ "@react-native/community-cli-plugin": "0.74.85",
34
+ "@react-native/gradle-plugin": "0.74.85",
35
+ "@react-native/js-polyfills": "0.74.85",
36
+ "@react-native/normalize-colors": "0.74.85",
37
+ "@react-native/virtualized-lists": "0.74.85",
38
38
  "abort-controller": "^3.0.0",
39
39
  "anser": "^1.4.9",
40
40
  "ansi-regex": "^5.0.0",
@@ -65,7 +65,7 @@
65
65
  },
66
66
  "devDependencies": {
67
67
  "@react-native-windows/codegen": "0.74.1",
68
- "@react-native/metro-config": "0.74.83",
68
+ "@react-native/metro-config": "0.74.85",
69
69
  "@rnw-scripts/babel-react-native-config": "0.0.0",
70
70
  "@rnw-scripts/eslint-config": "1.2.9",
71
71
  "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.13",
@@ -81,7 +81,7 @@
81
81
  "just-scripts": "^1.3.3",
82
82
  "prettier": "2.8.8",
83
83
  "react": "18.2.0",
84
- "react-native": "0.74.1",
84
+ "react-native": "0.74.3",
85
85
  "react-native-platform-override": "^1.9.25",
86
86
  "react-refresh": "^0.14.0",
87
87
  "typescript": "5.0.4"