From 81362b0816bae1244b858a0773044e490755c29c Mon Sep 17 00:00:00 2001
From: Dreamacro <8615343+Dreamacro@users.noreply.github.com>
Date: Sun, 24 Apr 2022 11:04:14 +0800
Subject: [PATCH] Fix: pass location search

---
 src/containers/App.tsx           | 6 ++++--
 src/containers/Sidebar/index.tsx | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/containers/App.tsx b/src/containers/App.tsx
index 48cfac3..b3e0d28 100644
--- a/src/containers/App.tsx
+++ b/src/containers/App.tsx
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { Route, Navigate, Routes } from 'react-router-dom'
+import { Route, Navigate, Routes, useLocation } from 'react-router-dom'
 
 // import Overview from '@containers/Overview'
 import Connections from '@containers/Connections'
@@ -18,6 +18,8 @@ import '../styles/iconfont.scss'
 export default function App () {
     useLogsStreamReader()
 
+    const location = useLocation()
+
     const routes = [
     // { path: '/', name: 'Overview', component: Overview, exact: true },
         { path: '/proxies', name: 'Proxies', element: <Proxies /> },
@@ -32,7 +34,7 @@ export default function App () {
             <SideBar routes={routes} />
             <div className="page-container">
                 <Routes>
-                    <Route path="/" element={<Navigate to="/proxies" replace />} />
+                    <Route path="/" element={<Navigate to={{ pathname: '/proxies', search: location.search }} replace />} />
                     {
                         routes.map(
                             route => <Route path={route.path} key={route.path} element={route.element} />,
diff --git a/src/containers/Sidebar/index.tsx b/src/containers/Sidebar/index.tsx
index be2419f..e0b9c08 100644
--- a/src/containers/Sidebar/index.tsx
+++ b/src/containers/Sidebar/index.tsx
@@ -1,5 +1,5 @@
 import classnames from 'classnames'
-import { NavLink } from 'react-router-dom'
+import { NavLink, useLocation } from 'react-router-dom'
 
 import logo from '@assets/logo.png'
 import { Lang, Language } from '@i18n'
@@ -20,11 +20,12 @@ export default function Sidebar (props: SidebarProps) {
     const { version, premium } = useVersion()
     const { data } = useClashXData()
     const { t } = translation('SideBar')
+    const location = useLocation()
 
     const navlinks = routes.map(
         ({ path, name, noMobile }) => (
             <li className={classnames('item', { 'no-mobile': noMobile })} key={name}>
-                <NavLink to={path} className={({ isActive }) => classnames({ active: isActive })}>
+                <NavLink to={{ pathname: path, search: location.search }} className={({ isActive }) => classnames({ active: isActive })}>
                     { t(name as keyof typeof Language[Lang]['SideBar']) }
                 </NavLink>
             </li>