From e0910f3206175dea320e59c9758d4c393d32f39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= <maleckidawid@meta.com>
Date: Tue, 22 Sep 2026 07:52:10 -0700
Subject: [PATCH 1/2] Use public umbrellas in text headers (#58571)

Summary:

Route public C++ dependencies through their supported umbrella entry points so framework consumers can use the text module with strict API enforcement enabled.

Changelog: [Internal]

Reviewed By: cortinico

Differential Revision: D120529435
---
 .../components/text/BaseParagraphComponentDescriptor.h    | 4 ++--
 .../react/renderer/components/text/BaseParagraphProps.h   | 8 ++------
 .../react/renderer/components/text/BaseTextProps.h        | 3 +--
 .../renderer/components/text/ParagraphEventEmitter.h      | 2 +-
 .../react/renderer/components/text/ParagraphShadowNode.h  | 5 ++---
 .../renderer/components/text/RawTextComponentDescriptor.h | 2 +-
 .../react/renderer/components/text/RawTextProps.h         | 5 ++---
 .../react/renderer/components/text/RawTextShadowNode.h    | 2 +-
 .../renderer/components/text/TextComponentDescriptor.h    | 2 +-
 .../components/text/TextEffectComponentDescriptor.h       | 2 +-
 .../react/renderer/components/text/TextEffectProps.h      | 3 +--
 .../react/renderer/components/text/TextEffectShadowNode.h | 4 ++--
 .../react/renderer/components/text/TextProps.h            | 3 +--
 .../react/renderer/components/text/TextShadowNode.h       | 4 ++--
 .../renderer/components/text/HostPlatformParagraphProps.h | 5 +----
 .../react/renderer/components/text/ParagraphState.h       | 4 ++--
 .../android/react/renderer/components/text/conversions.h  | 3 +--
 .../cxx/react/renderer/components/text/ParagraphState.h   | 2 +-
 .../react/renderer/components/text/stateConversions.h     | 3 +--
 19 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
index 0685a5e8eb60..2a28c775e07f 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
@@ -9,9 +9,9 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
index d5bb11aeb258..c1452d80d825 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
@@ -9,14 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <limits>
-#include <memory>
-
+#include <React/RendererCore.h>
+#include <React/View.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/components/text/BaseTextProps.h>
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
index ac8cfc0931cb..70a5cfd0d8bf 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
@@ -9,9 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
index a24323496b22..4945aa7a5d53 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/components/view/ViewEventEmitter.h>
+#include <React/View.h>
 #include <react/renderer/textlayoutmanager/TextMeasureCache.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
index adc375d94de0..5d0537d363df 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
@@ -9,13 +9,12 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/View.h>
 #include <react/renderer/components/text/BaseTextShadowNode.h>
 #include <react/renderer/components/text/ParagraphEventEmitter.h>
 #include <react/renderer/components/text/ParagraphProps.h>
 #include <react/renderer/components/text/ParagraphState.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/core/LayoutContext.h>
-#include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManagerExtended.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
index cca375e86f37..b27851831bb3 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/text/RawTextShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
index 5e01570b4f2d..d252620f5732 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
@@ -11,9 +11,8 @@
 
 #include <memory>
 
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
+#include <React/RendererCore.h>
+#include <React/RendererDebug.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
index d30e4e92bf6d..3dcc6a7a09e8 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/text/RawTextProps.h>
-#include <react/renderer/core/ConcreteShadowNode.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
index 589f2cbb721a..af5a8b75a97b 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/text/TextShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h
index 51b3b6bd666c..bad29de8b0db 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/text/TextEffectShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h
index b3129b903a73..a2fad67688f7 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h
@@ -9,9 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <folly/dynamic.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h
index a23f3fe8a2e6..361a1c93db72 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h
@@ -9,9 +9,9 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/View.h>
 #include <react/renderer/components/text/TextEffectProps.h>
-#include <react/renderer/components/view/ViewEventEmitter.h>
-#include <react/renderer/core/ConcreteShadowNode.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
index eba82ae0f678..684788309c06 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
@@ -9,10 +9,9 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextProps.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h
index 3b01c7f5d6e6..e636378b5a00 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h
@@ -11,10 +11,10 @@
 
 #include <limits>
 
+#include <React/RendererCore.h>
+#include <React/View.h>
 #include <react/renderer/components/text/BaseTextShadowNode.h>
 #include <react/renderer/components/text/TextProps.h>
-#include <react/renderer/components/view/ViewEventEmitter.h>
-#include <react/renderer/core/ConcreteShadowNode.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h
index f3e30191b30e..62e8ae954599 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h
@@ -9,14 +9,11 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <limits>
-#include <memory>
 #include <optional>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/text/BaseParagraphProps.h>
 #include <react/renderer/components/text/primitives.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h
index 1f79987a1d84..4b22132e20de 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h
@@ -9,7 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/debug/react_native_assert.h>
+#include <React/Debug.h>
+#include <React/MapBuffer.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
@@ -17,7 +18,6 @@
 
 #include <fbjni/fbjni.h>
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
 
 #include <utility>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h
index 0e8c8dd560a8..2be0d9f1fcb4 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h
@@ -9,9 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/text/primitives.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/RawValue.h>
 #include <string>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h
index 3b351aee9843..07783b401366 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/debug/react_native_assert.h>
+#include <React/Debug.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h b/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h
index 510bd2fe0c0a..6179b40313a5 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h
@@ -12,8 +12,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/ParagraphState.h>
 #ifdef RN_SERIALIZABLE_STATE
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#include <React/MapBuffer.h>
 #endif
 
 namespace facebook::react {

From 7e04f6cf9c338e13dedee8a32e437e872880731a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= <maleckidawid@meta.com>
Date: Tue, 22 Sep 2026 07:52:10 -0700
Subject: [PATCH 2/2] Use public umbrellas in root headers

Summary:
Route public C++ dependencies through their supported umbrella entry points so framework consumers can use the root module with strict API enforcement enabled.

Stage the iOS ImageRequestParams header under its canonical imagemanager include path in the prebuilt header inventory. The public ImageManager umbrella exposes this platform-specific type transitively, so framework builds need it alongside the root imagemanager headers.

Changelog:
[Internal]

Reviewed By: cortinico

Differential Revision: D120532145
---
 .../renderer/components/root/RootComponentDescriptor.h    | 2 +-
 .../react/renderer/components/root/RootProps.h            | 8 ++------
 .../react/renderer/components/root/RootShadowNode.h       | 5 ++---
 .../react-native/scripts/ios-prebuild/headers-config.js   | 5 ++++-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
index 07309a87af5d..91868c76ce77 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <react/renderer/components/root/RootShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
index 5a43e19ac606..9914e3b9839f 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
@@ -9,12 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <memory>
-
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/core/LayoutContext.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
+#include <React/View.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h
index fa980b713d23..e3dc6d0b7eab 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h
@@ -11,10 +11,9 @@
 
 #include <memory>
 
+#include <React/RendererCore.h>
+#include <React/View.h>
 #include <react/renderer/components/root/RootProps.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/core/LayoutContext.h>
-#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/scripts/ios-prebuild/headers-config.js b/packages/react-native/scripts/ios-prebuild/headers-config.js
index de50c9938788..bd4f5fa955f0 100644
--- a/packages/react-native/scripts/ios-prebuild/headers-config.js
+++ b/packages/react-native/scripts/ios-prebuild/headers-config.js
@@ -185,7 +185,10 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
 
       {
         name: 'imagemanager',
-        headerPatterns: ['react/renderer/imagemanager/*.h'],
+        headerPatterns: [
+          'react/renderer/imagemanager/*.h',
+          'react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h',
+        ],
         headerDir: 'react/renderer/imagemanager',
       },