From 9d009053f7af306fef2326fe7abb095f95578006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= <maleckidawid@meta.com>
Date: Tue, 29 Sep 2026 02:43:04 -0700
Subject: [PATCH 1/2] Clean up MapBuffer public header dependencies (#58715)

Summary:

Keep MapBuffer exported headers self-contained by removing implementation-only Debug and logging dependencies. Move those includes into the source files that use them and declare standard-library dependencies directly.

Changelog:
[Internal]

Reviewed By: cipolleschi

Differential Revision: D121398637
---
 .../ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp    | 3 +++
 .../ReactCommon/react/renderer/mapbuffer/MapBuffer.h      | 6 +-----
 .../react/renderer/mapbuffer/MapBufferBuilder.cpp         | 8 +++++++-
 .../react/renderer/mapbuffer/MapBufferBuilder.h           | 5 ++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
index e657cc5514fc..b02aaa65f937 100644
--- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
@@ -6,10 +6,13 @@
  */
 
 #include "MapBuffer.h"
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 
 #include <algorithm>
+#include <cstddef>
 #include <cstring>
+#include <utility>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
index d57b5ef2e9a7..c433c71acee7 100644
--- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
+++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
@@ -8,13 +8,9 @@
 #pragma once
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
-#include <react/debug/react_native_assert.h>
-
-#include <glog/logging.h>
 
+#include <cstddef>
 #include <cstdint>
-#include <cstdlib>
-#include <limits>
 #include <string>
 #include <vector>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
index 1944a01f261f..f0ced11264f8 100644
--- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
@@ -6,7 +6,13 @@
  */
 
 #include "MapBufferBuilder.h"
+
+#include <glog/logging.h>
+
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
+#include <utility>
 
 namespace facebook::react {
 
@@ -40,7 +46,7 @@ void MapBufferBuilder::storeKeyValue(
   if (valueSize > MAX_BUCKET_VALUE_SIZE) {
     LOG(ERROR) << "Error: size of value must be <= MAX_VALUE_SIZE. ValueSize: "
                << valueSize;
-    abort();
+    std::abort();
   }
 
   uint64_t data = 0;
diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
index 66a36a94b2f7..040744ce300f 100644
--- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
+++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
@@ -8,8 +8,11 @@
 #pragma once
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
-#include <react/debug/react_native_assert.h>
+
+#include <cstdint>
+#include <string>
 #include <vector>
+
 #include "MapBuffer.h"
 
 namespace facebook::react {

From e93676225d09e31d1c39add39ef6ac14132e25ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= <maleckidawid@meta.com>
Date: Tue, 29 Sep 2026 02:43:04 -0700
Subject: [PATCH 2/2] Use public umbrellas in UIManager headers (#58663)

Summary:

Route public React Native dependencies in exported UIManager framework headers through supported umbrella entry points. Preserve same-target, framework-tier, graphics, and third-party includes while declaring standard-library and build dependencies directly.

Changelog:
[Internal]

Reviewed By: cipolleschi

Differential Revision: D121402288
---
 .../ReactCommon/React-Fabric.podspec          |  4 ++++
 .../renderer/uimanager/AppRegistryBinding.h   |  5 ++++-
 .../react/renderer/uimanager/CMakeLists.txt   |  3 +++
 .../renderer/uimanager/LayoutEventEmitter.h   |  2 ++
 .../uimanager/PointerEventsProcessor.h        |  4 ++++
 .../renderer/uimanager/PointerHoverTracker.h  |  8 +++++---
 .../react/renderer/uimanager/UIManager.h      | 20 ++++++++++---------
 .../uimanager/UIManagerAnimationBackend.h     |  6 ++++--
 .../uimanager/UIManagerAnimationDelegate.h    |  6 +++---
 .../renderer/uimanager/UIManagerBinding.h     |  9 ++++++---
 .../renderer/uimanager/UIManagerCommitHook.h  |  2 ++
 .../renderer/uimanager/UIManagerDelegate.h    |  9 +++++++--
 .../renderer/uimanager/UIManagerMountHook.h   |  4 +++-
 .../UIManagerNativeAnimatedDelegate.h         |  5 -----
 .../UIManagerViewTransitionDelegate.h         |  8 ++++++--
 .../react/renderer/uimanager/primitives.h     | 13 ++++++++++--
 16 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index a80ef92ba6a8..8b84f704eef5 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -105,6 +105,7 @@ Pod::Spec.new do |s|
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/componentregistry\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
       ]
@@ -259,6 +260,9 @@ Pod::Spec.new do |s|
     end
 
     ss.dependency             "React-rendererconsistency"
+    ss.dependency             "React-Fabric/coreUmbrella"
+    ss.dependency             "React-Fabric/componentregistryUmbrella"
+    ss.dependency             "React-Fabric/components/viewUmbrella"
     ss.source_files         = podspec_sources("react/renderer/uimanager/*.{m,mm,cpp,h}", "react/renderer/uimanager/*.h")
     ss.header_dir           = "react/renderer/uimanager"
   end
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h b/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
index 7822930848bb..65cc30251b0a 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
@@ -9,9 +9,12 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
-#include <react/renderer/core/ReactPrimitives.h>
+
+#include <string>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
index f8e0b076c868..d6afbf677d5d 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
@@ -14,6 +14,7 @@ add_library(react_renderer_uimanager OBJECT ${react_renderer_uimanager_SRC})
 target_include_directories(react_renderer_uimanager PUBLIC ${REACT_COMMON_DIR})
 
 target_link_libraries(react_renderer_uimanager
+        callinvoker
         glog
         folly_runtime
         jsi
@@ -32,6 +33,8 @@ target_link_libraries(react_renderer_uimanager
         react_renderer_leakchecker
         react_renderer_runtimescheduler
         react_renderer_mounting
+        react_timing
+        react_utils
         rrc_root
         rrc_view
         runtimeexecutor
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
index 9ad3d13a6390..cf0755f42c18 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
@@ -11,6 +11,8 @@
 
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
 
+#include <vector>
+
 namespace facebook::react {
 
 /*
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
index d92055e78690..8f6fdf1a783e 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
@@ -9,7 +9,11 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <cstdint>
 #include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
 
 #include <jsi/jsi.h>
 #include <react/renderer/uimanager/PointerHoverTracker.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
index d0381f8db2a8..5472a537f89a 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
@@ -9,13 +9,15 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/View.h>
+
 #include <functional>
 #include <initializer_list>
 #include <memory>
+#include <tuple>
+#include <vector>
 
-#include <react/renderer/components/view/primitives.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/uimanager/UIManager.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
index 1dc650dc01c7..aaf758bcdf6b 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -9,17 +9,14 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
+#include <React/RuntimeExecutor.h>
+#include <React/Utils.h>
+
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 
-#include <ReactCommon/RuntimeExecutor.h>
-#include <shared_mutex>
-
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/renderer/core/InstanceHandle.h>
-#include <react/renderer/core/RawValue.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/core/StateData.h>
 #include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRegistry.h>
@@ -29,7 +26,12 @@
 #include <react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h>
 #include <react/renderer/uimanager/UIManagerViewTransitionDelegate.h>
 #include <react/renderer/uimanager/primitives.h>
-#include <react/utils/ContextContainer.h>
+#include <functional>
+#include <memory>
+#include <shared_mutex>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
index d291ce2fe178..d57f1e772ca9 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
@@ -9,9 +9,11 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <ReactCommon/CallInvoker.h>
-#include <react/renderer/core/ReactPrimitives.h>
+#include <React/CallInvoker.h>
+#include <React/RendererCore.h>
+
 #include <chrono>
+#include <cstdint>
 #include <functional>
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
index 67981d35d9d2..c4a25b38f289 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
@@ -9,10 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <jsi/jsi.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/core/RawValue.h>
+#include <jsi/jsi.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
index 4b20f29e3479..90cc0ce0fd13 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
@@ -9,12 +9,15 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/Timing.h>
+
 #include <jsi/jsi.h>
-#include <react/renderer/core/RawValue.h>
+
+#include <memory>
+#include <string>
+
 #include <react/renderer/uimanager/PointerEventsProcessor.h>
 #include <react/renderer/uimanager/UIManager.h>
-#include <react/renderer/uimanager/primitives.h>
-#include <react/timing/primitives.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
index b10f9da7905a..8ec991bb1d92 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
@@ -9,6 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <vector>
+
 #include <react/renderer/components/root/RootShadowNode.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
index aa439eadd509..579989d8e01f 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
@@ -9,8 +9,13 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTree.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
index b05ab8e4dfef..59a65567baed 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
@@ -9,8 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Timing.h>
+
 #include <react/renderer/components/root/RootShadowNode.h>
-#include "UIManager.h"
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
index 85217a2e6b59..cff6aa3edd83 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
@@ -9,11 +9,6 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <jsi/jsi.h>
-
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/core/RawValue.h>
-
 namespace facebook::react {
 
 class UIManagerNativeAnimatedDelegate {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
index 53f796a808f3..85921394a57a 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
@@ -9,10 +9,14 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/graphics/Float.h>
+#include <React/RendererCore.h>
+
 #include <functional>
+#include <memory>
 #include <optional>
+#include <string>
+
+#include <react/renderer/graphics/Float.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
index adb078351e7d..0a3d8e5f57cd 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
@@ -9,12 +9,21 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/Debug.h>
+#include <React/RendererCore.h>
+
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
-#include <react/debug/react_native_assert.h>
+
+#include <cstddef>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <react/renderer/bridging/bridging.h>
-#include <react/renderer/core/ShadowNode.h>
 
 namespace facebook::react {