react-native-windows 0.0.0-canary.721 → 0.0.0-canary.723

package/.flowconfig

@@ -14,7 +14,6 @@
 <PROJECT_ROOT>/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js
 <PROJECT_ROOT>/Libraries/Components/RefreshControl/RefreshControl.js
 <PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js
-<PROJECT_ROOT>/Libraries/Components/ScrollView/ScrollView.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInput.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInputState.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/Touchable.js

package/Libraries/Components/Pressable/Pressable.windows.js

@@ -36,7 +36,6 @@ import useAndroidRippleForView, {
 import * as React from 'react';
 import {useImperativeHandle, useMemo, useRef, useState} from 'react';
 import type {HandledKeyboardEvent} from '../../Components/View/ViewPropTypes';
-import TextInputState from '../TextInput/TextInputState';
 
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 

package/Libraries/Components/TextInput/TextInput.windows.js

@@ -1522,8 +1522,8 @@ function InternalTextInput(props: Props): React.Node {
       // $FlowFixMe - keyDownEvents was already checked to not be undefined
       for (const el of props.keyDownEvents) {
         if (
-          event.nativeEvent.code == el.code &&
-          el.handledEventPhase == eventPhase.Bubbling
+          event.nativeEvent.code === el.code &&
+          el.handledEventPhase === eventPhase.Bubbling
         ) {
           event.stopPropagation();
         }
@@ -1536,7 +1536,7 @@ function InternalTextInput(props: Props): React.Node {
     if (props.keyUpEvents && event.isPropagationStopped() !== true) {
       // $FlowFixMe - keyDownEvents was already checked to not be undefined
       for (const el of props.keyUpEvents) {
-        if (event.nativeEvent.code == el.code && el.handledEventPhase == 3) {
+        if (event.nativeEvent.code === el.code && el.handledEventPhase === 3) {
           event.stopPropagation();
         }
       }
@@ -1548,7 +1548,7 @@ function InternalTextInput(props: Props): React.Node {
     if (props.keyDownEvents && event.isPropagationStopped() !== true) {
       // $FlowFixMe - keyDownEvents was already checked to not be undefined
       for (const el of props.keyDownEvents) {
-        if (event.nativeEvent.code == el.code && el.handledEventPhase == 1) {
+        if (event.nativeEvent.code === el.code && el.handledEventPhase === 1) {
           event.stopPropagation();
         }
       }
@@ -1560,7 +1560,7 @@ function InternalTextInput(props: Props): React.Node {
     if (props.keyUpEvents && event.isPropagationStopped() !== true) {
       // $FlowFixMe - keyDownEvents was already checked to not be undefined
       for (const el of props.keyUpEvents) {
-        if (event.nativeEvent.code == el.code && el.handledEventPhase == 1) {
+        if (event.nativeEvent.code === el.code && el.handledEventPhase === 1) {
           event.stopPropagation();
         }
       }

package/Libraries/Components/View/View.windows.js

@@ -126,7 +126,10 @@ const View: React.AbstractComponent<
       if (otherProps.keyDownEvents && event.isPropagationStopped() !== true) {
         // $FlowFixMe - keyDownEvents was already checked to not be undefined
         for (const el of otherProps.keyDownEvents) {
-          if (event.nativeEvent.code == el.code && el.handledEventPhase == 3) {
+          if (
+            event.nativeEvent.code === el.code &&
+            el.handledEventPhase === 3
+          ) {
             event.stopPropagation();
           }
         }
@@ -138,7 +141,10 @@ const View: React.AbstractComponent<
       if (otherProps.keyUpEvents && event.isPropagationStopped() !== true) {
         // $FlowFixMe - keyDownEvents was already checked to not be undefined
         for (const el of otherProps.keyUpEvents) {
-          if (event.nativeEvent.code == el.code && el.handledEventPhase == 3) {
+          if (
+            event.nativeEvent.code === el.code &&
+            el.handledEventPhase === 3
+          ) {
             event.stopPropagation();
           }
         }
@@ -150,7 +156,10 @@ const View: React.AbstractComponent<
       if (otherProps.keyDownEvents && event.isPropagationStopped() !== true) {
         // $FlowFixMe - keyDownEvents was already checked to not be undefined
         for (const el of otherProps.keyDownEvents) {
-          if (event.nativeEvent.code == el.code && el.handledEventPhase == 1) {
+          if (
+            event.nativeEvent.code === el.code &&
+            el.handledEventPhase === 1
+          ) {
             event.stopPropagation();
           }
         }
@@ -162,7 +171,10 @@ const View: React.AbstractComponent<
       if (otherProps.keyUpEvents && event.isPropagationStopped() !== true) {
         // $FlowFixMe - keyDownEvents was already checked to not be undefined
         for (const el of otherProps.keyUpEvents) {
-          if (event.nativeEvent.code == el.code && el.handledEventPhase == 1) {
+          if (
+            event.nativeEvent.code === el.code &&
+            el.handledEventPhase === 1
+          ) {
             event.stopPropagation();
           }
         }
@@ -191,7 +203,7 @@ const View: React.AbstractComponent<
         }
         return child;
       });
-      if (updatedChildren.length == 1) {
+      if (updatedChildren.length === 1) {
         return updatedChildren[0];
       } else {
         return updatedChildren;

package/Libraries/Pressability/Pressability.windows.js

@@ -629,7 +629,7 @@ export default class Pressability {
           (event.nativeEvent.code === 'Space' ||
             event.nativeEvent.code === 'Enter' ||
             event.nativeEvent.code === 'GamepadA') &&
-          event.defaultPrevented != true &&
+          event.defaultPrevented !== true &&
           this._isKeyDown
         ) {
           const {onPressOut, onPress} = this._config;
@@ -649,7 +649,7 @@ export default class Pressability {
           (event.nativeEvent.code === 'Space' ||
             event.nativeEvent.code === 'Enter' ||
             event.nativeEvent.code === 'GamepadA') &&
-          event.defaultPrevented != true
+          event.defaultPrevented !== true
         ) {
           const {onPressIn} = this._config;
           this._isKeyDown = true;

package/Microsoft.ReactNative/Composition.Input.idl

@@ -25,6 +25,13 @@ namespace Microsoft.ReactNative.Composition.Input
     Windows.System.VirtualKey OriginalKey { get; };
   }
 
+  interface CharacterReceivedRoutedEventArgs requires RoutedEventArgs
+  {
+    Boolean Handled { get; set; };
+    Windows.UI.Core.CorePhysicalKeyStatus KeyStatus { get; };
+    Int32 KeyCode { get; };
+  };
+
   interface IPointerPointTransform
   {
     IPointerPointTransform Inverse { get; };

package/Microsoft.ReactNative/Fabric/ComponentView.h

@@ -87,6 +87,9 @@ struct IComponentView {
   virtual void onKeyUp(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept = 0;
+  virtual void onCharacterReceived(
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept = 0;
   virtual bool focusable() const noexcept = 0;
   virtual facebook::react::SharedViewEventEmitter eventEmitterAtPoint(facebook::react::Point pt) noexcept = 0;
   virtual facebook::react::SharedViewEventEmitter eventEmitter() noexcept = 0;
@@ -97,7 +100,6 @@ struct IComponentView {
       facebook::react::Point pt,
       facebook::react::Point &localPt,
       bool ignorePointerEvents = false) const noexcept = 0;
-  virtual int64_t sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept = 0;
   virtual winrt::IInspectable EnsureUiaProvider() noexcept = 0;
   // Notify up the tree to bring the rect into view by scrolling as needed
   virtual void StartBringIntoView(BringIntoViewOptions &&args) noexcept = 0;

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

@@ -57,7 +57,11 @@ void AbiCompositionViewComponentView::updateProps(
   const auto &oldViewProps = *std::static_pointer_cast<const AbiViewProps>(m_props);
   const auto &newViewProps = *std::static_pointer_cast<const AbiViewProps>(props);
 
+  updateAccessibilityProps(oldViewProps, newViewProps);
+  // updateShadowProps(oldViewProps, newViewProps, m_visual);
+  // updateTransformProps(oldViewProps, newViewProps, m_visual);
   updateBorderProps(oldViewProps, newViewProps);
+
   Builder().UpdateProps(m_handle, newViewProps.UserProps());
 
   m_props = std::static_pointer_cast<AbiViewProps const>(props);
@@ -101,10 +105,6 @@ bool AbiCompositionViewComponentView::focusable() const noexcept {
   return m_props->focusable;
 }
 
-int64_t AbiCompositionViewComponentView::sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept {
-  return Builder().SendMessage(m_handle, msg, wParam, lParam);
-}
-
 void AbiCompositionViewComponentView::onKeyDown(
     const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
@@ -119,6 +119,13 @@ void AbiCompositionViewComponentView::onKeyUp(
   Super::onKeyUp(source, args);
 }
 
+void AbiCompositionViewComponentView::onCharacterReceived(
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+    const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept {
+  Builder().OnCharacterReceived(m_handle, source, args);
+  Super::onCharacterReceived(source, args);
+}
+
 void AbiCompositionViewComponentView::onPointerEntered(
     const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
   Builder().OnPointerEntered(m_handle, args);

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

@@ -40,13 +40,16 @@ struct AbiCompositionViewComponentView : CompositionBaseComponentView {
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
   bool focusable() const noexcept override;
-  int64_t sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept override;
   void onKeyDown(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
   void onKeyUp(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
+  void onCharacterReceived(
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept
+      override;
   void onPointerEntered(
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept override;
   void onPointerExited(

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

@@ -75,6 +75,52 @@ winrt::Windows::System::VirtualKey KeyRoutedEventArgs::OriginalKey() noexcept {
   return m_key;
 }
 
+CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
+    facebook::react::Tag tag,
+    uint32_t msg,
+    uint64_t wParam,
+    int64_t lParam) {
+  m_keycode = static_cast<int32_t>(wParam);
+  m_keyStatus.RepeatCount = (lParam & 0x0000FFFF); // bits 0-15
+  m_keyStatus.ScanCode = (lParam & 0x00FF0000) >> 16; // bits 16-23
+  m_keyStatus.IsExtendedKey = (lParam & 0x01000000) >> 24; // bit 24
+  m_keyStatus.IsMenuKeyDown = (lParam & 0x20000000) >> 29; // bit 29
+  m_keyStatus.WasKeyDown = (lParam & 0x40000000) >> 30; // bit 30
+  m_keyStatus.IsKeyReleased = (lParam & 0x80000000) >> 31; // bit 31
+}
+
+#ifdef USE_WINUI3
+CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
+    facebook::react::Tag tag,
+    winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args)
+    : m_tag(tag) {
+  auto keyStatus = args.KeyStatus();
+  m_keyStatus.RepeatCount = keyStatus.RepeatCount;
+  m_keyStatus.ScanCode = keyStatus.ScanCode;
+  m_keyStatus.IsExtendedKey = keyStatus.IsExtendedKey;
+  m_keyStatus.IsMenuKeyDown = keyStatus.IsMenuKeyDown;
+  m_keyStatus.WasKeyDown = keyStatus.WasKeyDown;
+  m_keyStatus.IsKeyReleased = keyStatus.IsKeyReleased;
+  m_keycode = args.KeyCode();
+}
+#endif
+
+int32_t CharacterReceivedRoutedEventArgs::OriginalSource() noexcept {
+  return m_tag;
+}
+bool CharacterReceivedRoutedEventArgs::Handled() noexcept {
+  return m_handled;
+}
+void CharacterReceivedRoutedEventArgs::Handled(bool value) noexcept {
+  m_handled = value;
+}
+int32_t CharacterReceivedRoutedEventArgs::KeyCode() noexcept {
+  return m_keycode;
+}
+winrt::Windows::UI::Core::CorePhysicalKeyStatus CharacterReceivedRoutedEventArgs::KeyStatus() noexcept {
+  return m_keyStatus;
+}
+
 #ifdef USE_WINUI3
 PointerPointProperties::PointerPointProperties(const winrt::Microsoft::UI::Input::PointerPointProperties &ppp)
     : m_sysPointerPointProps(ppp) {}

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

@@ -39,6 +39,31 @@ struct KeyRoutedEventArgs : winrt::implements<
   winrt::Windows::UI::Core::CorePhysicalKeyStatus m_keyStatus;
 };
 
+struct CharacterReceivedRoutedEventArgs
+    : winrt::implements<
+          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);
+#ifdef USE_WINUI3
+  CharacterReceivedRoutedEventArgs(
+      facebook::react::Tag tag,
+      winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args);
+#endif
+
+  int32_t OriginalSource() noexcept;
+  bool Handled() noexcept;
+  void Handled(bool value) noexcept;
+  int32_t KeyCode() noexcept;
+  winrt::Windows::UI::Core::CorePhysicalKeyStatus KeyStatus() noexcept;
+
+ private:
+  facebook::react::Tag m_tag{-1};
+  bool m_handled{false};
+  int32_t m_keycode;
+  winrt::Windows::UI::Core::CorePhysicalKeyStatus m_keyStatus;
+};
+
 struct PointerPointProperties : PointerPointPropertiesT<PointerPointProperties> {
 #ifdef USE_WINUI3
   PointerPointProperties(const winrt::Microsoft::UI::Input::PointerPointProperties &ppp);

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

@@ -232,9 +232,31 @@ CompositionEventHandler::CompositionEventHandler(
       onKeyUp(keyboardSource, keyArgs);
       winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
     });
+
+    m_characterReceivedToken =
+        keyboardSource.CharacterReceived([this](
+                                             winrt::Microsoft::UI::Input::InputKeyboardSource const &source,
+                                             winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args) {
+          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::CompositionRootView>(
+                            m_compRootView)
+                            ->GetTag()),
+              args);
+          auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
+          onCharacterReceived(keyboardSource, charArgs);
+          winrt::get_self<CompositionInputKeyboardSource>(keyboardSource)->Disconnect();
+        });
   }
 #endif
-};
+}
 
 CompositionEventHandler::~CompositionEventHandler() {
 #ifdef USE_WINUI3
@@ -247,6 +269,7 @@ CompositionEventHandler::~CompositionEventHandler() {
     auto keyboardSource = winrt::Microsoft::UI::Input::InputKeyboardSource::GetForIsland(island);
     keyboardSource.KeyDown(m_keyDownToken);
     keyboardSource.KeyUp(m_keyUpToken);
+    keyboardSource.CharacterReceived(m_characterReceivedToken);
   }
 #endif
 }
@@ -357,13 +380,20 @@ int64_t CompositionEventHandler::SendMessage(uint32_t msg, uint64_t wParam, int6
     }
     case WM_CHAR:
     case WM_SYSCHAR: {
-      // TODO full bubbling of events
-      if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
-        auto result = focusedComponent->sendMessage(msg, wParam, lParam);
-        if (result)
-          return result;
-      }
-      break;
+      auto focusedComponent = RootComponentView().GetFocusedComponent();
+      auto args = winrt::make<
+          winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
+          focusedComponent
+              ? focusedComponent->tag()
+              : static_cast<facebook::react::Tag>(
+                    winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(m_compRootView)
+                        ->GetTag()),
+          msg,
+          wParam,
+          lParam);
+      auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
+      onCharacterReceived(keyboardSource, args);
+      winrt::get_self<CompositionKeyboardSource>(keyboardSource)->Disconnect();
     }
     case WM_KEYDOWN:
     case WM_KEYUP:
@@ -404,8 +434,8 @@ void CompositionEventHandler::onKeyDown(
 
   bool fShift = source.GetKeyState(winrt::Windows::System::VirtualKey::Shift) ==
       winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
-  bool fCtrl =
-      GetKeyState(winrt::Windows::System::VirtualKey::Control) == winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
+  bool fCtrl = source.GetKeyState(winrt::Windows::System::VirtualKey::Control) ==
+      winrt::Windows::UI::Core::CoreVirtualKeyStates::Down;
 
   if (fShift && fCtrl && args.Key() == static_cast<winrt::Windows::System::VirtualKey>(VkKeyScanA('d')) &&
       Mso::React::ReactOptions::UseDeveloperSupport(m_context.Properties().Handle())) {
@@ -435,6 +465,17 @@ 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);
+
+    if (args.Handled())
+      return;
+  }
+}
+
 std::vector<IComponentView *> GetTouchableViewsInPathToRoot(IComponentView *view) {
   std::vector<IComponentView *> results;
   while (view) {
@@ -448,11 +489,11 @@ std::vector<IComponentView *> GetTouchableViewsInPathToRoot(IComponentView *view
 
 /**
  * Private method which is used for tracking the location of pointer events to manage the entering/leaving events.
- * The primary idea is that a pointer's presence & movement is dictated by a variety of underlying events such as down,
- * move, and up — and they should all be treated the same when it comes to tracking the entering & leaving of pointers
- * to views. This method accomplishes that by receiving the pointer event, the target view (can be null in cases when
- * the event indicates that the pointer has left the screen entirely), and a block/callback where the underlying event
- * should be fired.
+ * The primary idea is that a pointer's presence & movement is dictated by a variety of underlying events such as
+ * down, move, and up — and they should all be treated the same when it comes to tracking the entering & leaving of
+ * pointers to views. This method accomplishes that by receiving the pointer event, the target view (can be null in
+ * cases when the event indicates that the pointer has left the screen entirely), and a block/callback where the
+ * underlying event should be fired.
  */
 void CompositionEventHandler::HandleIncomingPointerEvent(
     facebook::react::PointerEvent &event,

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

@@ -56,6 +56,9 @@ class CompositionEventHandler {
   void onKeyUp(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       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;
 
   facebook::react::SurfaceId SurfaceId() noexcept;
   RootComponentView &RootComponentView() noexcept;
@@ -141,6 +144,7 @@ class CompositionEventHandler {
   winrt::event_token m_pointerWheelChangedToken;
   winrt::event_token m_keyDownToken;
   winrt::event_token m_keyUpToken;
+  winrt::event_token m_characterReceivedToken;
 #endif
 };
 

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

@@ -152,6 +152,23 @@ HRESULT __stdcall CompositionRootAutomationProvider::ElementProviderFromPoint(
 
   auto spRootView = std::static_pointer_cast<::Microsoft::ReactNative::RootComponentView>(strongView);
 
+#ifdef USE_WINUI3
+  if (m_island) {
+    auto cc = m_island.CoordinateConverter();
+    auto local =
+        cc.ConvertScreenToLocal(winrt::Windows::Graphics::PointInt32{static_cast<int32_t>(x), static_cast<int32_t>(y)});
+    auto provider = spRootView->UiaProviderFromPoint(
+        {static_cast<LONG>(local.X * m_island.RasterizationScale()),
+         static_cast<LONG>(local.Y * m_island.RasterizationScale())});
+    auto spFragment = provider.try_as<IRawElementProviderFragment>();
+    if (spFragment) {
+      *pRetVal = spFragment.detach();
+    }
+
+    return S_OK;
+  }
+#endif
+
   if (m_hwnd == nullptr || !IsWindow(m_hwnd)) {
     // TODO: Add support for non-HWND based hosting
     return E_FAIL;

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

@@ -138,10 +138,6 @@ void CompositionBaseComponentView::handleCommand(std::string const &commandName,
   assert(false); // Unhandled command
 }
 
-int64_t CompositionBaseComponentView::sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept {
-  return 0;
-}
-
 void CompositionBaseComponentView::onKeyDown(
     const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
@@ -158,6 +154,14 @@ void CompositionBaseComponentView::onKeyUp(
   }
 }
 
+void CompositionBaseComponentView::onCharacterReceived(
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+    const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept {
+  if (m_parent && !args.Handled()) {
+    m_parent->onCharacterReceived(source, args);
+  }
+}
+
 void CompositionBaseComponentView::onPointerEntered(
     const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
   if (m_parent && !args.Handled()) {

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

@@ -54,13 +54,17 @@ struct CompositionBaseComponentView : public IComponentView,
   void onKeyUp(
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept override;
+  void onCharacterReceived(
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept
+      override;
+
   bool focusable() const noexcept override;
   std::vector<facebook::react::ComponentDescriptorProvider> supplementalComponentDescriptorProviders() noexcept
       override;
   facebook::react::SharedViewEventEmitter eventEmitter() noexcept override;
   facebook::react::SharedViewEventEmitter eventEmitterAtPoint(facebook::react::Point pt) noexcept override;
   facebook::react::Tag tag() const noexcept override;
-  int64_t sendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept override;
 
   RECT getClientRect() const noexcept override;
 

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

@@ -46,10 +46,6 @@ void ReactCompositionViewComponentBuilder::SetUpdateFinalizer(UpdateFinalizer im
 void ReactCompositionViewComponentBuilder::SetVisualCreator(Composition::VisualCreator impl) noexcept {
   m_visualCreator = impl;
 }
-// (Object handle, UInt32 Msg, UInt64 WParam, Int64 LParam) => Int64
-void ReactCompositionViewComponentBuilder::SetMessageHandler(MessageHandler impl) noexcept {
-  m_messageHandler = impl;
-}
 
 void ReactCompositionViewComponentBuilder::SetKeyDownHandler(KeyHandler impl) noexcept {
   m_keyDown = impl;
@@ -59,6 +55,10 @@ void ReactCompositionViewComponentBuilder::SetKeyUpHandler(KeyHandler impl) noex
   m_keyUp = impl;
 }
 
+void ReactCompositionViewComponentBuilder::SetCharacterReceivedHandler(CharacterReceivedHandler impl) noexcept {
+  m_characterReceived = impl;
+}
+
 void ReactCompositionViewComponentBuilder::SetPointerEnteredHandler(PointerHandler impl) noexcept {
   m_pointerEntered = impl;
 }
@@ -125,17 +125,6 @@ IVisual ReactCompositionViewComponentBuilder::CreateVisual(winrt::Windows::Found
   return m_visualCreator(handle);
 }
 
-int64_t ReactCompositionViewComponentBuilder::SendMessage(
-    winrt::Windows::Foundation::IInspectable handle,
-    uint32_t msg,
-    uint64_t wparam,
-    int64_t lparam) noexcept {
-  if (!m_messageHandler) {
-    return 0;
-  }
-  return m_messageHandler(handle, msg, wparam, lparam);
-}
-
 void ReactCompositionViewComponentBuilder::OnKeyDown(
     winrt::Windows::Foundation::IInspectable handle,
     const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
@@ -154,6 +143,15 @@ void ReactCompositionViewComponentBuilder::OnKeyUp(
   }
 }
 
+void ReactCompositionViewComponentBuilder::OnCharacterReceived(
+    winrt::Windows::Foundation::IInspectable handle,
+    const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+    const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept {
+  if (m_characterReceived) {
+    m_characterReceived(handle, source, args);
+  }
+}
+
 void ReactCompositionViewComponentBuilder::OnPointerEntered(
     winrt::Windows::Foundation::IInspectable handle,
     const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {

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

@@ -30,11 +30,10 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
   void SetUpdateFinalizer(UpdateFinalizer impl) noexcept;
   // (Object handle) => IVisual
   void SetVisualCreator(VisualCreator impl) noexcept;
-  // (Object handle, UInt32 Msg, UInt64 WParam, Int64 LParam) => Int64
-  void SetMessageHandler(MessageHandler impl) noexcept;
 
   void SetKeyDownHandler(KeyHandler impl) noexcept;
   void SetKeyUpHandler(KeyHandler impl) noexcept;
+  void SetCharacterReceivedHandler(CharacterReceivedHandler impl) noexcept;
 
   void SetPointerEnteredHandler(PointerHandler impl) noexcept;
   void SetPointerExitedHandler(PointerHandler impl) noexcept;
@@ -55,8 +54,6 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
   void UpdateLayoutMetrics(winrt::Windows::Foundation::IInspectable handle, LayoutMetrics metrics) noexcept;
   void FinalizeUpdates(winrt::Windows::Foundation::IInspectable handle) noexcept;
   IVisual CreateVisual(winrt::Windows::Foundation::IInspectable handle) noexcept;
-  int64_t
-  SendMessage(winrt::Windows::Foundation::IInspectable handle, uint32_t Msg, uint64_t WParam, int64_t LParam) noexcept;
   void OnKeyDown(
       winrt::Windows::Foundation::IInspectable handle,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
@@ -65,6 +62,10 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
       winrt::Windows::Foundation::IInspectable handle,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept;
+  void OnCharacterReceived(
+      winrt::Windows::Foundation::IInspectable handle,
+      const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source,
+      const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept;
   void OnPointerEntered(
       winrt::Windows::Foundation::IInspectable handle,
       const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept;
@@ -93,9 +94,9 @@ struct ReactCompositionViewComponentBuilder : winrt::implements<
   LayoutMetricsUpdater m_layoutMetricsUpdater;
   UpdateFinalizer m_finalizer;
   VisualCreator m_visualCreator;
-  MessageHandler m_messageHandler;
   KeyHandler m_keyUp;
   KeyHandler m_keyDown;
+  CharacterReceivedHandler m_characterReceived;
   PointerHandler m_pointerEntered;
   PointerHandler m_pointerExited;
   PointerHandler m_pointerReleased;