From 266c44565d259c69c63c99dd8a3fd80a4aa74eb4 Mon Sep 17 00:00:00 2001 From: Aleix Quintana Alsius Date: Fri, 11 Apr 2025 09:23:11 +0200 Subject: [PATCH] Update mentionui.ts Allow @someone@somedomain.com mentions --- packages/ckeditor5-mention/src/mentionui.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/ckeditor5-mention/src/mentionui.ts b/packages/ckeditor5-mention/src/mentionui.ts index e1d3c9ad088..5064a24c196 100644 --- a/packages/ckeditor5-mention/src/mentionui.ts +++ b/packages/ckeditor5-mention/src/mentionui.ts @@ -685,7 +685,14 @@ function getLastValidMarkerInText( let lastValidMarker: any; for ( const feed of feedsWithPattern ) { - const currentMarkerLastIndex = text.lastIndexOf( feed.marker ); + // RegExp to check inner markers inside the text such as @me@mysite.com + const markerInside = `${feed.marker}[\\S]+${feed.marker}[\\S]+`; + let currentMarkerLastIndex: any; + if (text.match(markerInside)) { + currentMarkerLastIndex = text.lastIndexOf( feed.marker, text.lastIndexOf(feed.marker) - 1); + } else { + currentMarkerLastIndex = text.lastIndexOf( feed.marker ); + } if ( currentMarkerLastIndex > 0 && !text.substring( currentMarkerLastIndex - 1 ).match( feed.pattern ) ) { continue;