diff --git a/packages/theme-default/src/components/Search/SearchPanel.tsx b/packages/theme-default/src/components/Search/SearchPanel.tsx index bb94f3810..f7c07169d 100644 --- a/packages/theme-default/src/components/Search/SearchPanel.tsx +++ b/packages/theme-default/src/components/Search/SearchPanel.tsx @@ -8,7 +8,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import { createPortal } from 'react-dom'; import * as userSearchHooks from 'virtual-search-hooks'; import { useLocaleSiteData } from '../../logic/useLocaleSiteData'; -import { getSidebarGroupData } from '../../logic/useSidebarData'; +import { getSidebarData } from '../../logic/useSidebarData'; import { SvgWrapper } from '../SvgWrapper'; import { Tab, Tabs } from '../Tabs'; import { NoSearchResult } from './NoSearchResult'; @@ -123,7 +123,7 @@ export function SearchPanel({ focused, setFocused }: SearchPanelProps) { // We need to extract the group name by the link so that we can divide the search result into different groups. const extractGroupName = (link: string) => - getSidebarGroupData(sidebar, link).group; + getSidebarData(sidebar, link).group; async function initPageSearcher() { if (search === false) { diff --git a/packages/theme-default/src/logic/useFullTextSearch.ts b/packages/theme-default/src/logic/useFullTextSearch.ts index eb492b76c..18a8d6318 100644 --- a/packages/theme-default/src/logic/useFullTextSearch.ts +++ b/packages/theme-default/src/logic/useFullTextSearch.ts @@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react'; import type { MatchResult } from '..'; import { PageSearcher } from '../components/Search/logic/search'; import { useLocaleSiteData } from './useLocaleSiteData'; -import { getSidebarGroupData } from './useSidebarData'; +import { getSidebarData } from './useSidebarData'; export function useFullTextSearch(): { initialized: boolean; @@ -13,7 +13,7 @@ export function useFullTextSearch(): { const [initialized, setInitialized] = useState(false); const { sidebar } = useLocaleSiteData(); const extractGroupName = (link: string) => - getSidebarGroupData(sidebar, link).group; + getSidebarData(sidebar, link).group; const searchRef = useRef(null); useEffect(() => { diff --git a/packages/theme-default/src/logic/useSidebarData.ts b/packages/theme-default/src/logic/useSidebarData.ts index 761a6531a..57bced09a 100644 --- a/packages/theme-default/src/logic/useSidebarData.ts +++ b/packages/theme-default/src/logic/useSidebarData.ts @@ -77,15 +77,12 @@ const match = ( return undefined; }; -export const getSidebarGroupData = ( +export const getSidebarData = ( sidebar: NormalizedSidebar, currentPathname: string, -) => { - console.log(sidebar, 111111); +): SidebarData => { for (const name of Object.keys(sidebar)) { - const isMatch = matchPath(name, currentPathname); - console.log(isMatch, name, currentPathname); - if (isMatch) { + if (matchPath(name, currentPathname)) { const sidebarGroup = sidebar[name]; const group = sidebarGroup.find(item => match(item, currentPathname)); return { @@ -105,7 +102,7 @@ export function useSidebarData(): SidebarData { const pathname = decodeURIComponent(rawPathname); const sidebarData = useMemo(() => { - return getSidebarGroupData(sidebar, pathname); + return getSidebarData(sidebar, pathname); }, [sidebar, pathname]); return sidebarData;