fix(app): browser pane keyboard tweaks
- Refresh icon: use single-arrow RotateCw instead of two-arrow RefreshCw - URL bar selects all text on focus - Cmd+R now reloads the active browser pane (tracked via IPC) when the URL bar has focus, instead of reloading the Electron window - Forward Paseo shortcut keys (b, e, w, t, k, /, \, comma, digits, enter, arrows) from the embedded webview to the main window so sidebar/tab/etc. shortcuts still fire when focus is inside the loaded page
This commit is contained in:
@@ -1,11 +1,15 @@
|
||||
import type { WebContents } from "electron";
|
||||
import { webContents as allWebContents, type WebContents } from "electron";
|
||||
|
||||
const browserIdsByWebContentsId = new Map<number, string>();
|
||||
let activeBrowserPaneId: string | null = null;
|
||||
|
||||
export function registerPaseoBrowserWebContents(contents: WebContents, browserId: string): void {
|
||||
browserIdsByWebContentsId.set(contents.id, browserId);
|
||||
contents.once("destroyed", () => {
|
||||
browserIdsByWebContentsId.delete(contents.id);
|
||||
if (activeBrowserPaneId === browserId) {
|
||||
activeBrowserPaneId = null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -15,3 +19,21 @@ export function getPaseoBrowserIdForWebContents(contents: WebContents | null): s
|
||||
}
|
||||
return browserIdsByWebContentsId.get(contents.id) ?? null;
|
||||
}
|
||||
|
||||
export function setActivePaseoBrowserPaneId(browserId: string | null): void {
|
||||
activeBrowserPaneId = browserId;
|
||||
}
|
||||
|
||||
export function getActivePaseoBrowserWebContents(): WebContents | null {
|
||||
if (!activeBrowserPaneId) {
|
||||
return null;
|
||||
}
|
||||
for (const [contentsId, browserId] of browserIdsByWebContentsId) {
|
||||
if (browserId !== activeBrowserPaneId) continue;
|
||||
const contents = allWebContents.fromId(contentsId);
|
||||
if (contents && !contents.isDestroyed()) {
|
||||
return contents;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import { app, Menu, BrowserWindow, ipcMain, webContents } from "electron";
|
||||
import { getPaseoBrowserIdForWebContents } from "./browser-webviews.js";
|
||||
import {
|
||||
getActivePaseoBrowserWebContents,
|
||||
getPaseoBrowserIdForWebContents,
|
||||
} from "./browser-webviews.js";
|
||||
|
||||
interface ShowContextMenuInput {
|
||||
kind?: "terminal";
|
||||
@@ -20,8 +23,12 @@ function getFocusedPaseoBrowserWebContents(): Electron.WebContents | null {
|
||||
return getPaseoBrowserIdForWebContents(focusedContents) ? focusedContents : null;
|
||||
}
|
||||
|
||||
function getReloadTargetBrowserWebContents(): Electron.WebContents | null {
|
||||
return getFocusedPaseoBrowserWebContents() ?? getActivePaseoBrowserWebContents();
|
||||
}
|
||||
|
||||
function reloadFocusedContentsOrWindow(win: BrowserWindow, options?: { ignoreCache?: boolean }) {
|
||||
const browserContents = getFocusedPaseoBrowserWebContents();
|
||||
const browserContents = getReloadTargetBrowserWebContents();
|
||||
if (browserContents) {
|
||||
if (options?.ignoreCache) {
|
||||
browserContents.reloadIgnoringCache();
|
||||
|
||||
Reference in New Issue
Block a user