From 190700aba113954610b57d154f4b720a1d0d50ac Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <piaseckijakub@meta.com>
Date: Tue, 13 Oct 2026 06:00:01 -0700
Subject: [PATCH] Use umbrella headers in ImageProps.h and
 ComponentDescriptorFactory.h (#59025)

Summary:

"For frameworks" headers `ImageProps.h` and `ComponentDescriptorFactory.h` included public module headers directly, so including them under `RN_STRICT_API` failed the umbrella guard. They now include `<React/*.h>` umbrellas instead. `react_renderer_animations` now links `rrc_image` so `<React/ImageManager.h>` is on its CMake include path.

Changelog: [Internal]

Differential Revision: D124947284
---
 packages/react-native/Package.swift                       | 1 +
 packages/react-native/ReactCommon/React-Fabric.podspec    | 2 ++
 .../ReactCommon/react/renderer/animations/CMakeLists.txt  | 1 +
 .../componentregistry/ComponentDescriptorFactory.h        | 8 +++-----
 .../react/renderer/components/image/ImageProps.h          | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift
index da76a10ac812..a2fbc5d3457f 100644
--- a/packages/react-native/Package.swift
+++ b/packages/react-native/Package.swift
@@ -465,6 +465,7 @@ let reactCore = RNTarget(
 let reactFabric = RNTarget(
   name: .reactFabric,
   path: "ReactCommon/react/renderer",
+  searchPaths: ["ReactCommon/react/renderer/imagemanager/platform/ios"], // ImageProps.h pulls in <React/ImageManager.h>; depending on reactImageManagerApple would be circular
   excludedPaths: [
     "animated/tests",
     "animationbackend/tests",
diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index ce02f4138872..90d2155ede9d 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -120,6 +120,8 @@ Pod::Spec.new do |s|
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/componentregistry\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/imagemanager\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/imagemanager/platform/ios\"",
       ]
     end
 
diff --git a/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt
index 377d8de9e265..8c423fa85e36 100644
--- a/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt
+++ b/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(react_renderer_animations
         react_renderer_graphics
         react_renderer_mounting
         react_renderer_uimanager
+        rrc_image
         rrc_view
         runtimeexecutor
         yoga
diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h
index 81bdccd2dad6..53e53df82dfa 100644
--- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h
+++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h
@@ -11,11 +11,9 @@
 
 #include <memory>
 
-#include <react/renderer/core/ComponentDescriptor.h>
-#include <react/renderer/core/EventDispatcher.h>
-#include <react/utils/ContextContainer.h>
-
-#include "ComponentDescriptorRegistry.h"
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
index 47db7c7ef787..592cb1e3c0c4 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -12,10 +12,10 @@
 #include <optional>
 #include <string>
 
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/imagemanager/primitives.h>
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
+#include <React/View.h>
 
 namespace facebook::react {