Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix restoring hidden desktop window

tianma-ifbe0e7b94e080
diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjs
index 7b777205..5f58ac31 100644
--- a/apps/desktop/src/main/index.mjs
+++ b/apps/desktop/src/main/index.mjs
@@ -18,6 +18,7 @@ import {
} from "./installation-location.mjs";
import { userDataDirectoryFromArguments } from "./user-data-directory.mjs";
import { isAllowedPrintPreviewUrl } from "./window-open-policy.mjs";
+import { showWindow } from "./window-visibility.mjs";
import electronUpdater from "electron-updater";
const { autoUpdater } = electronUpdater;
@@ -295,7 +296,7 @@ const createTray = () => {
tray = new Tray(icon);
tray.setToolTip("EdgeEver");
tray.setContextMenu(Menu.buildFromTemplate([
- { label: "Show EdgeEver", click: () => { mainWindow?.show(); mainWindow?.focus(); } },
+ { label: "Show EdgeEver", click: () => showWindow(mainWindow) },
{ label: "Sync now", click: () => sendDesktopCommand("sync-now") },
{ label: "Backup now", click: () => sendDesktopCommand("backup-now") },
...(updateState === "available" ? [{ label: "Download update", click: () => void autoUpdater.downloadUpdate() }] : []),
@@ -303,7 +304,7 @@ const createTray = () => {
{ type: "separator" },
{ label: "Quit EdgeEver", click: () => { isQuitting = true; app.quit(); } },
]));
- tray.on("double-click", () => { mainWindow?.show(); mainWindow?.focus(); });
+ tray.on("double-click", () => showWindow(mainWindow));
};
const registerResourceProtocol = () => {
@@ -677,7 +678,7 @@ app.whenReady().then(async () => {
configureAutoUpdater();
handleOpenTarget(process.argv);
app.on("activate", () => {
- if (BrowserWindow.getAllWindows().length === 0) void createWindow();
+ if (!showWindow(mainWindow)) void createWindow();
});
});
@@ -687,9 +688,7 @@ app.on("open-file", (event, filePath) => {
});
app.on("second-instance", (_event, commandLine) => {
- if (mainWindow?.isMinimized()) mainWindow.restore();
- mainWindow?.show();
- mainWindow?.focus();
+ showWindow(mainWindow);
handleOpenTarget(commandLine);
});
diff --git a/apps/desktop/src/main/window-visibility.mjs b/apps/desktop/src/main/window-visibility.mjs
new file mode 100644
index 00000000..ffe07dc0
--- /dev/null
+++ b/apps/desktop/src/main/window-visibility.mjs
@@ -0,0 +1,7 @@
+export const showWindow = (window) => {
+ if (!window || window.isDestroyed()) return false;
+ if (window.isMinimized()) window.restore();
+ window.show();
+ window.focus();
+ return true;
+};
diff --git a/apps/desktop/src/main/window-visibility.test.mjs b/apps/desktop/src/main/window-visibility.test.mjs
new file mode 100644
index 00000000..8ac0f8d8
--- /dev/null
+++ b/apps/desktop/src/main/window-visibility.test.mjs
@@ -0,0 +1,38 @@
+import { describe, expect, test } from "bun:test";
+import { showWindow } from "./window-visibility.mjs";
+
+const createWindow = ({ destroyed = false, minimized = false } = {}) => {
+ const calls = [];
+ return {
+ calls,
+ isDestroyed: () => destroyed,
+ isMinimized: () => minimized,
+ restore: () => calls.push("restore"),
+ show: () => calls.push("show"),
+ focus: () => calls.push("focus"),
+ };
+};
+
+describe("desktop window visibility", () => {
+ test("shows and focuses an existing hidden window", () => {
+ const window = createWindow();
+
+ expect(showWindow(window)).toBe(true);
+ expect(window.calls).toEqual(["show", "focus"]);
+ });
+
+ test("restores a minimized window before showing it", () => {
+ const window = createWindow({ minimized: true });
+
+ expect(showWindow(window)).toBe(true);
+ expect(window.calls).toEqual(["restore", "show", "focus"]);
+ });
+
+ test("ignores a missing or destroyed window", () => {
+ const destroyedWindow = createWindow({ destroyed: true });
+
+ expect(showWindow(null)).toBe(false);
+ expect(showWindow(destroyedWindow)).toBe(false);
+ expect(destroyedWindow.calls).toEqual([]);
+ });
+});
diff --git a/package.json b/package.json
index 81ca70c5..f73666d1 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"verify:web-performance": "bun scripts/verify-web-performance.mjs",
"test:release-planning": "bun test scripts/plan-native-release.test.mjs scripts/check-native-release-assets.test.mjs",
"test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",
- "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",
+ "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",
"verify:desktop-package": "bun scripts/verify-desktop-package.mjs",
"build:cloudflare": "bun run typecheck && bun run build",
"build:site": "bun --cwd apps/site build",