gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-21 08:04:24 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

fix(print/list): note content not shown due to race condition

Browse Source
This commit is contained in:
Elian Doran 2025-11-20 20:24:19 +02:00
parent c95cb79672
commit a59d407f12
No known key found for this signature in database
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
View File

@ -1,4 +1,4 @@
import { useEffect, useMemo, useRef, useState } from "preact/hooks"; import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "preact/hooks";
import FNote from "../../../entities/fnote"; import FNote from "../../../entities/fnote";
import Icon from "../../react/Icon"; import Icon from "../../react/Icon";
import { ViewModeProps } from "../interface"; import { ViewModeProps } from "../interface";
@ -12,6 +12,7 @@ import link from "../../../services/link";
import { t } from "../../../services/i18n"; import { t } from "../../../services/i18n";
import attribute_renderer from "../../../services/attribute_renderer"; import attribute_renderer from "../../../services/attribute_renderer";
import froca from "../../../services/froca"; import froca from "../../../services/froca";
import { RawHtmlBlock } from "../../react/RawHtml";
export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) { export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
const [ isExpanded ] = useNoteLabelBoolean(note, "expanded"); const [ isExpanded ] = useNoteLabelBoolean(note, "expanded");
@ -35,31 +36,43 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
); );
} }
interface NotesWithContent {
note: FNote;
content: string;
}
export function ListPrintView({ note, noteIds: unfilteredNoteIds, highlightedTokens, onReady }: ViewModeProps<{}>) { export function ListPrintView({ note, noteIds: unfilteredNoteIds, highlightedTokens, onReady }: ViewModeProps<{}>) {
const noteIds = useFilteredNoteIds(note, unfilteredNoteIds); const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
const [ notes, setNotes ] = useState<FNote[]>(); const [ notesWithContent, setNotesWithContent ] = useState<NotesWithContent[]>();
useEffect(() => { useLayoutEffect(() => {
froca.getNotes(noteIds).then(setNotes); froca.getNotes(noteIds).then(async (notes) => {
const notesWithContent: NotesWithContent[] = [];
for (const note of notes) {
const content = await content_renderer.getRenderedContent(note, {
trim: false,
noChildrenList: true
});
notesWithContent.push({ note, content: content.$renderedContent[0].innerHTML });
}
setNotesWithContent(notesWithContent);
});
}, [noteIds]); }, [noteIds]);
useEffect(() => { useEffect(() => {
if (notes && onReady) { if (notesWithContent && onReady) {
onReady(); onReady();
} }
}, [ notes, onReady ]); }, [ notesWithContent, onReady ]);
return ( return (
<div class="note-list list-print-view"> <div class="note-list list-print-view">
<div class="note-list-container use-tn-links"> <div class="note-list-container use-tn-links">
{notes?.map(childNote => ( {notesWithContent?.map(({ note: childNote, content }) => (
<> <section id={`note-${childNote.noteId}`} class="note">
<h1>{childNote.title}</h1> <h1>{childNote.title}</h1>
<NoteContent <RawHtmlBlock html={content} />
note={childNote} </section>
highlightedTokens={highlightedTokens}
/>
</>
))} ))}
</div> </div>
</div> </div>