From b677f7495ebcb696fbb7435ec656f2b9da6039d7 Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <piaseckijakub@meta.com>
Date: Tue, 29 Sep 2026 01:56:18 -0700
Subject: [PATCH 1/2] Make select graphics and debug implementation headers
 private (#58714)

Summary:

Changelog: [Internal]

Mark `rounding.h` and `debugStringConvertibleUtils.h` as private, and mark `RCTPlatformColorUtils.h` (iOS and macOS) as for-frameworks. Stop re-exporting them (and `configurePlatformColorCacheInvalidationHook.h`) from the `React/Graphics.h` and `React/RendererDebug.h` umbrellas. These are implementation helpers, not public API. `RCTPlatformColorUtils.h` stays reachable by direct include because for-frameworks inline helpers such as `RCTUIColorFromSharedColor` call into it.

Reviewed By: cipolleschi

Differential Revision: D122131841
---
 .../react/renderer/debug/React/RendererDebug.h           | 1 -
 .../react/renderer/debug/debugStringConvertibleUtils.h   | 2 +-
 .../ReactCommon/react/renderer/graphics/React/Graphics.h | 9 ---------
 .../ios/react/renderer/graphics/RCTPlatformColorUtils.h  | 2 +-
 .../ReactCommon/react/renderer/graphics/rounding.h       | 2 +-
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h b/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
index 7780c7af94b..549ea9b7538 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
@@ -32,7 +32,6 @@
 
 #include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
-#include <react/renderer/debug/debugStringConvertibleUtils.h>
 #include <react/renderer/debug/flags.h>
 
 #undef RN_UMBRELLA_CONTEXT
diff --git a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
index e723e7ae7da..b95d5b3685a 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/PrivateGuard.h>
 
 #include <memory>
 #include <optional>
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h b/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
index 1301e24a9d4..fc097b2fe9b 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
@@ -53,15 +53,6 @@
 #include <react/renderer/graphics/ValueUnit.h>
 #include <react/renderer/graphics/Vector.h>
 #include <react/renderer/graphics/fromRawValueShared.h>
-#include <react/renderer/graphics/rounding.h>
-
-#ifdef ANDROID
-#include <react/renderer/graphics/configurePlatformColorCacheInvalidationHook.h>
-#endif
-
-#if defined(__APPLE__) && defined(__OBJC__)
-#include <react/renderer/graphics/RCTPlatformColorUtils.h>
-#endif
 
 #undef RN_UMBRELLA_CONTEXT
 #pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
index bfd96f12281..b0fe8547cd0 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #import <UIKit/UIKit.h>
 #import <vector>
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h b/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
index b5f93f2891f..eea8010b503 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/PrivateGuard.h>
 
 #include <react/renderer/graphics/Float.h>
 

From ae429853a5420406e26f77379bcb3a0181f36dea Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <piaseckijakub@meta.com>
Date: Tue, 29 Sep 2026 01:56:18 -0700
Subject: [PATCH 2/2] Use umbrellas instead of direct includes in
 renderer/imagemanager module (#58708)

Summary:

Changelog: [Internal]

Part of the C++ stable API migration to umbrella includes. The `renderer/imagemanager` headers included other public modules through their fine-grained, `UmbrellaGuard`-protected headers. They now include those modules' umbrellas instead: `<React/RendererCore.h>`, `<React/Utils.h>`, `<React/Graphics.h>`, `<React/Debug.h>`, `<React/RendererDebug.h>`, `<React/FeatureFlags.h>` and `<React/MapBuffer.h>`.

Includes of the module's own headers and all `.cpp`/`.mm` files are unchanged. No functional change.

Differential Revision: D122119728
---
 .../react/renderer/imagemanager/ImageManager.h           | 4 ++--
 .../react/renderer/imagemanager/ImageRequest.h           | 2 +-
 .../imagemanager/ImageResponseObserverCoordinator.h      | 2 +-
 .../react/renderer/imagemanager/ImageTelemetry.h         | 4 ++--
 .../android/react/renderer/imagemanager/ImageFetcher.h   | 2 +-
 .../react/renderer/imagemanager/ImageRequestParams.h     | 3 +--
 .../android/react/renderer/imagemanager/conversions.h    | 9 ++++-----
 .../cxx/react/renderer/imagemanager/ImageRequestParams.h | 2 +-
 .../ios/react/renderer/imagemanager/ImageRequestParams.h | 2 +-
 .../renderer/imagemanager/RCTImageManagerProtocol.h      | 2 +-
 .../ReactCommon/react/renderer/imagemanager/primitives.h | 9 ++++-----
 11 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h
index c240b656da8..e72791d013a 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h
@@ -11,11 +11,11 @@
 
 #include <memory>
 
-#include <react/renderer/core/ReactPrimitives.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/imagemanager/ImageRequest.h>
 #include <react/renderer/imagemanager/ImageRequestParams.h>
 #include <react/renderer/imagemanager/primitives.h>
-#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h
index db67cde3d1f..c8b87da7f06 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h
@@ -9,12 +9,12 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <React/Utils.h>
 #include <react/renderer/imagemanager/ImageResponse.h>
 #include <react/renderer/imagemanager/ImageResponseObserver.h>
 #include <react/renderer/imagemanager/ImageResponseObserverCoordinator.h>
 #include <react/renderer/imagemanager/ImageTelemetry.h>
 #include <react/renderer/imagemanager/primitives.h>
-#include <react/utils/SharedFunction.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h
index f92a7a939f2..b605478f7a7 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h
@@ -9,9 +9,9 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <React/Utils.h>
 #include <react/renderer/imagemanager/ImageResponse.h>
 #include <react/renderer/imagemanager/ImageResponseObserver.h>
-#include <react/utils/SharedFunction.h>
 
 #include <memory>
 #include <mutex>
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
index 90a1d9b84e2..d8a566d846d 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/utils/Telemetry.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h
index 7b7aa318c6f..14ee1630452 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h
@@ -9,9 +9,9 @@
 
 #include <react/cxxstableapi/PrivateGuard.h>
 
+#include <React/Utils.h>
 #include <react/renderer/imagemanager/ImageRequest.h>
 #include <react/renderer/imagemanager/ImageRequestParams.h>
-#include <react/utils/ContextContainer.h>
 #include <memory>
 #include <mutex>
 #include <unordered_map>
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h
index 4a9fac49a22..42df8cecf01 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h
@@ -11,8 +11,7 @@
 
 #include <utility>
 
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Float.h>
+#include <React/Graphics.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h
index 21692968254..f004c5a0db9 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h
@@ -9,13 +9,12 @@
 
 #include <react/cxxstableapi/PrivateGuard.h>
 
-#include <react/featureflags/ReactNativeFeatureFlags.h>
-#include <react/renderer/core/graphicsConversions.h>
+#include <React/FeatureFlags.h>
+#include <React/MapBuffer.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/imagemanager/ImageRequestParams.h>
 #include <react/renderer/imagemanager/primitives.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#include <react/utils/to_underlying.h>
 #include <vector>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h
index a0df53c9770..1a78606ddf4 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
-#include <react/renderer/graphics/Float.h>
+#include <React/Graphics.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h
index 417f0d73c99..dd7ae8f7cf6 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
-#include <react/renderer/graphics/Float.h>
+#include <React/Graphics.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h
index 30bfbf391e3..408b6c45b9a 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h
@@ -6,7 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <react/renderer/core/ReactPrimitives.h>
+#import <React/RendererCore.h>
 #import <react/renderer/imagemanager/ImageRequest.h>
 
 @protocol RCTImageManagerProtocol <NSObject>
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
index b044ae1071e..2743da4430e 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
@@ -12,12 +12,11 @@
 #include <string>
 #include <vector>
 
-#include <react/debug/react_native_assert.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Debug.h>
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
+#include <React/RendererDebug.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-#include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/Size.h>
 
 namespace facebook::react {