@salesforcedevs/dx-components 0.19.3-alpha.33 → 0.19.3-alpha.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "0.19.3-alpha.33",
+    "version": "0.19.3-alpha.37",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {

package/src/modules/dx/sidebarSearch/sidebarSearch.ts

@@ -339,6 +339,8 @@ export default class SidebarSearch extends LightningElement {
             new Set(
                 [
                     this.value,
+                    Object.keys(termsToHighlight),
+                    Object.keys(phrasesToHighlight),
                     Object.values(termsToHighlight),
                     Object.values(phrasesToHighlight)
                 ].flat(2)

package/src/modules/utils/highlight/highlight.ts

@@ -21,19 +21,20 @@ export const highlightTerms = (
         }
 
         try {
-            let innerHtml = element.innerHTML.replace(
-                // Remove previously added mark tags
-                MARK_TAGS,
-                ""
-            );
-
-            if (query) {
-                innerHtml = innerHtml.replace(searchExp, "<mark>$&</mark>");
+            if (element.innerHTML.match(MARK_TAGS)) {
+                element.innerHTML.replace(
+                    // Remove previously added mark tags
+                    MARK_TAGS,
+                    ""
+                );
+            }
+            if (element.innerHTML.match(searchExp) && query) {
+                element.innerHTML.replace(searchExp, "<mark>$&</mark>");
             }
-
-            element.innerHTML = innerHtml;
         } catch (e) {
-            console.error(e, element);
+            console.error(
+                `${element} could not be parsed by the highlight utility: ${e}`
+            );
         }
 
         // element