if inside RNCTExecuteOnMainQueue

myntra · Mar 8, 2023 · 2c641c6 · 2c641c6
1 parent 3317977
commit 2c641c6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
@@ -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
@@ -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

diff --git a/android/com/facebook/react/react-native/maven-metadata.xml b/android/com/facebook/react/react-native/maven-metadata.xml
@@ -8,6 +8,6 @@
     <versions>
       <version>0.68.5</version>
     </versions>
-    <lastUpdated>20230227161545</lastUpdated>
+    <lastUpdated>20230308095903</lastUpdated>
   </versioning>
 </metadata>
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.md5 b/android/com/facebook/react/react-native/maven-metadata.xml.md5
@@ -1 +1 @@
-72d5804561b702287b21bf7c3b9f7423
+5e50491d154a0869a0948e01c4a56cd0
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha1 b/android/com/facebook/react/react-native/maven-metadata.xml.sha1
@@ -1 +1 @@
-484bb81ee79103f6832455814390c1cc5c3e742f
+4fc6b7525c66b3a6c214998f34f7611463ad1e73
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha256 b/android/com/facebook/react/react-native/maven-metadata.xml.sha256
@@ -1 +1 @@
-930078b761a7bfe9760272f253db9a0941868030a8c995c60595b36110d37fd8
+960dbf9dc373a20b381ea6061b8ec39716c2c414e666ec27d885ceca2a5833cf
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha512 b/android/com/facebook/react/react-native/maven-metadata.xml.sha512
@@ -1 +1 @@
-f44328bdf5b7d30d391f06a068a21b38309004b448d47968ca564123e260e52959bbf7f365c6a69c46b1f8c1084a1172228cff980ca56a91fa9db52f4b47c891
+34d4952934c59daf346a02aa1508e07d49fbc6201b52c74e2031270494b162665a827f18603fa02cb7c485934c163f999240737881a9fa763665e525cfc9753e