diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm index ddc331db19b5..0b488e6c9fb8 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm @@ -101,7 +101,7 @@ - (instancetype)initWithContextContainer:(std::shared_ptr(self); _mergeRunLoopObserver = std::make_unique( RunLoopObserver::Activity::BeforeWaiting, _mergeRunLoopObserverDelegate); @@ -350,7 +350,7 @@ - (void)schedulerShouldRenderTransactions:(std::shared_ptrscheduleReactRevisionMerge(surfaceId); + if (ReactNativeFeatureFlags::enableFabricCommitBranchingMergeOnMainThread()) { + auto mountingManager = + getMountingManager("schedulerShouldMergeReactRevision"); + if (mountingManager) { + mountingManager->scheduleReactRevisionMerge(surfaceId); + } + } else { + mergeReactRevision(surfaceId); } } void FabricUIManagerBinding::mergeReactRevision(SurfaceId surfaceId) { - std::shared_lock lock(installMutex_); - scheduler_->getUIManager()->getShadowTreeRegistry().visit( + auto scheduler = getScheduler(); + if (!scheduler) { + return; + } + + scheduler->getUIManager()->getShadowTreeRegistry().visit( surfaceId, [](const ShadowTree& shadowTree) { shadowTree.mergeReactRevision(); }); } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index 9920a83cca5f..a258ab9043eb 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -492,6 +492,7 @@ void ShadowTree::mount(ShadowTreeRevision revision, bool mountSynchronously) } void ShadowTree::mergeReactRevision() const { + TraceSection s("ShadowTree::mergeReactRevision"); ShadowTreeRevision promotedRevision; std::vector promotedRevisions; // If props updates accumulation is guaranteed, we can merge the promoted @@ -568,7 +569,7 @@ void ShadowTree::mergeReactRevision() const { } } -void ShadowTree::promoteReactRevision() const { +bool ShadowTree::promoteReactRevision() const { // Promote only when props updates accumulation is guaranteed. Otherwise, // queuedReactRevisions_ will be used instead. if (isPropsUpdatesAccumulationGuaranteed()) { @@ -579,7 +580,7 @@ void ShadowTree::promoteReactRevision() const { // have more than one promotion in a row. In this case, all but the first // one should no-op. if (!currentReactRevision_.has_value()) { - return; + return false; } currentReactRevision = currentReactRevision_.value(); } @@ -592,7 +593,7 @@ void ShadowTree::promoteReactRevision() const { UniqueLock lock = uniqueRevisionLock(false); if (queuedReactRevisions_.empty()) { - return; + return false; } // Move all queued revisions to the promoted revisions. @@ -603,7 +604,7 @@ void ShadowTree::promoteReactRevision() const { queuedReactRevisions_.clear(); } - delegate_.shadowTreeDidPromoteReactRevision(*this); + return true; } void ShadowTree::scheduleReactRevisionPromotion() const { diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h index 76f99d6ae25a..4eeb85abceea 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h @@ -148,9 +148,9 @@ class ShadowTree final { /** * Promotes the current React revision to be merged into the main branch of the - * ShadowTree. + * ShadowTree. Returns `true` if a revision was promoted. */ - void promoteReactRevision() const; + bool promoteReactRevision() const; /** * Commits the currently promoted React revision to the "main" branch of the diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h index ab97e0762972..1e0ca44d956e 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h @@ -46,12 +46,6 @@ class ShadowTreeDelegate { */ virtual void shadowTreeDidFinishReactCommit(const ShadowTree &shadowTree) const = 0; - /* - * Called right after Shadow Tree promotes a React revision of the tree to - * be merged. - */ - virtual void shadowTreeDidPromoteReactRevision(const ShadowTree &shadowTree) const = 0; - /* * Called right after a Shadow Tree commits a new tree, reporting the nodes * whose layout changed in this commit. diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeReactBranchingTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeReactBranchingTest.cpp index 79d76a6094fb..260cb7bc5711 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeReactBranchingTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeReactBranchingTest.cpp @@ -46,9 +46,6 @@ class DummyShadowTreeDelegate : public ShadowTreeDelegate { void shadowTreeDidFinishReactCommit( const ShadowTree& /*shadowTree*/) const override {} - - void shadowTreeDidPromoteReactRevision( - const ShadowTree& /*shadowTree*/) const override {} }; } // namespace diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp index 721a46700be8..a9c553e4f84f 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp @@ -40,9 +40,6 @@ class DummyShadowTreeDelegate : public ShadowTreeDelegate { void shadowTreeDidFinishReactCommit( const ShadowTree& /*shadowTree*/) const override {} - - void shadowTreeDidPromoteReactRevision( - const ShadowTree& /*shadowTree*/) const override {} }; namespace { diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index e81660b312ec..81d9de17660c 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -417,19 +417,24 @@ void Scheduler::uiManagerShouldRemoveEventListener( } void Scheduler::uiManagerDidFinishReactCommit(const ShadowTree& shadowTree) { + if (delegate_ == nullptr) { + return; + } + auto surfaceId = shadowTree.getSurfaceId(); runtimeScheduler_->scheduleRenderingUpdate( - surfaceId, [surfaceId, uiManager = uiManager_]() { + surfaceId, [surfaceId, uiManager = uiManager_, delegate = delegate_]() { + bool promoted = false; + uiManager->getShadowTreeRegistry().visit( - surfaceId, - [](const ShadowTree& tree) { tree.promoteReactRevision(); }); - }); -} + surfaceId, [&](const ShadowTree& tree) { + promoted = tree.promoteReactRevision(); + }); -void Scheduler::uiManagerDidPromoteReactRevision(const ShadowTree& shadowTree) { - if (delegate_ != nullptr) { - delegate_->schedulerShouldMergeReactRevision(shadowTree.getSurfaceId()); - } + if (promoted) { + delegate->schedulerShouldMergeReactRevision(surfaceId); + } + }); } void Scheduler::uiManagerDidStartSurface(const ShadowTree& shadowTree) { diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h index 59c8f6ceac82..179d6701727e 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h @@ -107,7 +107,6 @@ class Scheduler final : public UIManagerDelegate { void uiManagerShouldAddEventListener(std::shared_ptr listener) final; void uiManagerShouldRemoveEventListener(const std::shared_ptr &listener) final; void uiManagerDidFinishReactCommit(const ShadowTree &shadowTree) override; - void uiManagerDidPromoteReactRevision(const ShadowTree &shadowTree) override; void uiManagerDidStartSurface(const ShadowTree &shadowTree) override; #pragma mark - ContextContainer diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index b709fd63c317..0cb62936c8b5 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -673,13 +673,6 @@ void UIManager::shadowTreeDidFinishReactCommit( } } -void UIManager::shadowTreeDidPromoteReactRevision( - const ShadowTree& shadowTree) const { - if (delegate_ != nullptr) { - delegate_->uiManagerDidPromoteReactRevision(shadowTree); - } -} - void UIManager::shadowTreeDidCommit( const ShadowTree& shadowTree, const RootShadowNode::Shared& rootShadowNode, diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h index 269609a7fedb..1dc650dc01c7 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h @@ -143,8 +143,6 @@ class UIManager final : public ShadowTreeDelegate { void shadowTreeDidFinishReactCommit(const ShadowTree &shadowTree) const override; - void shadowTreeDidPromoteReactRevision(const ShadowTree &shadowTree) const override; - void shadowTreeDidCommit( const ShadowTree &shadowTree, const RootShadowNode::Shared &rootShadowNode, diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h index f88bef99c31e..aa439eadd509 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h @@ -91,11 +91,6 @@ class UIManagerDelegate { */ virtual void uiManagerDidFinishReactCommit(const ShadowTree &shadowTree) = 0; - /* - * Called after a React revision of the shadow tree is promoted to be merged. - */ - virtual void uiManagerDidPromoteReactRevision(const ShadowTree &shadowTree) = 0; - using OnSurfaceStartCallback = std::function; virtual void uiManagerShouldAddOnSurfaceStartCallback(OnSurfaceStartCallback &&callback) = 0; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/tests/LazyShadowTreeRevisionConsistencyManagerTest.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/tests/LazyShadowTreeRevisionConsistencyManagerTest.cpp index 349a79f3d495..d17ce99c0c17 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/tests/LazyShadowTreeRevisionConsistencyManagerTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/tests/LazyShadowTreeRevisionConsistencyManagerTest.cpp @@ -30,9 +30,6 @@ class FakeShadowTreeDelegate : public ShadowTreeDelegate { void shadowTreeDidFinishReactCommit( const ShadowTree& /*shadowTree*/) const override {} - - void shadowTreeDidPromoteReactRevision( - const ShadowTree& /*shadowTree*/) const override {} }; class LazyShadowTreeRevisionConsistencyManagerTest : public ::testing::Test { diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index ddbcc025df4b..1930037e741c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -4614,7 +4614,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -4820,6 +4819,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -4835,7 +4835,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -4845,7 +4844,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -5357,7 +5355,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -5438,7 +5435,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 27faa45129f6..0758fb0964d5 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -4430,7 +4430,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -4630,6 +4629,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -4645,7 +4645,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -4655,7 +4654,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -5167,7 +5165,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -5248,7 +5245,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 100ffa70ba53..3ff53c951548 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -4611,7 +4611,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -4811,6 +4810,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -4826,7 +4826,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -4836,7 +4835,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -5348,7 +5346,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -5429,7 +5426,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index c15e97984e03..498cb170b85c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -6798,7 +6798,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -7007,6 +7006,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -7022,7 +7022,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -7032,7 +7031,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -7522,7 +7520,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -7603,7 +7600,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 548568e06452..f223333b7d33 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -6646,7 +6646,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -6849,6 +6848,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -6864,7 +6864,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -6874,7 +6873,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -7364,7 +7362,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -7445,7 +7442,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 3f4cda1ab150..7dd7b47cdd02 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -6795,7 +6795,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -6998,6 +6997,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -7013,7 +7013,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -7023,7 +7022,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -7513,7 +7511,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -7594,7 +7591,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index da20c08e8265..8b46097a89f9 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -3153,7 +3153,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -3357,6 +3356,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -3372,7 +3372,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -3382,7 +3381,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -3793,7 +3791,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -3874,7 +3871,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index 5fde082a1140..692b5064e583 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -3009,7 +3009,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -3207,6 +3206,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -3222,7 +3222,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -3232,7 +3231,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -3643,7 +3641,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -3724,7 +3721,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index dc9369605169..ff0ef95bbfdb 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -3150,7 +3150,6 @@ class facebook::react::Scheduler : public facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) override; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) override; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) override; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) override; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) override; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) override; @@ -3348,6 +3347,7 @@ enum facebook::react::ShadowNodeTraits::Trait : int32_t { class facebook::react::ShadowTree { public ShadowTree(facebook::react::SurfaceId surfaceId, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext, const facebook::react::ShadowTreeDelegate& delegate, const facebook::react::ContextContainer& contextContainer); + public bool promoteReactRevision() const; public facebook::react::CommitMode getCommitMode() const; public facebook::react::CommitStatus commit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; public facebook::react::CommitStatus tryCommit(const facebook::react::ShadowTreeCommitTransaction& transaction, const facebook::react::ShadowTree::CommitOptions& commitOptions) const; @@ -3363,7 +3363,6 @@ class facebook::react::ShadowTree { public void commitEmptyTree() const; public void mergeReactRevision() const; public void notifyDelegatesOfUpdates() const; - public void promoteReactRevision() const; public void setCommitMode(facebook::react::CommitMode commitMode) const; public ~ShadowTree(); } @@ -3373,7 +3372,6 @@ class facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree&, const facebook::react::RootShadowNode::Shared&, const std::vector&) const; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const = 0; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const = 0; public virtual ~ShadowTreeDelegate() noexcept = default; } @@ -3784,7 +3782,6 @@ class facebook::react::UIManager : public facebook::react::ShadowTreeDelegate { public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector& affectedLayoutableNodes) const noexcept override; public virtual void shadowTreeDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) const override; public virtual void shadowTreeDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) const override; - public virtual void shadowTreeDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) const override; public void addEventListener(std::shared_ptr listener); public void addOnSurfaceStartCallback(facebook::react::UIManagerDelegate::OnSurfaceStartCallback&& callback); public void animationTick() const; @@ -3865,7 +3862,6 @@ class facebook::react::UIManagerDelegate { public virtual void uiManagerDidDispatchCommand(const std::shared_ptr& shadowNode, const std::string& commandName, const folly::dynamic& args) = 0; public virtual void uiManagerDidFinishReactCommit(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidFinishTransaction(std::shared_ptr mountingCoordinator, bool mountSynchronously) = 0; - public virtual void uiManagerDidPromoteReactRevision(const facebook::react::ShadowTree& shadowTree) = 0; public virtual void uiManagerDidSendAccessibilityEvent(const std::shared_ptr& shadowNode, const std::string& eventType) = 0; public virtual void uiManagerDidSetIsJSResponder(const std::shared_ptr& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; public virtual void uiManagerDidSetViewSnapshot(facebook::react::Tag sourceTag, facebook::react::Tag targetTag, facebook::react::SurfaceId surfaceId) = 0;