Only show DevMenu on shake if RCTView is visible

Peter Argany · facebook-github-bot · commit 7186c4de4fc7 · 2021-01-28T19:11:12.000-08:00
Summary: Changelog: [iOS] Only show Dev Menu on shake if RN view is visible

Reviewed By: fkgozali

Differential Revision: D26138659

fbshipit-source-id: e2db287728675c7ead5fcbf569ed591638e2187e
diff --git a/React/CoreModules/RCTDevMenu.mm b/React/CoreModules/RCTDevMenu.mm
@@ -168,7 +168,13 @@ - (void)invalidate
 - (void)showOnShake
 {
   if ([((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]) isShakeToShowDevMenuEnabled]) {
-    [self show];
+    for (UIWindow *window in [RCTSharedApplication() windows]) {
+      NSString *recursiveDescription = [window valueForKey:@"recursiveDescription"];
+      if ([recursiveDescription containsString:@"RCTView"]) {
+        [self show];
+        return;
+      }
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,13 @@ - (void)invalidate`
`168`	`168`	`- (void)showOnShake`
`169`	`169`	`{`
`170`	`170`	`if ([((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]) isShakeToShowDevMenuEnabled]) {`
`171`		`- [self show];`
	`171`	`+ for (UIWindow *window in [RCTSharedApplication() windows]) {`
	`172`	`+ NSString *recursiveDescription = [window valueForKey:@"recursiveDescription"];`
	`173`	`+ if ([recursiveDescription containsString:@"RCTView"]) {`
	`174`	`+ [self show];`
	`175`	`+ return;`
	`176`	`+ }`
	`177`	`+ }`
`172`	`178`	`}`
`173`	`179`	`}`
`174`	`180`