mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-20 02:42:12 +08:00
perf(ui): keep mutateVerge identity stable across renders
mutateVerge was a per-render closure that dozens of consumer callbacks depended on, and its updater fell back to a render-time config snapshot. It now keeps a stable identity, revalidates through the module-level query helper, and passes the live cache value (preload snapshot when the cache is still empty) to function updaters; object-form callers were migrated to updater functions.
This commit is contained in:
@@ -87,18 +87,18 @@ export const TestCard = () => {
|
||||
x.uid === uid ? { ...x, ...patch } : x,
|
||||
)
|
||||
|
||||
mutateVerge({ ...verge, test_list: newList })
|
||||
mutateVerge((prev) => ({ ...prev, test_list: newList }))
|
||||
},
|
||||
[testList, verge, mutateVerge],
|
||||
[testList, mutateVerge],
|
||||
)
|
||||
|
||||
const onDeleteTestListItem = useCallback(
|
||||
(uid: string) => {
|
||||
const newList = testList.filter((x) => x.uid !== uid)
|
||||
patchVerge({ test_list: newList })
|
||||
mutateVerge({ ...verge, test_list: newList })
|
||||
mutateVerge((prev) => ({ ...prev, test_list: newList }))
|
||||
},
|
||||
[testList, verge, patchVerge, mutateVerge],
|
||||
[testList, patchVerge, mutateVerge],
|
||||
)
|
||||
|
||||
const onDragEnd = useCallback(
|
||||
@@ -129,7 +129,7 @@ export const TestCard = () => {
|
||||
newList.splice(newIndex, 0, removed)
|
||||
|
||||
// 优化:先本地更新,再异步 patch,避免UI卡死
|
||||
mutateVerge({ ...verge, test_list: newList })
|
||||
mutateVerge((prev) => ({ ...prev, test_list: newList }))
|
||||
const patchFn = () => {
|
||||
try {
|
||||
patchVerge({ test_list: newList })
|
||||
@@ -141,7 +141,7 @@ export const TestCard = () => {
|
||||
setTimeout(patchFn, 0)
|
||||
}
|
||||
},
|
||||
[testList, verge, mutateVerge, patchVerge],
|
||||
[testList, mutateVerge, patchVerge],
|
||||
)
|
||||
|
||||
// 仅在verge首次加载时初始化测试列表
|
||||
|
||||
@@ -109,7 +109,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
showNotice.error(err)
|
||||
}
|
||||
const onChangeData = (patch: Partial<IVergeConfig>) => {
|
||||
mutateVerge({ ...verge, ...patch })
|
||||
mutateVerge((prev) => ({ ...prev, ...patch }))
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -326,7 +326,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
Promise.resolve().then(async () => {
|
||||
try {
|
||||
if (Object.keys(patch).length > 0) {
|
||||
mutateVerge({ ...verge, ...patch })
|
||||
mutateVerge((prev) => ({ ...prev, ...patch }))
|
||||
}
|
||||
if (Object.keys(patch).length > 0) {
|
||||
await patchVerge(patch)
|
||||
|
||||
@@ -25,7 +25,7 @@ const SettingSystem = ({ onError }: Props) => {
|
||||
value: boolean,
|
||||
) => value
|
||||
const onChangeData = (patch: Partial<IVergeConfig>) => {
|
||||
mutateVerge({ ...verge, ...patch })
|
||||
mutateVerge((prev) => ({ ...prev, ...patch }))
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -72,7 +72,7 @@ const SettingVergeBasic = ({ onError }: Props) => {
|
||||
const backupRef = useRef<DialogRef>(null)
|
||||
|
||||
const onChangeData = (patch: any) => {
|
||||
mutateVerge({ ...verge, ...patch })
|
||||
mutateVerge((prev) => ({ ...prev, ...patch }))
|
||||
}
|
||||
|
||||
const onCopyClashEnv = useCallback(async () => {
|
||||
|
||||
@@ -163,7 +163,7 @@ const ProxyControlSwitches = ({
|
||||
})
|
||||
return false
|
||||
}
|
||||
mutateVerge({ ...verge, enable_tun_mode: value })
|
||||
mutateVerge((prev) => ({ ...prev, enable_tun_mode: value }))
|
||||
await patchVerge({ enable_tun_mode: value })
|
||||
}
|
||||
|
||||
|
||||
+25
-19
@@ -3,12 +3,16 @@ import { useCallback } from 'react'
|
||||
import { getVergeConfig, patchVergeConfig } from '@/services/cmds'
|
||||
import { mutate } from '@/services/mutate'
|
||||
import { getPreloadConfig, setPreloadConfig } from '@/services/preload'
|
||||
import { setCacheData, useQuery } from '@/services/query-client'
|
||||
import {
|
||||
revalidateQuery,
|
||||
setCacheData,
|
||||
useQuery,
|
||||
} from '@/services/query-client'
|
||||
|
||||
export const useVerge = () => {
|
||||
const initialVergeConfig = getPreloadConfig()
|
||||
|
||||
const { data: verge, refetch } = useQuery({
|
||||
const { data: verge } = useQuery({
|
||||
queryKey: ['getVergeConfig'],
|
||||
queryFn: async () => {
|
||||
const config = await getVergeConfig()
|
||||
@@ -20,23 +24,25 @@ export const useVerge = () => {
|
||||
staleTime: 5000,
|
||||
})
|
||||
|
||||
const mutateVerge = (
|
||||
updaterOrData?:
|
||||
| IVergeConfig
|
||||
| ((prev: IVergeConfig | undefined) => IVergeConfig | undefined)
|
||||
| undefined,
|
||||
) => {
|
||||
if (updaterOrData === undefined) {
|
||||
void refetch()
|
||||
return
|
||||
}
|
||||
void setCacheData<IVergeConfig>(
|
||||
['getVergeConfig'],
|
||||
typeof updaterOrData === 'function'
|
||||
? (current) => updaterOrData(current ?? verge)
|
||||
: updaterOrData,
|
||||
)
|
||||
}
|
||||
// Stable identity: many consumers list mutateVerge in their own callback
|
||||
// deps, so a per-render closure here would churn their memoization too.
|
||||
// The updater receives the live cache value (preload snapshot when the
|
||||
// cache is still empty) instead of a render-time snapshot, so an older
|
||||
// render cannot clobber a newer cache write.
|
||||
const mutateVerge = useCallback(
|
||||
(
|
||||
updater?: (prev: IVergeConfig | undefined) => IVergeConfig | undefined,
|
||||
) => {
|
||||
if (updater === undefined) {
|
||||
void revalidateQuery(['getVergeConfig'])
|
||||
return
|
||||
}
|
||||
void setCacheData<IVergeConfig>(['getVergeConfig'], (current) =>
|
||||
updater(current ?? getPreloadConfig() ?? undefined),
|
||||
)
|
||||
},
|
||||
[],
|
||||
)
|
||||
|
||||
// Callers own the error toast (GuardState onCatch / page onError), so the
|
||||
// funnel must not add a second one.
|
||||
|
||||
Reference in New Issue
Block a user