gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-12 18:34:24 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

feat(tab_navigation): functional context menu

Browse Source
This commit is contained in:
Elian Doran 2025-12-09 14:23:06 +02:00
parent e3f5b3535a
commit 9e099444b6
No known key found for this signature in database
2 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/client/src/widgets/TabHistoryNavigationButtons.tsx
View File

@ -2,19 +2,27 @@ import "./TabHistoryNavigationButtons.css";
import { t } from "../services/i18n"; import { t } from "../services/i18n";
import ActionButton from "./react/ActionButton"; import ActionButton from "./react/ActionButton";
import { useCallback, useMemo } from "preact/hooks";
import { handleHistoryContextMenu } from "./launch_bar/HistoryNavigation";
import { dynamicRequire } from "../services/utils";
export default function TabHistoryNavigationButtons() { export default function TabHistoryNavigationButtons() {
const webContents = useMemo(() => dynamicRequire("@electron/remote").getCurrentWebContents(), []);
const onContextMenu = handleHistoryContextMenu(webContents);
return ( return (
<div className="tab-history-navigation-buttons"> <div className="tab-history-navigation-buttons">
<ActionButton <ActionButton
icon="bx bx-left-arrow-alt" icon="bx bx-left-arrow-alt"
text={t("tab_history_navigation_buttons.go-back")} text={t("tab_history_navigation_buttons.go-back")}
triggerCommand="backInNoteHistory" triggerCommand="backInNoteHistory"
onContextMenu={onContextMenu}
/> />
<ActionButton <ActionButton
icon="bx bx-right-arrow-alt" icon="bx bx-right-arrow-alt"
text={t("tab_history_navigation_buttons.go-forward")} text={t("tab_history_navigation_buttons.go-forward")}
triggerCommand="forwardInNoteHistory" triggerCommand="forwardInNoteHistory"
onContextMenu={onContextMenu}
/> />
</div> </div>
); );

39
apps/client/src/widgets/launch_bar/HistoryNavigation.tsx
View File

@ -1,11 +1,12 @@
import { useEffect, useRef } from "preact/hooks";
import FNote from "../../entities/fnote";
import { dynamicRequire, isElectron } from "../../services/utils";
import { LaunchBarActionButton, useLauncherIconAndTitle } from "./launch_bar_widgets";
import type { WebContents } from "electron"; import type { WebContents } from "electron";
import { useCallback, useMemo } from "preact/hooks";
import FNote from "../../entities/fnote";
import contextMenu, { MenuCommandItem } from "../../menus/context_menu"; import contextMenu, { MenuCommandItem } from "../../menus/context_menu";
import tree from "../../services/tree";
import link from "../../services/link"; import link from "../../services/link";
import tree from "../../services/tree";
import { dynamicRequire } from "../../services/utils";
import { LaunchBarActionButton, useLauncherIconAndTitle } from "./launch_bar_widgets";
interface HistoryNavigationProps { interface HistoryNavigationProps {
launcherNote: FNote; launcherNote: FNote;
@ -16,26 +17,22 @@ const HISTORY_LIMIT = 20;
export default function HistoryNavigationButton({ launcherNote, command }: HistoryNavigationProps) { export default function HistoryNavigationButton({ launcherNote, command }: HistoryNavigationProps) {
const { icon, title } = useLauncherIconAndTitle(launcherNote); const { icon, title } = useLauncherIconAndTitle(launcherNote);
const webContentsRef = useRef<WebContents>(null); const webContents = useMemo(() => dynamicRequire("@electron/remote").getCurrentWebContents(), []);
useEffect(() => {
if (isElectron()) {
const webContents = dynamicRequire("@electron/remote").getCurrentWebContents();
// without this, the history is preserved across frontend reloads
webContents?.clearHistory();
webContentsRef.current = webContents;
}
}, []);
return ( return (
<LaunchBarActionButton <LaunchBarActionButton
icon={icon} icon={icon}
text={title} text={title}
triggerCommand={command} triggerCommand={command}
onContextMenu={async (e) => { onContextMenu={handleHistoryContextMenu(webContents)}
/>
);
}
export function handleHistoryContextMenu(webContents: WebContents) {
return async (e: MouseEvent) => {
e.preventDefault(); e.preventDefault();
const webContents = webContentsRef.current;
if (!webContents || webContents.navigationHistory.length() < 2) { if (!webContents || webContents.navigationHistory.length() < 2) {
return; return;
} }
@ -55,9 +52,9 @@ export default function HistoryNavigationButton({ launcherNote, command }: Histo
title, title,
command: idx, command: idx,
uiIcon: uiIcon:
parseInt(idx) === activeIndex parseInt(idx, 10) === activeIndex
? "bx bx-radio-circle-marked" // compare with type coercion! ? "bx bx-radio-circle-marked" // compare with type coercion!
: parseInt(idx) < activeIndex : parseInt(idx, 10) < activeIndex
? "bx bx-left-arrow-alt" ? "bx bx-left-arrow-alt"
: "bx bx-right-arrow-alt" : "bx bx-right-arrow-alt"
}); });
@ -80,7 +77,5 @@ export default function HistoryNavigationButton({ launcherNote, command }: Histo
} }
} }
}); });
}} };
/>
)
} }