From a5d8ea4579c630af1e4e0fe1d99ad9dc0915df86 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Fri, 17 Nov 2023 03:27:51 -0800 Subject: [PATCH] delete ShadowNodeFamily::instanceHandle_ (#41513) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/41513 changelog: [internal] Reviewed By: christophpurrer Differential Revision: D51394187 fbshipit-source-id: 3add711a3954ba16bf4524d47c3ed67473e2c0eb --- .../ReactCommon/react/renderer/core/ShadowNode.cpp | 7 +------ .../ReactCommon/react/renderer/core/ShadowNodeFamily.cpp | 1 - .../ReactCommon/react/renderer/core/ShadowNodeFamily.h | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp index d51cb8ff231..5d8da6fe6b6 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp @@ -173,12 +173,7 @@ const SharedEventEmitter& ShadowNode::getEventEmitter() const { } jsi::Value ShadowNode::getInstanceHandle(jsi::Runtime& runtime) const { - auto instanceHandle = family_->instanceHandle_; - if (instanceHandle == nullptr) { - return jsi::Value::null(); - } - - return instanceHandle->getInstanceHandle(runtime); + return family_->eventEmitter_->getEventTarget()->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 index 0e73b0a5cf3..88143a9d0c0 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp @@ -26,7 +26,6 @@ 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 index dc5dbc81531..c4a0b4face1 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h @@ -132,11 +132,6 @@ 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. */