opensource/univer
3
0
Fork 0
mirror of https://github.com/dream-num/univer.git synced 2026-08-29 07:13:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(selection): support ctrl key for adding selections without altering order (#6272)

Browse Source
This commit is contained in:
WEI ZHANG
2025-12-10 10:04:14 +08:00
committed by GitHub
parent 0f29c82abb
commit cfdd7409bf
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/sheets-formula-ui/src/views/formula-editor/hooks/use-sheet-selection-change.ts
+14 -3
View File
@@ -91,7 +91,7 @@ export const useSheetSelectionChange = (
const sheetSkeletonManagerService = render?.with(SheetSkeletonManagerService);
const refSelectionsService = useDependency(IRefSelectionsService);
// eslint-disable-next-line complexity
const onSelectionsChange = useEvent((selections: IRange[], isEnd: boolean) => {
const onSelectionsChange = useEvent((selections: IRange[], isEnd: boolean, isCtrlAddMode?: boolean) => {
const ctx = prepareSelectionChangeContext({ editor, lexerTreeBuilder });
if (!ctx) return;
const { nodeIndex, updatingRefIndex, sequenceNodes, offset } = ctx;
@@ -147,7 +147,8 @@ export const useSheetSelectionChange = (
}
} else {
const orderedSelections = [...selections];
if (updatingRefIndex !== -1) {
// 当 isCtrlAddMode 为 true 时，跳过 updatingRefIndex 的逻辑，不调整选区顺序
if (!isCtrlAddMode && updatingRefIndex !== -1) {
const last = orderedSelections.pop();
last && orderedSelections.splice(updatingRefIndex, 0, last);
}
@@ -224,13 +225,23 @@ export const useSheetSelectionChange = (
useEffect(() => {
if (refSelectionsRenderService && isNeed) {
let isFirst = true;
let prevSelectionsCount = 0;
const handleSelectionsChange = (selections: ISelectionWithCoord[], isEnd: boolean) => {
if (isFirst) {
isFirst = false;
prevSelectionsCount = selections.length;
return;
}
onSelectionsChange(selections.map((i) => i.rangeWithCoord), isEnd);
// 通过比较选区数量判断是否是 ctrl 添加模式
const isCtrlAddMode = selections.length > prevSelectionsCount;
if (isEnd) {
prevSelectionsCount = selections.length;
}
onSelectionsChange(selections.map((i) => i.rangeWithCoord), isEnd, isCtrlAddMode);
};
const disposableCollection = new DisposableCollection();