react-native-windows 0.71.10 → 0.72.0-preview.2

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

@@ -5,22 +5,28 @@
 
 #include "CompositionEventHandler.h"
 
-#include <Fabric/Composition/CompositionViewComponentView.h>
 #include <Fabric/FabricUIManagerModule.h>
+#include <IReactContext.h>
+#include <Views/DevMenu.h>
 #include <Views/ShadowNodeBase.h>
 #include <windows.h>
 #include <windowsx.h>
+#include "CompositionRootView.h"
+#include "CompositionViewComponentView.h"
+#include "RootComponentView.h"
 
 namespace Microsoft::ReactNative {
 
 const PointerId MOUSE_POINTER_ID = 1; // TODO ensure this is something that does not conflict with pointer point IDs.
 
+bool IsMousePointerEvent(const facebook::react::PointerEvent &pointerEvent) {
+  return pointerEvent.pointerId == MOUSE_POINTER_ID;
+}
+
 bool IsViewListeningToEvent(IComponentView *view, facebook::react::ViewEvents::Offset eventType) {
   if (view) {
     auto const &viewProps = *std::static_pointer_cast<facebook::react::ViewProps const>(view->props());
-    return true;
-    // TODO why arn't the events bits being set?
-    // return viewProps.events[eventType];
+    return viewProps.events[eventType];
   }
   return false;
 }
@@ -78,6 +84,18 @@ CompositionEventHandler::CompositionEventHandler(
 
 CompositionEventHandler::~CompositionEventHandler() {}
 
+facebook::react::SurfaceId CompositionEventHandler::SurfaceId() noexcept {
+  return static_cast<facebook::react::SurfaceId>(
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::CompositionRootView>(m_compRootView)->GetTag());
+}
+
+::Microsoft::ReactNative::RootComponentView &CompositionEventHandler::RootComponentView() noexcept {
+  auto rootComponentViewDescriptor = (::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties()))
+                                         ->GetViewRegistry()
+                                         .componentViewDescriptorWithTag(SurfaceId());
+  return static_cast<::Microsoft::ReactNative::RootComponentView &>(*(rootComponentViewDescriptor.view));
+}
+
 // For DM
 /*
 void CompositionEventHandler::PointerDown(facebook::react::SurfaceId surfaceId, uint32_t pointerId) {
@@ -90,8 +108,7 @@ void CompositionEventHandler::PointerDown(facebook::react::SurfaceId surfaceId,
 
 
   auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
-  auto tag = static_cast<CompositionBaseComponentView &>(*rootComponentViewDescriptor.view)
-                 .hitTest({pp.Position().X, pp.Position().Y}, ptLocal);
+  auto tag = rootComponentViewDescriptor.view->hitTest({pp.Position().X, pp.Position().Y}, ptLocal);
 
   if (tag != -1) {
   auto hitComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag);
@@ -105,61 +122,84 @@ void CompositionEventHandler::PointerDown(facebook::react::SurfaceId surfaceId,
 }
 */
 
-void CompositionEventHandler::ScrollWheel(
-    facebook::react::SurfaceId surfaceId,
-    facebook::react::Point pt,
-    uint32_t delta) {
+void CompositionEventHandler::ScrollWheel(facebook::react::Point pt, uint32_t delta) {
   if (std::shared_ptr<FabricUIManager> fabricuiManager =
           ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties())) {
     facebook::react::Point ptLocal;
 
-    auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
-
-    static_cast<CompositionBaseComponentView &>(*rootComponentViewDescriptor.view)
-        .ScrollWheel(
-            {static_cast<float>(pt.x / m_compRootView.ScaleFactor()),
-             static_cast<float>(pt.y / m_compRootView.ScaleFactor())},
-            delta);
+    RootComponentView().ScrollWheel(
+        {static_cast<float>(pt.x / m_compRootView.ScaleFactor()),
+         static_cast<float>(pt.y / m_compRootView.ScaleFactor())},
+        delta);
   }
 }
 
-int64_t CompositionEventHandler::SendMessage(
-    facebook::react::SurfaceId surfaceId,
-    uint32_t msg,
-    uint64_t wParam,
-    int64_t lParam) noexcept {
+int64_t CompositionEventHandler::SendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept {
   switch (msg) {
     case WM_LBUTTONDOWN: {
-      ButtonDown(surfaceId, msg, wParam, lParam);
+      ButtonDown(msg, wParam, lParam);
       return 0;
     }
     case WM_POINTERDOWN: {
-      PointerPressed(surfaceId, msg, wParam, lParam);
+      PointerPressed(msg, wParam, lParam);
       return 0;
     }
     case WM_LBUTTONUP: {
-      ButtonUp(surfaceId, msg, wParam, lParam);
+      ButtonUp(msg, wParam, lParam);
       return 0;
     }
     case WM_POINTERUP: {
-      PointerUp(surfaceId, msg, wParam, lParam);
+      PointerUp(msg, wParam, lParam);
       return 0;
     }
     case WM_MOUSEMOVE: {
-      MouseMove(surfaceId, msg, wParam, lParam);
+      MouseMove(msg, wParam, lParam);
       return 0;
     }
+    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;
+      }
+    }
     case WM_KEYDOWN:
     case WM_KEYUP:
-    case WM_CHAR:
-    case WM_SYSCHAR:
     case WM_SYSKEYDOWN:
     case WM_SYSKEYUP: {
-      if (auto focusedComponent = GetFocusedComponent()) {
-        auto result = focusedComponent->SendMessage(msg, wParam, lParam);
+      // TODO full bubbling of events
+      if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
+        auto result = focusedComponent->sendMessage(msg, wParam, lParam);
         if (result)
           return result;
       }
+
+      BYTE bKeys[256];
+      if (GetKeyboardState(bKeys)) {
+        bool fShift = false;
+        if (bKeys[VK_LSHIFT] & 0x80)
+          fShift = true;
+        if (bKeys[VK_RSHIFT] & 0x80)
+          fShift = true;
+        bool fCtrl = false;
+        if (bKeys[VK_LCONTROL] & 0x80)
+          fCtrl = true;
+        if (bKeys[VK_RCONTROL] & 0x80)
+          fCtrl = true;
+        if (msg == WM_KEYDOWN && wParam == VkKeyScanA('d') && fShift && fCtrl) {
+          auto contextSelf = winrt::get_self<React::implementation::ReactContext>(m_context.Handle());
+          Microsoft::ReactNative::DevMenuManager::Show(
+              Mso::CntPtr<Mso::React::IReactContext>(&contextSelf->GetInner()));
+        }
+        if (!fCtrl && msg == WM_KEYDOWN && wParam == VK_TAB) {
+          if (!RootComponentView().TryMoveFocus(!fShift)) {
+            // TODO notify rootview that host should move focus
+          }
+          return 1;
+        }
+      }
       return 0;
     }
   }
@@ -197,7 +237,7 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
   auto itCurrentlyHoveredViews = m_currentlyHoveredViewsPerPointer.find(pointerId);
   if (itCurrentlyHoveredViews != m_currentlyHoveredViewsPerPointer.end()) {
     for (auto &taggedView : itCurrentlyHoveredViews->second) {
-      if (auto &view = taggedView.view()) {
+      if (auto view = taggedView.view()) {
         currentlyHoveredViews.push_back(view.get());
       }
     }
@@ -213,7 +253,7 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
   if (targetView != nullptr && previousTargetTag != targetView->tag()) {
     bool shouldEmitOverEvent =
         IsAnyViewInPathListeningToEvent(eventPathViews, facebook::react::ViewEvents::Offset::PointerOver);
-    facebook::react::SharedTouchEventEmitter eventEmitter = targetView->touchEventEmitter();
+    facebook::react::SharedTouchEventEmitter eventEmitter = targetView->touchEventEmitterAtPoint(event.offsetPoint);
     if (shouldEmitOverEvent && eventEmitter != nullptr) {
       eventEmitter->onPointerOver(event);
     }
@@ -224,8 +264,8 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
   // We only want to emit events to JS if there is a view that is currently listening to said event
   // so we only send those event to the JS side if the element which has been entered is itself listening,
   // or if one of its parents is listening in case those listeners care about the capturing phase. Adding the ability
-  // for native to distingusih between capturing listeners and not could be an optimization to futher reduce the number
-  // of events we send to JS
+  // for native to distingusih between capturing listeners and not could be an optimization to futher reduce the
+  // number of events we send to JS
   bool hasParentEnterListener = false;
 
   for (auto itComponentView = eventPathViews.rbegin(); itComponentView != eventPathViews.rend();
@@ -234,7 +274,8 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
     auto componentView = *itComponentView;
     bool shouldEmitEvent = componentView != nullptr &&
         (hasParentEnterListener ||
-         IsViewListeningToEvent(componentView, facebook::react::ViewEvents::Offset::PointerEnter));
+         IsViewListeningToEvent(componentView, facebook::react::ViewEvents::Offset::PointerEnter) ||
+         IsViewListeningToEvent(componentView, facebook::react::ViewEvents::Offset::MouseEnter));
 
     if (shouldEmitEvent &&
         std::find(currentlyHoveredViews.begin(), currentlyHoveredViews.end(), componentView) ==
@@ -242,6 +283,9 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
       facebook::react::SharedTouchEventEmitter eventEmitter = componentView->touchEventEmitter();
       if (eventEmitter) {
         eventEmitter->onPointerEnter(event);
+        if (IsMousePointerEvent(event)) {
+          eventEmitter->onMouseEnter(event);
+        }
       }
     }
 
@@ -274,13 +318,15 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
 
   bool hasParentLeaveListener = false;
   for (auto itComponentView = currentlyHoveredViews.rbegin(); itComponentView != currentlyHoveredViews.rend();
-       itComponentView++) { //  for (RCTReactTaggedView *taggedView in [currentlyHoveredViews reverseObjectEnumerator])
+       itComponentView++) { //  for (RCTReactTaggedView *taggedView in [currentlyHoveredViews
+                            //  reverseObjectEnumerator])
                             //  {
     auto componentView = *itComponentView;
 
     bool shouldEmitEvent = componentView != nullptr &&
         (hasParentLeaveListener ||
-         IsViewListeningToEvent(componentView, facebook::react::ViewEvents::Offset::PointerLeave));
+         IsViewListeningToEvent(componentView, facebook::react::ViewEvents::Offset::PointerLeave) ||
+         IsViewListeningToEvent(componentView, facebook::react::ViewEvents::Offset::MouseLeave));
 
     if (shouldEmitEvent &&
         std::find(eventPathViews.begin(), eventPathViews.end(), componentView) == eventPathViews.end()) {
@@ -299,6 +345,9 @@ void CompositionEventHandler::HandleIncomingPointerEvent(
     facebook::react::SharedTouchEventEmitter eventEmitter = componentView->touchEventEmitter();
     if (eventEmitter) {
       eventEmitter->onPointerLeave(event);
+      if (IsMousePointerEvent(event)) {
+        eventEmitter->onMouseLeave(event);
+      }
     }
   }
 
@@ -351,7 +400,7 @@ facebook::react::PointerEvent CreatePointerEventFromIncompleteHoverData(
 
   pointerEvent.clientPoint = ptScaled;
   pointerEvent.screenPoint = ptScaled;
-  // pointerEvent.offsetPoint = ptLocal;
+  pointerEvent.offsetPoint = ptLocal;
   pointerEvent.width = 1.0;
   pointerEvent.height = 1.0;
   pointerEvent.tiltX = 0;
@@ -367,11 +416,7 @@ facebook::react::PointerEvent CreatePointerEventFromIncompleteHoverData(
   return pointerEvent;
 }
 
-void CompositionEventHandler::MouseMove(
-    facebook::react::SurfaceId surfaceId,
-    uint32_t msg,
-    uint64_t wParam,
-    int64_t lParam) {
+void CompositionEventHandler::MouseMove(uint32_t msg, uint64_t wParam, int64_t lParam) {
   int pointerId = MOUSE_POINTER_ID; // TODO pointerId
 
   auto x = GET_X_LPARAM(lParam);
@@ -381,11 +426,9 @@ void CompositionEventHandler::MouseMove(
           ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties())) {
     facebook::react::Point ptLocal;
 
-    auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
     facebook::react::Point ptScaled = {
         static_cast<float>(x / m_compRootView.ScaleFactor()), static_cast<float>(y / m_compRootView.ScaleFactor())};
-    auto tag =
-        static_cast<CompositionBaseComponentView &>(*rootComponentViewDescriptor.view).hitTest(ptScaled, ptLocal);
+    auto tag = RootComponentView().hitTest(ptScaled, ptLocal);
 
     if (tag == -1)
       return;
@@ -396,7 +439,8 @@ void CompositionEventHandler::MouseMove(
     facebook::react::PointerEvent pointerEvent = CreatePointerEventFromIncompleteHoverData(ptScaled, ptLocal);
 
     auto handler = [targetView, &pointerEvent](std::vector<IComponentView *> &eventPathViews) {
-      facebook::react::SharedTouchEventEmitter eventEmitter = targetView ? targetView->touchEventEmitter() : nullptr;
+      facebook::react::SharedTouchEventEmitter eventEmitter =
+          targetView ? targetView->touchEventEmitterAtPoint(pointerEvent.offsetPoint) : nullptr;
       bool hasMoveEventListeners =
           IsAnyViewInPathListeningToEvent(eventPathViews, facebook::react::ViewEvents::Offset::PointerMove) ||
           IsAnyViewInPathListeningToEvent(eventPathViews, facebook::react::ViewEvents::Offset::PointerMoveCapture);
@@ -409,11 +453,7 @@ void CompositionEventHandler::MouseMove(
   }
 }
 
-void CompositionEventHandler::PointerPressed(
-    facebook::react::SurfaceId surfaceId,
-    uint32_t msg,
-    uint64_t wParam,
-    int64_t lParam) {
+void CompositionEventHandler::PointerPressed(uint32_t msg, uint64_t wParam, int64_t lParam) {
   POINTER_INFO pi;
   PointerId pointerId = GET_POINTERID_WPARAM(wParam);
   GetPointerInfo(pointerId, &pi);
@@ -436,19 +476,17 @@ void CompositionEventHandler::PointerPressed(
           ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties())) {
     facebook::react::Point ptLocal;
 
-    auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
     facebook::react::Point ptScaled = {
         static_cast<float>(pt.x / m_compRootView.ScaleFactor()),
         static_cast<float>(pt.y / m_compRootView.ScaleFactor())};
-    auto tag =
-        static_cast<CompositionBaseComponentView &>(*rootComponentViewDescriptor.view).hitTest(ptScaled, ptLocal);
+    auto tag = RootComponentView().hitTest(ptScaled, ptLocal);
 
     if (tag == -1)
       return;
 
     IComponentView *targetComponentView =
         fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view.get();
-    static_cast<CompositionBaseComponentView *>(targetComponentView)->SendMessage(msg, wParam, lParam);
+    static_cast<CompositionBaseComponentView *>(targetComponentView)->sendMessage(msg, wParam, lParam);
 
     ActiveTouch activeTouch{0};
     switch (pi.pointerType) {
@@ -490,15 +528,11 @@ void CompositionEventHandler::PointerPressed(
 
     m_activeTouches.emplace(pointerId, activeTouch);
 
-    DispatchTouchEvent(surfaceId, eventType, pointerId);
+    DispatchTouchEvent(eventType, pointerId);
   }
 }
 
-void CompositionEventHandler::ButtonDown(
-    facebook::react::SurfaceId surfaceId,
-    uint32_t msg,
-    uint64_t wParam,
-    int64_t lParam) {
+void CompositionEventHandler::ButtonDown(uint32_t msg, uint64_t wParam, int64_t lParam) {
   PointerId pointerId = MOUSE_POINTER_ID;
 
   auto staleTouch = std::find_if(m_activeTouches.begin(), m_activeTouches.end(), [pointerId](const auto &pair) {
@@ -519,24 +553,23 @@ void CompositionEventHandler::ButtonDown(
           ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties())) {
     facebook::react::Point ptLocal;
 
-    auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
     facebook::react::Point ptScaled = {
         static_cast<float>(x / m_compRootView.ScaleFactor()), static_cast<float>(y / m_compRootView.ScaleFactor())};
-    auto tag = rootComponentViewDescriptor.view->hitTest(ptScaled, ptLocal);
+    auto tag = RootComponentView().hitTest(ptScaled, ptLocal);
 
     if (tag == -1)
       return;
 
     IComponentView *targetComponentView =
         fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view.get();
-    static_cast<CompositionBaseComponentView *>(targetComponentView)->SendMessage(msg, wParam, lParam);
+    static_cast<CompositionBaseComponentView *>(targetComponentView)->sendMessage(msg, wParam, lParam);
 
     ActiveTouch activeTouch{0};
     activeTouch.touchType = UITouchType::Mouse;
 
     auto componentView = targetComponentView;
     while (componentView) {
-      if (auto eventEmitter = componentView->touchEventEmitter()) {
+      if (auto eventEmitter = componentView->touchEventEmitterAtPoint(ptLocal)) {
         activeTouch.eventEmitter = eventEmitter;
         activeTouch.touch.target = componentView->tag();
         // activeTouch.componentView = componentView;
@@ -559,15 +592,11 @@ void CompositionEventHandler::ButtonDown(
 
     m_activeTouches.emplace(pointerId, activeTouch);
 
-    DispatchTouchEvent(surfaceId, eventType, pointerId);
+    DispatchTouchEvent(eventType, pointerId);
   }
 }
 
-void CompositionEventHandler::PointerUp(
-    facebook::react::SurfaceId surfaceId,
-    uint32_t msg,
-    uint64_t wParam,
-    int64_t lParam) {
+void CompositionEventHandler::PointerUp(uint32_t msg, uint64_t wParam, int64_t lParam) {
   POINTER_INFO pi;
   PointerId pointerId = GET_POINTERID_WPARAM(wParam);
   GetPointerInfo(pointerId, &pi);
@@ -588,30 +617,24 @@ void CompositionEventHandler::PointerUp(
           ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties())) {
     facebook::react::Point ptLocal;
 
-    auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
     facebook::react::Point ptScaled = {
         static_cast<float>(pt.x / m_compRootView.ScaleFactor()),
         static_cast<float>(pt.y / m_compRootView.ScaleFactor())};
-    auto tag =
-        static_cast<CompositionBaseComponentView &>(*rootComponentViewDescriptor.view).hitTest(ptScaled, ptLocal);
+    auto tag = RootComponentView().hitTest(ptScaled, ptLocal);
 
     if (tag == -1)
       return;
 
     auto targetComponentView = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view;
-    std::static_pointer_cast<CompositionBaseComponentView>(targetComponentView)->SendMessage(msg, wParam, lParam);
+    std::static_pointer_cast<CompositionBaseComponentView>(targetComponentView)->sendMessage(msg, wParam, lParam);
 
     UpdateActiveTouch(activeTouch->second, ptScaled, ptLocal);
-    DispatchTouchEvent(surfaceId, TouchEventType::End, pointerId);
+    DispatchTouchEvent(TouchEventType::End, pointerId);
     m_activeTouches.erase(pointerId);
   }
 }
 
-void CompositionEventHandler::ButtonUp(
-    facebook::react::SurfaceId surfaceId,
-    uint32_t msg,
-    uint64_t wParam,
-    int64_t lParam) {
+void CompositionEventHandler::ButtonUp(uint32_t msg, uint64_t wParam, int64_t lParam) {
   int pointerId = MOUSE_POINTER_ID;
 
   auto activeTouch = std::find_if(m_activeTouches.begin(), m_activeTouches.end(), [pointerId](const auto &pair) {
@@ -629,20 +652,18 @@ void CompositionEventHandler::ButtonUp(
           ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties())) {
     facebook::react::Point ptLocal;
 
-    auto rootComponentViewDescriptor = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(surfaceId);
     facebook::react::Point ptScaled = {
         static_cast<float>(x / m_compRootView.ScaleFactor()), static_cast<float>(y / m_compRootView.ScaleFactor())};
-    auto tag =
-        static_cast<CompositionBaseComponentView &>(*rootComponentViewDescriptor.view).hitTest(ptScaled, ptLocal);
+    auto tag = RootComponentView().hitTest(ptScaled, ptLocal);
 
     if (tag == -1)
       return;
 
     auto targetComponentView = fabricuiManager->GetViewRegistry().componentViewDescriptorWithTag(tag).view;
-    std::static_pointer_cast<CompositionBaseComponentView>(targetComponentView)->SendMessage(msg, wParam, lParam);
+    std::static_pointer_cast<CompositionBaseComponentView>(targetComponentView)->sendMessage(msg, wParam, lParam);
 
     UpdateActiveTouch(activeTouch->second, ptScaled, ptLocal);
-    DispatchTouchEvent(surfaceId, TouchEventType::End, pointerId);
+    DispatchTouchEvent(TouchEventType::End, pointerId);
     m_activeTouches.erase(pointerId);
   }
 }
@@ -685,7 +706,7 @@ facebook::react::PointerEvent CompositionEventHandler::CreatePointerEventFromAct
   event.pointerType = PointerTypeCStringFromUITouchType(activeTouch.touchType);
   event.clientPoint = touch.pagePoint;
   event.screenPoint = touch.screenPoint;
-  // event.offsetPoint = touch.offsetPoint;
+  event.offsetPoint = touch.offsetPoint;
 
   event.pressure = touch.force;
   if (activeTouch.touchType == UITouchType::Mouse) {
@@ -723,10 +744,7 @@ facebook::react::PointerEvent CompositionEventHandler::CreatePointerEventFromAct
 }
 
 // If we have events that include multiple pointer updates, we should change arg from pointerId to vector<pointerId>
-void CompositionEventHandler::DispatchTouchEvent(
-    facebook::react::SurfaceId surfaceId,
-    TouchEventType eventType,
-    PointerId pointerId) {
+void CompositionEventHandler::DispatchTouchEvent(TouchEventType eventType, PointerId pointerId) {
   auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties());
 
   if (!fabricuiManager)
@@ -757,9 +775,8 @@ void CompositionEventHandler::DispatchTouchEvent(
         eventType == TouchEventType::Cancel;
     if (!shouldLeave) {
       const auto &viewRegistry = fabricuiManager->GetViewRegistry();
-      auto rootComponentViewDescriptor = viewRegistry.componentViewDescriptorWithTag(surfaceId);
       facebook::react::Point ptLocal;
-      auto targetTag = rootComponentViewDescriptor.view->hitTest(pointerEvent.clientPoint, ptLocal);
+      auto targetTag = RootComponentView().hitTest(pointerEvent.clientPoint, ptLocal);
       auto targetComponentViewDescriptor = viewRegistry.componentViewDescriptorWithTag(targetTag);
       targetView = FindClosestFabricManagedTouchableView(targetComponentViewDescriptor.view.get());
     }

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

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
+#include <Fabric/Composition/RootComponentView.h>
 #include <Fabric/ReactTaggedView.h>
 #include <IReactInstance.h>
 #include <JSValue.h>
@@ -33,16 +34,19 @@ class CompositionEventHandler {
       const winrt::Microsoft::ReactNative::CompositionRootView &CompositionRootView);
   virtual ~CompositionEventHandler();
 
-  int64_t SendMessage(facebook::react::SurfaceId surfaceId, uint32_t msg, uint64_t wParam, int64_t lParam) noexcept;
-  void ScrollWheel(facebook::react::SurfaceId surfaceId, facebook::react::Point pt, uint32_t delta);
+  int64_t SendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept;
+  void ScrollWheel(facebook::react::Point pt, uint32_t delta);
   void RemoveTouchHandlers();
 
  private:
-  void ButtonDown(facebook::react::SurfaceId surfaceId, uint32_t msg, uint64_t wParam, int64_t lParam);
-  void PointerPressed(facebook::react::SurfaceId surfaceId, uint32_t msg, uint64_t wParam, int64_t lParam);
-  void ButtonUp(facebook::react::SurfaceId surfaceId, uint32_t msg, uint64_t wParam, int64_t lParam);
-  void PointerUp(facebook::react::SurfaceId surfaceId, uint32_t msg, uint64_t wParam, int64_t lParam);
-  void MouseMove(facebook::react::SurfaceId surfaceId, uint32_t msg, uint64_t wParam, int64_t lParam);
+  void ButtonDown(uint32_t msg, uint64_t wParam, int64_t lParam);
+  void PointerPressed(uint32_t msg, uint64_t wParam, int64_t lParam);
+  void ButtonUp(uint32_t msg, uint64_t wParam, int64_t lParam);
+  void PointerUp(uint32_t msg, uint64_t wParam, int64_t lParam);
+  void MouseMove(uint32_t msg, uint64_t wParam, int64_t lParam);
+
+  facebook::react::SurfaceId SurfaceId() noexcept;
+  RootComponentView &RootComponentView() noexcept;
 
   enum class UITouchType {
     Mouse,
@@ -50,7 +54,7 @@ class CompositionEventHandler {
     Touch,
   };
   enum class TouchEventType { Start = 0, End, Move, Cancel, CaptureLost, PointerEntered, PointerExited, PointerMove };
-  void DispatchTouchEvent(facebook::react::SurfaceId surfaceId, TouchEventType eventType, PointerId pointerId);
+  void DispatchTouchEvent(TouchEventType eventType, PointerId pointerId);
   void HandleIncomingPointerEvent(
       facebook::react::PointerEvent &pe,
       IComponentView *targetView,

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

@@ -5,8 +5,6 @@
 #pragma once
 
 #include <Composition/CompositionSwitcher.interop.h>
-#include <guid/msoGuid.h>
-
 #include <winrt/Windows.UI.Composition.h>
 
 namespace Microsoft::ReactNative {

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

@@ -14,6 +14,9 @@
 #include "CompositionContextHelper.h"
 #include "ReactNativeHost.h"
 
+#include "CompositionRootAutomationProvider.h"
+#include "CompositionRootView.h"
+
 WINUSERAPI UINT WINAPI GetDpiForWindow(_In_ HWND hwnd);
 
 namespace winrt::Microsoft::ReactNative::implementation {
@@ -70,12 +73,15 @@ double CompositionHwndHost::ScaleFactor() noexcept {
 void CompositionHwndHost::UpdateSize() noexcept {
   RECT rc;
   if (GetClientRect(m_hwnd, &rc)) {
-    winrt::Windows::Foundation::Size size{
-        static_cast<float>((rc.right - rc.left) / ScaleFactor()),
-        static_cast<float>((rc.bottom - rc.top) / ScaleFactor())};
-    m_compRootView.Size(size);
-    m_compRootView.Measure(size);
-    m_compRootView.Arrange(size);
+    if (m_height != (rc.bottom - rc.top) || m_width != (rc.right - rc.left)) {
+      m_height = rc.bottom - rc.top;
+      m_width = rc.right - rc.left;
+      winrt::Windows::Foundation::Size size{
+          static_cast<float>(m_width / ScaleFactor()), static_cast<float>(m_height / ScaleFactor())};
+      m_compRootView.Size(size);
+      m_compRootView.Measure(size);
+      m_compRootView.Arrange(size);
+    }
   }
 }
 
@@ -121,6 +127,11 @@ LRESULT CompositionHwndHost::TranslateMessage(int msg, uint64_t wParam, int64_t
   return 0;
 }
 
+winrt::Microsoft::ReactNative::FocusNavigationResult CompositionHwndHost::NavigateFocus(
+    const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept {
+  return m_compRootView.NavigateFocus(request);
+}
+
 ReactNative::IReactViewHost CompositionHwndHost::ReactViewHost() const noexcept {
   return m_reactViewHost ? m_reactViewHost : m_compRootView.ReactViewHost();
 }
@@ -142,4 +153,14 @@ winrt::Windows::UI::Composition::Compositor CompositionHwndHost::Compositor() co
       compositionContext);
 }
 
+IInspectable CompositionHwndHost::UiaProvider() noexcept {
+  auto compRootView = winrt::get_self<implementation::CompositionRootView>(m_compRootView);
+  auto provider = compRootView->GetUiaProvider();
+  auto pRootProvider = static_cast<CompositionRootAutomationProvider *>(provider.as<IRawElementProviderSimple>().get());
+  if (pRootProvider != nullptr) {
+    pRootProvider->SetHwnd(m_hwnd);
+  }
+  return provider;
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -20,8 +20,14 @@ struct CompositionHwndHost : CompositionHwndHostT<CompositionHwndHost> {
   winrt::Microsoft::ReactNative::IReactViewHost ReactViewHost() const noexcept;
   void ReactViewHost(winrt::Microsoft::ReactNative::IReactViewHost const &value) noexcept;
 
+  // property UiaProvider
+  IInspectable UiaProvider() noexcept;
+
   winrt::Windows::UI::Composition::Visual RootVisual() const noexcept;
 
+  winrt::Microsoft::ReactNative::FocusNavigationResult NavigateFocus(
+      const winrt::Microsoft::ReactNative::FocusNavigationRequest &request) noexcept;
+
   LRESULT TranslateMessage(int msg, uint64_t wParam, int64_t lParam) noexcept;
 
  private:
@@ -37,6 +43,8 @@ struct CompositionHwndHost : CompositionHwndHostT<CompositionHwndHost> {
   HWND m_hwnd;
   winrt::Microsoft::ReactNative::CompositionRootView m_compRootView{nullptr};
   winrt::Windows::UI::Composition::Desktop::DesktopWindowTarget m_target{nullptr};
+  LONG m_height{0};
+  LONG m_width{0};
 
   // Store locally if set before we have a rootview
   ReactNative::IReactViewHost m_reactViewHost{nullptr};