Skip to content

Commit 6f3bb6f

Browse files
committed
if block inside RCTExecuteOnMainQueue
1 parent 3317977 commit 6f3bb6f

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

React/Views/RCTModalHostViewManager.m

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
7575
modalHostView.onShow(nil);
7676
}
7777
};
78-
if (_presentationBlock) {
79-
_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
80-
} else {
81-
RCTExecuteOnMainQueue(^{
82-
[[modalHostView reactViewController] presentViewController:viewController
83-
animated:animated
84-
completion:completionBlock];
85-
});
86-
}
78+
RCTExecuteOnMainQueue(^{
79+
if (self->_presentationBlock) {
80+
self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
81+
} else {
82+
[[modalHostView reactViewController] presentViewController:viewController
83+
animated:animated
84+
completion:completionBlock];
85+
}
86+
})
8787
}
8888

8989
- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
@@ -95,13 +95,13 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
9595
[[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
9696
}
9797
};
98-
if (_dismissalBlock) {
99-
_dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
100-
} else {
101-
RCTExecuteOnMainQueue(^{
102-
[viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
103-
});
98+
RCTExecuteOnMainQueue(^{
99+
if (self->_dismissalBlock) {
100+
self->_dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
101+
} else {
102+
[viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
104103
}
104+
})
105105
}
106106

107107
- (RCTShadowView *)shadowView

0 commit comments

Comments
 (0)