Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into renovate/mermaid-11.x

Browse Source
This commit is contained in:
Elian Doran 2025-03-26 19:34:55 +02:00 committed by GitHub
commit b95dca71db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 406 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build-server/action.yml vendored
View File

@ -11,7 +11,7 @@ runs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
cache: "npm" cache: "npm"
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash

2
.github/workflows/dev.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
cache: "npm" cache: "npm"
- run: npm ci - run: npm ci

2
.github/workflows/main-docker.yml vendored
View File

@ -45,7 +45,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
cache: "npm" cache: "npm"
- name: Install npm dependencies - name: Install npm dependencies

5
.github/workflows/nightly.yml vendored
View File

@ -5,6 +5,9 @@ on:
- cron: "0 2 * * *" # run at 2 AM UTC - cron: "0 2 * * *" # run at 2 AM UTC
# This can be used to allow manually triggering nightlies from the web interface # This can be used to allow manually triggering nightlies from the web interface
workflow_dispatch: workflow_dispatch:
push:
branches:
- renovate/electron-forge*
pull_request: pull_request:
paths: paths:
- .github/actions/build-electron/* - .github/actions/build-electron/*
@ -39,7 +42,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
- name: Update nightly version - name: Update nightly version

2
.github/workflows/release.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
- name: Run the build - name: Run the build
uses: ./.github/actions/build-electron uses: ./.github/actions/build-electron
with: with:

3
.vscode/extensions.json vendored
View File

@ -2,6 +2,7 @@
"recommendations": [ "recommendations": [
"lokalise.i18n-ally", "lokalise.i18n-ally",
"editorconfig.editorconfig", "editorconfig.editorconfig",
"vitest.explorer" "vitest.explorer",
"ms-playwright.playwright"
] ]
} }

2
bin/build-server.sh
View File

@ -21,7 +21,7 @@ fi
echo "Selected Arch: $ARCH" echo "Selected Arch: $ARCH"
# Set Node.js version and architecture-specific filename # Set Node.js version and architecture-specific filename
NODE_VERSION=20.15.1 NODE_VERSION=22.14.0
BUILD_DIR="./build" BUILD_DIR="./build"
DIST_DIR="./dist" DIST_DIR="./dist"

4
e2e/i18n.spec.ts
View File

@ -47,6 +47,10 @@ test("User can change language from settings", async ({ page, context }) => {
// Select Chinese and ensure the translation is set. // Select Chinese and ensure the translation is set.
await languageCombobox.selectOption("cn"); await languageCombobox.selectOption("cn");
// Press the refresh button.
await app.currentNoteSplit.getByRole("button", { name: "Restart the application" }).click();
await expect(app.currentNoteSplit).toContainText("一周的第一天", { timeout: 15000 }); await expect(app.currentNoteSplit).toContainText("一周的第一天", { timeout: 15000 });
await expect(languageCombobox).toHaveValue("cn"); await expect(languageCombobox).toHaveValue("cn");

2
electron.ts
View File

@ -23,7 +23,7 @@ electronDl({ saveAs: true });
// needed for excalidraw export https://github.com/zadam/trilium/issues/4271 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features"); electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features");
electron.app.commandLine.appendSwitch("lang", options.getOption("formattingLocale") ?? "en"); electron.app.commandLine.appendSwitch("lang", options.getOptionOrNull("formattingLocale") ?? "en");
electron.app.userAgentFallback = `${electron.app.getName()} ${electron.app.getVersion()}`; electron.app.userAgentFallback = `${electron.app.getName()} ${electron.app.getVersion()}`;

BIN
images/app-icons/tray/new-windowTemplate-inverted.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 348 B

BIN
images/app-icons/tray/new-windowTemplate-inverted@1.25x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 427 B

BIN
images/app-icons/tray/new-windowTemplate-inverted@1.5x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 514 B

BIN
images/app-icons/tray/new-windowTemplate-inverted@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 649 B

BIN
images/app-icons/tray/new-windowTemplate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 331 B

BIN
images/app-icons/tray/new-windowTemplate@1.25x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 409 B

BIN
images/app-icons/tray/new-windowTemplate@1.5x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 481 B

BIN
images/app-icons/tray/new-windowTemplate@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 626 B

243
package-lock.json generated
View File

@ -100,14 +100,14 @@
"trilium": "src/main.js" "trilium": "src/main.js"
}, },
"devDependencies": { "devDependencies": {
"@electron-forge/cli": "7.7.0", "@electron-forge/cli": "7.8.0",
"@electron-forge/maker-deb": "7.7.0", "@electron-forge/maker-deb": "7.8.0",
"@electron-forge/maker-dmg": "7.7.0", "@electron-forge/maker-dmg": "7.8.0",
"@electron-forge/maker-flatpak": "7.7.0", "@electron-forge/maker-flatpak": "7.8.0",
"@electron-forge/maker-rpm": "7.7.0", "@electron-forge/maker-rpm": "7.8.0",
"@electron-forge/maker-squirrel": "7.7.0", "@electron-forge/maker-squirrel": "7.8.0",
"@electron-forge/maker-zip": "7.7.0", "@electron-forge/maker-zip": "7.8.0",
"@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron-forge/plugin-auto-unpack-natives": "7.8.0",
"@electron/rebuild": "3.7.1", "@electron/rebuild": "3.7.1",
"@eslint/js": "9.23.0", "@eslint/js": "9.23.0",
"@fullcalendar/core": "6.1.15", "@fullcalendar/core": "6.1.15",
@ -569,9 +569,9 @@
} }
}, },
"node_modules/@electron-forge/cli": { "node_modules/@electron-forge/cli": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.8.0.tgz",
"integrity": "sha512-QfnjghmlHMb7dyArR5cbPA+MP9ff/ulWZi6R/a5MkHlKyhrysRfjzDtZDsmkEv9mGQgRwylssgXrZrKHGlxFkw==", "integrity": "sha512-XZ+Hg7pxeE9pgrahqcpMlND+VH0l0UTZLyO5wkI+YfanNyBQksB2mw24XeEtCA6x8F2IaEYdIGgijmPF6qpjzA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -585,15 +585,16 @@
], ],
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/core": "7.7.0", "@electron-forge/core": "7.8.0",
"@electron-forge/core-utils": "7.7.0", "@electron-forge/core-utils": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron/get": "^3.0.0", "@electron/get": "^3.0.0",
"chalk": "^4.0.0", "chalk": "^4.0.0",
"commander": "^11.1.0", "commander": "^11.1.0",
"debug": "^4.3.1", "debug": "^4.3.1",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"listr2": "^7.0.2", "listr2": "^7.0.2",
"log-symbols": "^4.0.0",
"semver": "^7.2.1" "semver": "^7.2.1"
}, },
"bin": { "bin": {
@ -634,9 +635,9 @@
} }
}, },
"node_modules/@electron-forge/core": { "node_modules/@electron-forge/core": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-7.8.0.tgz",
"integrity": "sha512-BWhg1Zw1bhpDuZowGH3lXDiL9zZBsYFNjtqyMqmkjcEm5xf9Dzs8mpRpNjtkpf3jit3LB4PNGMLj3c8ix0h4vQ==", "integrity": "sha512-7byf660ECZND+irOhGxvpmRXjk1bMrsTWh5J2AZMEvaXI8tub9OrZY9VSbi5fcDt0lpHPKmgVk7NRf/ZjJ+beQ==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -650,17 +651,17 @@
], ],
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/core-utils": "7.7.0", "@electron-forge/core-utils": "7.8.0",
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/plugin-base": "7.7.0", "@electron-forge/plugin-base": "7.8.0",
"@electron-forge/publisher-base": "7.7.0", "@electron-forge/publisher-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron-forge/template-base": "7.7.0", "@electron-forge/template-base": "7.8.0",
"@electron-forge/template-vite": "7.7.0", "@electron-forge/template-vite": "7.8.0",
"@electron-forge/template-vite-typescript": "7.7.0", "@electron-forge/template-vite-typescript": "7.8.0",
"@electron-forge/template-webpack": "7.7.0", "@electron-forge/template-webpack": "7.8.0",
"@electron-forge/template-webpack-typescript": "7.7.0", "@electron-forge/template-webpack-typescript": "7.8.0",
"@electron-forge/tracer": "7.7.0", "@electron-forge/tracer": "7.8.0",
"@electron/get": "^3.0.0", "@electron/get": "^3.0.0",
"@electron/packager": "^18.3.5", "@electron/packager": "^18.3.5",
"@electron/rebuild": "^3.7.0", "@electron/rebuild": "^3.7.0",
@ -689,13 +690,13 @@
} }
}, },
"node_modules/@electron-forge/core-utils": { "node_modules/@electron-forge/core-utils": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.8.0.tgz",
"integrity": "sha512-kgOkiLzqnySkcpt26rBg8AoZsI1ID3f6s/dQlzfRJisWZTKTu4ryiMcaC0F07DVjaYFnEl9SQ86IvkTcyS97mQ==", "integrity": "sha512-ZioRzqkXVOGuwkfvXN/FPZxcssJ9AkOZx6RvxomQn90F77G2KfEbw4ZwAxVTQ+jWNUzydTic5qavWle++Y5IeA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron/rebuild": "^3.7.0", "@electron/rebuild": "^3.7.0",
"@malept/cross-spawn-promise": "^2.0.0", "@malept/cross-spawn-promise": "^2.0.0",
"chalk": "^4.0.0", "chalk": "^4.0.0",
@ -766,13 +767,13 @@
} }
}, },
"node_modules/@electron-forge/maker-base": { "node_modules/@electron-forge/maker-base": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.8.0.tgz",
"integrity": "sha512-9u+mmBLBAUHuH0+IGw94EGVTDD4CPKX05h5pp5/PIaijy16ss5dymK4vEp3s2XJMFlza2PsCgLLYBgDcAE2Dqg==", "integrity": "sha512-yGRvz70w+NnKO7PhzNFRgYM+x6kxYFgpbChJIQBs3WChd9bGjL+MZLrwYqmxOFLpWNwRAJ6PEi4E/8U5GgV6AQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"which": "^2.0.2" "which": "^2.0.2"
}, },
@ -809,14 +810,14 @@
} }
}, },
"node_modules/@electron-forge/maker-deb": { "node_modules/@electron-forge/maker-deb": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-7.8.0.tgz",
"integrity": "sha512-yMT0TWpCwXaC9+AYpSr9PBIhcZR297wdJUk5PnEnIROsvOW2y1sh7ny7YdHXTxkvhWdbqY8sLQruL3BE+CyE8w==", "integrity": "sha512-9jjhLm/1IBIo0UuRdELgvBhUkNjK3tHNlUsrqeb8EJwWJZShbPwHYZJj+VbgjQfJFFzhHwBBDJViBXJ/4ePv+g==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0" "@electron-forge/shared-types": "7.8.0"
}, },
"engines": { "engines": {
"node": ">= 16.4.0" "node": ">= 16.4.0"
@ -826,14 +827,14 @@
} }
}, },
"node_modules/@electron-forge/maker-dmg": { "node_modules/@electron-forge/maker-dmg": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-7.8.0.tgz",
"integrity": "sha512-Hq4nsY6eOdtigN4RLc9i2SbLEr46J6FfbdU+r39R/EVIJ82WRk7JPrCqbckEM7KY1TjhmrnhPWeviWoGAjbXhA==", "integrity": "sha512-ml6GpHvUyhOapIF1ALEM4zCqXiAf2+t+3FqKnjNtiVbH5fnV2CW//SWWozrvAGTrYGi/6V4s9TL/rIek0BHOPA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -872,14 +873,14 @@
} }
}, },
"node_modules/@electron-forge/maker-flatpak": { "node_modules/@electron-forge/maker-flatpak": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-flatpak/-/maker-flatpak-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-flatpak/-/maker-flatpak-7.8.0.tgz",
"integrity": "sha512-WDNmGTulgPe4FEgxq128TI58EtVyS2Fq3loXhfirNuzoXpBtvt0LHK447cmtKHAvZZ+R802uriTcj28L+Iub3A==", "integrity": "sha512-tnOWQLVvNZVO9xWmhUHK4OsQgYUpEIn0DX1M8FkgQCYSDXcPg/CZaZ66zqj/gu1KzGAOWg1m5KlTbITRY5Jmcg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -918,14 +919,14 @@
} }
}, },
"node_modules/@electron-forge/maker-rpm": { "node_modules/@electron-forge/maker-rpm": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-7.8.0.tgz",
"integrity": "sha512-M9cFO6bCnOuA6BwBUUw35FrnWciWeFyLuByO0KOn3zEYeBDqG2fbBgXXS6OKcRHrpnJVTwiLY5S7eviyO1DJzQ==", "integrity": "sha512-oTH951NE39LOX2wYMg+C06vBZDWUP/0dsK01PlXEl5e5YfQM5Cifsk3E7BzE6BpZdWRJL3k/ETqpyYeIGNb1jw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0" "@electron-forge/shared-types": "7.8.0"
}, },
"engines": { "engines": {
"node": ">= 16.4.0" "node": ">= 16.4.0"
@ -935,14 +936,14 @@
} }
}, },
"node_modules/@electron-forge/maker-squirrel": { "node_modules/@electron-forge/maker-squirrel": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-7.8.0.tgz",
"integrity": "sha512-9Gcq8e6+1MuXGeE7bEpk7VTd86c0riXTsDFKW8OqwVozeBYhoCd6GU59RmI3b7mcAIKOY1cBY97B+/5bnZ8ZYg==", "integrity": "sha512-On8WIyjNtNlWf8NJRRVToighGCCU+wcxytFM0F8Zx/pLszgc01bt7wIarOiAIzuIT9Z8vshAYA0iG1U099jfeA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -981,14 +982,14 @@
} }
}, },
"node_modules/@electron-forge/maker-zip": { "node_modules/@electron-forge/maker-zip": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-7.8.0.tgz",
"integrity": "sha512-/rRFiPcojk0hcn+NOfHv2SlMNvghBk1RN0nuLHbbe8r+C0vG4LJV9ee/Y0HhVKkcpapJOQ+MasXJ86fzAp5uAg==", "integrity": "sha512-7MLD7GkZdlGecC9GvgBu0sWYt48p3smYvr+YCwlpdH1CTeLmWhvCqeH33a2AB0XI5CY8U8jnkG2jgdTkzr/EQw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/maker-base": "7.7.0", "@electron-forge/maker-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"cross-zip": "^4.0.0", "cross-zip": "^4.0.0",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"got": "^11.8.5" "got": "^11.8.5"
@ -1026,53 +1027,53 @@
} }
}, },
"node_modules/@electron-forge/plugin-auto-unpack-natives": { "node_modules/@electron-forge/plugin-auto-unpack-natives": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/plugin-auto-unpack-natives/-/plugin-auto-unpack-natives-7.8.0.tgz",
"integrity": "sha512-cYeD4x2oQXUyK4+DtIR6wMxcIHvyPgsJq1diEuBoQ+MFTh+s6DXZl6JvwtI3scD0XieCkzcmUmf8ygzqs124+w==", "integrity": "sha512-JGal5ltZmbTQ5rNq67OgGC4MJ2zjjFW0fqykHy8X9J8cgaH7SRdKkT4yYZ8jH01IAF1J57FD2zIob1MvcBqjcg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/plugin-base": "7.7.0", "@electron-forge/plugin-base": "7.8.0",
"@electron-forge/shared-types": "7.7.0" "@electron-forge/shared-types": "7.8.0"
}, },
"engines": { "engines": {
"node": ">= 16.4.0" "node": ">= 16.4.0"
} }
}, },
"node_modules/@electron-forge/plugin-base": { "node_modules/@electron-forge/plugin-base": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.8.0.tgz",
"integrity": "sha512-6wisQ4ZKOWey48wFF+JHzih7AuQuVma5KauwNEju2Dh2ibwDMJmPy0FWVolMSg7XUIMbGKLADGilxX6XRv8qNQ==", "integrity": "sha512-rDeeChRWIp5rQVo3Uc1q0ncUvA+kWWURW7tMuQjPvy2qVSgX+jIf5krk+T1Dp06+D4YZzEIrkibRaamAaIcR1w==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0" "@electron-forge/shared-types": "7.8.0"
}, },
"engines": { "engines": {
"node": ">= 16.4.0" "node": ">= 16.4.0"
} }
}, },
"node_modules/@electron-forge/publisher-base": { "node_modules/@electron-forge/publisher-base": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.8.0.tgz",
"integrity": "sha512-jHKvUc1peBBSl2t5d1x6M3CNyCMyNB+NnTO9LmA1dWFQ3oRDFwromIH5KjRqPJj6l4AyH0/XJogdO7Nn4Eyn6Q==", "integrity": "sha512-wrZyptJ0Uqvlh2wYzDZfIu2HgCQ+kdGiBlcucmLY4W+GUqf043O8cbYso3D9NXQxOow55QC/1saCQkgLphprPA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0" "@electron-forge/shared-types": "7.8.0"
}, },
"engines": { "engines": {
"node": ">= 16.4.0" "node": ">= 16.4.0"
} }
}, },
"node_modules/@electron-forge/shared-types": { "node_modules/@electron-forge/shared-types": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.8.0.tgz",
"integrity": "sha512-1zQsmudkAuHv0HnJtSJY3pvTeuN3fnSa9BR6cbeUlcpOfrnG4OTG03FqerHfyIWaBRVy7jGgif0NhKKE9azKyg==", "integrity": "sha512-Ul+7HPvAZiAirqpZm0vc9YvlkAE+2bcrI10p3t50mEtuxn5VO/mB72NXiEKfWzHm8F31JySIe9bUV6s1MHQcCw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/tracer": "7.7.0", "@electron-forge/tracer": "7.8.0",
"@electron/packager": "^18.3.5", "@electron/packager": "^18.3.5",
"@electron/rebuild": "^3.7.0", "@electron/rebuild": "^3.7.0",
"listr2": "^7.0.2" "listr2": "^7.0.2"
@ -1082,14 +1083,14 @@
} }
}, },
"node_modules/@electron-forge/template-base": { "node_modules/@electron-forge/template-base": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.8.0.tgz",
"integrity": "sha512-jwnhEHNIyQfbwJ6R8SuZIJApHKBykDr/rSgUF3km9nr2qAUSoUUV7RaJa/uiQJMtvamXenuo5K84C2NzumzS3A==", "integrity": "sha512-hc8NwoDqEEmZFH/p0p3MK/7xygMmI+cm8Gavoj2Mr2xS7VUUu4r3b5PwIGKvkLfPG34uwsiVwtid2t1rWGF4UA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/core-utils": "7.7.0", "@electron-forge/core-utils": "7.8.0",
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@malept/cross-spawn-promise": "^2.0.0", "@malept/cross-spawn-promise": "^2.0.0",
"debug": "^4.3.1", "debug": "^4.3.1",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
@ -1128,14 +1129,14 @@
} }
}, },
"node_modules/@electron-forge/template-vite": { "node_modules/@electron-forge/template-vite": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.8.0.tgz",
"integrity": "sha512-6p+U6FDWrmF7XgSLkrO07OOgJcrrrArbnExSckGJdBnupxmIDf1Y+exwfHHKdxX6/FfkA6JST5nRGjgA5CFqcw==", "integrity": "sha512-bf/jd8WzD0gU7Jet+WSi0Lm0SQmseb08WY27ZfJYEs2EVNMiwDfPicgQnOaqP++2yTrXhj1OY/rolZCP9CUyVw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron-forge/template-base": "7.7.0", "@electron-forge/template-base": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -1143,14 +1144,14 @@
} }
}, },
"node_modules/@electron-forge/template-vite-typescript": { "node_modules/@electron-forge/template-vite-typescript": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.8.0.tgz",
"integrity": "sha512-32C/+PF+hIloTdbRx7OutvqnTkkC7BHeQxNw4/zG2TfQ3cjl7JUD6A2UvTUHtv5KHkK2hDw6ZdahPwpJO41YSA==", "integrity": "sha512-kW3CaVxKHUYuVfY+rT3iepeZ69frBRGh3YZOngLY2buCvGIqNEx+VCgrFBRDDbOKGmwQtwO1E9wp2rtC8q6Ztg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron-forge/template-base": "7.7.0", "@electron-forge/template-base": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -1214,14 +1215,14 @@
} }
}, },
"node_modules/@electron-forge/template-webpack": { "node_modules/@electron-forge/template-webpack": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.8.0.tgz",
"integrity": "sha512-7Hb1wejKqtvPXqhelubUNAh39FtClB/4JDtWzyAsL2iC3XeB5qh6pITz8+nW/rF2qW/JAepc/lnreqKn34P2ig==", "integrity": "sha512-AdLGC6NVgrd7Q0SaaeiwJKmSBjN6C2EHxZgLMy1yxNSpazU9m3DtYQilDjXqmCWfxkeNzdke0NaeDvLgdJSw5A==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron-forge/template-base": "7.7.0", "@electron-forge/template-base": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -1229,14 +1230,14 @@
} }
}, },
"node_modules/@electron-forge/template-webpack-typescript": { "node_modules/@electron-forge/template-webpack-typescript": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.8.0.tgz",
"integrity": "sha512-w1vRAjGy0MjjdEDYPpZcpkMo2e3z5uEwfJdwVOpBeha7p2WM/Y6go21K+7pSqGp8Xmq4zlE20hq5MEx8Bs8eZg==", "integrity": "sha512-Pl8l+gv3HzqCfFIMLxlEsoAkNd0VEWeZZ675SYyqs0/kBQUifn0bKNhVE4gUZwKGgQCcG1Gvb23KdVGD3H3XmA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron-forge/shared-types": "7.7.0", "@electron-forge/shared-types": "7.8.0",
"@electron-forge/template-base": "7.7.0", "@electron-forge/template-base": "7.8.0",
"fs-extra": "^10.0.0" "fs-extra": "^10.0.0"
}, },
"engines": { "engines": {
@ -1300,9 +1301,9 @@
} }
}, },
"node_modules/@electron-forge/tracer": { "node_modules/@electron-forge/tracer": {
"version": "7.7.0", "version": "7.8.0",
"resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.8.0.tgz",
"integrity": "sha512-R/JiGFzWhwfVyc6ioT4l5FFChRLS4Z2tWPeQfPcyoemdpzKpI1rvMHti42gzWXFW8GdzkhG0G3ZWfKiF3y3x/Q==", "integrity": "sha512-t4fIATZEX6/7PJNfyh6tLzKEsNMpO01Nz/rgHWBxeRvjCw5UNul9OOxoM7b43vfFAO9Jv++34oI3VJ09LeVQ2Q==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -1313,9 +1314,9 @@
} }
}, },
"node_modules/@electron/asar": { "node_modules/@electron/asar": {
"version": "3.2.17", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.17.tgz", "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.3.1.tgz",
"integrity": "sha512-OcWImUI686w8LkghQj9R2ynZ2ME693Ek6L1SiaAgqGKzBaTIZw3fHDqN82Rcl+EU1Gm9EgkJ5KLIY/q5DCRbbA==", "integrity": "sha512-WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -1511,9 +1512,9 @@
} }
}, },
"node_modules/@electron/osx-sign": { "node_modules/@electron/osx-sign": {
"version": "1.3.2", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.2.tgz", "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.3.tgz",
"integrity": "sha512-KqVlm9WMWq19lBpCXQoThC/Koaiji2zotUDYwZDaZlZZym+FXY9mQW8wN6sUQ93nkVc42f3TQ1S/XN9S1kjM5Q==", "integrity": "sha512-KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==",
"dev": true, "dev": true,
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
@ -1677,13 +1678,13 @@
} }
}, },
"node_modules/@electron/universal": { "node_modules/@electron/universal": {
"version": "2.0.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz",
"integrity": "sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==", "integrity": "sha512-mqY1szx5/d5YLvfCDWWoJdkSIjIz+NdWN4pN0r78lYiE7De+slLpuF3lVxIT+hlJnwk5sH2wFRMl6/oUgUVO3A==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron/asar": "^3.2.7", "@electron/asar": "^3.3.1",
"@malept/cross-spawn-promise": "^2.0.0", "@malept/cross-spawn-promise": "^2.0.0",
"debug": "^4.3.1", "debug": "^4.3.1",
"dir-compare": "^4.2.0", "dir-compare": "^4.2.0",

16
package.json
View File

@ -157,14 +157,14 @@
"yauzl": "3.2.0" "yauzl": "3.2.0"
}, },
"devDependencies": { "devDependencies": {
"@electron-forge/cli": "7.7.0", "@electron-forge/cli": "7.8.0",
"@electron-forge/maker-deb": "7.7.0", "@electron-forge/maker-deb": "7.8.0",
"@electron-forge/maker-dmg": "7.7.0", "@electron-forge/maker-dmg": "7.8.0",
"@electron-forge/maker-flatpak": "7.7.0", "@electron-forge/maker-flatpak": "7.8.0",
"@electron-forge/maker-rpm": "7.7.0", "@electron-forge/maker-rpm": "7.8.0",
"@electron-forge/maker-squirrel": "7.7.0", "@electron-forge/maker-squirrel": "7.8.0",
"@electron-forge/maker-zip": "7.7.0", "@electron-forge/maker-zip": "7.8.0",
"@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron-forge/plugin-auto-unpack-natives": "7.8.0",
"@electron/rebuild": "3.7.1", "@electron/rebuild": "3.7.1",
"@eslint/js": "9.23.0", "@eslint/js": "9.23.0",
"@fullcalendar/core": "6.1.15", "@fullcalendar/core": "6.1.15",

7
src/public/stylesheets/theme-next-dark.css
View File

@ -190,8 +190,11 @@
--right-pane-item-hover-background: #ffffff26; --right-pane-item-hover-background: #ffffff26;
--right-pane-item-hover-color: white; --right-pane-item-hover-color: white;
--scrollbar-border-color: #666; --scrollbar-thumb-color: #fdfdfd5c;
--scrollbar-background-color: #333; --scrollbar-thumb-color-hover: #ffffff7d;
--scrollbar-border-color: unset; /* Deprecated */
--scrollbar-background-color: unset; /* Deprecated */
--link-color: lightskyblue; --link-color: lightskyblue;
--mermaid-theme: dark; --mermaid-theme: dark;

7
src/public/stylesheets/theme-next-light.css
View File

@ -189,8 +189,11 @@
--right-pane-item-hover-background: #ececec; --right-pane-item-hover-background: #ececec;
--right-pane-item-hover-color: inherit; --right-pane-item-hover-color: inherit;
--scrollbar-border-color: #ddd; --scrollbar-thumb-color: #0000005c;
--scrollbar-background-color: #ddd; --scrollbar-thumb-color-hover: #00000066;
--scrollbar-border-color: unset; /* Deprecated */
--scrollbar-background-color: unset; /* Deprecated */
--link-color: blue; --link-color: blue;
--mermaid-theme: default; --mermaid-theme: default;

80
src/public/stylesheets/theme-next/forms.css
View File

@ -660,3 +660,83 @@ a.tn-link:hover[href^="https://"]:not(.no-arrow)::after,
input[type="range"] { input[type="range"] {
background: transparent; background: transparent;
} }
/*
* WebKit scrollbars
*/
:root {
--scrollbar-thickness: 10px;
--scrollbar-thumb-thickness: 3px;
--scrollbar-thumb-hover-thickness: 8px;
--scrollbar-start-end-gap: 8px;
}
/* Scrollbar's body */
::-webkit-scrollbar:vertical {
width: var(--scrollbar-thickness) !important;
}
::-webkit-scrollbar:horizontal {
height: var(--scrollbar-thickness) !important;
}
/* Scrollbar's thumb */
::-webkit-scrollbar-thumb {
--s-thumb-thickness: var(--scrollbar-thumb-thickness);
--s-thumb-color: var(--scrollbar-thumb-color);
--s-gradient-angle: 90deg;
--s-gradient-p1: calc((var(--scrollbar-thickness) - var(--s-thumb-thickness)) / 2);
--s-gradient-p2: calc(var(--s-gradient-p1) + var(--s-thumb-thickness));
border: none !important;
background: linear-gradient(var(--s-gradient-angle),
transparent, transparent var(--s-gradient-p1),
var(--s-thumb-color) 0px, var(--s-thumb-color) var(--s-gradient-p2),
transparent 0) !important;
border-radius: calc(var(--scrollbar-thickness) / 2) !important;
}
::-webkit-scrollbar-thumb:horizontal {
--s-gradient-angle: 0deg;
}
::-webkit-scrollbar-thumb:hover {
--s-thumb-thickness: var(--scrollbar-thumb-hover-thickness);
--s-thumb-color: var(--scrollbar-thumb-color-hover);
}
/* Scrollbar's increment/decrement buttons (repurposed as a scrollbar start/end gap) */
::-webkit-scrollbar-button:vertical {
height: var(--scrollbar-start-end-gap);
}
::-webkit-scrollbar-button:horizontal {
width: var(--scrollbar-start-end-gap);
}
/*
* Firefox scrollbars
*
* Unsupported features: --scrollbar-thumb-thickness, --scrollbar-thumb-hover-thickness,
* --scrollbar-start-end-gap, --scrollbar-thumb-color-hover.
*/
:root {
scrollbar-color: var(--scrollbar-thumb-color) transparent;
scrollbar-width: var(--scrollbar-thickness);
}
@supports selector(::-webkit-scrollbar) {
/* Prevent the scrollbar-color and scrollbar-width properties to override the custom styles
* defined using ::-webkit-scrollbar. */
:root {
scrollbar-color: unset;
scrollbar-width: unset;
}
}

7
src/services/options.ts
View File

@ -25,7 +25,12 @@ function getOptionOrNull(name: OptionNames): string | null {
option = becca.getOption(name); option = becca.getOption(name);
} else { } else {
// e.g. in initial sync becca is not loaded because DB is not initialized // e.g. in initial sync becca is not loaded because DB is not initialized
option = sql.getRow<OptionRow>("SELECT * FROM options WHERE name = ?", [name]); try {
option = sql.getRow<OptionRow>("SELECT * FROM options WHERE name = ?", [name]);
} catch (e: unknown) {
// DB is not initialized.
return null;
}
} }
return option ? option.value : null; return option ? option.value : null;

161
src/services/tray.ts
View File

@ -1,4 +1,4 @@
import { Menu, Tray } from "electron"; import { Menu, Tray, BrowserWindow } from "electron";
import path from "path"; import path from "path";
import windowService from "./window.js"; import windowService from "./window.js";
import optionService from "./options.js"; import optionService from "./options.js";
@ -17,7 +17,7 @@ import cls from "./cls.js";
let tray: Tray; let tray: Tray;
// `mainWindow.isVisible` doesn't work with `mainWindow.show` and `mainWindow.hide` - it returns `false` when the window // `mainWindow.isVisible` doesn't work with `mainWindow.show` and `mainWindow.hide` - it returns `false` when the window
// is minimized // is minimized
let isVisible = true; let windowVisibilityMap: Record<number, boolean> = {};; // Dictionary for storing window ID and its visibility status
function getTrayIconPath() { function getTrayIconPath() {
let name: string; let name: string;
@ -37,53 +37,93 @@ function getIconPath(name: string) {
return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}Template${suffix}.png`); return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}Template${suffix}.png`);
} }
function registerVisibilityListener() { function registerVisibilityListener(window: BrowserWindow) {
const mainWindow = windowService.getMainWindow(); if (!window) {
if (!mainWindow) {
return; return;
} }
// They need to be registered before the tray updater is registered // They need to be registered before the tray updater is registered
mainWindow.on("show", () => { window.on("show", () => {
isVisible = true; windowVisibilityMap[window.id] = true;
updateTrayMenu(); updateTrayMenu();
}); });
mainWindow.on("hide", () => { window.on("hide", () => {
isVisible = false; windowVisibilityMap[window.id] = false;
updateTrayMenu(); updateTrayMenu();
}); });
mainWindow.on("minimize", updateTrayMenu); window.on("minimize", updateTrayMenu);
mainWindow.on("maximize", updateTrayMenu); window.on("maximize", updateTrayMenu);
if (!isMac) {
// macOS uses template icons which work great on dark & light themes.
nativeTheme.on("updated", updateTrayMenu);
}
ipcMain.on("reload-tray", updateTrayMenu);
i18next.on("languageChanged", updateTrayMenu);
} }
function updateTrayMenu() { function getWindowTitle(window: BrowserWindow | null) {
const mainWindow = windowService.getMainWindow(); if (!window) {
if (!mainWindow) {
return; return;
} }
const title = window.getTitle();
const titleWithoutAppName = title.replace(/\s-\s[^-]+$/, ''); // Remove the name of the app
function ensureVisible() { // Limit title maximum length to 17
if (mainWindow) { if (titleWithoutAppName.length > 20) {
mainWindow.show(); return titleWithoutAppName.substring(0, 17) + '...';
mainWindow.focus(); }
return titleWithoutAppName;
}
function updateWindowVisibilityMap(allWindows: BrowserWindow[]) {
const currentWindowIds: number[] = allWindows.map(window => window.id);
// Deleting closed windows from windowVisibilityMap
for (const [id, visibility] of Object.entries(windowVisibilityMap)) {
const windowId = Number(id);
if (!currentWindowIds.includes(windowId)) {
delete windowVisibilityMap[windowId];
}
}
// Iterate through allWindows to make sure the ID of each window exists in windowVisibilityMap
allWindows.forEach(window => {
const windowId = window.id;
if (!(windowId in windowVisibilityMap)) {
// If it does not exist, it is the newly created window
windowVisibilityMap[windowId] = true;
registerVisibilityListener(window);
}
});
}
function updateTrayMenu() {
const lastFocusedWindow = windowService.getLastFocusedWindow();
const allWindows = windowService.getAllWindows();
updateWindowVisibilityMap(allWindows);
function ensureVisible(win: BrowserWindow) {
if (win) {
win.show();
win.focus();
}
}
function openNewWindow() {
if (lastFocusedWindow){
lastFocusedWindow.webContents.send("globalShortcut", "openNewWindow");
} }
} }
function triggerKeyboardAction(actionName: KeyboardActionNames) { function triggerKeyboardAction(actionName: KeyboardActionNames) {
mainWindow?.webContents.send("globalShortcut", actionName); if (lastFocusedWindow){
ensureVisible(); lastFocusedWindow.webContents.send("globalShortcut", actionName);
ensureVisible(lastFocusedWindow);
}
} }
function openInSameTab(note: BNote | BRecentNote) { function openInSameTab(note: BNote | BRecentNote) {
mainWindow?.webContents.send("openInSameTab", note.noteId); if (lastFocusedWindow){
ensureVisible(); lastFocusedWindow.webContents.send("openInSameTab", note.noteId);
ensureVisible(lastFocusedWindow);
}
} }
function buildBookmarksMenu() { function buildBookmarksMenu() {
@ -144,20 +184,44 @@ function updateTrayMenu() {
return menuItems; return menuItems;
} }
const contextMenu = Menu.buildFromTemplate([ const windowVisibilityMenuItems: Electron.MenuItemConstructorOptions[] = [];
{
label: t("tray.show-windows"), // Only call getWindowTitle if windowVisibilityMap has more than one window
const showTitle = Object.keys(windowVisibilityMap).length > 1;
for (const idStr in windowVisibilityMap) {
const id = parseInt(idStr, 10); // Get the ID of the window and make sure it is a number
const isVisible = windowVisibilityMap[id];
const win = allWindows.find(w => w.id === id);
if (!win) {
continue;
}
windowVisibilityMenuItems.push({
label: showTitle ? `${t("tray.show-windows")}: ${getWindowTitle(win)}` : t("tray.show-windows"),
type: "checkbox", type: "checkbox",
checked: isVisible, checked: isVisible,
click: () => { click: () => {
if (isVisible) { if (isVisible) {
mainWindow.hide(); win.hide();
windowVisibilityMap[id] = false;
} else { } else {
ensureVisible(); ensureVisible(win);
windowVisibilityMap[id] = true;
} }
} }
}, });
}
const contextMenu = Menu.buildFromTemplate([
...windowVisibilityMenuItems,
{ type: "separator" }, { type: "separator" },
{
label: t("tray.open_new_window"),
type: "normal",
icon: getIconPath("new-window"),
click: () => openNewWindow()
},
{ {
label: t("tray.new-note"), label: t("tray.new-note"),
type: "normal", type: "normal",
@ -188,7 +252,10 @@ function updateTrayMenu() {
type: "normal", type: "normal",
icon: getIconPath("close"), icon: getIconPath("close"),
click: () => { click: () => {
mainWindow.close(); const windows = BrowserWindow.getAllWindows();
windows.forEach(window => {
window.close();
});
} }
} }
]); ]);
@ -197,16 +264,18 @@ function updateTrayMenu() {
} }
function changeVisibility() { function changeVisibility() {
const window = windowService.getMainWindow(); const lastFocusedWindow = windowService.getLastFocusedWindow();
if (!window) {
if (!lastFocusedWindow) {
return; return;
} }
if (isVisible) { // If the window is visible, hide it
window.hide(); if (windowVisibilityMap[lastFocusedWindow.id]) {
lastFocusedWindow.hide();
} else { } else {
window.show(); lastFocusedWindow.show();
window.focus(); lastFocusedWindow.focus();
} }
} }
@ -221,9 +290,15 @@ function createTray() {
tray.on("click", changeVisibility); tray.on("click", changeVisibility);
updateTrayMenu(); updateTrayMenu();
registerVisibilityListener(); if (!isMac) {
// macOS uses template icons which work great on dark & light themes.
nativeTheme.on("updated", updateTrayMenu);
}
ipcMain.on("reload-tray", updateTrayMenu);
i18next.on("languageChanged", updateTrayMenu);
} }
export default { export default {
createTray createTray,
updateTrayMenu
}; };

48
src/services/window.ts
View File

@ -11,6 +11,7 @@ import remoteMain from "@electron/remote/main/index.js";
import { BrowserWindow, shell, type App, type BrowserWindowConstructorOptions, type WebContents } from "electron"; import { BrowserWindow, shell, type App, type BrowserWindowConstructorOptions, type WebContents } from "electron";
import { dialog, ipcMain } from "electron"; import { dialog, ipcMain } from "electron";
import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js"; import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js";
import tray from "./tray.js";
import { fileURLToPath } from "url"; import { fileURLToPath } from "url";
import { dirname } from "path"; import { dirname } from "path";
@ -19,6 +20,26 @@ import { t } from "i18next";
// Prevent the window being garbage collected // Prevent the window being garbage collected
let mainWindow: BrowserWindow | null; let mainWindow: BrowserWindow | null;
let setupWindow: BrowserWindow | null; let setupWindow: BrowserWindow | null;
let allWindows: BrowserWindow[] = []; // // Used to store all windows, sorted by the order of focus.
function trackWindowFocus(win: BrowserWindow) {
// We need to get the last focused window from allWindows. If the last window is closed, we return the previous window.
// Therefore, we need to push the window into the allWindows array every time it gets focused.
win.on("focus", () => {
allWindows = allWindows.filter(w => !w.isDestroyed() && w !== win);
allWindows.push(win);
if (!optionService.getOptionBool("disableTray")) {
tray.updateTrayMenu();
}
});
win.on("closed", () => {
allWindows = allWindows.filter(w => !w.isDestroyed());
if (!optionService.getOptionBool("disableTray")) {
tray.updateTrayMenu();
}
});
}
async function createExtraWindow(extraWindowHash: string) { async function createExtraWindow(extraWindowHash: string) {
const spellcheckEnabled = optionService.getOptionBool("spellCheckEnabled"); const spellcheckEnabled = optionService.getOptionBool("spellCheckEnabled");
@ -42,6 +63,8 @@ async function createExtraWindow(extraWindowHash: string) {
win.loadURL(`http://127.0.0.1:${port}/?extraWindow=1${extraWindowHash}`); win.loadURL(`http://127.0.0.1:${port}/?extraWindow=1${extraWindowHash}`);
configureWebContents(win.webContents, spellcheckEnabled); configureWebContents(win.webContents, spellcheckEnabled);
trackWindowFocus(win);
} }
ipcMain.on("create-extra-window", (event, arg) => { ipcMain.on("create-extra-window", (event, arg) => {
@ -154,18 +177,21 @@ async function createMainWindow(app: App) {
configureWebContents(mainWindow.webContents, spellcheckEnabled); configureWebContents(mainWindow.webContents, spellcheckEnabled);
app.on("second-instance", (event, commandLine) => { app.on("second-instance", (event, commandLine) => {
const lastFocusedWindow = getLastFocusedWindow();
if (commandLine.includes("--new-window")) { if (commandLine.includes("--new-window")) {
createExtraWindow(""); createExtraWindow("");
} else if (mainWindow) { } else if (lastFocusedWindow) {
// Someone tried to run a second instance, we should focus our window. // Someone tried to run a second instance, we should focus our window.
// see www.ts "requestSingleInstanceLock" for the rest of this logic with explanation // see www.ts "requestSingleInstanceLock" for the rest of this logic with explanation
if (mainWindow.isMinimized()) { if (lastFocusedWindow.isMinimized()) {
mainWindow.restore(); lastFocusedWindow.restore();
} }
lastFocusedWindow.show();
mainWindow.focus(); lastFocusedWindow.focus();
} }
}); });
trackWindowFocus(mainWindow);
} }
function getWindowExtraOpts() { function getWindowExtraOpts() {
@ -296,10 +322,20 @@ function getMainWindow() {
return mainWindow; return mainWindow;
} }
function getLastFocusedWindow() {
return allWindows.length > 0 ? allWindows[allWindows.length - 1] : null;
}
function getAllWindows(){
return allWindows;
}
export default { export default {
createMainWindow, createMainWindow,
createSetupWindow, createSetupWindow,
closeSetupWindow, closeSetupWindow,
registerGlobalShortcuts, registerGlobalShortcuts,
getMainWindow getMainWindow,
getLastFocusedWindow,
getAllWindows
}; };

3
translations/cn/server.json
View File

@ -271,7 +271,8 @@
"bookmarks": "书签", "bookmarks": "书签",
"today": "打开今天的日记笔记", "today": "打开今天的日记笔记",
"new-note": "新建笔记", "new-note": "新建笔记",
"show-windows": "显示窗口" "show-windows": "显示窗口",
"open_new_window": "打开新窗口"
}, },
"migration": { "migration": {
"old_version": "由您当前版本的直接迁移不被支持。请先升级到最新的 v0.60.4 然后再到这个版本。", "old_version": "由您当前版本的直接迁移不被支持。请先升级到最新的 v0.60.4 然后再到这个版本。",

3
translations/en/server.json
View File

@ -272,7 +272,8 @@
"bookmarks": "Bookmarks", "bookmarks": "Bookmarks",
"today": "Open today's journal note", "today": "Open today's journal note",
"new-note": "New note", "new-note": "New note",
"show-windows": "Show windows" "show-windows": "Show windows",
"open_new_window": "Open new window"
}, },
"migration": { "migration": {
"old_version": "Direct migration from your current version is not supported. Please upgrade to the latest v0.60.4 first and only then to this version.", "old_version": "Direct migration from your current version is not supported. Please upgrade to the latest v0.60.4 first and only then to this version.",