Improved regex test

1 files changed, 8 insertions, 2 deletions

diff --git a/src/components/comments/MentionInputControlled.tsx b/src/components/comments/MentionInputControlled.tsx
index 642ef64c..892c9564 100644
--- a/src/components/comments/MentionInputControlled.tsx
+++ b/src/components/comments/MentionInputControlled.tsx
@@ -43,7 +43,13 @@ const MentionInputControlled: FC<MentionInputProps> = (
 
   const [keyboardText, setKeyboardText] = useState<string>('');
 
-  const validRegex = /.*\@[^ ]*$/;
+  const validRegex = () => {
+    if (partTypes.length === 0) {
+        return /.*\@[^ ]*$/;
+    } else {
+        return new RegExp(`.*\@${keywordByTrigger[partTypes[0].trigger]}.*$`);
+    }
+  };
 
   const {
     plainText,
@@ -134,7 +140,7 @@ const MentionInputControlled: FC<MentionInputProps> = (
   );
 
   const validateInput = (testString: string) => {
-      return validRegex.test(testString);
+      return validRegex().test(testString);
   }
 
   return (