react-native-windows 0.74.20 → 0.74.21

package/Microsoft.ReactNative/Fabric/ComponentView.h

@@ -12,11 +12,14 @@
 #include <react/renderer/core/LayoutMetrics.h>
 
 #include <Fabric/Composition/Theme.h>
+#include <uiautomationcore.h>
 #include <winrt/Microsoft.ReactNative.Composition.Input.h>
 #include <winrt/Microsoft.ReactNative.h>
 
 #include "ComponentView.g.h"
-#include "CreateComponentViewArgs.g.h"
+#include "LayoutMetricsChangedArgs.g.h"
+#include "MountChildComponentViewArgs.g.h"
+#include "UnmountChildComponentViewArgs.g.h"
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 struct RootComponentView;
@@ -41,25 +44,41 @@ struct BringIntoViewOptions {
   float VerticalOffset{0};
 };
 
-struct CreateComponentViewArgs : public CreateComponentViewArgsT<CreateComponentViewArgs> {
-  CreateComponentViewArgs(const winrt::Microsoft::ReactNative::IReactContext &reactContext, facebook::react::Tag tag);
+struct LayoutMetricsChangedArgs : public LayoutMetricsChangedArgsT<LayoutMetricsChangedArgs> {
+  LayoutMetricsChangedArgs(const LayoutMetrics &newLayoutMetrics, const LayoutMetrics &oldLayoutMetrics);
 
-  facebook::react::Tag Tag() const noexcept;
+  LayoutMetrics OldLayoutMetrics() const noexcept;
+  LayoutMetrics NewLayoutMetrics() const noexcept;
 
-  winrt::Microsoft::ReactNative::IReactContext ReactContext() const noexcept;
+ private:
+  LayoutMetrics m_old;
+  LayoutMetrics m_new;
+};
+
+struct MountChildComponentViewArgs : public MountChildComponentViewArgsT<MountChildComponentViewArgs> {
+  MountChildComponentViewArgs(const winrt::Microsoft::ReactNative::ComponentView &child, uint32_t index);
+
+  winrt::Microsoft::ReactNative::ComponentView Child() const noexcept;
+  uint32_t Index() const noexcept;
 
  private:
-  const facebook::react::Tag m_tag;
-  const winrt::Microsoft::ReactNative::IReactContext m_reactContext;
+  winrt::Microsoft::ReactNative::ComponentView m_child;
+  uint32_t m_index;
 };
 
-struct ComponentView : public ComponentViewT<ComponentView> {
-  ComponentView(winrt::Microsoft::ReactNative::CreateComponentViewArgs const &args);
+struct UnmountChildComponentViewArgs : public UnmountChildComponentViewArgsT<UnmountChildComponentViewArgs> {
+  UnmountChildComponentViewArgs(const winrt::Microsoft::ReactNative::ComponentView &child, uint32_t index);
 
-  ComponentView(
-      facebook::react::Tag tag,
-      winrt::Microsoft::ReactNative::ReactContext const &reactContext,
-      bool customComponent);
+  winrt::Microsoft::ReactNative::ComponentView Child() const noexcept;
+  uint32_t Index() const noexcept;
+
+ private:
+  winrt::Microsoft::ReactNative::ComponentView m_child;
+  uint32_t m_index;
+};
+
+struct ComponentView : public ComponentViewT<ComponentView> {
+  ComponentView(facebook::react::Tag tag, winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
   virtual std::vector<facebook::react::ComponentDescriptorProvider> supplementalComponentDescriptorProviders() noexcept;
   virtual void updateProps(
@@ -91,7 +110,20 @@ struct ComponentView : public ComponentViewT<ComponentView> {
   virtual void onGettingFocus(const winrt::Microsoft::ReactNative::GettingFocusEventArgs &args) noexcept;
   virtual void onLostFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept;
   virtual void onGotFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept;
+  void MarkAsCustomComponent() noexcept;
+  virtual void onMounted() noexcept;
+  virtual void onUnmounted() noexcept;
+  void onDestroying() noexcept;
 
+  winrt::event_token Destroying(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView> const &handler) noexcept;
+  void Destroying(winrt::event_token const &token) noexcept;
+  winrt::event_token Mounted(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView> const &handler) noexcept;
+  void Mounted(winrt::event_token const &token) noexcept;
+  winrt::event_token Unmounted(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView> const &handler) noexcept;
+  void Unmounted(winrt::event_token const &token) noexcept;
   winrt::event_token LosingFocus(
       winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::LosingFocusEventArgs> const
           &handler) noexcept;
@@ -108,6 +140,52 @@ struct ComponentView : public ComponentViewT<ComponentView> {
       winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs> const
           &handler) noexcept;
   void GotFocus(winrt::event_token const &token) noexcept;
+  winrt::event_token LayoutMetricsChanged(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::LayoutMetricsChangedArgs> const
+          &handler) noexcept;
+  void LayoutMetricsChanged(winrt::event_token const &token) noexcept;
+
+  winrt::event_token KeyDown(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs> const &handler) noexcept;
+  void KeyDown(winrt::event_token const &token) noexcept;
+  winrt::event_token KeyUp(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs> const &handler) noexcept;
+  void KeyUp(winrt::event_token const &token) noexcept;
+  winrt::event_token CharacterReceived(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs> const &handler) noexcept;
+  void CharacterReceived(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerPressed(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs> const &handler) noexcept;
+  void PointerPressed(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerReleased(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs> const &handler) noexcept;
+  void PointerReleased(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerMoved(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs> const &handler) noexcept;
+  void PointerMoved(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerWheelChanged(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs> const &handler) noexcept;
+  void PointerWheelChanged(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerEntered(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs> const &handler) noexcept;
+  void PointerEntered(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerExited(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs> const &handler) noexcept;
+  void PointerExited(winrt::event_token const &token) noexcept;
+  winrt::event_token PointerCaptureLost(
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView> const &handler) noexcept;
+  void PointerCaptureLost(winrt::event_token const &token) noexcept;
+
+  LayoutMetrics LayoutMetrics() const noexcept;
 
   bool TryFocus() noexcept;
 
@@ -123,6 +201,8 @@ struct ComponentView : public ComponentViewT<ComponentView> {
   virtual std::optional<std::string> getAcccessiblityValue() noexcept;
   virtual void setAcccessiblityValue(std::string &&value) noexcept;
   virtual bool getAcccessiblityIsReadOnly() noexcept;
+  virtual ToggleState getToggleState() noexcept;
+  virtual void Toggle() noexcept;
   winrt::Microsoft::ReactNative::IReactContext ReactContext() const noexcept;
 
   // Notify up the tree to bring the rect into view by scrolling as needed
@@ -131,7 +211,17 @@ struct ComponentView : public ComponentViewT<ComponentView> {
   virtual const winrt::Microsoft::ReactNative::IComponentProps userProps(
       facebook::react::Props::Shared const &props) noexcept;
 
-  // Publicaly overridable APIs
+  void UserData(const winrt::IInspectable &userData) noexcept;
+  winrt::IInspectable UserData() const noexcept;
+
+  void CustomCommandHandler(const HandleCommandDelegate &handler) noexcept;
+  void UpdatePropsHandler(const UpdatePropsDelegate &handler) noexcept;
+  void UpdateStateHandler(const UpdateStateDelegate &handler) noexcept;
+  void UpdateEventEmitterHandler(const UpdateEventEmitterDelegate &handler) noexcept;
+  void MountChildComponentViewHandler(const MountChildComponentViewDelegate &handler) noexcept;
+  void UnmountChildComponentViewHandler(const UnmountChildComponentViewDelegate &handler) noexcept;
+  void FinalizeUpdateHandler(const UpdateFinalizerDelegate &handler) noexcept;
+
   virtual void MountChildComponentView(
       const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
       uint32_t index) noexcept;
@@ -141,11 +231,6 @@ struct ComponentView : public ComponentViewT<ComponentView> {
   virtual void HandleCommand(
       winrt::hstring commandName,
       const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept;
-  virtual void UpdateProps(
-      const winrt::Microsoft::ReactNative::IComponentProps &props,
-      const winrt::Microsoft::ReactNative::IComponentProps &oldProps) noexcept;
-  virtual void UpdateState(const winrt::Microsoft::ReactNative::IComponentState &state) noexcept;
-  virtual void UpdateLayoutMetrics(const LayoutMetrics &metrics, const LayoutMetrics &oldMetrics) noexcept;
   virtual void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept;
   virtual void OnPointerEntered(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
@@ -160,25 +245,68 @@ struct ComponentView : public ComponentViewT<ComponentView> {
   virtual void OnPointerWheelChanged(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
   virtual void OnPointerCaptureLost() noexcept;
-  virtual void OnKeyDown(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
-  virtual void OnKeyUp(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
+  virtual void OnKeyDown(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
+  virtual void OnKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
   virtual void OnCharacterReceived(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept;
 
  protected:
-  const bool m_customComponent; // Is a user custom component, and so needs to call external override functions
+  bool m_customComponent : 1 {false}; // Is a user custom component, and so needs to call external override functions
+  bool m_mounted : 1 {false};
   const facebook::react::Tag m_tag;
+  winrt::IInspectable m_userData;
   winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *m_rootView{nullptr};
   mutable winrt::Microsoft::ReactNative::Composition::implementation::Theme *m_theme{nullptr};
   const winrt::Microsoft::ReactNative::ReactContext m_reactContext;
   winrt::Microsoft::ReactNative::ComponentView m_parent{nullptr};
+  facebook::react::LayoutMetrics m_layoutMetrics;
   winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::ReactNative::ComponentView> m_children{
       winrt::single_threaded_vector<winrt::Microsoft::ReactNative::ComponentView>()};
+
+  UpdatePropsDelegate m_updatePropsDelegate{nullptr};
+  UpdateStateDelegate m_updateStateDelegate{nullptr};
+  HandleCommandDelegate m_customCommandHandler{nullptr};
+  UpdateFinalizerDelegate m_finalizeUpdateHandler{nullptr};
+  MountChildComponentViewDelegate m_mountChildComponentViewHandler{nullptr};
+  UnmountChildComponentViewDelegate m_unmountChildComponentViewHandler{nullptr};
+  UpdateEventEmitterDelegate m_updateEventEmitterHandler{nullptr};
+
+  winrt::event<
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs>>
+      m_keyDownEvent;
+  winrt::event<
+      winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs>>
+      m_keyUpEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs>>
+      m_characterReceivedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs>>
+      m_pointerPressedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs>>
+      m_pointerReleasedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs>>
+      m_pointerMovedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs>>
+      m_pointerWheelChangedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs>>
+      m_pointerEnteredEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs>>
+      m_pointerExitedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView>>
+      m_pointerCaptureLostEvent;
+
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::LayoutMetricsChangedArgs>>
+      m_layoutMetricsChangedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView>>
+      m_destroyingEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView>> m_mountedEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::ComponentView>> m_unmountedEvent;
   winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::LosingFocusEventArgs>>
       m_losingFocusEvent;
   winrt::event<winrt::Windows::Foundation::EventHandler<winrt::Microsoft::ReactNative::GettingFocusEventArgs>>
@@ -199,9 +327,3 @@ bool walkTree(
     Mso::Functor<bool(const winrt::Microsoft::ReactNative::ComponentView &)> &fn) noexcept;
 
 } // namespace winrt::Microsoft::ReactNative::implementation
-
-namespace winrt::Microsoft::ReactNative::factory_implementation {
-
-struct ComponentView : ComponentViewT<ComponentView, implementation::ComponentView> {};
-
-} // namespace winrt::Microsoft::ReactNative::factory_implementation

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

@@ -29,8 +29,7 @@ ActivityIndicatorComponentView::ActivityIndicatorComponentView(
           compContext,
           tag,
           reactContext,
-          ComponentViewFeatures::Default,
-          false) {}
+          ComponentViewFeatures::Default) {}
 
 void ActivityIndicatorComponentView::MountChildComponentView(
     const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
@@ -83,6 +82,7 @@ void ActivityIndicatorComponentView::FinalizeUpdates(
   } else {
     m_ActivityIndicatorVisual.Size(radiusLarge * m_layoutMetrics.pointScaleFactor);
   }
+  base_type::FinalizeUpdates(updateMask);
 }
 
 void ActivityIndicatorComponentView::updateState(

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

@@ -124,5 +124,8 @@ void ComponentViewRegistry::enqueueComponentViewWithComponentHandle(
       ->prepareForRecycle();
 
   m_registry.erase(tag);
+
+  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(componentViewDescriptor.view)
+      ->onDestroying();
 }
 } // namespace Microsoft::ReactNative

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

@@ -10,8 +10,13 @@
 
 namespace winrt::Microsoft::ReactNative::Composition::Input::implementation {
 
-KeyRoutedEventArgs::KeyRoutedEventArgs(facebook::react::Tag tag, uint32_t msg, uint64_t wParam, int64_t lParam)
-    : m_tag(tag) {
+KeyRoutedEventArgs::KeyRoutedEventArgs(
+    facebook::react::Tag tag,
+    uint32_t msg,
+    uint64_t wParam,
+    int64_t lParam,
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source)
+    : m_tag(tag), m_source(source) {
   bool fUp = (msg == WM_KEYUP || msg == WM_SYSKEYUP);
   bool fSysKey = (msg == WM_SYSKEYUP || msg == WM_SYSKEYDOWN);
 
@@ -35,8 +40,11 @@ KeyRoutedEventArgs::KeyRoutedEventArgs(facebook::react::Tag tag, uint32_t msg, u
 }
 
 #ifdef USE_WINUI3
-KeyRoutedEventArgs::KeyRoutedEventArgs(facebook::react::Tag tag, winrt::Microsoft::UI::Input::KeyEventArgs const &args)
-    : m_tag(tag) {
+KeyRoutedEventArgs::KeyRoutedEventArgs(
+    facebook::react::Tag tag,
+    winrt::Microsoft::UI::Input::KeyEventArgs const &args,
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source)
+    : m_tag(tag), m_source(source) {
   auto keyStatus = args.KeyStatus();
   m_keyStatus.RepeatCount = keyStatus.RepeatCount;
   m_keyStatus.ScanCode = keyStatus.ScanCode;
@@ -75,12 +83,17 @@ winrt::Microsoft::UI::Input::PhysicalKeyStatus KeyRoutedEventArgs::KeyStatus() n
 winrt::Windows::System::VirtualKey KeyRoutedEventArgs::OriginalKey() noexcept {
   return m_key;
 }
+winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource KeyRoutedEventArgs::KeyboardSource() const noexcept {
+  return m_source;
+}
 
 CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
     facebook::react::Tag tag,
     uint32_t msg,
     uint64_t wParam,
-    int64_t lParam) {
+    int64_t lParam,
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source)
+    : m_source(source) {
   m_keycode = static_cast<int32_t>(wParam);
   m_keyStatus.RepeatCount = (lParam & 0x0000FFFF); // bits 0-15
   m_keyStatus.ScanCode = (lParam & 0x00FF0000) >> 16; // bits 16-23
@@ -93,8 +106,9 @@ CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
 #ifdef USE_WINUI3
 CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
     facebook::react::Tag tag,
-    winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args)
-    : m_tag(tag) {
+    winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args,
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source)
+    : m_tag(tag), m_source(source) {
   auto keyStatus = args.KeyStatus();
   m_keyStatus.RepeatCount = keyStatus.RepeatCount;
   m_keyStatus.ScanCode = keyStatus.ScanCode;
@@ -121,6 +135,10 @@ int32_t CharacterReceivedRoutedEventArgs::KeyCode() noexcept {
 winrt::Microsoft::UI::Input::PhysicalKeyStatus CharacterReceivedRoutedEventArgs::KeyStatus() noexcept {
   return m_keyStatus;
 }
+winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource CharacterReceivedRoutedEventArgs::KeyboardSource()
+    const noexcept {
+  return m_source;
+}
 
 Pointer::Pointer(winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType type, uint32_t id)
     : m_type(type), m_id(id) {}

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

@@ -21,9 +21,17 @@ struct KeyRoutedEventArgs : winrt::implements<
                                 KeyRoutedEventArgs,
                                 winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs,
                                 winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs> {
-  KeyRoutedEventArgs(facebook::react::Tag tag, uint32_t msg, uint64_t wParam, int64_t lParam);
+  KeyRoutedEventArgs(
+      facebook::react::Tag tag,
+      uint32_t msg,
+      uint64_t wParam,
+      int64_t lParam,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
 #ifdef USE_WINUI3
-  KeyRoutedEventArgs(facebook::react::Tag tag, winrt::Microsoft::UI::Input::KeyEventArgs const &args);
+  KeyRoutedEventArgs(
+      facebook::react::Tag tag,
+      winrt::Microsoft::UI::Input::KeyEventArgs const &args,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
 #endif
 
   int32_t OriginalSource() noexcept;
@@ -33,12 +41,14 @@ struct KeyRoutedEventArgs : winrt::implements<
   winrt::Windows::System::VirtualKey Key() noexcept;
   winrt::Microsoft::UI::Input::PhysicalKeyStatus KeyStatus() noexcept;
   winrt::Windows::System::VirtualKey OriginalKey() noexcept;
+  winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource KeyboardSource() const noexcept;
 
  private:
   facebook::react::Tag m_tag{-1};
   bool m_handled{false};
   winrt::Windows::System::VirtualKey m_key;
   winrt::Microsoft::UI::Input::PhysicalKeyStatus m_keyStatus;
+  const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource m_source;
 };
 
 struct CharacterReceivedRoutedEventArgs
@@ -46,11 +56,17 @@ struct CharacterReceivedRoutedEventArgs
           CharacterReceivedRoutedEventArgs,
           winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs,
           winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs> {
-  CharacterReceivedRoutedEventArgs(facebook::react::Tag tag, uint32_t msg, uint64_t wParam, int64_t lParam);
+  CharacterReceivedRoutedEventArgs(
+      facebook::react::Tag tag,
+      uint32_t msg,
+      uint64_t wParam,
+      int64_t lParam,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
 #ifdef USE_WINUI3
   CharacterReceivedRoutedEventArgs(
       facebook::react::Tag tag,
-      winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args);
+      winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
 #endif
 
   int32_t OriginalSource() noexcept;
@@ -58,12 +74,14 @@ struct CharacterReceivedRoutedEventArgs
   void Handled(bool value) noexcept;
   int32_t KeyCode() noexcept;
   winrt::Microsoft::UI::Input::PhysicalKeyStatus KeyStatus() noexcept;
+  winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource KeyboardSource() const noexcept;
 
  private:
   facebook::react::Tag m_tag{-1};
   bool m_handled{false};
   int32_t m_keycode;
   winrt::Microsoft::UI::Input::PhysicalKeyStatus m_keyStatus;
+  const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource m_source;
 };
 
 struct Pointer : PointerT<Pointer> {

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

@@ -160,6 +160,11 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
     AddRef();
   }
 
+  if (patternId == UIA_TogglePatternId && (accessibilityRole == "switch" || accessibilityRole == "checkbox")) {
+    *pRetVal = static_cast<IToggleProvider *>(this);
+    AddRef();
+  }
+
   return S_OK;
 }
 
@@ -313,6 +318,21 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
       hr = pRetVal->bstrVal != nullptr ? S_OK : E_OUTOFMEMORY;
       break;
     }
+    case UIA_PositionInSetPropertyId: {
+      pRetVal->vt = VT_I4;
+      pRetVal->lVal = props->accessibilityPosInSet;
+      break;
+    }
+    case UIA_SizeOfSetPropertyId: {
+      pRetVal->vt = VT_I4;
+      pRetVal->lVal = props->accessibilitySetSize;
+      break;
+    }
+    case UIA_LiveSettingPropertyId: {
+      pRetVal->vt = VT_I4;
+      pRetVal->lVal = GetLiveSetting(props->accessibilityLiveRegion);
+      break;
+    }
   }
 
   return hr;
@@ -416,4 +436,27 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::get_IsReadOnly(BOOL *pRe
   return S_OK;
 }
 
+HRESULT __stdcall CompositionDynamicAutomationProvider::get_ToggleState(ToggleState *pRetVal) {
+  if (pRetVal == nullptr)
+    return E_POINTER;
+  auto strongView = m_view.view();
+
+  if (!strongView)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  *pRetVal =
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->getToggleState();
+  return S_OK;
+}
+
+HRESULT __stdcall CompositionDynamicAutomationProvider::Toggle() {
+  auto strongView = m_view.view();
+
+  if (!strongView)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->Toggle();
+  return S_OK;
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -15,7 +15,8 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
                                                  IRawElementProviderSimple,
                                                  IInvokeProvider,
                                                  IScrollItemProvider,
-                                                 IValueProvider> {
+                                                 IValueProvider,
+                                                 IToggleProvider> {
  public:
   CompositionDynamicAutomationProvider(
       const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView) noexcept;
@@ -46,6 +47,10 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
   virtual HRESULT __stdcall get_Value(BSTR *pRetVal) override;
   virtual HRESULT __stdcall get_IsReadOnly(BOOL *pRetVal) override;
 
+  // inherited via IToggleProivder
+  virtual HRESULT __stdcall get_ToggleState(ToggleState *pRetVal) override;
+  virtual HRESULT __stdcall Toggle() override;
+
  private:
   ::Microsoft::ReactNative::ReactTaggedView m_view;
 };