From 55195ca43fe030026b2a540b188f29b633d584b0 Mon Sep 17 00:00:00 2001 From: Kamil Paradowski Date: Thu, 30 Jul 2026 11:44:31 -0700 Subject: [PATCH] Layout event emitter (#57722) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: > Stack 2/3 — parent: `feat/shadowTreeDidCommit`. Review that first. `onLayout` events are emitted inline from `ShadowTree::emitLayoutEvents`, which forces `ShadowTree` to depend on `ViewProps` and `BaseViewEventEmitter`. This moves that logic into a standalone `LayoutEventEmitter` that consumes the `shadowTreeDidCommit` hook (added in the parent PR) and is registered as a commit hook by `Scheduler`. Same filter (nodes with an `onLayout` prop), same timing (during commit), same `BaseViewEventEmitter::onLayout` call — behavior is unchanged. After this, `ShadowTree` no longer references view props or event emitters, and the per-commit layout-change signal is shared with `ResizeObserver` instead of being duplicated. ## Changelog: [INTERNAL] [CHANGED] - Emit `onLayout` from a `LayoutEventEmitter` commit hook instead of inline in `ShadowTree` Pull Request resolved: https://github.com/react/react-native/pull/57722 Test Plan: Behavior-preserving refactor. Existing `onLayout` tests pass and `ShadowTree` no longer includes `ViewShadowNode`/`ViewProps`. Verified in rn-tester that `onLayout` still fires on mount and on size changes. Reviewed By: christophpurrer Differential Revision: D114045065 Pulled By: javache fbshipit-source-id: 5b887537ad3e947f3a352fb9dd10b7d124f669df --- .../react/renderer/mounting/ShadowTree.cpp | 22 ----------- .../react/renderer/mounting/ShadowTree.h | 2 - .../react/renderer/scheduler/Scheduler.cpp | 6 +++ .../renderer/uimanager/LayoutEventEmitter.cpp | 38 +++++++++++++++++++ .../renderer/uimanager/LayoutEventEmitter.h | 31 +++++++++++++++ .../api-snapshots/ReactAndroidDebugCxx.api | 6 +++ .../api-snapshots/ReactAndroidNewarchCxx.api | 6 +++ .../api-snapshots/ReactAndroidReleaseCxx.api | 6 +++ .../api-snapshots/ReactAppleDebugCxx.api | 6 +++ .../api-snapshots/ReactAppleNewarchCxx.api | 6 +++ .../api-snapshots/ReactAppleReleaseCxx.api | 6 +++ .../api-snapshots/ReactCommonDebugCxx.api | 6 +++ .../api-snapshots/ReactCommonNewarchCxx.api | 6 +++ .../api-snapshots/ReactCommonReleaseCxx.api | 6 +++ 14 files changed, 129 insertions(+), 24 deletions(-) create mode 100644 packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.cpp create mode 100644 packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index d4f0722b44a..9920a83cca5 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -466,8 +465,6 @@ CommitStatus ShadowTree::tryCommit( delegate_.shadowTreeDidCommit( *this, newRevision.rootShadowNode, affectedLayoutableNodes); - emitLayoutEvents(affectedLayoutableNodes); - if (isReactBranch) { scheduleReactRevisionPromotion(); } else if (commitMode == CommitMode::Normal) { @@ -637,25 +634,6 @@ void ShadowTree::commitEmptyTree() const { {/* default commit options */}); } -void ShadowTree::emitLayoutEvents( - std::vector& affectedLayoutableNodes) const { - TraceSection s( - "ShadowTree::emitLayoutEvents", - "affectedLayoutableNodes", - affectedLayoutableNodes.size()); - - for (const auto* layoutableNode : affectedLayoutableNodes) { - if (auto viewProps = - dynamic_cast(layoutableNode->getProps().get())) { - if (viewProps->onLayout) { - static_cast( - *layoutableNode->getEventEmitter()) - .onLayout(layoutableNode->getLayoutMetrics()); - } - } - } -} - void ShadowTree::notifyDelegatesOfUpdates() const { delegate_.shadowTreeDidFinishTransaction(mountingCoordinator_, true); } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h index b875ccc80e2..f462271b03a 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h @@ -161,8 +161,6 @@ class ShadowTree final { void mount(ShadowTreeRevision revision, bool mountSynchronously) const; - void emitLayoutEvents(std::vector &affectedLayoutableNodes) const; - void scheduleReactRevisionPromotion() const; const SurfaceId surfaceId_; diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index 9aba200a839..77f7719dcc0 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -148,6 +149,11 @@ Scheduler::Scheduler( delegate_ = delegate; commitHooks_ = schedulerToolbox.commitHooks; + + // Layout events (`onLayout`) are emitted as a standalone consumer of the + // `shadowTreeDidCommit` commit hook. + commitHooks_.push_back(std::make_shared()); + uiManager_ = uiManager; for (auto& commitHook : commitHooks_) { diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.cpp new file mode 100644 index 00000000000..5cda81e2674 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.cpp @@ -0,0 +1,38 @@ +/* + * 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. + */ + +#include "LayoutEventEmitter.h" + +#include +#include +#include + +namespace facebook::react { + +void LayoutEventEmitter::shadowTreeDidCommit( + const ShadowTree& /*shadowTree*/, + const RootShadowNode::Shared& /*rootShadowNode*/, + const std::vector& + affectedLayoutableNodes) noexcept { + TraceSection s( + "LayoutEventEmitter::shadowTreeDidCommit", + "affectedLayoutableNodes", + affectedLayoutableNodes.size()); + + for (const auto* layoutableNode : affectedLayoutableNodes) { + if (auto viewProps = + dynamic_cast(layoutableNode->getProps().get())) { + if (viewProps->onLayout) { + static_cast( + *layoutableNode->getEventEmitter()) + .onLayout(layoutableNode->getLayoutMetrics()); + } + } + } +} + +} // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h new file mode 100644 index 00000000000..4506cfabc8d --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h @@ -0,0 +1,31 @@ +/* + * 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 + +namespace facebook::react { + +/* + * Emits layout events (`onLayout`) for the nodes whose layout changed in + * each commit, using the `shadowTreeDidCommit` commit hook as the source of + * layout changes (this logic used to be implemented directly in + * `ShadowTree`). + */ +class LayoutEventEmitter final : public UIManagerCommitHook { + public: + void commitHookWasRegistered(const UIManager & /*uiManager*/) noexcept override {} + void commitHookWasUnregistered(const UIManager & /*uiManager*/) noexcept override {} + + void shadowTreeDidCommit( + const ShadowTree &shadowTree, + const RootShadowNode::Shared &rootShadowNode, + const std::vector &affectedLayoutableNodes) noexcept override; +}; + +} // namespace facebook::react diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index 925a292e112..5caa29627d6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -3166,6 +3166,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 5e6bad306fb..957dedf6aba 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -3075,6 +3075,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index fa1cff25459..016bc534b9f 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -3163,6 +3163,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index dc703a0cbf7..32fdfd48d33 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -5397,6 +5397,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 42c8dd152d5..bee7a8777e7 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -5321,6 +5321,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 38103974da2..01edab95afd 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -5394,6 +5394,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 8c52bab2ad7..e33b73a68d4 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -2086,6 +2086,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index cc250889755..7dcd0bb477e 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -2022,6 +2022,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index d2e9cf90239..f6ba681cc2a 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -2083,6 +2083,12 @@ class facebook::react::LayoutAnimationStatusDelegate { class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { } +class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook { + public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override; + public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override; + public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) noexcept override; +} + class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode { public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);