Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-09-03 14:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(client): one-click navigation to bookmarks (closes #2187)

Browse Source
This commit is contained in:
Elian Doran 2025-06-06 23:50:42 +03:00
parent 7007feabd8
commit 73cf828bc9
No known key found for this signature in database
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/client/src/services/link.ts
View File

@ -218,10 +218,10 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
} }
// Exclude external links that contain # // Exclude external links that contain #
if (hashIdx !== 0 && !url.includes("/#root") && !url.includes("/#?searchString")) { if (hashIdx !== 0 && !url.includes("/#root") && !url.includes("/#?searchString")) {
return {}; return {};
} }
const hash = url.substr(hashIdx + 1); // strip also the initial '#' const hash = url.substr(hashIdx + 1); // strip also the initial '#'
let [notePath, paramString] = hash.split("?"); let [notePath, paramString] = hash.split("?");
@ -285,8 +285,8 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation(); evt.stopPropagation();
if (hrefLink?.startsWith("#fn") && $link) { if (hrefLink && hrefLink.startsWith("#") && !hrefLink.startsWith("#root/") && $link) {
return handleFootnote(hrefLink, $link); return handleAnchor(hrefLink, $link);
} }
const { notePath, viewScope } = parseNavigationStateFromUrl(hrefLink); const { notePath, viewScope } = parseNavigationStateFromUrl(hrefLink);
@ -348,13 +348,14 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
} }
/** /**
* Scrolls to either the footnote (if clicking on a reference such as `[1]`), or to the reference of a footnote (if clicking on the footnote `^` arrow). * Scrolls to either the footnote (if clicking on a reference such as `[1]`), or to the reference of a footnote (if clicking on the footnote `^` arrow),
* or CKEditor bookmarks.
* *
* @param hrefLink the URL of the link that was clicked (it should be in the form of `#fn` or `#fnref`). * @param hrefLink the URL of the link that was clicked (it should be in the form of `#fn` or `#fnref`).
* @param $link the element of the link that was clicked. * @param $link the element of the link that was clicked.
* @returns whether the event should be consumed or not. * @returns whether the event should be consumed or not.
*/ */
function handleFootnote(hrefLink: string, $link: JQuery<HTMLElement>) { function handleAnchor(hrefLink: string, $link: JQuery<HTMLElement>) {
const el = $link.closest(".ck-content").find(hrefLink)[0]; const el = $link.closest(".ck-content").find(hrefLink)[0];
if (el) { if (el) {
el.scrollIntoView({ behavior: "smooth", block: "center" }); el.scrollIntoView({ behavior: "smooth", block: "center" });