-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Init] Add an executor provider to RCTBridge's init method
If you construct an RCTBridge you may want to configure the executor. However the constructor synchronously calls `setUp` and sets up the executor. Instead, let the code that constructs the bridge specify an executor source, which controls how the executor is provided. This allows for customizing the web view executor with a UIWebView of your choice, or configuring the URL of the debugger proxy that the web socket executor connects to. Now that RCTRootView takes a bridge in one of its initializers, it is possible to create a bridge with a custom executor and then use that to set up a root view as well. Test Plan: Run the UIExplorer app and confirm I am able to connect to the plain JSContext via Safari. Hit Cmd-D and see Chrome open a Tab. Hit Cmd-N and see that I can connect to a plain JSContext again. Shake the simulator and select "Enable Safari Debugging" and see that I can connect to the UIWebView from Safari. tl;dr the keyboard shortcuts and dev menu work as expected. Fixes #288
- Loading branch information
Showing
9 changed files
with
169 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @protocol RCTJavaScriptExecutor; | ||
|
|
||
| @protocol RCTJavaScriptExecutorSource <NSObject> | ||
|
|
||
| /** | ||
| * Return a new JavaScript executor to run a React application. | ||
| */ | ||
| - (id<RCTJavaScriptExecutor>)executor; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "RCTJavaScriptExecutorSource.h" | ||
|
|
||
| typedef NS_ENUM(NSUInteger, RCTStandardExecutorType) { | ||
| RCTStandardExecutorTypeJSContext, | ||
| RCTStandardExecutorTypeUIWebView, | ||
| RCTStandardExecutorTypeWebSocket, | ||
| }; | ||
|
|
||
| @interface RCTStandardExecutorSource : NSObject <RCTJavaScriptExecutorSource> | ||
|
|
||
| @property (nonatomic) RCTStandardExecutorType executorType; | ||
|
|
||
| - (id<RCTJavaScriptExecutor>)executor; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // Copyright 2015-present Facebook. All rights reserved. | ||
|
|
||
| #import "RCTStandardExecutorSource.h" | ||
|
|
||
| #import "RCTContextExecutor.h" | ||
| #import "RCTJavaScriptExecutor.h" | ||
| #import "RCTLog.h" | ||
| #import "RCTWebViewExecutor.h" | ||
|
|
||
| @implementation RCTStandardExecutorSource | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| if (self = [super init]) { | ||
| _executorType = RCTStandardExecutorTypeJSContext; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (id<RCTJavaScriptExecutor>)executor | ||
| { | ||
| switch (_executorType) { | ||
| case RCTStandardExecutorTypeJSContext: | ||
| return [[RCTContextExecutor alloc] init]; | ||
| case RCTStandardExecutorTypeUIWebView: | ||
| return [[RCTWebViewExecutor alloc]initWithWebView:[[UIWebView alloc] init]]; | ||
| case RCTStandardExecutorTypeWebSocket: { | ||
| Class executorClass = NSClassFromString(@"RCTWebSocketExecutor"); | ||
| if (!executorClass) { | ||
| RCTLogError(@"WebSocket debugger is not available. Did you forget to include RCTWebSocketExecutor?"); | ||
| executorClass = [RCTContextExecutor class]; | ||
| } | ||
| return [[executorClass alloc] init]; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @end |
Oops, something went wrong.