Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-26 07:46:30 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #1732 from TriliumNext/notepath

Browse Source 
Make each part of the note path clickable.
This commit is contained in:
Elian Doran
2025-04-17 19:48:53 +03:00
committed by GitHub
parent c2b5f0a5a3 b7e7196f48
commit 4f075927f3
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/public/app/services/link.ts
View File

@@ -278,15 +278,20 @@ function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent
const { notePath, viewScope } = parseNavigationStateFromUrl(hrefLink);
const ctrlKey = utils.isCtrlKey(evt);
const shiftKey = evt.shiftKey;
const isLeftClick = "which" in evt && evt.which === 1;
const isMiddleClick = "which" in evt && evt.which === 2;
const targetIsBlank = ($link?.attr("target") === "_blank");
const openInNewTab = (isLeftClick && ctrlKey) || isMiddleClick || targetIsBlank;
const activate = (isLeftClick && ctrlKey && shiftKey) || (isMiddleClick && shiftKey);
const openInNewWindow = isLeftClick && evt.shiftKey && !ctrlKey;
if (notePath) {
if (openInNewTab) {
if (openInNewWindow) {
appContext.triggerCommand("openInWindow", { notePath, viewScope });
} else if (openInNewTab) {
appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
activate: targetIsBlank,
activate: activate ? true : targetIsBlank,
viewScope
});
} else if (isLeftClick) {

46
src/public/app/widgets/ribbon_widgets/note_paths.ts
View File

@@ -19,15 +19,15 @@ const TPL = /*html*/`
margin-top: 10px;
}
.note-path-list .path-current {
.note-path-list .path-current a {
font-weight: bold;
}
.note-path-list .path-archived {
.note-path-list .path-archived a {
color: var(--muted-text-color) !important;
}
.note-path-list .path-search {
.note-path-list .path-search a {
font-style: italic;
}
</style>
@@ -72,7 +72,7 @@ export default class NotePathsWidget extends NoteContextAwareWidget {
this.$notePathList.empty();
if (!this.note || this.noteId === "root") {
this.$notePathList.empty().append(await this.getRenderedPath("root"));
this.$notePathList.empty().append(await this.getRenderedPath(["root"]));
return;
}
@@ -88,7 +88,7 @@ export default class NotePathsWidget extends NoteContextAwareWidget {
const renderedPaths = [];
for (const notePathRecord of sortedNotePaths) {
const notePath = notePathRecord.notePath.join("/");
const notePath = notePathRecord.notePath;
renderedPaths.push(await this.getRenderedPath(notePath, notePathRecord));
}
@@ -96,42 +96,54 @@ export default class NotePathsWidget extends NoteContextAwareWidget {
this.$notePathList.empty().append(...renderedPaths);
}
async getRenderedPath(notePath: string, notePathRecord: NotePathRecord | null = null) {
const title = await treeService.getNotePathTitle(notePath);
async getRenderedPath(notePath: string[], notePathRecord: NotePathRecord | null = null) {
const $pathItem = $("<li>");
const pathSegments: string[] = [];
const lastIndex = notePath.length - 1;
for (let i = 0; i < notePath.length; i++) {
const noteId = notePath[i];
pathSegments.push(noteId);
const title = await treeService.getNoteTitle(noteId);
const $noteLink = await linkService.createLink(pathSegments.join("/"), { title });
const $noteLink = await linkService.createLink(notePath, { title });
$noteLink.find("a").addClass("no-tooltip-preview tn-link");
$noteLink.find("a").addClass("no-tooltip-preview tn-link");
$pathItem.append($noteLink);
if (i != lastIndex) {
$pathItem.append(" / ");
}
}
const icons = [];
if (this.notePath === notePath) {
$noteLink.addClass("path-current");
if (this.notePath === notePath.join("/")) {
$pathItem.addClass("path-current");
}
if (!notePathRecord || notePathRecord.isInHoistedSubTree) {
$noteLink.addClass("path-in-hoisted-subtree");
$pathItem.addClass("path-in-hoisted-subtree");
} else {
icons.push(`<span class="bx bx-trending-up" title="${t("note_paths.outside_hoisted")}"></span>`);
}
if (notePathRecord?.isArchived) {
$noteLink.addClass("path-archived");
$pathItem.addClass("path-archived");
icons.push(`<span class="bx bx-archive" title="${t("note_paths.archived")}"></span>`);
}
if (notePathRecord?.isSearch) {
$noteLink.addClass("path-search");
$pathItem.addClass("path-search");
icons.push(`<span class="bx bx-search" title="${t("note_paths.search")}"></span>`);
}
if (icons.length > 0) {
$noteLink.append(` ${icons.join(" ")}`);
$pathItem.append(` ${icons.join(" ")}`);
}
return $("<li>").append($noteLink);
return $pathItem;
}
entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {