From f8cb8721d19f3a5999033bd926dfc81f9861bd49 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Mon, 15 Jul 2024 20:16:19 +0300
Subject: [PATCH] apply suggestion

Co-authored-by: Bill Thornton <thornbill@users.noreply.github.com>
---
 .../components/AppToolbar/SearchButton.tsx           | 12 ++++++------
 .../experimental/components/AppToolbar/index.tsx     |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/apps/experimental/components/AppToolbar/SearchButton.tsx b/src/apps/experimental/components/AppToolbar/SearchButton.tsx
index 2b9732d890..fded244524 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<SearchButtonProps> = ({
-    isTabsAvailable,
-    isSearchPath
-}) => {
+const SearchButton: FC<SearchButtonProps> = ({ 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 e8f3386c5d..e8463ea803 100644
--- a/src/apps/experimental/components/AppToolbar/index.tsx
+++ b/src/apps/experimental/components/AppToolbar/index.tsx
@@ -33,7 +33,6 @@ const ExperimentalAppToolbar: FC<AppToolbarProps> = ({
 
     const isTabsAvailable = isTabPath(location.pathname);
     const isPublicPath = PUBLIC_PATHS.includes(location.pathname);
-    const isSearchPath = location.pathname === '/search.html';
 
     return (
         <AppToolbar
@@ -41,7 +40,7 @@ const ExperimentalAppToolbar: FC<AppToolbarProps> = ({
                 <>
                     <SyncPlayButton />
                     <RemotePlayButton />
-                    <SearchButton isTabsAvailable={isTabsAvailable} isSearchPath={isSearchPath} />
+                    <SearchButton isTabsAvailable={isTabsAvailable} />
                 </>
             )}
             isDrawerAvailable={isDrawerAvailable}