diff --git a/src/apps/experimental/components/AppToolbar/SearchButton.tsx b/src/apps/experimental/components/AppToolbar/SearchButton.tsx index 2b9732d89..fded24452 100644 --- a/src/apps/experimental/components/AppToolbar/SearchButton.tsx +++ b/src/apps/experimental/components/AppToolbar/SearchButton.tsx @@ -3,6 +3,7 @@ import { Link, URLSearchParamsInit, createSearchParams, + useLocation, useSearchParams } from 'react-router-dom'; import SearchIcon from '@mui/icons-material/Search'; @@ -11,7 +12,8 @@ import Tooltip from '@mui/material/Tooltip'; import globalize from 'scripts/globalize'; const getUrlParams = (searchParams: URLSearchParams) => { - const parentId = searchParams.get('parentId') || searchParams.get('topParentId'); + const parentId = + searchParams.get('parentId') || searchParams.get('topParentId'); const collectionType = searchParams.get('collectionType'); const params: URLSearchParamsInit = {}; @@ -27,15 +29,13 @@ const getUrlParams = (searchParams: URLSearchParams) => { interface SearchButtonProps { isTabsAvailable: boolean; - isSearchPath: boolean; } -const SearchButton: FC = ({ - isTabsAvailable, - isSearchPath -}) => { +const SearchButton: FC = ({ isTabsAvailable }) => { + const location = useLocation(); const [searchParams] = useSearchParams(); + const isSearchPath = location.pathname === '/search.html'; const createSearchLink = isTabsAvailable ? { pathname: '/search.html', diff --git a/src/apps/experimental/components/AppToolbar/index.tsx b/src/apps/experimental/components/AppToolbar/index.tsx index e8f3386c5..e8463ea80 100644 --- a/src/apps/experimental/components/AppToolbar/index.tsx +++ b/src/apps/experimental/components/AppToolbar/index.tsx @@ -33,7 +33,6 @@ const ExperimentalAppToolbar: FC = ({ const isTabsAvailable = isTabPath(location.pathname); const isPublicPath = PUBLIC_PATHS.includes(location.pathname); - const isSearchPath = location.pathname === '/search.html'; return ( = ({ <> - + )} isDrawerAvailable={isDrawerAvailable}