refactor(PastePlugin): improve mention validation logic by consolidat…

…ing conditions for username checks
wireapp · Jan 15, 2025 · 8aae236 · 8aae236
1 parent c7fcbf6
commit 8aae236
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/script/components/InputBar/components/RichTextEditor/plugins/PastePlugin/PastePlugin.tsx b/src/script/components/InputBar/components/RichTextEditor/plugins/PastePlugin/PastePlugin.tsx
@@ -103,18 +103,17 @@ export const PastePlugin = ({getMentionCandidates}: PastePluginProps): JSX.Eleme
       // Process mentions in the DOM before generating nodes
       lexicalMentions.forEach(mention => {
         const {isValid, username} = validateMention(mention, availableUsers);
-        if (!username) {
+        if (!username || isValid) {
           return;
         }
 
-        if (!isValid) {
-          const textNode = doc.createTextNode(`@${username}`);
-          const parent = mention.parentNode;
-          if (!parent) {
-            return;
-          }
-          parent.replaceChild(textNode, mention);
+        const parent = mention.parentNode;
+        if (!parent) {
+          return;
         }
+
+        const textNode = doc.createTextNode(`@${username}`);
+        parent.replaceChild(textNode, mention);
       });
 
       const nodes = $generateNodesFromDOM(editor, doc);