gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-01-06 14:44:25 +01:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fix(breadcrumbs): branch prefix not shown

Browse Source
This commit is contained in:
Elian Doran 2025-12-24 17:37:31 +02:00
parent db3aedf39d
commit 30cc221eca
No known key found for this signature in database
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/client/src/widgets/layout/Breadcrumb.tsx
View File

@ -25,7 +25,7 @@ import ActionButton from "../react/ActionButton";
import { Badge } from "../react/Badge"; import { Badge } from "../react/Badge";
import Dropdown from "../react/Dropdown"; import Dropdown from "../react/Dropdown";
import { FormDropdownDivider, FormListItem } from "../react/FormList"; import { FormDropdownDivider, FormListItem } from "../react/FormList";
import { useActiveNoteContext, useChildNotes, useNote, useNoteColorClass, useNoteIcon, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useStaticTooltip, useTriliumOptionBool } from "../react/hooks"; import { useActiveNoteContext, useChildNotes, useNote, useNoteColorClass, useNoteIcon, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useNoteTitle, useStaticTooltip, useTriliumOptionBool } from "../react/hooks";
import Icon from "../react/Icon"; import Icon from "../react/Icon";
import { NewNoteLink } from "../react/NoteLink"; import { NewNoteLink } from "../react/NoteLink";
import { ParentComponent } from "../react/react_utils"; import { ParentComponent } from "../react/react_utils";
@ -134,9 +134,9 @@ function BreadcrumbHoistedNoteRoot({ noteId }: { noteId: string }) {
function BreadcrumbLastItem({ notePath, parentComponent }: { notePath: string, parentComponent: Component | null }) { function BreadcrumbLastItem({ notePath, parentComponent }: { notePath: string, parentComponent: Component | null }) {
const linkRef = useRef<HTMLAnchorElement>(null); const linkRef = useRef<HTMLAnchorElement>(null);
const noteId = notePath.split("/").at(-1); const { noteId, parentNoteId } = tree.getNoteIdAndParentIdFromUrl(notePath);
const [ note ] = useState(() => froca.getNoteFromCache(noteId!)); const [ note ] = useState(() => froca.getNoteFromCache(noteId!));
const title = useNoteProperty(note, "title"); const title = useNoteTitle(noteId, parentNoteId);
const colorClass = useNoteColorClass(note); const colorClass = useNoteColorClass(note);
const [ archived ] = useNoteLabelBoolean(note, "archived"); const [ archived ] = useNoteLabelBoolean(note, "archived");
useStaticTooltip(linkRef, { useStaticTooltip(linkRef, {

11
apps/client/src/widgets/react/NoteLink.tsx
View File

@ -1,9 +1,10 @@
import clsx from "clsx"; import clsx from "clsx";
import { HTMLAttributes } from "preact"; import { HTMLAttributes } from "preact";
import { useEffect, useRef, useState } from "preact/hooks"; import { useEffect, useLayoutEffect, useRef, useState } from "preact/hooks";
import link, { calculateHash, ViewScope } from "../../services/link"; import link, { calculateHash, ViewScope } from "../../services/link";
import { useImperativeSearchHighlighlighting, useNote, useNoteColorClass, useNoteIcon, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useTriliumEvent } from "./hooks"; import tree from "../../services/tree";
import { useImperativeSearchHighlighlighting, useNote, useNoteColorClass, useNoteIcon, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useNoteTitle, useTriliumEvent } from "./hooks";
import Icon from "./Icon"; import Icon from "./Icon";
interface NoteLinkOpts { interface NoteLinkOpts {
@ -97,9 +98,11 @@ interface NewNoteLinkProps extends Pick<HTMLAttributes<HTMLAnchorElement>, "onCo
} }
export function NewNoteLink({ notePath, viewScope, noContextMenu, showNoteIcon, noPreview, ...linkProps }: NewNoteLinkProps) { export function NewNoteLink({ notePath, viewScope, noContextMenu, showNoteIcon, noPreview, ...linkProps }: NewNoteLinkProps) {
const noteId = notePath.split("/").at(-1);
const { noteId, parentNoteId } = tree.getNoteIdAndParentIdFromUrl(notePath);
const note = useNote(noteId); const note = useNote(noteId);
const title = useNoteProperty(note, "title");
const title = useNoteTitle(noteId, parentNoteId);
const icon = useNoteIcon(showNoteIcon ? note : null); const icon = useNoteIcon(showNoteIcon ? note : null);
const colorClass = useNoteColorClass(note); const colorClass = useNoteColorClass(note);
const [ archived ] = useNoteLabelBoolean(note, "archived"); const [ archived ] = useNoteLabelBoolean(note, "archived");

16
apps/client/src/widgets/react/hooks.tsx
View File

@ -1086,6 +1086,22 @@ export function useNote(noteId: string | null | undefined, silentNotFoundError =
return undefined; return undefined;
} }
export function useNoteTitle(noteId: string | undefined, parentNoteId: string | undefined) {
const [ title, setTitle ] = useState<string>();
const requestIdRef = useRef(0);
useEffect(() => {
const requestId = ++requestIdRef.current;
if (!noteId) return;
tree.getNoteTitle(noteId, parentNoteId).then(title => {
if (requestId !== requestIdRef.current) return;
setTitle(title);
});
}, [ noteId, parentNoteId ]);
return title;
}
export function useNoteIcon(note: FNote | null | undefined) { export function useNoteIcon(note: FNote | null | undefined) {
const [ icon, setIcon ] = useState(note?.getIcon()); const [ icon, setIcon ] = useState(note?.getIcon());
const iconClass = useNoteLabel(note, "iconClass"); const iconClass = useNoteLabel(note, "iconClass");