Skip to content

Allow inner markers in mention text e.g @someone@somedomain.com #18371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleixq wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow inner markers in mention text e.g @someone@somedomain.com #18371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/ckeditor5-mention/src/mentionui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down