react-native-windows 0.74.13 → 0.74.15
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/Common/Common.vcxproj +1 -1
- package/Common/packages.lock.json +3 -3
- package/Folly/Folly.vcxproj +1 -1
- package/Folly/packages.lock.json +3 -3
- package/Microsoft.ReactNative/Fabric/AbiShadowNode.cpp +18 -11
- package/Microsoft.ReactNative/Fabric/AbiShadowNode.h +1 -1
- package/Microsoft.ReactNative/Fabric/AbiViewShadowNode.cpp +7 -5
- package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +1 -1
- package/PropertySheets/External/Microsoft.ReactNative.Composition.CppApp.targets +1 -1
- package/PropertySheets/External/Microsoft.ReactNative.Composition.CppLib.targets +2 -2
- package/PropertySheets/Generated/PackageVersion.g.props +3 -3
- package/ReactCommon/ReactCommon.vcxproj +1 -1
- package/ReactCommon/packages.lock.json +5 -5
- package/package.json +1 -1
package/Common/Common.vcxproj
CHANGED
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
</ItemGroup>
|
|
95
95
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
96
96
|
<ItemGroup>
|
|
97
|
-
<PackageReference Include="boost" Version="1.
|
|
97
|
+
<PackageReference Include="boost" Version="1.83.0.0" />
|
|
98
98
|
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
|
|
99
99
|
</ItemGroup>
|
|
100
100
|
<ImportGroup Label="ExtensionTargets">
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
"native,Version=v0.0": {
|
|
5
5
|
"boost": {
|
|
6
6
|
"type": "Direct",
|
|
7
|
-
"requested": "[1.
|
|
8
|
-
"resolved": "1.
|
|
9
|
-
"contentHash": "
|
|
7
|
+
"requested": "[1.83.0, )",
|
|
8
|
+
"resolved": "1.83.0",
|
|
9
|
+
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
|
|
10
10
|
},
|
|
11
11
|
"Microsoft.Windows.CppWinRT": {
|
|
12
12
|
"type": "Direct",
|
package/Folly/Folly.vcxproj
CHANGED
|
@@ -325,7 +325,7 @@
|
|
|
325
325
|
<TemporaryFollyPatchFiles Include="$(MSBuildThisFileDirectory)\TEMP_UntilFollyUpdate\**\*.*" />
|
|
326
326
|
</ItemGroup>
|
|
327
327
|
<ItemGroup>
|
|
328
|
-
<PackageReference Include="boost" Version="1.
|
|
328
|
+
<PackageReference Include="boost" Version="1.83.0.0" />
|
|
329
329
|
</ItemGroup>
|
|
330
330
|
<Target Name="Deploy" />
|
|
331
331
|
<!-- Reenable this task if we need to temporarily replace any folly files for fixes, while we wait for PRs to land in folly -->
|
package/Folly/packages.lock.json
CHANGED
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
"native,Version=v0.0": {
|
|
5
5
|
"boost": {
|
|
6
6
|
"type": "Direct",
|
|
7
|
-
"requested": "[1.
|
|
8
|
-
"resolved": "1.
|
|
9
|
-
"contentHash": "
|
|
7
|
+
"requested": "[1.83.0, )",
|
|
8
|
+
"resolved": "1.83.0",
|
|
9
|
+
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
|
|
10
10
|
},
|
|
11
11
|
"fmt": {
|
|
12
12
|
"type": "Project"
|
|
@@ -30,7 +30,9 @@ winrt::Microsoft::ReactNative::IComponentProps AbiProps::UserProps() const noexc
|
|
|
30
30
|
ShadowNode::ShadowNode(facebook::react::ShadowNode::Shared shadowNode) noexcept : m_shadowNode(shadowNode) {}
|
|
31
31
|
|
|
32
32
|
void ShadowNode::EnsureUnsealed() noexcept {
|
|
33
|
-
m_shadowNode
|
|
33
|
+
if (auto shadowNode = m_shadowNode.lock()) {
|
|
34
|
+
shadowNode->ensureUnsealed();
|
|
35
|
+
}
|
|
34
36
|
}
|
|
35
37
|
|
|
36
38
|
winrt::IInspectable ShadowNode::Tag() const noexcept {
|
|
@@ -42,20 +44,25 @@ void ShadowNode::Tag(winrt::IInspectable tag) noexcept {
|
|
|
42
44
|
}
|
|
43
45
|
|
|
44
46
|
winrt::IInspectable ShadowNode::StateData() const noexcept {
|
|
45
|
-
auto
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
if (auto shadowNode = m_shadowNode.lock()) {
|
|
48
|
+
auto state = shadowNode->getState();
|
|
49
|
+
react_native_assert(state && "State must not be `nullptr`.");
|
|
50
|
+
auto abiStateData =
|
|
51
|
+
static_cast<const facebook::react::ConcreteState<::Microsoft::ReactNative::AbiStateData> *>(state.get())
|
|
52
|
+
->getData();
|
|
53
|
+
return abiStateData.userdata;
|
|
54
|
+
}
|
|
55
|
+
return nullptr;
|
|
51
56
|
}
|
|
52
57
|
|
|
53
58
|
void ShadowNode::StateData(winrt::IInspectable tag) noexcept {
|
|
54
|
-
m_shadowNode
|
|
59
|
+
if (auto shadowNode = m_shadowNode.lock()) {
|
|
60
|
+
shadowNode->ensureUnsealed();
|
|
55
61
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
62
|
+
auto &state = const_cast<facebook::react::State::Shared &>(shadowNode->getState());
|
|
63
|
+
state = std::make_shared<const facebook::react::ConcreteState<::Microsoft::ReactNative::AbiStateData>>(
|
|
64
|
+
std::make_shared<const ::Microsoft::ReactNative::AbiStateData>(tag), *state);
|
|
65
|
+
}
|
|
59
66
|
}
|
|
60
67
|
|
|
61
68
|
} // namespace winrt::Microsoft::ReactNative::implementation
|
|
@@ -17,11 +17,13 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(facebook::react::ShadowNode::
|
|
|
17
17
|
: base_type(shadowNode) {}
|
|
18
18
|
|
|
19
19
|
void YogaLayoutableShadowNode::Layout(winrt::Microsoft::ReactNative::LayoutContext layoutContext) noexcept {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
20
|
+
if (auto shadowNode = m_shadowNode.lock()) {
|
|
21
|
+
std::const_pointer_cast<facebook::react::YogaLayoutableShadowNode>(
|
|
22
|
+
std::dynamic_pointer_cast<const facebook::react::YogaLayoutableShadowNode>(shadowNode))
|
|
23
|
+
->facebook::react::YogaLayoutableShadowNode::layout(
|
|
24
|
+
winrt::get_self<winrt::Microsoft::ReactNative::implementation::LayoutContext>(layoutContext)
|
|
25
|
+
->m_layoutContext);
|
|
26
|
+
}
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
} // namespace winrt::Microsoft::ReactNative::implementation
|
|
@@ -624,7 +624,7 @@
|
|
|
624
624
|
</Page>
|
|
625
625
|
</ItemGroup>
|
|
626
626
|
<ItemGroup>
|
|
627
|
-
<PackageReference Include="boost" Version="1.
|
|
627
|
+
<PackageReference Include="boost" Version="1.83.0.0" />
|
|
628
628
|
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
|
|
629
629
|
<PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
|
|
630
630
|
<PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.targets" />
|
|
13
13
|
|
|
14
14
|
<ItemGroup>
|
|
15
|
-
<PackageReference Include="boost" Version="1.
|
|
15
|
+
<PackageReference Include="boost" Version="1.83.0.0" />
|
|
16
16
|
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
|
|
17
17
|
</ItemGroup>
|
|
18
18
|
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\Codegen.targets" />
|
|
14
14
|
|
|
15
15
|
<ItemGroup>
|
|
16
|
-
<PackageReference Include="boost" Version="1.
|
|
16
|
+
<PackageReference Include="boost" Version="1.83.0.0" />
|
|
17
17
|
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
|
|
18
18
|
</ItemGroup>
|
|
19
|
-
|
|
19
|
+
|
|
20
20
|
</Project>
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
12
12
|
<PropertyGroup>
|
|
13
|
-
<ReactNativeWindowsVersion>0.74.
|
|
13
|
+
<ReactNativeWindowsVersion>0.74.15</ReactNativeWindowsVersion>
|
|
14
14
|
<ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
|
|
15
15
|
<ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
|
|
16
|
-
<ReactNativeWindowsPatch>
|
|
16
|
+
<ReactNativeWindowsPatch>15</ReactNativeWindowsPatch>
|
|
17
17
|
<ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
|
|
18
|
-
<ReactNativeWindowsCommitId>
|
|
18
|
+
<ReactNativeWindowsCommitId>b555ac924fa33bd4640ec3291603117fc7dd013c</ReactNativeWindowsCommitId>
|
|
19
19
|
</PropertyGroup>
|
|
20
20
|
</Project>
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
</ProjectReference>
|
|
196
196
|
</ItemGroup>
|
|
197
197
|
<ItemGroup>
|
|
198
|
-
<PackageReference Include="boost" Version="1.
|
|
198
|
+
<PackageReference Include="boost" Version="1.83.0.0" />
|
|
199
199
|
</ItemGroup>
|
|
200
200
|
<PropertyGroup>
|
|
201
201
|
<NodeApiJsiZipDir>$(NodeApiJsiDir)..\.node-api-jsi-zip</NodeApiJsiZipDir>
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
"native,Version=v0.0": {
|
|
5
5
|
"boost": {
|
|
6
6
|
"type": "Direct",
|
|
7
|
-
"requested": "[1.
|
|
8
|
-
"resolved": "1.
|
|
9
|
-
"contentHash": "
|
|
7
|
+
"requested": "[1.83.0, )",
|
|
8
|
+
"resolved": "1.83.0",
|
|
9
|
+
"contentHash": "cy53VNMzysEMvhBixDe8ujPk67Fcj3v6FPHQnH91NYJNLHpc6jxa2xq9ruCaaJjE4M3YrGSHDi4uUSTGBWw6EQ=="
|
|
10
10
|
},
|
|
11
11
|
"fmt": {
|
|
12
12
|
"type": "Project"
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
"folly": {
|
|
15
15
|
"type": "Project",
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"
|
|
18
|
-
"
|
|
17
|
+
"Fmt": "[1.0.0, )",
|
|
18
|
+
"boost": "[1.83.0, )"
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
},
|