gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-21 23:59:02 +02:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

refactor(react/ribbon): set up keyboard shortcuts

Browse Source
This commit is contained in:
Elian Doran 2025-08-23 20:59:13 +03:00
parent d53faa8c01
commit 9f217b88e4
No known key found for this signature in database
4 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/client/src/widgets/attribute_widgets/attribute_editor.ts
View File

@ -1,20 +0,0 @@
export default class AttributeEditorWidget extends NoteContextAwareWidget implements EventListener<"entitiesReloaded">, EventListener<"addNewLabel">, EventListener<"addNewRelation"> {
// triggered from keyboard shortcut
async addNewLabelEvent({ ntxId }: EventData<"addNewLabel">) {
if (this.isNoteContext(ntxId)) {
await this.refresh();
this.handleAddNewAttributeCommand("addNewLabel");
}
}
// triggered from keyboard shortcut
async addNewRelationEvent({ ntxId }: EventData<"addNewRelation">) {
if (this.isNoteContext(ntxId)) {
await this.refresh();
this.handleAddNewAttributeCommand("addNewRelation");
}
}
}

1
apps/client/src/widgets/react/hooks.tsx
View File

@ -450,7 +450,6 @@ export function useLegacyWidget<T extends BasicWidget>(widgetFactory: () => T, {
// Inject the note context. // Inject the note context.
useEffect(() => { useEffect(() => {
console.log("Injecting note context");
if (noteContext && widget instanceof NoteContextAwareWidget) { if (noteContext && widget instanceof NoteContextAwareWidget) {
widget.activeContextChangedEvent({ noteContext }); widget.activeContextChangedEvent({ noteContext });
} }

8
apps/client/src/widgets/ribbon/OwnedAttributesTab.tsx
View File

@ -1,15 +1,11 @@
import AttributeEditor from "./components/AttributeEditor"; import AttributeEditor from "./components/AttributeEditor";
import { TabContext } from "./ribbon-interface"; import { TabContext } from "./ribbon-interface";
export default function OwnedAttributesTab({ note, notePath, componentId }: TabContext) { export default function OwnedAttributesTab({ note, ...restProps }: TabContext) {
return ( return (
<div className="attribute-list"> <div className="attribute-list">
{ note && ( { note && (
<AttributeEditor <AttributeEditor note={note} {...restProps} />
componentId={componentId}
note={note}
notePath={notePath}
/>
)} )}
</div> </div>
) )

12
apps/client/src/widgets/ribbon/components/AttributeEditor.tsx
View File

@ -76,7 +76,7 @@ const mentionSetup: MentionFeed[] = [
]; ];
export default function AttributeEditor({ note, componentId, notePath }: { note: FNote, componentId: string, notePath?: string | null }) { export default function AttributeEditor({ note, componentId, notePath, ntxId }: { note: FNote, componentId: string, notePath?: string | null, ntxId?: string | null }) {
const [ state, setState ] = useState<"normal" | "showHelpTooltip" | "showAttributeDetail">(); const [ state, setState ] = useState<"normal" | "showHelpTooltip" | "showAttributeDetail">();
const [ error, setError ] = useState<unknown>(); const [ error, setError ] = useState<unknown>();
const [ needsSaving, setNeedsSaving ] = useState(false); const [ needsSaving, setNeedsSaving ] = useState(false);
@ -253,6 +253,16 @@ export default function AttributeEditor({ note, componentId, notePath }: { note:
reloadAttributesCommand: refresh, reloadAttributesCommand: refresh,
updateAttributeListCommand: ({ attributes }: CommandListenerData<"updateAttributeList">) => renderOwnedAttributes(attributes as FAttribute[], false) updateAttributeListCommand: ({ attributes }: CommandListenerData<"updateAttributeList">) => renderOwnedAttributes(attributes as FAttribute[], false)
}), [])); }), []));
// Keyboard shortcuts
useTriliumEventBeta("addNewLabel", ({ ntxId: eventNtxId }) => {
if (eventNtxId !== ntxId) return;
handleAddNewAttributeCommand("addNewLabel");
});
useTriliumEventBeta("addNewRelation", ({ ntxId: eventNtxId }) => {
if (eventNtxId !== ntxId) return;
handleAddNewAttributeCommand("addNewRelation");
});
return ( return (
<> <>