From 71d2dc7afadca4146a83e00a5bda7760c04faadb Mon Sep 17 00:00:00 2001
From: zhongwuzw <zhongwuzw@qq.com>
Date: Mon, 20 May 2019 12:21:19 +0800
Subject: [PATCH 1/2] [iOS] Keep the order of Modals that we can dismiss in
 sequence

---
 React/Views/RCTModalHostViewManager.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index 6377683d2dc7..758992caf23a 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -49,7 +49,7 @@ @interface RCTModalHostViewManager () <RCTModalHostViewInteractor>
 
 @implementation RCTModalHostViewManager
 {
-  NSHashTable *_hostViews;
+  NSPointerArray *_hostViews;
 }
 
 RCT_EXPORT_MODULE()
@@ -59,9 +59,9 @@ - (UIView *)view
   RCTModalHostView *view = [[RCTModalHostView alloc] initWithBridge:self.bridge];
   view.delegate = self;
   if (!_hostViews) {
-    _hostViews = [NSHashTable weakObjectsHashTable];
+    _hostViews = [NSPointerArray weakObjectsPointerArray];
   }
-  [_hostViews addObject:view];
+  [_hostViews addPointer:(__bridge void *)view];
   return view;
 }
 
@@ -104,7 +104,7 @@ - (void)invalidate
   for (RCTModalHostView *hostView in _hostViews) {
     [hostView invalidate];
   }
-  [_hostViews removeAllObjects];
+  _hostViews = [NSPointerArray weakObjectsPointerArray];
 }
 
 RCT_EXPORT_VIEW_PROPERTY(animationType, NSString)

From b1a9e717a50abfa12a99811f26dc031a4beed2d4 Mon Sep 17 00:00:00 2001
From: zhongwuzw <zhongwuzw@qq.com>
Date: Fri, 24 May 2019 10:27:20 +0800
Subject: [PATCH 2/2] Using nil operation instead

---
 React/Views/RCTModalHostViewManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index 758992caf23a..dbaaf714611b 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -104,7 +104,7 @@ - (void)invalidate
   for (RCTModalHostView *hostView in _hostViews) {
     [hostView invalidate];
   }
-  _hostViews = [NSPointerArray weakObjectsPointerArray];
+  _hostViews = nil;
 }
 
 RCT_EXPORT_VIEW_PROPERTY(animationType, NSString)