diff --git a/apps/client/src/layouts/desktop_layout.ts b/apps/client/src/layouts/desktop_layout.tsx
similarity index 99%
rename from apps/client/src/layouts/desktop_layout.ts
rename to apps/client/src/layouts/desktop_layout.tsx
index 33c1135c8..85dcb531f 100644
--- a/apps/client/src/layouts/desktop_layout.ts
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -4,7 +4,7 @@ import TabRowWidget from "../widgets/tab_row.js";
import TitleBarButtonsWidget from "../widgets/title_bar_buttons.js";
import LeftPaneContainer from "../widgets/containers/left_pane_container.js";
import NoteTreeWidget from "../widgets/note_tree.js";
-import NoteTitleWidget from "../widgets/note_title.js";
+import NoteTitleWidget from "../widgets/note_title.jsx";
import OwnedAttributeListWidget from "../widgets/ribbon_widgets/owned_attribute_list.js";
import NoteActionsWidget from "../widgets/buttons/note_actions.js";
import NoteDetailWidget from "../widgets/note_detail.js";
@@ -152,7 +152,7 @@ export default class DesktopLayout {
.css("align-items", "center")
.cssBlock(".title-row > * { margin: 5px; }")
.child(new NoteIconWidget())
- .child(new NoteTitleWidget())
+ .child()
.child(new SpacerWidget(0, 1))
.child(new MovePaneButton(true))
.child(new MovePaneButton(false))
diff --git a/apps/client/src/widgets/basic_widget.ts b/apps/client/src/widgets/basic_widget.ts
index 7b5c8e29c..22d1864fb 100644
--- a/apps/client/src/widgets/basic_widget.ts
+++ b/apps/client/src/widgets/basic_widget.ts
@@ -4,6 +4,7 @@ import froca from "../services/froca.js";
import { t } from "../services/i18n.js";
import toastService from "../services/toast.js";
import { renderReactWidget } from "./react/react_utils.jsx";
+import { EventNames, EventData } from "../components/app_context.js";
export class TypedBasicWidget> extends TypedComponent {
protected attrs: Record;
@@ -276,9 +277,10 @@ export function wrapReactWidgets>(components: (T |
return wrappedResult;
}
-class ReactWrappedWidget extends BasicWidget {
+export class ReactWrappedWidget extends BasicWidget {
private el: VNode;
+ listeners: Record void> = {};
constructor(el: VNode) {
super();
@@ -289,4 +291,10 @@ class ReactWrappedWidget extends BasicWidget {
this.$widget = renderReactWidget(this, this.el);
}
+ handleEvent(name: T, data: EventData): Promise | null | undefined {
+ const listener = this.listeners[name];
+ console.log("Handle ", name, listener);
+ listener?.(data);
+ }
+
}
diff --git a/apps/client/src/widgets/note_title.tsx b/apps/client/src/widgets/note_title.tsx
index b1409d5e8..7fe057f28 100644
--- a/apps/client/src/widgets/note_title.tsx
+++ b/apps/client/src/widgets/note_title.tsx
@@ -1,7 +1,11 @@
+import { useNoteContext } from "./react/hooks";
+
export default function NoteTitleWidget() {
+ const { ntxId, noteId, note } = useNoteContext();
+
return (
<>
- Hi
+ { ntxId }{ noteId }
>
);
}
diff --git a/apps/client/src/widgets/react/hooks.tsx b/apps/client/src/widgets/react/hooks.tsx
index adf6a8576..925ac24f1 100644
--- a/apps/client/src/widgets/react/hooks.tsx
+++ b/apps/client/src/widgets/react/hooks.tsx
@@ -6,7 +6,8 @@ import { OptionNames } from "@triliumnext/commons";
import options, { type OptionValue } from "../../services/options";
import utils, { reloadFrontendApp } from "../../services/utils";
import Component from "../../components/component";
-import server from "../../services/server";
+import NoteContext from "../../components/note_context";
+import { ReactWrappedWidget } from "../basic_widget";
type TriliumEventHandler = (data: EventData) => void;
const registeredHandlers: Map[]>> = new Map();
@@ -83,6 +84,11 @@ export default function useTriliumEvent(eventName: T, hand
}, [ eventName, parentWidget, handler ]);
}
+export function useTriliumEventBeta(eventName: T, handler: TriliumEventHandler) {
+ const parentComponent = useContext(ParentComponent) as ReactWrappedWidget;
+ parentComponent.listeners[eventName] = handler;
+}
+
export function useSpacedUpdate(callback: () => Promise, interval = 1000) {
const callbackRef = useRef(callback);
const spacedUpdateRef = useRef();
@@ -218,4 +224,36 @@ export function useTriliumOptions(...names: T[]) {
*/
export function useUniqueName(prefix?: string) {
return useMemo(() => (prefix ? prefix + "-" : "") + utils.randomString(10), [ prefix ]);
+}
+
+export function useNoteContext() {
+
+ const [ noteContext, setNoteContext ] = useState();
+ const [ notePath, setNotePath ] = useState();
+
+ useTriliumEvent("activeContextChanged", ({ noteContext }) => {
+ console.log("Active context changed.");
+ setNoteContext(noteContext);
+ });
+ useTriliumEventBeta("setNoteContext", ({ noteContext }) => {
+ console.log("Set note context", noteContext, noteContext.noteId);
+ setNoteContext(noteContext);
+ });
+ useTriliumEvent("noteSwitchedAndActivated", ({ noteContext }) => {
+ console.log("Note switched and activated")
+ setNoteContext(noteContext);
+ });
+ useTriliumEvent("noteSwitched", ({ noteContext, notePath }) => {
+ console.warn("Note switched", notePath);
+ setNotePath(notePath);
+ });
+
+ return {
+ note: noteContext?.note,
+ noteId: noteContext?.note?.noteId,
+ notePath: noteContext?.notePath,
+ hoistedNoteId: noteContext?.hoistedNoteId,
+ ntxId: noteContext?.ntxId
+ };
+
}
\ No newline at end of file