diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index da76a10ac81..a2fbc5d3457 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 ; 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 ce02f413887..90d2155ede9 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 377d8de9e26..8c423fa85e3 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 81bdccd2dad..53e53df82df 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 -#include -#include -#include - -#include "ComponentDescriptorRegistry.h" +#include +#include +#include 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 47db7c7ef78..592cb1e3c0c 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 #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook::react {