Implement onClick (#15889)

* Implement onClick

* Change files

Author: acoates-ms

change/react-native-windows-b347e777-3318-42c1-991c-4e91d42f6e08.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Implement onClick",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

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

@@ -986,8 +986,6 @@ void CompositionEventHandler::UpdateActiveTouch(
   // activeTouch.touch.shiftKey = false;
   // activeTouch.touch.ctrlKey = false;
   // activeTouch.touch.altKey = false;
-
-  // activeTouch.touch.isPrimary = true;
 }
 
 facebook::react::PointerEvent CreatePointerEventFromIncompleteHoverData(
@@ -1246,15 +1244,15 @@ void CompositionEventHandler::onPointerPressed(
                   ->eventEmitterAtPoint(ptLocal)) {
         activeTouch.eventEmitter = eventEmitter;
         activeTouch.touch.target = targetComponentView.Tag();
-        // activeTouch.componentView = componentView;
+        activeTouch.initialComponentView = targetComponentView;
         break;
       }
       targetComponentView = targetComponentView.Parent();
     }
 
     UpdateActiveTouch(activeTouch, ptScaled, ptLocal);
 
-    // activeTouch.touch.isPrimary = true;
+    activeTouch.isPrimary = pointerId == 1;
     activeTouch.touch.identifier = pointerId;
 
     // If the pointer has not been marked as hovering over views before the touch started, we register
@@ -1459,11 +1457,26 @@ facebook::react::PointerEvent CompositionEventHandler::CreatePointerEventFromAct
 
   // event.tangentialPressure = 0.0;
   // event.twist = 0;
-  // event.isPrimary = activeTouch.isPrimary;
+  event.isPrimary = activeTouch.isPrimary;
 
   return event;
 }
 
+bool CompositionEventHandler::IsPointerWithinInitialTree(const ActiveTouch &activeTouch) noexcept {
+  auto initialComponentView = activeTouch.initialComponentView.view();
+  if (!initialComponentView)
+    return false;
+
+  auto initialViewSet = GetTouchableViewsInPathToRoot(initialComponentView);
+
+  for (const auto &view : initialViewSet) {
+    if (view.Tag() == activeTouch.touch.target)
+      return true;
+  }
+
+  return false;
+}
+
 // If we have events that include multiple pointer updates, we should change arg from pointerId to vector<pointerId>
 void CompositionEventHandler::DispatchTouchEvent(
     TouchEventType eventType,
@@ -1520,6 +1533,13 @@ void CompositionEventHandler::DispatchTouchEvent(
         }
         case TouchEventType::End:
           activeTouch.eventEmitter->onPointerUp(pointerEvent);
+          if (pointerEvent.isPrimary && pointerEvent.button == 0) {
+            if (IsPointerWithinInitialTree(activeTouch)) {
+              activeTouch.eventEmitter->onClick(pointerEvent);
+            }
+          } /* else if (IsPointerWithinInitialTree(activeTouch)) {
+            activeTouch.eventEmitter->onAuxClick(pointerEvent);
+          } */
           break;
         case TouchEventType::Cancel:
         case TouchEventType::CaptureLost:

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

@@ -138,9 +138,10 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
     /*
      * A component view on which the touch was begun.
      */
-    //__strong UIView<RCTComponentViewProtocol> *componentView = nil;
+    ReactTaggedView initialComponentView{nullptr};
   };
 
+  static bool IsPointerWithinInitialTree(const ActiveTouch &activeTouch) noexcept;
   static bool IsEndishEventType(TouchEventType eventType) noexcept;
   static const char *PointerTypeCStringFromUITouchType(UITouchType type) noexcept;
   static facebook::react::PointerEvent CreatePointerEventFromActiveTouch(

vnext/Microsoft.ReactNative/Fabric/ReactTaggedView.h

@@ -18,7 +18,7 @@ struct ReactTaggedView {
   ReactTaggedView(const winrt::Microsoft::ReactNative::ComponentView &componentView)
       : m_view(componentView), m_tag(componentView ? componentView.Tag() : -1) {}
 
-  winrt::Microsoft::ReactNative::ComponentView view() noexcept {
+  winrt::Microsoft::ReactNative::ComponentView view() const noexcept {
     if (!m_view) {
       return nullptr;
     }
@@ -37,7 +37,7 @@ struct ReactTaggedView {
 
  private:
   facebook::react::Tag m_tag;
-  winrt::weak_ref<winrt::Microsoft::ReactNative::ComponentView> m_view;
+  mutable winrt::weak_ref<winrt::Microsoft::ReactNative::ComponentView> m_view;
 };
 
 } // namespace Microsoft::ReactNative