Skip to content

Commit

Permalink
if block inside RCTExecuteOnMainQueue
Browse files Browse the repository at this point in the history
  • Loading branch information
Darsbir committed Mar 8, 2023
1 parent 3317977 commit 6f3bb6f
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions React/Views/RCTModalHostViewManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
modalHostView.onShow(nil);
}
};
if (_presentationBlock) {
_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else {
RCTExecuteOnMainQueue(^{
[[modalHostView reactViewController] presentViewController:viewController
animated:animated
completion:completionBlock];
});
}
RCTExecuteOnMainQueue(^{
if (self->_presentationBlock) {
self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else {
[[modalHostView reactViewController] presentViewController:viewController
animated:animated
completion:completionBlock];
}
})
}

- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
Expand All @@ -95,13 +95,13 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
[[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
}
};
if (_dismissalBlock) {
_dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else {
RCTExecuteOnMainQueue(^{
[viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
});
RCTExecuteOnMainQueue(^{
if (self->_dismissalBlock) {
self->_dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else {
[viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
}
})
}

- (RCTShadowView *)shadowView
Expand Down

0 comments on commit 6f3bb6f

Please sign in to comment.