diff --git a/React/Base/RCTKeyCommands.m b/React/Base/RCTKeyCommands.m index 449d5f4b231..83385f82439 100644 --- a/React/Base/RCTKeyCommands.m +++ b/React/Base/RCTKeyCommands.m @@ -18,10 +18,10 @@ @interface UIEvent (UIPhysicalKeyboardEvent) -@property (nonatomic) NSString *_modifiedEventInput; +@property (nonatomic) NSString *_modifiedInput; @property (nonatomic) NSString *_unmodifiedInput; -@property (nonatomic) UIKeyModifierFlags _modifierEventFlags; -@property (nonatomic) BOOL _isKeyEventDown; +@property (nonatomic) UIKeyModifierFlags _modifierFlags; +@property (nonatomic) BOOL _isKeyDown; @property (nonatomic) long _keyCode; @end @@ -116,16 +116,16 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init) UIKeyModifierFlags modifierFlags = 0; BOOL isKeyDown = NO; - if ([event respondsToSelector:@selector(_modifiedEventInput)]) { - modifiedInput = [event _modifiedEventInput]; + if ([event respondsToSelector:@selector(_modifiedInput)]) { + modifiedInput = [event _modifiedInput]; } - if ([event respondsToSelector:@selector(_modifierEventFlags)]) { - modifierFlags = [event _modifierEventFlags]; + if ([event respondsToSelector:@selector(_modifierFlags)]) { + modifierFlags = [event _modifierFlags]; } - if ([event respondsToSelector:@selector(_isKeyEventDown)]) { - isKeyDown = [event _isKeyEventDown]; + if ([event respondsToSelector:@selector(_isKeyDown)]) { + isKeyDown = [event _isKeyDown]; } BOOL interactionEnabled = !UIApplication.sharedApplication.isIgnoringInteractionEvents; diff --git a/React/DevSupport/RCTPackagerClient.h b/React/DevSupport/RCTPackagerClient.h index c012d4ea90a..6dea84f358a 100644 --- a/React/DevSupport/RCTPackagerClient.h +++ b/React/DevSupport/RCTPackagerClient.h @@ -25,7 +25,7 @@ extern const int RCT_PACKAGER_CLIENT_PROTOCOL_VERSION; @protocol RCTPackagerClientMethod - (void)handleRequest:(NSDictionary *)params withResponder:(RCTPackagerClientResponder *)responder; -- (void)handlePackageNotification:(NSDictionary *)params; +- (void)handleNotification:(NSDictionary *)params; @optional diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm index 10e48bf6d64..199f8ac42ad 100644 --- a/React/DevSupport/RCTPackagerConnection.mm +++ b/React/DevSupport/RCTPackagerConnection.mm @@ -210,7 +210,7 @@ static void eraseRegistrationsWithToken(std::vector> ®i [self addNotificationHandler:^(NSDictionary *notification) { - [handler handlePackageNotification:notification]; + [handler handleNotification:notification]; } queue:queue forMethod:method];