Skip to content

Build your personal knowledge base with Trilium Notes

fix(text): open the image position menu as a Trilium menu on desktop

Elian Doran5b7e5444e753
diff --git a/packages/ckeditor5/src/plugins/toolbar_group_menu.spec.ts b/packages/ckeditor5/src/plugins/toolbar_group_menu.spec.ts
index 7ad4002d8b..3f4951b310 100644
--- a/packages/ckeditor5/src/plugins/toolbar_group_menu.spec.ts
+++ b/packages/ckeditor5/src/plugins/toolbar_group_menu.spec.ts
@@ -554,6 +554,35 @@ describe("ToolbarGroupMenu", () => {
expect(host.destroy).toHaveBeenCalled();
});
+ it("converts a dropdown of a widget toolbar, registered and filled after the plugin is set up", async () => {
+ const { _setModelData: setModelData, Image, ImageStyle, ImageToolbar, WidgetToolbarRepository } = await import("ckeditor5");
+ const { default: ImagePosition } = await import("./image_position.js");
+ const { config, last } = createHost();
+ const editor = await createTestEditor([...PLUGINS, Image, ImageStyle, ImageToolbar, ImagePosition], {
+ ...config,
+ toolbar: { items: ["bold"] },
+ image: { toolbar: ["imagePosition"], styles: { options: ["inline", "alignLeft"] } }
+ });
+
+ // The repository fills a toolbar the first time it shows it, for a selected image.
+ editor.editing.view.focus();
+ setModelData(editor.model, "[<imageBlock src=\"a.png\"></imageBlock>]<paragraph>b</paragraph>");
+ editor.ui.update();
+
+ const repository = editor.plugins.get(WidgetToolbarRepository) as unknown as {
+ _toolbarDefinitions: Map<string, { view: ToolbarView }>;
+ };
+ const toolbar = repository._toolbarDefinitions.get("image")?.view;
+ if (!toolbar) {
+ throw new Error("No image toolbar was registered.");
+ }
+ const dropdown = groupDropdown(toolbar, "Image position");
+ dropdown.buttonView.fire("open");
+
+ expect(dropdown.isOpen).toBe(false);
+ expect(labels(last().items)).toStrictEqual(["In line", "Wrap text", "Align left"]);
+ });
+
it("opens a dropdown handed to openListAsMenu as a menu of its rows, with the one on checked", async () => {
const { host, config, last } = createHost();
const editor = await createTestEditor(PLUGINS, {
diff --git a/packages/ckeditor5/src/plugins/toolbar_group_menu.ts b/packages/ckeditor5/src/plugins/toolbar_group_menu.ts
index b4ef937fd6..9bf1642ae3 100644
--- a/packages/ckeditor5/src/plugins/toolbar_group_menu.ts
+++ b/packages/ckeditor5/src/plugins/toolbar_group_menu.ts
@@ -1,7 +1,8 @@
import {
BalloonToolbar, BlockToolbar, ButtonView, DropdownView, type Editor, type FocusTracker,
ListItemGroupView, ListItemView, ListSeparatorView, ListView, Plugin, SearchTextView, SplitButtonView, SwitchButtonView,
- type ToolbarConfig, type ToolbarConfigItem, ToolbarSeparatorView, type ToolbarView, type View
+ type ToolbarConfig, type ToolbarConfigItem, ToolbarSeparatorView, type ToolbarView, type View,
+ WidgetToolbarRepository
} from "ckeditor5";
import ContextToolbar from "./context_toolbar.js";
@@ -143,8 +144,7 @@ export default class ToolbarGroupMenu extends Plugin {
return;
}
const createHost = () => menuConfig.host(editor);
-
- for (const toolbar of this.getToolbarViews()) {
+ const watchToolbar = (toolbar: ToolbarView) => {
for (const item of toolbar.items) {
this.watchGroupDropdown(toolbar, item, groups, createHost);
}
@@ -152,6 +152,20 @@ export default class ToolbarGroupMenu extends Plugin {
this.listenTo(toolbar.items, "add", (evt, item: View) => {
this.watchGroupDropdown(toolbar, item, groups, createHost);
});
+ };
+
+ for (const toolbar of this.getToolbarViews()) {
+ watchToolbar(toolbar);
+ }
+
+ // The plugins that own a widget toolbar register it in their own `afterInit()`, which can
+ // run after this one, and `WidgetToolbarRepository` fills it the first time it shows it.
+ if (editor.plugins.has(WidgetToolbarRepository)) {
+ this.listenTo(editor, "ready", () => {
+ for (const toolbar of getWidgetToolbarViews(editor)) {
+ watchToolbar(toolbar);
+ }
+ });
}
}
@@ -382,6 +396,17 @@ function collectFromItems(items: ToolbarConfigItem[] | undefined, groups: Map<st
}
}
+/**
+ * The toolbars registered with `WidgetToolbarRepository`, such as the one of an image. The
+ * repository keeps them in a private map, as `ContextToolbar` reads it too.
+ */
+function getWidgetToolbarViews(editor: Editor) {
+ const repository = editor.plugins.get(WidgetToolbarRepository) as unknown as {
+ _toolbarDefinitions: Map<string, { view: ToolbarView }>;
+ };
+ return [...repository._toolbarDefinitions.values()].map(({ view }) => view);
+}
+
/**
* The entries `items` stand for, with a rule wherever the group has a separator between entries.
* A dropdown's list is read now, as `dateTime` fills its list with the time it is opened at.