react-native-windows 0.76.2 → 0.77.0-preview.1

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

@@ -31,7 +31,8 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
  public:
   CompositionEventHandler(
       const winrt::Microsoft::ReactNative::ReactContext &context,
-      const winrt::Microsoft::ReactNative::ReactNativeIsland &ReactNativeIsland);
+      const winrt::Microsoft::ReactNative::ReactNativeIsland &ReactNativeIsland,
+      const int fragmentTag);
   virtual ~CompositionEventHandler();
 
   void Initialize() noexcept;
@@ -146,8 +147,12 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
   static void
   UpdateActiveTouch(ActiveTouch &activeTouch, facebook::react::Point ptScaled, facebook::react::Point ptLocal) noexcept;
 
+  void UpdateCursor() noexcept;
+  void SetCursor(facebook::react::Cursor cursor, HCURSOR hcur) noexcept;
+
   std::map<PointerId, ActiveTouch> m_activeTouches; // iOS is map of touch event args to ActiveTouch..?
   PointerId m_touchId = 0;
+  int m_fragmentTag = -1;
 
   std::map<PointerId, std::vector<ReactTaggedView>> m_currentlyHoveredViewsPerPointer;
   winrt::weak_ref<winrt::Microsoft::ReactNative::ReactNativeIsland> m_wkRootView;
@@ -155,6 +160,10 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
 
   facebook::react::Tag m_pointerCapturingComponentTag{-1}; // Component that has captured input
   std::vector<PointerId> m_capturedPointers;
+  HCURSOR m_hcursor{nullptr};
+  bool m_hcursorOwned{false}; // If we create the cursor, so we need to destroy it
+  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;

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

@@ -189,40 +189,16 @@ HRESULT __stdcall CompositionRootAutomationProvider::ElementProviderFromPoint(
   *pRetVal = nullptr;
 
   if (auto rootView = rootComponentView()) {
-#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 = rootView->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;
+    auto local = rootView->ConvertScreenToLocal({static_cast<float>(x), static_cast<float>(y)});
+    auto provider = rootView->UiaProviderFromPoint(
+        {static_cast<LONG>(local.X * rootView->LayoutMetrics().PointScaleFactor),
+         static_cast<LONG>(local.Y * rootView->LayoutMetrics().PointScaleFactor)});
+    auto spFragment = provider.try_as<IRawElementProviderFragment>();
+    if (spFragment) {
+      *pRetVal = spFragment.detach();
     }
-#endif
 
-    if (m_hwnd) {
-      if (!IsWindow(m_hwnd)) {
-        // TODO: Add support for non-HWND based hosting
-        assert(false);
-        return E_FAIL;
-      }
-
-      POINT clientPoint{static_cast<LONG>(x), static_cast<LONG>(y)};
-      ScreenToClient(m_hwnd, &clientPoint);
-
-      auto provider = rootView->UiaProviderFromPoint(clientPoint);
-      auto spFragment = provider.try_as<IRawElementProviderFragment>();
-      if (spFragment) {
-        *pRetVal = spFragment.detach();
-        return S_OK;
-      }
-    }
+    return S_OK;
   }
 
   AddRef();