gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-07 06:59:04 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

chore(react/collections/table): react to nesting depth change

Browse Source
This commit is contained in:
Elian Doran 2025-09-09 19:00:08 +03:00
parent ab6fc9303b
commit 0c7f926421
No known key found for this signature in database
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/collections/table/index.tsx
View File

@ -134,7 +134,7 @@ function useData(note: FNote, noteIds: string[], viewConfig: TableConfig | undef
}); });
} }
useEffect(refresh, [ note, noteIds ]); useEffect(refresh, [ note, noteIds, maxDepth ]);
// React to column changes. // React to column changes.
useTriliumEvent("entitiesReloaded", ({ loadResults}) => { useTriliumEvent("entitiesReloaded", ({ loadResults}) => {

27
apps/client/src/widgets/view_widgets/table_view/index.ts
View File

@ -3,7 +3,6 @@ import attributes from "../../../services/attributes.js";
import SpacedUpdate from "../../../services/spaced_update.js"; import SpacedUpdate from "../../../services/spaced_update.js";
import type { EventData } from "../../../components/app_context.js"; import type { EventData } from "../../../components/app_context.js";
import { canReorderRows, configureReorderingRows } from "./dragging.js";
import buildFooter from "./footer.js"; import buildFooter from "./footer.js";
import getAttributeDefinitionInformation, { buildRowDefinitions } from "./rows.js"; import getAttributeDefinitionInformation, { buildRowDefinitions } from "./rows.js";
import { AttributeDefinitionInformation, buildColumnDefinitions } from "./columns.js"; import { AttributeDefinitionInformation, buildColumnDefinitions } from "./columns.js";
@ -49,14 +48,6 @@ export default class TableView extends ViewMode<StateInfo> {
return this.$root; return this.$root;
} }
private async renderTable(el: HTMLElement) {
for (const module of modules) {
Tabulator.registerModule(module);
}
this.initialize(el, info);
}
private async initialize(el: HTMLElement, info: AttributeDefinitionInformation[]) { private async initialize(el: HTMLElement, info: AttributeDefinitionInformation[]) {
const viewStorage = await this.viewStorage.restore(); const viewStorage = await this.viewStorage.restore();
this.persistentData = viewStorage?.tableData || {}; this.persistentData = viewStorage?.tableData || {};
@ -66,9 +57,6 @@ export default class TableView extends ViewMode<StateInfo> {
this.colEditing = new TableColumnEditing(this.args.$parent, this.args.parentNote, this.api); this.colEditing = new TableColumnEditing(this.args.$parent, this.args.parentNote, this.api);
this.rowEditing = new TableRowEditing(this.api, this.args.parentNotePath!); this.rowEditing = new TableRowEditing(this.api, this.args.parentNotePath!);
if (movableRows) {
configureReorderingRows(this.api);
}
setupContextMenu(this.api, this.parentNote); setupContextMenu(this.api, this.parentNote);
} }
@ -82,21 +70,6 @@ export default class TableView extends ViewMode<StateInfo> {
return true; return true;
} }
// Refresh if promoted attributes get changed.
if (loadResults.getAttributeRows().find(attr =>
attr.type === "label" &&
(attr.name?.startsWith("label:") || attr.name?.startsWith("relation:")) &&
attributes.isAffecting(attr, this.parentNote))) {
this.#manageColumnUpdate();
//return await this.#manageRowsUpdate();
}
// Refresh max depth
if (loadResults.getAttributeRows().find(attr => attr.type === "label" && attr.name === "maxNestingDepth" && attributes.isAffecting(attr, this.parentNote))) {
this.maxDepth = parseInt(this.parentNote.getLabelValue("maxNestingDepth") ?? "-1", 10);
return await this.#manageRowsUpdate();
}
if (loadResults.getBranchRows().some(branch => branch.parentNoteId === this.parentNote.noteId || this.noteIds.includes(branch.parentNoteId ?? "")) if (loadResults.getBranchRows().some(branch => branch.parentNoteId === this.parentNote.noteId || this.noteIds.includes(branch.parentNoteId ?? ""))
|| loadResults.getNoteIds().some(noteId => this.noteIds.includes(noteId)) || loadResults.getNoteIds().some(noteId => this.noteIds.includes(noteId))
|| loadResults.getAttributeRows().some(attr => this.noteIds.includes(attr.noteId!))) { || loadResults.getAttributeRows().some(attr => this.noteIds.includes(attr.noteId!))) {