From aaa28b5d24186d686bd7fab04536b1ae77cf9295 Mon Sep 17 00:00:00 2001
From: Muhammad Ali <alihamuh@gmail.com>
Date: Wed, 19 Jul 2023 13:23:36 +0500
Subject: [PATCH] editor: added all tools in / command pop-up.

---
 .../editor/src/extensions/key-map/key-map.ts  | 52 ++++++++++++--
 .../src/toolbar/popups/blocknodes-popup.tsx   | 68 ++-----------------
 2 files changed, 51 insertions(+), 69 deletions(-)

diff --git a/packages/editor/src/extensions/key-map/key-map.ts b/packages/editor/src/extensions/key-map/key-map.ts
index 5a30e0904..d33df219f 100644
--- a/packages/editor/src/extensions/key-map/key-map.ts
+++ b/packages/editor/src/extensions/key-map/key-map.ts
@@ -25,6 +25,8 @@ import { CodeBlock } from "../code-block";
 import { ShowBlockNodesComponent } from "../../toolbar/popups/blocknodes-popup";
 import { Editor } from "../../types";
 import { getAllTools } from "../../toolbar";
+import { ToolId } from "../../toolbar/tools";
+import { MenuItem } from "../../components/menu/types";
 
 export const KeyMap = Extension.create({
   name: "key-map",
@@ -58,22 +60,60 @@ export const KeyMap = Extension.create({
         const selectedElement = editor.view.domAtPos($from.pos)
           .node as HTMLElement;
 
+        const menuItems: MenuItem[] = [];
+        const defaultTools = Object.keys(getAllTools()).splice(1, 6);
+        for (const key of defaultTools) {
+          const blocknode = getAllTools()[key as ToolId];
+          menuItems.push({
+            key: blocknode.icon,
+            type: "button",
+            title: blocknode.title,
+            icon: blocknode.icon,
+            onClick() {
+              console.log("clicked");
+              /* 
+              How to apply on click methods
+              editor.current?.chain().focus()....
+              //.toggleOutlineList().run();//
+              */
+            }
+          });
+        }
         ShowBlockNodesComponent({
           editor: editor as Editor,
-          selectedElement: selectedElement
+          selectedElement: selectedElement,
+          items: menuItems
         });
 
         (editor as Editor).current?.commands.focus();
+
         (editor as Editor).current?.on("update", ({ editor }) => {
+          const menuItems: MenuItem[] = [];
           const { state } = editor as Editor;
           const { $from } = state.selection;
           const before = $from.nodeBefore?.textContent;
-          console.log(
-            " inlistenr",
-            Object.keys(getAllTools()).filter(
-              (string) => string.indexOf(before as string) > -1
-            )
+
+          let keys = Object.keys(getAllTools()).filter(
+            (string) => string.indexOf(before as string) > -1
           );
+          console.log("keys", keys);
+          if (!before && keys.length === 0) keys = defaultTools;
+          for (const key of keys.slice(0, 6)) {
+            const blocknode = getAllTools()[key as ToolId];
+            console.log(blocknode);
+            menuItems.push({
+              key: blocknode.icon,
+              icon: blocknode.icon,
+              type: "button",
+              title: blocknode.title
+            });
+          }
+          ShowBlockNodesComponent({
+            editor: editor as Editor,
+            selectedElement: selectedElement,
+            items: menuItems
+          });
+          (editor as Editor).current?.commands.focus();
         });
         return true;
       }
diff --git a/packages/editor/src/toolbar/popups/blocknodes-popup.tsx b/packages/editor/src/toolbar/popups/blocknodes-popup.tsx
index 3f488decc..e72dde09c 100644
--- a/packages/editor/src/toolbar/popups/blocknodes-popup.tsx
+++ b/packages/editor/src/toolbar/popups/blocknodes-popup.tsx
@@ -21,14 +21,14 @@ import { showPopup } from "../../components/popup-presenter";
 import { Editor } from "../../types";
 import { MenuItem } from "../../components/menu/types";
 import { getToolbarElement } from "../utils/dom";
-import { getAllTools } from "../tool-definitions";
 
 export const ShowBlockNodesComponent = (props: {
   editor: Editor;
   selectedElement: HTMLElement;
+  items: MenuItem[];
 }) => {
-  const { editor, selectedElement } = props;
-  const items = toMenuItems(editor);
+  const { editor, selectedElement, items } = props;
+  //const items = toMenuItems(editor);
   const toolbarLocation = useToolbarStore.getState().toolbarLocation;
   const isMobile = useToolbarStore.getState().isMobile;
   const isBottom = toolbarLocation === "bottom";
@@ -55,66 +55,8 @@ export const ShowBlockNodesComponent = (props: {
       display: "flex",
       alignItems: isBottom ? "center" : "unset"
     },
-    onFocus: () => {
-      console.log("on foucs");
-    },
-    onBlur: () => {
-      console.log("on bluur");
+    onClose: () => {
+      editor.current?.off("update");
     }
   });
 };
-
-const blocknodes = [
-  { id: "table", title: "Table" },
-  { id: "outline-list", title: "Outline list" },
-  { id: "task-list", title: "Task list" },
-  { id: "bullet-list", title: "Bullet list" },
-  { id: "ordered-list", title: "Ordered list" },
-  { id: "block-quote", title: "Quote" },
-  { id: "code-block", title: "Code block" }
-];
-
-function toMenuItems(editor: Editor): MenuItem[] {
-  const menuItems: MenuItem[] = [];
-  for (const blocknode of blocknodes) {
-    menuItems.push({
-      key: blocknode.id,
-      type: "button",
-      title: blocknode.title,
-      onClick: () => {
-        console.log(getAllTools());
-        editor.current?.chain().focus().insertContent(" ").run();
-
-        switch (blocknode.id) {
-          case "table":
-            editor.current
-              ?.chain()
-              .focus()
-              .insertTable({ rows: 3, cols: 3 })
-              .run();
-            break;
-          case "outline-list":
-            editor.current?.chain().focus().toggleOutlineList().run();
-            break;
-          case "task-list":
-            editor.current?.chain().focus().toggleTaskList().run();
-            break;
-          case "bullet-list":
-            editor.current?.chain().focus().toggleBulletList().run();
-            break;
-          case "ordered-list":
-            editor.current?.chain().focus().toggleOrderedList().run();
-            break;
-          case "block-quote":
-            editor.current?.chain().focus().setBlockquote().run();
-            break;
-          case "code-block":
-            editor.current?.chain().focus().toggleCodeBlock().run();
-            break;
-        }
-        editor.current?.off("update");
-      }
-    });
-  }
-  return menuItems;
-}