@firecms/core 3.0.0-canary.95 → 3.0.0-canary.97

package/dist/util/icon_list.d.ts

@@ -1 +1,5 @@
-export declare const iconsSearch: any;
+import Fuse from "fuse.js";
+export declare const iconsSearch: Fuse<{
+    key: string;
+    synonyms: any;
+}>;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.95",
+    "version": "3.0.0-canary.97",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,14 +46,14 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/formex": "^3.0.0-canary.95",
-        "@firecms/ui": "^3.0.0-canary.95",
+        "@firecms/formex": "^3.0.0-canary.97",
+        "@firecms/ui": "^3.0.0-canary.97",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.1.1",
         "clsx": "^2.1.1",
         "date-fns": "^3.6.0",
+        "fuse.js": "^7.0.0",
         "history": "^5.3.0",
-        "js-search": "^2.0.1",
         "markdown-it": "^14.1.0",
         "notistack": "^3.0.1",
         "object-hash": "^3.0.0",
@@ -68,8 +68,8 @@
     },
     "peerDependencies": {
         "firebase": "^10.5.2",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
+        "react": ">=18.3.1",
+        "react-dom": ">=18.3.1",
         "react-router": "^6.25.1",
         "react-router-dom": "^6.25.1"
     },
@@ -100,7 +100,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "9445f94041b8654b1cf88310f6fda2a4f3e9be3f",
+    "gitHead": "da52ff032616af10d60ee976daf80f18d5ac879b",
     "publishConfig": {
         "access": "public"
     },

package/src/components/HomePage/DefaultHomePage.tsx

@@ -1,25 +1,23 @@
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 
 import { useCustomizationController, useFireCMSContext, useNavigationController } from "../../hooks";
-import { CMSAnalyticsEvent, PluginGenericProps, PluginHomePageAdditionalCardsProps } from "../../types";
+import {
+    CMSAnalyticsEvent,
+    PluginGenericProps,
+    PluginHomePageAdditionalCardsProps,
+    TopNavigationEntry
+} from "../../types";
 
 import { toArray } from "../../util/arrays";
 import { NavigationGroup } from "./NavigationGroup";
 import { NavigationCardBinding } from "./NavigationCardBinding";
 
-// @ts-ignore
-import * as JsSearch from "js-search";
+import Fuse from "fuse.js"
 
 import { Container, SearchBar } from "@firecms/ui";
 import { FavouritesView } from "./FavouritesView";
 import { useRestoreScroll } from "../../internal/useRestoreScroll";
 
-const search = new JsSearch.Search("url");
-search.addIndex("name");
-search.addIndex("description");
-search.addIndex("group");
-search.addIndex("path");
-
 /**
  * Default entry view for the CMS. This component renders navigation cards
  * for each collection defined in the navigation.
@@ -49,6 +47,8 @@ export function DefaultHomePage({
     const customizationController = useCustomizationController();
     const navigationController = useNavigationController();
 
+    const fuse = useRef<Fuse<TopNavigationEntry> | null>(null);
+
     if (!navigationController.topLevelNavigation)
         throw Error("Navigation not ready in FireCMSHomePage");
 
@@ -70,7 +70,13 @@ export function DefaultHomePage({
         : navigationEntries;
 
     useEffect(() => {
-        search.addDocuments(navigationEntries);
+        fuse.current = new Fuse(navigationEntries, {
+            keys: ["name",
+                "description",
+                "group",
+                "path"
+            ]
+        });
     }, [navigationEntries]);
 
     const updateSearchResults = useCallback(
@@ -78,8 +84,11 @@ export function DefaultHomePage({
             if (!value || value === "") {
                 setFilteredUrls(null);
             } else {
-                const searchResult = search.search(value);
-                setFilteredUrls(searchResult.map((e: any) => e.url));
+                const searchResult = fuse.current?.search(value);
+                console.log("Search result", searchResult);
+                if (searchResult) {
+                    setFilteredUrls(searchResult.map((e) => e.item.url));
+                }
             }
         }, []);
 

package/src/components/SearchIconsView.tsx

@@ -31,7 +31,9 @@ export function SearchIconsView({
                 setKeys(null);
             } else {
                 const searchResult = iconsSearch.search(value);
-                setKeys(searchResult.map((e: any) => e.key));
+                const limit = 50;
+                const limited = searchResult.slice(0, limit);
+                setKeys(limited.map((e) => e.item.key));
             }
         }, UPDATE_SEARCH_INDEX_WAIT_MS), []
     );
@@ -44,6 +46,7 @@ export function SearchIconsView({
     }, [query, updateSearchResults]);
 
     const icons = keys === null ? coolIconKeys : keys;
+    console.log("Icons", icons);
 
     return (
         <>

package/src/util/icon_list.ts

@@ -1,17 +1,23 @@
 import { iconSynonyms } from "./icon_synonyms";
 import { iconKeys } from "@firecms/ui";
+import Fuse from "fuse.js";
 
-// @ts-ignore
-import * as JsSearch from "js-search";
 
-export const iconsSearch = new JsSearch.Search("key");
-iconsSearch.addIndex("synonyms");
-
-iconsSearch.addDocuments(iconKeys
+console.log("iconKeys", iconKeys);
+const map = iconKeys
     .map((importName) => {
+        // @ts-ignore
+        const iconSynonym = importName in iconSynonyms ? iconSynonyms[importName] : "";
         return {
             key: importName,
-            // @ts-ignore
-            synonyms: iconSynonyms[importName] ?? [],
+            synonyms: iconSynonym,
         }
-    }));
+    });
+export const iconsSearch = new Fuse(map, {
+    isCaseSensitive: false,
+    shouldSort: true,
+    distance: 0,
+    keys: ["key", "synonyms"]
+})
+
+