react-native-windows 0.74.19 → 0.74.21

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

@@ -140,149 +140,170 @@ struct CompositionInputKeyboardSource : winrt::implements<
 CompositionEventHandler::CompositionEventHandler(
     const winrt::Microsoft::ReactNative::ReactContext &context,
     const winrt::Microsoft::ReactNative::ReactNativeIsland &reactNativeIsland)
-    : m_context(context), m_wkRootView(reactNativeIsland) {
+    : m_context(context), m_wkRootView(reactNativeIsland) {}
+
+void CompositionEventHandler::Initialize() noexcept {
 #ifdef USE_WINUI3
-  if (auto island = reactNativeIsland.Island()) {
+  if (auto island = m_wkRootView.get().Island()) {
     auto pointerSource = winrt::Microsoft::UI::Input::InputPointerSource::GetForIsland(island);
 
     m_pointerPressedToken =
-        pointerSource.PointerPressed([this](
+        pointerSource.PointerPressed([wkThis = weak_from_this()](
                                          winrt::Microsoft::UI::Input::InputPointerSource const &,
                                          winrt::Microsoft::UI::Input::PointerEventArgs const &args) {
-          if (auto strongRootView = m_wkRootView.get()) {
-            if (SurfaceId() == -1)
-              return;
-
-            auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
-                args.CurrentPoint(), strongRootView.ScaleFactor());
-            onPointerPressed(pp, args.KeyModifiers());
+          if (auto strongThis = wkThis.lock()) {
+            if (auto strongRootView = strongThis->m_wkRootView.get()) {
+              if (strongThis->SurfaceId() == -1)
+                return;
+
+              auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+                  args.CurrentPoint(), strongRootView.ScaleFactor());
+              strongThis->onPointerPressed(pp, args.KeyModifiers());
+            }
           }
         });
 
     m_pointerReleasedToken =
-        pointerSource.PointerReleased([this](
+        pointerSource.PointerReleased([wkThis = weak_from_this()](
                                           winrt::Microsoft::UI::Input::InputPointerSource const &,
                                           winrt::Microsoft::UI::Input::PointerEventArgs const &args) {
-          if (auto strongRootView = m_wkRootView.get()) {
-            if (SurfaceId() == -1)
-              return;
-
-            auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
-                args.CurrentPoint(), strongRootView.ScaleFactor());
-            onPointerReleased(pp, args.KeyModifiers());
+          if (auto strongThis = wkThis.lock()) {
+            if (auto strongRootView = strongThis->m_wkRootView.get()) {
+              if (strongThis->SurfaceId() == -1)
+                return;
+
+              auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+                  args.CurrentPoint(), strongRootView.ScaleFactor());
+              strongThis->onPointerReleased(pp, args.KeyModifiers());
+            }
           }
         });
 
-    m_pointerMovedToken = pointerSource.PointerMoved([this](
+    m_pointerMovedToken = pointerSource.PointerMoved([wkThis = weak_from_this()](
                                                          winrt::Microsoft::UI::Input::InputPointerSource const &,
                                                          winrt::Microsoft::UI::Input::PointerEventArgs const &args) {
-      if (auto strongRootView = m_wkRootView.get()) {
-        if (SurfaceId() == -1)
-          return;
-
-        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
-            args.CurrentPoint(), strongRootView.ScaleFactor());
-        onPointerMoved(pp, args.KeyModifiers());
+      if (auto strongThis = wkThis.lock()) {
+        if (auto strongRootView = strongThis->m_wkRootView.get()) {
+          if (strongThis->SurfaceId() == -1)
+            return;
+
+          auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+              args.CurrentPoint(), strongRootView.ScaleFactor());
+          strongThis->onPointerMoved(pp, args.KeyModifiers());
+        }
       }
     });
 
     m_pointerCaptureLostToken =
-        pointerSource.PointerCaptureLost([this](
+        pointerSource.PointerCaptureLost([wkThis = weak_from_this()](
                                              winrt::Microsoft::UI::Input::InputPointerSource const &,
                                              winrt::Microsoft::UI::Input::PointerEventArgs const &args) {
-          if (auto strongRootView = m_wkRootView.get()) {
-            if (SurfaceId() == -1)
-              return;
-
-            auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
-                args.CurrentPoint(), strongRootView.ScaleFactor());
-            onPointerCaptureLost(pp, args.KeyModifiers());
+          if (auto strongThis = wkThis.lock()) {
+            if (auto strongRootView = strongThis->m_wkRootView.get()) {
+              if (strongThis->SurfaceId() == -1)
+                return;
+
+              auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+                  args.CurrentPoint(), strongRootView.ScaleFactor());
+              strongThis->onPointerCaptureLost(pp, args.KeyModifiers());
+            }
           }
         });
 
     m_pointerWheelChangedToken =
-        pointerSource.PointerWheelChanged([this](
+        pointerSource.PointerWheelChanged([wkThis = weak_from_this()](
                                               winrt::Microsoft::UI::Input::InputPointerSource const &,
                                               winrt::Microsoft::UI::Input::PointerEventArgs const &args) {
-          if (auto strongRootView = m_wkRootView.get()) {
-            if (SurfaceId() == -1)
-              return;
-
-            auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
-                args.CurrentPoint(), strongRootView.ScaleFactor());
-            onPointerWheelChanged(pp, args.KeyModifiers());
+          if (auto strongThis = wkThis.lock()) {
+            if (auto strongRootView = strongThis->m_wkRootView.get()) {
+              if (strongThis->SurfaceId() == -1)
+                return;
+
+              auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+                  args.CurrentPoint(), strongRootView.ScaleFactor());
+              strongThis->onPointerWheelChanged(pp, args.KeyModifiers());
+            }
           }
         });
 
     auto keyboardSource = winrt::Microsoft::UI::Input::InputKeyboardSource::GetForIsland(island);
 
-    m_keyDownToken = keyboardSource.KeyDown([this](
+    m_keyDownToken = keyboardSource.KeyDown([wkThis = weak_from_this()](
                                                 winrt::Microsoft::UI::Input::InputKeyboardSource const &source,
                                                 winrt::Microsoft::UI::Input::KeyEventArgs const &args) {
-      if (auto strongRootView = m_wkRootView.get()) {
-        if (SurfaceId() == -1)
-          return;
-
-        auto focusedComponent = RootComponentView().GetFocusedComponent();
-        auto keyArgs =
-            winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
-                focusedComponent
-                    ? focusedComponent.Tag()
-                    : static_cast<facebook::react::Tag>(
-                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
-                              strongRootView)
-                              ->RootTag()),
-                args);
-        auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
-        onKeyDown(keyboardSource, keyArgs);
-        winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+      if (auto strongThis = wkThis.lock()) {
+        if (auto strongRootView = strongThis->m_wkRootView.get()) {
+          if (strongThis->SurfaceId() == -1)
+            return;
+
+          auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
+          auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
+          auto keyArgs =
+              winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
+                  focusedComponent
+                      ? focusedComponent.Tag()
+                      : static_cast<facebook::react::Tag>(
+                            winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
+                                strongRootView)
+                                ->RootTag()),
+                  args,
+                  keyboardSource);
+          strongThis->onKeyDown(keyArgs);
+          winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+        }
       }
     });
 
-    m_keyUpToken = keyboardSource.KeyUp([this](
+    m_keyUpToken = keyboardSource.KeyUp([wkThis = weak_from_this()](
                                             winrt::Microsoft::UI::Input::InputKeyboardSource const &source,
                                             winrt::Microsoft::UI::Input::KeyEventArgs const &args) {
-      if (auto strongRootView = m_wkRootView.get()) {
-        if (SurfaceId() == -1)
-          return;
-
-        auto focusedComponent = RootComponentView().GetFocusedComponent();
-        auto keyArgs =
-            winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
-                focusedComponent
-                    ? focusedComponent.Tag()
-                    : static_cast<facebook::react::Tag>(
-                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
-                              strongRootView)
-                              ->RootTag()),
-                args);
-        auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
-        onKeyUp(keyboardSource, keyArgs);
-        winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+      if (auto strongThis = wkThis.lock()) {
+        if (auto strongRootView = strongThis->m_wkRootView.get()) {
+          if (strongThis->SurfaceId() == -1)
+            return;
+
+          auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
+          auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
+          auto keyArgs =
+              winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
+                  focusedComponent
+                      ? focusedComponent.Tag()
+                      : static_cast<facebook::react::Tag>(
+                            winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
+                                strongRootView)
+                                ->RootTag()),
+                  args,
+                  keyboardSource);
+          strongThis->onKeyUp(keyArgs);
+          winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+        }
       }
     });
 
     m_characterReceivedToken =
-        keyboardSource.CharacterReceived([this](
+        keyboardSource.CharacterReceived([wkThis = weak_from_this()](
                                              winrt::Microsoft::UI::Input::InputKeyboardSource const &source,
                                              winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args) {
-          if (auto strongRootView = m_wkRootView.get()) {
-            if (SurfaceId() == -1)
-              return;
-
-            auto focusedComponent = RootComponentView().GetFocusedComponent();
-            auto charArgs = winrt::make<
-                winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
-                focusedComponent
-                    ? focusedComponent.Tag()
-                    : static_cast<facebook::react::Tag>(
-                          winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
-                              strongRootView)
-                              ->RootTag()),
-                args);
-            auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
-            onCharacterReceived(keyboardSource, charArgs);
-            winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+          if (auto strongThis = wkThis.lock()) {
+            if (auto strongRootView = strongThis->m_wkRootView.get()) {
+              if (strongThis->SurfaceId() == -1)
+                return;
+
+              auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
+              auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
+              auto charArgs = winrt::make<
+                  winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
+                  focusedComponent
+                      ? focusedComponent.Tag()
+                      : static_cast<facebook::react::Tag>(
+                            winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(
+                                strongRootView)
+                                ->RootTag()),
+                  args,
+                  keyboardSource);
+              strongThis->onCharacterReceived(charArgs);
+              winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+            }
           }
         });
   }
@@ -344,7 +365,8 @@ void CompositionEventHandler::onPointerWheelChanged(
     auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerRoutedEventArgs>(
         m_context, tag, pointerPoint, keyModifiers);
 
-    targetComponentView.OnPointerWheelChanged(args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+        ->OnPointerWheelChanged(args);
   }
 }
 
@@ -441,6 +463,7 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
     case WM_SYSCHAR: {
       if (auto strongRootView = m_wkRootView.get()) {
         auto focusedComponent = RootComponentView().GetFocusedComponent();
+        auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
         auto args = winrt::make<
             winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
             focusedComponent
@@ -450,9 +473,9 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
                           ->RootTag()),
             msg,
             wParam,
-            lParam);
-        auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
-        onCharacterReceived(keyboardSource, args);
+            lParam,
+            keyboardSource);
+        onCharacterReceived(args);
         winrt::get_self<CompositionKeyboardSource>(keyboardSource)->Disconnect();
       }
       break;
@@ -463,6 +486,7 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
     case WM_SYSKEYUP: {
       if (auto strongRootView = m_wkRootView.get()) {
         auto focusedComponent = RootComponentView().GetFocusedComponent();
+        auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
         auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
             focusedComponent
                 ? focusedComponent.Tag()
@@ -471,12 +495,12 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
                           ->RootTag()),
             msg,
             wParam,
-            lParam);
-        auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
+            lParam,
+            keyboardSource);
         if (msg == WM_KEYDOWN || msg == WM_SYSKEYDOWN) {
-          onKeyDown(keyboardSource, args);
+          onKeyDown(args);
         } else {
-          onKeyUp(keyboardSource, args);
+          onKeyUp(args);
         }
         winrt::get_self<CompositionKeyboardSource>(keyboardSource)->Disconnect();
       }
@@ -488,20 +512,19 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
 }
 
 void CompositionEventHandler::onKeyDown(
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
   if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
-    focusedComponent.OnKeyDown(source, args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)->OnKeyDown(args);
 
     if (args.Handled())
       return;
   }
 
   bool fShift =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) &
+      (args.KeyboardSource().GetKeyState(winrt::Windows::System::VirtualKey::Shift) &
        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
   bool fCtrl =
-      (source.GetKeyState(winrt::Windows::System::VirtualKey::Control) &
+      (args.KeyboardSource().GetKeyState(winrt::Windows::System::VirtualKey::Control) &
        winrt::Microsoft::UI::Input::VirtualKeyStates::Down) == winrt::Microsoft::UI::Input::VirtualKeyStates::Down;
 
   if (fShift && fCtrl && args.Key() == static_cast<winrt::Windows::System::VirtualKey>(VkKeyScanA('d')) &&
@@ -522,10 +545,9 @@ void CompositionEventHandler::onKeyDown(
 }
 
 void CompositionEventHandler::onKeyUp(
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
   if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
-    focusedComponent.OnKeyUp(source, args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)->OnKeyUp(args);
 
     if (args.Handled())
       return;
@@ -533,10 +555,10 @@ void CompositionEventHandler::onKeyUp(
 }
 
 void CompositionEventHandler::onCharacterReceived(
-    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept {
   if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
-    focusedComponent.OnCharacterReceived(source, args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)
+        ->OnCharacterReceived(args);
 
     if (args.Handled())
       return;
@@ -624,7 +646,8 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
       auto args =
           winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerRoutedEventArgs>(
               m_context, componentView.Tag(), pointerPoint, keyModifiers);
-      componentView.OnPointerEntered(args);
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(componentView)
+          ->OnPointerEntered(args);
 
       if (shouldEmitEvent) {
         const auto eventEmitter =
@@ -702,7 +725,7 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
 
     auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerRoutedEventArgs>(
         m_context, componentView.Tag(), pointerPoint, keyModifiers);
-    componentView.OnPointerExited(args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(componentView)->OnPointerExited(args);
   }
 
   for (auto itComponentView = viewsToEmitJSLeaveEventsTo.rbegin(); itComponentView != viewsToEmitJSLeaveEventsTo.rend();
@@ -853,7 +876,8 @@ void CompositionEventHandler::onPointerMoved(
         m_context, tag, pointerPoint, keyModifiers);
     auto targetComponentView = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view;
 
-    targetComponentView.OnPointerMoved(args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+        ->OnPointerMoved(args);
 
     auto targetView = FindClosestFabricManagedTouchableView(
         fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view);
@@ -907,7 +931,8 @@ void CompositionEventHandler::onPointerPressed(
     auto targetComponentView = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view;
     auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerRoutedEventArgs>(
         m_context, tag, pointerPoint, keyModifiers);
-    targetComponentView.OnPointerPressed(args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+        ->OnPointerPressed(args);
 
     ActiveTouch activeTouch{0};
     activeTouch.touchType = UITouchType::Mouse;
@@ -968,7 +993,8 @@ void CompositionEventHandler::onPointerReleased(
     auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerRoutedEventArgs>(
         m_context, tag, pointerPoint, keyModifiers);
 
-    targetComponentView.OnPointerReleased(args);
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+        ->OnPointerReleased(args);
 
     UpdateActiveTouch(activeTouch->second, ptScaled, ptLocal);
     DispatchTouchEvent(TouchEventType::End, pointerId, pointerPoint, keyModifiers);
@@ -987,7 +1013,8 @@ bool CompositionEventHandler::CapturePointer(
       auto targetComponentView =
           fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(m_pointerCapturingComponentTag).view;
 
-      targetComponentView.OnPointerCaptureLost();
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+          ->OnPointerCaptureLost();
     }
   }
 
@@ -1018,7 +1045,8 @@ bool CompositionEventHandler::releasePointerCapture(PointerId pointerId, faceboo
       auto targetComponentView =
           fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(m_pointerCapturingComponentTag).view;
 
-      targetComponentView.OnPointerCaptureLost();
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentView)
+          ->OnPointerCaptureLost();
     }
 
     if (m_capturedPointers.size() == 0) {

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

@@ -27,13 +27,14 @@ struct FabricUIManager;
 struct winrt::Microsoft::ReactNative::implementation::ComponentView;
 typedef int PointerId;
 
-class CompositionEventHandler {
+class CompositionEventHandler : public std::enable_shared_from_this<CompositionEventHandler> {
  public:
   CompositionEventHandler(
       const winrt::Microsoft::ReactNative::ReactContext &context,
       const winrt::Microsoft::ReactNative::ReactNativeIsland &ReactNativeIsland);
   virtual ~CompositionEventHandler();
 
+  void Initialize() noexcept;
   int64_t SendMessage(HWND hwnd, uint32_t msg, uint64_t wParam, int64_t lParam) noexcept;
   void RemoveTouchHandlers();
   winrt::Microsoft::UI::Input::VirtualKeyStates GetKeyState(winrt::Windows::System::VirtualKey key) noexcept;
@@ -62,14 +63,9 @@ class CompositionEventHandler {
   void onPointerCaptureLost(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerPoint &pointerPoint,
       winrt::Windows::System::VirtualKeyModifiers keyModifiers) noexcept;
-  void onKeyDown(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
-  void onKeyUp(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
+  void onKeyDown(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
+  void onKeyUp(const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
   void onCharacterReceived(
-      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept;
 
   void getTargetPointerArgs(