Removed NSObject (CKComponentDelegateProxy)

Summary: Remove ObjC categories so we can strip dead code

Reviewed By: cuva

Differential Revision: D14683303

fbshipit-source-id: 022ef7de7e8be70559221acbf3c81cdf7ad0c6a3

Author: Andrey Mishanin

ComponentKit/Utilities/CKComponentDelegateAttribute.mm

@@ -17,12 +17,6 @@
 #import "CKComponent+UIView.h"
 #import "CKComponentSubclass.h"
 
-@interface UIView (CKDelegateProxy)
-
-@property (nonatomic, strong, setter=ck_setDelegateProxy:) CKComponentDelegateForwarder *ck_delegateProxy;
-
-@end
-
 CKComponentViewAttributeValue CKComponentDelegateAttribute(SEL selector,
                                                            CKComponentForwardedSelectors selectors) noexcept
 {
@@ -43,12 +37,12 @@ CKComponentViewAttributeValue CKComponentDelegateAttribute(SEL selector,
 
         // Create a proxy for this set of selectors
 
-        CKCAssertNil(view.ck_delegateProxy,
-                     @"Unsupported: registered two delegate proxies for the same view: %@ %@", view, view.ck_delegateProxy);
+        CKCAssertNil(CKDelegateProxyForObject(view),
+                     @"Unsupported: registered two delegate proxies for the same view: %@ %@", view, CKDelegateProxyForObject(view));
 
         CKComponentDelegateForwarder *proxy = [CKComponentDelegateForwarder newWithSelectors:selectors];
         proxy.view = view;
-        view.ck_delegateProxy = proxy;
+        CKSetDelegateProxyForObject(view, proxy);
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
@@ -59,9 +53,9 @@ CKComponentViewAttributeValue CKComponentDelegateAttribute(SEL selector,
       ^(UIView *view, id value){
 
         // When unapplied, remove association with the view
-        CKComponentDelegateForwarder *proxy = view.ck_delegateProxy;
+        CKComponentDelegateForwarder *proxy = CKDelegateProxyForObject(view);
         proxy.view = nil;
-        view.ck_delegateProxy = nil;
+        CKSetDelegateProxyForObject(view, nil);
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"

ComponentKit/Utilities/CKComponentDelegateForwarder.h

@@ -29,20 +29,20 @@ std::string CKIdentifierFromDelegateForwarderSelectors(const CKComponentForwarde
 /**
  This initializer will make an object that forwards calls to the given selectors on to the component, and its nextResponder, etc.
  */
-+ (instancetype)newWithSelectors:(CKComponentForwardedSelectors)selectors;
++ (instancetype _Nullable)newWithSelectors:(CKComponentForwardedSelectors)selectors;
 
 /**
  The view is used to find out where to start looking in the component responder chain.
 
  The forwarder will call [CKMountedComponentForView(view) targetForAction: withSender:] to proxy to the responder chain, so this needs to be accurate when you mount/unmount.
  */
-@property (nonatomic, weak) UIView *view;
+@property (nonatomic, weak) UIView * _Nullable view;
 
 @end
 
+NS_ASSUME_NONNULL_BEGIN
 
-@interface NSObject (CKComponentDelegateProxy)
+auto CKDelegateProxyForObject(NSObject *obj) -> CKComponentDelegateForwarder *_Nullable;
+auto CKSetDelegateProxyForObject(NSObject *obj, CKComponentDelegateForwarder *_Nullable delegateProxy) -> void;
 
-@property (nonatomic, strong, setter=ck_setDelegateProxy:) CKComponentDelegateForwarder *ck_delegateProxy;
-
-@end
+NS_ASSUME_NONNULL_END

ComponentKit/Utilities/CKComponentDelegateForwarder.mm

@@ -113,18 +113,14 @@ static BOOL selectorInList(SEL selector, const CKComponentForwardedSelectors &se
 
 @end
 
-@implementation NSObject (CKComponentDelegateForwarder)
-
 static const char kCKComponentDelegateProxyKey = ' ';
 
-- (CKComponentDelegateForwarder *)ck_delegateProxy
+auto CKDelegateProxyForObject(NSObject *obj) -> CKComponentDelegateForwarder *
 {
-  return objc_getAssociatedObject(self, &kCKComponentDelegateProxyKey);
+  return objc_getAssociatedObject(obj, &kCKComponentDelegateProxyKey);
 }
 
-- (void)ck_setDelegateProxy:(CKComponentDelegateForwarder *)delegateProxy
+auto CKSetDelegateProxyForObject(NSObject *obj, CKComponentDelegateForwarder *delegateProxy) -> void
 {
-  objc_setAssociatedObject(self, &kCKComponentDelegateProxyKey, delegateProxy, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  objc_setAssociatedObject(obj, &kCKComponentDelegateProxyKey, delegateProxy, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
-
-@end

ComponentKit/Utilities/CKComponentGestureActions.mm

@@ -141,7 +141,7 @@ CKComponentViewAttributeValue CKComponentGestureAttribute(Class gestureRecognize
           proxy.view = view;
           gestureRecognizer.delegate = (id<UIGestureRecognizerDelegate>)proxy;
           // This will retain it
-          gestureRecognizer.ck_delegateProxy = proxy;
+          CKSetDelegateProxyForObject(gestureRecognizer, proxy);
         }
         [view addGestureRecognizer:gestureRecognizer];
       },
@@ -156,10 +156,10 @@ CKComponentViewAttributeValue CKComponentGestureAttribute(Class gestureRecognize
 
         // Tear down delegate proxying if applicable
         if (delegateSelectors.size() > 0) {
-          CKComponentDelegateForwarder *proxy = recognizer.ck_delegateProxy;
+          CKComponentDelegateForwarder *proxy = CKDelegateProxyForObject(recognizer);
           proxy.view = nil;
           recognizer.delegate = nil;
-          recognizer.ck_delegateProxy = nil;
+          CKSetDelegateProxyForObject(recognizer, nil);
         }
         reusePool->recycle(recognizer);
       }