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

chore(react/collections): fix expand state when switching notes

Browse Source
This commit is contained in:
Elian Doran
2025-08-30 19:11:12 +03:00
parent d52f9f2a92
commit 5f73532d62
2 changed files with 3 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,9 @@ function ListNoteCard({ note, parentNote, expand, highlightedTokens }: { note: F
const [ isExpanded, setExpanded ] = useState(expand); const [ isExpanded, setExpanded ] = useState(expand);
const notePath = getNotePath(parentNote, note); const notePath = getNotePath(parentNote, note);
// Reset expand state if switching to another note.
useEffect(() => setExpanded(expand), [ note ]);
return ( return (
<div <div
className={`note-book-card no-tooltip-preview ${isExpanded ? "expanded" : ""}`} className={`note-book-card no-tooltip-preview ${isExpanded ? "expanded" : ""}`}

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

@@ -1,61 +0,0 @@
import linkService from "../../services/link.js";
import contentRenderer from "../../services/content_renderer.js";
import attributeRenderer from "../../services/attribute_renderer.js";
import treeService from "../../services/tree.js";
import utils from "../../services/utils.js";
import type FNote from "../../entities/fnote.js";
import ViewMode, { type ViewModeArgs } from "./view_mode.js";
import { ViewTypeOptions } from "../collections/interface.js";
class ListOrGridView extends ViewMode<{}> {
private $noteList: JQuery<HTMLElement>;
private filteredNoteIds!: string[];
private page?: number;
private pageSize?: number;
private highlightRegex?: RegExp | null;
async renderList() {
if (this.filteredNoteIds.length === 0 || !this.page || !this.pageSize) {
this.$noteList.hide();
return;
}
const highlightedTokens = this.parentNote.highlightedTokens || [];
if (highlightedTokens.length > 0) {
const regex = highlightedTokens.map((token) => utils.escapeRegExp(token)).join("|");
this.highlightRegex = new RegExp(regex, "gi");
} else {
this.highlightRegex = null;
}
this.$noteList.show();
return this.$noteList;
}
async renderNote(note: FNote, expand: boolean = false) {
if (this.highlightRegex) {
const Mark = new (await import("mark.js")).default($card.find(".note-book-title")[0]);
Mark.markRegExp(this.highlightRegex, {
element: "span",
className: "ck-find-result"
});
}
}
async renderNoteContent(note: FNote) {
try {
if (this.highlightRegex) {
const Mark = new (await import("mark.js")).default($renderedContent[0]);
Mark.markRegExp(this.highlightRegex, {
element: "span",
className: "ck-find-result"
});
}
}
}
}
export default ListOrGridView;