react-native-windows 0.74.34 → 0.74.36

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 (9) hide show
  1. package/Microsoft.ReactNative/Fabric/ComponentView.cpp +4 -1
  2. package/Microsoft.ReactNative/Fabric/Composition/ContentIslandComponentView.cpp +1 -1
  3. package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp +2 -2
  4. package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp +5 -2
  5. package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.h +2 -1
  6. package/Microsoft.ReactNative/packages.lock.json +103 -27
  7. package/PropertySheets/Generated/PackageVersion.g.props +3 -3
  8. package/PropertySheets/WinUI.props +1 -1
  9. package/package.json +1 -1
package/Microsoft.ReactNative/Fabric/ComponentView.cpp CHANGED
@@ -279,7 +279,10 @@ void ComponentView::parent(const winrt::Microsoft::ReactNative::ComponentView &p
279
279
  m_parent = parent;
280
280
  if (!parent) {
281
281
  if (oldRootView && oldRootView->GetFocusedComponent() == *this) {
282
- oldRootView->TrySetFocusedComponent(oldParent, winrt::Microsoft::ReactNative::FocusNavigationDirection::None);
282
+ oldRootView->TrySetFocusedComponent(
283
+ oldParent,
284
+ winrt::Microsoft::ReactNative::FocusNavigationDirection::None,
285
+ true /*forceNoSelectionIfCannotMove*/);
283
286
  }
284
287
  }
285
288
  if (parent) {
package/Microsoft.ReactNative/Fabric/Composition/ContentIslandComponentView.cpp CHANGED
@@ -241,7 +241,7 @@ void ContentIslandComponentView::ConfigureChildSiteLinkAutomation() noexcept {
241
241
  // This automation mode must be set before connecting the child ContentIsland.
242
242
  // It puts the child content into a mode where it won't own its own framework root. Instead, the child island's
243
243
  // automation peers will use the same framework root as the automation peer of this ContentIslandComponentView.
244
- m_childSiteLink.AutomationTreeOption(winrt::Microsoft::UI::Content::AutomationTreeOptions::FragmentBased);
244
+ m_childSiteLink.AutomationOption(winrt::Microsoft::UI::Content::ContentAutomationOptions::FragmentBased);
245
245
 
246
246
  // These events are raised in response to the child ContentIsland asking for providers.
247
247
  // For example, the ContentIsland.FragmentRootAutomationProvider property will return
package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp CHANGED
@@ -771,7 +771,7 @@ winrt::Windows::Foundation::Size ReactNativeIsland::Measure(
771
771
  facebook::react::LayoutConstraints constraints;
772
772
  ApplyConstraints(layoutConstraints, constraints);
773
773
 
774
- if (m_isInitialized && m_rootTag != -1) {
774
+ if (m_isInitialized && m_rootTag != -1 && m_hasRenderedVisual) {
775
775
  if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
776
776
  winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
777
777
  facebook::react::LayoutContext context;
@@ -802,7 +802,7 @@ void ReactNativeIsland::Arrange(
802
802
  facebook::react::LayoutConstraints fbLayoutConstraints;
803
803
  ApplyConstraints(layoutConstraints, fbLayoutConstraints);
804
804
 
805
- if (m_isInitialized && m_rootTag != -1 && !m_isFragment) {
805
+ if (m_isInitialized && m_rootTag != -1 && !m_isFragment && m_hasRenderedVisual) {
806
806
  if (auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(
807
807
  winrt::Microsoft::ReactNative::ReactPropertyBag(m_context.Properties()))) {
808
808
  facebook::react::LayoutContext context;
package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp CHANGED
@@ -120,7 +120,8 @@ bool RootComponentView::NavigateFocus(const winrt::Microsoft::ReactNative::Focus
120
120
 
121
121
  bool RootComponentView::TrySetFocusedComponent(
122
122
  const winrt::Microsoft::ReactNative::ComponentView &view,
123
- winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept {
123
+ winrt::Microsoft::ReactNative::FocusNavigationDirection direction,
124
+ bool forceNoSelectionIfCannotMove /*= false*/) noexcept {
124
125
  auto target = view;
125
126
  auto selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(target);
126
127
  if (selfView && !selfView->focusable()) {
@@ -128,7 +129,7 @@ bool RootComponentView::TrySetFocusedComponent(
128
129
  direction == winrt::Microsoft::ReactNative::FocusNavigationDirection::Previous)
129
130
  ? FocusManager::FindLastFocusableElement(target)
130
131
  : FocusManager::FindFirstFocusableElement(target);
131
- if (!target)
132
+ if (!target && !forceNoSelectionIfCannotMove)
132
133
  return false;
133
134
  selfView = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(target);
134
135
  }
@@ -154,6 +155,8 @@ bool RootComponentView::TrySetFocusedComponent(
154
155
  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(losingFocusArgs.NewFocusedComponent())
155
156
  ->rootComponentView()
156
157
  ->SetFocusedComponent(gettingFocusArgs.NewFocusedComponent(), direction);
158
+ } else {
159
+ SetFocusedComponent(nullptr, direction);
157
160
  }
158
161
 
159
162
  return true;
package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.h CHANGED
@@ -32,7 +32,8 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
32
32
  winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept;
33
33
  bool TrySetFocusedComponent(
34
34
  const winrt::Microsoft::ReactNative::ComponentView &view,
35
- winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept;
35
+ winrt::Microsoft::ReactNative::FocusNavigationDirection direction,
36
+ bool forceNoSelectionIfCannotMove = false) noexcept;
36
37
 
37
38
  bool NavigateFocus(const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
38
39
 
package/Microsoft.ReactNative/packages.lock.json CHANGED
@@ -24,21 +24,22 @@
24
24
  "Microsoft.SourceLink.Common": "1.1.1"
25
25
  }
26
26
  },
27
- "Microsoft.UI.Xaml": {
28
- "type": "Direct",
29
- "requested": "[2.8.0, )",
30
- "resolved": "2.8.0",
31
- "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
32
- "dependencies": {
33
- "Microsoft.Web.WebView2": "1.0.1264.42"
34
- }
35
- },
36
27
  "Microsoft.Windows.CppWinRT": {
37
28
  "type": "Direct",
38
29
  "requested": "[2.0.230706.1, )",
39
30
  "resolved": "2.0.230706.1",
40
31
  "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
41
32
  },
33
+ "Microsoft.WindowsAppSDK": {
34
+ "type": "Direct",
35
+ "requested": "[1.6.240923002, )",
36
+ "resolved": "1.6.240923002",
37
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
38
+ "dependencies": {
39
+ "Microsoft.Web.WebView2": "1.0.2651.64",
40
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
41
+ }
42
+ },
42
43
  "Microsoft.Build.Tasks.Git": {
43
44
  "type": "Transitive",
44
45
  "resolved": "1.1.1",
@@ -51,8 +52,13 @@
51
52
  },
52
53
  "Microsoft.Web.WebView2": {
53
54
  "type": "Transitive",
54
- "resolved": "1.0.1264.42",
55
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
55
+ "resolved": "1.0.2651.64",
56
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
57
+ },
58
+ "Microsoft.Windows.SDK.BuildTools": {
59
+ "type": "Transitive",
60
+ "resolved": "10.0.22621.756",
61
+ "contentHash": "7ZL2sFSioYm1Ry067Kw1hg0SCcW5kuVezC2SwjGbcPE61Nn+gTbH86T73G3LcEOVj0S3IZzNuE/29gZvOLS7VA=="
56
62
  },
57
63
  "common": {
58
64
  "type": "Project",
@@ -66,8 +72,8 @@
66
72
  "folly": {
67
73
  "type": "Project",
68
74
  "dependencies": {
69
- "boost": "[1.83.0, )",
70
- "fmt": "[1.0.0, )"
75
+ "Fmt": "[1.0.0, )",
76
+ "boost": "[1.83.0, )"
71
77
  }
72
78
  },
73
79
  "reactcommon": {
@@ -79,52 +85,122 @@
79
85
  }
80
86
  },
81
87
  "native,Version=v0.0/win10-arm": {
88
+ "Microsoft.WindowsAppSDK": {
89
+ "type": "Direct",
90
+ "requested": "[1.6.240923002, )",
91
+ "resolved": "1.6.240923002",
92
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
93
+ "dependencies": {
94
+ "Microsoft.Web.WebView2": "1.0.2651.64",
95
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
96
+ }
97
+ },
82
98
  "Microsoft.Web.WebView2": {
83
99
  "type": "Transitive",
84
- "resolved": "1.0.1264.42",
85
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
100
+ "resolved": "1.0.2651.64",
101
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
86
102
  }
87
103
  },
88
104
  "native,Version=v0.0/win10-arm-aot": {
105
+ "Microsoft.WindowsAppSDK": {
106
+ "type": "Direct",
107
+ "requested": "[1.6.240923002, )",
108
+ "resolved": "1.6.240923002",
109
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
110
+ "dependencies": {
111
+ "Microsoft.Web.WebView2": "1.0.2651.64",
112
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
113
+ }
114
+ },
89
115
  "Microsoft.Web.WebView2": {
90
116
  "type": "Transitive",
91
- "resolved": "1.0.1264.42",
92
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
117
+ "resolved": "1.0.2651.64",
118
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
93
119
  }
94
120
  },
95
121
  "native,Version=v0.0/win10-arm64-aot": {
122
+ "Microsoft.WindowsAppSDK": {
123
+ "type": "Direct",
124
+ "requested": "[1.6.240923002, )",
125
+ "resolved": "1.6.240923002",
126
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
127
+ "dependencies": {
128
+ "Microsoft.Web.WebView2": "1.0.2651.64",
129
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
130
+ }
131
+ },
96
132
  "Microsoft.Web.WebView2": {
97
133
  "type": "Transitive",
98
- "resolved": "1.0.1264.42",
99
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
134
+ "resolved": "1.0.2651.64",
135
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
100
136
  }
101
137
  },
102
138
  "native,Version=v0.0/win10-x64": {
139
+ "Microsoft.WindowsAppSDK": {
140
+ "type": "Direct",
141
+ "requested": "[1.6.240923002, )",
142
+ "resolved": "1.6.240923002",
143
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
144
+ "dependencies": {
145
+ "Microsoft.Web.WebView2": "1.0.2651.64",
146
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
147
+ }
148
+ },
103
149
  "Microsoft.Web.WebView2": {
104
150
  "type": "Transitive",
105
- "resolved": "1.0.1264.42",
106
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
151
+ "resolved": "1.0.2651.64",
152
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
107
153
  }
108
154
  },
109
155
  "native,Version=v0.0/win10-x64-aot": {
156
+ "Microsoft.WindowsAppSDK": {
157
+ "type": "Direct",
158
+ "requested": "[1.6.240923002, )",
159
+ "resolved": "1.6.240923002",
160
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
161
+ "dependencies": {
162
+ "Microsoft.Web.WebView2": "1.0.2651.64",
163
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
164
+ }
165
+ },
110
166
  "Microsoft.Web.WebView2": {
111
167
  "type": "Transitive",
112
- "resolved": "1.0.1264.42",
113
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
168
+ "resolved": "1.0.2651.64",
169
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
114
170
  }
115
171
  },
116
172
  "native,Version=v0.0/win10-x86": {
173
+ "Microsoft.WindowsAppSDK": {
174
+ "type": "Direct",
175
+ "requested": "[1.6.240923002, )",
176
+ "resolved": "1.6.240923002",
177
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
178
+ "dependencies": {
179
+ "Microsoft.Web.WebView2": "1.0.2651.64",
180
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
181
+ }
182
+ },
117
183
  "Microsoft.Web.WebView2": {
118
184
  "type": "Transitive",
119
- "resolved": "1.0.1264.42",
120
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
185
+ "resolved": "1.0.2651.64",
186
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
121
187
  }
122
188
  },
123
189
  "native,Version=v0.0/win10-x86-aot": {
190
+ "Microsoft.WindowsAppSDK": {
191
+ "type": "Direct",
192
+ "requested": "[1.6.240923002, )",
193
+ "resolved": "1.6.240923002",
194
+ "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==",
195
+ "dependencies": {
196
+ "Microsoft.Web.WebView2": "1.0.2651.64",
197
+ "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756"
198
+ }
199
+ },
124
200
  "Microsoft.Web.WebView2": {
125
201
  "type": "Transitive",
126
- "resolved": "1.0.1264.42",
127
- "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
202
+ "resolved": "1.0.2651.64",
203
+ "contentHash": "f5sc/vcAoTCTEW7Nqzp4galAuTRguZViw8ksn+Nx2uskEBPm0/ubzy6gVjvXS/P96jLS89C8T9I0hPc417xpNg=="
128
204
  }
129
205
  }
130
206
  }
package/PropertySheets/Generated/PackageVersion.g.props CHANGED
@@ -10,11 +10,11 @@
10
10
  -->
11
11
  <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
12
12
  <PropertyGroup>
13
- <ReactNativeWindowsVersion>0.74.34</ReactNativeWindowsVersion>
13
+ <ReactNativeWindowsVersion>0.74.36</ReactNativeWindowsVersion>
14
14
  <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
15
15
  <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
16
- <ReactNativeWindowsPatch>34</ReactNativeWindowsPatch>
16
+ <ReactNativeWindowsPatch>36</ReactNativeWindowsPatch>
17
17
  <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
18
- <ReactNativeWindowsCommitId>bf15804e00e3369083e8213a331753952b706204</ReactNativeWindowsCommitId>
18
+ <ReactNativeWindowsCommitId>a31e698ed4c308d9f1933ef2abed8bbc4c2bbc31</ReactNativeWindowsCommitId>
19
19
  </PropertyGroup>
20
20
  </Project>
package/PropertySheets/WinUI.props CHANGED
@@ -6,7 +6,7 @@
6
6
  Internal versions are located at: https://microsoft.visualstudio.com/DefaultCollection/ProjectReunion/_artifacts/feed/Project.Reunion.nuget.internal/NuGet/Microsoft.WindowsAppSDK/versions
7
7
  For local testing of internal versions, modify WinUI3ExperimentalVersion, and comment out the addition nuget source in NuGet.Config
8
8
  -->
9
- <WinUI3ExperimentalVersion Condition="'$(WinUI3ExperimentalVersion)'==''">1.7.250109001-experimental2</WinUI3ExperimentalVersion>
9
+ <WinUI3ExperimentalVersion Condition="'$(WinUI3ExperimentalVersion)'==''">1.7.250127003-experimental3</WinUI3ExperimentalVersion>
10
10
  <!-- This value is also used by the CLI, see /packages/@react-native-windows/cli/.../autolinkWindows.ts -->
11
11
  <WinUI3Version Condition="'$(WinUI3Version)'=='' AND '$(UseExperimentalWinUI3)'=='true'">$(WinUI3ExperimentalVersion)</WinUI3Version>
12
12
  <WinUI3Version Condition="'$(WinUI3Version)'==''">1.6.240923002</WinUI3Version>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-windows",
3
- "version": "0.74.34",
3
+ "version": "0.74.36",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",