react-native-windows 0.81.37 → 0.81.40

package/Shared/OInstance.cpp

@@ -14,6 +14,7 @@
 #include <folly/json.h>
 #include <jsi/jsi.h>
 #include <jsireact/JSIExecutor.h>
+#include <cstring>
 #include <filesystem>
 #include "OInstance.h"
 #include "Unicode.h"
@@ -77,15 +78,13 @@ namespace Microsoft::ReactNative {
 bool isHBCBundle(const std::string &bundle) {
   static uint32_t constexpr HBCBundleMagicNumber = 0xffe7c3c3;
 
-  // Note:: Directly access the pointer to avoid copy/length-check. It matters as this string contains the bundle which
-  // can be potentially huge.
-  // https://herbsutter.com/2008/04/07/cringe-not-vectors-are-guaranteed-to-be-contiguous/#comment-483
-  auto header = reinterpret_cast<const facebook::react::BundleHeader *>(&bundle[0]);
-  if (HBCBundleMagicNumber == header->magic32.value) {
-    return true;
-  } else {
+  // Only the leading magic number is needed; copy just those bytes rather than the whole (potentially huge) bundle.
+  uint32_t magic = 0;
+  if (bundle.size() < sizeof(magic)) {
     return false;
   }
+  std::memcpy(&magic, bundle.data(), sizeof(magic));
+  return magic == HBCBundleMagicNumber;
 }
 
 void LoadRemoteUrlScript(
@@ -136,7 +135,13 @@ void LoadRemoteUrlScript(
   // This code is based on the HBC Bundle integration on Android
   // Ref:
   // https://github.com/facebook/react-native/blob/24d91268b64c7abbd4b26547ffcc663dc90ec5e7/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp#L231
-  if (isHBCBundle(jsBundleString)) {
+  // Bytecode bundles are only requested from the dev server when USE_HERMES and ENABLE_DEVSERVER_HBCBUNDLES are
+  // defined.
+  bool isBytecodeBundle = false;
+#if defined(USE_HERMES) && defined(ENABLE_DEVSERVER_HBCBUNDLES)
+  isBytecodeBundle = isHBCBundle(jsBundleString);
+#endif
+  if (isBytecodeBundle) {
     auto script = std::make_unique<facebook::react::JSBigStdString>(jsBundleString, false);
     const char *buffer = script->c_str();
     uint32_t bufferLength = (uint32_t)script->size();

package/Shared/Shared.vcxitems

@@ -190,6 +190,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiViewProps.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiTextInputShadowNode.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiShadowNode.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
@@ -199,9 +202,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiViewShadowNode.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiState.cpp">
-      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\ComponentView.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>

package/Shared/Shared.vcxitems.filters

@@ -273,7 +273,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\platform\react\renderer\graphics\PlatformColorUtils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiPortalShadowNode.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiViewShadowNode.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiState.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ThemeUtils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\DebuggingOverlayComponentView.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionViewComponentView.cpp" />
@@ -338,6 +337,7 @@
     </ClCompile>
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\cxxreact\Instance.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\cxxreact\JSExecutor.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\AbiTextInputShadowNode.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">

package/external/folly/folly.vcxitems

@@ -153,6 +153,16 @@
       <AdditionalIncludeDirectories>$(ReactNativeWindowsDir)Folly;$(ReactNativeWindowsDir)stubs;$(ExternalDir)folly;$(ExternalDir)fast-float\include;$(ExternalDir)fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
+  <!-- Work around MSVC v145 ARM64 optimizer C1001 in AtForkListSingleton::init.
+       Disable PCH use so its Release optimization settings cannot override /Od.
+       Keep the forced pch.h include as an ordinary header. Remove when the compiler is fixed. -->
+  <ItemGroup>
+    <ClCompile Update="$(ExternalDir)folly\folly\system\AtFork.cpp" Condition="'$(Platform)' == 'ARM64' And '$(PlatformToolsetVersion)' != '' And $(PlatformToolsetVersion)&gt;=145">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>Disabled</Optimization>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+    </ClCompile>
+  </ItemGroup>
   <!-- SysMman.cpp is Desktop-only and must not use folly's UWP pch; re-assert no-PCH after
        the blanket Update above, which would otherwise force pch.h onto it. -->
   <ItemGroup>

package/index.windows.js

@@ -369,6 +369,11 @@ module.exports = {
   get AppTheme() {
     return require('./Libraries/AppTheme/AppTheme').AppTheme;
   },
+  // Export this to allow custom native textinput components to provide a full view spec
+  get TextInputViewSpec() {
+    return require('./Libraries/Components/TextInput/WindowsTextInputNativeComponent')
+      .__INTERNAL_VIEW_CONFIG;
+  },
 } as ReactNativePublicAPI;
 
 if (__DEV__) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.81.37",
+  "version": "0.81.40",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "17.0.0",
     "@react-native-community/cli-platform-android": "17.0.0",
     "@react-native-community/cli-platform-ios": "17.0.0",
-    "@react-native-windows/cli": "0.81.10",
+    "@react-native-windows/cli": "0.81.12",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.81.6",
     "@react-native/codegen": "0.81.6",
@@ -68,7 +68,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.81.7",
+    "@react-native-windows/codegen": "0.81.8",
     "@react-native/metro-config": "0.81.6",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.38",
@@ -85,7 +85,7 @@
     "prettier": "2.8.8",
     "react": "19.1.4",
     "react-native": "0.81.6",
-    "react-native-platform-override": "0.81.3",
+    "react-native-platform-override": "0.81.4",
     "react-refresh": "^0.14.0",
     "typescript": "5.0.4"
   },

package/Microsoft.ReactNative/Fabric/AbiState.cpp

@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "AbiState.h"
-
-namespace Microsoft::ReactNative {
-
-AbiComponentState::AbiComponentState(facebook::react::State::Shared const &state) {
-  m_state = std::static_pointer_cast<facebook::react::ConcreteState<AbiStateData> const>(state);
-}
-
-winrt::Windows::Foundation::IInspectable AbiComponentState::Data() noexcept {
-  return m_state->getData().userdata;
-}
-
-void AbiComponentState::UpdateState(const winrt::Windows::Foundation::IInspectable &data) noexcept {
-  AbiStateData state;
-  state.userdata = data;
-  m_state->updateState(std::move(state));
-}
-
-void AbiComponentState::UpdateStateWithMutation(
-    const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept {
-  m_state->updateState([mutation](const AbiStateData &oldData) {
-    return std::make_shared<AbiStateData const>(mutation(oldData.userdata));
-  });
-}
-
-} // namespace Microsoft::ReactNative