Use public umbrellas in root headers (#58575)

Summary:

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

Ensure CocoaPods dynamic-framework builds can resolve those entry points both while compiling React-Fabric and from downstream consumers. The root subspec selects the core and view umbrella subspecs so their headers are packaged, while framework header search paths live on the top-level pod target because exported root headers are also compiled from sibling subspecs such as mounting.

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

Author: coado

packages/react-native/ReactCommon/React-Fabric.podspec

@@ -18,6 +18,27 @@ end
 
 react_native_path = ".."
 
+header_search_path = [
+  "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
+  "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+  "\"$(PODS_TARGET_SRCROOT)\""
+]
+
+if ENV['USE_FRAMEWORKS']
+  header_search_path = header_search_path + [
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/legacyviewmanagerinterop/platform/ios\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
+    "\"$(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/core\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
+  ]
+end
+
 Pod::Spec.new do |s|
   s.name                   = "React-Fabric"
   s.version                = version
@@ -30,7 +51,8 @@ Pod::Spec.new do |s|
   s.source_files           = podspec_sources("dummyFile.cpp", "")
   s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
                             "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
-                            "DEFINES_MODULE" => "YES" }
+                            "DEFINES_MODULE" => "YES",
+                            "HEADER_SEARCH_PATHS" => header_search_path.join(" ") }
 
   resolve_use_frameworks(s, header_mappings_dir: "./", module_name: "React_Fabric")
 
@@ -89,32 +111,9 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "core" do |ss|
-    header_search_path = [
-      "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
-      "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
-      "\"$(PODS_TARGET_SRCROOT)\""
-    ]
-
-    if ENV['USE_FRAMEWORKS']
-      header_search_path = header_search_path + [
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/legacyviewmanagerinterop/platform/ios\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
-        "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
-      ]
-    end
-
     ss.source_files         = podspec_sources("react/renderer/core/**/*.{m,mm,cpp,h}", "react/renderer/core/**/*.{h}")
     ss.exclude_files        = ["react/renderer/core/tests", "react/renderer/core/React"]
     ss.header_dir           = "react/renderer/core"
-    ss.pod_target_xcconfig  = {
-      "HEADER_SEARCH_PATHS" => header_search_path.join(" ")
-    }
   end
 
   s.subspec "coreUmbrella" do |ss|
@@ -141,6 +140,8 @@ Pod::Spec.new do |s|
 
   s.subspec "components" do |ss|
     ss.subspec "root" do |sss|
+      sss.dependency             "React-Fabric/coreUmbrella"
+      sss.dependency             "React-Fabric/components/viewUmbrella"
       sss.source_files         = podspec_sources("react/renderer/components/root/**/*.{m,mm,cpp,h}", "react/renderer/components/root/**/*.{h}")
       sss.exclude_files        = "react/renderer/components/root/tests"
       sss.header_dir           = "react/renderer/components/root"

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 {
 

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 {
 

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 {
 

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',
       },