Keep the order of Modals that we can dismiss in sequence (facebook#24961)

zhongwuzw · facebook-github-bot · commit fd7f5bb76868 · 2019-06-04T07:12:46.000-07:00
Summary: Fixes facebook#16037. We need to keep the order of Modals, if we dismiss Modal randomly(before we use hash table), some Modals may not dismiss successfully. This PR should based on facebook#24959. ## Changelog [iOS] [Fixed] - Keep the order of Modals that we can dismiss in sequence Pull Request resolved: facebook#24961 Differential Revision: D15621858 Pulled By: cpojer fbshipit-source-id: 964729f8f4584995f4e1dd527af4b61534d369ba
diff --git 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 = nil;
 }
 
 RCT_EXPORT_VIEW_PROPERTY(animationType, NSString)

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ @interface RCTModalHostViewManager () <RCTModalHostViewInteractor>`
`49`	`49`
`50`	`50`	`@implementation RCTModalHostViewManager`
`51`	`51`	`{`
`52`		`- NSHashTable *_hostViews;`
	`52`	`+ NSPointerArray *_hostViews;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`RCT_EXPORT_MODULE()`
`@@ -59,9 +59,9 @@ - (UIView *)view`
`59`	`59`	`RCTModalHostView *view = [[RCTModalHostView alloc] initWithBridge:self.bridge];`
`60`	`60`	`view.delegate = self;`
`61`	`61`	`if (!_hostViews) {`
`62`		`- _hostViews = [NSHashTable weakObjectsHashTable];`
	`62`	`+ _hostViews = [NSPointerArray weakObjectsPointerArray];`
`63`	`63`	`}`
`64`		`- [_hostViews addObject:view];`
	`64`	`+ [_hostViews addPointer:(__bridge void *)view];`
`65`	`65`	`return view;`
`66`	`66`	`}`
`67`	`67`
`@@ -104,7 +104,7 @@ - (void)invalidate`
`104`	`104`	`for (RCTModalHostView *hostView in _hostViews) {`
`105`	`105`	`[hostView invalidate];`
`106`	`106`	`}`
`107`		`- [_hostViews removeAllObjects];`
	`107`	`+ _hostViews = nil;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`RCT_EXPORT_VIEW_PROPERTY(animationType, NSString)`