diff --git a/React/Fabric/Mounting/ComponentViews/InteropView/RCTLegacyViewManagerInteropComponentView.h b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h similarity index 88% rename from React/Fabric/Mounting/ComponentViews/InteropView/RCTLegacyViewManagerInteropComponentView.h rename to React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h index ed1be3ad2ca..9f025aadc00 100644 --- a/React/Fabric/Mounting/ComponentViews/InteropView/RCTLegacyViewManagerInteropComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h @@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN */ + (BOOL)isSupported:(NSString *)componentName; ++ (void)supportLegacyViewManagerWithName:(NSString *)componentName; + @end NS_ASSUME_NONNULL_END diff --git a/React/Fabric/Mounting/ComponentViews/InteropView/RCTLegacyViewManagerInteropComponentView.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm similarity index 88% rename from React/Fabric/Mounting/ComponentViews/InteropView/RCTLegacyViewManagerInteropComponentView.mm rename to React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm index bc00a5c909f..48287492f1f 100644 --- a/React/Fabric/Mounting/ComponentViews/InteropView/RCTLegacyViewManagerInteropComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm @@ -36,11 +36,21 @@ using namespace facebook::react; return self; } ++ (NSMutableSet *)supportedViewManagers +{ + static NSMutableSet *supported = + [NSMutableSet setWithObjects:@"Picker", @"DatePicker", @"ProgressView", @"SegmentedControl", @"MaskedView", nil]; + return supported; +} + + (BOOL)isSupported:(NSString *)componentName { - static NSSet *supportedComponents = - [NSSet setWithObjects:@"Picker", @"DatePicker", @"ProgressView", @"SegmentedControl", @"MaskedView", nil]; - return [supportedComponents containsObject:componentName]; + return [[RCTLegacyViewManagerInteropComponentView supportedViewManagers] containsObject:componentName]; +} + ++ (void)supportLegacyViewManagerWithName:(NSString *)componentName +{ + [[RCTLegacyViewManagerInteropComponentView supportedViewManagers] addObject:componentName]; } - (RCTLegacyViewManagerInteropCoordinator *)coordinator diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm b/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm index 65c4aefc756..62bbc051624 100644 --- a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm +++ b/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm @@ -17,9 +17,15 @@ namespace facebook { namespace react { -static std::string moduleNameFromComponentName(const std::string &componentName) +static std::string moduleNameFromComponentName(const std::string &moduleName) { - return "RCT" + componentName + "Manager"; + // TODO: remove FB specific code (T56174424) + std::string fbPrefix("FB"); + if (std::mismatch(fbPrefix.begin(), fbPrefix.end(), moduleName.begin()).first == fbPrefix.end()) { + // If `moduleName` has "FB" prefix. + return moduleName + "Manager"; + } + return "RCT" + moduleName + "Manager"; } inline NSString *RCTNSStringFromString(const std::string &string)