From 23564ab44d3af71185bf0f1418b63f00686ca2f1 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 15 Oct 2019 16:12:53 -0700
Subject: [PATCH] Fabric: Enforcing `RCTImageResponseDelegate` conformance

Summary: For `RCTSliderComponentView` the conformance to the protocol wasn't enforced. For `RCTImageComponentView` it was in .h file without a need to be exported.

Reviewed By: sammy-SC

Differential Revision: D17923550

fbshipit-source-id: d98b892d24d9079a7109dc7d881c5c5a175fe3bf
---
 .../ComponentViews/Image/RCTImageComponentView.h       |  5 ++---
 .../ComponentViews/Image/RCTImageComponentView.mm      |  4 ++++
 .../ComponentViews/Slider/RCTSliderComponentView.mm    | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
index 716edc91071..668109c2eb2 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
@@ -5,15 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTImageResponseDelegate.h>
-#import "RCTViewComponentView.h"
+#import <React/RCTViewComponentView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * UIView class for root <Image> component.
  */
-@interface RCTImageComponentView : RCTViewComponentView <RCTImageResponseDelegate>
+@interface RCTImageComponentView : RCTViewComponentView
 
 @end
 
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index a350d81d730..8a8752a4ccf 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/RCTImageResponseDelegate.h>
 #import <React/RCTImageResponseObserverProxy.h>
 #import <react/components/image/ImageComponentDescriptor.h>
 #import <react/components/image/ImageEventEmitter.h>
@@ -17,6 +18,9 @@
 
 #import "RCTConversions.h"
 
+@interface RCTImageComponentView () <RCTImageResponseDelegate>
+@end
+
 @implementation RCTImageComponentView {
   UIImageView *_imageView;
   SharedImageLocalData _imageLocalData;
diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
index 72a6c2ebfe4..40928326462 100644
--- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
@@ -7,6 +7,7 @@
 
 #import "RCTSliderComponentView.h"
 
+#import <React/RCTImageResponseDelegate.h>
 #import <React/RCTImageResponseObserverProxy.h>
 #import <react/components/rncore/EventEmitters.h>
 #import <react/components/rncore/Props.h>
@@ -15,6 +16,9 @@
 
 using namespace facebook::react;
 
+@interface RCTSliderComponentView () <RCTImageResponseDelegate>
+@end
+
 @implementation RCTSliderComponentView {
   UISlider *_sliderView;
   float _previousValue;
@@ -312,7 +316,7 @@ using namespace facebook::react;
 
 #pragma mark - RCTImageResponseDelegate
 
-- (void)didReceiveImage:(UIImage *)image fromObserver:(void *)observer
+- (void)didReceiveImage:(UIImage *)image fromObserver:(void const *)observer
 {
   if (observer == _trackImageResponseObserverProxy.get()) {
     self.trackImage = image;
@@ -325,11 +329,11 @@ using namespace facebook::react;
   }
 }
 
-- (void)didReceiveProgress:(float)progress fromObserver:(void *)observer
+- (void)didReceiveProgress:(float)progress fromObserver:(void const *)observer
 {
 }
 
-- (void)didReceiveFailureFromObserver:(void *)observer
+- (void)didReceiveFailureFromObserver:(void const *)observer
 {
 }