Skip to content

Commit

Permalink
Enable dev keyboard shortcuts on Mac Catalyst (#27479)
Browse files Browse the repository at this point in the history
Summary:
This enables the dev menu to bo opened from keyboard shortcuts in dev from a Mac Catalyst app.

cc TheSavior andymatuschak radex

## Changelog

[iOS] [Fixed] - Enable dev keyboard shortcuts on Mac Catalyst
Pull Request resolved: #27479

Test Plan:
It depends on #27469 (to have working WebSocket in debug).

![image](https://user-images.githubusercontent.com/7189823/70629346-d3a68880-1bf7-11ea-8949-7553157a2f9c.png)

Differential Revision: D19576528

Pulled By: shergin

fbshipit-source-id: 32b4f8424fb7d270640af4bc50dba24f488bef4f
  • Loading branch information
charpeni authored and facebook-github-bot committed Jan 27, 2020
1 parent 5d08aab commit 56dfc86
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion React/CoreModules/RCTDevMenu.mm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ - (instancetype)init
object:nil];
_extraMenuItems = [NSMutableArray new];

#if TARGET_OS_SIMULATOR
#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
__weak __typeof(self) weakSelf = self;

Expand Down
2 changes: 1 addition & 1 deletion React/CoreModules/RCTRedBox.mm
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ - (instancetype)initWithFrame:(CGRect)frame customButtonTitles:(NSArray<NSString
_stackTraceTableView.indicatorStyle = UIScrollViewIndicatorStyleWhite;
[rootView addSubview:_stackTraceTableView];

#if TARGET_OS_SIMULATOR
#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
NSString *reloadText = @"Reload\n(\u2318R)";
NSString *dismissText = @"Dismiss\n(ESC)";
NSString *copyText = @"Copy\n(\u2325\u2318C)";
Expand Down
2 changes: 1 addition & 1 deletion React/Modules/RCTRedBoxExtraDataViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ - (instancetype)init
_tableView.rowHeight = UITableViewAutomaticDimension;
_tableView.allowsSelection = NO;

#if TARGET_OS_SIMULATOR
#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
NSString *reloadText = @"Reload JS (\u2318R)";
NSString *dismissText = @"Dismiss (ESC)";
#else
Expand Down

0 comments on commit 56dfc86

Please sign in to comment.