refactor(format painter menu): adjusted format painter menu display o…

…rder
cycleccc · Aug 18, 2024 · a84ecd1 · a84ecd1
1 parent e80bed6
commit a84ecd1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/packages/basic-modules/__tests__/format-painter/format-painter-menu.test.ts b/packages/basic-modules/__tests__/format-painter/format-painter-menu.test.ts
@@ -0,0 +1,30 @@
+/**
+ * @description format painter menu test
+ * @author CodePencil
+ */
+
+import { Editor } from 'slate'
+import FormatPainter from '../../src/modules/format-painter/menu/FormatPainter'
+import createEditor from '../../../../tests/utils/create-editor'
+
+describe('format painter menu', () => {
+  let editor: any
+  let startLocation: any
+
+  const menus = [
+    {
+      mark: 'formatPainter',
+      menu: new FormatPainter(),
+    },
+  ]
+
+  beforeEach(() => {
+    editor = createEditor()
+    startLocation = Editor.start(editor, [])
+  })
+
+  afterEach(() => {
+    editor = null
+    startLocation = null
+  })
+})
diff --git a/packages/basic-modules/src/modules/format-painter/menu/FormatPainter.ts b/packages/basic-modules/src/modules/format-painter/menu/FormatPainter.ts
@@ -6,7 +6,7 @@
 import { IButtonMenu, IDomEditor, t } from '@wangeditor-next/core'
 import { SlateEditor } from '@wangeditor-next/editor'
 import { FORMAT_PAINTER } from '../../../constants/icon-svg'
-import { Element, Text } from 'slate'
+import { Text } from 'slate'
 import { clearAllMarks } from '../helper'
 
 interface FormatPaintAttributes {

diff --git a/packages/editor/src/init-default-config/config/toolbar.ts b/packages/editor/src/init-default-config/config/toolbar.ts
@@ -14,7 +14,6 @@ import {
 
 export function genDefaultToolbarKeys() {
   return [
-    'formatPainter',
     'headerSelect',
     // 'header1',
     // 'header2',
@@ -83,6 +82,7 @@ export function genDefaultToolbarKeys() {
     'undo',
     'redo',
     '|',
+    'formatPainter',
     'fullScreen',
   ]
 }