Merge pull request #2000 from GetStream/develop

v10.7.6

Author: MartinCupela

src/__tests__/__snapshots__/utils.test.js.snap

@@ -1,5 +1,44 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`renderText handles the special case where there are pronouns in the name 1`] = `
+<p>
+  hey, 
+  <span
+    className="str-chat__message-mention"
+    data-user-id="john"
+  >
+    @John (they/them)
+  </span>
+  , how are you?
+</p>
+`;
+
+exports[`renderText handles the special case where there is a backslash in the name 1`] = `
+<p>
+  hey, 
+  <span
+    className="str-chat__message-mention"
+    data-user-id="john"
+  >
+    @John\\Cena
+  </span>
+  , how are you?
+</p>
+`;
+
+exports[`renderText handles the special case where there is a forward slash in the name 1`] = `
+<p>
+  hey, 
+  <span
+    className="str-chat__message-mention"
+    data-user-id="john"
+  >
+    @John/Cena
+  </span>
+  , how are you?
+</p>
+`;
+
 exports[`renderText handles the special case where there's at least one mention and @ symbol at the end 1`] = `
 <p>
   <span

src/__tests__/utils.test.js

@@ -88,4 +88,28 @@ describe(`renderText`, () => {
     const tree = renderer.create(Markdown).toJSON();
     expect(tree).toMatchSnapshot();
   });
+
+  it('handles the special case where there are pronouns in the name', () => {
+    const Markdown = renderText('hey, @John (they/them), how are you?', [
+      { id: 'john', name: 'John (they/them)' },
+    ]);
+    const tree = renderer.create(Markdown).toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('handles the special case where there is a forward slash in the name', () => {
+    const Markdown = renderText('hey, @John/Cena, how are you?', [
+      { id: 'john', name: 'John/Cena' },
+    ]);
+    const tree = renderer.create(Markdown).toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('handles the special case where there is a backslash in the name', () => {
+    const Markdown = renderText('hey, @John\\Cena, how are you?', [
+      { id: 'john', name: 'John\\Cena' },
+    ]);
+    const tree = renderer.create(Markdown).toJSON();
+    expect(tree).toMatchSnapshot();
+  });
 });

src/utils.tsx

@@ -331,7 +331,7 @@ export const renderText = <
 };
 
 export function escapeRegExp(text: string) {
-  return text.replace(/[-[\]{}()*+?.,\\^$|#]/g, '\\$&');
+  return text.replace(/[-[\]{}()*+?.,/\\^$|#]/g, '\\$&');
 }
 
 /**