Merge branch 'hotfix/1.4.1'

Author: ECRomaneli

src/data/Storage.ts

@@ -1,19 +1,9 @@
 import { DefaultQuickActions, DefaultSettings, IsDebug, Permission, QuickAction, Settings } from '@/data/Constants';
 import { PlainPage } from '@/model/Page';
 import PreferencesService from '@/service/PreferencesService';
-import { app, safeStorage, session } from 'electron';
+import { app, Rectangle, safeStorage, session } from 'electron';
 import Store from 'electron-store';
 
-/**
- * Bounds interface for window dimensions
- */
-interface Bounds {
-  width: number;
-  height: number;
-  x?: number;
-  y?: number;
-}
-
 type AllPermissions = Record<string, SessionPermissions>;
 type SessionPermissions = Record<string, UrlPermissions>;
 type UrlPermissions = Record<string, PermissionStatus>;
@@ -97,30 +87,34 @@ class Vault {
  * Storage class - manages application data persistence
  */
 class Storage {
-  static getSharedBounds(): Bounds {
+  static getSharedBounds(): Rectangle {
     return Vault.get('SharedBounds', {
       width: Storage.getSettings(Settings.DEFAULT_WIDTH),
       height: Storage.getSettings(Settings.DEFAULT_HEIGHT),
-    } as Bounds)!;
+      x: 0,
+      y: 0,
+    })!;
   }
 
   static getSharedSize(): { width: number; height: number } {
     const bounds = Storage.getSharedBounds();
     return { width: bounds.width, height: bounds.height };
   }
 
-  static setSharedBounds(value: Bounds): void {
+  static setSharedBounds(value: Rectangle): void {
     Vault.set('SharedBounds', value);
   }
 
-  static getWindowBounds(id: string | number): Bounds {
+  static getWindowBounds(id: string | number): Rectangle {
     return Vault.get(`WindowBounds.${id}`, {
       width: Storage.getSettings(Settings.DEFAULT_WIDTH),
       height: Storage.getSettings(Settings.DEFAULT_HEIGHT),
-    } as Bounds)!;
+      x: 0,
+      y: 0,
+    })!;
   }
 
-  static setWindowBounds(id: string | number, value: Bounds): void {
+  static setWindowBounds(id: string | number, value: Rectangle): void {
     Vault.set(`WindowBounds.${id}`, value);
   }
 
@@ -150,11 +144,13 @@ class Storage {
     Storage.setPages(pages);
   }
 
-  static getDefaultSize(): Bounds {
+  static getDefaultSize(): Rectangle {
     return {
       width: Storage.getSettings(Settings.DEFAULT_WIDTH),
       height: Storage.getSettings(Settings.DEFAULT_HEIGHT),
-    } as Bounds;
+      x: 0,
+      y: 0,
+    };
   }
 
   static getPermissions(

src/service/FrameService.ts

@@ -81,23 +81,15 @@ class FrameService {
     this.getFrame()!.emit('blur');
   }
 
-  private getOrCreateFrame(): BaseWindow {
-    if (!this.getFrame()) { this.createFrame(); }
-    return this.getFrame()!;
-  }
-
-  private createFrame() {
+  private createFrame(): BaseWindow {
     const frame = new BaseWindow(this.getFrameOptions());
     frame.setContentProtection(AppState.contentProtection);
     frame.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
     WindowUtil.setDefaultAlwaysOnTopSettings(frame);
     const fps = Storage.getSettings(Settings.DRAG_REFRESH_RATE) as number || null;
     Draggable.from(frame, { maximize: true, fps });
-    if (Storage.getSettings<boolean>(Settings.SHARE_BOUNDS)) {
-      const sharedBounds = Storage.getSharedBounds();
-      sharedBounds && frame.setBounds(sharedBounds);
-    }
     AppState.frame = frame;
+    return frame;
   }
 
   private registerStateListeners(): void {
@@ -254,12 +246,16 @@ class FrameService {
 
     if (newView === oldView) { return; }
 
-    const frame = this.getOrCreateFrame();
+    let frame = this.getFrame();
+    const hasFrame = !!frame;
+
+    !frame && (frame = this.createFrame());
+
     oldView && frame.contentView.removeChildView(oldView);
     oldView?.emit('detached');
     this.setupNavbarForCurrentPage();
 
-    if (!Storage.getSettings<boolean>(Settings.SHARE_BOUNDS)) {
+    if (!hasFrame || !Storage.getSettings<boolean>(Settings.SHARE_BOUNDS)) {
       frame.isMaximized() && frame.unmaximize();
       const bounds = PageService.getPageBounds(page);
       frame.setBounds(bounds);

src/service/NavbarService.ts

@@ -41,8 +41,7 @@ class NavbarService {
   }
 
   private getCurrentUrl(): string {
-    const currentView = PageService.getCurrentView();
-    return currentView ? currentView.webContents.getURL() : '';
+    return PageService.getCurrentView()?.webContents.getURL() || PageService.getCurrentHomeUrl();
   }
 
   public sendLabel(label = AppState.currentPage!.label): void {
@@ -78,7 +77,7 @@ class NavbarService {
   private sendDidNavigate(): void {
     const wc = PageService.getCurrentView()!.webContents;
     NavbarPropagator.sendToRender('did-navigate', {
-      url: this.getCurrentUrl() || PageService.getCurrentHomeUrl(),
+      url: this.getCurrentUrl(),
       canGoBack: wc.navigationHistory.canGoBack(),
       canGoForward: wc.navigationHistory.canGoForward(),
     });

src/service/PageService.ts

@@ -290,7 +290,7 @@ class PageService {
      * @returns Window bounds.
      */
   private getBoundsForDefaultPosition(windowSize: Size): Rectangle {
-    const bounds = { width: windowSize.width, height: windowSize.height } as Rectangle;
+    const bounds = { width: windowSize.width, height: windowSize.height, x: 0, y: 0 };
 
     // Get user position preference
     const position = Storage.getSettings(Settings.DEFAULT_POSITION);