gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-22 07:14:24 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

feat(client/bundle): respect position for TSX widgets

Browse Source
This commit is contained in:
Elian Doran 2025-12-21 10:02:13 +02:00
parent f8bf301d12
commit f3f491d141
No known key found for this signature in database
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/services/bundle.ts
View File

@ -108,7 +108,9 @@ export class WidgetsByParent {
const el = h(preactWidget.render, {}); const el = h(preactWidget.render, {});
const widget = new ReactWrappedWidget(el); const widget = new ReactWrappedWidget(el);
widget.contentSized(); widget.contentSized();
// TODO: set position here. if (preactWidget.position) {
widget.position = preactWidget.position;
}
widgets.push(widget); widgets.push(widget);
} }

3
apps/client/src/services/frontend_script_api_preact.ts
View File

@ -6,7 +6,8 @@ import RightPanelWidget from "../widgets/sidebar/RightPanelWidget";
export interface WidgetDefinition { export interface WidgetDefinition {
parent: "right-pane", parent: "right-pane",
render: () => VNode render: () => VNode,
position?: number,
} }
export interface WidgetDefinitionWithType extends WidgetDefinition { export interface WidgetDefinitionWithType extends WidgetDefinition {

20
apps/client/src/widgets/sidebar/RightPanelContainer.tsx
View File

@ -24,7 +24,7 @@ const MIN_WIDTH_PERCENT = 5;
interface RightPanelWidgetDefinition { interface RightPanelWidgetDefinition {
el: VNode; el: VNode;
enabled: boolean; enabled: boolean;
position: number; position?: number;
} }
export default function RightPanelContainer({ widgetsByParent }: { widgetsByParent: WidgetsByParent }) { export default function RightPanelContainer({ widgetsByParent }: { widgetsByParent: WidgetsByParent }) {
@ -62,30 +62,38 @@ function useItems(rightPaneVisible: boolean, widgetsByParent: WidgetsByParent) {
{ {
el: <TableOfContents />, el: <TableOfContents />,
enabled: (noteType === "text" || noteType === "doc"), enabled: (noteType === "text" || noteType === "doc"),
position: 10,
}, },
{ {
el: <HighlightsList />, el: <HighlightsList />,
enabled: noteType === "text" && highlightsList.length > 0, enabled: noteType === "text" && highlightsList.length > 0,
position: 20,
}, },
...widgetsByParent.getLegacyWidgets("right-pane").map((widget, i) => ({ ...widgetsByParent.getLegacyWidgets("right-pane").map((widget, i) => ({
el: <CustomLegacyWidget key={widget._noteId} originalWidget={widget as LegacyRightPanelWidget} />, el: <CustomLegacyWidget key={widget._noteId} originalWidget={widget as LegacyRightPanelWidget} />,
enabled: true, enabled: true,
position: widget.position ?? 30 + i * 10 position: widget.position
})), })),
...widgetsByParent.getPreactWidgets("right-pane").map((widget) => { ...widgetsByParent.getPreactWidgets("right-pane").map((widget) => {
const El = widget.render; const El = widget.render;
return { return {
el: <El />, el: <El />,
enabled: true enabled: true,
position: widget.position
}; };
}) })
]; ];
// Assign a position to items that don't have one yet.
let pos = 10;
for (const definition of definitions) {
if (!definition.position) {
definition.position = pos;
pos += 10;
}
}
return definitions return definitions
.filter(e => e.enabled) .filter(e => e.enabled)
.toSorted((a, b) => a.position - b.position) .toSorted((a, b) => (a.position ?? 10) - (b.position ?? 10))
.map(e => e.el); .map(e => e.el);
} }