react-native-windows 0.74.48 → 0.74.52

package/.flowconfig

@@ -53,6 +53,10 @@
 .*/node_modules/sample-apps/.*
 .*/node_modules/playground/.*
 
+; Ignore prepare-release's own node_modules (hermes-estree .flow files use unsupported syntax)
+.*/node_modules/@rnw-scripts/prepare-release/node_modules/.*
+.*/packages/@rnw-scripts/prepare-release/node_modules/.*
+
 ; Ignore templates for 'react-native init'
 <PROJECT_ROOT>/packages/react-native/template/.*
 

package/Chakra/ChakraUtils.cpp

@@ -166,8 +166,6 @@ FileMappingBigString::FileMappingBigString(const std::wstring &filename, uint32_
     return;
   }
 
-  WerRegisterMemoryBlock(m_fileData.get(), m_fileSize);
-
   static const uint32_t s_pageSize = getPageSize();
   if (m_fileSize % s_pageSize != 0) {
     // Data are owned by m_fileData, deleter is no-op

package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.cpp

@@ -966,12 +966,17 @@ void CompositionEventHandler::getTargetPointerArgs(
     assert(m_pointerCapturingComponentTag != -1);
     tag = m_pointerCapturingComponentTag;
 
-    auto targetComponentView = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view;
-    auto clientRect = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
-                          ->getClientRect();
-    if (auto strongRootView = m_wkRootView.get()) {
-      ptLocal.x = ptScaled.x - (clientRect.left / strongRootView.ScaleFactor());
-      ptLocal.y = ptScaled.y - (clientRect.top / strongRootView.ScaleFactor());
+    auto targetComponentView = fabricuiManager->GetViewRegistry().findComponentViewWithTag(tag);
+    if (targetComponentView) {
+      auto clientRect =
+          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+              ->getClientRect();
+      if (auto strongRootView = m_wkRootView.get()) {
+        ptLocal.x = ptScaled.x - (clientRect.left / strongRootView.ScaleFactor());
+        ptLocal.y = ptScaled.y - (clientRect.top / strongRootView.ScaleFactor());
+      }
+    } else {
+      tag = -1;
     }
   } else {
     tag = RootComponentView().hitTest(ptScaled, ptLocal);

package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp

@@ -374,13 +374,12 @@ winrt::IInspectable ReactNativeIsland::GetUiaProvider() noexcept {
   if (m_uiaProvider == nullptr) {
     m_uiaProvider =
         winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider>(*this);
-    if (m_hwnd && !m_island) {
-      auto pRootProvider =
-          static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
-              m_uiaProvider.as<IRawElementProviderSimple>().get());
-      if (pRootProvider != nullptr) {
-        pRootProvider->SetHwnd(m_hwnd);
-      }
+    auto pRootProvider =
+        static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
+            m_uiaProvider.as<IRawElementProviderSimple>().get());
+    if (pRootProvider != nullptr) {
+      pRootProvider->SetIsland(m_island);
+      pRootProvider->SetHwnd(m_hwnd);
     }
   }
   return m_uiaProvider;
@@ -868,9 +867,6 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
             auto pRootProvider =
                 static_cast<winrt::Microsoft::ReactNative::implementation::CompositionRootAutomationProvider *>(
                     provider.as<IRawElementProviderSimple>().get());
-            if (pRootProvider != nullptr) {
-              pRootProvider->SetIsland(pThis->m_island);
-            }
             args.AutomationProvider(std::move(provider));
             args.Handled(true);
           }

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -631,6 +631,19 @@ WPARAM PointerRoutedEventArgsToMouseWParam(
   return wParam;
 }
 
+bool WindowsTextInputComponentView::IsDoubleClick() {
+  using namespace std::chrono;
+
+  auto now = steady_clock::now();
+  auto duration = duration_cast<milliseconds>(now - m_lastClickTime).count();
+
+  const int DOUBLE_CLICK_TIME_MS = ::GetDoubleClickTime();
+
+  m_lastClickTime = now;
+
+  return (duration < DOUBLE_CLICK_TIME_MS);
+}
+
 void WindowsTextInputComponentView::OnPointerPressed(
     const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
   UINT msg = 0;
@@ -647,7 +660,11 @@ void WindowsTextInputComponentView::OnPointerPressed(
   if (pp.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse) {
     switch (pp.Properties().PointerUpdateKind()) {
       case winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::LeftButtonPressed:
-        msg = WM_LBUTTONDOWN;
+        if (IsDoubleClick()) {
+          msg = WM_LBUTTONDBLCLK;
+        } else {
+          msg = WM_LBUTTONDOWN;
+        }
         break;
       case winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::MiddleButtonPressed:
         msg = WM_MBUTTONDOWN;

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h

@@ -70,6 +70,7 @@ struct WindowsTextInputComponentView
   std::optional<std::string> getAccessiblityValue() noexcept override;
   void setAcccessiblityValue(std::string &&value) noexcept override;
   bool getAcccessiblityIsReadOnly() noexcept override;
+  bool IsDoubleClick();
 
   WindowsTextInputComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -141,6 +142,7 @@ struct WindowsTextInputComponentView
   DWORD m_propBitsMask{0};
   DWORD m_propBits{0};
   HCURSOR m_hcursor{nullptr};
+  std::chrono::steady_clock::time_point m_lastClickTime{};
   std::vector<facebook::react::CompWindowsTextInputSubmitKeyEventsStruct> m_submitKeyEvents;
 };
 

package/Microsoft.ReactNative/Fabric/Composition/TooltipService.cpp

@@ -266,7 +266,7 @@ void TooltipTracker::ShowTooltip(const winrt::Microsoft::ReactNative::ComponentV
           static_cast<int>((tm.width + tooltipHorizontalPadding + tooltipHorizontalPadding) * scaleFactor);
       tooltipData->height = static_cast<int>((tm.height + tooltipTopPadding + tooltipBottomPadding) * scaleFactor);
 
-      POINT pt = {static_cast<LONG>(m_pos.X), static_cast<LONG>(m_pos.Y)};
+      POINT pt = {static_cast<LONG>(m_pos.X * scaleFactor), static_cast<LONG>(m_pos.Y * scaleFactor)};
       ClientToScreen(parentHwnd, &pt);
 
       RegisterTooltipWndClass();

package/PropertySheets/CIBuildOptimizations.props

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    CI-specific C++ build optimizations for the publish pipeline.
+
+    This file is injected via /p:ForceImportAfterCppTargets in .ado/publish.yml.
+    It overrides defaults that are tuned for developer workflows (incremental builds,
+    file tracking) with settings that are better for CI clean builds.
+
+    1. Multi-threaded compilation: Use CL.exe internal /MP parallelism instead of
+       MSBuild's MultiToolTask (which spawns one CL.exe+Tracker.exe per source file).
+       /MP lets CL.exe compile all files in one process with shared PCH state.
+
+    2. Disable file tracking: CI always does clean builds, so incremental build
+       tracking (MinimalRebuild, TrackFileAccess) is pure overhead.
+  -->
+  <PropertyGroup>
+    <MultiProcCL>false</MultiProcCL>
+    <MinimalRebuildFromTracking>false</MinimalRebuildFromTracking>
+    <TrackFileAccess>false</TrackFileAccess>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalOptions>%(AdditionalOptions) /MP</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.48</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.52</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>48</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>52</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>ddef61e5c9244a04e1c34529f89bde30491ec53f</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>48c6cfeeb522a3f66014675370d4f276ca080a86</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Scripts/Tfs/Layout-MSRN-Headers.ps1

@@ -45,6 +45,14 @@ Copy-Item -Force -Recurse -Path $ReactWindowsRoot\Microsoft.ReactNative.Cxx -Des
 # Copy native module spec files
 Copy-Item -Force -Recurse -Path $ReactWindowsRoot\codegen -Destination $TargetRoot\inc
 
+# Overwrite ReactCommon\jsi\jsi files. It must be called before the ReactCommon overrides
+Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\decorator.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\
+Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\instrumentation.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\
+Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi.cpp -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\
+Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\
+Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\jsi-inl.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\
+Copy-Item -Force -Path $NodeApiJsiRoot\jsi\jsi\threadsafe.h -Destination $ReactNativeRoot\ReactCommon\jsi\jsi\
+
 # Overwrite temporary ReactCommon files (since this script can runs on a different machine than where ReactCommon was built)
 Copy-Item -Force -Recurse -Path $ReactCommonOverrideRoot\* -Destination $ReactNativeRoot\ReactCommon\
 
@@ -61,6 +69,8 @@ New-Item $TargetRoot\Microsoft.ReactNative.Cxx\node-api -ItemType Directory -For
 Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
 Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api_types.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
 Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_runtime_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\node_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\node_api_types.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
 
 # Microsoft.ReactNative.CXX project Node-API JSI files
 New-Item $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders -ItemType Directory -Force

package/Shared/MemoryMappedBuffer.cpp

@@ -77,8 +77,6 @@ MemoryMappedBuffer::MemoryMappedBuffer(const wchar_t *const filename, uint32_t o
     throw facebook::jsi::JSINativeException(
         "MapViewOfFile/MapViewOfFileFromApp failed with last error " + std::to_string(GetLastError()));
   }
-
-  WerRegisterMemoryBlock(m_fileData.get(), m_fileSize);
 }
 
 size_t MemoryMappedBuffer::size() const {

package/Shared/Networking/WinRTWebSocketResource.cpp

@@ -227,11 +227,12 @@ fire_and_forget WinRTWebSocketResource2::PerformConnect(Uri &&uri) noexcept {
       [self = self->shared_from_this(), coUri = std::move(movedUri)]() -> IAsyncAction {
         auto coSelf = self->shared_from_this();
 
-        auto async = coSelf->m_socket.ConnectAsync(coUri);
-        co_await lessthrow_await_adapter<IAsyncAction>{async};
-
-        auto result = async.ErrorCode();
         try {
+          // `ConnectAsync` MAY throw synchronously (e.g. WININET_E_INVALID_CA)
+          auto async = coSelf->m_socket.ConnectAsync(coUri);
+          co_await lessthrow_await_adapter<IAsyncAction>{async};
+
+          auto result = async.ErrorCode();
           if (result >= 0) { // Non-failing HRESULT
             coSelf->m_readyState = ReadyState::Open;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.48",
+  "version": "0.74.52",
   "license": "MIT",
   "repository": {
     "type": "git",