@jetbrains/ring-ui 5.0.53 → 5.0.54

package/components/global/fuzzy-highlight.d.ts

@@ -1,5 +1,11 @@
 /** https://github.com/bevacqua/fuzzysearch + highlighting with Markdown */
+declare type Match = {
+    from: number;
+    to: number;
+};
 export default function fuzzyHighlight(needle: string, haystack: string, caseSensitive?: boolean): {
     matched: boolean;
+    matches: Match[];
     highlight: string;
 };
+export {};

package/components/global/fuzzy-highlight.js

@@ -1,9 +1,20 @@
 /** https://github.com/bevacqua/fuzzysearch + highlighting with Markdown */
-const marker = '**';
 export default function fuzzyHighlight(needle, haystack, caseSensitive = false) {
     const ndl = caseSensitive ? needle : needle.toLowerCase();
     const hstck = caseSensitive ? haystack : haystack.toLowerCase();
-    const result = (matched, highlight = haystack) => ({ matched, highlight });
+    const result = (matched, matches = []) => {
+        let highlight = haystack;
+        if (matches.length > 0) {
+            highlight = '';
+            let prevMatch = { to: 0 };
+            for (const match of matches) {
+                highlight += `${haystack.slice(prevMatch.to, match.from)}**${haystack.slice(match.from, match.to)}**`;
+                prevMatch = match;
+            }
+            highlight += haystack.slice(prevMatch.to);
+        }
+        return ({ matched, matches, highlight });
+    };
     const hlen = hstck.length;
     const nlen = ndl.length;
     if (nlen > hlen) {
@@ -11,11 +22,12 @@ export default function fuzzyHighlight(needle, haystack, caseSensitive = false)
     }
     if (nlen === hlen) {
         const matched = ndl === hstck;
-        return result(matched, matched ? `${marker}${haystack}${marker}` : haystack);
+        return result(matched, matched ? [{ from: 0, to: haystack.length }] : []);
     }
-    let highlight = '';
     let on = false;
     let j = 0;
+    const matches = [];
+    let from = 0;
     /* eslint-disable no-labels */
     outer: for (let i = 0; i < nlen; i++) {
         const nch = ndl[i];
@@ -24,10 +36,13 @@ export default function fuzzyHighlight(needle, haystack, caseSensitive = false)
             const match = hch === nch;
             // Don't turn highlight on for space characters
             const nextOn = match && /\S/.test(hch);
-            if (nextOn !== on) {
-                highlight += marker;
+            if (nextOn && !on) {
+                from = j;
+            }
+            else if (!nextOn && on) {
+                matches.push({ from, to: j });
             }
-            highlight += haystack[j++];
+            j++;
             on = nextOn;
             if (match) {
                 continue outer;
@@ -37,8 +52,7 @@ export default function fuzzyHighlight(needle, haystack, caseSensitive = false)
     }
     /* eslint-enable */
     if (on) {
-        highlight += marker;
+        matches.push({ from, to: j });
     }
-    highlight += haystack.slice(j);
-    return result(true, highlight);
+    return result(true, matches);
 }

package/dist/global/fuzzy-highlight.d.ts

@@ -1,5 +1,11 @@
 /** https://github.com/bevacqua/fuzzysearch + highlighting with Markdown */
+declare type Match = {
+    from: number;
+    to: number;
+};
 export default function fuzzyHighlight(needle: string, haystack: string, caseSensitive?: boolean): {
     matched: boolean;
+    matches: Match[];
     highlight: string;
 };
+export {};

package/dist/global/fuzzy-highlight.js

@@ -1,13 +1,25 @@
 /** https://github.com/bevacqua/fuzzysearch + highlighting with Markdown */
-const marker = '**';
 function fuzzyHighlight(needle, haystack) {
   let caseSensitive = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   const ndl = caseSensitive ? needle : needle.toLowerCase();
   const hstck = caseSensitive ? haystack : haystack.toLowerCase();
   const result = function (matched) {
-    let highlight = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : haystack;
+    let matches = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    let highlight = haystack;
+    if (matches.length > 0) {
+      highlight = '';
+      let prevMatch = {
+        to: 0
+      };
+      for (const match of matches) {
+        highlight += `${haystack.slice(prevMatch.to, match.from)}**${haystack.slice(match.from, match.to)}**`;
+        prevMatch = match;
+      }
+      highlight += haystack.slice(prevMatch.to);
+    }
     return {
       matched,
+      matches,
       highlight
     };
   };
@@ -18,11 +30,15 @@ function fuzzyHighlight(needle, haystack) {
   }
   if (nlen === hlen) {
     const matched = ndl === hstck;
-    return result(matched, matched ? `${marker}${haystack}${marker}` : haystack);
+    return result(matched, matched ? [{
+      from: 0,
+      to: haystack.length
+    }] : []);
   }
-  let highlight = '';
   let on = false;
   let j = 0;
+  const matches = [];
+  let from = 0;
   /* eslint-disable no-labels */
   outer: for (let i = 0; i < nlen; i++) {
     const nch = ndl[i];
@@ -31,10 +47,15 @@ function fuzzyHighlight(needle, haystack) {
       const match = hch === nch;
       // Don't turn highlight on for space characters
       const nextOn = match && /\S/.test(hch);
-      if (nextOn !== on) {
-        highlight += marker;
+      if (nextOn && !on) {
+        from = j;
+      } else if (!nextOn && on) {
+        matches.push({
+          from,
+          to: j
+        });
       }
-      highlight += haystack[j++];
+      j++;
       on = nextOn;
       if (match) {
         continue outer;
@@ -44,10 +65,12 @@ function fuzzyHighlight(needle, haystack) {
   }
   /* eslint-enable */
   if (on) {
-    highlight += marker;
+    matches.push({
+      from,
+      to: j
+    });
   }
-  highlight += haystack.slice(j);
-  return result(true, highlight);
+  return result(true, matches);
 }
 
 export { fuzzyHighlight as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "5.0.53",
+  "version": "5.0.54",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -259,5 +259,5 @@
     "node": ">=14.0",
     "npm": ">=6.0.0"
   },
-  "gitHead": "21c1f2143dec4335b5094f69720307af583d39cf"
+  "gitHead": "738bf4ba27a6a7ac082c070a845f7b992f87c350"
 }