gitea-admin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-10-14 21:20:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(frontend): reuse sortable arrayMove

Browse Source
This commit is contained in:
Tunglies
2026-07-11 18:58:31 +08:00
parent 6d3761a9ee
commit 0c86b70fe9
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/profile/groups-editor-viewer.tsx
+7 -13
View File
@@ -7,7 +7,11 @@ import {
useSensor,
useSensors,
} from '@dnd-kit/core'
import { SortableContext, sortableKeyboardCoordinates } from '@dnd-kit/sortable'
import {
arrayMove,
SortableContext,
sortableKeyboardCoordinates,
} from '@dnd-kit/sortable'
import {
VerticalAlignBottomRounded,
VerticalAlignTopRounded,
@@ -285,16 +289,6 @@ export const GroupsEditorViewer = (props: Props) => {
coordinateGetter: sortableKeyboardCoordinates,
}),
)
const reorder = (
list: IProxyGroupConfig[],
startIndex: number,
endIndex: number,
) => {
const result = Array.from(list)
const [removed] = result.splice(startIndex, 1)
result.splice(endIndex, 0, removed)
return result
}
const onPrependDragEnd = async (event: DragEndEvent) => {
const { active, over } = event
if (over) {
@@ -310,7 +304,7 @@ export const GroupsEditorViewer = (props: Props) => {
}
})
setPrependSeq(reorder(prependSeq, activeIndex, overIndex))
setPrependSeq(arrayMove(prependSeq, activeIndex, overIndex))
}
}
}
@@ -328,7 +322,7 @@ export const GroupsEditorViewer = (props: Props) => {
overIndex = index
}
})
setAppendSeq(reorder(appendSeq, activeIndex, overIndex))
setAppendSeq(arrayMove(appendSeq, activeIndex, overIndex))
}
}
}
src/components/profile/proxies-editor-viewer.tsx
+7 -13
View File
@@ -7,7 +7,11 @@ import {
useSensor,
useSensors,
} from '@dnd-kit/core'
import { SortableContext, sortableKeyboardCoordinates } from '@dnd-kit/sortable'
import {
arrayMove,
SortableContext,
sortableKeyboardCoordinates,
} from '@dnd-kit/sortable'
import {
VerticalAlignBottomRounded,
VerticalAlignTopRounded,
@@ -176,16 +180,6 @@ export const ProxiesEditorViewer = (props: Props) => {
coordinateGetter: sortableKeyboardCoordinates,
}),
)
const reorder = (
list: IProxyConfig[],
startIndex: number,
endIndex: number,
) => {
const result = Array.from(list)
const [removed] = result.splice(startIndex, 1)
result.splice(endIndex, 0, removed)
return result
}
const onPrependDragEnd = async (event: DragEndEvent) => {
const { active, over } = event
if (over) {
@@ -201,7 +195,7 @@ export const ProxiesEditorViewer = (props: Props) => {
}
})
setPrependSeq(reorder(prependSeq, activeIndex, overIndex))
setPrependSeq(arrayMove(prependSeq, activeIndex, overIndex))
}
}
}
@@ -219,7 +213,7 @@ export const ProxiesEditorViewer = (props: Props) => {
overIndex = index
}
})
setAppendSeq(reorder(appendSeq, activeIndex, overIndex))
setAppendSeq(arrayMove(appendSeq, activeIndex, overIndex))
}
}
}