delete ComponentDescriptor::createEventEmitter (#41514)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/41514

changelog: [internal]

`ComponentDescriptor::createEventEmitter` can be deleted.

Reviewed By: christophpurrer

Differential Revision: D51394153

fbshipit-source-id: 7541c3cb018a009e8c9555f9a9b0d41215dca1bc

packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include <react/renderer/core/EventDispatcher.h>
-#include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/InstanceHandle.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
@@ -130,12 +129,6 @@ class ComponentDescriptor {
   virtual ShadowNodeFamily::Shared createFamily(
       const ShadowNodeFamilyFragment& fragment) const = 0;
 
-  /*
-   * Creates an event emitter for particular node.
-   */
-  virtual SharedEventEmitter createEventEmitter(
-      const InstanceHandle::Shared& instanceHandle) const = 0;
-
  protected:
   friend ShadowNode;
 

packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h

@@ -155,14 +155,11 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
 
   ShadowNodeFamily::Shared createFamily(
       const ShadowNodeFamilyFragment& fragment) const override {
+    auto eventEmitter = std::make_shared<const ConcreteEventEmitter>(
+        std::make_shared<EventTarget>(fragment.instanceHandle),
+        eventDispatcher_);
     return std::make_shared<ShadowNodeFamily>(
-        fragment, eventDispatcher_, *this);
-  }
-
-  SharedEventEmitter createEventEmitter(
-      const InstanceHandle::Shared& instanceHandle) const override {
-    return std::make_shared<const ConcreteEventEmitter>(
-        std::make_shared<EventTarget>(instanceHandle), eventDispatcher_);
+        fragment, std::move(eventEmitter), eventDispatcher_, *this);
   }
 
  protected:

packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp

@@ -20,14 +20,14 @@ using AncestorList = ShadowNode::AncestorList;
 
 ShadowNodeFamily::ShadowNodeFamily(
     const ShadowNodeFamilyFragment& fragment,
+    SharedEventEmitter eventEmitter,
     EventDispatcher::Weak eventDispatcher,
     const ComponentDescriptor& componentDescriptor)
     : eventDispatcher_(std::move(eventDispatcher)),
       tag_(fragment.tag),
       surfaceId_(fragment.surfaceId),
       instanceHandle_(fragment.instanceHandle),
-      eventEmitter_(
-          componentDescriptor.createEventEmitter(fragment.instanceHandle)),
+      eventEmitter_(std::move(eventEmitter)),
       componentDescriptor_(componentDescriptor),
       componentHandle_(componentDescriptor.getComponentHandle()),
       componentName_(componentDescriptor.getComponentName()) {}

packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h

@@ -50,6 +50,7 @@ class ShadowNodeFamily final {
 
   ShadowNodeFamily(
       const ShadowNodeFamilyFragment& fragment,
+      SharedEventEmitter eventEmitter,
       EventDispatcher::Weak eventDispatcher,
       const ComponentDescriptor& componentDescriptor);
 

packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp

@@ -37,14 +37,11 @@ class ShadowNodeTest : public ::testing::Test {
 
     auto traits = TestShadowNode::BaseTraits();
 
-    auto familyAA = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 11,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyAA = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 11,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeAA_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -53,14 +50,11 @@ class ShadowNodeTest : public ::testing::Test {
         familyAA,
         traits);
 
-    auto familyABA = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 12,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyABA = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 12,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeABA_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -69,14 +63,11 @@ class ShadowNodeTest : public ::testing::Test {
         familyABA,
         traits);
 
-    auto familyABB = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 13,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyABB = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 13,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeABB_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -88,14 +79,11 @@ class ShadowNodeTest : public ::testing::Test {
     auto nodeABChildren = std::make_shared<ShadowNode::ListOfShared>(
         ShadowNode::ListOfShared{nodeABA_, nodeABB_});
 
-    auto familyAB = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 15,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyAB = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 15,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeAB_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -104,14 +92,11 @@ class ShadowNodeTest : public ::testing::Test {
         familyAB,
         traits);
 
-    auto familyAC = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 16,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyAC = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 16,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeAC_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -123,14 +108,11 @@ class ShadowNodeTest : public ::testing::Test {
     auto nodeAChildren = std::make_shared<ShadowNode::ListOfShared>(
         ShadowNode::ListOfShared{nodeAA_, nodeAB_, nodeAC_});
 
-    auto familyA = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 17,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyA = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 17,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeA_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -139,14 +121,11 @@ class ShadowNodeTest : public ::testing::Test {
         familyA,
         traits);
 
-    auto familyZ = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 18,
-            /* .surfaceId = */ surfaceId_,
-            /* .instanceHandle = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
+    auto familyZ = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+        /* .tag = */ 18,
+        /* .surfaceId = */ surfaceId_,
+        /* .instanceHandle = */ nullptr,
+    });
     nodeZ_ = std::make_shared<TestShadowNode>(
         ShadowNodeFragment{
             /* .props = */ props,
@@ -234,14 +213,11 @@ TEST_F(ShadowNodeTest, handleCloneFunction) {
 }
 
 TEST_F(ShadowNodeTest, handleState) {
-  auto family = std::make_shared<ShadowNodeFamily>(
-      ShadowNodeFamilyFragment{
-          /* .tag = */ 9,
-          /* .surfaceId = */ surfaceId_,
-          /* .instanceHandle = */ nullptr,
-      },
-      eventDispatcher_,
-      componentDescriptor_);
+  auto family = componentDescriptor_.createFamily(ShadowNodeFamilyFragment{
+      /* .tag = */ 9,
+      /* .surfaceId = */ surfaceId_,
+      /* .instanceHandle = */ nullptr,
+  });
 
   auto traits = TestShadowNode::BaseTraits();