Extract the menu items creation

matthiask · Dec 3, 2024 · 59b5ff3 · 59b5ff3
1 parent 6a687c2
commit 59b5ff3
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 40 deletions.
diff --git a/django_prose_editor/static/django_prose_editor/editor.js b/django_prose_editor/static/django_prose_editor/editor.js
diff --git a/django_prose_editor/static/django_prose_editor/init.js b/django_prose_editor/static/django_prose_editor/init.js
diff --git a/src/init.js b/src/init.js
@@ -26,6 +26,7 @@ function createEditor(textarea) {
     Underline,
     Link,
     Menu,
+    menuItemsFromConfig,
     NoSpellCheck,
     Typographic,
     createTextareaEditor,
@@ -42,7 +43,7 @@ function createEditor(textarea) {
     Paragraph,
     HardBreak,
     Text,
-    Menu.configure({ config }),
+    Menu.configure({ menuItems: menuItemsFromConfig(config) }),
     NoSpellCheck,
     config.typographic && Typographic,
     // Nodes and marks

diff --git a/src/library.js b/src/library.js
@@ -24,7 +24,7 @@ import { Underline } from "@tiptap/extension-underline"
 
 import { updateAttrsDialog } from "./commands.js"
 import { Link } from "./link.js"
-import { Menu } from "./menu.js"
+export * from "./menu.js"
 import { NoSpellCheck } from "./nospellcheck.js"
 import { Typographic } from "./typographic.js"
 import { crel } from "./utils.js"
@@ -60,7 +60,6 @@ export {
   Underline,
   Link,
   /* others */
-  Menu,
   NoSpellCheck,
   Typographic,
 }

diff --git a/src/menu.js b/src/menu.js
@@ -5,33 +5,29 @@ import { undo, redo } from "@tiptap/pm/history"
 import { wrapInList } from "@tiptap/pm/schema-list"
 import { Plugin } from "@tiptap/pm/state"
 
+export const menuItemsFromConfig = (config) => (editor) => {
+  const schema = editor.schema
+  return [
+    blockTypeMenuItems(schema, config.headingLevels),
+    listMenuItems(schema),
+    linkMenuItems(schema),
+    markMenuItems(schema),
+    config.history ? historyMenuItems() : null,
+    config.html ? htmlMenuItem() : null,
+  ].filter(Boolean)
+}
+
 export const Menu = Extension.create({
   name: "menu",
 
   addProseMirrorPlugins() {
-    const schema = this.editor.schema
-    const config = this.options.config
-
-    // console.debug("this", this)
-    // console.debug("arguments", arguments)
-    // console.debug("schema", schema)
+    const menuItems = this.options.menuItems(this.editor)
 
     return [
       new Plugin({
         view(editorView) {
-          const menuView = new MenuView(
-            editorView,
-            [
-              blockTypeMenuItems(schema, config.headingLevels),
-              listMenuItems(schema),
-              linkMenuItems(schema),
-              markMenuItems(schema),
-              config.history ? historyMenuItems() : null,
-              config.html ? htmlMenuItem() : null,
-            ].filter(Boolean),
-          )
+          const menuView = new MenuView(editorView, menuItems)
           editorView.dom.parentNode.insertBefore(menuView.dom, editorView.dom)
-
           return menuView
         },
       }),