fix: close #532

Tencent · Aug 17, 2023 · a1df190 · a1df190
1 parent cbff2bf
commit a1df190
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/src/toolbars/Bubble.js b/src/toolbars/Bubble.js
@@ -51,6 +51,10 @@ export default class Bubble extends Toolbar {
     this.editorDom.querySelector('.CodeMirror').appendChild(this.bubbleDom);
   }
 
+  appendMenusToDom(menus) {
+    this.options.dom.appendChild(menus);
+  }
+
   /**
    * 计算编辑区域的偏移量
    * @returns {number} 编辑区域的滚动区域

diff --git a/src/toolbars/FloatMenu.js b/src/toolbars/FloatMenu.js
@@ -29,6 +29,10 @@ export default class FloatMenu extends Toolbar {
     this.initAction();
   }
 
+  appendMenusToDom(menus) {
+    this.options.dom.appendChild(menus);
+  }
+
   initAction() {
     const self = this;
     this.editor.addListener('cursorActivity', (codemirror, evt) => {

diff --git a/src/toolbars/Sidebar.js b/src/toolbars/Sidebar.js
@@ -23,4 +23,7 @@ export default class Sidebar extends Toolbar {
   // constructor(options) {
   //   super(options);
   // }
+  appendMenusToDom(menus) {
+    this.options.dom.appendChild(menus);
+  }
 }
diff --git a/src/toolbars/Toolbar.js b/src/toolbars/Toolbar.js
@@ -87,7 +87,6 @@ export default class Toolbar {
    */
   drawMenus() {
     const fragLeft = document.createDocumentFragment();
-    const toolbarLeft = createElement('div', 'toolbar-left');
 
     this.menus.level1MenusName.forEach((name) => {
       const btn = this.menus.hooks[name].createBtn();
@@ -104,7 +103,12 @@ export default class Toolbar {
       fragLeft.appendChild(btn);
     });
 
-    toolbarLeft.appendChild(fragLeft);
+    this.appendMenusToDom(fragLeft);
+  }
+
+  appendMenusToDom(menus) {
+    const toolbarLeft = createElement('div', 'toolbar-left');
+    toolbarLeft.appendChild(menus);
     this.options.dom.appendChild(toolbarLeft);
   }
 

diff --git a/src/toolbars/ToolbarRight.js b/src/toolbars/ToolbarRight.js
@@ -22,26 +22,9 @@ export default class ToolbarRight extends Toolbar {
   /**
    * 根据配置画出来一级工具栏
    */
-  drawMenus() {
-    const fragRight = document.createDocumentFragment();
-    const toolbarRight = createElement('div', 'toolbar-right');
-
-    this.menus.level1MenusName.forEach((name) => {
-      const btn = this.menus.hooks[name].createBtn();
-      btn.addEventListener(
-        'click',
-        (event) => {
-          this.onClick(event, name);
-        },
-        false,
-      );
-      if (this.isHasSubMenu(name)) {
-        btn.classList.add('cherry-toolbar-dropdown');
-      }
-      fragRight.appendChild(btn);
-    });
-
-    toolbarRight.appendChild(fragRight);
-    this.options.dom.appendChild(toolbarRight);
+  appendMenusToDom(menus) {
+    const toolbarLeft = createElement('div', 'toolbar-right');
+    toolbarLeft.appendChild(menus);
+    this.options.dom.appendChild(toolbarLeft);
   }
 }