Browse Source

set waitForRender on sharedElement transition

yogevbd 6 years ago
parent
commit
326d2fc9ad
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      lib/ios/RNNCommandsHandler.m

+ 1
- 1
lib/ios/RNNCommandsHandler.m View File

126
 		}
126
 		}
127
 	} else {
127
 	} else {
128
 		id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
128
 		id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
129
-		[newVc waitForReactViewRender:newVc.options.animations.push.waitForRender perform:^{
129
+		[newVc waitForReactViewRender:(newVc.options.animations.push.waitForRender || animationDelegate) perform:^{
130
 			[_stackManager push:newVc onTop:fromVC animated:newVc.options.animations.push.enable animationDelegate:animationDelegate completion:^{
130
 			[_stackManager push:newVc onTop:fromVC animated:newVc.options.animations.push.enable animationDelegate:animationDelegate completion:^{
131
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
131
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
132
 				completion();
132
 				completion();