Fix PickPlugin will not remove nodes with other tags other than <a> t…

…ag (#2116)
microsoft · Sep 29, 2023 · 1d70f8a · 1d70f8a
1 parent 3e3429a
commit 1d70f8a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/packages/roosterjs-editor-plugins/lib/plugins/Picker/PickerPlugin.ts b/packages/roosterjs-editor-plugins/lib/plugins/Picker/PickerPlugin.ts
@@ -465,9 +465,11 @@ export default class PickerPlugin<T extends PickerDataProvider = PickerDataProvi
             } else if (keyboardEvent.key == DELETE_CHAR_CODE) {
                 let searcher = this.editor?.getContentSearcherOfCursor(event);
                 if (searcher) {
-                    let nodeAfterCursor = searcher.getInlineElementAfter()
-                        ? searcher.getInlineElementAfter()?.getContainerNode()
+                    const inlineElementAfter = searcher.getInlineElementAfter();
+                    let nodeAfterCursor = inlineElementAfter
+                        ? inlineElementAfter.getContainerNode()
                         : null;
+                    nodeAfterCursor = this.getParentNodeIfTextNode(nodeAfterCursor);
                     let nodeId = nodeAfterCursor ? this.getIdValue(nodeAfterCursor) : null;
                     if (
                         nodeId &&
@@ -483,6 +485,13 @@ export default class PickerPlugin<T extends PickerDataProvider = PickerDataProvi
         }
     }
 
+    private getParentNodeIfTextNode(node: Node | null): Node | null {
+        if (safeInstanceOf(node, 'Text')) {
+            node = node.parentNode;
+        }
+        return node;
+    }
+
     private onAndroidInputEvent(event: PluginInputEvent) {
         this.newInputLength = this.calcInputLength(event);
 
@@ -506,16 +515,14 @@ export default class PickerPlugin<T extends PickerDataProvider = PickerDataProvi
         if (!this.editor) {
             return false;
         }
-
         const searcher = this.editor.getContentSearcherOfCursor(event);
         if (!searcher) {
             return false;
         }
 
         const inlineElementBefore = searcher.getInlineElementBefore();
-        const nodeBeforeCursor = inlineElementBefore
-            ? inlineElementBefore.getContainerNode()
-            : null;
+        let nodeBeforeCursor = inlineElementBefore ? inlineElementBefore.getContainerNode() : null;
+        nodeBeforeCursor = this.getParentNodeIfTextNode(nodeBeforeCursor);
         const nodeId = nodeBeforeCursor ? this.getIdValue(nodeBeforeCursor) : null;
         const inlineElementAfter = searcher.getInlineElementAfter();
 
@@ -606,3 +613,4 @@ export default class PickerPlugin<T extends PickerDataProvider = PickerDataProvi
         );
     }
 }
+