diff --git a/src/components/quicklaunch.jsx b/src/components/quicklaunch.jsx index f61a14e0..9051c599 100644 --- a/src/components/quicklaunch.jsx +++ b/src/components/quicklaunch.jsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import { resolveIcon } from "./services/item"; -export default function QuickLaunch({bookmarksAndServices, searchString, setSearchString, isOpen, close}) { +export default function QuickLaunch({servicesAndBookmarks, searchString, setSearchString, isOpen, close}) { const { t } = useTranslation(); const searchField = useRef(); @@ -53,13 +53,13 @@ export default function QuickLaunch({bookmarksAndServices, searchString, setSear useEffect(() => { if (searchString.length === 0) setResults([]); else { - const newResults = bookmarksAndServices.filter(r => r.name.toLowerCase().includes(searchString)); + const newResults = servicesAndBookmarks.filter(r => r.name.toLowerCase().includes(searchString)); setResults(newResults); if (newResults.length) { setCurrentItemIndex(0); } } - }, [searchString, bookmarksAndServices]) + }, [searchString, servicesAndBookmarks]) const [hidden, setHidden] = useState(true); diff --git a/src/pages/index.jsx b/src/pages/index.jsx index a1ce96d5..400d7eb5 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -175,7 +175,7 @@ function Home({ initialSettings }) { const { data: bookmarks } = useSWR("/api/bookmarks"); const { data: widgets } = useSWR("/api/widgets"); - const bookmarksAndServices = [...bookmarks.map(bg => bg.bookmarks).flat(), ...services.map(sg => sg.services).flat()] + const servicesAndBookmarks = [...services.map(sg => sg.services).flat(), ...bookmarks.map(bg => bg.bookmarks).flat()] useEffect(() => { if (settings.language) { @@ -236,7 +236,7 @@ function Home({ initialSettings }) { headerStyles[initialSettings.headerStyle || "underlined"] )} > - + {widgets && ( <> {widgets