diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.h b/React/Fabric/Mounting/RCTComponentViewFactory.h index b846634678b..09bfb9ae2f3 100644 --- a/React/Fabric/Mounting/RCTComponentViewFactory.h +++ b/React/Fabric/Mounting/RCTComponentViewFactory.h @@ -14,15 +14,11 @@ NS_ASSUME_NONNULL_BEGIN -@protocol RCTComponentViewFactoryDelegate - /** * Given a component name, return its actual class. If component with doesn't exist, nil is returned. * Can be called on any thread. */ -- (Class)componentViewClassWithName:(facebook::react::ComponentName)name; - -@end +extern "C" Class RCTComponentViewClassWithName(const char *componentName); /** * Registry of supported component view classes that can instantiate @@ -52,8 +48,6 @@ NS_ASSUME_NONNULL_BEGIN - (facebook::react::ComponentDescriptorRegistry::Shared)createComponentDescriptorRegistryWithParameters: (facebook::react::ComponentDescriptorParameters)parameters; -@property (atomic, weak, nullable) id delegate; - @end NS_ASSUME_NONNULL_END diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.mm b/React/Fabric/Mounting/RCTComponentViewFactory.mm index dd1b93da446..95bcb84a19c 100644 --- a/React/Fabric/Mounting/RCTComponentViewFactory.mm +++ b/React/Fabric/Mounting/RCTComponentViewFactory.mm @@ -48,43 +48,40 @@ using namespace facebook::react; auto providerRegistry = &componentViewFactory->_providerRegistry; - providerRegistry->setComponentDescriptorProviderRequest([providerRegistry, - componentViewFactory](ComponentName requestedComponentName) { - // Fallback 1: Call delegate for component view class. - if (componentViewFactory.delegate) { - Class klass = - [componentViewFactory.delegate componentViewClassWithName:requestedComponentName]; - if (klass) { - [componentViewFactory registerComponentViewClass:klass]; - return; - } - } + providerRegistry->setComponentDescriptorProviderRequest( + [providerRegistry, componentViewFactory](ComponentName requestedComponentName) { + // Fallback 1: Call provider function for component view class. + Class klass = RCTComponentViewClassWithName(requestedComponentName); + if (klass) { + [componentViewFactory registerComponentViewClass:klass]; + return; + } - // Fallback 3: Try to use Paper Interop. - if ([RCTLegacyViewManagerInteropComponentView isSupported:RCTNSStringFromString(requestedComponentName)]) { - auto flavor = std::make_shared(requestedComponentName); - auto componentName = ComponentName{flavor->c_str()}; - auto componentHandle = reinterpret_cast(componentName); - auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor; + // Fallback 2: Try to use Paper Interop. + if ([RCTLegacyViewManagerInteropComponentView isSupported:RCTNSStringFromString(requestedComponentName)]) { + auto flavor = std::make_shared(requestedComponentName); + auto componentName = ComponentName{flavor->c_str()}; + auto componentHandle = reinterpret_cast(componentName); + auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor; - providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor}); + providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor}); - componentViewFactory->_componentViewClasses[componentHandle] = [componentViewFactory - _componentViewClassDescriptorFromClass:[RCTLegacyViewManagerInteropComponentView class]]; - return; - } + componentViewFactory->_componentViewClasses[componentHandle] = [componentViewFactory + _componentViewClassDescriptorFromClass:[RCTLegacyViewManagerInteropComponentView class]]; + return; + } - // Fallback 4: Finally use . - auto flavor = std::make_shared(requestedComponentName); - auto componentName = ComponentName{flavor->c_str()}; - auto componentHandle = reinterpret_cast(componentName); - auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor; + // Fallback 3: Finally use . + auto flavor = std::make_shared(requestedComponentName); + auto componentName = ComponentName{flavor->c_str()}; + auto componentHandle = reinterpret_cast(componentName); + auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor; - providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor}); + providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor}); - componentViewFactory->_componentViewClasses[componentHandle] = - [componentViewFactory _componentViewClassDescriptorFromClass:[RCTUnimplementedViewComponentView class]]; - }); + componentViewFactory->_componentViewClasses[componentHandle] = + [componentViewFactory _componentViewClassDescriptorFromClass:[RCTUnimplementedViewComponentView class]]; + }); return componentViewFactory; } diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h index c4d2d5f1371..234d8c5eaae 100644 --- a/React/Fabric/RCTSurfacePresenter.h +++ b/React/Fabric/RCTSurfacePresenter.h @@ -10,7 +10,6 @@ #import #import -#import #import #import @@ -29,8 +28,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithContextContainer:(facebook::react::ContextContainer::Shared)contextContainer runtimeExecutor:(facebook::react::RuntimeExecutor)runtimeExecutor; -@property (nonatomic, readonly) RCTComponentViewFactory *componentViewFactory; - @property (nonatomic) facebook::react::ContextContainer::Shared contextContainer; @property (nonatomic) facebook::react::RuntimeExecutor runtimeExecutor; diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm index cdada30aa80..41868438093 100644 --- a/React/Fabric/RCTSurfacePresenter.mm +++ b/React/Fabric/RCTSurfacePresenter.mm @@ -72,11 +72,6 @@ using namespace facebook::react; return self; } -- (RCTComponentViewFactory *)componentViewFactory -{ - return _mountingManager.componentViewRegistry.componentViewFactory; -} - - (ContextContainer::Shared)contextContainer { std::lock_guard lock(_schedulerMutex); @@ -210,12 +205,12 @@ using namespace facebook::react; - (RCTScheduler *)_createScheduler { - auto componentRegistryFactory = [factory = wrapManagedObject(self.componentViewFactory)]( - EventDispatcher::Weak const &eventDispatcher, - ContextContainer::Shared const &contextContainer) { - return [(RCTComponentViewFactory *)unwrapManagedObject(factory) - createComponentDescriptorRegistryWithParameters:{eventDispatcher, contextContainer}]; - }; + auto componentRegistryFactory = + [factory = wrapManagedObject(_mountingManager.componentViewRegistry.componentViewFactory)]( + EventDispatcher::Weak const &eventDispatcher, ContextContainer::Shared const &contextContainer) { + return [(RCTComponentViewFactory *)unwrapManagedObject(factory) + createComponentDescriptorRegistryWithParameters:{eventDispatcher, contextContainer}]; + }; auto runtimeExecutor = _runtimeExecutor;