react-native-windows 0.81.2 → 0.81.4

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/Mso/src/dispatchQueue/queueService.cpp

@@ -205,8 +205,10 @@ void QueueService::InvokeTask(
   DispatchTask taskToInvoke{std::move(task)};
   taskToInvoke.Get()->Invoke(); // Call Get()->Invoke instead of operator() to flatten call stack
 
-  while (taskToInvoke = context.TakeNextDeferredTask()) {
+  taskToInvoke = context.TakeNextDeferredTask();
+  while (taskToInvoke) {
     taskToInvoke.Get()->Invoke();
+    taskToInvoke = context.TakeNextDeferredTask();
   }
 }
 

package/Mso/src/dispatchQueue/uiScheduler_winrt.cpp

@@ -271,7 +271,8 @@ bool UISchedulerWinRT<TDispatcherTraits>::TryTakeTask(
     --m_taskCount;
   }
 
-  if (queue = m_queue.GetStrongPtr()) {
+  queue = m_queue.GetStrongPtr();
+  if (queue) {
     return queue->TryDequeTask(task);
   }
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.81.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.81.4</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>81</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>2</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>4</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>2589a216e30d0edb9b2be922ba8b5a3fb6ce2591</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>6cfb66be9b4dbbdff53e896e215230cdeddc38a6</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Networking/OriginPolicyHttpFilter.cpp

@@ -758,7 +758,8 @@ ResponseOperation OriginPolicyHttpFilter::SendRequestAsync(HttpRequestMessage co
     if (originPolicy == OriginPolicy::CrossOriginResourceSharing) {
       // If inner filter can AllowRedirect, disable for preflight.
       winrt::impl::com_ref<IHttpBaseProtocolFilter> baseFilter;
-      if (baseFilter = m_innerFilter.try_as<IHttpBaseProtocolFilter>()) {
+      baseFilter = m_innerFilter.try_as<IHttpBaseProtocolFilter>();
+      if (baseFilter) {
         baseFilter.AllowAutoRedirect(false);
       }
 

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

@@ -59,55 +59,55 @@ struct AndroidDrawerLayoutProps : winrt::implements<AndroidDrawerLayoutProps, wi
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerSlide)
-struct AndroidDrawerLayout_OnDrawerSlide {
-  REACT_FIELD(offset)
-  float offset{};
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerClose)
+struct AndroidDrawerLayoutSpec_onDrawerClose {
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerStateChanged)
-struct AndroidDrawerLayout_OnDrawerStateChanged {
-  REACT_FIELD(drawerState)
-  int32_t drawerState{};
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerOpen)
+struct AndroidDrawerLayoutSpec_onDrawerOpen {
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerOpen)
-struct AndroidDrawerLayout_OnDrawerOpen {
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerStateChanged)
+struct AndroidDrawerLayoutSpec_onDrawerStateChanged {
+  REACT_FIELD(drawerState)
+  int32_t drawerState{};
 };
 
-REACT_STRUCT(AndroidDrawerLayout_OnDrawerClose)
-struct AndroidDrawerLayout_OnDrawerClose {
+REACT_STRUCT(AndroidDrawerLayoutSpec_onDrawerSlide)
+struct AndroidDrawerLayoutSpec_onDrawerSlide {
+  REACT_FIELD(offset)
+  float offset{};
 };
 
 struct AndroidDrawerLayoutEventEmitter {
   AndroidDrawerLayoutEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnDrawerSlide = AndroidDrawerLayout_OnDrawerSlide;
-  using OnDrawerStateChanged = AndroidDrawerLayout_OnDrawerStateChanged;
-  using OnDrawerOpen = AndroidDrawerLayout_OnDrawerOpen;
-  using OnDrawerClose = AndroidDrawerLayout_OnDrawerClose;
+  using OnDrawerSlide = AndroidDrawerLayoutSpec_onDrawerSlide;
+  using OnDrawerStateChanged = AndroidDrawerLayoutSpec_onDrawerStateChanged;
+  using OnDrawerOpen = AndroidDrawerLayoutSpec_onDrawerOpen;
+  using OnDrawerClose = AndroidDrawerLayoutSpec_onDrawerClose;
 
   void onDrawerSlide(OnDrawerSlide &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerSlide", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+    m_eventEmitter.DispatchEvent(L"drawerSlide", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
   void onDrawerStateChanged(OnDrawerStateChanged &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerStateChanged", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+    m_eventEmitter.DispatchEvent(L"drawerStateChanged", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
   void onDrawerOpen(OnDrawerOpen &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerOpen", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+    m_eventEmitter.DispatchEvent(L"drawerOpen", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
 
   void onDrawerClose(OnDrawerClose &value) const {
-    m_eventEmitter.DispatchEvent(L"drawerClose", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+    m_eventEmitter.DispatchEvent(L"drawerClose", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
@@ -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) {

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

@@ -59,18 +59,18 @@ struct AndroidSwipeRefreshLayoutProps : winrt::implements<AndroidSwipeRefreshLay
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
-REACT_STRUCT(AndroidSwipeRefreshLayout_OnRefresh)
-struct AndroidSwipeRefreshLayout_OnRefresh {
+REACT_STRUCT(AndroidSwipeRefreshLayoutSpec_onRefresh)
+struct AndroidSwipeRefreshLayoutSpec_onRefresh {
 };
 
 struct AndroidSwipeRefreshLayoutEventEmitter {
   AndroidSwipeRefreshLayoutEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnRefresh = AndroidSwipeRefreshLayout_OnRefresh;
+  using OnRefresh = AndroidSwipeRefreshLayoutSpec_onRefresh;
 
   void onRefresh(OnRefresh &value) const {
-    m_eventEmitter.DispatchEvent(L"refresh", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+    m_eventEmitter.DispatchEvent(L"refresh", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
@@ -130,6 +130,12 @@ struct BaseAndroidSwipeRefreshLayout {
                                         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 "setNativeRefreshing" command
   virtual void HandleSetNativeRefreshingCommand(bool value) noexcept = 0;
 
@@ -223,6 +229,14 @@ void RegisterAndroidSwipeRefreshLayoutNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseAndroidSwipeRefreshLayout<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 != &BaseAndroidSwipeRefreshLayout<TUserData>::Initialize) {

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

@@ -71,8 +71,8 @@ struct AndroidSwitchProps : winrt::implements<AndroidSwitchProps, winrt::Microso
   const winrt::Microsoft::ReactNative::ViewProps ViewProps;
 };
 
-REACT_STRUCT(AndroidSwitch_OnChange)
-struct AndroidSwitch_OnChange {
+REACT_STRUCT(AndroidSwitchSpec_onChange)
+struct AndroidSwitchSpec_onChange {
   REACT_FIELD(value)
   bool value{};
 
@@ -84,10 +84,10 @@ struct AndroidSwitchEventEmitter {
   AndroidSwitchEventEmitter(const winrt::Microsoft::ReactNative::EventEmitter &eventEmitter)
       : m_eventEmitter(eventEmitter) {}
 
-  using OnChange = AndroidSwitch_OnChange;
+  using OnChange = AndroidSwitchSpec_onChange;
 
   void onChange(OnChange &value) const {
-    m_eventEmitter.DispatchEvent(L"change", [value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
+    m_eventEmitter.DispatchEvent(L"change", [&value](const winrt::Microsoft::ReactNative::IJSValueWriter writer) {
       winrt::Microsoft::ReactNative::WriteValue(writer, value);
     });
   }
@@ -147,6 +147,12 @@ struct BaseAndroidSwitch {
                                         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 "setNativeValue" command
   virtual void HandleSetNativeValueCommand(bool value) noexcept = 0;
 
@@ -240,6 +246,14 @@ void RegisterAndroidSwitchNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseAndroidSwitch<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 != &BaseAndroidSwitch<TUserData>::Initialize) {

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

@@ -95,6 +95,12 @@ struct BaseDebuggingOverlay {
                                         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 "highlightTraceUpdates" command
   virtual void HandleHighlightTraceUpdatesCommand(std::vector<winrt::Microsoft::ReactNative::JSValue> updates) noexcept = 0;
 
@@ -207,6 +213,14 @@ void RegisterDebuggingOverlayNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseDebuggingOverlay<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 != &BaseDebuggingOverlay<TUserData>::Initialize) {

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

@@ -98,6 +98,12 @@ struct BaseInputAccessory {
                                         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<InputAccessoryEventEmitter>& EventEmitter() const { return m_eventEmitter; }
@@ -173,6 +179,14 @@ void RegisterInputAccessoryNativeComponent(
           });
         }
 
+        if CONSTEXPR_SUPPORTED_ON_VIRTUAL_FN_ADDRESS (&TUserData::CreateAutomationPeer != &BaseInputAccessory<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 != &BaseInputAccessory<TUserData>::Initialize) {