Fix Fabric umbrella search paths (react#58622)

Summary:

Source-built CocoaPods frameworks do not automatically expose the directories behind stable <React/...> umbrella includes. React-FabricComponents exports modal and text headers that consume umbrellas owned by React-Fabric, React-debug, React-rendererdebug, and React-utils. Those headers are also compiled by consuming application targets, which do not inherit React-FabricComponents pod target settings.

Add the owning source directories to React-FabricComponents and propagate the four framework header roots to aggregate targets when RNCore is built from source. Keep prebuilt RNCore unchanged so its <React/...> headers continue to resolve from the prebuilt React.framework.

Changelog: [Internal]

Reviewed By: cipolleschi

Differential Revision: D120992289

Author: coado

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

@@ -33,6 +33,17 @@ if ENV['USE_FRAMEWORKS']
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
   ]
+
+  if ReactNativeCoreUtils.build_rncore_from_source()
+    # Stable umbrellas consumed by exported component headers.
+    header_search_path = header_search_path + [
+      "\"$(PODS_TARGET_SRCROOT)/react/debug\"",
+      "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"",
+      "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
+      "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
+      "\"$(PODS_TARGET_SRCROOT)/react/utils\"",
+    ]
+  end
 end
 
 Pod::Spec.new do |s|

packages/react-native/scripts/cocoapods/__tests__/utils-test.rb

@@ -5,6 +5,7 @@
 
 require "test/unit"
 require_relative "../utils.rb"
+require_relative "../rncore.rb"
 require_relative "./test_utils/PodMock.rb"
 require_relative "./test_utils/InstallerMock.rb"
 require_relative "./test_utils/EnvironmentMock.rb"
@@ -33,6 +34,7 @@ def teardown
         Environment.reset()
         Xcodeproj::Plist.reset()
         XcodebuildMock.reset()
+        ReactNativeCoreUtils.class_variable_set(:@@build_from_source, true)
         ENV['RCT_NEW_ARCH_ENABLED'] = '0'
         ENV['USE_FRAMEWORKS'] = nil
         ENV['RCT_REMOVE_LEGACY_MODULE_INTEROP'] = nil
@@ -741,7 +743,7 @@ def test_updateSearchPaths_whenUseFrameworks_addsSearchPaths
         # Assert
         user_project_mock.build_configurations.each do |config|
             received_search_path = config.build_settings["HEADER_SEARCH_PATHS"]
-            expected_search_path = "$(inherited) ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-renderercss/React_renderercss.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-cxxstableapi/React_cxxstableapi.framework/Headers"
+            expected_search_path = "$(inherited) ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-renderercss/React_renderercss.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-cxxstableapi/React_cxxstableapi.framework/Headers"
             assert_equal(expected_search_path, received_search_path)
         end
 
@@ -921,6 +923,25 @@ def test_creatHeaderSearchPathForFrameworks_whenMultiplePlatformsAndExtraPath_cr
         ], result)
     end
 
+    def test_createHeaderSearchPathsForStableUmbrellas_whenBuildingFromSource_addsOwningFrameworks
+        result = ReactNativePodsUtils.create_header_search_paths_for_stable_umbrellas("PODS_CONFIGURATION_BUILD_DIR")
+
+        assert_equal([
+            "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers",
+            "${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers",
+            "${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers",
+            "${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers",
+        ], result)
+    end
+
+    def test_createHeaderSearchPathsForStableUmbrellas_whenUsingPrebuiltCore_addsNothing
+        ReactNativeCoreUtils.class_variable_set(:@@build_from_source, false)
+
+        result = ReactNativePodsUtils.create_header_search_paths_for_stable_umbrellas("PODS_CONFIGURATION_BUILD_DIR")
+
+        assert_equal([], result)
+    end
+
     # ================================= #
     # TEST - Add RN_BUILDING definition #
     # ================================= #

packages/react-native/scripts/cocoapods/utils.rb

@@ -355,6 +355,19 @@ def self.create_header_search_path_for_frameworks(base_folder, pod_name, framewo
         return search_paths
     end
 
+    def self.create_header_search_paths_for_stable_umbrellas(base_folder)
+        return [] unless ReactNativeCoreUtils.build_rncore_from_source()
+
+        [
+            ["React-Fabric", "React_Fabric"],
+            ["React-debug", "React_debug"],
+            ["React-rendererdebug", "React_rendererdebug"],
+            ["React-utils", "React_utils"],
+        ].flat_map { |pod_name, framework_name|
+            self.create_header_search_path_for_frameworks(base_folder, pod_name, framework_name, [])
+        }
+    end
+
     # Add a new dependency to an existing spec, configuring also the headers search paths
     def self.add_dependency(spec, dependency_name, base_folder_for_frameworks, framework_name, additional_paths: [], version: nil, subspec_dependency: nil)
         # Update Search Path
@@ -397,6 +410,7 @@ def self.update_search_paths(installer)
                         "react/renderer/components/scrollview/platform/cxx",
                         "react/renderer/components/scrollview/platform/ios",
                     ], false))
+                    .concat(ReactNativePodsUtils.create_header_search_paths_for_stable_umbrellas("PODS_CONFIGURATION_BUILD_DIR"))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricComponents", "React_FabricComponents", [
                         "react/renderer/textlayoutmanager/platform/ios",
                         "react/renderer/components/text/platform/cxx",