react-native-windows 0.73.11 → 0.74.0-preview.2

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

@@ -9,39 +9,45 @@
 #include <Windows.UI.Composition.h>
 #include <Windows.h>
 #include "CompositionContextHelper.h"
+#include "RootComponentView.h"
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-std::shared_ptr<ActivityIndicatorComponentView> ActivityIndicatorComponentView::Create(
+winrt::Microsoft::ReactNative::ComponentView ActivityIndicatorComponentView::Create(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
-  return std::shared_ptr<ActivityIndicatorComponentView>(
-      new ActivityIndicatorComponentView(compContext, tag, reactContext));
+  return winrt::make<ActivityIndicatorComponentView>(compContext, tag, reactContext);
 }
 
 ActivityIndicatorComponentView::ActivityIndicatorComponentView(
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
     facebook::react::Tag tag,
     winrt::Microsoft::ReactNative::ReactContext const &reactContext)
-    : Super(compContext, tag), m_context(reactContext) {
+    : Super(compContext, tag, reactContext, ComponentViewFeatures::Default, false) {
   m_props = std::make_shared<facebook::react::ActivityIndicatorViewProps const>();
 }
 
-void ActivityIndicatorComponentView::mountChildComponentView(
-    IComponentView &childComponentView,
+void ActivityIndicatorComponentView::MountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
     uint32_t index) noexcept {
   assert(false);
+  base_type::MountChildComponentView(childComponentView, index);
 }
 
-void ActivityIndicatorComponentView::unmountChildComponentView(
-    IComponentView &childComponentView,
+void ActivityIndicatorComponentView::UnmountChildComponentView(
+    const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
     uint32_t index) noexcept {
   assert(false);
+  base_type::UnmountChildComponentView(childComponentView, index);
 }
 
-void ActivityIndicatorComponentView::handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept {
-  Super::handleCommand(commandName, arg);
+void ActivityIndicatorComponentView::updateProgressColor(const facebook::react::SharedColor &color) noexcept {
+  if (color) {
+    m_ActivityIndicatorVisual.Brush(theme()->Brush(*color));
+  } else {
+    m_ActivityIndicatorVisual.Brush(theme()->PlatformBrush("ProgressRingForegroundTheme"));
+  }
 }
 
 void ActivityIndicatorComponentView::updateProps(
@@ -52,19 +58,37 @@ void ActivityIndicatorComponentView::updateProps(
 
   ensureVisual();
 
+  if (newViewProps->testId != oldViewProps->testId) {
+    m_visual.Comment(winrt::to_hstring(newViewProps->testId));
+  }
+
   // update color if needed
-  if (newViewProps->color && (!oldProps || newViewProps->color != oldViewProps->color)) {
-    m_ActivityIndicatorVisual.Color(newViewProps->color.AsWindowsColor());
+  if (!oldProps || newViewProps->color != oldViewProps->color) {
+    updateProgressColor(newViewProps->color);
   }
 
   if (newViewProps->animating != oldViewProps->animating) {
     m_ActivityIndicatorVisual.IsVisible(newViewProps->animating);
   }
 
-  updateBorderProps(*oldViewProps, *newViewProps);
+  Super::updateProps(props, oldProps);
+
   m_props = std::static_pointer_cast<facebook::react::ViewProps const>(props);
 }
 
+void ActivityIndicatorComponentView::FinalizeUpdates(
+    winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept {
+  static constexpr float radiusSmall = 10.0f;
+  static constexpr float radiusLarge = 18.0f;
+
+  if (std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(m_props)->size ==
+      facebook::react::ActivityIndicatorViewSize::Small) {
+    m_ActivityIndicatorVisual.Size(radiusSmall * m_layoutMetrics.pointScaleFactor);
+  } else {
+    m_ActivityIndicatorVisual.Size(radiusLarge * m_layoutMetrics.pointScaleFactor);
+  }
+}
+
 void ActivityIndicatorComponentView::updateState(
     facebook::react::State::Shared const &state,
     facebook::react::State::Shared const &oldState) noexcept {}
@@ -79,27 +103,22 @@ void ActivityIndicatorComponentView::updateLayoutMetrics(
     OuterVisual().IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
   }
 
-  updateBorderLayoutMetrics(layoutMetrics, *m_props);
-  m_layoutMetrics = layoutMetrics;
-
-  UpdateCenterPropertySet();
+  Super::updateLayoutMetrics(layoutMetrics, oldLayoutMetrics);
   m_visual.Size(
       {layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
        layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
 }
 
-void ActivityIndicatorComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
-
 void ActivityIndicatorComponentView::prepareForRecycle() noexcept {}
 
-facebook::react::Props::Shared ActivityIndicatorComponentView::props() noexcept {
+facebook::react::SharedViewProps ActivityIndicatorComponentView::viewProps() noexcept {
   return m_props;
 }
 
 void ActivityIndicatorComponentView::ensureVisual() noexcept {
   if (!m_visual) {
     m_visual = m_compContext.CreateSpriteVisual();
-    m_ActivityIndicatorVisual = m_compContext.CreateActivityVisual(); // creates COM control
+    m_ActivityIndicatorVisual = m_compContext.CreateActivityVisual();
 
     OuterVisual().InsertAt(m_ActivityIndicatorVisual, 0);
     OuterVisual().InsertAt(m_visual, 0);
@@ -117,7 +136,7 @@ facebook::react::Tag ActivityIndicatorComponentView::hitTest(
       ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
       ptLocal.y <= m_layoutMetrics.frame.size.height) {
     localPt = ptLocal;
-    return tag();
+    return Tag();
   }
   return -1;
 }
@@ -126,6 +145,11 @@ winrt::Microsoft::ReactNative::Composition::IVisual ActivityIndicatorComponentVi
   return m_visual;
 }
 
+void ActivityIndicatorComponentView::onThemeChanged() noexcept {
+  updateProgressColor(std::static_pointer_cast<const facebook::react::ActivityIndicatorViewProps>(m_props)->color);
+  Super::onThemeChanged();
+}
+
 bool ActivityIndicatorComponentView::focusable() const noexcept {
   return false;
 }
@@ -134,4 +158,4 @@ std::string ActivityIndicatorComponentView::DefaultControlType() const noexcept
   return "progressbar";
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -8,23 +8,25 @@
 
 #include "CompositionViewComponentView.h"
 
+#include "Composition.ActivityIndicatorComponentView.g.h"
 #include <react/components/rnwcore/ShadowNodes.h>
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct ActivityIndicatorComponentView;
+struct ActivityIndicatorComponentView : ActivityIndicatorComponentViewT<ActivityIndicatorComponentView, ComponentView> {
+  using Super = ActivityIndicatorComponentViewT<ActivityIndicatorComponentView, ComponentView>;
 
-struct ActivityIndicatorComponentView : CompositionBaseComponentView {
-  using Super = CompositionBaseComponentView;
-
-  [[nodiscard]] static std::shared_ptr<ActivityIndicatorComponentView> Create(
+  [[nodiscard]] static winrt::Microsoft::ReactNative::ComponentView Create(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
 
-  void mountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept override;
-  void unmountChildComponentView(IComponentView &childComponentView, uint32_t index) noexcept override;
-  void handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept override;
+  void MountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
+  void UnmountChildComponentView(
+      const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
+      uint32_t index) noexcept override;
   void updateProps(facebook::react::Props::Shared const &props, facebook::react::Props::Shared const &oldProps) noexcept
       override;
   void updateState(facebook::react::State::Shared const &state, facebook::react::State::Shared const &oldState) noexcept
@@ -32,28 +34,30 @@ struct ActivityIndicatorComponentView : CompositionBaseComponentView {
   void updateLayoutMetrics(
       facebook::react::LayoutMetrics const &layoutMetrics,
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
-  void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
+  void FinalizeUpdates(winrt::Microsoft::ReactNative::ComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::Props::Shared props() noexcept override;
+  facebook::react::SharedViewProps viewProps() noexcept override;
   bool focusable() const noexcept override;
+  void onThemeChanged() noexcept override;
 
   facebook::react::Tag hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents)
       const noexcept override;
   winrt::Microsoft::ReactNative::Composition::IVisual Visual() const noexcept override;
   virtual std::string DefaultControlType() const noexcept;
 
- private:
   ActivityIndicatorComponentView(
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
       facebook::react::Tag tag,
       winrt::Microsoft::ReactNative::ReactContext const &reactContext);
 
+ private:
   void ensureVisual() noexcept;
+  void updateVisualSize() noexcept;
+  void updateProgressColor(const facebook::react::SharedColor &color) noexcept;
 
   winrt::Microsoft::ReactNative::Composition::ISpriteVisual m_visual{nullptr};
   winrt::Microsoft::ReactNative::Composition::IActivityVisual m_ActivityIndicatorVisual{nullptr};
-  winrt::Microsoft::ReactNative::ReactContext m_context;
   facebook::react::SharedViewProps m_props;
 };
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Composition::implementation

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

@@ -10,27 +10,28 @@
 #include <react/renderer/components/scrollview/ScrollViewShadowNode.h>
 #pragma warning(pop)
 
-#include <Fabric/Composition/TextInput/WindowsTextInputShadowNode.h>
-#include <react/components/rnwcore/ShadowNodes.h>
-#include <react/renderer/components/image/ImageShadowNode.h>
-#include <react/renderer/components/root/RootShadowNode.h>
-#include <react/renderer/components/text/ParagraphShadowNode.h>
-#include <react/renderer/components/text/RawTextShadowNode.h>
-#include <react/renderer/components/text/TextShadowNode.h>
-#include <react/renderer/components/view/ViewShadowNode.h>
-
-#include <Fabric/Composition/AbiCompositionViewComponentView.h>
 #include <Fabric/Composition/ActivityIndicatorComponentView.h>
 #include <Fabric/Composition/CompositionHelpers.h>
 #include <Fabric/Composition/CompositionViewComponentView.h>
+#include <Fabric/Composition/DebuggingOverlayComponentView.h>
 #include <Fabric/Composition/ImageComponentView.h>
+#include <Fabric/Composition/Modal/WindowsModalHostViewComponentView.h>
+#include <Fabric/Composition/Modal/WindowsModalHostViewShadowNode.h>
 #include <Fabric/Composition/ParagraphComponentView.h>
 #include <Fabric/Composition/RootComponentView.h>
 #include <Fabric/Composition/ScrollViewComponentView.h>
 #include <Fabric/Composition/SwitchComponentView.h>
 #include <Fabric/Composition/TextInput/WindowsTextInputComponentView.h>
+#include <Fabric/Composition/TextInput/WindowsTextInputShadowNode.h>
 #include <Fabric/Composition/UnimplementedNativeViewComponentView.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
+#include <react/components/rnwcore/ShadowNodes.h>
+#include <react/renderer/components/image/ImageShadowNode.h>
+#include <react/renderer/components/root/RootShadowNode.h>
+#include <react/renderer/components/text/ParagraphShadowNode.h>
+#include <react/renderer/components/text/RawTextShadowNode.h>
+#include <react/renderer/components/text/TextShadowNode.h>
+#include <react/renderer/components/view/ViewShadowNode.h>
 
 namespace Microsoft::ReactNative {
 
@@ -44,39 +45,53 @@ ComponentViewDescriptor const &ComponentViewRegistry::dequeueComponentViewWithCo
     const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext) noexcept {
   // TODO implement recycled components like core does
 
-  std::shared_ptr<CompositionBaseComponentView> view;
+  winrt::Microsoft::ReactNative::ComponentView view{nullptr};
 
   if (componentHandle == facebook::react::ViewShadowNode::Handle()) {
-    view = CompositionViewComponentView::Create(compContext, tag);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::ParagraphShadowNode::Handle()) {
-    view = ParagraphComponentView::Create(compContext, tag);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::ParagraphComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::ScrollViewShadowNode::Handle()) {
-    view = ScrollViewComponentView::Create(compContext, tag);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::ScrollViewComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::ImageShadowNode::Handle()) {
-    view = ImageComponentView::Create(compContext, tag, m_context);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::ImageComponentView::Create(
+        compContext, tag, m_context);
+  } else if (componentHandle == facebook::react::WindowsModalHostViewShadowNode::Handle()) {
+    view = winrt::Microsoft::ReactNative::Composition::implementation::WindowsModalHostComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::WindowsTextInputShadowNode::Handle()) {
-    view = WindowsTextInputComponentView::Create(compContext, tag, m_context);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::WindowsTextInputComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::SwitchShadowNode::Handle()) {
-    view = SwitchComponentView::Create(compContext, tag, m_context);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::SwitchComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::ActivityIndicatorViewShadowNode::Handle()) {
-    view = ActivityIndicatorComponentView::Create(compContext, tag, m_context);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::ActivityIndicatorComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::RootShadowNode::Handle()) {
-    view = RootComponentView::Create(compContext, tag, m_context);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView::Create(
+        compContext, tag, m_context);
   } else if (
       componentHandle == facebook::react::RawTextShadowNode::Handle() ||
       componentHandle == facebook::react::TextShadowNode::Handle()) {
     // Review - Why do we get asked for ComponentViews for Text/RawText... do these get used?
-    view = CompositionViewComponentView::Create(compContext, tag);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView::Create(
+        compContext, tag, m_context);
   } else if (componentHandle == facebook::react::UnimplementedNativeViewShadowNode::Handle()) {
-    view = UnimplementedNativeViewComponentView::Create(compContext, tag);
+    view = winrt::Microsoft::ReactNative::Composition::implementation::UnimplementedNativeViewComponentView::Create(
+        compContext, tag, m_context);
+  } else if (componentHandle == facebook::react::DebuggingOverlayShadowNode::Handle()) {
+    view = winrt::Microsoft::ReactNative::Composition::implementation::DebuggingOverlayComponentView::Create(
+        compContext, tag, m_context);
   } else {
     auto descriptor =
         WindowsComponentDescriptorRegistry::FromProperties(m_context.Properties())->GetDescriptor(componentHandle);
-    view = AbiCompositionViewComponentView::Create(
-        m_context.Handle(),
-        compContext,
-        tag,
-        descriptor.as<winrt::Microsoft::ReactNative::IReactViewComponentBuilder>());
+    view = winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(
+               descriptor.as<winrt::Microsoft::ReactNative::Composition::IReactCompositionViewComponentBuilder>())
+               ->CreateView(m_context.Handle(), tag, compContext);
   }
 
   auto it = m_registry.insert({tag, ComponentViewDescriptor{view}});
@@ -90,7 +105,7 @@ ComponentViewDescriptor const &ComponentViewRegistry::componentViewDescriptorWit
   return iterator->second;
 }
 
-std::shared_ptr<IComponentView> ComponentViewRegistry::findComponentViewWithTag(
+winrt::Microsoft::ReactNative::ComponentView ComponentViewRegistry::findComponentViewWithTag(
     facebook::react::Tag tag) const noexcept {
   auto iterator = m_registry.find(tag);
   if (iterator == m_registry.end()) {

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

@@ -7,6 +7,7 @@
 #include <Fabric/IComponentViewRegistry.h>
 
 #include <Fabric/Composition/CompositionHelpers.h>
+#include <winrt/Microsoft.ReactNative.h>
 
 namespace Microsoft::ReactNative {
 
@@ -20,7 +21,8 @@ class ComponentViewRegistry final : public IComponentViewRegistry {
       facebook::react::Tag tag,
       const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext) noexcept override;
   ComponentViewDescriptor const &componentViewDescriptorWithTag(facebook::react::Tag tag) const noexcept override;
-  std::shared_ptr<IComponentView> findComponentViewWithTag(facebook::react::Tag tag) const noexcept override;
+  winrt::Microsoft::ReactNative::ComponentView findComponentViewWithTag(
+      facebook::react::Tag tag) const noexcept override;
   void enqueueComponentViewWithComponentHandle(
       facebook::react::ComponentHandle componentHandle,
       facebook::react::Tag tag,

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

@@ -3,6 +3,7 @@
 
 #pragma once
 #include "Composition.Input.h"
+#include <Fabric/FabricUIManagerModule.h>
 #include <windowsx.h>
 #include <winrt/Windows.Devices.Input.h>
 #include <winrt/Windows.UI.Input.h>
@@ -75,6 +76,63 @@ 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;
+}
+
+Pointer::Pointer(winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType type, uint32_t id)
+    : m_type(type), m_id(id) {}
+
+winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType Pointer::PointerDeviceType() const noexcept {
+  return m_type;
+}
+
+uint32_t Pointer::PointerId() const noexcept {
+  return m_id;
+}
+
 #ifdef USE_WINUI3
 PointerPointProperties::PointerPointProperties(const winrt::Microsoft::UI::Input::PointerPointProperties &ppp)
     : m_sysPointerPointProps(ppp) {}
@@ -313,14 +371,24 @@ float PointerPointProperties::YTilt() noexcept {
 }
 
 #ifdef USE_WINUI3
-PointerPoint::PointerPoint(const winrt::Microsoft::UI::Input::PointerPoint &pp) : m_sysPointerPoint(pp) {}
+PointerPoint::PointerPoint(const winrt::Microsoft::UI::Input::PointerPoint &pp, float scaleFactor)
+    : m_sysPointerPoint(pp), m_scaleFactor(scaleFactor), m_offset({0, 0}) {}
+
+PointerPoint::PointerPoint(
+    const winrt::Microsoft::UI::Input::PointerPoint &pp,
+    float scaleFactor,
+    const winrt::Windows::Foundation::Point &offset)
+    : m_sysPointerPoint(pp), m_scaleFactor(scaleFactor), m_offset(offset) {}
 #endif
 
-PointerPoint::PointerPoint(uint32_t msg, uint64_t wParam, int64_t lParam, float scaleFactor) {
-  m_msg = msg;
-  m_wParam = wParam;
-  m_lParam = lParam;
-  m_scaleFactor = scaleFactor;
+PointerPoint::PointerPoint(
+    HWND hwnd,
+    uint32_t msg,
+    uint64_t wParam,
+    int64_t lParam,
+    float scaleFactor,
+    const winrt::Windows::Foundation::Point &offset)
+    : m_offset(offset), m_hwnd(hwnd), m_msg(msg), m_wParam(wParam), m_lParam(lParam), m_scaleFactor(scaleFactor) {
   if (IsPointerMessage(msg)) {
     const unsigned int pointerId = GET_POINTERID_WPARAM(wParam);
     bool result = ::GetPointerInfo(pointerId, &m_pi);
@@ -328,7 +396,10 @@ PointerPoint::PointerPoint(uint32_t msg, uint64_t wParam, int64_t lParam, float
   }
 }
 
-uint32_t PointerPoint::FrameId() noexcept {
+PointerPoint::PointerPoint(HWND hwnd, uint32_t msg, uint64_t wParam, int64_t lParam, float scaleFactor)
+    : PointerPoint(hwnd, msg, wParam, lParam, scaleFactor, {0, 0}) {}
+
+uint32_t PointerPoint::FrameId() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.FrameId();
@@ -337,7 +408,7 @@ uint32_t PointerPoint::FrameId() noexcept {
   return m_pi.frameId;
 }
 
-bool PointerPoint::IsInContact() noexcept {
+bool PointerPoint::IsInContact() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.IsInContact();
@@ -346,7 +417,7 @@ bool PointerPoint::IsInContact() noexcept {
   return ((m_pi.pointerFlags & POINTER_FLAG_INCONTACT) == POINTER_FLAG_INCONTACT);
 }
 
-winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType PointerPoint::PointerDeviceType() noexcept {
+winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType PointerPoint::PointerDeviceType() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return static_cast<winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType>(
@@ -372,7 +443,7 @@ winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType PointerPoin
   return winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType::Mouse;
 }
 
-uint32_t PointerPoint::PointerId() noexcept {
+uint32_t PointerPoint::PointerId() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.PointerId();
@@ -381,21 +452,27 @@ uint32_t PointerPoint::PointerId() noexcept {
   return (m_pi.pointerId ? m_pi.pointerId : 1 /* MOUSE */);
 }
 
-winrt::Windows::Foundation::Point PointerPoint::Position() noexcept {
+winrt::Windows::Foundation::Point PointerPoint::Position() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
-    return m_sysPointerPoint.Position();
+    auto pos = m_sysPointerPoint.Position();
+    return {pos.X - (m_offset.X / m_scaleFactor), pos.Y - (m_offset.Y / m_scaleFactor)};
   }
 #endif
-  return m_pi.pointerId
-      ? winrt::Windows::Foundation::
-            Point{static_cast<float>(m_pi.ptPixelLocation.x / m_scaleFactor), static_cast<float>(m_pi.ptPixelLocation.y / m_scaleFactor)}
-      : winrt::Windows::Foundation::Point{
-            static_cast<float>(GET_X_LPARAM(m_lParam) / m_scaleFactor),
-            static_cast<float>(GET_Y_LPARAM(m_lParam) / m_scaleFactor)};
+
+  assert(m_hwnd);
+  POINT clientPoint{
+      m_pi.pointerId ? m_pi.ptPixelLocation.x : GET_X_LPARAM(m_lParam),
+      m_pi.pointerId ? m_pi.ptPixelLocation.y : GET_Y_LPARAM(m_lParam)};
+  if (m_pi.pointerId || m_msg == WM_MOUSEWHEEL || m_msg == WM_MOUSEHWHEEL) {
+    ScreenToClient(m_hwnd, &clientPoint);
+  }
+  return winrt::Windows::Foundation::Point{
+      static_cast<float>(clientPoint.x / m_scaleFactor) - (m_offset.X / m_scaleFactor),
+      static_cast<float>(clientPoint.y / m_scaleFactor) - (m_offset.Y / m_scaleFactor)};
 }
 
-winrt::Microsoft::ReactNative::Composition::Input::PointerPointProperties PointerPoint::Properties() noexcept {
+winrt::Microsoft::ReactNative::Composition::Input::PointerPointProperties PointerPoint::Properties() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return winrt::make<PointerPointProperties>(m_sysPointerPoint.Properties());
@@ -517,7 +594,7 @@ winrt::Microsoft::ReactNative::Composition::Input::PointerPointProperties Pointe
   );
 }
 
-uint64_t PointerPoint::Timestamp() noexcept {
+uint64_t PointerPoint::Timestamp() const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.Timestamp();
@@ -526,27 +603,28 @@ uint64_t PointerPoint::Timestamp() noexcept {
   return m_pi.dwTime;
 }
 
-winrt::Microsoft::ReactNative::Composition::Input::PointerPoint PointerPoint::GetTransformedPoint(
-    const IPointerPointTransform &transform) noexcept {
+winrt::Microsoft::ReactNative::Composition::Input::PointerPoint PointerPoint::GetOffsetPoint(
+    const winrt::Windows::Foundation::Point &offset) const noexcept {
 #ifdef USE_WINUI3
   if (m_sysPointerPoint) {
-    return winrt::make<PointerPoint>(m_sysPointerPoint);
+    return winrt::make<PointerPoint>(m_sysPointerPoint, m_scaleFactor, offset);
   }
 #endif
-  return winrt::make<PointerPoint>(m_msg, m_wParam, m_lParam, m_scaleFactor);
+  return winrt::make<PointerPoint>(m_hwnd, m_msg, m_wParam, m_lParam, m_scaleFactor, offset);
 }
 
-bool PointerPoint::IsPointerMessage(uint32_t message) noexcept {
+bool PointerPoint::IsPointerMessage(uint32_t message) const noexcept {
   constexpr uint32_t WM_POINTERFIRST = 0x0245;
   constexpr uint32_t WM_POINTERLAST = 0x0257;
   return (message >= WM_POINTERFIRST && message <= WM_POINTERLAST);
 }
 
 PointerRoutedEventArgs::PointerRoutedEventArgs(
+    const winrt::Microsoft::ReactNative::ReactContext &context,
     facebook::react::Tag tag,
     const winrt::Microsoft::ReactNative::Composition::Input::PointerPoint &pp,
     const winrt::Windows::System::VirtualKeyModifiers &virtualKeyModifiers)
-    : m_tag(tag), m_virtualKeyModifiers(virtualKeyModifiers) {
+    : m_context(context), m_tag(tag), m_virtualKeyModifiers(virtualKeyModifiers) {
   m_pointerPoint = pp;
 }
 
@@ -556,8 +634,25 @@ int32_t PointerRoutedEventArgs::OriginalSource() noexcept {
 
 winrt::Microsoft::ReactNative::Composition::Input::PointerPoint PointerRoutedEventArgs::GetCurrentPoint(
     int32_t tag) noexcept {
-  assert(tag == -1); // TODO: Non-null tags need to apply a transform
-  return m_pointerPoint;
+  if (tag == -1) {
+    return m_pointerPoint;
+  }
+
+  auto fabricuiManager = ::Microsoft::ReactNative::FabricUIManager::FromProperties(m_context.Properties());
+
+  const auto &viewRegistry = fabricuiManager->GetViewRegistry();
+  auto targetComponentViewDescriptor = viewRegistry.componentViewDescriptorWithTag(tag);
+
+  auto clientRect =
+      winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetComponentViewDescriptor.view)
+          ->getClientRect();
+
+  return m_pointerPoint.GetOffsetPoint({static_cast<float>(clientRect.left), static_cast<float>(clientRect.top)});
+}
+
+winrt::Microsoft::ReactNative::Composition::Input::Pointer PointerRoutedEventArgs::Pointer() const noexcept {
+  return winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::Pointer>(
+      m_pointerPoint.PointerDeviceType(), m_pointerPoint.PointerId());
 }
 
 bool PointerRoutedEventArgs::Handled() noexcept {