react-native-windows 0.81.1 → 0.81.3

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

@@ -227,6 +227,14 @@ void ReactCompositionViewComponentBuilder::SetUnmountChildComponentViewHandler(
   m_unmountChildComponentViewHandler = impl;
 }
 
+void ReactCompositionViewComponentBuilder::SetCreateAutomationPeerHandler(CreateAutomationPeerDelegate impl) noexcept {
+  m_createAutomationPeerHandler = impl;
+}
+
+const CreateAutomationPeerDelegate &ReactCompositionViewComponentBuilder::CreateAutomationPeerHandler() const noexcept {
+  return m_createAutomationPeerHandler;
+}
+
 const UnmountChildComponentViewDelegate &ReactCompositionViewComponentBuilder::UnmountChildComponentViewHandler()
     const noexcept {
   return m_unmountChildComponentViewHandler;

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

@@ -39,6 +39,7 @@ struct ReactCompositionViewComponentBuilder
   void SetUpdateEventEmitterHandler(UpdateEventEmitterDelegate impl) noexcept;
   void SetMountChildComponentViewHandler(MountChildComponentViewDelegate impl) noexcept;
   void SetUnmountChildComponentViewHandler(UnmountChildComponentViewDelegate impl) noexcept;
+  void SetCreateAutomationPeerHandler(CreateAutomationPeerDelegate impl) noexcept;
 
  public: // Composition::IReactCompositionViewComponentBuilder
   void SetViewComponentViewInitializer(const ViewComponentViewInitializer &initializer) noexcept;
@@ -77,6 +78,7 @@ struct ReactCompositionViewComponentBuilder
   const CreateVisualDelegate &CreateVisualHandler() const noexcept;
   const winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate &
   VisualToMountChildrenIntoHandler() const noexcept;
+  const CreateAutomationPeerDelegate &CreateAutomationPeerHandler() const noexcept;
 
  private:
   void InitializeComponentView(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
@@ -103,6 +105,7 @@ struct ReactCompositionViewComponentBuilder
   winrt::Microsoft::ReactNative::UpdateEventEmitterDelegate m_updateEventEmitterHandler;
   winrt::Microsoft::ReactNative::MountChildComponentViewDelegate m_mountChildComponentViewHandler;
   winrt::Microsoft::ReactNative::UnmountChildComponentViewDelegate m_unmountChildComponentViewHandler;
+  winrt::Microsoft::ReactNative::CreateAutomationPeerDelegate m_createAutomationPeerHandler;
 
   winrt::Microsoft::ReactNative::Composition::CreateVisualDelegate m_createVisualHandler;
   winrt::Microsoft::ReactNative::Composition::Experimental::IVisualToMountChildrenIntoDelegate

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

@@ -8,7 +8,10 @@
 
 #include <Fabric/FabricUIManagerModule.h>
 #include <winrt/Microsoft.UI.Input.h>
+#include "CompositionDynamicAutomationProvider.h"
 #include "CompositionRootAutomationProvider.h"
+#include "ContentIslandComponentView.h"
+#include "ParagraphComponentView.h"
 #include "ReactNativeIsland.h"
 #include "Theme.h"
 
@@ -275,7 +278,7 @@ facebook::react::Point RootComponentView::getClientOffset() const noexcept {
   return {};
 }
 
-winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixels) noexcept {
+winrt::IUnknown RootComponentView::UiaProviderFromPoint(const POINT &ptPixels, const POINT &ptScreen) noexcept {
   facebook::react::Point ptDips{
       static_cast<facebook::react::Float>(ptPixels.x) / m_layoutMetrics.pointScaleFactor,
       static_cast<facebook::react::Float>(ptPixels.y) / m_layoutMetrics.pointScaleFactor};
@@ -295,7 +298,41 @@ winrt::IInspectable RootComponentView::UiaProviderFromPoint(const POINT &ptPixel
   if (view == nullptr)
     return nullptr;
 
-  return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider();
+  auto uiaProvider =
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(view)->EnsureUiaProvider();
+
+  if (auto contentIsland =
+          view.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ContentIslandComponentView>()) {
+    if (contentIsland->InnerAutomationProvider()) {
+      if (auto childProvider = contentIsland->InnerAutomationProvider()->TryGetChildSiteLinkAutomationProvider()) {
+        // ChildProvider is the the automation provider from the ChildSiteLink.  In the case of WinUI, this
+        // is a pointer to WinUI's internal CUIAHostWindow object.
+        // It seems odd, but even though this node doesn't behave as a fragment root in our case (the real fragment root
+        // is the RootComponentView's UIA provider), we still use its IRawElementProviderFragmentRoot -- just so
+        // we can do the ElementProviderFromPoint call.  (this was recommended by the team who did the initial
+        // architecture work).
+        if (auto fragmentRoot = childProvider.try_as<IRawElementProviderFragmentRoot>()) {
+          com_ptr<IRawElementProviderFragment> frag;
+          // WinUI then does its own hitTest inside the XAML tree.
+          fragmentRoot->ElementProviderFromPoint(
+              ptScreen
+                  .x, // Note since we're going through IRawElementProviderFragment the coordinates are in screen space.
+              ptScreen.y,
+              frag.put());
+          // We return the specific child provider(frag) when hosted XAML has an element
+          // under the cursor. This satisfies the UIA "element at point" contract and exposes
+          // the control’s patterns/properties. If the hosted tree finds nothing, we fall back
+          // to the RNW container’s provider (uiaProvider) to keep the island accessible.
+          // (A Microsoft_UI_Xaml!CUIAWrapper object)
+          if (frag) {
+            return frag.as<winrt::IUnknown>();
+          }
+        }
+      }
+    }
+  }
+
+  return uiaProvider;
 }
 
 float RootComponentView::FontSizeMultiplier() const noexcept {
@@ -349,4 +386,18 @@ HWND RootComponentView::GetHwndForParenting() noexcept {
   return base_type::GetHwndForParenting();
 }
 
+void RootComponentView::ClearCurrentTextSelection() noexcept {
+  if (auto view = m_viewWithTextSelection.view()) {
+    if (auto paragraphView = view.try_as<ParagraphComponentView>()) {
+      paragraphView->ClearSelection();
+    }
+  }
+  m_viewWithTextSelection =
+      ::Microsoft::ReactNative::ReactTaggedView{winrt::Microsoft::ReactNative::ComponentView{nullptr}};
+}
+
+void RootComponentView::SetViewWithTextSelection(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
+  m_viewWithTextSelection = ::Microsoft::ReactNative::ReactTaggedView{view};
+}
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Fabric/ComponentView.h>
+#include <Fabric/ReactTaggedView.h>
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 
 #include "CompositionViewComponentView.h"
@@ -64,7 +65,7 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
 
-  winrt::Windows::Foundation::IInspectable UiaProviderFromPoint(const POINT &ptPixels) noexcept;
+  winrt::Windows::Foundation::IUnknown UiaProviderFromPoint(const POINT &ptPixels, const POINT &ptScreen) noexcept;
 
   RootComponentView(
       const winrt::Microsoft::ReactNative::Composition::Experimental::ICompositionContext &compContext,
@@ -86,6 +87,9 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
 
   HWND GetHwndForParenting() noexcept override;
 
+  void ClearCurrentTextSelection() noexcept;
+  void SetViewWithTextSelection(const winrt::Microsoft::ReactNative::ComponentView &view) noexcept;
+
  private:
   // should this be a ReactTaggedView? - It shouldn't actually matter since if the view is going away it should always
   // be clearing its focus But being a reactTaggedView might make it easier to identify cases where that isn't
@@ -94,6 +98,9 @@ struct RootComponentView : RootComponentViewT<RootComponentView, ViewComponentVi
   winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView{nullptr};
   winrt::weak_ref<winrt::Microsoft::ReactNative::Composition::PortalComponentView> m_wkPortal{nullptr};
   bool m_visualAddedToIsland{false};
+
+  ::Microsoft::ReactNative::ReactTaggedView m_viewWithTextSelection{
+      winrt::Microsoft::ReactNative::ComponentView{nullptr}};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -20,7 +20,6 @@
 #include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
 #include <unicode.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "JSValueReader.h"
 #include "RootComponentView.h"
 

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

@@ -7,7 +7,6 @@
 #include "SwitchComponentView.h"
 #include <AutoDraw.h>
 #include <Fabric/AbiViewProps.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "RootComponentView.h"
 #include "UiaHelpers.h"
 

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

@@ -6,7 +6,6 @@
 #include "WindowsTextInputComponentView.h"
 
 #include <AutoDraw.h>
-#include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
 #include <Fabric/Composition/UiaHelpers.h>
 #include <Fabric/platform/react/renderer/graphics/PlatformColorUtils.h>
 #include <Utils/ThemeUtils.h>
@@ -1782,6 +1781,9 @@ WindowsTextInputComponentView::createVisual() noexcept {
   LRESULT res;
   winrt::check_hresult(m_textServices->TxSendMessage(EM_SETTEXTMODE, TM_PLAINTEXT, 0, &res));
 
+  // Enable TSF support
+  winrt::check_hresult(m_textServices->TxSendMessage(EM_SETEDITSTYLE, SES_USECTF, SES_USECTF, nullptr));
+
   m_caretVisual = m_compContext.CreateCaretVisual();
   visual.InsertAt(m_caretVisual.InnerVisual(), 0);
   m_caretVisual.IsVisible(false);

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

@@ -174,6 +174,12 @@ bool Theme::TryGetPlatformColor(const std::string &platformColor, winrt::Windows
     return true;
   }
 
+  if (platformColor == "Highlight@40" && TryGetPlatformColor("Highlight", color)) {
+    color.A = static_cast<uint8_t>(static_cast<float>(color.A) * 0.4f);
+    m_colorCache[platformColor] = std::make_pair(true, color);
+    return true;
+  }
+
   auto uiColor = s_uiColorTypes.find(platformColor);
   if (uiColor != s_uiColorTypes.end()) {
     auto uiSettings{winrt::Windows::UI::ViewManagement::UISettings()};

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

@@ -267,7 +267,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/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.cpp

@@ -513,27 +513,45 @@ ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept {
 }
 
 void AddSelectionItemsToContainer(CompositionDynamicAutomationProvider *provider) noexcept {
-  winrt::com_ptr<IRawElementProviderSimple> selectionContainer;
-  provider->get_SelectionContainer(selectionContainer.put());
-  if (!selectionContainer)
+  auto selectionContainerView = provider->GetSelectionContainer();
+  if (!selectionContainerView)
     return;
-  auto selectionContainerProvider = selectionContainer.as<CompositionDynamicAutomationProvider>();
+
+  auto selectionContainerCompView =
+      selectionContainerView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+  if (!selectionContainerCompView)
+    return;
+
+  selectionContainerCompView->EnsureUiaProvider();
+
+  if (!selectionContainerCompView->InnerAutomationProvider())
+    return;
+
   auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
   winrt::com_ptr<IRawElementProviderSimple> simpleProviderPtr;
   simpleProviderPtr.copy_from(simpleProvider);
-  selectionContainerProvider->AddToSelectionItems(simpleProviderPtr);
+  selectionContainerCompView->InnerAutomationProvider()->AddToSelectionItems(simpleProviderPtr);
 }
 
 void RemoveSelectionItemsFromContainer(CompositionDynamicAutomationProvider *provider) noexcept {
-  winrt::com_ptr<IRawElementProviderSimple> selectionContainer;
-  provider->get_SelectionContainer(selectionContainer.put());
-  if (!selectionContainer)
+  auto selectionContainerView = provider->GetSelectionContainer();
+  if (!selectionContainerView)
     return;
-  auto selectionContainerProvider = selectionContainer.as<CompositionDynamicAutomationProvider>();
+
+  auto selectionContainerCompView =
+      selectionContainerView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
+  if (!selectionContainerCompView)
+    return;
+
+  selectionContainerCompView->EnsureUiaProvider();
+
+  if (!selectionContainerCompView->InnerAutomationProvider())
+    return;
+
   auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
   winrt::com_ptr<IRawElementProviderSimple> simpleProviderPtr;
   simpleProviderPtr.copy_from(simpleProvider);
-  selectionContainerProvider->RemoveFromSelectionItems(simpleProviderPtr);
+  selectionContainerCompView->InnerAutomationProvider()->RemoveFromSelectionItems(simpleProviderPtr);
 }
 
 ToggleState GetToggleState(const std::optional<facebook::react::AccessibilityState> &state) noexcept {

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

@@ -8,7 +8,6 @@
 
 #include <AutoDraw.h>
 #include <Fabric/DWriteHelpers.h>
-#include "CompositionDynamicAutomationProvider.h"
 #include "Unicode.h"
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {

package/Microsoft.ReactNative/Fabric/ReactTaggedView.h

@@ -16,7 +16,7 @@ namespace Microsoft::ReactNative {
  */
 struct ReactTaggedView {
   ReactTaggedView(const winrt::Microsoft::ReactNative::ComponentView &componentView)
-      : m_view(componentView), m_tag(componentView.Tag()) {}
+      : m_view(componentView), m_tag(componentView ? componentView.Tag() : -1) {}
 
   winrt::Microsoft::ReactNative::ComponentView view() noexcept {
     if (!m_view) {

package/Microsoft.ReactNative/Fabric/platform/react/renderer/textlayoutmanager/WindowsTextLayoutManager.h

@@ -56,8 +56,9 @@ class WindowsTextLayoutManager : public TextLayoutManager {
       TextMeasurement::Attachments &attachments,
       float minimumFontScale) noexcept;
 
- private:
   static winrt::hstring GetTransformedText(const AttributedStringBox &attributedStringBox);
+
+ private:
   static void GetTextLayout(
       const AttributedStringBox &attributedStringBox,
       const ParagraphAttributes &paragraphAttributes,

package/Microsoft.ReactNative/IReactViewComponentBuilder.idl

@@ -54,6 +54,10 @@ namespace Microsoft.ReactNative
     Boolean Handled;
   };
 
+  runtimeclass CreateAutomationPeerArgs {
+    Object DefaultAutomationPeer { get; };
+  };
+
   [experimental]
   DOC_STRING("A delegate that creates a @IComponentProps object for an instance of @ViewProps. See @IReactViewComponentBuilder.SetCreateProps")
   delegate IComponentProps ViewPropsFactory(ViewProps props, IComponentProps cloneFrom);
@@ -95,6 +99,9 @@ namespace Microsoft.ReactNative
   [experimental]
   delegate void UnmountChildComponentViewDelegate(ComponentView source, UnmountChildComponentViewArgs args);
 
+  [experimental]
+  delegate Object CreateAutomationPeerDelegate(ComponentView source, CreateAutomationPeerArgs args);
+
   [experimental]
   runtimeclass EventEmitter {
     void DispatchEvent(String eventName, JSValueArgWriter args);
@@ -124,6 +131,7 @@ namespace Microsoft.ReactNative
     void SetUpdateEventEmitterHandler(UpdateEventEmitterDelegate impl);
     void SetMountChildComponentViewHandler(MountChildComponentViewDelegate impl);
     void SetUnmountChildComponentViewHandler(UnmountChildComponentViewDelegate impl);
+    void SetCreateAutomationPeerHandler(CreateAutomationPeerDelegate impl);
   };
 
   // [exclusiveto(ShadowNode)]

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -313,6 +313,7 @@
     <ClInclude Include="Utils\TransformableText.h" />
     <ClInclude Include="Utils\UwpPreparedScriptStore.h" />
     <ClInclude Include="Utils\UwpScriptStore.h" />
+    <ClInclude Include="Utils\IcuUtils.h" />
     <ClInclude Include="Utils\ValueUtils.h" />
     <ClInclude Include="Utils\XamlIslandUtils.h" />
     <ClInclude Include="Utils\XamlUtils.h" />

package/Microsoft.ReactNative/Utils/IcuUtils.cpp

@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "IcuUtils.h"
+#include <icu.h>
+
+namespace Microsoft::ReactNative::IcuUtils {
+
+void UBreakIteratorDeleter::operator()(void *ptr) const noexcept {
+  if (ptr) {
+    ubrk_close(static_cast<UBreakIterator *>(ptr));
+  }
+}
+
+WordBreakIterator::WordBreakIterator(const wchar_t *text, int32_t length) noexcept : m_length(length) {
+  UErrorCode status = U_ZERO_ERROR;
+  auto *iter = ubrk_open(UBRK_WORD, nullptr, reinterpret_cast<const UChar *>(text), length, &status);
+  if (U_SUCCESS(status)) {
+    m_breakIterator.reset(static_cast<void *>(iter));
+  }
+}
+
+bool WordBreakIterator::IsValid() const noexcept {
+  return m_breakIterator != nullptr;
+}
+
+bool WordBreakIterator::GetWordBoundaries(int32_t position, int32_t &outStart, int32_t &outEnd) const noexcept {
+  if (!m_breakIterator || position < 0 || position >= m_length) {
+    return false;
+  }
+
+  auto *iter = static_cast<UBreakIterator *>(m_breakIterator.get());
+
+  int32_t start = ubrk_preceding(iter, position + 1);
+  if (start == UBRK_DONE) {
+    start = 0;
+  }
+
+  int32_t end = ubrk_following(iter, position);
+  if (end == UBRK_DONE) {
+    end = m_length;
+  }
+
+  int32_t ruleStatus = ubrk_getRuleStatus(iter);
+  if (ruleStatus == UBRK_WORD_NONE) {
+    return false;
+  }
+
+  outStart = start;
+  outEnd = end;
+  return true;
+}
+
+bool IsAlphanumeric(UChar32 codePoint) noexcept {
+  return u_isalnum(codePoint) != 0;
+}
+
+UChar32 GetCodePointAt(const wchar_t *str, int32_t length, int32_t pos) noexcept {
+  if (!str || length <= 0 || pos < 0 || pos >= length) {
+    return 0;
+  }
+  UChar32 cp;
+  U16_GET(str, 0, pos, length, cp);
+  return cp;
+}
+
+int32_t MoveToPreviousCodePoint(const wchar_t *str, int32_t pos) noexcept {
+  if (!str || pos <= 0) {
+    return 0;
+  }
+  U16_BACK_1(str, 0, pos);
+  return pos;
+}
+
+int32_t MoveToNextCodePoint(const wchar_t *str, int32_t length, int32_t pos) noexcept {
+  if (!str || length <= 0 || pos >= length) {
+    return length;
+  }
+  U16_FWD_1(str, pos, length);
+  return pos;
+}
+
+} // namespace Microsoft::ReactNative::IcuUtils

package/Microsoft.ReactNative/Utils/IcuUtils.h

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+
+// ICU utilities wrapped in a namespace to avoid UChar naming conflicts with Folly's FBString.
+// Folly has a template parameter named 'UChar' which conflicts with ICU's global UChar typedef.
+namespace Microsoft::ReactNative::IcuUtils {
+
+using UChar32 = int32_t;
+
+struct UBreakIteratorDeleter {
+  void operator()(void *ptr) const noexcept;
+};
+
+class WordBreakIterator {
+ public:
+  WordBreakIterator(const wchar_t *text, int32_t length) noexcept;
+
+  WordBreakIterator(const WordBreakIterator &) = delete;
+  WordBreakIterator &operator=(const WordBreakIterator &) = delete;
+  WordBreakIterator(WordBreakIterator &&) = default;
+  WordBreakIterator &operator=(WordBreakIterator &&) = default;
+
+  bool IsValid() const noexcept;
+
+  bool GetWordBoundaries(int32_t position, int32_t &outStart, int32_t &outEnd) const noexcept;
+
+ private:
+  std::unique_ptr<void, UBreakIteratorDeleter> m_breakIterator{nullptr};
+  int32_t m_length = 0;
+};
+
+bool IsAlphanumeric(UChar32 codePoint) noexcept;
+UChar32 GetCodePointAt(const wchar_t *str, int32_t length, int32_t pos) noexcept;
+int32_t MoveToPreviousCodePoint(const wchar_t *str, int32_t pos) noexcept;
+int32_t MoveToNextCodePoint(const wchar_t *str, int32_t length, int32_t pos) noexcept;
+
+} // namespace Microsoft::ReactNative::IcuUtils

package/Microsoft.ReactNative.Cxx/StructInfo.h

@@ -81,7 +81,7 @@ struct FieldInfo {
   FieldInfo(TValue TClass::*fieldPtr) noexcept
       : m_fieldReader{FieldReader<TClass, TValue>},
         m_fieldWriter{FieldWriter<TClass, TValue>},
-        m_fieldPtrStore{*reinterpret_cast<uintptr_t *>(&fieldPtr)} {
+        m_fieldPtrStore{StoreFieldPtr(fieldPtr)} {
     static_assert(sizeof(m_fieldPtrStore) >= sizeof(fieldPtr));
   }
 
@@ -94,6 +94,13 @@ struct FieldInfo {
   }
 
  private:
+  template <class TClass, class TValue>
+  static uintptr_t StoreFieldPtr(TValue TClass::*fieldPtr) noexcept {
+    uintptr_t result{};
+    std::memcpy(&result, &fieldPtr, sizeof(fieldPtr));
+    return result;
+  }
+
   FieldReaderType m_fieldReader;
   FieldWriterType m_fieldWriter;
   const uintptr_t m_fieldPtrStore;

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.81.1</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.81.3</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>81</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>1</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>3</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>58d0858332f98821a7f434ba5f6e39ddbe81d0cc</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>2c35b82f34d7821ca3d855c0bb51fb44d4d8c1df</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Shared.vcxitems

@@ -519,6 +519,7 @@
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\RedBoxErrorInfo.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\TurboModulesProvider.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\Helpers.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\IcuUtils.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ImageUtils.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ThemeUtils.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Views\DevMenu.cpp" />

package/Shared/Shared.vcxitems.filters

@@ -105,6 +105,7 @@
       <Filter>Source Files\Modules</Filter>
     </ClCompile>
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ImageUtils.cpp" />
+    <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\IcuUtils.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\Helpers.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Views\DevMenu.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\codegen\react\components\rnwcore\EventEmitters.cpp">

package/codegen/react/components/rnwcore/ActivityIndicatorView.g.h

@@ -110,6 +110,12 @@ struct BaseActivityIndicatorView {
                                         winrt::Microsoft::ReactNative::ComponentViewUpdateMask /*mask*/) noexcept {
   }
 
+  // CreateAutomationPeer will only be called if this method is overridden
+  virtual winrt::Windows::Foundation::IInspectable CreateAutomationPeer(const winrt::Microsoft::ReactNative::ComponentView & /*view*/,
+                                        const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& /*args*/) noexcept {
+    return nullptr;
+  }
+
   
 
   const std::shared_ptr<ActivityIndicatorViewEventEmitter>& EventEmitter() const { return m_eventEmitter; }
@@ -185,6 +191,14 @@ void RegisterActivityIndicatorViewNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseActivityIndicatorView<TUserData>::CreateAutomationPeer) {
+            builder.SetCreateAutomationPeerHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
+                                     const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& args) noexcept {
+            auto userData = view.UserData().as<TUserData>();
+            return userData->CreateAutomationPeer(view, args);
+          });
+        } 
+
         compBuilder.SetViewComponentViewInitializer([](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
           auto userData = winrt::make_self<TUserData>();
           if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::Initialize != &BaseActivityIndicatorView<TUserData>::Initialize) {

package/codegen/react/components/rnwcore/AndroidDrawerLayout.g.h

@@ -167,6 +167,12 @@ struct BaseAndroidDrawerLayout {
                                         winrt::Microsoft::ReactNative::ComponentViewUpdateMask /*mask*/) noexcept {
   }
 
+  // CreateAutomationPeer will only be called if this method is overridden
+  virtual winrt::Windows::Foundation::IInspectable CreateAutomationPeer(const winrt::Microsoft::ReactNative::ComponentView & /*view*/,
+                                        const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& /*args*/) noexcept {
+    return nullptr;
+  }
+
   // You must provide an implementation of this method to handle the "openDrawer" command
   virtual void HandleOpenDrawerCommand() noexcept = 0;
 
@@ -268,6 +274,14 @@ void RegisterAndroidDrawerLayoutNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseAndroidDrawerLayout<TUserData>::CreateAutomationPeer) {
+            builder.SetCreateAutomationPeerHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
+                                     const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& args) noexcept {
+            auto userData = view.UserData().as<TUserData>();
+            return userData->CreateAutomationPeer(view, args);
+          });
+        } 
+
         compBuilder.SetViewComponentViewInitializer([](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
           auto userData = winrt::make_self<TUserData>();
           if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::Initialize != &BaseAndroidDrawerLayout<TUserData>::Initialize) {

package/codegen/react/components/rnwcore/AndroidHorizontalScrollContentView.g.h

@@ -98,6 +98,12 @@ struct BaseAndroidHorizontalScrollContentView {
                                         winrt::Microsoft::ReactNative::ComponentViewUpdateMask /*mask*/) noexcept {
   }
 
+  // CreateAutomationPeer will only be called if this method is overridden
+  virtual winrt::Windows::Foundation::IInspectable CreateAutomationPeer(const winrt::Microsoft::ReactNative::ComponentView & /*view*/,
+                                        const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& /*args*/) noexcept {
+    return nullptr;
+  }
+
   
 
   const std::shared_ptr<AndroidHorizontalScrollContentViewEventEmitter>& EventEmitter() const { return m_eventEmitter; }
@@ -173,6 +179,14 @@ void RegisterAndroidHorizontalScrollContentViewNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseAndroidHorizontalScrollContentView<TUserData>::CreateAutomationPeer) {
+            builder.SetCreateAutomationPeerHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
+                                     const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& args) noexcept {
+            auto userData = view.UserData().as<TUserData>();
+            return userData->CreateAutomationPeer(view, args);
+          });
+        } 
+
         compBuilder.SetViewComponentViewInitializer([](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
           auto userData = winrt::make_self<TUserData>();
           if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::Initialize != &BaseAndroidHorizontalScrollContentView<TUserData>::Initialize) {

package/codegen/react/components/rnwcore/AndroidProgressBar.g.h

@@ -122,6 +122,12 @@ struct BaseAndroidProgressBar {
                                         winrt::Microsoft::ReactNative::ComponentViewUpdateMask /*mask*/) noexcept {
   }
 
+  // CreateAutomationPeer will only be called if this method is overridden
+  virtual winrt::Windows::Foundation::IInspectable CreateAutomationPeer(const winrt::Microsoft::ReactNative::ComponentView & /*view*/,
+                                        const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& /*args*/) noexcept {
+    return nullptr;
+  }
+
   
 
   const std::shared_ptr<AndroidProgressBarEventEmitter>& EventEmitter() const { return m_eventEmitter; }
@@ -197,6 +203,14 @@ void RegisterAndroidProgressBarNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseAndroidProgressBar<TUserData>::CreateAutomationPeer) {
+            builder.SetCreateAutomationPeerHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
+                                     const winrt::Microsoft::ReactNative::CreateAutomationPeerArgs& args) noexcept {
+            auto userData = view.UserData().as<TUserData>();
+            return userData->CreateAutomationPeer(view, args);
+          });
+        } 
+
         compBuilder.SetViewComponentViewInitializer([](const winrt::Microsoft::ReactNative::ComponentView &view) noexcept {
           auto userData = winrt::make_self<TUserData>();
           if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::Initialize != &BaseAndroidProgressBar<TUserData>::Initialize) {