diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.cpp index a8c21a18718..6662b848918 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.cpp @@ -8,12 +8,31 @@ #include "ImageComponentDescriptor.h" #include +namespace { + +std::shared_ptr getImageManager( + std::shared_ptr& + contextContainer) { + if (auto imageManager = + contextContainer + ->find>( + facebook::react::ImageManagerKey); + imageManager.has_value()) { + return imageManager.value(); + } + return std::make_shared(contextContainer); +} + +} // namespace + namespace facebook::react { +extern const char ImageManagerKey[] = "ImageManager"; + ImageComponentDescriptor::ImageComponentDescriptor( const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters), - imageManager_(std::make_shared(contextContainer_)){}; + imageManager_(getImageManager(contextContainer_)){}; void ImageComponentDescriptor::adopt(ShadowNode& shadowNode) const { ConcreteComponentDescriptor::adopt(shadowNode); diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h index 4be803fa5ff..35bce183c02 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h @@ -14,6 +14,8 @@ namespace facebook::react { class ImageManager; +extern const char ImageManagerKey[]; + /* * Descriptor for component. */