Skip to content

Commit 6fcb878

Browse files
javachefacebook-github-bot
authored andcommitted
Back out "fixed SDK issue while uploading app in debug scheme"
Summary: Original commit changeset: 78387999f94e Original Phabricator Diff: D34392529 (086c13d) Backing this out because it breaks univeral hot reload support. We should probably find a way to support this *without* relying on swizzling. This was originally backed out it because it was blocking app store submission, but this is gated by `RN_DEV` so should never be included in a release build. Changelog: [General][Removed] - The diffs renames the required variable which was causing conflicts in names with Apple core SDK's Reviewed By: cipolleschi Differential Revision: D37311377 fbshipit-source-id: 18abb1b53a5be054098cd3717705ea5086c4f595
1 parent e5f7e40 commit 6fcb878

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

React/Base/RCTKeyCommands.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
@interface UIEvent (UIPhysicalKeyboardEvent)
2020

21-
@property (nonatomic) NSString *_modifiedEventInput;
21+
@property (nonatomic) NSString *_modifiedInput;
2222
@property (nonatomic) NSString *_unmodifiedInput;
23-
@property (nonatomic) UIKeyModifierFlags _modifierEventFlags;
24-
@property (nonatomic) BOOL _isKeyEventDown;
23+
@property (nonatomic) UIKeyModifierFlags _modifierFlags;
24+
@property (nonatomic) BOOL _isKeyDown;
2525
@property (nonatomic) long _keyCode;
2626

2727
@end
@@ -116,16 +116,16 @@ - (void)handleKeyUIEventSwizzle:(UIEvent *)event
116116
UIKeyModifierFlags modifierFlags = 0;
117117
BOOL isKeyDown = NO;
118118

119-
if ([event respondsToSelector:@selector(_modifiedEventInput)]) {
120-
modifiedInput = [event _modifiedEventInput];
119+
if ([event respondsToSelector:@selector(_modifiedInput)]) {
120+
modifiedInput = [event _modifiedInput];
121121
}
122122

123-
if ([event respondsToSelector:@selector(_modifierEventFlags)]) {
124-
modifierFlags = [event _modifierEventFlags];
123+
if ([event respondsToSelector:@selector(_modifierFlags)]) {
124+
modifierFlags = [event _modifierFlags];
125125
}
126126

127-
if ([event respondsToSelector:@selector(_isKeyEventDown)]) {
128-
isKeyDown = [event _isKeyEventDown];
127+
if ([event respondsToSelector:@selector(_isKeyDown)]) {
128+
isKeyDown = [event _isKeyDown];
129129
}
130130

131131
BOOL interactionEnabled = !UIApplication.sharedApplication.isIgnoringInteractionEvents;

React/DevSupport/RCTPackagerClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern const int RCT_PACKAGER_CLIENT_PROTOCOL_VERSION;
2525
@protocol RCTPackagerClientMethod <NSObject>
2626

2727
- (void)handleRequest:(NSDictionary<NSString *, id> *)params withResponder:(RCTPackagerClientResponder *)responder;
28-
- (void)handlePackageNotification:(NSDictionary<NSString *, id> *)params;
28+
- (void)handleNotification:(NSDictionary<NSString *, id> *)params;
2929

3030
@optional
3131

React/DevSupport/RCTPackagerConnection.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ - (void)addHandler:(id<RCTPackagerClientMethod>)handler forMethod:(NSString *)me
210210

211211
[self
212212
addNotificationHandler:^(NSDictionary<NSString *, id> *notification) {
213-
[handler handlePackageNotification:notification];
213+
[handler handleNotification:notification];
214214
}
215215
queue:queue
216216
forMethod:method];

0 commit comments

Comments
 (0)