@ckeditor/ckeditor5-mention 41.1.0 → 41.3.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-mention",
-  "version": "41.1.0",
+  "version": "41.3.0-alpha.0",
   "description": "Mention feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,7 +13,7 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "41.1.0",
+    "ckeditor5": "41.3.0-alpha.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",
@@ -26,6 +26,7 @@
     "directory": "packages/ckeditor5-mention"
   },
   "files": [
+    "dist",
     "lang",
     "src/**/*.js",
     "src/**/*.d.ts",

package/src/mentioncommand.js

@@ -8,6 +8,11 @@
 import { Command } from 'ckeditor5/src/core.js';
 import { CKEditorError, toMap } from 'ckeditor5/src/utils.js';
 import { _addMentionAttributes } from './mentionediting.js';
+const BRACKET_PAIRS = {
+    '(': ')',
+    '[': ']',
+    '{': '}'
+};
 /**
  * The mention command.
  *
@@ -138,8 +143,24 @@ export default class MentionCommand extends Command {
             const attributesWithMention = new Map(currentAttributes.entries());
             attributesWithMention.set('mention', mention);
             // Replace a range with the text with a mention.
-            model.insertContent(writer.createText(mentionText, attributesWithMention), range);
-            model.insertContent(writer.createText(' ', currentAttributes), range.start.getShiftedBy(mentionText.length));
+            const insertionRange = model.insertContent(writer.createText(mentionText, attributesWithMention), range);
+            const nodeBefore = insertionRange.start.nodeBefore;
+            const nodeAfter = insertionRange.end.nodeAfter;
+            const isFollowedByWhiteSpace = nodeAfter && nodeAfter.is('$text') && nodeAfter.data.startsWith(' ');
+            let isInsertedInBrackets = false;
+            if (nodeBefore && nodeAfter && nodeBefore.is('$text') && nodeAfter.is('$text')) {
+                const precedingCharacter = nodeBefore.data.slice(-1);
+                const isPrecededByOpeningBracket = precedingCharacter in BRACKET_PAIRS;
+                const isFollowedByBracketClosure = isPrecededByOpeningBracket && nodeAfter.data.startsWith(BRACKET_PAIRS[precedingCharacter]);
+                isInsertedInBrackets = isPrecededByOpeningBracket && isFollowedByBracketClosure;
+            }
+            // Don't add a white space if either of the following is true:
+            // * there's already one after the mention;
+            // * the mention was inserted in the empty matching brackets.
+            // https://github.com/ckeditor/ckeditor5/issues/4651
+            if (!isInsertedInBrackets && !isFollowedByWhiteSpace) {
+                model.insertContent(writer.createText(' ', currentAttributes), range.start.getShiftedBy(mentionText.length));
+            }
         });
     }
 }