refactor: move permissions dialog to BrowserView

ttuanhung · Sep 28, 2019 · 14bf883 · 14bf883
1 parent 615564f
commit 14bf883
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 33 deletions.
diff --git a/src/main/dialogs/find.ts b/src/main/dialogs/find.ts
@@ -15,7 +15,6 @@ export class FindDialog extends Dialog {
         height: HEIGHT,
         y: TOOLBAR_HEIGHT,
       },
-      devtools: true,
     });
 
     ipcMain.on(`show-${this.webContents.id}`, () => {
@@ -24,8 +23,7 @@ export class FindDialog extends Dialog {
   }
 
   public show() {
-    const { width } = this.appWindow.getContentBounds();
-    super.show({ x: width - WIDTH });
+    super.show();
   }
 
   public find(tabId: number, data: any) {

diff --git a/src/main/dialogs/menu.ts b/src/main/dialogs/menu.ts
@@ -19,9 +19,13 @@ export class MenuDialog extends Dialog {
     });
   }
 
-  public show() {
+  public rearrange() {
     const { width } = this.appWindow.getContentBounds();
-    super.show({ x: width - WIDTH });
+    super.rearrange({ x: width - WIDTH });
+  }
+
+  public show() {
+    super.show();
     this.webContents.send('visible', true);
   }
 

diff --git a/src/main/windows/permissions.ts → src/main/dialogs/permissions.ts b/src/main/windows/permissions.ts → src/main/dialogs/permissions.ts
@@ -1,19 +1,22 @@
 import { ipcMain } from 'electron';
 import { TOOLBAR_HEIGHT } from '~/constants/design';
-import { AppWindow } from '.';
-import { PopupWindow } from './popup';
+import { AppWindow } from '../windows';
+import { Dialog } from '.';
 
 const HEIGHT = 175;
 const WIDTH = 350;
 
-export class PermissionsWindow extends PopupWindow {
+export class PermissionsDialog extends Dialog {
   public constructor(appWindow: AppWindow) {
-    super(appWindow, 'permissions');
-
-    this.setBounds({
-      height: HEIGHT,
-      width: WIDTH,
-    } as any);
+    super(appWindow, {
+      name: 'permissions',
+      bounds: {
+        height: HEIGHT,
+        width: WIDTH,
+        y: TOOLBAR_HEIGHT,
+        x: 0,
+      },
+    });
   }
 
   public async requestPermission(
@@ -30,7 +33,6 @@ export class PermissionsWindow extends PopupWindow {
         return reject('Unknown permission');
       }
 
-      this.rearrange();
       this.show();
 
       this.webContents.send('request-permission', { name, url, details });
@@ -44,9 +46,4 @@ export class PermissionsWindow extends PopupWindow {
       );
     });
   }
-
-  public rearrange() {
-    const cBounds = this.appWindow.getContentBounds();
-    this.setBounds({ x: cBounds.x, y: cBounds.y + TOOLBAR_HEIGHT } as any);
-  }
 }
diff --git a/src/main/dialogs/search.ts b/src/main/dialogs/search.ts
@@ -19,7 +19,7 @@ export class SearchDialog extends Dialog {
 
     ipcMain.on(`height-${this.webContents.id}`, (e, height) => {
       const { width } = this.appWindow.getContentBounds();
-      this.rearrange({
+      super.rearrange({
         height: HEIGHT + height,
         x: Math.round(width / 2 - WIDTH / 2),
       });
@@ -31,12 +31,13 @@ export class SearchDialog extends Dialog {
     else this.hide();
   }
 
-  public show() {
+  public rearrange() {
     const { width } = this.appWindow.getContentBounds();
+    super.rearrange({ x: Math.round(width / 2 - WIDTH / 2) });
+  }
 
-    super.show({
-      x: Math.round(width / 2 - WIDTH / 2),
-    });
+  public show() {
+    super.show();
 
     const selected = this.appWindow.viewManager.selected;
 

diff --git a/src/main/services/messaging.ts b/src/main/services/messaging.ts
@@ -32,7 +32,7 @@ export const runMessagingService = (appWindow: AppWindow) => {
   });
 
   ipcMain.on(`permission-dialog-hide-${id}`, () => {
-    appWindow.permissionWindow.hide();
+    appWindow.permissionsDialog.hide();
   });
 
   ipcMain.on(`update-find-info-${id}`, (e, tabId, data) =>

diff --git a/src/main/sessions-manager.ts b/src/main/sessions-manager.ts
@@ -47,7 +47,7 @@ export class SessionsManager {
             const window = windowsManager.findWindowByBrowserView(
               webContents.id,
             );
-            const response = await window.permissionWindow.requestPermission(
+            const response = await window.permissionsDialog.requestPermission(
               permission,
               webContents.getURL(),
               details,

diff --git a/src/main/windows/app.ts b/src/main/windows/app.ts
@@ -7,20 +7,21 @@ import { getPath } from '~/utils';
 import { runMessagingService, Multrin } from '../services';
 import { WindowsManager } from '../windows-manager';
 import { MenuDialog, SearchDialog, FindDialog } from '../dialogs';
+import { PermissionsDialog } from '../dialogs/permissions';
 
 export class AppWindow extends BrowserWindow {
   public viewManager: ViewManager;
   public multrin = new Multrin(this);
 
   // TODO:
-  // public permissionWindow = new PermissionsWindow(this);
   // public authWindow = new AuthWindow(this);
   // public formFillWindow = new FormFillWindow(this);
   // public credentialsWindow = new CredentialsWindow(this);
 
   public menuDialog = new MenuDialog(this);
   public searchDialog = new SearchDialog(this);
   public findDialog = new FindDialog(this);
+  public permissionsDialog = new PermissionsDialog(this);
   public incognito: boolean;
 
   private windowsManager: WindowsManager;
@@ -76,12 +77,12 @@ export class AppWindow extends BrowserWindow {
 
     const moveAndResize = () => {
       this.authWindow.rearrange();
-      this.permissionWindow.rearrange();
       this.formFillWindow.rearrange();
       this.credentialsWindow.rearrange();
 
       this.findDialog.rearrange();
       this.menuDialog.hide();
+      this.permissionsDialog.rearrange();
     };
 
     // Update window bounds on resize and on move when window is not maximized.

diff --git a/src/main/windows/index.ts b/src/main/windows/index.ts
@@ -1,5 +1,4 @@
 export * from './app';
 export * from './auth';
-export * from './permissions';
 export * from './form-fill';
 export * from './credentials';
diff --git a/src/renderer/views/permissions/store/index.ts b/src/renderer/views/permissions/store/index.ts
@@ -11,9 +11,7 @@ export class Store {
   @observable
   public domain: string;
 
-  public windowId: number = ipcRenderer.sendSync(
-    `get-window-id-${getCurrentWindow().id}`,
-  );
+  public windowId = getCurrentWindow().id;
 
   public constructor() {
     ipcRenderer.on('request-permission', (e, { url, name, details }) => {