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

chore(react/collections/list): display children recursively

Browse Source
This commit is contained in:
Elian Doran
2025-08-30 16:19:21 +03:00
parent 1c986e2bf6
commit c2a5f437fd
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/client/src/widgets/collections/legacy/ListView.tsx
View File

@@ -55,7 +55,10 @@ function NoteCard({ note, expand }: { note: FNote, expand?: boolean }) {
<Icon className="note-icon" icon={note.getIcon()} /> <Icon className="note-icon" icon={note.getIcon()} />
<NoteLink notePath={notePath} noPreview showNotePath={isSearch} /> <NoteLink notePath={notePath} noPreview showNotePath={isSearch} />
<NoteContent note={note} /> {isExpanded && <>
<NoteContent note={note} />
<NoteChildren note={note} />
</>}
</h5> </h5>
</div> </div>
) )
@@ -80,6 +83,20 @@ function NoteContent({ note, trim }: { note: FNote, trim?: boolean }) {
return <div ref={contentRef} className="note-book-content" />; return <div ref={contentRef} className="note-book-content" />;
} }
function NoteChildren({ note }: { note: FNote}) {
const imageLinks = note.getRelations("imageLink");
const [ childNotes, setChildNotes ] = useState<FNote[]>();
useEffect(() => {
note.getChildNotes().then(childNotes => {
const filteredChildNotes = childNotes.filter((childNote) => !imageLinks.find((rel) => rel.value === childNote.noteId));
setChildNotes(filteredChildNotes);
});
}, [ note ]);
return childNotes?.map(childNote => <NoteCard note={childNote} />)
}
function usePagination(note: FNote, noteIds: string[]) { function usePagination(note: FNote, noteIds: string[]) {
const [ page, setPage ] = useState(1); const [ page, setPage ] = useState(1);
const [ pageNotes, setPageNotes ] = useState<FNote[]>(); const [ pageNotes, setPageNotes ] = useState<FNote[]>();

14
apps/client/src/widgets/view_widgets/list_or_grid_view.ts
View File

@@ -127,8 +127,6 @@ class ListOrGridView extends ViewMode<{}> {
return; return;
} }
const $expander = $card.find("> .note-book-header .note-expander");
if ((this.viewType === "grid")) { if ((this.viewType === "grid")) {
$card.append(await this.renderNoteContent(note)); $card.append(await this.renderNoteContent(note));
} }
@@ -148,18 +146,6 @@ class ListOrGridView extends ViewMode<{}> {
}); });
} }
} }
if (this.viewType === "list") {
const imageLinks = note.getRelations("imageLink");
const childNotes = (await note.getChildNotes()).filter((childNote) => !imageLinks.find((rel) => rel.value === childNote.noteId));
for (const childNote of childNotes) {
$content.append(await this.renderNote(childNote));
}
}
return $content;
} }
} }