Skip to content

Commit

Permalink
Avoid asserting bridge ready on setDefaultOptions (#6374)
Browse files Browse the repository at this point in the history
There is no need to wait for `JavascriptDidLoad` event on `setDefaultOptions` because all it does is update the default options in the native side.
  • Loading branch information
yogevbd authored Jul 8, 2020
1 parent 5e03718 commit 87e7b1a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 0 additions & 1 deletion lib/ios/RNNCommandsHandler.m
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ - (void)mergeOptions:(NSString*)componentId options:(NSDictionary*)mergeOptions
}

- (void)setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
[self assertReady];
RNNAssertMainQueue();

RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initWithDict:optionsDict];
Expand Down
2 changes: 1 addition & 1 deletion playground/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ buildscript {

allprojects {
repositories {
maven { url 'https://www.jitpack.io' }
jcenter()
maven { url 'https://www.jitpack.io' }
google()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand Down
6 changes: 6 additions & 0 deletions playground/ios/NavigationTests/RNNCommandsHandlerTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ - (NSArray*)getPublicMethodNamesForObject:(NSObject*)obj {
[skipMethods addObject:@"dismissedModal:"];
[skipMethods addObject:@"attemptedToDismissModal:"];
[skipMethods addObject:@"dismissedMultipleModals:"];
[skipMethods addObject:@"setDefaultOptions:completion:"];

NSMutableArray* result = [NSMutableArray new];

Expand Down Expand Up @@ -503,4 +504,9 @@ - (void)testPop_shouldRejectPromiseForInvalidComponentId {
[self waitForExpectationsWithTimeout:5 handler:nil];
}

- (void)testSetDefaultOptions_shouldNotThrowWhenBridgeNotReady {
[self.uut setReadyToReceiveCommands:false];
[self.uut setDefaultOptions:@{} completion:^{}];
}

@end

0 comments on commit 87e7b1a

Please sign in to comment.