Skip to content

Commit 2c641c6

Browse files
committed
if inside RNCTExecuteOnMainQueue
1 parent 3317977 commit 2c641c6

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
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

android/com/facebook/react/react-native/maven-metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<versions>
99
<version>0.68.5</version>
1010
</versions>
11-
<lastUpdated>20230227161545</lastUpdated>
11+
<lastUpdated>20230308095903</lastUpdated>
1212
</versioning>
1313
</metadata>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
72d5804561b702287b21bf7c3b9f7423
1+
5e50491d154a0869a0948e01c4a56cd0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
484bb81ee79103f6832455814390c1cc5c3e742f
1+
4fc6b7525c66b3a6c214998f34f7611463ad1e73
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
930078b761a7bfe9760272f253db9a0941868030a8c995c60595b36110d37fd8
1+
960dbf9dc373a20b381ea6061b8ec39716c2c414e666ec27d885ceca2a5833cf
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f44328bdf5b7d30d391f06a068a21b38309004b448d47968ca564123e260e52959bbf7f365c6a69c46b1f8c1084a1172228cff980ca56a91fa9db52f4b47c891
1+
34d4952934c59daf346a02aa1508e07d49fbc6201b52c74e2031270494b162665a827f18603fa02cb7c485934c163f999240737881a9fa763665e525cfc9753e

0 commit comments

Comments
 (0)