Merge pull request #521 from jflinter/jack-uiresponder-additions

Add UIResponder methods to ASDisplayNode

Author: appleguy

AsyncDisplayKit/ASDisplayNode.h

@@ -432,6 +432,16 @@ typedef CALayer *(^ASDisplayNodeLayerBlock)();
  */
 - (CGRect)convertRect:(CGRect)rect fromNode:(ASDisplayNode *)node;
 
+/** @name UIResponder methods */
+
+// By default these fall through to the underlying view, but can be overridden.
+- (BOOL)canBecomeFirstResponder;                                            // default==NO
+- (BOOL)becomeFirstResponder;                                               // default==NO (no-op)
+- (BOOL)canResignFirstResponder;                                            // default==YES
+- (BOOL)resignFirstResponder;                                               // default==NO (no-op)
+- (BOOL)isFirstResponder;
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender;
+
 @end
 
 

AsyncDisplayKit/ASDisplayNode.mm

@@ -1698,6 +1698,35 @@ - (void)_enqueueAsyncSizingWithSentinel:(ASSentinel *)sentinel completion:(void(
 
 }
 
+- (BOOL)canBecomeFirstResponder {
+    return NO;
+}
+
+- (BOOL)canResignFirstResponder {
+    return YES;
+}
+
+- (BOOL)isFirstResponder {
+    ASDisplayNodeAssertMainThread();
+    return _view != nil && [_view isFirstResponder];
+}
+
+// Note: this implicitly loads the view if it hasn't been loaded yet.
+- (BOOL)becomeFirstResponder {
+    ASDisplayNodeAssertMainThread();
+    return !self.layerBacked && [self canBecomeFirstResponder] && [self.view becomeFirstResponder];
+}
+
+- (BOOL)resignFirstResponder {
+    ASDisplayNodeAssertMainThread();
+    return !self.layerBacked && [self canResignFirstResponder] && [_view resignFirstResponder];
+}
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
+    ASDisplayNodeAssertMainThread();
+    return !self.layerBacked && [self.view canPerformAction:action withSender:sender];
+}
+
 @end
 
 @implementation ASDisplayNode (Debugging)

AsyncDisplayKit/ASEditableTextNode.h

@@ -57,10 +57,10 @@
 - (BOOL)isFirstResponder;
 
 //! @abstract Makes the receiver's text view the first responder.
-- (void)becomeFirstResponder;
+- (BOOL)becomeFirstResponder;
 
 //! @abstract Resigns the receiver's text view from first-responder status, if it has it.
-- (void)resignFirstResponder;
+- (BOOL)resignFirstResponder;
 
 #pragma mark - Geometry
 /**

AsyncDisplayKit/ASEditableTextNode.mm

@@ -352,16 +352,26 @@ - (BOOL)isFirstResponder
   return [_textKitComponents.textView isFirstResponder];
 }
 
-- (void)becomeFirstResponder
+- (BOOL)canBecomeFirstResponder {
+    ASDN::MutexLocker l(_textKitLock);
+    return [_textKitComponents.textView canBecomeFirstResponder];
+}
+
+- (BOOL)becomeFirstResponder
 {
   ASDN::MutexLocker l(_textKitLock);
-  [_textKitComponents.textView becomeFirstResponder];
+  return [_textKitComponents.textView becomeFirstResponder];
+}
+
+- (BOOL)canResignFirstResponder {
+    ASDN::MutexLocker l(_textKitLock);
+    return [_textKitComponents.textView canResignFirstResponder];
 }
 
-- (void)resignFirstResponder
+- (BOOL)resignFirstResponder
 {
   ASDN::MutexLocker l(_textKitLock);
-  [_textKitComponents.textView resignFirstResponder];
+  return [_textKitComponents.textView resignFirstResponder];
 }
 
 #pragma mark - UITextView Delegate

AsyncDisplayKit/Details/_ASDisplayView.mm

@@ -243,6 +243,14 @@ - (void)tintColorDidChange
     [_node tintColorDidChange];
 }
 
+- (BOOL)canBecomeFirstResponder {
+    return [_node canBecomeFirstResponder];
+}
+
+- (BOOL)canResignFirstResponder {
+    return [_node canResignFirstResponder];
+}
+
 - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
 {
   // We forward responder-chain actions to our node if we can't handle them ourselves. See -targetForAction:withSender:.

AsyncDisplayKitTests/ASDisplayNodeTests.m

@@ -71,6 +71,9 @@ @interface ASTestDisplayNode : ASDisplayNode
 @property (atomic, copy) CGSize(^calculateSizeBlock)(ASTestDisplayNode *node, CGSize size);
 @end
 
+@interface ASTestResponderNode : ASTestDisplayNode
+@end
+
 @implementation ASTestDisplayNode
 
 - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
@@ -91,9 +94,57 @@ - (void)dealloc
 @interface UIDisplayNodeTestView : UIView
 @end
 
+@interface UIResponderNodeTestView : _ASDisplayView
+@property(nonatomic) BOOL isFirstResponder;
+@end
+
 @implementation UIDisplayNodeTestView
 @end
 
+@interface ASTestWindow : UIWindow
+@end
+
+@implementation ASTestWindow
+
+- (id)firstResponder {
+  return self.subviews.firstObject;
+}
+
+@end
+
+@implementation ASTestResponderNode
+
++ (Class)viewClass {
+  return [UIResponderNodeTestView class];
+}
+
+- (BOOL)canBecomeFirstResponder {
+  return YES;
+}
+
+@end
+
+@implementation UIResponderNodeTestView
+
+- (BOOL)becomeFirstResponder {
+  self.isFirstResponder = YES;
+  return YES;
+}
+
+- (BOOL)canResignFirstResponder {
+  return YES;
+}
+
+- (BOOL)resignFirstResponder {
+  if (self.isFirstResponder) {
+    self.isFirstResponder = NO;
+    return YES;
+  }
+  return NO;
+}
+
+@end
+
 @interface ASDisplayNodeTests : XCTestCase
 @end
 
@@ -102,6 +153,25 @@ @implementation ASDisplayNodeTests
   dispatch_queue_t queue;
 }
 
+- (void)testOverriddenFirstResponderBehavior {
+  ASTestDisplayNode *node = [[ASTestResponderNode alloc] init];
+  XCTAssertTrue([node canBecomeFirstResponder]);
+  XCTAssertTrue([node becomeFirstResponder]);
+}
+
+- (void)testDefaultFirstResponderBehavior {
+  ASTestDisplayNode *node = [[ASTestDisplayNode alloc] init];
+  XCTAssertFalse([node canBecomeFirstResponder]);
+  XCTAssertFalse([node becomeFirstResponder]);
+}
+
+- (void)testLayerBackedFirstResponderBehavior {
+  ASTestDisplayNode *node = [[ASTestResponderNode alloc] init];
+  node.layerBacked = YES;
+  XCTAssertTrue([node canBecomeFirstResponder]);
+  XCTAssertFalse([node becomeFirstResponder]);
+}
+
 - (void)setUp
 {
   [super setUp];