react-native-windows 0.84.0-preview.4 → 0.84.0-preview.6

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

@@ -14,6 +14,7 @@
 #include <winrt/Windows.Devices.Input.h>
 #include <optional>
 #include <set>
+#include <unordered_set>
 
 namespace winrt {
 using namespace Windows::UI;
@@ -79,7 +80,7 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
   bool releasePointerCapture(PointerId pointerId, facebook::react::Tag tag) noexcept;
 
   facebook::react::SurfaceId SurfaceId() const noexcept;
-  winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView &RootComponentView() const noexcept;
+  winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *RootComponentView() const noexcept;
 
   enum class UITouchType {
     Mouse,
@@ -141,7 +142,7 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
     ReactTaggedView initialComponentView{nullptr};
   };
 
-  static bool IsPointerWithinInitialTree(const ActiveTouch &activeTouch) noexcept;
+  bool IsPointerWithinInitialTree(const ActiveTouch &activeTouch) noexcept;
   static bool IsEndishEventType(TouchEventType eventType) noexcept;
   static const char *PointerTypeCStringFromUITouchType(UITouchType type) noexcept;
   static facebook::react::PointerEvent CreatePointerEventFromActiveTouch(
@@ -150,6 +151,14 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
   static void
   UpdateActiveTouch(ActiveTouch &activeTouch, facebook::react::Point ptScaled, facebook::react::Point ptLocal) noexcept;
 
+  void DispatchSynthesizedTouchCancelForActiveTouch(
+      const ActiveTouch &cancelledTouch,
+      const winrt::Microsoft::ReactNative::Composition::Input::PointerPoint &pointerPoint,
+      winrt::Windows::System::VirtualKeyModifiers keyModifiers);
+
+  std::vector<winrt::Microsoft::ReactNative::ComponentView> GetTouchableViewsInPathToRoot(
+      const winrt::Microsoft::ReactNative::ComponentView &componentView);
+
   void UpdateCursor() noexcept;
   void SetCursor(facebook::react::Cursor cursor, HCURSOR hcur) noexcept;
 
@@ -161,7 +170,7 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
   winrt::Microsoft::ReactNative::ReactContext m_context;
 
   facebook::react::Tag m_pointerCapturingComponentTag{-1}; // Component that has captured input
-  std::vector<PointerId> m_capturedPointers;
+  std::unordered_set<PointerId> m_capturedPointers;
   HCURSOR m_hcursor{nullptr};
   bool m_hcursorOwned{false}; // If we create the cursor, so we need to destroy it
   facebook::react::Cursor m_currentCursor{facebook::react::Cursor::Auto};

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

@@ -6,6 +6,8 @@
 
 #include "CompositionViewComponentView.h"
 
+#include <vector>
+
 #include <AutoDraw.h>
 #include <Fabric/AbiState.h>
 #include <Fabric/AbiViewProps.h>
@@ -1013,15 +1015,18 @@ bool ComponentView::anyHitTestHelper(
     facebook::react::Tag &targetTag,
     facebook::react::Point &ptContent,
     facebook::react::Point &localPt) const noexcept {
-  if (auto index = m_children.Size()) {
-    do {
-      index--;
-      targetTag = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_children.GetAt(index))
-                      ->hitTest(ptContent, localPt);
-      if (targetTag != -1) {
-        return true;
-      }
-    } while (index != 0);
+  auto size = m_children.Size();
+  if (size == 0) {
+    return false;
+  }
+
+  // m_children is backed by single_threaded_vector (std::vector), so GetAt is O(1)
+  for (uint32_t i = size; i > 0; --i) {
+    targetTag = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(m_children.GetAt(i - 1))
+                    ->hitTest(ptContent, localPt);
+    if (targetTag != -1) {
+      return true;
+    }
   }
 
   return false;

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

@@ -981,8 +981,6 @@ void ScrollViewComponentView::OnPointerPressed(
   Super::OnPointerPressed(args);
 
   if (!args.Handled()) {
-    auto f = args.Pointer();
-    auto g = f.PointerDeviceType();
     m_scrollVisual.OnPointerPressed(args);
   }
 }

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

@@ -18,6 +18,7 @@
 #include <winrt/Microsoft.UI.Input.h>
 #include <winrt/Windows.System.h>
 #include <winrt/Windows.UI.h>
+#include <mutex>
 #include "../Composition.Input.h"
 #include "../CompositionHelpers.h"
 #include "../RootComponentView.h"
@@ -75,37 +76,38 @@ WindowsTextInputComponentView::DrawBlock::~DrawBlock() {
 
 // 	Msftedit.dll vs "Riched20.dll"?
 
+static std::once_flag g_richEditLoadedFlag;
 static HINSTANCE g_hInstRichEdit = nullptr;
 static PCreateTextServices g_pfnCreateTextServices;
 
 HRESULT HrEnsureRichEd20Loaded() noexcept {
-  if (g_hInstRichEdit == nullptr) {
+  HRESULT hr = S_OK;
+  std::call_once(g_richEditLoadedFlag, [&hr]() {
     g_hInstRichEdit = LoadLibrary(L"Msftedit.dll");
-    if (!g_hInstRichEdit)
-      return E_FAIL;
+    if (!g_hInstRichEdit) {
+      hr = E_FAIL;
+      return;
+    }
 
     // Create the windowless control (text services object)
     g_pfnCreateTextServices = (PCreateTextServices)GetProcAddress(g_hInstRichEdit, "CreateTextServices");
-    if (!g_pfnCreateTextServices)
-      return E_FAIL;
-
-    /*
-    // Calling the REExtendedRegisterClass() function is required for
-    // registering the REComboboxW and REListBoxW window classes.
-    PFNREGISTER pfnRegister = (PFNREGISTER)GetProcAddress(g_hInstRichEdit, "REExtendedRegisterClass");
-    if (pfnRegister) {
-      pfnRegister();
-      return S_OK;
-    } else
-      return E_FAIL;
-      */
-  }
-  return NOERROR;
+    if (!g_pfnCreateTextServices) {
+      hr = E_FAIL;
+      return;
+    }
+  });
+  if (!g_hInstRichEdit || !g_pfnCreateTextServices)
+    return E_FAIL;
+  return hr;
 }
 
 struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
   CompTextHost(WindowsTextInputComponentView *outer) : m_outer(outer) {}
 
+  void Detach() {
+    m_outer = nullptr;
+  }
+
   //@cmember Get the DC for the host
   HDC TxGetDC() override {
     assert(false);
@@ -144,6 +146,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember InvalidateRect
   void TxInvalidateRect(LPCRECT prc, BOOL fMode) override {
+    if (!m_outer)
+      return;
     if (m_outer->m_drawing)
       return;
     m_outer->DrawText();
@@ -151,6 +155,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Send a WM_PAINT to the window
   void TxViewChange(BOOL fUpdate) override {
+    if (!m_outer)
+      return;
     // When keyboard scrolling without scrollbar, TxInvalidateRect is not called.
     // Instead TxViewChange is called with fUpdate = true
     // if (fUpdate && !OnInnerViewerExtentChanged())
@@ -163,12 +169,16 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Create the caret
   BOOL TxCreateCaret(HBITMAP hbmp, INT xWidth, INT yHeight) override {
+    if (!m_outer)
+      return false;
     m_outer->m_caretVisual.Size({static_cast<float>(xWidth), static_cast<float>(yHeight)});
     return true;
   }
 
   //@cmember Show the caret
   BOOL TxShowCaret(BOOL fShow) override {
+    if (!m_outer)
+      return false;
     // Only show the caret if we have focus
     if (fShow && !m_outer->m_hasFocus) {
       return false;
@@ -179,6 +189,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Set the caret position
   BOOL TxSetCaretPos(INT x, INT y) override {
+    if (!m_outer)
+      return false;
     if (x < 0 && y < 0) {
       // RichEdit sends (-32000,-32000) when the caret is not currently visible.
       return false;
@@ -217,6 +229,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get mouse capture
   void TxSetCapture(BOOL fCapture) override {
+    if (!m_outer)
+      return;
     auto mousePointer = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::Pointer>(
         winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse, 1 /* 1 is Mouse PointerId*/);
 
@@ -229,6 +243,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Set the focus to the text window
   void TxSetFocus() override {
+    if (!m_outer)
+      return;
     winrt::Microsoft::ReactNative::ComponentView view{nullptr};
     winrt::check_hresult(
         m_outer->QueryInterface(winrt::guid_of<winrt::Microsoft::ReactNative::ComponentView>(), winrt::put_abi(view)));
@@ -242,11 +258,15 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Establish a new cursor shape
   void TxSetCursor(HCURSOR hcur, BOOL fText) override {
+    if (!m_outer)
+      return;
     m_outer->m_hcursor = hcur;
   }
 
   //@cmember Converts screen coordinates of a specified point to the client coordinates
   BOOL TxScreenToClient(LPPOINT lppt) override {
+    if (!m_outer)
+      return false;
     winrt::Windows::Foundation::Point pt{static_cast<float>(lppt->x), static_cast<float>(lppt->y)};
     pt.X -= m_outer->m_contentOffsetPx.x;
     pt.Y -= m_outer->m_contentOffsetPx.y;
@@ -258,6 +278,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Converts the client coordinates of a specified point to screen coordinates
   BOOL TxClientToScreen(LPPOINT lppt) override {
+    if (!m_outer)
+      return false;
     winrt::Windows::Foundation::Point pt{static_cast<float>(lppt->x), static_cast<float>(lppt->y)};
 
     if (!m_outer->m_parent) {
@@ -284,6 +306,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Retrieves the coordinates of a window's client area
   HRESULT TxGetClientRect(LPRECT prc) override {
+    if (!m_outer)
+      return E_FAIL;
     *prc = m_outer->getClientRect();
 
     prc->top += m_outer->m_contentOffsetPx.y;
@@ -310,6 +334,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get the default character format for the text
   HRESULT TxGetCharFormat(const CHARFORMATW **ppCF) override {
+    if (!m_outer)
+      return E_FAIL;
     m_outer->UpdateCharFormat();
 
     *ppCF = &(m_outer->m_cf);
@@ -318,6 +344,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get the default paragraph format for the text
   HRESULT TxGetParaFormat(const PARAFORMAT **ppPF) override {
+    if (!m_outer)
+      return E_FAIL;
     m_outer->UpdateParaFormat();
 
     *ppPF = &(m_outer->m_pf);
@@ -326,6 +354,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get the background color for the window
   COLORREF TxGetSysColor(int nIndex) override {
+    if (!m_outer)
+      return GetSysColor(nIndex);
     // if (/* !m_isDisabled || */ nIndex != COLOR_WINDOW && nIndex != COLOR_WINDOWTEXT && nIndex != COLOR_GRAYTEXT) {
     // This window is either not disabled or the color isn't interesting
     // in the disabled case.
@@ -400,6 +430,10 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get the maximum length for the text
   HRESULT TxGetMaxLength(DWORD *plength) override {
+    if (!m_outer) {
+      *plength = std::numeric_limits<DWORD>::max();
+      return S_OK;
+    }
     auto length = m_outer->windowsTextInputProps().maxLength;
     if (length > static_cast<decltype(m_outer->windowsTextInputProps().maxLength)>(std::numeric_limits<DWORD>::max())) {
       length = std::numeric_limits<DWORD>::max();
@@ -410,6 +444,10 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Get the bits representing requested scroll bars for the window
   HRESULT TxGetScrollBars(DWORD *pdwScrollBar) override {
+    if (!m_outer) {
+      *pdwScrollBar = WS_HSCROLL | ES_AUTOHSCROLL;
+      return S_OK;
+    }
     if (m_outer->m_multiline) {
       *pdwScrollBar = WS_VSCROLL | WS_HSCROLL | ES_AUTOVSCROLL | ES_AUTOHSCROLL;
     } else {
@@ -457,7 +495,8 @@ struct CompTextHost : public winrt::implements<CompTextHost, ITextHost> {
 
   //@cmember Notify host of events
   HRESULT TxNotify(DWORD iNotify, void *pv) override {
-    // TODO
+    if (!m_outer)
+      return S_OK;
 
     switch (iNotify) {
       case EN_UPDATE:
@@ -542,6 +581,16 @@ WindowsTextInputComponentView::WindowsTextInputComponentView(
           reactContext,
           ComponentViewFeatures::Default & ~ComponentViewFeatures::Background) {}
 
+WindowsTextInputComponentView::~WindowsTextInputComponentView() {
+  // Release text services first to prevent further callbacks into CompTextHost.
+  m_textServices = nullptr;
+
+  // Detach the CompTextHost so any lingering references cannot use a dangling pointer.
+  if (m_textHost) {
+    winrt::get_self<CompTextHost>(m_textHost)->Detach();
+  }
+}
+
 void WindowsTextInputComponentView::HandleCommand(
     const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept {
   Super::HandleCommand(args);
@@ -649,17 +698,22 @@ WPARAM PointerRoutedEventArgsToMouseWParam(
   return wParam;
 }
 
-bool WindowsTextInputComponentView::IsDoubleClick() {
+bool WindowsTextInputComponentView::IsDoubleClick(uint32_t pointerId) {
   using namespace std::chrono;
 
   auto now = steady_clock::now();
-  auto duration = duration_cast<milliseconds>(now - m_lastClickTime).count();
+  auto it = m_lastClickTimeByPointer.find(pointerId);
+  bool isDouble = false;
 
-  const int DOUBLE_CLICK_TIME_MS = ::GetDoubleClickTime();
-
-  m_lastClickTime = now;
+  if (it != m_lastClickTimeByPointer.end()) {
+    auto duration = duration_cast<milliseconds>(now - it->second).count();
+    isDouble = (duration < ::GetDoubleClickTime());
+    it->second = now;
+  } else {
+    m_lastClickTimeByPointer[pointerId] = now;
+  }
 
-  return (duration < DOUBLE_CLICK_TIME_MS);
+  return isDouble;
 }
 
 void WindowsTextInputComponentView::OnPointerPressed(
@@ -678,7 +732,7 @@ 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:
-        if (IsDoubleClick()) {
+        if (IsDoubleClick(pp.PointerId())) {
           msg = WM_LBUTTONDBLCLK;
         } else {
           msg = WM_LBUTTONDOWN;
@@ -699,10 +753,14 @@ void WindowsTextInputComponentView::OnPointerPressed(
         wParam |= (XBUTTON2 << 16);
         break;
     }
-    wParam = PointerRoutedEventArgsToMouseWParam(args);
+    wParam |= PointerRoutedEventArgsToMouseWParam(args);
   } else {
-    msg = WM_POINTERDOWN;
-    wParam = PointerPointToPointerWParam(pp);
+    if (IsDoubleClick(pp.PointerId())) {
+      msg = WM_LBUTTONDBLCLK;
+    } else {
+      msg = WM_LBUTTONDOWN;
+    }
+    wParam = PointerRoutedEventArgsToMouseWParam(args);
   }
 
   if (m_textServices && msg) {
@@ -764,10 +822,10 @@ void WindowsTextInputComponentView::OnPointerReleased(
         wParam |= (XBUTTON2 << 16);
         break;
     }
-    wParam = PointerRoutedEventArgsToMouseWParam(args);
+    wParam |= PointerRoutedEventArgsToMouseWParam(args);
   } else {
-    msg = WM_POINTERUP;
-    wParam = PointerPointToPointerWParam(pp);
+    msg = WM_LBUTTONUP;
+    wParam = PointerRoutedEventArgsToMouseWParam(args);
   }
 
   if (m_textServices && msg) {
@@ -817,23 +875,18 @@ void WindowsTextInputComponentView::OnPointerMoved(
       static_cast<LONG>(position.Y * m_layoutMetrics.pointScaleFactor)};
   lParam = static_cast<LPARAM>(POINTTOPOINTS(ptContainer));
 
-  if (pp.PointerDeviceType() == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse) {
-    msg = WM_MOUSEMOVE;
-    wParam = PointerRoutedEventArgsToMouseWParam(args);
-  } else {
-    msg = WM_POINTERUPDATE;
-    wParam = PointerPointToPointerWParam(pp);
-  }
+  msg = WM_MOUSEMOVE;
+  wParam = PointerRoutedEventArgsToMouseWParam(args);
 
   if (m_textServices) {
     LRESULT lresult;
     DrawBlock db(*this);
     auto hr = m_textServices->TxSendMessage(msg, static_cast<WPARAM>(wParam), static_cast<LPARAM>(lParam), &lresult);
     args.Handled(hr != S_FALSE);
-  }
 
-  m_textServices->OnTxSetCursor(
-      DVASPECT_CONTENT, -1, nullptr, nullptr, nullptr, nullptr, nullptr, ptContainer.x, ptContainer.y);
+    m_textServices->OnTxSetCursor(
+        DVASPECT_CONTENT, -1, nullptr, nullptr, nullptr, nullptr, nullptr, ptContainer.x, ptContainer.y);
+  }
 }
 
 void WindowsTextInputComponentView::OnPointerWheelChanged(
@@ -935,7 +988,7 @@ bool WindowsTextInputComponentView::ShouldSubmit(
         bool ctrlDown = (args.KeyboardSource().GetKeyState(winrt::Windows::System::VirtualKey::Control) &
                          winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
             winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
-        bool altDown = (args.KeyboardSource().GetKeyState(winrt::Windows::System::VirtualKey::Control) &
+        bool altDown = (args.KeyboardSource().GetKeyState(winrt::Windows::System::VirtualKey::Menu) &
                         winrt::Microsoft::UI::Input::VirtualKeyStates::Down) ==
             winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
         bool metaDown = (args.KeyboardSource().GetKeyState(winrt::Windows::System::VirtualKey::LeftWindows) &
@@ -946,7 +999,7 @@ bool WindowsTextInputComponentView::ShouldSubmit(
                 winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
         return (submitKeyEvent.shiftKey && shiftDown) || (submitKeyEvent.ctrlKey && ctrlDown) ||
             (submitKeyEvent.altKey && altDown) || (submitKeyEvent.metaKey && metaDown) ||
-            (!submitKeyEvent.shiftKey && !submitKeyEvent.altKey && !submitKeyEvent.metaKey && !submitKeyEvent.altKey &&
+            (!submitKeyEvent.shiftKey && !submitKeyEvent.ctrlKey && !submitKeyEvent.altKey && !submitKeyEvent.metaKey &&
              !shiftDown && !ctrlDown && !altDown && !metaDown);
       } else {
         shouldSubmit = false;
@@ -1836,6 +1889,7 @@ WindowsTextInputComponentView::createVisual() noexcept {
   winrt::com_ptr<::IUnknown> spUnk;
   winrt::check_hresult(g_pfnCreateTextServices(nullptr, m_textHost.get(), spUnk.put()));
   spUnk.as(m_textServices);
+  winrt::check_bool(m_textServices != nullptr);
 
   LRESULT res;
   winrt::check_hresult(m_textServices->TxSendMessage(EM_SETTEXTMODE, TM_PLAINTEXT, 0, &res));

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

@@ -11,6 +11,7 @@
 #include <textserv.h>
 #include <windows.ui.composition.interop.h>
 #include <winrt/Windows.UI.Composition.h>
+#include <unordered_map>
 #include "../ComponentView.h"
 #include "../CompositionHelpers.h"
 #include "../CompositionViewComponentView.h"
@@ -74,12 +75,13 @@ struct WindowsTextInputComponentView
   std::optional<std::string> getAccessiblityValue() noexcept override;
   void setAcccessiblityValue(std::string &&value) noexcept override;
   bool getAcccessiblityIsReadOnly() noexcept override;
-  bool IsDoubleClick();
+  bool IsDoubleClick(uint32_t pointerId);
 
   WindowsTextInputComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
+  ~WindowsTextInputComponentView();
 
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisual createVisual() noexcept;
 
@@ -152,7 +154,7 @@ struct WindowsTextInputComponentView
   DWORD m_propBits{0};
   HCURSOR m_hcursor{nullptr};
   POINT m_caretPosition{0, 0};
-  std::chrono::steady_clock::time_point m_lastClickTime{};
+  std::unordered_map<uint32_t, std::chrono::steady_clock::time_point> m_lastClickTimeByPointer;
   std::vector<facebook::react::CompWindowsTextInputSubmitKeyEventsStruct> m_submitKeyEvents;
 };
 

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.cpp

@@ -46,12 +46,12 @@ WindowsComponentDescriptorRegistry::WindowsComponentDescriptorRegistry()
 }
 
 void WindowsComponentDescriptorRegistry::add(const facebook::react::ComponentDescriptorProvider &provider) noexcept {
-  m_componentNames.push_back(provider.name);
+  m_componentNames.insert(provider.name);
   m_componentDescriptorRegistry->add(provider);
 }
 
 bool WindowsComponentDescriptorRegistry::hasComponentProvider(const std::string &name) noexcept {
-  return std::find(m_componentNames.begin(), m_componentNames.end(), name) != m_componentNames.end();
+  return m_componentNames.count(name) != 0;
 }
 
 bool WindowsComponentDescriptorRegistry::isXamlSupportRequired() const noexcept {
@@ -68,7 +68,7 @@ void WindowsComponentDescriptorRegistry::Add(
   auto builder = winrt::make<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>();
   provider(builder);
 
-  m_componentNames.push_back(winrt::to_string(componentName));
+  m_componentNames.insert(winrt::to_string(componentName));
   m_descriptorFlavors.emplace_back(std::make_shared<std::string>(winrt::to_string(componentName)));
   auto handle = reinterpret_cast<facebook::react::ComponentHandle>(
       facebook::react::ComponentName(m_descriptorFlavors.back()->c_str()));

package/Microsoft.ReactNative/Fabric/WindowsComponentDescriptorRegistry.h

@@ -10,6 +10,8 @@
 #include <ReactPropertyBag.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
+#include <unordered_set>
+
 namespace Microsoft::ReactNative {
 
 struct WindowsComponentDescriptorRegistry {
@@ -41,7 +43,7 @@ struct WindowsComponentDescriptorRegistry {
   void add(const facebook::react::ComponentDescriptorProvider &provider) noexcept;
 
   std::vector<std::shared_ptr<const std::string>> m_descriptorFlavors;
-  std::vector<std::string> m_componentNames;
+  std::unordered_set<std::string> m_componentNames;
   std::shared_ptr<facebook::react::ComponentDescriptorProviderRegistry> m_componentDescriptorRegistry;
 
   std::map<std::shared_ptr<const std::string>, winrt::Microsoft::ReactNative::IReactViewComponentBuilder const>

package/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp

@@ -72,7 +72,6 @@ wicBitmapSourceFromStream(const winrt::Windows::Storage::Streams::IRandomAccessS
     return {decodedFrame, imagingFactory, nullptr};
   } catch (winrt::hresult_error const &ex) {
     auto errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
-    errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
     errorInfo->error = ::Microsoft::ReactNative::FormatHResultError(winrt::hresult_error(ex));
     return {nullptr, nullptr, errorInfo};
   }

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -428,7 +428,7 @@
   <ItemGroup>
     <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
+    <PackageReference Include="$(HermesPackageName)" Version="$(HermesVersion)" />
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
   </ItemGroup>

package/Microsoft.ReactNative/Modules/Animated/AnimatedNode.cpp

@@ -22,19 +22,19 @@ int64_t AnimatedNode::Tag() {
 }
 
 void AnimatedNode::AddChild(const int64_t animatedNodeTag) {
-  m_children.push_back(animatedNodeTag);
+  m_children.insert(animatedNodeTag);
   GetChildNode(animatedNodeTag)->OnAttachToNode(m_tag);
 }
 
 void AnimatedNode::RemoveChild(const int64_t tag) {
   if (const auto childNode = GetChildNode(tag)) {
     childNode->OnDetachedFromNode(m_tag);
-    m_children.erase(std::find(m_children.begin(), m_children.end(), tag));
+    m_children.erase(tag);
   }
 }
 
 AnimatedNode *AnimatedNode::GetChildNode(int64_t tag) {
-  if (std::find(m_children.begin(), m_children.end(), tag) != m_children.end()) {
+  if (m_children.count(tag)) {
     if (const auto manager = m_manager.lock()) {
       return manager->GetAnimatedNode(tag);
     }

package/Microsoft.ReactNative/Modules/Animated/AnimatedNode.h

@@ -6,6 +6,7 @@
 #include <JSValue.h>
 #include <cstdint>
 #include <memory>
+#include <unordered_set>
 #include <vector>
 
 namespace Microsoft::ReactNative {
@@ -20,7 +21,7 @@ class AnimatedNode {
   void AddChild(int64_t animatedNode);
   void RemoveChild(int64_t animatedNode);
 
-  std::vector<int64_t> &Children() {
+  std::unordered_set<int64_t> &Children() {
     return m_children;
   }
 
@@ -37,7 +38,7 @@ class AnimatedNode {
   AnimatedNode *GetChildNode(int64_t tag);
   int64_t m_tag{0};
   const std::weak_ptr<NativeAnimatedNodeManager> m_manager;
-  std::vector<int64_t> m_children{};
+  std::unordered_set<int64_t> m_children{};
   bool m_useComposition{false};
 
   bool HasCompatibleAnimationDriver(int64_t tag);

package/Microsoft.ReactNative/Modules/Timing.h

@@ -9,6 +9,7 @@
 #include <ReactCoreInjection.h>
 #include <react/runtime/PlatformTimerRegistry.h>
 #include <react/runtime/TimerManager.h>
+#include <atomic>
 
 namespace Microsoft::ReactNative {
 
@@ -114,7 +115,7 @@ struct Timing : public std::enable_shared_from_this<Timing> {
   xaml::Media::CompositionTarget::Rendering_revoker m_rendering;
   winrt::Microsoft::ReactNative::ITimer m_dispatcherQueueTimer{nullptr};
   winrt::weak_ref<winrt::Microsoft::ReactNative::IReactDispatcher> m_uiDispatcher;
-  bool m_usingRendering{false};
+  std::atomic<bool> m_usingRendering{false};
   bool m_usePostForRendering{false};
 };
 

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets

@@ -25,7 +25,7 @@
     <!-- WinUI package name and version are set by WinUI.props -->
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <!-- Hermes version is set by JSEngine.props -->
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
+    <PackageReference Include="$(HermesPackageName)" Version="$(HermesVersion)" />
   </ItemGroup>
 
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets"

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets

@@ -25,7 +25,7 @@
     <!-- WinUI package name and version are set by WinUI.props -->
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <!-- Hermes version is set by JSEngine.props -->
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
+    <PackageReference Include="$(HermesPackageName)" Version="$(HermesVersion)" />
   </ItemGroup>
 
   <!-- The props file for bundling is not set up to be just defaults, it assumes to be run at the end of the project. -->

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.84.0-preview.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.84.0-preview.6</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>84</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>c72727372283e8a8b3a82c21d817ad737c27f5ae</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>91ceaa8418a39db986927aaaff0cdd07dbf9ba2e</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -7,8 +7,9 @@
     <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
     <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2512.22001-bc3d0ed7</HermesVersion>
+    <HermesPackageName Condition="'$(HermesPackageName)' == ''">Microsoft.JavaScript.Hermes</HermesPackageName>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
-    <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\Microsoft.JavaScript.Hermes\$(HermesVersion)</HermesPackage>
+    <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\$(HermesPackageName)\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
     <!-- Disable linking Hermes into the output in cases where we need to fully rely on HermesShim -->
     <HermesNoLink Condition="'$(HermesNoLink)' == '' and '$(Configuration)' == 'Release' and '$(EnableHermesInspectorInReleaseFlavor)' != 'true'">true</HermesNoLink>