diff --git a/packages/react-native/React/Fabric/RCTScheduler.h b/packages/react-native/React/Fabric/RCTScheduler.h index ed585390890..8b809580c10 100644 --- a/packages/react-native/React/Fabric/RCTScheduler.h +++ b/packages/react-native/React/Fabric/RCTScheduler.h @@ -31,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)schedulerShouldRenderTransactions: (std::shared_ptr)mountingCoordinator; +- (void)schedulerShouldMergeReactRevision:(facebook::react::SurfaceId)surfaceId; + - (void)schedulerDidDispatchCommand:(const facebook::react::ShadowView &)shadowView commandName:(const std::string &)commandName args:(const folly::dynamic &)args; diff --git a/packages/react-native/React/Fabric/RCTScheduler.mm b/packages/react-native/React/Fabric/RCTScheduler.mm index 76922e26287..408ed9545b2 100644 --- a/packages/react-native/React/Fabric/RCTScheduler.mm +++ b/packages/react-native/React/Fabric/RCTScheduler.mm @@ -37,6 +37,12 @@ class SchedulerDelegateProxy : public SchedulerDelegate { [scheduler.delegate schedulerShouldRenderTransactions:mountingCoordinator]; } + void schedulerShouldMergeReactRevision(SurfaceId surfaceId) override + { + RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_; + [scheduler.delegate schedulerShouldMergeReactRevision:surfaceId]; + } + void schedulerDidRequestPreliminaryViewAllocation(const ShadowNode &shadowNode) override { // Does nothing. diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm index 9a5b94696cc..5da1d1b75ca 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm @@ -307,6 +307,15 @@ using namespace facebook::react; [_mountingManager scheduleTransaction:mountingCoordinator]; } +- (void)schedulerShouldMergeReactRevision:(SurfaceId)surfaceId +{ + auto scheduler = [self scheduler]; + RCTExecuteOnMainQueue(^{ + scheduler.uiManager->getShadowTreeRegistry().visit( + surfaceId, [](const ShadowTree &shadowTree) { shadowTree.mergeReactRevision(); }); + }); +} + - (void)schedulerDidDispatchCommand:(const ShadowView &)shadowView commandName:(const std::string &)commandName args:(const folly::dynamic &)args diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 4cd41bc0fa2..998586790bf 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -964,6 +964,25 @@ public class FabricUIManager } } + @SuppressWarnings("unused") + @AnyThread + @ThreadConfined(ANY) + private void scheduleReactRevisionMerge(int surfaceId) { + if (UiThreadUtil.isOnUiThread()) { + if (mBinding != null) { + mBinding.mergeReactRevision(surfaceId); + } + } else { + UiThreadUtil.runOnUiThread( + () -> { + FabricUIManagerBinding binding = mBinding; + if (binding != null) { + binding.mergeReactRevision(surfaceId); + } + }); + } + } + /** * This method initiates preloading of an image specified by ImageSource. It can later be consumed * by an ImageView. diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt index 0373e9d2be1..cad82b4f1b1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt @@ -89,6 +89,8 @@ internal class FabricUIManagerBinding : HybridClassBase() { animationBackendChoreographer: AnimationBackendChoreographer ) + external fun mergeReactRevision(surfaceId: Int) + fun register( runtimeExecutor: RuntimeExecutor, runtimeScheduler: RuntimeScheduler, diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp index 8b966236899..95ddd80e6d9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp @@ -1206,4 +1206,11 @@ void FabricMountingManager::synchronouslyUpdateViewOnUIThread( synchronouslyUpdateViewOnUIThreadJNI(javaUIManager_, viewTag, propsMap); } +void FabricMountingManager::scheduleReactRevisionMerge(SurfaceId surfaceId) { + static const auto scheduleReactRevisionMerge = + JFabricUIManager::javaClassStatic()->getMethod( + "scheduleReactRevisionMerge"); + scheduleReactRevisionMerge(javaUIManager_, surfaceId); +} + } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h index 9fd87538d16..98a66775bae 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h @@ -54,6 +54,8 @@ class FabricMountingManager final { void synchronouslyUpdateViewOnUIThread(Tag viewTag, const folly::dynamic &props); + void scheduleReactRevisionMerge(SurfaceId surfaceId); + private: bool isOnMainThread(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp index 42a30dde17f..15c34793d06 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp @@ -701,6 +701,23 @@ void FabricUIManagerBinding::schedulerShouldRenderTransactions( } } +void FabricUIManagerBinding::schedulerShouldMergeReactRevision( + SurfaceId surfaceId) { + std::shared_lock lock(installMutex_); + auto mountingManager = + getMountingManager("schedulerShouldMergeReactRevision"); + if (mountingManager) { + mountingManager->scheduleReactRevisionMerge(surfaceId); + } +} + +void FabricUIManagerBinding::mergeReactRevision(SurfaceId surfaceId) { + std::shared_lock lock(installMutex_); + scheduler_->getUIManager()->getShadowTreeRegistry().visit( + surfaceId, + [](const ShadowTree& shadowTree) { shadowTree.mergeReactRevision(); }); +} + void FabricUIManagerBinding::schedulerDidRequestPreliminaryViewAllocation( const ShadowNode& shadowNode) { using namespace std::literals::string_view_literals; @@ -838,6 +855,8 @@ void FabricUIManagerBinding::registerNatives() { makeNativeMethod( "setAnimationBackendChoreographer", FabricUIManagerBinding::setAnimationBackendChoreographer), + makeNativeMethod( + "mergeReactRevision", FabricUIManagerBinding::mergeReactRevision), }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h index a84659c5412..6d129e7ffea 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h @@ -97,6 +97,10 @@ class FabricUIManagerBinding : public jni::HybridClass, void schedulerShouldRenderTransactions( const std::shared_ptr &mountingCoordinator) override; + void schedulerShouldMergeReactRevision(SurfaceId surfaceId) override; + + void mergeReactRevision(SurfaceId surfaceId); + void schedulerDidRequestPreliminaryViewAllocation(const ShadowNode &shadowNode) override; void schedulerDidDispatchCommand( diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index af2a59f0a28..7bec66e48fb 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -377,8 +377,9 @@ void Scheduler::uiManagerDidFinishReactCommit(const ShadowTree& shadowTree) { } void Scheduler::uiManagerDidPromoteReactRevision(const ShadowTree& shadowTree) { - // Replaced by scheduling on the UI thread in the following diff. - shadowTree.mergeReactRevision(); + if (delegate_ != nullptr) { + delegate_->schedulerShouldMergeReactRevision(shadowTree.getSurfaceId()); + } } void Scheduler::uiManagerDidStartSurface(const ShadowTree& shadowTree) { diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h index afa2d57de65..fafb5f90f29 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h @@ -38,6 +38,12 @@ class SchedulerDelegate { virtual void schedulerShouldRenderTransactions( const std::shared_ptr &mountingCoordinator) = 0; + /* + * Called at the end of the event loop if there were commits to the JS + * during the pass and JS branch should be "merged" to the main revision. + */ + virtual void schedulerShouldMergeReactRevision(SurfaceId surfaceId) = 0; + /* * Called right after a new ShadowNode was created. */ diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.cpp index ad9ca80551b..dcc1df6a5cd 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.cpp @@ -6,6 +6,7 @@ */ #include "SchedulerDelegateImpl.h" +#include namespace facebook::react { @@ -13,6 +14,11 @@ SchedulerDelegateImpl::SchedulerDelegateImpl( std::shared_ptr mountingManager) noexcept : mountingManager_(std::move(mountingManager)) {} +void SchedulerDelegateImpl::setUIManager( + std::shared_ptr uiManager) noexcept { + uiManager_ = uiManager; +} + void SchedulerDelegateImpl::schedulerDidFinishTransaction( const std::shared_ptr& /*mountingCoordinator*/) { // no-op, we will flush the transaction from schedulerShouldRenderTransactions @@ -30,6 +36,13 @@ void SchedulerDelegateImpl::schedulerShouldRenderTransactions( } } +void SchedulerDelegateImpl::schedulerShouldMergeReactRevision( + SurfaceId surfaceId) { + uiManager_->getShadowTreeRegistry().visit( + surfaceId, + [](const ShadowTree& shadowTree) { shadowTree.mergeReactRevision(); }); +} + void SchedulerDelegateImpl::schedulerDidRequestPreliminaryViewAllocation( const ShadowNode& shadowNode) {} diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.h b/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.h index 2167e5fe143..b60f33962ce 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.h +++ b/packages/react-native/ReactCxxPlatform/react/renderer/scheduler/SchedulerDelegateImpl.h @@ -25,12 +25,16 @@ class SchedulerDelegateImpl : public SchedulerDelegate { SchedulerDelegateImpl(const SchedulerDelegateImpl &) = delete; SchedulerDelegateImpl &operator=(const SchedulerDelegateImpl &) = delete; + void setUIManager(std::shared_ptr uiManager) noexcept; + private: void schedulerDidFinishTransaction(const std::shared_ptr &mountingCoordinator) override; void schedulerShouldRenderTransactions( const std::shared_ptr &mountingCoordinator) override; + void schedulerShouldMergeReactRevision(SurfaceId surfaceId) override; + void schedulerDidRequestPreliminaryViewAllocation(const ShadowNode &shadowNode) override; void schedulerDidDispatchCommand( @@ -48,6 +52,7 @@ class SchedulerDelegateImpl : public SchedulerDelegate { void schedulerDidUpdateShadowTree(const std::unordered_map &tagToProps) override; std::shared_ptr mountingManager_; + std::shared_ptr uiManager_; }; }; // namespace facebook::react diff --git a/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.cpp b/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.cpp index 74427d2a72b..eb54ebd0fe8 100644 --- a/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.cpp +++ b/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.cpp @@ -229,12 +229,14 @@ void ReactHost::createReactInstance() { }; toolbox.animationChoreographer = reactInstanceData_->animationChoreographer; - schedulerDelegate_ = std::make_unique( + auto schedulerDelegate = std::make_unique( reactInstanceData_->mountingManager); scheduler_ = - std::make_unique(toolbox, nullptr, schedulerDelegate_.get()); + std::make_unique(toolbox, nullptr, schedulerDelegate.get()); surfaceManager_ = std::make_unique(*scheduler_); + schedulerDelegate->setUIManager(scheduler_->getUIManager()); + schedulerDelegate_ = std::move(schedulerDelegate); reactInstanceData_->mountingManager->setSchedulerTaskExecutor( [this](SchedulerTask&& task) { runOnScheduler(std::move(task)); });