Normalize accents/diacritics (#23)

src/utils/strings.test.ts

@@ -1,6 +1,7 @@
 import {
   excludeEmoji,
   excludeSpace,
+  normalizeAccentsDiacritics,
   smartIncludes,
   smartStartsWith,
 } from "./strings";
@@ -31,6 +32,18 @@ describe.each`
   });
 });
 
+describe.each`
+  text        | expected
+  ${"abcde"}  | ${"abcde"}
+  ${"àáâãäå"} | ${"aaaaaa"}
+  ${"çüöà"}   | ${"cuoa"}
+  ${"a🍰b"}   | ${"a🍰b"}
+`("normalizeAccentsDiacritics", ({ text, expected }) => {
+  test(`normalizeAccentsDiacritics(${text}) = ${expected}`, () => {
+    expect(normalizeAccentsDiacritics(text)).toBe(expected);
+  });
+});
+
 describe.each`
   text            | query      | expected
   ${"abcd"}       | ${"bc"}    | ${true}

src/utils/strings.ts

@@ -1,3 +1,5 @@
+import { normalize } from "jest-config";
+
 const regEmoji = new RegExp(
   /[\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF]|[\uFE0E-\uFE0F]/,
   "g"
@@ -11,12 +13,19 @@ export function excludeEmoji(text: string): string {
   return text.replace(regEmoji, "");
 }
 
+export function normalizeAccentsDiacritics(text: string): string {
+  // https://stackoverflow.com/questions/990904/remove-accents-diacritics-in-a-string-in-javascript
+  return text.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+}
+
 export function smartIncludes(text: string, query: string): boolean {
-  return excludeSpace(text.toLowerCase()).includes(query.toLowerCase());
+  return excludeSpace(normalizeAccentsDiacritics(text.toLowerCase())).includes(
+    normalizeAccentsDiacritics(query.toLowerCase())
+  );
 }
 
 export function smartStartsWith(text: string, query: string): boolean {
-  return excludeSpace(excludeEmoji(text.toLowerCase())).startsWith(
-    query.toLowerCase()
-  );
+  return excludeSpace(
+    excludeEmoji(normalizeAccentsDiacritics(text.toLowerCase()))
+  ).startsWith(normalizeAccentsDiacritics(query.toLowerCase()));
 }