Skip to content

Commit

Permalink
Back out "fixed SDK issue while uploading app in debug scheme"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
javache authored and facebook-github-bot committed Jun 21, 2022
1 parent e5f7e40 commit 6fcb878
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions React/Base/RCTKeyCommands.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -116,16 +116,16 @@ - (void)handleKeyUIEventSwizzle:(UIEvent *)event
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;
Expand Down
2 changes: 1 addition & 1 deletion React/DevSupport/RCTPackagerClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern const int RCT_PACKAGER_CLIENT_PROTOCOL_VERSION;
@protocol RCTPackagerClientMethod <NSObject>

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

@optional

Expand Down
2 changes: 1 addition & 1 deletion React/DevSupport/RCTPackagerConnection.mm
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ - (void)addHandler:(id<RCTPackagerClientMethod>)handler forMethod:(NSString *)me

[self
addNotificationHandler:^(NSDictionary<NSString *, id> *notification) {
[handler handlePackageNotification:notification];
[handler handleNotification:notification];
}
queue:queue
forMethod:method];
Expand Down

0 comments on commit 6fcb878

Please sign in to comment.