Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix: unexpected cross viewport selection because it counts rowheader (#3296)

lumixebde3da36225
diff --git a/packages/engine-render/src/scroll-timer.ts b/packages/engine-render/src/scroll-timer.ts
index 2075b1ce12..04641c67e6 100644
--- a/packages/engine-render/src/scroll-timer.ts
+++ b/packages/engine-render/src/scroll-timer.ts
@@ -32,21 +32,16 @@ export enum ScrollTimerType {
export class ScrollTimer {
private _requestNewFrameNumber: number = -1;
-
private _viewport: Nullable<any>;
-
private _offsetX: number = 0;
-
private _offsetY: number = 0;
-
private _moveX: number = 0;
-
private _moveY: number = 0;
-
private _scrollX: number = 0;
-
private _scrollY: number = 0;
-
+ /**
+ * Custmize scroll function.
+ */
private _scrollFunction: Nullable<(x?: number, y?: number) => void>;
constructor(
@@ -97,7 +92,8 @@ export class ScrollTimer {
this._runRenderLoop();
}
- private _scroll(viewport: Nullable<Viewport>) {
+ //eslint-disable-next-line complexity
+ private _autoScroll(viewport: Nullable<Viewport>) {
const topBounding = viewport?.top || 0;
const bottomBounding = topBounding + (viewport?.height || 0);
const leftBounding = viewport?.left || 0;
@@ -156,7 +152,7 @@ export class ScrollTimer {
const ancestorScene = this._findAncestorScene(viewport?.scene);
const newViewport = this.getViewportByCoord(ancestorScene);
if (newViewport) {
- this._scroll(newViewport);
+ this._autoScroll(newViewport);
}
}
}
@@ -185,8 +181,10 @@ export class ScrollTimer {
}
private _runRenderLoop() {
- this._scroll(this._viewport);
- this._scrollFunction && this._scrollFunction(this._scrollX, this._scrollY);
+ this._autoScroll(this._viewport);
+ if (this._scrollFunction) {
+ this._scrollFunction(this._scrollX, this._scrollY);
+ }
this._requestNewFrameNumber = requestNewFrame(this._runRenderLoop.bind(this));
}
diff --git a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts
index 271fb2602a..f424435279 100644
--- a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts
+++ b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts
@@ -543,7 +543,8 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
}
/**
- * Init pointer move listener, bind in each pointer down, unbind in each pointer up
+ * Init pointer move listener in each pointer down, unbind in each pointer up.
+ * Both cell selections and row-column selections are supported by this method.
* @param viewportMain
* @param activeSelectionControl
* @param rangeType
@@ -582,6 +583,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
let scrollOffsetX = newMoveOffsetX;
let scrollOffsetY = newMoveOffsetY;
+ //#region selection cross freezing line
const currentSelection = this.getActiveSelectionControl();
const freeze = this._getFreeze();
@@ -590,14 +592,27 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
scene.getActiveViewportByCoord(Vector2.FromArray([moveOffsetX, moveOffsetY])) ??
this._getViewportByCell(selection?.endRow, selection?.endColumn);
- if (startViewport && endViewport && viewportMain) {
+ const isCrossableViewports = () => {
+ if (!startViewport || !endViewport || !viewportMain) {
+ return false;
+ }
+ const crossableViewports = [SHEET_VIEWPORT_KEY.VIEW_MAIN,
+ SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP,
+ SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP,
+ SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT] as string[];
+ return crossableViewports.includes(startViewport.viewportKey) && crossableViewports.includes(endViewport.viewportKey);
+ };
+ if (isCrossableViewports()) {
+ if (!startViewport || !endViewport || !viewportMain) {
+ return false;
+ }
+
const isCrossingX =
(lastX < viewportMain.left && newMoveOffsetX > viewportMain.left) ||
(lastX > viewportMain.left && newMoveOffsetX < viewportMain.left);
const isCrossingY =
(lastY < viewportMain.top && newMoveOffsetY > viewportMain.top) ||
(lastY > viewportMain.top && newMoveOffsetY < viewportMain.top);
-
if (isCrossingX) {
xCrossTime += 1;
}
@@ -696,10 +711,13 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
lastX = newMoveOffsetX;
lastY = newMoveOffsetY;
}
+ //#endregion
+ //#region auto scrolling
this._scrollTimer.scrolling(scrollOffsetX, scrollOffsetY, () => {
this._movingHandler(newMoveOffsetX, newMoveOffsetY, activeSelectionControl, rangeType);
});
+ //#endregion
});
// #endregion
}