fix: Correct modal focus behavior on macOS (electron#19061)

trop[bot] · codebytere · commit b9605cc602fe · 2019-07-02T18:26:59.000-07:00
* wip: wish i could hack the main window focus away

* main -&gt; key

* remove useless code

* test: Add focus event spec

* test: more robust spec

* test: simplify test

* duplicate non-firing macOS event listener 😳

* destroy 🚨

* chore: remove unused variable
diff --git a/atom/browser/ui/cocoa/atom_ns_window_delegate.mm b/atom/browser/ui/cocoa/atom_ns_window_delegate.mm
@@ -83,11 +83,11 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window
   return frame;
 }
 
-- (void)windowDidBecomeMain:(NSNotification*)notification {
+- (void)windowDidBecomeKey:(NSNotification*)notification {
   shell_->NotifyWindowFocus();
 }
 
-- (void)windowDidResignMain:(NSNotification*)notification {
+- (void)windowDidResignKey:(NSNotification*)notification {
   shell_->NotifyWindowBlur();
 }
 
diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
@@ -2330,6 +2330,33 @@ describe('BrowserWindow module', () => {
     })
   })
 
+  describe('focus event', () => {
+    it('should not emit if focusing on a main window with a modal open', (done) => {
+      const child = new BrowserWindow({
+        parent: w,
+        modal: true,
+        show: false
+      })
+
+      child.once('ready-to-show', () => {
+        child.show()
+      })
+
+      child.on('show', () => {
+        w.once('focus', () => {
+          expect(child.isDestroyed()).to.equal(true)
+          done()
+        })
+        w.focus() // this should not trigger the above listener
+        child.close()
+      })
+
+      // act
+      child.loadURL(server.url)
+      w.show()
+    })
+  })
+
   describe('sheet-begin event', () => {
     let sheet = null
 

Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window`
`83`	`83`	`return frame;`
`84`	`84`	`}`
`85`	`85`
`86`		`-- (void)windowDidBecomeMain:(NSNotification*)notification {`
	`86`	`+- (void)windowDidBecomeKey:(NSNotification*)notification {`
`87`	`87`	`shell_->NotifyWindowFocus();`
`88`	`88`	`}`
`89`	`89`
`90`		`-- (void)windowDidResignMain:(NSNotification*)notification {`
	`90`	`+- (void)windowDidResignKey:(NSNotification*)notification {`
`91`	`91`	`shell_->NotifyWindowBlur();`
`92`	`92`	`}`
`93`	`93`