Skip to content

Build your personal knowledge base with Trilium Notes

feat(canvas): drop the "Excalidraw links" from the canvas note's menu

Elian Doran6faa4798e3d0
diff --git a/apps/client/src/widgets/type_widgets/canvas/Canvas.tsx b/apps/client/src/widgets/type_widgets/canvas/Canvas.tsx
index 349b9eb932..e2b7aee340 100644
--- a/apps/client/src/widgets/type_widgets/canvas/Canvas.tsx
+++ b/apps/client/src/widgets/type_widgets/canvas/Canvas.tsx
@@ -14,6 +14,7 @@ import options from "../../../services/options";
import "./Canvas.css";
import { NonDeleted, NonDeletedExcalidrawElement, ExcalidrawEmbeddableElement } from "@excalidraw/excalidraw/element/types";
import { goToLinkExt } from "../../../services/link";
+import { CanvasNoteMenu } from "./CanvasDrawingMenu";
import useCanvasPersistence from "./persistence";
import useCanvasNoteDrop from "./useCanvasNoteDrop";
import { LANGUAGE_MAPPINGS } from "./i18n";
@@ -37,7 +38,9 @@ export default function Canvas({ note, noteContext }: TypeWidgetProps) {
isReadOnly={isReadOnly}
colorScheme={colorScheme}
persistence={persistence}
- />
+ >
+ <CanvasNoteMenu />
+ </CanvasEditor>
);
}
diff --git a/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.spec.tsx b/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.spec.tsx
index 46dab31397..57c0ab850c 100644
--- a/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.spec.tsx
+++ b/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.spec.tsx
@@ -12,7 +12,10 @@ const MainMenu = vi.hoisted(() => Object.assign(
<button type="button" onClick={onSelect}>{children}</button>
),
Separator: () => <hr />,
- DefaultItems: Object.fromEntries([ "LoadScene", "SaveAsImage", "SearchMenu", "Help" ]
+ DefaultItems: Object.fromEntries([
+ "LoadScene", "SaveAsImage", "SearchMenu", "Help", "ClearCanvas",
+ "ChangeCanvasBackground", "Socials"
+ ]
.map((name) => [ name, () => <span>{name}</span> ]))
}
));
@@ -21,7 +24,7 @@ vi.mock("@excalidraw/excalidraw", () => ({
useI18n: () => ({ t: (key: string) => `t:${key}`, langCode: "en" })
}));
-const { default: CanvasDrawingMenu } = await import("./CanvasDrawingMenu");
+const { default: CanvasDrawingMenu, CanvasNoteMenu } = await import("./CanvasDrawingMenu");
describe("CanvasDrawingMenu", () => {
let container: HTMLElement;
@@ -61,3 +64,20 @@ describe("CanvasDrawingMenu", () => {
.toEqual([ "LoadScene", "SaveAsImage", "|", "SearchMenu", "Help" ]);
});
});
+
+describe("CanvasNoteMenu", () => {
+ it("offers Excalidraw's default entries without its links", async () => {
+ const container = document.createElement("div");
+ await act(async () => {
+ render(<CanvasNoteMenu />, container);
+ });
+ const items = [ ...container.querySelector(".menu")?.children ?? [] ]
+ .map((item) => item.tagName === "HR" ? "|" : item.textContent);
+ render(null, container);
+
+ expect(items).toEqual([
+ "LoadScene", "SaveAsImage", "SearchMenu", "Help", "ClearCanvas",
+ "ChangeCanvasBackground"
+ ]);
+ });
+});
diff --git a/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.tsx b/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.tsx
index 4d265788a0..545fe5a3ce 100644
--- a/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.tsx
+++ b/apps/client/src/widgets/type_widgets/canvas/CanvasDrawingMenu.tsx
@@ -32,3 +32,20 @@ export default function CanvasDrawingMenu({ apiRef, isEditable }: CanvasDrawingM
</MainMenu>
);
}
+
+/**
+ * The main menu of Excalidraw in a canvas note: Excalidraw's default menu without its links to
+ * Excalidraw's social accounts. Renders inside `<Excalidraw>`.
+ */
+export function CanvasNoteMenu() {
+ return (
+ <MainMenu>
+ <MainMenu.DefaultItems.LoadScene />
+ <MainMenu.DefaultItems.SaveAsImage />
+ <MainMenu.DefaultItems.SearchMenu />
+ <MainMenu.DefaultItems.Help />
+ <MainMenu.DefaultItems.ClearCanvas />
+ <MainMenu.DefaultItems.ChangeCanvasBackground />
+ </MainMenu>
+ );
+}