fix: don't set delegate for QLPreviewPanel (#37576)

fix: don't set delegate for QLPreviewPanel Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Jeremy Spiegel <jeremy.spiegel@frontapp.com>
electron · Mar 16, 2023 · 24ce948 · 24ce948
1 parent a831d69
commit 24ce948
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/shell/browser/ui/cocoa/electron_ns_window.mm b/shell/browser/ui/cocoa/electron_ns_window.mm
@@ -185,12 +185,10 @@ - (BOOL)acceptsPreviewPanelControl:(QLPreviewPanel*)panel {
 }
 
 - (void)beginPreviewPanelControl:(QLPreviewPanel*)panel {
-  panel.delegate = [self delegate];
   panel.dataSource = static_cast<id<QLPreviewPanelDataSource>>([self delegate]);
 }
 
 - (void)endPreviewPanelControl:(QLPreviewPanel*)panel {
-  panel.delegate = nil;
   panel.dataSource = nil;
 }
 

diff --git a/spec/api-browser-window-spec.ts b/spec/api-browser-window-spec.ts
@@ -5202,6 +5202,22 @@ describe('BrowserWindow module', () => {
         w.closeFilePreview();
       }).to.not.throw();
     });
+
+    it('should not call BrowserWindow show event', async () => {
+      const w = new BrowserWindow({ show: false });
+      const shown = emittedOnce(w, 'show');
+      w.show();
+      await shown;
+
+      let showCalled = false;
+      w.on('show', () => {
+        showCalled = true;
+      });
+
+      w.previewFile(__filename);
+      await delay(500);
+      expect(showCalled).to.equal(false, 'should not have called show twice');
+    });
   });
 
   // TODO (jkleinsc) renable these tests on mas arm64