Revert D51394187: delete ShadowNodeFamily::instanceHandle_

Differential Revision: D51394187 Original commit changeset: 3add711a3954 Original Phabricator Diff: D51394187 fbshipit-source-id: 881fb82c949fef05f001fec57f62911a3a5dc482
huntie · Nov 17, 2023 · ba43dd2 · ba43dd2
1 parent d9fa64e
commit ba43dd2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
@@ -173,7 +173,12 @@ const SharedEventEmitter& ShadowNode::getEventEmitter() const {
 }
 
 jsi::Value ShadowNode::getInstanceHandle(jsi::Runtime& runtime) const {
-  return family_->eventEmitter_->getEventTarget()->getInstanceHandle(runtime);
+  auto instanceHandle = family_->instanceHandle_;
+  if (instanceHandle == nullptr) {
+    return jsi::Value::null();
+  }
+
+  return instanceHandle->getInstanceHandle(runtime);
 }
 
 Tag ShadowNode::getTag() const {

diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
@@ -26,6 +26,7 @@ ShadowNodeFamily::ShadowNodeFamily(
     : eventDispatcher_(std::move(eventDispatcher)),
       tag_(fragment.tag),
       surfaceId_(fragment.surfaceId),
+      instanceHandle_(fragment.instanceHandle),
       eventEmitter_(std::move(eventEmitter)),
       componentDescriptor_(componentDescriptor),
       componentHandle_(componentDescriptor.getComponentHandle()),

diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h
@@ -132,6 +132,11 @@ class ShadowNodeFamily final {
    */
   const SurfaceId surfaceId_;
 
+  /*
+   * Weak reference to the React instance handle
+   */
+  InstanceHandle::Shared const instanceHandle_;
+
   /*
    * `EventEmitter` associated with all nodes of the family.
    */