react-native-windows 0.81.3 → 0.82.0-preview.10

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

@@ -4,11 +4,9 @@
 #if __has_include("Composition.Experimental.SystemCompositionContextHelper.g.cpp")
 #include "Composition.Experimental.SystemCompositionContextHelper.g.cpp"
 #endif
-#ifdef USE_WINUI3
 #if __has_include("Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp")
 #include "Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp"
 #endif
-#endif
 
 namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation {
 
@@ -43,7 +41,6 @@ winrt::Windows::UI::Composition::ICompositionSurface SystemCompositionContextHel
   return nullptr;
 }
 
-#ifdef USE_WINUI3
 ICompositionContext MicrosoftCompositionContextHelper::CreateContext(
     winrt::Microsoft::UI::Composition::Compositor const &) noexcept {
   return nullptr;
@@ -74,6 +71,5 @@ winrt::Microsoft::UI::Composition::ICompositionSurface MicrosoftCompositionConte
     IDrawingSurfaceBrush) noexcept {
   return nullptr;
 }
-#endif
 
 } // namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation

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

@@ -118,7 +118,6 @@ struct CompositionKeyboardSource
   CompositionEventHandler *m_outer{nullptr};
 };
 
-#ifdef USE_WINUI3
 struct CompositionInputKeyboardSource : winrt::implements<
                                             CompositionInputKeyboardSource,
                                             winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource> {
@@ -138,7 +137,6 @@ struct CompositionInputKeyboardSource : winrt::implements<
  private:
   winrt::Microsoft::UI::Input::InputKeyboardSource m_source{nullptr};
 };
-#endif
 
 CompositionEventHandler::CompositionEventHandler(
     const winrt::Microsoft::ReactNative::ReactContext &context,
@@ -146,7 +144,6 @@ CompositionEventHandler::CompositionEventHandler(
     : m_context(context), m_wkRootView(reactNativeIsland) {}
 
 void CompositionEventHandler::Initialize() noexcept {
-#ifdef USE_WINUI3
   if (auto island = m_wkRootView.get().Island()) {
     auto pointerSource = winrt::Microsoft::UI::Input::InputPointerSource::GetForIsland(island);
 
@@ -323,12 +320,36 @@ void CompositionEventHandler::Initialize() noexcept {
             }
           }
         });
+
+    m_contextMenuKeyToken =
+        keyboardSource.ContextMenuKey([wkThis = weak_from_this()](
+                                          winrt::Microsoft::UI::Input::InputKeyboardSource const & /*source*/,
+                                          winrt::Microsoft::UI::Input::ContextMenuKeyEventArgs const &args) {
+          if (auto strongThis = wkThis.lock()) {
+            if (auto strongRootView = strongThis->m_wkRootView.get()) {
+              if (strongThis->SurfaceId() == -1)
+                return;
+
+              auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
+              if (focusedComponent) {
+                auto tag =
+                    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)
+                        ->Tag();
+                auto contextMenuArgs = winrt::make<
+                    winrt::Microsoft::ReactNative::Composition::Input::implementation::ContextMenuKeyEventArgs>(tag);
+                winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)
+                    ->OnContextMenuKey(contextMenuArgs);
+                if (contextMenuArgs.Handled()) {
+                  args.Handled(true);
+                }
+              }
+            }
+          }
+        });
   }
-#endif
 }
 
 CompositionEventHandler::~CompositionEventHandler() {
-#ifdef USE_WINUI3
   if (auto strongRootView = m_wkRootView.get()) {
     if (auto island = strongRootView.Island()) {
       auto pointerSource = winrt::Microsoft::UI::Input::InputPointerSource::GetForIsland(island);
@@ -341,9 +362,9 @@ CompositionEventHandler::~CompositionEventHandler() {
       keyboardSource.KeyDown(m_keyDownToken);
       keyboardSource.KeyUp(m_keyUpToken);
       keyboardSource.CharacterReceived(m_characterReceivedToken);
+      keyboardSource.ContextMenuKey(m_contextMenuKeyToken);
     }
   }
-#endif
 
   if (m_hcursorOwned) {
     ::DestroyCursor(m_hcursor);
@@ -449,6 +470,54 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
       }
       return 0;
     }
+    case WM_RBUTTONDOWN: {
+      if (auto strongRootView = m_wkRootView.get()) {
+        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+            hwnd, msg, wParam, lParam, strongRootView.ScaleFactor());
+        onPointerPressed(pp, GetKeyModifiers(wParam));
+      }
+      return 0;
+    }
+    case WM_RBUTTONUP: {
+      if (auto strongRootView = m_wkRootView.get()) {
+        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+            hwnd, msg, wParam, lParam, strongRootView.ScaleFactor());
+        onPointerReleased(pp, GetKeyModifiers(wParam));
+      }
+      return 0;
+    }
+    case WM_MBUTTONDOWN: {
+      if (auto strongRootView = m_wkRootView.get()) {
+        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+            hwnd, msg, wParam, lParam, strongRootView.ScaleFactor());
+        onPointerPressed(pp, GetKeyModifiers(wParam));
+      }
+      return 0;
+    }
+    case WM_MBUTTONUP: {
+      if (auto strongRootView = m_wkRootView.get()) {
+        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+            hwnd, msg, wParam, lParam, strongRootView.ScaleFactor());
+        onPointerReleased(pp, GetKeyModifiers(wParam));
+      }
+      return 0;
+    }
+    case WM_XBUTTONDOWN: {
+      if (auto strongRootView = m_wkRootView.get()) {
+        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+            hwnd, msg, wParam, lParam, strongRootView.ScaleFactor());
+        onPointerPressed(pp, GetKeyModifiers(wParam));
+      }
+      return 0;
+    }
+    case WM_XBUTTONUP: {
+      if (auto strongRootView = m_wkRootView.get()) {
+        auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(
+            hwnd, msg, wParam, lParam, strongRootView.ScaleFactor());
+        onPointerReleased(pp, GetKeyModifiers(wParam));
+      }
+      return 0;
+    }
     case WM_POINTERUP: {
       if (auto strongRootView = m_wkRootView.get()) {
         auto pp = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::PointerPoint>(

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

@@ -166,7 +166,6 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
   facebook::react::Cursor m_currentCursor{facebook::react::Cursor::Auto};
   winrt::Microsoft::UI::Input::InputCursor m_inputCursor{nullptr};
 
-#ifdef USE_WINUI3
   winrt::event_token m_pointerPressedToken;
   winrt::event_token m_pointerReleasedToken;
   winrt::event_token m_pointerMovedToken;
@@ -176,7 +175,7 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
   winrt::event_token m_keyDownToken;
   winrt::event_token m_keyUpToken;
   winrt::event_token m_characterReceivedToken;
-#endif
+  winrt::event_token m_contextMenuKeyToken;
 };
 
 } // namespace Microsoft::ReactNative

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

@@ -42,7 +42,6 @@ struct IWindowsCompositionDrawingSurfaceInner : public IUnknown {
   virtual winrt::Windows::UI::Composition::ICompositionSurface Inner() const noexcept = 0;
 };
 
-#ifdef USE_WINUI3
 // Windows composition specific interface to extract the inner compositor object
 MSO_STRUCT_GUID(IMicrosoftCompositionCompositor, "B7B3E027-6A87-4946-B397-247AAB8634C6")
 struct IMicrosoftCompositionCompositor : public IUnknown {
@@ -72,7 +71,6 @@ MSO_STRUCT_GUID(IMicrosoftCompositionDrawingSurfaceInner, "4ADDC62F-51D0-4C71-8B
 struct IMicrosoftCompositionDrawingSurfaceInner : public IUnknown {
   virtual winrt::Microsoft::UI::Composition::ICompositionSurface Inner() const noexcept = 0;
 };
-#endif
 
 } // namespace Composition
 

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

@@ -18,10 +18,8 @@
 #include "CompositionRootAutomationProvider.h"
 #include "ReactNativeIsland.h"
 
-#if USE_WINUI3
 #include <winrt/Microsoft.UI.Content.h>
 #include <winrt/Microsoft.UI.interop.h>
-#endif
 
 WINUSERAPI UINT WINAPI GetDpiForWindow(_In_ HWND hwnd);
 
@@ -35,7 +33,6 @@ void CompositionHwndHost::Initialize(uint64_t hwnd) noexcept {
   auto compositionContext =
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           ReactViewHost().ReactNativeHost().InstanceSettings().Properties());
-#if USE_WINUI3
   if (auto liftedCompositor =
           winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper::InnerCompositor(
               compositionContext)) {
@@ -56,7 +53,6 @@ void CompositionHwndHost::Initialize(uint64_t hwnd) noexcept {
     m_compRootView.as<winrt::Microsoft::ReactNative::Composition::Experimental::IInternalCompositionRootView>()
         .SetWindow(reinterpret_cast<uint64_t>(m_hwnd));
 
-#endif
     auto compositor =
         winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper::InnerCompositor(
             compositionContext);
@@ -77,10 +73,7 @@ void CompositionHwndHost::Initialize(uint64_t hwnd) noexcept {
         .InternalRootVisual(
             winrt::Microsoft::ReactNative::Composition::Experimental::SystemCompositionContextHelper::CreateVisual(
                 target.Root()));
-
-#if USE_WINUI3
   }
-#endif
 
   m_compRootView.ReactViewHost(std::move(m_reactViewHost));
   m_compRootView.ScaleFactor(ScaleFactor());
@@ -122,9 +115,7 @@ LRESULT CompositionHwndHost::TranslateMessage(int msg, uint64_t wParam, int64_t
   }
 
   if (m_compRootView) {
-#if USE_WINUI3
     if (!m_compRootView.Island()) // When using Island hosting we dont need to forward window messages
-#endif
       return static_cast<LRESULT>(
           m_compRootView.as<winrt::Microsoft::ReactNative::Composition::Experimental::IInternalCompositionRootView>()
               .SendMessage(msg, wParam, lParam));

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

@@ -3,10 +3,8 @@
 #include <algorithm>
 #include "UiaHelpers.h"
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Content.h>
 #include <winrt/Microsoft.UI.Input.h>
-#endif
 
 #include <Fabric/Composition/ReactNativeIsland.h>
 
@@ -59,7 +57,6 @@ HRESULT __stdcall CompositionRootAutomationProvider::GetEmbeddedFragmentRoots(SA
 }
 
 HRESULT __stdcall CompositionRootAutomationProvider::SetFocus(void) {
-#ifdef USE_WINUI3
   if (m_island) {
     auto focusController = winrt::Microsoft::UI::Input::InputFocusController::GetForIsland(m_island);
 
@@ -69,7 +66,6 @@ HRESULT __stdcall CompositionRootAutomationProvider::SetFocus(void) {
       }
     }
   }
-#endif
 
   if (m_hwnd) {
     ::SetFocus(m_hwnd);
@@ -107,13 +103,11 @@ HRESULT __stdcall CompositionRootAutomationProvider::get_HostRawElementProvider(
   if (pRetVal == nullptr)
     return E_POINTER;
 
-#ifdef USE_WINUI3
   if (m_island) {
     winrt::Windows::Foundation::IInspectable host = m_island.GetAutomationHostProvider();
     *pRetVal = host.as<IRawElementProviderSimple>().detach();
     return S_OK;
   }
-#endif
 
   // TODO: assumes windowed
   if (!IsWindow(m_hwnd)) {
@@ -130,7 +124,6 @@ HRESULT __stdcall CompositionRootAutomationProvider::get_BoundingRectangle(UiaRe
   if (pRetVal == nullptr)
     return E_POINTER;
 
-#ifdef USE_WINUI3
   if (m_island) {
     auto cc = m_island.CoordinateConverter();
     auto origin = cc.ConvertLocalToScreen(winrt::Windows::Foundation::Point{0, 0});
@@ -143,7 +136,6 @@ HRESULT __stdcall CompositionRootAutomationProvider::get_BoundingRectangle(UiaRe
 
     return S_OK;
   }
-#endif
 
   // TODO: Need host site offsets
   // Assume we're hosted in some other visual-based hosting site
@@ -265,11 +257,9 @@ void CompositionRootAutomationProvider::SetHwnd(HWND hwnd) noexcept {
   m_hwnd = hwnd;
 }
 
-#ifdef USE_WINUI3
 void CompositionRootAutomationProvider::SetIsland(winrt::Microsoft::UI::Content::ContentIsland &island) noexcept {
   m_island = island;
 }
-#endif
 
 HRESULT __stdcall CompositionRootAutomationProvider::Navigate(
     NavigateDirection direction,

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

@@ -42,9 +42,7 @@ class CompositionRootAutomationProvider : public winrt::implements<
   CompositionRootAutomationProvider(const winrt::Microsoft::ReactNative::ReactNativeIsland &rootView) noexcept;
 
   void SetHwnd(HWND hwnd) noexcept;
-#ifdef USE_WINUI3
   void SetIsland(winrt::Microsoft::UI::Content::ContentIsland &island) noexcept;
-#endif
   bool WasPropertyAdvised(PROPERTYID prop) noexcept;
   bool WasEventAdvised(EVENTID event) noexcept;
 
@@ -75,9 +73,7 @@ class CompositionRootAutomationProvider : public winrt::implements<
   std::vector<AdvisedEvent> m_advisedProperties{};
   winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView;
   HWND m_hwnd{nullptr};
-#ifdef USE_WINUI3
   winrt::Microsoft::UI::Content::ContentIsland m_island{nullptr};
-#endif
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -11,10 +11,8 @@
 #include <Fabric/AbiViewProps.h>
 #include <Fabric/Composition/ReactNativeIsland.h>
 #include <Fabric/FabricUIManagerModule.h>
-#include <UI.Xaml.Controls.h>
 #include <Utils/KeyboardUtils.h>
 #include <Utils/ValueUtils.h>
-#include <Views/FrameworkElementTransferProperties.h>
 #include <atlcomcli.h>
 #include <winrt/Microsoft.ReactNative.Composition.Experimental.h>
 #include <winrt/Microsoft.UI.Input.h>
@@ -527,10 +525,10 @@ facebook::react::RectangleEdges<bool> ComponentView::focusNudges() const noexcep
 
   Assert(m_componentHostingFocusVisual);
 
-  if (layoutMetrics.frame.origin.x < 0) {
+  if (layoutMetrics.frame.origin.x < m_componentHostingFocusVisual->m_layoutMetrics.frame.origin.x) {
     nudgeEdges.left = true;
   }
-  if (layoutMetrics.frame.origin.y < 0) {
+  if (layoutMetrics.frame.origin.y < m_componentHostingFocusVisual->m_layoutMetrics.frame.origin.y) {
     nudgeEdges.top = true;
   }
   if (layoutMetrics.frame.getMaxX() > m_componentHostingFocusVisual->m_layoutMetrics.frame.getMaxX()) {

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

@@ -8,7 +8,6 @@
 
 #include <Fabric/FabricUIManagerModule.h>
 #include <IReactContext.h>
-#include <UI.Xaml.Controls.h>
 #include <Utils/ValueUtils.h>
 #include <winrt/Microsoft.UI.Content.h>
 #include <winrt/Microsoft.UI.Input.h>
@@ -172,24 +171,6 @@ ContentIslandComponentView::~ContentIslandComponentView() noexcept {
     m_navigationHost.DepartFocusRequested(m_navigationHostDepartFocusRequestedToken);
     m_navigationHostDepartFocusRequestedToken = {};
   }
-  if (m_childSiteLink) {
-    if (m_fragmentRootAutomationProviderRequestedToken) {
-      m_childSiteLink.FragmentRootAutomationProviderRequested(m_fragmentRootAutomationProviderRequestedToken);
-      m_fragmentRootAutomationProviderRequestedToken = {};
-    }
-    if (m_parentAutomationProviderRequestedToken) {
-      m_childSiteLink.ParentAutomationProviderRequested(m_parentAutomationProviderRequestedToken);
-      m_parentAutomationProviderRequestedToken = {};
-    }
-    if (m_nextSiblingAutomationProviderRequestedToken) {
-      m_childSiteLink.NextSiblingAutomationProviderRequested(m_nextSiblingAutomationProviderRequestedToken);
-      m_nextSiblingAutomationProviderRequestedToken = {};
-    }
-    if (m_previousSiblingAutomationProviderRequestedToken) {
-      m_childSiteLink.PreviousSiblingAutomationProviderRequested(m_previousSiblingAutomationProviderRequestedToken);
-      m_previousSiblingAutomationProviderRequestedToken = {};
-    }
-  }
   if (m_islandToConnect) {
     m_islandToConnect.Close();
   }
@@ -231,56 +212,13 @@ void ContentIslandComponentView::prepareForRecycle() noexcept {
 }
 
 void ContentIslandComponentView::ConfigureChildSiteLinkAutomation() noexcept {
-  // This automation mode must be set before connecting the child ContentIsland.
-  // It puts the child content into a mode where it won't own its own framework root.  Instead, the child island's
-  // automation peers will use the same framework root as the automation peer of this ContentIslandComponentView.
-  m_childSiteLink.AutomationOption(winrt::Microsoft::UI::Content::ContentAutomationOptions::FragmentBased);
-
-  // These events are raised in response to the child ContentIsland asking for providers.
-  // For example, the ContentIsland.FragmentRootAutomationProvider property will return
-  // the provider we provide here in FragmentRootAutomationProviderRequested.
-
-  // We capture "this" as a raw pointer because ContentIslandComponentView doesn't currently support weak ptrs.
-  // It's safe because we disconnect these events in the destructor.
-
-  m_fragmentRootAutomationProviderRequestedToken = m_childSiteLink.FragmentRootAutomationProviderRequested(
-      [this](
-          const winrt::Microsoft::UI::Content::IContentSiteAutomation &,
-          const winrt::Microsoft::UI::Content::ContentSiteAutomationProviderRequestedEventArgs &args) {
-        // The child island's fragment tree doesn't have its own fragment root.
-        // Here's how we can provide the correct fragment root to the child's UIA logic.
-        winrt::com_ptr<IRawElementProviderFragmentRoot> fragmentRoot{nullptr};
-        auto uiaProvider = this->EnsureUiaProvider();
-        uiaProvider.as<IRawElementProviderFragment>()->get_FragmentRoot(fragmentRoot.put());
-        args.AutomationProvider(fragmentRoot.as<IInspectable>());
-        args.Handled(true);
-      });
-
-  m_parentAutomationProviderRequestedToken = m_childSiteLink.ParentAutomationProviderRequested(
-      [this](
-          const winrt::Microsoft::UI::Content::IContentSiteAutomation &,
-          const winrt::Microsoft::UI::Content::ContentSiteAutomationProviderRequestedEventArgs &args) {
-        auto uiaProvider = this->EnsureUiaProvider();
-        args.AutomationProvider(uiaProvider);
-        args.Handled(true);
-      });
-
-  m_nextSiblingAutomationProviderRequestedToken = m_childSiteLink.NextSiblingAutomationProviderRequested(
-      [](const winrt::Microsoft::UI::Content::IContentSiteAutomation &,
-         const winrt::Microsoft::UI::Content::ContentSiteAutomationProviderRequestedEventArgs &args) {
-        // The ContentIsland will always be the one and only child of this node, so it won't have siblings.
-        args.AutomationProvider(nullptr);
-        args.Handled(true);
-      });
-
-  m_previousSiblingAutomationProviderRequestedToken = m_childSiteLink.PreviousSiblingAutomationProviderRequested(
-      [](const winrt::Microsoft::UI::Content::IContentSiteAutomation &,
-         const winrt::Microsoft::UI::Content::ContentSiteAutomationProviderRequestedEventArgs &args) {
-        // The ContentIsland will always be the one and only child of this node, so it won't have siblings.
-        args.AutomationProvider(nullptr);
-        args.Handled(true);
-      });
+  // Use FrameworkBased to let the XamlIsland manage its own framework-level accessibility tree
+  // and raise focus events naturally. This tells the system that the child island has its own
+  // framework (WinUI/XAML) that manages automation.
+  m_childSiteLink.AutomationOption(winrt::Microsoft::UI::Content::ContentAutomationOptions::FrameworkBased);
 
+  // When using FrameworkBased mode, we don't register automation callbacks - let the XamlIsland handle its own UIA
+  // tree.
   if (m_innerAutomationProvider) {
     m_innerAutomationProvider->SetChildSiteLink(m_childSiteLink);
   }

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

@@ -70,10 +70,6 @@ struct ContentIslandComponentView : ContentIslandComponentViewT<ContentIslandCom
 
   // Automation
   void ConfigureChildSiteLinkAutomation() noexcept;
-  winrt::event_token m_fragmentRootAutomationProviderRequestedToken{};
-  winrt::event_token m_parentAutomationProviderRequestedToken{};
-  winrt::event_token m_nextSiblingAutomationProviderRequestedToken{};
-  winrt::event_token m_previousSiblingAutomationProviderRequestedToken{};
 };
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -6,7 +6,6 @@
 
 #include "ImageComponentView.h"
 
-#include <UI.Xaml.Controls.h>
 #include <Utils/ValueUtils.h>
 
 #include <IReactContext.h>

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

@@ -7,7 +7,6 @@
 #include <Fabric/ComponentView.h>
 
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
-#include <Views/Image/ReactImage.h>
 #include <react/renderer/components/image/ImageShadowNode.h>
 #include <react/renderer/imagemanager/ImageResponseObserver.h>
 #include <wincodec.h>

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

@@ -107,6 +107,10 @@ void ParagraphComponentView::updateProps(
     m_requireRedraw = true;
   }
 
+  if (oldViewProps.selectionColor != newViewProps.selectionColor) {
+    m_requireRedraw = true;
+  }
+
   Super::updateProps(props, oldProps);
 }
 
@@ -167,6 +171,26 @@ void ParagraphComponentView::updateTextAlignment(
   m_textLayout = nullptr;
 }
 
+facebook::react::Tag ParagraphComponentView::hitTest(
+    facebook::react::Point pt,
+    facebook::react::Point &localPt,
+    bool ignorePointerEvents) const noexcept {
+  facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
+  const auto &props = paragraphProps();
+  const auto &vProps = *viewProps();
+
+  if (props.isSelectable && ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
+      ptLocal.y <= m_layoutMetrics.frame.size.height) {
+    // claims if pointer events are enabled for this component
+    if (ignorePointerEvents || vProps.pointerEvents == facebook::react::PointerEventsMode::Auto ||
+        vProps.pointerEvents == facebook::react::PointerEventsMode::BoxOnly) {
+      localPt = ptLocal;
+      return Tag();
+    }
+  }
+  return Super::hitTest(pt, localPt, ignorePointerEvents);
+}
+
 bool ParagraphComponentView::IsTextSelectableAtPoint(facebook::react::Point pt) noexcept {
   // paragraph-level selectable prop is enabled
   const auto &props = paragraphProps();
@@ -454,9 +478,14 @@ void ParagraphComponentView::DrawSelectionHighlight(
     return;
   }
 
-  // TODO: use prop selectionColor if provided
   winrt::com_ptr<ID2D1SolidColorBrush> selectionBrush;
-  const D2D1_COLOR_F selectionColor = theme()->D2DPlatformColor("Highlight@40");
+  D2D1_COLOR_F selectionColor;
+  const auto &props = paragraphProps();
+  if (props.selectionColor) {
+    selectionColor = theme()->D2DColor(**props.selectionColor);
+  } else {
+    selectionColor = theme()->D2DPlatformColor("Highlight@40");
+  }
   hr = renderTarget.CreateSolidColorBrush(selectionColor, selectionBrush.put());
 
   if (FAILED(hr)) {
@@ -519,6 +548,7 @@ void ParagraphComponentView::ClearSelection() noexcept {
   m_selectionStart = std::nullopt;
   m_selectionEnd = std::nullopt;
   m_isSelecting = false;
+  m_isWordSelecting = false;
   if (hadSelection) {
     // Clears selection highlight
     DrawText();
@@ -534,7 +564,8 @@ void ParagraphComponentView::OnPointerPressed(
     return;
   }
 
-  auto pp = args.GetCurrentPoint(-1);
+  // Use Tag() to get coordinates in component's local space
+  auto pp = args.GetCurrentPoint(static_cast<int32_t>(Tag()));
 
   // Ignores right-click
   if (pp.Properties().PointerUpdateKind() ==
@@ -545,8 +576,8 @@ void ParagraphComponentView::OnPointerPressed(
 
   auto position = pp.Position();
 
-  facebook::react::Point localPt{
-      position.X - m_layoutMetrics.frame.origin.x, position.Y - m_layoutMetrics.frame.origin.y};
+  // GetCurrentPoint(Tag()) returns position relative to component origin
+  facebook::react::Point localPt{position.X, position.Y};
 
   std::optional<int32_t> charPosition = GetTextPositionAtPoint(localPt);
 
@@ -568,7 +599,13 @@ void ParagraphComponentView::OnPointerPressed(
 
     if (isDoubleClick) {
       SelectWordAtPosition(*charPosition);
-      m_isSelecting = false;
+      if (m_selectionStart && m_selectionEnd) {
+        m_isWordSelecting = true;
+        m_wordAnchorStart = *m_selectionStart;
+        m_wordAnchorEnd = *m_selectionEnd;
+        m_isSelecting = true;
+        CapturePointer(args.Pointer());
+      }
     } else {
       // Single-click: start drag selection
       m_selectionStart = charPosition;
@@ -610,17 +647,35 @@ void ParagraphComponentView::OnPointerMoved(
   facebook::react::Point localPt{position.X, position.Y};
   std::optional<int32_t> charPosition = GetClampedTextPosition(localPt);
 
-  if (charPosition && charPosition != m_selectionEnd) {
-    m_selectionEnd = charPosition;
-    DrawText();
-    args.Handled(true);
+  if (charPosition) {
+    if (m_isWordSelecting) {
+      // Extend selection by whole words
+      auto [wordStart, wordEnd] = GetWordBoundariesAtPosition(*charPosition);
+
+      if (*charPosition < m_wordAnchorStart) {
+        m_selectionStart = wordStart;
+        m_selectionEnd = m_wordAnchorEnd;
+      } else if (*charPosition >= m_wordAnchorEnd) {
+        m_selectionStart = m_wordAnchorStart;
+        m_selectionEnd = wordEnd;
+      } else {
+        m_selectionStart = m_wordAnchorStart;
+        m_selectionEnd = m_wordAnchorEnd;
+      }
+      DrawText();
+      args.Handled(true);
+    } else if (charPosition != m_selectionEnd) {
+      m_selectionEnd = charPosition;
+      DrawText();
+      args.Handled(true);
+    }
   }
 }
 
 void ParagraphComponentView::OnPointerReleased(
     const winrt::Microsoft::ReactNative::Composition::Input::PointerRoutedEventArgs &args) noexcept {
   // Check for right-click to show context menu
-  auto pp = args.GetCurrentPoint(-1);
+  auto pp = args.GetCurrentPoint(static_cast<int32_t>(Tag()));
   if (pp.Properties().PointerUpdateKind() ==
       winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::RightButtonReleased) {
     const auto &props = paragraphProps();
@@ -637,6 +692,7 @@ void ParagraphComponentView::OnPointerReleased(
   }
 
   m_isSelecting = false;
+  m_isWordSelecting = false;
 
   ReleasePointerCapture(args.Pointer());
 
@@ -661,6 +717,7 @@ void ParagraphComponentView::OnPointerCaptureLost() noexcept {
   // Pointer capture was lost stop any active selection drag
   if (m_isSelecting) {
     m_isSelecting = false;
+    m_isWordSelecting = false;
 
     if (!m_selectionStart || !m_selectionEnd || *m_selectionStart == *m_selectionEnd) {
       m_selectionStart = std::nullopt;
@@ -711,12 +768,17 @@ void ParagraphComponentView::CopySelectionToClipboard() noexcept {
   winrt::Windows::ApplicationModel::DataTransfer::Clipboard::SetContent(dataPackage);
 }
 
-void ParagraphComponentView::SelectWordAtPosition(int32_t charPosition) noexcept {
+std::pair<int32_t, int32_t> ParagraphComponentView::GetWordBoundariesAtPosition(int32_t charPosition) noexcept {
   const std::wstring utf16Text{facebook::react::WindowsTextLayoutManager::GetTransformedText(m_attributedStringBox)};
   const int32_t textLength = static_cast<int32_t>(utf16Text.length());
 
-  if (utf16Text.empty() || charPosition < 0 || charPosition >= textLength) {
-    return;
+  if (utf16Text.empty() || charPosition < 0) {
+    return {0, 0};
+  }
+
+  charPosition = std::min(charPosition, textLength - 1);
+  if (charPosition < 0) {
+    return {0, 0};
   }
 
   int32_t wordStart = charPosition;
@@ -749,6 +811,12 @@ void ParagraphComponentView::SelectWordAtPosition(int32_t charPosition) noexcept
     }
   }
 
+  return {wordStart, wordEnd};
+}
+
+void ParagraphComponentView::SelectWordAtPosition(int32_t charPosition) noexcept {
+  auto [wordStart, wordEnd] = GetWordBoundariesAtPosition(charPosition);
+
   if (wordEnd > wordStart) {
     SetSelection(wordStart, wordEnd);
     DrawText();