fix(atomic): escape searchQuery in regex (#4116)

https://coveord.atlassian.net/browse/KIT-3337
coveo · Jun 25, 2024 · dbd33a1 · dbd33a1
1 parent 5f60704
commit dbd33a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/atomic/src/components/common/facets/facet-search/facet-search-utils.spec.ts b/packages/atomic/src/components/common/facets/facet-search/facet-search-utils.spec.ts
@@ -26,4 +26,10 @@ describe('#highlightSearchResult', () => {
       '&lt;script&gt;<span part="search-highlight" class="font-bold">con</span>sole.log(&quot;hmm&quot;)&lt;script&gt;'
     );
   });
+
+  it('should not highlight in the middle of an escaped character', () => {
+    expect(highlightSearchResult('foo&bar', 'foo&')).toBe(
+      '<span part="search-highlight" class="font-bold">foo&amp;</span>bar'
+    );
+  });
 });
diff --git a/packages/atomic/src/components/common/facets/facet-search/facet-search-utils.ts b/packages/atomic/src/components/common/facets/facet-search/facet-search-utils.ts
@@ -52,7 +52,7 @@ export function highlightSearchResult(resultValue: string, searchQuery = '') {
     return sanitizedResult;
   }
 
-  const regex = new RegExp(`(${regexEncode(searchQuery)})`, 'i');
+  const regex = new RegExp(`(${regexEncode(escape(searchQuery))})`, 'i');
   return escape(resultValue).replace(
     regex,
     '<span part="search-highlight" class="font-bold">$1</span>'