react-native-windows 0.74.20 → 0.74.22

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(
@@ -74,7 +93,8 @@ struct ComponentView : public ComponentViewT<ComponentView> {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept;
   virtual void prepareForRecycle() noexcept;
   virtual facebook::react::Props::Shared props() noexcept;
-  virtual winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *rootComponentView() noexcept;
+  virtual winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *rootComponentView()
+      const noexcept;
   virtual void parent(const winrt::Microsoft::ReactNative::ComponentView &parent) noexcept;
   virtual winrt::Microsoft::ReactNative::ComponentView Parent() const noexcept;
   virtual winrt::IVectorView<winrt::Microsoft::ReactNative::ComponentView> Children() const noexcept;
@@ -91,7 +111,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 +141,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,29 +202,37 @@ 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
   virtual void StartBringIntoView(BringIntoViewOptions &&args) noexcept;
 
+  // Eventually PopupContentLink and similar APIs will remove the need for this.
+  virtual HWND GetHwndForParenting() noexcept;
+
   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;
   virtual void UnmountChildComponentView(
       const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
       uint32_t index) noexcept;
-  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 HandleCommand(const winrt::Microsoft::ReactNative::HandleCommandArgs &args) noexcept;
   virtual void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept;
   virtual void OnPointerEntered(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
@@ -160,25 +247,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::Microsoft::ReactNative::Composition::implementation::RootComponentView *m_rootView{nullptr};
+  winrt::IInspectable m_userData;
+  mutable 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 +329,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) {}
@@ -619,6 +637,10 @@ bool PointerPoint::IsPointerMessage(uint32_t message) const noexcept {
   return (message >= WM_POINTERFIRST && message <= WM_POINTERLAST);
 }
 
+winrt::Microsoft::UI::Input::PointerPoint PointerPoint::Inner() const noexcept {
+  return m_sysPointerPoint;
+}
+
 PointerRoutedEventArgs::PointerRoutedEventArgs(
     const winrt::Microsoft::ReactNative::ReactContext &context,
     facebook::react::Tag tag,

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> {
@@ -180,6 +198,7 @@ struct PointerPoint : PointerPointT<PointerPoint> {
   uint64_t Timestamp() const noexcept;
   winrt::Microsoft::ReactNative::Composition::Input::PointerPoint GetOffsetPoint(
       const winrt::Windows::Foundation::Point &offset) const noexcept;
+  winrt::Microsoft::UI::Input::PointerPoint Inner() const noexcept;
 
  private:
   bool IsPointerMessage(uint32_t message) const noexcept;

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

@@ -12,6 +12,7 @@
 
 #include <Windows.Graphics.Interop.h>
 #include <windows.ui.composition.interop.h>
+#include <winrt/Microsoft.ReactNative.Composition.Input.h>
 #include <winrt/Windows.Graphics.DirectX.Direct3D11.h>
 #include <winrt/Windows.UI.Composition.h>
 #include <winrt/Windows.UI.Composition.interactions.h>
@@ -744,14 +745,9 @@ struct CompScrollerVisual : winrt::implements<
     m_interactionTracker.MaxScale(1.0);
 
     m_visualInteractionSource = TTypeRedirects::VisualInteractionSource::Create(m_visual);
-
-    m_visualInteractionSource.PositionXSourceMode(TTypeRedirects::InteractionSourceMode::EnabledWithInertia);
-    m_visualInteractionSource.PositionYSourceMode(TTypeRedirects::InteractionSourceMode::EnabledWithInertia);
     m_visualInteractionSource.ScaleSourceMode(TTypeRedirects::InteractionSourceMode::Disabled);
-
-    m_visualInteractionSource.ManipulationRedirectionMode(
-        TTypeRedirects::VisualInteractionSourceRedirectionMode::CapableTouchpadAndPointerWheel);
     m_interactionTracker.InteractionSources().Add(m_visualInteractionSource);
+    UpdateInteractionModes();
 
     auto positionExpression = compositor.CreateExpressionAnimation(L"-tracker.Position");
     positionExpression.SetReferenceParameter(L"tracker", m_interactionTracker);
@@ -762,6 +758,44 @@ struct CompScrollerVisual : winrt::implements<
     return m_visual;
   }
 
+  void OnPointerPressed(
+      const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
+    if constexpr (std::is_same_v<TTypeRedirects, MicrosoftTypeRedirects>) {
+      auto pointerDeviceType = args.Pointer().PointerDeviceType();
+      if (pointerDeviceType == winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Touch) {
+        m_visualInteractionSource.TryRedirectForManipulation(args.GetCurrentPoint(args.OriginalSource()).Inner());
+      }
+    }
+  }
+
+  bool Horizontal() const noexcept {
+    return m_horizontal;
+  }
+
+  void Horizontal(bool value) noexcept {
+    m_horizontal = value;
+
+    UpdateInteractionModes();
+  }
+
+  void UpdateInteractionModes() noexcept {
+    if (m_isScrollEnabled) {
+      m_visualInteractionSource.PositionXSourceMode(
+          m_horizontal ? TTypeRedirects::InteractionSourceMode::EnabledWithInertia
+                       : TTypeRedirects::InteractionSourceMode::Disabled);
+      m_visualInteractionSource.PositionYSourceMode(
+          m_horizontal ? TTypeRedirects::InteractionSourceMode::Disabled
+                       : TTypeRedirects::InteractionSourceMode::EnabledWithInertia);
+      m_visualInteractionSource.ManipulationRedirectionMode(
+          TTypeRedirects::VisualInteractionSourceRedirectionMode::CapableTouchpadAndPointerWheel);
+    } else {
+      m_visualInteractionSource.PositionXSourceMode(TTypeRedirects::InteractionSourceMode::Disabled);
+      m_visualInteractionSource.PositionYSourceMode(TTypeRedirects::InteractionSourceMode::Disabled);
+      m_visualInteractionSource.ManipulationRedirectionMode(
+          TTypeRedirects::VisualInteractionSourceRedirectionMode::Off);
+    }
+  }
+
   void InsertAt(
       const winrt::Microsoft::ReactNative::Composition::Experimental::IVisual &visual,
       uint32_t index) noexcept {
@@ -796,13 +830,8 @@ struct CompScrollerVisual : winrt::implements<
   }
 
   void ScrollEnabled(bool isScrollEnabled) noexcept {
-    if (isScrollEnabled) {
-      m_visualInteractionSource.ManipulationRedirectionMode(
-          TTypeRedirects::VisualInteractionSourceRedirectionMode::CapableTouchpadAndPointerWheel);
-    } else {
-      m_visualInteractionSource.ManipulationRedirectionMode(
-          TTypeRedirects::VisualInteractionSourceRedirectionMode::Off);
-    }
+    m_isScrollEnabled = isScrollEnabled;
+    UpdateInteractionModes();
   }
 
   void Opacity(float opacity) noexcept {
@@ -970,6 +999,8 @@ struct CompScrollerVisual : winrt::implements<
          0});
   }
 
+  bool m_isScrollEnabled{true};
+  bool m_horizontal{false};
   bool m_inertia{false};
   bool m_custom{false};
   winrt::Windows::Foundation::Numerics::float3 m_targetPosition;