Use InteropLayer for ReactART

Summary:
Changelog: [Internal]

Use InteropLayer to bridge ReactART into Fabric.

Reviewed By: shergin

Differential Revision: D21302151

fbshipit-source-id: 46deb381389c6fa87ecad296f616fbaccb29fe30

Libraries/ART/ARTGroup.m

@@ -11,13 +11,19 @@ @implementation ARTGroup
 
 - (void)renderLayerTo:(CGContextRef)context
 {
-
   if (!CGRectIsEmpty(self.clipping)) {
     CGContextClipToRect(context, self.clipping);
   }
 
-  for (ARTNode *node in self.subviews) {
-    [node renderTo:context];
+  for (UIView *subview in self.subviews) {
+    if ([subview respondsToSelector:@selector(renderTo:)]) {
+      [(ARTNode *)subview renderTo:context];
+    } else {
+      // This is needed for legacy interop layer. Legacy interop layer
+      // is superview of the view that it is bridging, that's why we need
+      // to grab its first subview.
+      [(ARTNode *)subview.subviews.firstObject renderTo:context];
+    }
   }
 }
 

Libraries/ART/ARTNode.m

@@ -43,8 +43,10 @@ - (void)setTransform:(CGAffineTransform)transform
 
 - (void)invalidate
 {
-  id<ARTContainer> container = (id<ARTContainer>)self.superview;
-  [container invalidate];
+  if ([self.superview respondsToSelector:@selector(invalidate)]) {
+    id<ARTContainer> container = (id<ARTContainer>)self.superview;
+    [container invalidate];
+  }
 }
 
 - (void)renderTo:(CGContextRef)context

Libraries/ART/ARTSurfaceView.m

@@ -49,8 +49,15 @@ - (void)drawRect:(CGRect)rect
 {
   [super drawRect:rect];
   CGContextRef context = UIGraphicsGetCurrentContext();
-  for (ARTNode *node in self.subviews) {
-    [node renderTo:context];
+  for (UIView *subview in self.subviews) {
+    if ([subview respondsToSelector:@selector(renderTo:)]) {
+      [(ARTNode *)subview renderTo:context];
+    } else {
+      // This is needed for legacy interop layer. Legacy interop layer
+      // is superview of the view that it is bridging, that's why we need
+      // to grab its first subview.
+      [(ARTNode *)subview.subviews.firstObject renderTo:context];
+    }
   }
 }
 

React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm

@@ -36,8 +36,16 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 + (NSMutableSet<NSString *> *)supportedViewManagers
 {
-  static NSMutableSet<NSString *> *supported =
-      [NSMutableSet setWithObjects:@"Picker", @"DatePicker", @"ProgressView", @"SegmentedControl", @"MaskedView", nil];
+  static NSMutableSet<NSString *> *supported = [NSMutableSet setWithObjects:@"Picker",
+                                                                            @"DatePicker",
+                                                                            @"ProgressView",
+                                                                            @"SegmentedControl",
+                                                                            @"MaskedView",
+                                                                            @"ARTSurfaceView",
+                                                                            @"ARTText",
+                                                                            @"ARTShape",
+                                                                            @"ARTGroup",
+                                                                            nil];
   return supported;
 }
 

React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h

@@ -37,7 +37,6 @@ Class<RCTComponentViewProtocol> RCTSliderCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSwitchCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTModalHostViewCls(void) __attribute__((used));
-Class<RCTComponentViewProtocol> RCTARTSurfaceViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTImageCls(void) __attribute__((used));
 
 #ifdef __cplusplus

React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm

@@ -26,7 +26,6 @@
     {"Switch", RCTSwitchCls},
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},
     {"ModalHostView", RCTModalHostViewCls},
-    {"ARTSurfaceView", RCTARTSurfaceViewCls},
     {"Image", RCTImageCls},
   };
 

ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm

@@ -29,6 +29,12 @@
     // If `moduleName` has "FB" prefix.
     return componentName + "Manager";
   }
+
+  std::string artPrefix("ART");
+  if (std::mismatch(artPrefix.begin(), artPrefix.end(), componentName.begin()).first == artPrefix.end()) {
+    return componentName + "Manager";
+  }
+
   return "RCT" + componentName + "Manager";
 }