From eda8311a499b85194c3f9a134df95ea5fc3dd25a Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <piaseckijakub@meta.com>
Date: Tue, 29 Sep 2026 00:18:28 -0700
Subject: [PATCH] Make select graphics and debug implementation headers private

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 7780c7af94ba..549ea9b75386 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 e723e7ae7dae..b95d5b3685af 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 1301e24a9d4d..fc097b2fe9b7 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 bfd96f122819..b0fe8547cd09 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 b5f93f2891f5..eea8010b503a 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>