[lexical-link] Bug Fix: Removing a link from descendants (#6656)

facebook · Sep 25, 2024 · 2889ccd · 2889ccd
1 parent 25a3121
commit 2889ccd
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/packages/lexical-link/src/index.ts b/packages/lexical-link/src/index.ts
@@ -18,7 +18,11 @@ import type {
   SerializedElementNode,
 } from 'lexical';
 
-import {addClassNamesToElement, isHTMLAnchorElement} from '@lexical/utils';
+import {
+  $findMatchingParent,
+  addClassNamesToElement,
+  isHTMLAnchorElement,
+} from '@lexical/utils';
 import {
   $applyNodeReplacement,
   $getSelection,
@@ -495,16 +499,20 @@ export function $toggleLink(
   if (url === null) {
     // Remove LinkNodes
     nodes.forEach((node) => {
-      const parent = node.getParent();
+      const parentLink = $findMatchingParent(
+        node,
+        (parent): parent is LinkNode =>
+          !$isAutoLinkNode(parent) && $isLinkNode(parent),
+      );
 
-      if (!$isAutoLinkNode(parent) && $isLinkNode(parent)) {
-        const children = parent.getChildren();
+      if (parentLink) {
+        const children = parentLink.getChildren();
 
         for (let i = 0; i < children.length; i++) {
-          parent.insertBefore(children[i]);
+          parentLink.insertBefore(children[i]);
         }
 
-        parent.remove();
+        parentLink.remove();
       }
     });
   } else {