From 442a15f4356f5527a02181178e93e61a275ad412 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Tue, 29 Sep 2026 00:35:58 -0700 Subject: [PATCH 1/3] 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 #include -#include #include #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 +#include #include #include 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 #include #include -#include - -#ifdef ANDROID -#include -#endif - -#if defined(__APPLE__) && defined(__OBJC__) -#include -#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 +#include #import #import 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 +#include #include From 316f4dce8ce563a6cec5f091b5a6d51287624f76 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Tue, 29 Sep 2026 00:35:58 -0700 Subject: [PATCH 2/3] 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: ``, ``, ``, ``, ``, `` and ``. 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 ++++----- .../react/renderer/imagemanager/ImageRequestParams.h | 2 +- .../react/renderer/imagemanager/ImageRequestParams.h | 2 +- .../renderer/imagemanager/RCTImageManagerProtocol.h | 2 +- .../react/renderer/imagemanager/primitives.h | 10 ++++------ 11 files changed, 19 insertions(+), 23 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 -#include +#include +#include #include #include #include -#include 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 +#include #include #include #include #include #include -#include 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 +#include #include #include -#include #include #include 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 -#include -#include +#include +#include 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 +#include #include #include -#include #include #include #include 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 -#include -#include +#include #include 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 -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include #include 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 -#include +#include 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 -#include +#include 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 -#import +#import #import @protocol RCTImageManagerProtocol diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h index b044ae1071e..ef2c04fe292 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h @@ -12,12 +12,10 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook::react { From aaeae8731e60a685233d0dba779b72f3543234b6 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Tue, 29 Sep 2026 00:35:58 -0700 Subject: [PATCH 3/3] Use umbrellas instead of direct includes in nativemodule/core module (#58711) Summary: Changelog: [Internal] Part of the C++ stable API migration to umbrella includes. The `nativemodule/core` headers included other public modules through their fine-grained, `UmbrellaGuard`-protected headers. They now include those modules' umbrellas instead: ``, `` and ``. This matters most for the iOS `RCTTurboModule*.h` headers, which are exported, have no guard, and are not reached through ``. Includes of the module's own headers and all `.cpp`/`.mm` files are unchanged. No functional change. Differential Revision: D122123056 --- .../react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h | 2 +- .../react/nativemodule/core/ReactCommon/TurboModule.h | 4 ++-- .../react/nativemodule/core/ReactCommon/TurboModuleBinding.h | 2 +- .../react/nativemodule/core/ReactCommon/TurboModuleUtils.h | 2 +- .../core/ReactCommon/TurboModuleWithJSIBindings.h | 2 +- .../core/platform/android/ReactCommon/JavaTurboModule.h | 4 ++-- .../core/platform/ios/ReactCommon/RCTTurboModule.h | 2 +- .../core/platform/ios/ReactCommon/RCTTurboModuleManager.h | 2 +- .../platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h index 024c8cff889..04c5997ade5 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h @@ -9,7 +9,7 @@ #include -#include +#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h index 237868170b1..6bedaa1f704 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h @@ -15,8 +15,8 @@ #include -#include -#include +#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h index 74aee0f7c30..ca0990fd4f6 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h @@ -11,8 +11,8 @@ #include +#include #include -#include #include diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h index 60c730f93cd..f000cda626c 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h @@ -9,8 +9,8 @@ #include +#include #include -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleWithJSIBindings.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleWithJSIBindings.h index 012666fd87a..2e7c42a839c 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleWithJSIBindings.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleWithJSIBindings.h @@ -9,7 +9,7 @@ #include -#include +#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h index a60941880b7..f5c7fde5239 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h @@ -11,10 +11,10 @@ #include -#include +#include +#include #include #include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h index fcd3231c383..95e49ba04e4 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h @@ -12,7 +12,7 @@ #import #import #import -#import +#import #import #import #import diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h index b7f4789ba0e..9496b05483c 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h @@ -12,7 +12,7 @@ #import #import #import -#import +#import #import #import "RCTTurboModule.h" diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h index 6e23cdb2f1b..14a50c8fd8c 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h @@ -8,7 +8,7 @@ #import #ifdef __cplusplus -#include +#include #include #endif