Skip to content

Commit 5a46506

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
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
1 parent 96a89f9 commit 5a46506

5 files changed

Lines changed: 11 additions & 9 deletions

File tree

‎packages/react-native/Package.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ let reactCore = RNTarget(
465465
let reactFabric = RNTarget(
466466
name: .reactFabric,
467467
path: "ReactCommon/react/renderer",
468+
searchPaths: ["ReactCommon/react/renderer/imagemanager/platform/ios"], // ImageProps.h pulls in <React/ImageManager.h>; depending on reactImageManagerApple would be circular
468469
excludedPaths: [
469470
"animated/tests",
470471
"animationbackend/tests",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ Pod::Spec.new do |s|
120120
"\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
121121
"\"$(PODS_TARGET_SRCROOT)/react/renderer/componentregistry\"",
122122
"\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
123+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/imagemanager\"",
124+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/imagemanager/platform/ios\"",
123125
]
124126
end
125127

‎packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ target_link_libraries(react_renderer_animations
2626
react_renderer_graphics
2727
react_renderer_mounting
2828
react_renderer_uimanager
29+
rrc_image
2930
rrc_view
3031
runtimeexecutor
3132
yoga

‎packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111

1212
#include <memory>
1313

14-
#include <react/renderer/core/ComponentDescriptor.h>
15-
#include <react/renderer/core/EventDispatcher.h>
16-
#include <react/utils/ContextContainer.h>
17-
18-
#include "ComponentDescriptorRegistry.h"
14+
#include <React/ComponentRegistry.h>
15+
#include <React/RendererCore.h>
16+
#include <React/Utils.h>
1917

2018
namespace facebook::react {
2119

‎packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include <optional>
1313
#include <string>
1414

15-
#include <react/renderer/components/view/ViewProps.h>
16-
#include <react/renderer/core/PropsParserContext.h>
17-
#include <react/renderer/graphics/Color.h>
18-
#include <react/renderer/imagemanager/primitives.h>
15+
#include <React/Graphics.h>
16+
#include <React/ImageManager.h>
17+
#include <React/RendererCore.h>
18+
#include <React/View.h>
1919

2020
namespace facebook::react {
2121

0 commit comments

Comments
 (0)