fix: delete text will delete img too

wangeditor-team · Dec 19, 2021 · 2d060d5 · 2d060d5
1 parent bac1b1e
commit 2d060d5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/src/config/menus.ts b/src/config/menus.ts
@@ -182,21 +182,19 @@ export default {
             // type -> 'emoji' / 'image'
             type: 'emoji',
             // content -> 数组
-            content:
-                '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split(
-                    /\s/
-                ),
+            content: '😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣'.split(
+                /\s/
+            ),
         },
         {
             // tab 的标题
             title: '手势',
             // type -> 'emoji' / 'image'
             type: 'emoji',
             // content -> 数组
-            content:
-                '👐 🙌 👏 🤝 👍 👎 👊 ✊ 🤛 🤜 🤞 ✌️ 🤘 👌 👈 👉 👆 👇 ☝️ ✋ 🤚 🖐 🖖 👋 🤙 💪 🖕 ✍️ 🙏'.split(
-                    /\s/
-                ),
+            content: '👐 🙌 👏 🤝 👍 👎 👊 ✊ 🤛 🤜 🤞 ✌️ 🤘 👌 👈 👉 👆 👇 ☝️ ✋ 🤚 🖐 🖖 👋 🤙 💪 🖕 ✍️ 🙏'.split(
+                /\s/
+            ),
         },
     ],
 

diff --git a/src/lib/simplehtmlparser.js b/src/lib/simplehtmlparser.js
@@ -61,8 +61,7 @@ SimpleHtmlParser.prototype = {
 
     // regexps
 
-    startTagRe:
-        /^<([^>\s\/]+)((\s+[^=>\s]+(\s*=\s*((\"[^"]*\")|(\'[^']*\')|[^>\s]+))?)*)\s*\/?\s*>/m,
+    startTagRe: /^<([^>\s\/]+)((\s+[^=>\s]+(\s*=\s*((\"[^"]*\")|(\'[^']*\')|[^>\s]+))?)*)\s*\/?\s*>/m,
     endTagRe: /^<\/([^>\s]+)[^>]*>/m,
     attrRe: /([^=\s]+)(\s*=\s*((\"([^"]*)\")|(\'([^']*)\')|[^>\s]+))?/gm,
 

diff --git a/src/menus/img/bind-event/keyboard-event.ts b/src/menus/img/bind-event/keyboard-event.ts
@@ -51,5 +51,13 @@ export default function bindEventKeyboardEvent(editor: Editor) {
             lastChildNodeInPrevNode =
                 lastChildNodeInPrevNode.childNodes[lastChildNodeInPrevNode.childNodes.length - 1]
         }
+
+        if (
+            lastChildNodeInPrevNode instanceof HTMLElement &&
+            lastChildNodeInPrevNode.tagName === 'IMG'
+        ) {
+            lastChildNodeInPrevNode.remove()
+            e.preventDefault()
+        }
     })
 }
diff --git a/src/menus/lineHeight/index.ts b/src/menus/lineHeight/index.ts
@@ -69,8 +69,8 @@ class LineHeight extends DropListMenu implements MenuActive {
             //获取range 开头结束的dom
             const StartElem: DomElement = $(editor.selection.getSelectionStartElem())
             const EndElem: DomElement = $(editor.selection.getSelectionEndElem())
-            const childList: NodeListOf<ChildNode> | undefined =
-                editor.selection.getRange()?.commonAncestorContainer.childNodes
+            const childList: NodeListOf<ChildNode> | undefined = editor.selection.getRange()
+                ?.commonAncestorContainer.childNodes
             arrayDom_a.push(this.getDom(StartElem.elems[0]))
             childList?.forEach((item, index) => {
                 if (item === this.getDom(StartElem.elems[0])) {

diff --git a/src/text/index.ts b/src/text/index.ts
@@ -343,9 +343,7 @@ class Text {
         // 键盘 down 时的 hooks
         $textElem.on('keydown', (e: KeyboardEvent) => {
             const keydownEvents = eventHooks.keydownEvents
-            setTimeout(() => {
-                keydownEvents.forEach(fn => fn(e))
-            })
+            keydownEvents.forEach(fn => fn(e))
         })
 
         // delete 键 up 时 hooks

diff --git a/src/utils/const.ts b/src/utils/const.ts
@@ -6,8 +6,7 @@
 export function EMPTY_FN() {}
 
 //用于校验是否为url格式字符串
-export const urlRegex =
-    /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
+export const urlRegex = /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/
 
 // 编辑器为了方便继续输入/换行等原因 主动生成的空标签
 export const EMPTY_P = '<p data-we-empty-p=""><br></p>'