From 7a5a3a6608dfc0e55f7468f23e81827e063a6726 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 31 Jan 2023 00:25:23 -0800 Subject: [PATCH] Compatible with quicklaunch internet search --- src/components/widgets/search/search.jsx | 33 +++++++++++++----------- src/pages/index.jsx | 17 +++++++----- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/components/widgets/search/search.jsx b/src/components/widgets/search/search.jsx index 0189e809..b04f0e9f 100644 --- a/src/components/widgets/search/search.jsx +++ b/src/components/widgets/search/search.jsx @@ -3,6 +3,7 @@ import { useTranslation } from "next-i18next"; import { FiSearch } from "react-icons/fi"; import { SiDuckduckgo, SiMicrosoftbing, SiGoogle, SiBaidu, SiBrave } from "react-icons/si"; import { Listbox, Transition } from "@headlessui/react"; +import classNames from "classnames"; export const searchProviders = { google: { @@ -37,10 +38,6 @@ export const searchProviders = { }, }; -function classNames(...classes) { - return classes.filter(Boolean).join(" "); -} - function getAvailableProviderIds(options) { if (options.provider && Array.isArray(options.provider)) { return Object.keys(searchProviders).filter((value) => options.provider.includes(value)); @@ -51,26 +48,32 @@ function getAvailableProviderIds(options) { return null; } +const localStorageKey = "search-name"; + +export function getStoredProvider() { + if (typeof window !== 'undefined') { + const storedName = localStorage.getItem(localStorageKey); + if (storedName) { + return Object.values(searchProviders).find((el) => el.name === storedName); + } + } + return null; +} + export default function Search({ options }) { const { t } = useTranslation(); const availableProviderIds = getAvailableProviderIds(options); - const key = "search-name"; - const [query, setQuery] = useState(""); const [selectedProvider, setSelectedProvider] = useState(searchProviders[availableProviderIds[0] ?? searchProviders.google]); useEffect(() => { - const storedName = localStorage.getItem(key); - let storedProvider = null; + const storedProvider = getStoredProvider(); let storedProviderKey = null; - if (storedName) { - storedProvider = Object.values(searchProviders).find((el) => el.name === storedName); - storedProviderKey = Object.keys(searchProviders).find((pkey) => searchProviders[pkey] === storedProvider); - if (storedProvider && availableProviderIds.includes(storedProviderKey)) { - setSelectedProvider(storedProvider); - } + storedProviderKey = Object.keys(searchProviders).find((pkey) => searchProviders[pkey] === storedProvider); + if (storedProvider && availableProviderIds.includes(storedProviderKey)) { + setSelectedProvider(storedProvider); } }, [availableProviderIds]); @@ -95,7 +98,7 @@ export default function Search({ options }) { const onChangeProvider = (provider) => { setSelectedProvider(provider); - localStorage.setItem(key, provider.name); + localStorage.setItem(localStorageKey, provider.name); } return ( diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 22b10248..6c42ab71 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -22,7 +22,7 @@ import { bookmarksResponse, servicesResponse, widgetsResponse } from "utils/conf import ErrorBoundary from "components/errorboundry"; import themes from "utils/styles/themes"; import QuickLaunch from "components/quicklaunch"; -import { searchProviders } from "components/widgets/search/search"; +import { getStoredProvider, searchProviders } from "components/widgets/search/search"; const ThemeToggle = dynamic(() => import("components/toggles/theme"), { ssr: false, @@ -197,12 +197,17 @@ function Home({ initialSettings }) { let searchProvider = null; const searchWidget = Object.values(widgets).find(w => w.type === "search"); if (searchWidget) { - if (searchWidget.options?.provider === 'custom') { - searchProvider = { - url: searchWidget.options.url - } + if (Array.isArray(searchWidget.options?.provider)) { + // if search provider is a list, try to retrieve from localstorage, fall back to the first + searchProvider = getStoredProvider() ?? searchProviders[searchWidget.options.provider[0]]; } else { - searchProvider = searchProviders[searchWidget.options?.provider]; + if (searchWidget.options?.provider === 'custom') { + searchProvider = { + url: searchWidget.options.url + } + } else { + searchProvider = searchProviders[searchWidget.options?.provider]; + } } }