From ad516f5f49f684097d24290bad6e8f20074768fa Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <piaseckijakub@meta.com>
Date: Tue, 29 Sep 2026 01:39:01 -0700
Subject: [PATCH] Use umbrellas instead of direct includes in
 react/renderer/scheduler module (#58551)

Summary:

Changelog: [Internal]

Update the react/renderer/scheduler module to use the `React/RendererCore.h`, `React/Utils.h`, and `React/ComponentRegistry.h` umbrella includes instead of direct ones.

Differential Revision: D120315036
---
 .../react-native/ReactCommon/React-Fabric.podspec     |  1 +
 .../ReactCommon/react/renderer/scheduler/Scheduler.h  | 11 ++++-------
 .../react/renderer/scheduler/SchedulerDelegate.h      |  2 +-
 .../react/renderer/scheduler/SchedulerToolbox.h       |  9 ++++-----
 .../react/renderer/scheduler/SurfaceHandler.h         |  6 ++----
 .../react/renderer/scheduler/SurfaceManager.h         |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index a80ef92ba6a8..38fcab30e886 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -106,6 +106,7 @@ Pod::Spec.new do |s|
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/componentregistry\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
       ]
     end
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h
index 179d6701727e..28c2d86462bf 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h
@@ -15,12 +15,10 @@
 #include <shared_mutex>
 #include <vector>
 
-#include <ReactCommon/RuntimeExecutor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/core/ComponentDescriptor.h>
-#include <react/renderer/core/EventEmitter.h>
-#include <react/renderer/core/EventListener.h>
-#include <react/renderer/core/LayoutConstraints.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
+#include <React/RuntimeExecutor.h>
+#include <React/Utils.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/scheduler/InspectorData.h>
 #include <react/renderer/scheduler/SchedulerDelegate.h>
@@ -29,7 +27,6 @@
 #include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <react/renderer/uimanager/UIManagerDelegate.h>
-#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
index 10f45018d94a..e6ca676fdbae 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include <react/renderer/core/ReactPrimitives.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowView.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
index 50ddbdca8015..2e6e34399b36 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
@@ -11,14 +11,13 @@
 
 #include <memory>
 
-#include <ReactCommon/RuntimeExecutor.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
+#include <React/RuntimeExecutor.h>
+#include <React/Utils.h>
 #include <react/renderer/animationbackend/AnimationChoreographer.h>
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/core/EventBeat.h>
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
 #include <react/renderer/uimanager/primitives.h>
-#include <react/utils/ContextContainer.h>
-#include <react/utils/RunLoopObserver.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
index 40a1ee28f79c..5e03e796e67a 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
@@ -12,11 +12,9 @@
 #include <memory>
 #include <shared_mutex>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <folly/dynamic.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/core/LayoutContext.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h
index ed76f11d4c11..dcc3968659de 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h
@@ -14,7 +14,7 @@
 #include <shared_mutex>
 #include <unordered_map>
 
-#include <react/renderer/core/LayoutConstraints.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/scheduler/SurfaceHandler.h>