From 6aa63272dcbe4bfbfe21b175ea7fa84708a4ef66 Mon Sep 17 00:00:00 2001
From: Paige Sun <paigesun@fb.com>
Date: Sat, 22 Aug 2020 01:17:11 -0700
Subject: [PATCH] Create internal Fabric subclass of RCTImageComponentView

Summary: Changelog: [Internal] Create internal Fabric subclass of RCTImageComponentView

Reviewed By: sammy-SC

Differential Revision: D23211115

fbshipit-source-id: 0e756de3f3e555bf212dc88dfc8c32930ac85132
---
 .../ComponentViews/Image/RCTImageComponentView.mm | 15 ++++++++++++---
 .../ComponentViews/RCTFabricComponentsPlugins.h   |  1 -
 .../ComponentViews/RCTFabricComponentsPlugins.mm  |  1 -
 .../ComponentViews/View/RCTViewComponentView.mm   | 15 ++++++++++++---
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index fbef56afa10..e617f20b72c 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -7,6 +7,7 @@
 
 #import "RCTImageComponentView.h"
 
+#import <React/RCTConversions.h>
 #import <React/RCTImageBlurUtils.h>
 #import <React/RCTImageResponseDelegate.h>
 #import <React/RCTImageResponseObserverProxy.h>
@@ -18,9 +19,6 @@
 #import <react/renderer/imagemanager/RCTImageInstrumentationProxy.h>
 #import <react/renderer/imagemanager/RCTImagePrimitivesConversions.h>
 
-#import "RCTConversions.h"
-#import "RCTFabricComponentsPlugins.h"
-
 using namespace facebook::react;
 
 @interface RCTImageComponentView () <RCTImageResponseDelegate>
@@ -209,6 +207,17 @@ using namespace facebook::react;
 
 @end
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Can't the import generated Plugin.h because plugins are not in this BUCK target
+Class<RCTComponentViewProtocol> RCTImageCls(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 Class<RCTComponentViewProtocol> RCTImageCls(void)
 {
   return RCTImageComponentView.class;
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
index fa7984df03a..4f6ea0e8156 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
@@ -36,7 +36,6 @@ Class<RCTComponentViewProtocol> RCTActivityIndicatorViewCls(void) __attribute__(
 Class<RCTComponentViewProtocol> RCTSliderCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSwitchCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));
-Class<RCTComponentViewProtocol> RCTImageCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTParagraphCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTInputAccessoryCls(void) __attribute__((used));
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
index c8bee6acfce..a52c8c06e36 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
@@ -25,7 +25,6 @@ Class<RCTComponentViewProtocol> RCTFabricComponentsProvider(const char *name) {
     {"Slider", RCTSliderCls},
     {"Switch", RCTSwitchCls},
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},
-    {"Image", RCTImageCls},
     {"Paragraph", RCTParagraphCls},
     {"TextInput", RCTTextInputCls},
     {"InputAccessoryView", RCTInputAccessoryCls},
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 1b6c81c1679..e5c7e6a8537 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -9,14 +9,12 @@
 
 #import <React/RCTAssert.h>
 #import <React/RCTBorderDrawing.h>
+#import <React/RCTConversions.h>
 #import <objc/runtime.h>
 #import <react/renderer/components/view/ViewComponentDescriptor.h>
 #import <react/renderer/components/view/ViewEventEmitter.h>
 #import <react/renderer/components/view/ViewProps.h>
 
-#import "RCTConversions.h"
-#import "RCTFabricComponentsPlugins.h"
-
 using namespace facebook::react;
 
 @implementation RCTViewComponentView {
@@ -622,6 +620,17 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
 
 @end
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Can't the import generated Plugin.h because plugins are not in this BUCK target
+Class<RCTComponentViewProtocol> RCTViewCls(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 Class<RCTComponentViewProtocol> RCTViewCls(void)
 {
   return RCTViewComponentView.class;