refactor: simplify useConnectionSetting (clash-verge-rev#1141)

ganlu510 · Jun 7, 2024 · 7a1f4f9 · 7a1f4f9
1 parent 5768b01
commit 7a1f4f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "ahooks": "^3.8.0",
     "axios": "^1.7.2",
     "dayjs": "1.11.5",
-    "foxact": "^0.2.34",
+    "foxact": "^0.2.35",
     "i18next": "^23.11.5",
     "lodash-es": "^4.17.21",
     "meta-json-schema": "1.18.5-alpha4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/pages/connections.tsx b/src/pages/connections.tsx
@@ -5,10 +5,7 @@ import { Virtuoso } from "react-virtuoso";
 import { useTranslation } from "react-i18next";
 import { TableChartRounded, TableRowsRounded } from "@mui/icons-material";
 import { closeAllConnections } from "@/services/api";
-import {
-  defaultConnectionSetting,
-  useConnectionSetting,
-} from "@/services/states";
+import { useConnectionSetting } from "@/services/states";
 import { useClashInfo } from "@/hooks/use-clash";
 import { BaseEmpty, BasePage } from "@/components/base";
 import { useWebsocket } from "@/hooks/use-websocket";
@@ -38,8 +35,7 @@ const ConnectionsPage = () => {
 
   const [setting, setSetting] = useConnectionSetting();
 
-  const isTableLayout =
-    (setting || defaultConnectionSetting).layout === "table";
+  const isTableLayout = setting.layout === "table";
 
   const orderOpts: Record<string, OrderFunc> = {
     Default: (list) =>

diff --git a/src/services/states.ts b/src/services/states.ts
@@ -15,7 +15,7 @@ interface IConnectionSetting {
   layout: "table" | "list";
 }
 
-export const defaultConnectionSetting: IConnectionSetting = { layout: "table" };
+const defaultConnectionSetting: IConnectionSetting = { layout: "table" };
 
 export const useConnectionSetting = () =>
   useLocalStorage<IConnectionSetting>(