fix: not trigger keyboard event whith delete key in contenteditable e…

…lem (#2965)
antvis · Nov 29, 2022 · 4978110 · 4978110
1 parent 8eb4387
commit 4978110
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -96,7 +96,7 @@ module.exports = function (config, base, karmaTypescriptConfig) {
         },
         coverageOptions: {
           instrumentation: !isDebug,
-          exclude: /\.test|spec\.ts$/,
+          exclude: /(\.test)|(spec\.ts$)/,
         },
         reports: {
           html: reportsDir,

diff --git a/packages/x6-plugin-keyboard/src/keyboard.ts b/packages/x6-plugin-keyboard/src/keyboard.ts
@@ -129,15 +129,18 @@ export class KeyboardImpl extends Disposable implements IDisablable {
   isInputEvent(e: KeyboardEvent | Dom.MouseUpEvent) {
     const target = e.target as Element
     const tagName = target?.tagName?.toLowerCase()
-    return ['input', 'textarea'].includes(tagName)
+    let isInput = ['input', 'textarea'].includes(tagName)
+    if (Dom.attr(target, 'contenteditable') === 'true') {
+      isInput = true
+    }
+    return isInput
   }
 
   isEnabledForEvent(e: KeyboardEvent) {
     const allowed = !this.disabled && this.isGraphEvent(e)
     const isInputEvent = this.isInputEvent(e)
     if (allowed) {
-      const code = e.keyCode || e.which
-      if (isInputEvent && (code === 8 || code === 46)) {
+      if (isInputEvent && (e.key === 'Backspace' || e.key === 'Delete')) {
         return false
       }
       if (this.options.guard) {