Merge branch 'release/1.1.0'

Author: ECRomaneli

package-lock.json

@@ -33,30 +33,30 @@
     "@eslint/js": "^10.0.1",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/auto-launch": "^5.0.5",
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.5.2",
     "clean-css": "^5.3.3",
     "concurrently": "^9.2.1",
     "copy-webpack-plugin": "^14.0.0",
-    "electron": "^40.8.5",
+    "electron": "^41.2.0",
     "electron-builder": "^26.8.1",
-    "eslint": "^10.1.0",
+    "eslint": "^10.2.0",
     "html-minifier-terser": "^7.2.0",
     "rimraf": "^6.1.3",
     "terser-webpack-plugin": "^5.4.0",
-    "ts-loader": "^9.5.4",
+    "ts-loader": "^9.5.7",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.58.0",
+    "typescript-eslint": "^8.58.1",
     "webpack": "^5.105.4",
     "webpack-cli": "^7.0.2"
   },
   "dependencies": {
     "@ecromaneli/search-engine": "^3.0.0",
     "auto-launch": "^5.0.6",
     "electron-context-menu": "^4.1.2",
-    "electron-draggable": "^1.5.2",
-    "electron-findbar": "^3.6.0",
+    "electron-draggable": "^1.5.3",
+    "electron-findbar": "^3.7.0",
     "electron-store": "^11.0.2",
     "electron-updater": "^6.8.3",
-    "vue": "^3.5.31"
+    "vue": "^3.5.32"
   }
 }

package.json

@@ -14,18 +14,18 @@ export type SystemTheme = 'light' | 'dark';
 export type ResetBoundType = 'bounds' | 'position' | '';
 
 class AppState {
-  private _autoLauncher = new AutoLaunch({ name: 'Handbook' });
+  private readonly _autoLauncher = new AutoLaunch({ name: 'Handbook' });
   private _strings: Strings = getLanguageStrings(Storage.getSettings(Settings.APP_LANGUAGE) || app.getLocale());
   private _defaultAppMenu?: MenuItem[];
   private _globalShortcut = '';
   private _resetBoundsType: ResetBoundType = Storage.getSettings(Settings.RESET_BOUNDS);
   private _systemTheme = this.getSystemTheme();
   private _tray?: Tray;
   private _preferences?: BrowserWindow;
-  private _fromClipboardPage: Page = new Page(void 0, this.strings.menu.fromClipboard);
   private _pages: Page[] = [];
-  private _appMenuTemplate: MenuItemConstructorOptions[] = [];
+  private readonly _fromClipboardPage: Page = new Page(void 0, this.strings.menu.fromClipboard);
   private readonly currentStack: { frame?: BaseWindow, navbar?: WebContentsView, page?: Page } = {};
+  private readonly onViewChangeHandler = function (this: Page) { ViewPropagator.propagate(this.view); };
   private readonly contextMenu: {
     tray?: MenuItemConstructorOptions[],
     view?: MenuItemConstructorOptions[],
@@ -63,14 +63,14 @@ class AppState {
     this.currentStack.page = page;
     if (page) {
       ViewPropagator.propagate(page.view);
-      page.setViewChangeHandler(() => ViewPropagator.propagate(page.view));
+      if (!page.hasViewChangeHandler()) {
+        page.setViewChangeHandler(this.onViewChangeHandler);
+      }
     }
   }
   get currentPage(): Page | undefined { return this.currentStack.page; }
   set pages(pages: Page[]) { this._pages = pages; }
   get pages(): Page[] { return this._pages; }
-  get appMenuTemplate(): MenuItemConstructorOptions[] { return this._appMenuTemplate; }
-  set appMenuTemplate(template: MenuItemConstructorOptions[]) { this._appMenuTemplate = template; }
 
   set googleApiKey(key: string) { process.env.GOOGLE_API_KEY = key; }
   set themeSource(theme: 'light' | 'dark' | 'system') { nativeTheme.themeSource = theme; }
@@ -98,9 +98,10 @@ class AppState {
     if (process.env.NODE_ENV !== 'development') { return []; }
     const allPages = () => [this._fromClipboardPage, ...this._pages];
     const pageType = (current?: Page) => {
-      return !current ? '' :
-        !current.view ? 'no view' :
-          current.view.webContents.isDestroyed() ? 'view: destroyed' : 'view: alive';
+      if (!current) { return ''; }
+      if (!current.view) { return 'no view'; }
+      return current.label + (current.hasView ?
+        current.view.webContents && !current.view.webContents.isDestroyed() ? ': alive' : ': destroyed' : '');
     };
 
     return [

src/AppState.ts

@@ -53,7 +53,7 @@ const DefaultSettings: Record<string, any> = {};
 DefaultSettings[Settings.SHOW_FRAME] = true;
 DefaultSettings[Settings.BACKGROUND_COLOR] = '#171717';
 DefaultSettings[Settings.FOCUS_OPACITY] = 100;
-DefaultSettings[Settings.BLUR_OPACITY] = 70;
+DefaultSettings[Settings.BLUR_OPACITY] = 90;
 DefaultSettings[Settings.KEEP_OPACITY_WHEN_MAXIMIZED] = false;
 DefaultSettings[Settings.ALLOW_FULLSCREEN] = false;
 DefaultSettings[Settings.RESET_BOUNDS] = 'position';

src/data/Constants.ts

@@ -114,6 +114,10 @@ export class Page {
     this._onViewChange = handler;
   }
 
+  public hasViewChangeHandler(): boolean {
+    return !!this._onViewChange;
+  }
+
   get hasView(): boolean {
     return !!this._view;
   }

src/model/Page.ts

@@ -12,13 +12,14 @@ import SyncService from '@/service/SyncService';
 import TrayService from '@/service/TrayService';
 import ViewService from '@/service/ViewService';
 import { parseToAccelerator } from '@/util/EventKeyCapture';
-import Dialog from '@/util/modal/Dialog';
-import { app, globalShortcut, Menu, MenuItemConstructorOptions, Session, session, WebContentsView } from 'electron';
+import Dialog, { DialogOptions } from '@/util/modal/Dialog';
+import { app, BrowserWindow, globalShortcut, Menu, MenuItemConstructorOptions, Session, session, WebContentsView } from 'electron';
 
 class ApplicationService {
   private static readonly ACCEPT_LANGUAGE_HEADER = 'Accept-Language';
 
   public initialize() {
+    this.setupExitDialog();
     this.setupAutoLaunch();
     this.registerGlobalShortcut();
     this.setupAccelerators();
@@ -93,6 +94,54 @@ class ApplicationService {
     }
   }
 
+  private setupExitDialog() {
+    let quitting = false;
+    app.on('before-quit', (e) => {
+      if (quitting) { return; }
+      e.preventDefault();
+      const d = AppState.strings.exitDialog;
+      return this.showConfirmationDialog({
+        title: d.title,
+        message: d.message,
+        confirmBtn: d.confirm,
+        cancelBtn: AppState.strings.dialog.cancel,
+        parent: null,
+        confirmAction: () => { quitting = true; app.quit(); },
+      });
+    });
+  }
+
+  private async showConfirmationDialog(
+    data: DialogOptions & {
+      parent: BrowserWindow | null,
+      confirmBtn?: string,
+      cancelBtn?: string,
+      confirmAction?: () => void,
+      cancelAction?: () => void,
+    },
+  ): Promise<void> {
+    const d = AppState.strings.dialog;
+    const result = await Dialog.show(
+      data.parent ?? null,
+      {
+        type: data.type || 'question',
+        title: data.title || d.confirmation,
+        message: data.message || d.areYouSure,
+        buttons: [data.confirmBtn ?? d.ok, data.cancelBtn ?? d.cancel],
+        defaultId: 1,
+        cancelId: 1,
+      },
+    );
+
+    setTimeout(() => {
+      if (result.response === 0) {
+        data.confirmAction && data.confirmAction();
+      } else {
+        data.cancelAction && data.cancelAction();
+      }
+    });
+  }
+
   private setupAccelerators() {
     AppState.defaultAppMenu = (Menu.getApplicationMenu()?.items || []);
     this.buildApplicationMenu();

src/service/ApplicationService.ts

@@ -49,7 +49,7 @@ class FrameService {
 
   public toggleVisibility(): void {
     const frame = this.getFrame()!;
-    frame.isVisible() ? frame.hide() : frame.show();
+    frame.isVisible() ? this.hide() : this.show();
   }
 
   public toggleMaximize(): void {
@@ -310,6 +310,7 @@ class FrameService {
 
   public show(): void {
     this.getFrame()!.show();
+    ViewService.focus();
   }
 
   public hide(): void {

src/service/FrameService.ts

@@ -8,10 +8,9 @@ import PageService from '@/service/PageService';
 import PreferencesService from '@/service/PreferencesService';
 import TrayService from '@/service/TrayService';
 import ViewService from '@/service/ViewService';
-import Dialog, { DialogOptions } from '@/util/modal/Dialog';
 import QuickMenuModal, { QuickMenuItem } from '@/util/modal/QuickMenuModal';
 import SearchEngine from '@ecromaneli/search-engine';
-import { app, BrowserWindow, clipboard, Menu, MenuItemConstructorOptions, shell } from 'electron';
+import { app, clipboard, Menu, MenuItemConstructorOptions, shell } from 'electron';
 
 type MenuItem = MenuItemConstructorOptions & { submenu: MenuItemConstructorOptions[] };
 
@@ -115,19 +114,7 @@ class MenuService {
     windowMenuItems.push({ label: s.preferences, click: () => PreferencesService.open() });
 
     menuItems.push(...windowMenuItems);
-    menuItems.push({
-      label: s.exit, click: () => {
-        const d = AppState.strings.exitDialog;
-        this.showConfirmationDialog({
-          title: d.title,
-          message: d.message,
-          confirmBtn: d.confirm,
-          cancelBtn: AppState.strings.dialog.cancel,
-          parent: null,
-          confirmAction: () => app.quit(),
-        });
-      },
-    });
+    menuItems.push({ label: s.exit, click: () => app.quit() });
 
     if (currentPageSubmenu) {
       AppState.viewContextMenu = [
@@ -186,37 +173,6 @@ class MenuService {
     }
   }
 
-  private async showConfirmationDialog(
-    data: DialogOptions & {
-      parent: BrowserWindow | null,
-      confirmBtn?: string,
-      cancelBtn?: string,
-      confirmAction?: () => void,
-      cancelAction?: () => void,
-    },
-  ): Promise<void> {
-    const d = AppState.strings.dialog;
-    const result = await Dialog.show(
-      data.parent ?? null,
-      {
-        type: data.type || 'question',
-        title: data.title || d.confirmation,
-        message: data.message || d.areYouSure,
-        buttons: [data.confirmBtn ?? d.ok, data.cancelBtn ?? d.cancel],
-        defaultId: 1,
-        cancelId: 1,
-      },
-    );
-
-    setTimeout(() => {
-      if (result.response === 0) {
-        data.confirmAction && data.confirmAction();
-      } else {
-        data.cancelAction && data.cancelAction();
-      }
-    });
-  }
-
   private createPageSubmenu(page: Page): MenuItemConstructorOptions[] {
     const view = page.view!;
     const wc = view.webContents;

src/service/MenuService.ts

@@ -7,12 +7,17 @@ import MenuService, { ContextMenuType } from '@/service/MenuService';
 import PageService from '@/service/PageService';
 import PreferencesService from '@/service/PreferencesService';
 import ViewService from '@/service/ViewService';
-import { clipboard, WebContentsView } from 'electron';
+import { clipboard, MouseInputEvent, WebContents, WebContentsView } from 'electron';
 import path from 'node:path';
 
 class NavbarService {
   public readonly NAVBAR_HEIGHT = 40;
   public readonly NAVBAR_WEB_FOLDER = path.join(Path.WEB, 'navigation-bar');
+  private static readonly FOCUS_CASCADE_HANDLER =
+    (_: unknown, i: MouseInputEvent) => i.type === 'mouseUp' && ViewService.focus();
+  private static readonly REMOVE_FOCUS_CASCADE = function (this: WebContents) {
+    this.removeListener('before-mouse-event', NavbarService.FOCUS_CASCADE_HANDLER);
+  };
 
   constructor() {
     this.registerStateListeners();
@@ -32,6 +37,8 @@ class NavbarService {
       },
     });
     AppState.navbar = navbar;
+    navbar.webContents.on('before-mouse-event', NavbarService.FOCUS_CASCADE_HANDLER);
+    navbar.webContents.once('destroyed', NavbarService.REMOVE_FOCUS_CASCADE);
     navbar.webContents.loadFile(path.join(this.NAVBAR_WEB_FOLDER, 'index.html'));
     return navbar;
   }

src/service/NavbarService.ts

@@ -40,8 +40,11 @@ class PageService {
     AppState.currentPage = page;
     this.setupCurrentPage();
 
+    if (!Storage.getSettings<boolean>(Settings.SHARE_BOUNDS)) {
+      FrameService.getFrame()?.isMaximized() && FrameService.toggleMaximize();
+    }
+
     if (previousPage?.view && !previousPage.persist) {
-      FrameService.getFrame()!.isMaximized() && FrameService.toggleMaximize();
       this.closePageView(previousPage);
     }
   }
@@ -206,7 +209,7 @@ class PageService {
     const view = page.view;
     page.view = undefined;
     const wc = view.webContents;
-    !wc.isDestroyed() && wc.close();
+    wc && !wc.isDestroyed() && wc.close();
   }
 
   public recreateView(page = this.getCurrentPage()!): void {