gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-26 18:44:26 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

chore(react/promoted_attributes): bring back reacting to changes

Browse Source
This commit is contained in:
Elian Doran 2025-11-23 13:35:16 +02:00
parent 6a126009a8
commit 6160945b9e
No known key found for this signature in database
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
apps/client/src/widgets/PromotedAttributes.tsx
View File

@ -1,6 +1,6 @@
import { MutableRef, useEffect, useRef, useState } from "preact/hooks"; import { Dispatch, StateUpdater, useEffect, useRef, useState } from "preact/hooks";
import "./PromotedAttributes.css"; import "./PromotedAttributes.css";
import { useNoteContext, useNoteLabel, useUniqueName } from "./react/hooks"; import { useNoteContext, useNoteLabel, useTriliumEvent, useUniqueName } from "./react/hooks";
import { Attribute } from "../services/attribute_parser"; import { Attribute } from "../services/attribute_parser";
import FAttribute from "../entities/fattribute"; import FAttribute from "../entities/fattribute";
import clsx from "clsx"; import clsx from "clsx";
@ -9,10 +9,10 @@ import { DefinitionObject, LabelType } from "../services/promoted_attribute_defi
import server from "../services/server"; import server from "../services/server";
import FNote from "../entities/fnote"; import FNote from "../entities/fnote";
import { ComponentChild, HTMLInputTypeAttribute, InputHTMLAttributes, MouseEventHandler, TargetedEvent, TargetedInputEvent } from "preact"; import { ComponentChild, HTMLInputTypeAttribute, InputHTMLAttributes, MouseEventHandler, TargetedEvent, TargetedInputEvent } from "preact";
import tree from "../services/tree";
import NoteAutocomplete from "./react/NoteAutocomplete"; import NoteAutocomplete from "./react/NoteAutocomplete";
import ws from "../services/ws"; import ws from "../services/ws";
import { UpdateAttributeResponse } from "@triliumnext/commons"; import { UpdateAttributeResponse } from "@triliumnext/commons";
import attributes from "../services/attributes";
interface Cell { interface Cell {
definitionAttr: FAttribute; definitionAttr: FAttribute;
@ -33,11 +33,34 @@ interface CellProps {
export default function PromotedAttributes() { export default function PromotedAttributes() {
const { note, componentId } = useNoteContext(); const { note, componentId } = useNoteContext();
const [ cells, setCells ] = useState<Cell[]>(); const [ cells, setCells ] = usePromotedAttributeData(note, componentId);
const [ viewType ] = useNoteLabel(note, "viewType");
const [ cellToFocus, setCellToFocus ] = useState<Cell>(); const [ cellToFocus, setCellToFocus ] = useState<Cell>();
useEffect(() => { return (
<div className="promoted-attributes-widget">
<div className="promoted-attributes-container">
{note && cells?.map(cell => <PromotedAttributeCell
cell={cell}
cells={cells} setCells={setCells}
shouldFocus={cell === cellToFocus} setCellToFocus={setCellToFocus}
componentId={componentId} note={note}
/>)}
</div>
</div>
);
}
/**
* Handles the individual cells (instances for promoted attributes including empty attributes). Promoted attributes with "multiple" multiplicity will have
* each value represented as a separate cell.
*
* The cells are returned as a state since they can also be altered internally if needed, for example to add a new empty cell.
*/
function usePromotedAttributeData(note: FNote | null | undefined, componentId: string): [ Cell[] | undefined, Dispatch<StateUpdater<Cell[] | undefined>> ] {
const [ viewType ] = useNoteLabel(note, "viewType");
const [ cells, setCells ] = useState<Cell[]>();
function refresh() {
if (!note || viewType === "table") { if (!note || viewType === "table") {
setCells([]); setCells([]);
return; return;
@ -81,20 +104,16 @@ export default function PromotedAttributes() {
} }
} }
setCells(cells); setCells(cells);
}, [ note, viewType ]); }
return ( useEffect(refresh, [ note, viewType ]);
<div className="promoted-attributes-widget"> useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
<div className="promoted-attributes-container"> if (loadResults.getAttributeRows(componentId).find((attr) => attributes.isAffecting(attr, note))) {
{note && cells?.map(cell => <PromotedAttributeCell refresh();
cell={cell} }
cells={cells} setCells={setCells} });
shouldFocus={cell === cellToFocus} setCellToFocus={setCellToFocus}
componentId={componentId} note={note} return [ cells, setCells ];
/>)}
</div>
</div>
);
} }
function PromotedAttributeCell(props: CellProps) { function PromotedAttributeCell(props: CellProps) {

12
apps/client/src/widgets/promoted_attributes.ts
View File

@ -1,12 +0,0 @@
export default class PromotedAttributesWidget extends NoteContextAwareWidget {
focus() {
this.$widget.find(".promoted-attribute-input:first").focus();
}
entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
if (loadResults.getAttributeRows(this.componentId).find((attr) => attributeService.isAffecting(attr, this.note))) {
this.refresh();
}
}
}