Allow out-of-tree platforms to extend Touch fields

packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -44,6 +44,7 @@ header_search_paths = [
   "$(PODS_ROOT)/Headers/Public/hermes-engine"
 ] : []).concat(use_frameworks ? [
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers/",
+  "$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx/",
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/",
   "$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
   "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",

packages/react-native/React/React-RCTFabric.podspec

@@ -38,6 +38,7 @@ if ENV['USE_FRAMEWORKS']
   header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\""
   header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/textlayoutmanager/platform/ios\""
   header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/textinput/iostextinput\""
+  header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\""
   header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\""
   header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-nativeconfig/React_nativeconfig.framework/Headers\""
   header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""

packages/react-native/ReactAndroid/build.gradle

@@ -118,7 +118,10 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
             ),
             new PrefabPreprocessingEntry(
                 "rrc_view",
-                new Pair("../ReactCommon/react/renderer/components/view/", "react/renderer/components/view/")
+                [
+                    new Pair("../ReactCommon/react/renderer/components/view/", "react/renderer/components/view/"),
+                    new Pair("../ReactCommon/react/renderer/components/view/platform/android/", ""),
+                ]
             ),
             new PrefabPreprocessingEntry(
                 "rrc_legacyviewmanagerinterop",

packages/react-native/ReactCommon/React-Fabric.podspec

@@ -105,6 +105,7 @@ Pod::Spec.new do |s|
         "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-rendererdebug/React_rendererdebug.framework/Headers/\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/iostextinput\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
       ]
     end
 
@@ -224,7 +225,7 @@ Pod::Spec.new do |s|
       sss.dependency             "Yoga"
       sss.compiler_flags       = folly_compiler_flags
       sss.source_files         = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "react/renderer/components/view/tests"
+      sss.exclude_files        = "react/renderer/components/view/tests", "react/renderer/components/view/platform/android"
       sss.header_dir           = "react/renderer/components/view"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
     end

packages/react-native/ReactCommon/React-FabricImage.podspec

@@ -36,6 +36,7 @@ if ENV['USE_FRAMEWORKS']
     "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"",
     "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"",
     "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\"",
+    "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/iostextinput\"",
     "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\"",

packages/react-native/ReactCommon/react/renderer/components/view/Touch.cpp → packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.cpp

@@ -9,14 +9,30 @@
 
 namespace facebook::react {
 
+void setTouchPayloadOnObject(
+    jsi::Object &object,
+    jsi::Runtime &runtime,
+    BaseTouch const &touch) {
+  object.setProperty(runtime, "locationX", touch.offsetPoint.x);
+  object.setProperty(runtime, "locationY", touch.offsetPoint.y);
+  object.setProperty(runtime, "pageX", touch.pagePoint.x);
+  object.setProperty(runtime, "pageY", touch.pagePoint.y);
+  object.setProperty(runtime, "screenX", touch.screenPoint.x);
+  object.setProperty(runtime, "screenY", touch.screenPoint.y);
+  object.setProperty(runtime, "identifier", touch.identifier);
+  object.setProperty(runtime, "target", touch.target);
+  object.setProperty(runtime, "timestamp", touch.timestamp * 1000);
+  object.setProperty(runtime, "force", touch.force);
+}
+
 #if RN_DEBUG_STRING_CONVERTIBLE
 
-std::string getDebugName(Touch const & /*touch*/) {
+std::string getDebugName(BaseTouch const & /*touch*/) {
   return "Touch";
 }
 
 std::vector<DebugStringConvertibleObject> getDebugProps(
-    Touch const &touch,
+    BaseTouch const &touch,
     DebugStringConvertibleOptions options) {
   return {
       {"pagePoint", getDebugDescription(touch.pagePoint, options)},

packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.h

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/graphics/Point.h>
+
+namespace facebook::react {
+
+/*
+ * Describes an individual touch point for a touch event.
+ * See https://www.w3.org/TR/touch-events/ for more details.
+ */
+struct BaseTouch {
+  /*
+   * The coordinate of point relative to the root component in points.
+   */
+  Point pagePoint;
+
+  /*
+   * The coordinate of point relative to the target component in points.
+   */
+  Point offsetPoint;
+
+  /*
+   * The coordinate of point relative to the screen component in points.
+   */
+  Point screenPoint;
+
+  /*
+   * An identification number for each touch point.
+   */
+  int identifier;
+
+  /*
+   * The tag of a component on which the touch point started when it was first
+   * placed on the surface, even if the touch point has since moved outside the
+   * interactive area of that element.
+   */
+  Tag target;
+
+  /*
+   * The force of the touch.
+   */
+  Float force;
+
+  /*
+   * The time in seconds when the touch occurred or when it was last mutated.
+   */
+  Float timestamp;
+
+  /*
+   * The particular implementation of `Hasher` and (especially) `Comparator`
+   * make sense only when `Touch` object is used as a *key* in indexed
+   * collections. Because of that they are expressed as separate classes.
+   */
+  struct Hasher {
+    size_t operator()(BaseTouch const &touch) const {
+      return std::hash<decltype(touch.identifier)>()(touch.identifier);
+    }
+  };
+
+  struct Comparator {
+    bool operator()(BaseTouch const &lhs, BaseTouch const &rhs) const {
+      return lhs.identifier == rhs.identifier;
+    }
+  };
+};
+
+void setTouchPayloadOnObject(
+    jsi::Object &object,
+    jsi::Runtime &runtime,
+    BaseTouch const &touch);
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+
+std::string getDebugName(BaseTouch const &touch);
+std::vector<DebugStringConvertibleObject> getDebugProps(
+    BaseTouch const &touch,
+    DebugStringConvertibleOptions options);
+
+#endif
+
+} // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp → packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.cpp

@@ -5,35 +5,36 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ViewEventEmitter.h"
+#include "BaseViewEventEmitter.h"
 
 namespace facebook::react {
 
 #pragma mark - Accessibility
 
-void ViewEventEmitter::onAccessibilityAction(std::string const &name) const {
+void BaseViewEventEmitter::onAccessibilityAction(
+    std::string const &name) const {
   dispatchEvent("accessibilityAction", [name](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
     payload.setProperty(runtime, "actionName", name);
     return payload;
   });
 }
 
-void ViewEventEmitter::onAccessibilityTap() const {
+void BaseViewEventEmitter::onAccessibilityTap() const {
   dispatchEvent("accessibilityTap");
 }
 
-void ViewEventEmitter::onAccessibilityMagicTap() const {
+void BaseViewEventEmitter::onAccessibilityMagicTap() const {
   dispatchEvent("magicTap");
 }
 
-void ViewEventEmitter::onAccessibilityEscape() const {
+void BaseViewEventEmitter::onAccessibilityEscape() const {
   dispatchEvent("accessibilityEscape");
 }
 
 #pragma mark - Layout
 
-void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
+void BaseViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
   // A copy of a shared pointer (`layoutEventState_`) establishes shared
   // ownership that will be captured by lambda.
   auto layoutEventState = layoutEventState_;

packages/react-native/ReactCommon/react/renderer/components/view/ViewEventEmitter.h → packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.h

@@ -17,11 +17,7 @@
 
 namespace facebook::react {
 
-class ViewEventEmitter;
-
-using SharedViewEventEmitter = std::shared_ptr<const ViewEventEmitter>;
-
-class ViewEventEmitter : public TouchEventEmitter {
+class BaseViewEventEmitter : public TouchEventEmitter {
  public:
   using TouchEventEmitter::TouchEventEmitter;