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.

refactor: better auto scroll & better scroll (#2779)

lumixf23c0daee72a
diff --git a/packages/docs-ui/src/controllers/doc-editor-bridge.controller.ts b/packages/docs-ui/src/controllers/doc-editor-bridge.controller.ts
index 6a60d68f2d..b68f5ae57b 100644
--- a/packages/docs-ui/src/controllers/doc-editor-bridge.controller.ts
+++ b/packages/docs-ui/src/controllers/doc-editor-bridge.controller.ts
@@ -120,11 +120,11 @@ export class DocEditorBridgeController extends Disposable {
if (scrollBar == null) {
viewportMain && new ScrollBar(viewportMain, { enableHorizontal: false, barSize: 8 });
} else {
- viewportMain?.resetCanvasSizeAndUpdateScrollBar();
+ viewportMain?.resetCanvasSizeAndUpdateScroll();
}
} else {
scrollBar = null;
- viewportMain?.scrollTo({ x: 0, y: 0 });
+ viewportMain?.scrollToBarPos({ x: 0, y: 0 });
viewportMain?.getScrollBar()?.dispose();
}
} else {
@@ -132,11 +132,11 @@ export class DocEditorBridgeController extends Disposable {
if (scrollBar == null) {
viewportMain && new ScrollBar(viewportMain, { barSize: 8, enableVertical: false });
} else {
- viewportMain?.resetCanvasSizeAndUpdateScrollBar();
+ viewportMain?.resetCanvasSizeAndUpdateScroll();
}
} else {
scrollBar = null;
- viewportMain?.scrollTo({ x: 0, y: 0 });
+ viewportMain?.scrollToBarPos({ x: 0, y: 0 });
viewportMain?.getScrollBar()?.dispose();
}
}
diff --git a/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts b/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts
index 783e501d5e..9a70837152 100644
--- a/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts
+++ b/packages/docs-ui/src/controllers/render-controllers/back-scroll.render-controller.ts
@@ -118,7 +118,7 @@ export class DocBackScrollRenderController extends RxDisposable implements IRend
}
const config = viewportMain.transViewportScroll2ScrollValue(offsetX, offsetY);
- viewportMain.scrollBy(config);
+ viewportMain.scrollByBarDeltaValue(config);
}
// Let the selection show on the current screen.
diff --git a/packages/docs-ui/src/controllers/render-controllers/zoom.render-controller.ts b/packages/docs-ui/src/controllers/render-controllers/zoom.render-controller.ts
index 515141c1fc..cd808c62d3 100644
--- a/packages/docs-ui/src/controllers/render-controllers/zoom.render-controller.ts
+++ b/packages/docs-ui/src/controllers/render-controllers/zoom.render-controller.ts
@@ -195,9 +195,8 @@ export class DocZoomRenderController extends Disposable implements IRenderModule
const viewport = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);
if (scrollToX !== Number.POSITIVE_INFINITY && viewport != null) {
- const actualX = viewport.transViewportScroll2ScrollValue(scrollToX, 0).x;
- viewport.scrollTo({
- x: actualX,
+ viewport.scrollToViewportPos({
+ viewportScrollX: scrollToX,
});
}
diff --git a/packages/engine-render/src/components/docs/text-selection/text-selection-render-manager.ts b/packages/engine-render/src/components/docs/text-selection/text-selection-render-manager.ts
index f83724cbb9..258b9cffae 100644
--- a/packages/engine-render/src/components/docs/text-selection/text-selection-render-manager.ts
+++ b/packages/engine-render/src/components/docs/text-selection/text-selection-render-manager.ts
@@ -909,7 +909,7 @@ export class TextSelectionRenderManager extends RxDisposable implements ITextSel
return;
}
- const scrollBefore = viewport.onScrollBefore$.subscribeEvent((param: IScrollObserverParam) => {
+ const scrollBefore = viewport.onScrollAfter$.subscribeEvent((param: IScrollObserverParam) => {
const viewport = param.viewport;
if (!viewport) {
return;
@@ -920,7 +920,7 @@ export class TextSelectionRenderManager extends RxDisposable implements ITextSel
activeRangeInstance?.activeStatic();
});
- const scrollStop = viewport.onScrollStop$.subscribeEvent((param: IScrollObserverParam) => {
+ const scrollStop = viewport.onScrollEnd$.subscribeEvent((param: IScrollObserverParam) => {
const viewport = param.viewport;
if (!viewport) {
return;
diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.ts
index 820961df55..ad8e61fd14 100644
--- a/packages/engine-render/src/scene.ts
+++ b/packages/engine-render/src/scene.ts
@@ -1000,7 +1000,7 @@ export class Scene extends ThinScene {
this.transform = composeResult;
this.getViewports().forEach((vp: Viewport) => {
- vp.resetCanvasSizeAndUpdateScrollBar();
+ vp.resetCanvasSizeAndUpdateScroll();
});
this.makeDirty(true);
}
diff --git a/packages/engine-render/src/scroll-timer.ts b/packages/engine-render/src/scroll-timer.ts
index 5eff3bf6b1..2075b1ce12 100644
--- a/packages/engine-render/src/scroll-timer.ts
+++ b/packages/engine-render/src/scroll-timer.ts
@@ -52,9 +52,9 @@ export class ScrollTimer {
constructor(
private _scene: Scene,
private _scrollTimerType: ScrollTimerType = ScrollTimerType.ALL,
- private _padding?: IPaddingData,
- private _smoothRatioX = 0.4,
- private _smoothRatioY = 0.1
+ private _padding?: IPaddingData
+ // private _smoothRatioX = 0.4,
+ // private _smoothRatioY = 0.05
) {
if (!this._padding) {
this._padding = { t: 0, b: 15, l: 0, r: 60 };
@@ -112,24 +112,24 @@ export class ScrollTimer {
if (this._scrollTimerType & ScrollTimerType.X) {
if (this._moveX < leftBounding + l) {
- x = (this._moveX - leftBounding - l) * this._smoothRatioX;
+ x = (this._moveX - leftBounding - l);
shouldScroll = true;
}
if (this._moveX > rightBounding - r) {
- x = (this._moveX - rightBounding + r) * this._smoothRatioX;
+ x = (this._moveX - rightBounding + r);
shouldScroll = true;
}
}
if (this._scrollTimerType & ScrollTimerType.Y) {
if (this._moveY < topBounding + t) {
- y = (this._moveY - topBounding - t) * this._smoothRatioY;
+ y = (this._moveY - topBounding - t);
shouldScroll = true;
}
if (this._moveY > bottomBounding - b) {
- y = (this._moveY - bottomBounding + b) * this._smoothRatioY;
+ y = (this._moveY - bottomBounding + b);
shouldScroll = true;
}
}
@@ -138,15 +138,19 @@ export class ScrollTimer {
return;
}
- const limited = viewport?.scrollBy({
- x,
- y,
+ // const limited = viewport?.scrollBy({
+ // x,
+ // y,
+ // });
+ const limited = viewport?.scrollByViewportDeltaVal({
+ viewportScrollX: x,
+ viewportScrollY: y,
});
- const actualScroll = viewport?.transScroll2ViewportScrollValue(x, y);
+ const viewportScrollVal = viewport?.transScroll2ViewportScrollValue(x, y);
- this._scrollX = actualScroll?.x || 0;
- this._scrollY = actualScroll?.y || 0;
+ this._scrollX = viewportScrollVal?.x || 0;
+ this._scrollY = viewportScrollVal?.y || 0;
if (limited) {
const ancestorScene = this._findAncestorScene(viewport?.scene);
@@ -173,8 +177,6 @@ export class ScrollTimer {
}
getViewportByCoord(scene?: Scene) {
- // return scene?.getActiveViewportByCoord(Vector2.FromArray([this._offsetX, this._offsetY]));
-
return scene?.findViewportByPosToViewport(Vector2.FromArray([this._offsetX, this._offsetY]));
}
diff --git a/packages/engine-render/src/shape/scroll-bar.ts b/packages/engine-render/src/shape/scroll-bar.ts
index 6b61c3b481..06d5ce50f9 100644
--- a/packages/engine-render/src/shape/scroll-bar.ts
+++ b/packages/engine-render/src/shape/scroll-bar.ts
@@ -347,7 +347,7 @@ export class ScrollBar extends BaseScrollBar {
this.verticalBarRect && this._eventSub.add(this.verticalBarRect.onPointerDown$.subscribeEvent((evt: unknown, state: EventState) => {
const e = evt as IPointerEvent | IMouseEvent;
- this._view.scrollTo({
+ this._view.scrollToBarPos({
y: e.offsetY - this._view.top - this.verticalThumbHeight / 2,
});
state.stopPropagation();
@@ -438,7 +438,7 @@ export class ScrollBar extends BaseScrollBar {
// 水平滚动条槽的点击滚动事件
this.horizonBarRect && this._eventSub.add(this.horizonBarRect.onPointerDown$.subscribeEvent((evt: unknown, state: EventState) => {
const e = evt as IPointerEvent | IMouseEvent;
- this._view.scrollTo({
+ this._view.scrollToBarPos({
x: e.offsetX - this._view.left - this.horizontalThumbWidth / 2,
});
state.stopPropagation();
diff --git a/packages/engine-render/src/viewport.ts b/packages/engine-render/src/viewport.ts
index 78a10090fa..8fbb708ead 100644
--- a/packages/engine-render/src/viewport.ts
+++ b/packages/engine-render/src/viewport.ts
@@ -60,33 +60,33 @@ export interface IScrollObserverParam {
/**
* scrollX for scrollbar
*/
- scrollX?: number;
- scrollY?: number;
- x?: number;
- y?: number;
+ scrollX: number;
+ scrollY: number;
+
+ /**
+ * scrollXY before limit function
+ * why need this value?
+ */
+ rawScrollX?: number;
+ rawScrollY?: number;
/**
* scrollX for viewport
*/
- viewportScrollX?: number;
- viewportScrollY?: number;
+ viewportScrollX: number;
+ viewportScrollY: number;
limitX?: number;
limitY?: number;
isTrigger?: boolean;
}
interface IScrollBarPosition {
- x?: number;
- y?: number;
+ x: number;
+ y: number;
}
-interface IViewportScrollPos {
- viewportScrollX?: number;
- viewportScrollY?: number;
-}
-
-enum SCROLL_TYPE {
- scrollTo,
- scrollBy,
+interface IViewportScrollPosition {
+ viewportScrollX: number;
+ viewportScrollY: number;
}
const MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR = 3;
@@ -113,10 +113,18 @@ export class Viewport {
private _deltaViewportScrollY: number = 0;
/**
- * physcal scene size (scene width * scale)
+ * scene size in current viewport port with scale
+ * scene size relative to row col settings.
+ * if AB col has set to be freeze, then scene size in viewMain will be smaller compared to no freeze state.
*/
- private _physicalSceneWidth: number = 0;
- private _physicalSceneHeight: number = 0;
+ private _sceneWCurrVpAfterScale: number = 0;
+ private _sceneHCurrVpAfterScale: number = 0;
+
+ /**
+ * scene size with scale
+ */
+ private _sceneWidthAfterScale: number;
+ private _sceneHeightAfterScale: number;
onMouseWheel$ = new EventSubject<IWheelEvent>();
@@ -124,7 +132,7 @@ export class Viewport {
onScrollBefore$ = new EventSubject<IScrollObserverParam>();
- onScrollStop$ = new EventSubject<IScrollObserverParam>();
+ onScrollEnd$ = new EventSubject<IScrollObserverParam>();
onScrollByBar$ = new EventSubject<IScrollObserverParam>();
@@ -176,8 +184,14 @@ export class Viewport {
private _paddingStartX: number = 0;
+ /**
+ * after create a freeze column, there is a "padding distace" from row header to curr viewport.
+ */
private _paddingEndX: number = 0;
+ /**
+ * after create a freeze row, there is a "padding distace" from column header to curr viewport.
+ */
private _paddingStartY: number = 0;
private _paddingEndY: number = 0;
@@ -255,7 +269,7 @@ export class Viewport {
this._isWheelPreventDefaultX = props?.isWheelPreventDefaultX || false;
this._isWheelPreventDefaultY = props?.isWheelPreventDefaultY || false;
- this.resetCanvasSizeAndUpdateScrollBar();
+ this.resetCanvasSizeAndUpdateScroll();
this.getBounding();
this.scene.getEngine()?.onTransformChange$.subscribeEvent(() => {
@@ -453,14 +467,14 @@ export class Viewport {
* invoked when canvas element size change
* engineResizeObserver --> engine.resizeBySize --> scene._setTransForm
*/
- resetCanvasSizeAndUpdateScrollBar() {
+ resetCanvasSizeAndUpdateScroll() {
this._resizeCacheCanvas();
- this._updateScrollBarPosByViewportScroll();
+ this._updateScrollByViewportScrollValue();
}
setScrollBar(instance: BaseScrollBar) {
this._scrollBar = instance;
- this._updateScrollBarPosByViewportScroll();
+ this._updateScrollByViewportScrollValue();
}
removeScrollBar() {
@@ -490,7 +504,7 @@ export class Viewport {
// }
// });
this._setViewportWidthAndHeight(position);
- this.resetCanvasSizeAndUpdateScrollBar();
+ this.resetCanvasSizeAndUpdateScroll();
}
setPadding(param: IPosition) {
@@ -500,7 +514,7 @@ export class Viewport {
this._paddingStartY = startY;
this._paddingEndY = endY;
- this.resetCanvasSizeAndUpdateScrollBar();
+ this.resetCanvasSizeAndUpdateScroll();
}
resetPadding() {
@@ -513,69 +527,58 @@ export class Viewport {
}
/**
- * set scrollXY and viewportScrollXY, and update scrollInfo without notify listeners of scrollInfo$
- * mainly call by scroll.render-controller and viewport.resize ...
- * only viewMain would call scrollTo, other views did not call scroll, see scroll.render-controller
- * @param pos
+ * There are serval cases to call this method.
+ * the most common case is scrolling. Other situations include:
+ * 1. changing the frozen row & col settings
+ * 2. changing curr skeleton
+ * 3. changing selection which cross viewport
+ * 4. changing the viewport size (also include change window size)
+ * 5. changing the scroll bar position
*
* when scrolling by trackpad:
- * scene.input-manager@_onMouseWheel --> scene@triggerMouseWheel --> [email protected] --> scrollManagerService.setScrollInfo -->
- * scroll.render-controller@_scrollManagerService.scrollInfo$.subscribe --> scrollTo
- * scroll-manager.service@_scrollInfo$.next -->scroll.render-controller@_scrollManagerService.scrollInfo$.subscribe -->
- * viewportMain.scrollTo(config);
- *
+ * scene.input-manager@_onMouseWheel --> scene@triggerMouseWheel --> [email protected]$.add -->
+ * set-scroll.command.ts --> scroll.operation.ts -->
+ * scrollManagerService.setScrollInfoAndEmitEvent
*
* when change skelenton:
- * _currentSkeletonBefore$ ---> scroll.render-controller@_updateSceneSize --> setSearchParam --> scene@_setTransForm ---> viewport.resetCanvasSizeAndUpdateScrollBar ---> scrollTo ---> _scroll
+ * _currentSkeletonBefore$ ---> scroll.render-controller@_updateSceneSize --> setSearchParam --> scene@_setTransForm ---> viewport.resetCanvasSizeAndUpdateScrollBar ---> scrollToXX
* --> onScrollAfterObserver.notifyObservers --> scroll.render-controller@onScrollAfterObserver ---> setScrollInfoToCurrSheetWithoutNotify ---> sms._setScrollInfo
*
* _currentSkeleton$ ---> selection.render-controller ---> formula@_autoScroll ---> viewport.resize ---> get scrollXY by viewportScrollXY ---> scrollTo
* _currentSkeleton$ ---> selection.render-controller ---> setCurrentSelection ---> formula@_autoScroll ---> scrollTo
* _currentSkeleton$ ---> freeze.render-controller@_refreshFreeze --> viewport.resize ---> scrollTo ---> _scroll
*
- *
- *
- * TODO: @lumix many side effects in scrollTo, it would update scrollXY & viewportScrollXY, and notify listeners of scrollInfo$
- *
- * TODO: @lumix Other controller should call scrollManagerService to set scrollInfo$
- * example in scroll.operation.ts
- *
* Debug
* window.scene.getViewports()[0].scrollTo({x: 14.2, y: 1.8}, true)
+ *
+ * @param pos
+ *
*/
- scrollTo(pos: IScrollBarPosition) {
- // console.trace();
- return this._scrollCore(SCROLL_TYPE.scrollTo, pos);
+ scrollToBarPos(pos: Partial<IScrollBarPosition>) {
+ return this._scrollToBarPosCore(pos);
}
/**
- * current position plus offset, relative
- * normally triggered by scroll-timer(in sheet)
- * @param pos
+ * scrolling by current position plus offset
+ * the most common case is triggered by scroll-timer(in sheet)
+ * @param delta
* @returns isLimited
*/
- scrollBy(pos: IScrollBarPosition, isTrigger = true) {
- pos.x = this.scrollX + (pos.x || 0);
- pos.y = this.scrollY + (pos.y || 0);
- return this._scrollCore(SCROLL_TYPE.scrollTo, pos, isTrigger);
+ scrollByBarDeltaValue(delta: Partial<IScrollBarPosition>, isTrigger = true) {
+ const x = this.scrollX + (delta.x || 0);
+ const y = this.scrollY + (delta.y || 0);
+ return this._scrollToBarPosCore({ x, y }, isTrigger);
}
- /**
- *
- * @param pos
- * @param isTrigger
- */
- scrollByBar(pos: IScrollBarPosition, isTrigger = true) {
- pos.x = this.scrollX + (pos.x || 0);
- pos.y = this.scrollY + (pos.y || 0);
- this._scrollCore(SCROLL_TYPE.scrollTo, pos, isTrigger);
- const { x, y } = pos;
+ scrollByBar(delta: Partial<IScrollBarPosition>, isTrigger = true) {
+ this.scrollByBarDeltaValue(delta, isTrigger);
+ const { x, y } = delta;
this.onScrollByBar$.emitEvent({
viewport: this,
scrollX: this.scrollX,
scrollY: this.scrollY,
- x,
- y,
+ rawScrollX: x,
+ rawScrollY: y,
viewportScrollX: this.viewportScrollX,
viewportScrollY: this.viewportScrollY,
limitX: this._scrollBar?.limitX,
@@ -584,16 +587,21 @@ export class Viewport {
});
}
- scrollByViewportScroll({ deltaX = 0, deltaY = 0 }) {
+ scrollToViewportPos(pos: Partial<IViewportScrollPosition>, isTrigger = true) {
if (!this._scrollBar || this.isActive === false) {
return;
}
- const x = deltaX + this.viewportScrollX;
- const y = deltaY + this.viewportScrollY;
- // console.log('before', y, viewportScrollY, this.viewportScrollY);
- const param = this.transViewportScroll2ScrollValue(x, y);
- this._scrollCore(SCROLL_TYPE.scrollTo, param, false);
- // console.log('after', y, this.viewportScrollY);
+ const { viewportScrollX, viewportScrollY } = pos;
+ return this._scrollToViewportPosCore({ viewportScrollX, viewportScrollY }, isTrigger);
+ }
+
+ scrollByViewportDeltaVal(delta: IViewportScrollPosition, isTrigger = true) {
+ if (!this._scrollBar || this.isActive === false) {
+ return;
+ }
+ const viewportScrollX = this.viewportScrollX + (delta.viewportScrollX || 0);
+ const viewportScrollY = this.viewportScrollY + (delta.viewportScrollY || 0);
+ return this._scrollToViewportPosCore({ viewportScrollX, viewportScrollY }, isTrigger);
}
/**
@@ -602,7 +610,6 @@ export class Viewport {
* @param offsetX
* @param offsetY
* @param isTrigger
- * @returns
*/
scrollByOffset(offsetX = 0, offsetY = 0, isTrigger = true) {
if (!this._scrollBar || this.isActive === false) {
@@ -611,7 +618,7 @@ export class Viewport {
const x = offsetX + this._paddingStartX;
const y = offsetY + this._paddingStartY;
const param = this.transViewportScroll2ScrollValue(x, y);
- return this.scrollBy(param, isTrigger);
+ return this.scrollByBarDeltaValue(param, isTrigger);
}
transViewportScroll2ScrollValue(viewportScrollX: number, viewportScrollY: number) {
@@ -691,9 +698,8 @@ export class Viewport {
/**
* get actual scroll value by scrollXY
- * @returns
*/
- getViewportScrollByScroll() {
+ getViewportScrollByScrollXY() {
const x = this.scrollX;
const y = this.scrollY;
@@ -704,8 +710,9 @@ export class Viewport {
return this._scrollBar;
}
- // scrollTo ---> _scroll ---> onScrollAfterObserver.notifyObservers ---> scroll.render-controller@updateScroll
- updateScroll(current: IScrollObserverParam) {
+ // scrollTo ---> _scroll ---> onScrollAfter$.next ---> scroll.render-controller@updateScroll
+ // scrollTo ---> _scroll ---> onScrollAfter$.next ---> freeze.render-controller@updateScroll
+ updateScrollVal(current: Partial<IScrollObserverParam>) {
// scrollvalue for scrollbar, when rows over 5000(big sheet), deltaScrollY always 0 when scrolling. Do not use this value to judge scrolling
// this._deltaScrollX = this.scrollX - this._preScrollX;
// this._deltaScrollY = this.scrollY - this._preScrollY;
@@ -756,12 +763,11 @@ export class Viewport {
}
/**
- * engine.renderLoop ---> scene.render ---> layer.render ---> viewport.render
+ * call stack: engine.renderLoop ---> scene.render ---> layer.render ---> viewport.render
* that means each layer call all viewports to render
- * @param parentCtx 如果 layer._allowCache true, 那么 parentCtx 是 layer 中的 cacheCtx
+ * @param parentCtx parentCtx is cacheCtx from layer when layer._allowCache is true
* @param objects
* @param isMaxLayer
- * @param isLast last viewport would
*/
render(parentCtx?: UniverRenderingContext, objects: BaseObject[] = [], isMaxLayer = false) {
if (!this.shouldIntoRender()) {
@@ -866,7 +872,7 @@ export class Viewport {
const sceneTrans = this._scene.transform.clone();
- const m = sceneTrans.getMatrix();
+ // const m = sceneTrans.getMatrix();
// const scaleFromX = this._isRelativeX ? (m[0] < 1 ? m[0] : 1) : 1;
@@ -877,9 +883,7 @@ export class Viewport {
// const scaleToY = this._isRelativeY ? 1 : m[3] < 1 ? m[3] : 1;
let width = this._width;
-
let height = this._height;
-
const size = this._getViewPortSize();
// if (m[0] > 1) {
@@ -978,7 +982,7 @@ export class Viewport {
*/
transformVector2SceneCoord(vec: Vector2): Vector2 {
const sceneTrans = this.scene.transform.clone().invert();
- const scroll = this.getViewportScrollByScroll();
+ const scroll = this.getViewportScrollByScrollXY();
const svCoord = sceneTrans.applyPoint(vec).add(Vector2.FromArray([scroll.x, scroll.y]));
return svCoord;
@@ -986,7 +990,7 @@ export class Viewport {
getAbsoluteVector(coord: Vector2): Vector2 {
const sceneTrans = this.scene.transform.clone();
- const scroll = this.getViewportScrollByScroll();
+ const scroll = this.getViewportScrollByScrollXY();
const svCoord = sceneTrans.applyPoint(coord.subtract(Vector2.FromArray([scroll.x, scroll.y])));
return svCoord;
@@ -1010,11 +1014,11 @@ export class Viewport {
const viewWidth = this.width || 1;
const scrollNum = (viewWidth / allWidth) * deltaFactor;
if (evt.deltaX > 0) {
- isLimitedStore = this.scrollBy({
+ isLimitedStore = this.scrollByBarDeltaValue({
x: scrollNum,
});
} else {
- isLimitedStore = this.scrollBy({
+ isLimitedStore = this.scrollByBarDeltaValue({
x: -scrollNum,
});
}
@@ -1039,11 +1043,11 @@ export class Viewport {
if (evt.shiftKey) {
scrollNum *= MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR;
if (evt.deltaY > 0) {
- isLimitedStore = this.scrollBy({
+ isLimitedStore = this.scrollByBarDeltaValue({
x: scrollNum,
});
} else {
- isLimitedStore = this.scrollBy({
+ isLimitedStore = this.scrollByBarDeltaValue({
x: -scrollNum,
});
}
@@ -1060,11 +1064,11 @@ export class Viewport {
}
} else {
if (evt.deltaY > 0) {
- isLimitedStore = this.scrollBy({
+ isLimitedStore = this.scrollByBarDeltaValue({
y: scrollNum,
});
} else {
- isLimitedStore = this.scrollBy({
+ isLimitedStore = this.scrollByBarDeltaValue({
y: -scrollNum,
});
}
@@ -1130,45 +1134,79 @@ export class Viewport {
this.onMouseWheel$.complete();
this.onScrollAfter$.complete();
this.onScrollBefore$.complete();
- this.onScrollStop$.complete();
+ this.onScrollEnd$.complete();
this._scrollBar?.dispose();
this._cacheCanvas?.dispose();
this._scene.removeViewport(this._viewportKey);
}
- limitedScroll() {
+ limitedScroll(scrollX: Nullable<number>, scrollY: Nullable<number>) {
if (!this._scrollBar) {
- return;
+ return {
+ scrollX: 0,
+ scrollY: 0,
+ isLimitedX: false,
+ isLimitedY: false,
+ };
+ }
+
+ scrollX = scrollX ?? this.scrollX;
+ scrollY = scrollY ?? this.scrollY;
+ const { height, width } = this._getViewPortSize();
+ if (this._sceneWCurrVpAfterScale <= width) {
+ scrollX = 0;
+ }
+ if (this._sceneHCurrVpAfterScale <= height) {
+ scrollY = 0;
}
const limitX = this._scrollBar?.limitX;
const limitY = this._scrollBar?.limitY;
- let isLimitedX = true;
- let isLimitedY = true;
+ let isLimitedX = false;
+ let isLimitedY = false;
- if (this.scrollX < 0) {
- this.scrollX = 0;
- } else if (this.scrollX > limitX) {
- this.scrollX = limitX;
- } else {
- isLimitedX = false;
+ if (scrollX < 0 || scrollX > limitX) {
+ isLimitedX = true;
}
- if (this.scrollY < 0) {
- this.scrollY = 0;
- } else if (this.scrollY > limitY) {
- this.scrollY = limitY;
- } else {
- isLimitedY = false;
+ if (scrollY < 0 || scrollY > limitY) {
+ isLimitedY = true;
}
+ scrollX = Tools.clamp(scrollX, 0, limitX);
+ scrollY = Tools.clamp(scrollY, 0, limitY);
return {
+ scrollX,
+ scrollY,
isLimitedX,
isLimitedY,
};
}
+ /**
+ * Still in working progress, do not use it now.
+ * @param viewportScrollX
+ * @param viewportScrollY
+ * @returns
+ */
+ _limitViewportScroll(viewportScrollX: number, viewportScrollY: number) {
+ const { width, height } = this._getViewPortSize();
+ // Not enough! freeze row & col should also take into consideration.
+ const freezeHeight = this._paddingEndY - this._paddingStartY;
+ const freezeWidth = this._paddingEndX - this._paddingStartX;
+ const scaleY = this.scene.scaleY;
+ const scaleX = this.scene.scaleX;
+ const maxViewportScrollX = this._sceneWidthAfterScale - freezeWidth * scaleX - width;
+ const maxViewportScrollY = this._sceneHeightAfterScale - freezeHeight * scaleY - height;
+ return {
+ viewportScrollX: Tools.clamp(viewportScrollX, this._paddingStartX, maxViewportScrollX / scaleX),
+ viewportScrollY: Tools.clamp(viewportScrollY, this._paddingStartY, maxViewportScrollY / scaleY),
+ isLimitedX: viewportScrollX > maxViewportScrollX,
+ isLimitedY: viewportScrollY > maxViewportScrollY,
+ };
+ }
+
markDirty(state?: boolean) {
if (state === undefined) {
state = true;
@@ -1214,27 +1252,28 @@ export class Viewport {
}
/**
- * This method will be invoked whenever the viewport is resized.
+ * This method will be invoked when viewport is resizing and removing rol & col
*/
- private _updateScrollBarPosByViewportScroll() {
+ private _updateScrollByViewportScrollValue() {
// zoom.render-controller ---> scene._setTransform --> _updateScrollBarPosByViewportScroll
// viewport width is negative when canvas container has not been set to engine.
if (!this.width || this.width < 0) return;
if (!this.height || this.height < 0) return;
- const viewportScrollX = this.viewportScrollX;
- const viewportScrollY = this.viewportScrollY;
const { width, height } = this._getViewPortSize();
- const contentWidth = (this._scene.width - this._paddingEndX) * this._scene.scaleX;
- const contentHeight = (this._scene.height - this._paddingEndY) * this._scene.scaleY;
- this._physicalSceneWidth = contentWidth;
- this._physicalSceneHeight = contentHeight;
+ const sceneWidthCurrVpAfterScale = (this._scene.width - this._paddingEndX) * this._scene.scaleX;
+ const sceneHeightCurrVpAfterScale = (this._scene.height - this._paddingEndY) * this._scene.scaleY;
+ this._sceneWCurrVpAfterScale = sceneWidthCurrVpAfterScale;
+ this._sceneHCurrVpAfterScale = sceneHeightCurrVpAfterScale;
+ this._sceneWidthAfterScale = this._scene.width * this._scene.scaleX;
+ this._sceneHeightAfterScale = this._scene.height * this._scene.scaleY;
if (this._scrollBar) {
- this._scrollBar.resize(width, height, contentWidth, contentHeight);
- const { x, y } = this.transViewportScroll2ScrollValue(viewportScrollX, viewportScrollY);
- this.scrollTo({
- x,
- y,
+ this._scrollBar.resize(width, height, sceneWidthCurrVpAfterScale, sceneHeightCurrVpAfterScale);
+ const viewportScrollX = this.viewportScrollX;
+ const viewportScrollY = this.viewportScrollY;
+ this.scrollToViewportPos({
+ viewportScrollX,
+ viewportScrollY,
});
}
this.markForceDirty(true);
@@ -1305,24 +1344,17 @@ export class Viewport {
// this._preScrollY = this.scrollY;
}
- private _triggerScrollStop(
- scroll: {
- x: number;
- y: number;
- },
- scollBarX?: number,
- scrollBarY?: number
- ) {
+ private _emitScrollEnd$(scrollSubParam: IScrollObserverParam) {
clearTimeout(this._scrollStopNum);
this._scrollStopNum = setTimeout(() => {
- this.onScrollStop$.emitEvent({
+ this.onScrollEnd$.emitEvent({
+ rawScrollX: scrollSubParam.rawScrollX,
+ rawScrollY: scrollSubParam.rawScrollY,
viewport: this,
scrollX: this.scrollX,
scrollY: this.scrollY,
- x: scollBarX,
- y: scrollBarY,
- viewportScrollX: scroll.x,
- viewportScrollY: scroll.y,
+ viewportScrollX: this.viewportScrollX,
+ viewportScrollY: this.viewportScrollY,
limitX: this._scrollBar?.limitX,
limitY: this._scrollBar?.limitY,
isTrigger: false,
@@ -1331,84 +1363,101 @@ export class Viewport {
}
/**
- * Scroll Viewport
- * This function called by viewMain only, other viewports will not.
*
- * caller: scroll.render-controller viewportMain.scrollTo({x, y}))
- * this._scrollManagerService.scrollInfo$.subscribe --> scrollTo --> _scroll
- * @param scrollType
- * @param scrollBarPos viewMain 滚动条的位置
+ * When scroll just in X direction, there is no y definition in scrollXY. So scrollXY is Partial<IScrollBarPosition>
+ * @param rawScrollXY Partial<IViewportScrollPosition>
* @param isTrigger
*/
- private _scrollCore(scrollType: SCROLL_TYPE, scrollBarPos: IScrollBarPosition, isTrigger: boolean = true) {
- const { x, y } = scrollBarPos;
+ private _scrollToBarPosCore(rawScrollXY: Partial<IScrollBarPosition>, isTrigger: boolean = true) {
if (this._scrollBar == null) {
return;
}
- if (x !== undefined) {
- if (this._scrollBar.hasHorizonThumb()) {
- if (scrollType === SCROLL_TYPE.scrollBy) {
- this.scrollX += x;
- } else {
- this.scrollX = x;
- }
- } else {
- this.scrollX = 0;
- }
- }
+ // TODO @lumixraku WTF? ?! sheet can not scroll when horizonThumb is invisible ??
+ // if (this._scrollBar.hasHorizonThumb()) {...}
- if (y !== undefined) {
- if (this._scrollBar.hasVerticalThumb()) {
- if (scrollType === SCROLL_TYPE.scrollBy) {
- this.scrollY += y;
- } else {
- this.scrollY = y;
- }
- } else {
- this.scrollY = 0;
- }
- }
+ let scrollX = rawScrollXY.x;
+ let scrollY = rawScrollXY.y;
+ const afterLimit = this.limitedScroll(scrollX, scrollY);
+ const viewportScrollXY = this.transScroll2ViewportScrollValue(afterLimit.scrollX, afterLimit.scrollY);
+ this.scrollX = scrollX = afterLimit.scrollX;
+ this.scrollY = scrollY = afterLimit.scrollY;
+ this.viewportScrollX = viewportScrollXY.x;
+ this.viewportScrollY = viewportScrollXY.y;
- const limited = this.limitedScroll();
- this.onScrollBefore$.emitEvent({
+ const scrollSubParam: IScrollObserverParam = {
viewport: this,
- scrollX: this.scrollX,
- scrollY: this.scrollY,
- x,
- y,
+ scrollX,
+ scrollY,
+ viewportScrollX: viewportScrollXY.x,
+ viewportScrollY: viewportScrollXY.y,
+ rawScrollX: rawScrollXY.x,
+ rawScrollY: rawScrollXY.y,
limitX: this._scrollBar?.limitX,
limitY: this._scrollBar?.limitY,
isTrigger,
- });
+ };
+ this._scrollBar?.makeDirty(true);
- if (this._scrollBar) {
- this._scrollBar.makeDirty(true);
+ this.onScrollBefore$.emitEvent(scrollSubParam);
+ this.onScrollAfter$.emitEvent(scrollSubParam);
+ this._emitScrollEnd$(scrollSubParam);
+
+ return afterLimit;
+ }
+
+ /**
+ *
+ * When scroll just in X direction, there is no y definition in scrollVpPos. So scrollVpPos is Partial<IViewportScrollPosition>
+ * @param scrollVpPos Partial<IViewportScrollPosition>
+ * @param isTrigger
+ */
+ private _scrollToViewportPosCore(scrollVpPos: Partial<IViewportScrollPosition>, isTrigger: boolean = true) {
+ if (this._scrollBar == null) {
+ return;
}
- const clampedViewportScroll = this.getViewportScrollByScroll();
- this.viewportScrollX = clampedViewportScroll.x;
- this.viewportScrollY = clampedViewportScroll.y;
- // console.log('scrollToCore', this.scrollY, this.viewportScrollY, limited);
- // calc startRow & offset by viewportScrollXY, then update scrollInfo
- // other viewports, rowHeader & colHeader depend on this notify
- // scroll.render-controller@onScrollAfterObserver ---> setScrollInfo but no notify
- this.onScrollAfter$.emitEvent({
+ let viewportScrollX = scrollVpPos.viewportScrollX ?? this.viewportScrollX;
+ let viewportScrollY = scrollVpPos.viewportScrollY ?? this.viewportScrollY;
+ const rawScrollXY = this.transViewportScroll2ScrollValue(viewportScrollX, viewportScrollY);
+ // const afterLimit = this.limitedScroll(rawScrollXY.x, rawScrollXY.y);
+ // const scrollX = afterLimit.scrollX;
+ // const scrollY = afterLimit.scrollY;
+ // const afterLimitViewportXY = this.transScroll2ViewportScrollValue(scrollX, scrollY);
+ // viewportScrollX = afterLimitViewportXY.x;
+ // viewportScrollY = afterLimitViewportXY.y;
+ const afterLimitViewportXY = this._limitViewportScroll(viewportScrollX, viewportScrollY);
+ viewportScrollX = afterLimitViewportXY.viewportScrollX;
+ viewportScrollY = afterLimitViewportXY.viewportScrollY;
+ const afterLimitScrollXY = this.transViewportScroll2ScrollValue(viewportScrollX, viewportScrollY);
+ const scrollX = afterLimitScrollXY.x;
+ const scrollY = afterLimitScrollXY.y;
+
+ this.scrollX = scrollX;
+ this.scrollY = scrollY;
+ this.viewportScrollX = viewportScrollX;
+ this.viewportScrollY = viewportScrollY;
+
+ const scrollSubParam: IScrollObserverParam = {
isTrigger,
viewport: this,
- x,
- y,
scrollX: this.scrollX,
scrollY: this.scrollY,
- viewportScrollX: clampedViewportScroll.x,
- viewportScrollY: clampedViewportScroll.y,
+ viewportScrollX,
+ viewportScrollY,
+ rawScrollX: rawScrollXY.x,
+ rawScrollY: rawScrollXY.y,
limitX: this._scrollBar?.limitX,
limitY: this._scrollBar?.limitY,
- } as IScrollObserverParam);
+ };
+
+ this._scrollBar?.makeDirty(true);
- this._triggerScrollStop(clampedViewportScroll, x, y);
+ this.onScrollBefore$.emitEvent(scrollSubParam);
+ this.onScrollAfter$.emitEvent(scrollSubParam);
+ this._emitScrollEnd$(scrollSubParam);
- return limited;
+ return afterLimitViewportXY;
}
expandBounds(value: { top: number; left: number; bottom: number; right: number }) {
diff --git a/packages/sheets-ui/src/commands/commands/__tests__/set-frozen.command.spec.ts b/packages/sheets-ui/src/commands/commands/__tests__/set-frozen.command.spec.ts
index 4090cfee87..3fa6e3404f 100644
--- a/packages/sheets-ui/src/commands/commands/__tests__/set-frozen.command.spec.ts
+++ b/packages/sheets-ui/src/commands/commands/__tests__/set-frozen.command.spec.ts
@@ -69,7 +69,7 @@ describe('Test commands used for change selections', () => {
}
const scrollTo = (startRow: number, startColumn: number, offsetX = 0, offsetY = 0) => {
- scrollManagerService.setScrollInfoToCurrSheetAndEmitEvent({
+ scrollManagerService.setScrollStateToCurrSheetAndEmitEvent({
sheetViewStartRow: startRow,
sheetViewStartColumn: startColumn,
offsetX,
diff --git a/packages/sheets-ui/src/commands/commands/set-frozen.command.ts b/packages/sheets-ui/src/commands/commands/set-frozen.command.ts
index 0ecc8c6baf..2558061f3f 100644
--- a/packages/sheets-ui/src/commands/commands/set-frozen.command.ts
+++ b/packages/sheets-ui/src/commands/commands/set-frozen.command.ts
@@ -51,7 +51,7 @@ export const SetSelectionFrozenCommand: ICommand<ISetSelectionFrozenCommandParam
const currentSelection = selections[selections?.length - 1];
const { range } = currentSelection;
const scrollManagerService = accessor.get(SheetScrollManagerService);
- const { sheetViewStartRow = 0, sheetViewStartColumn = 0 } = scrollManagerService.getCurrentScrollInfo() || {};
+ const { sheetViewStartRow = 0, sheetViewStartColumn = 0 } = scrollManagerService.getCurrentScrollState() || {};
let startRow;
let startColumn;
let ySplit;
diff --git a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts b/packages/sheets-ui/src/commands/commands/set-scroll.command.ts
index 7d7a6200a0..ce3a4e5dea 100644
--- a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts
+++ b/packages/sheets-ui/src/commands/commands/set-scroll.command.ts
@@ -19,7 +19,7 @@ import { CommandType, ICommandService, IUniverInstanceService, UniverInstanceTyp
import { getSheetCommandTarget } from '@univerjs/sheets';
import { IRenderManagerService } from '@univerjs/engine-render';
-import type { IScrollManagerParam } from '../../services/scroll-manager.service';
+import type { IScrollState } from '../../services/scroll-manager.service';
import { SheetScrollManagerService } from '../../services/scroll-manager.service';
import { SetScrollOperation } from '../operations/scroll.operation';
import { SheetsScrollRenderController } from '../../controllers/render-controllers/scroll.render-controller';
@@ -56,7 +56,7 @@ export const SetScrollRelativeCommand: ICommand<ISetScrollRelativeCommandParams>
const { unitId, subUnitId, worksheet } = target;
const { xSplit, ySplit } = worksheet.getConfig().freeze;
const scrollManagerService = renderManagerSrv.getRenderById(unitId)!.with(SheetScrollManagerService);
- const currentScroll = scrollManagerService.getCurrentScrollInfo();
+ const currentScroll = scrollManagerService.getCurrentScrollState();
const { offsetX = 0, offsetY = 0 } = params || {};
const {
sheetViewStartRow = 0,
@@ -97,7 +97,7 @@ export const ScrollCommand: ICommand<IScrollCommandParams> = {
const { workbook, worksheet, unitId } = target;
const scrollManagerService = renderManagerSrv.getRenderById(unitId)!.with(SheetScrollManagerService);
- const currentScroll: Readonly<Nullable<IScrollManagerParam>> = scrollManagerService.getCurrentScrollInfo();
+ const currentScroll: Readonly<Nullable<IScrollState>> = scrollManagerService.getCurrentScrollState();
if (!worksheet) {
return false;
diff --git a/packages/sheets-ui/src/commands/operations/scroll.operation.ts b/packages/sheets-ui/src/commands/operations/scroll.operation.ts
index 16f336a54f..d46d682888 100644
--- a/packages/sheets-ui/src/commands/operations/scroll.operation.ts
+++ b/packages/sheets-ui/src/commands/operations/scroll.operation.ts
@@ -18,14 +18,14 @@ import type { IOperation } from '@univerjs/core';
import { CommandType, IUniverInstanceService } from '@univerjs/core';
import { IRenderManagerService } from '@univerjs/engine-render';
-import type { IScrollManagerWithSearchParam } from '../../services/scroll-manager.service';
+import type { IScrollStateWithSearchParam } from '../../services/scroll-manager.service';
import { SheetScrollManagerService } from '../../services/scroll-manager.service';
-export const SetScrollOperation: IOperation<IScrollManagerWithSearchParam> = {
+export const SetScrollOperation: IOperation<IScrollStateWithSearchParam> = {
id: 'sheet.operation.set-scroll',
type: CommandType.OPERATION,
- handler: (accessor, params: IScrollManagerWithSearchParam) => {
+ handler: (accessor, params: IScrollStateWithSearchParam) => {
if (!params) {
return false;
}
diff --git a/packages/sheets-ui/src/controllers/auto-fill.controller.ts b/packages/sheets-ui/src/controllers/auto-fill.controller.ts
index 7d80426135..2a8732dd43 100644
--- a/packages/sheets-ui/src/controllers/auto-fill.controller.ts
+++ b/packages/sheets-ui/src/controllers/auto-fill.controller.ts
@@ -271,7 +271,7 @@ export class AutoFillController extends Disposable {
);
}
- // eslint-disable-next-line max-lines-per-function
+ // eslint-disable-next-line max-lines-per-function, complexity
private _triggerAutoFill(source: IRange, selection: IRange) {
// if source range === dest range, do nothing;
if (
diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
index 0c8eb2c088..68db383e00 100644
--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
@@ -436,7 +436,7 @@ export class EditingRenderController extends Disposable implements IRenderModule
if (scrollBar == null) {
viewportMain && new ScrollBar(viewportMain, { enableHorizontal: false, barSize: 8 });
} else {
- viewportMain?.resetCanvasSizeAndUpdateScrollBar();
+ viewportMain?.resetCanvasSizeAndUpdateScroll();
}
} else {
scrollBar = null;
@@ -613,8 +613,8 @@ export class EditingRenderController extends Disposable implements IRenderModule
// TODO: @JOCS, Get the position close to the cursor after clicking on the cell.
const cursor = documentDataModel.getBody()!.dataStream.length - 2 || 0;
- scene.getViewport(DOC_VIEWPORT_KEY.VIEW_MAIN)?.scrollTo({
- y: Number.POSITIVE_INFINITY,
+ scene.getViewport(DOC_VIEWPORT_KEY.VIEW_MAIN)?.scrollToViewportPos({
+ viewportScrollX: Number.POSITIVE_INFINITY,
});
this._textSelectionManagerService.replaceTextRanges([
diff --git a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
index 96b81ab6cc..d2bd1552c3 100644
--- a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
@@ -559,11 +559,11 @@ export class FormulaEditorController extends RxDisposable {
if (scrollBar == null) {
viewportMain && new ScrollBar(viewportMain, { enableHorizontal: false, barSize: 8 });
} else {
- viewportMain?.resetCanvasSizeAndUpdateScrollBar();
+ viewportMain?.resetCanvasSizeAndUpdateScroll();
}
} else {
scrollBar = null;
- viewportMain?.scrollTo({ x: 0, y: 0 });
+ viewportMain?.scrollToViewportPos({ viewportScrollX: 0, viewportScrollY: 0 });
viewportMain?.getScrollBar()?.dispose();
}
}
diff --git a/packages/sheets-ui/src/controllers/hover-render.controller.ts b/packages/sheets-ui/src/controllers/hover-render.controller.ts
index f56ddcd301..cbe8d51779 100644
--- a/packages/sheets-ui/src/controllers/hover-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/hover-render.controller.ts
@@ -59,6 +59,6 @@ export class HoverRenderController extends Disposable implements IRenderModule {
}
private _initScrollEvent() {
- this.disposeWithMe(this._scrollManagerService.rawScrollInfo$.subscribe(() => this._hoverManagerService.onScroll()));
+ this.disposeWithMe(this._scrollManagerService.validViewportScrollInfo$.subscribe(() => this._hoverManagerService.onScroll()));
}
}
diff --git a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
index ea0f74034b..7c907f28a5 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
@@ -28,7 +28,7 @@ import {
ThemeService,
toDisposable,
} from '@univerjs/core';
-import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, IScrollObserverParam, Viewport } from '@univerjs/engine-render';
+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Viewport } from '@univerjs/engine-render';
import { CURSOR_TYPE, Rect, SHEET_VIEWPORT_KEY, TRANSFORM_CHANGE_OBSERVABLE_TYPE, Vector2 } from '@univerjs/engine-render';
import type {
IInsertColCommandParams,
@@ -72,6 +72,7 @@ import { ScrollCommand } from '../../commands/commands/set-scroll.command';
import { SetZoomRatioOperation } from '../../commands/operations/set-zoom-ratio.operation';
import { SHEET_COMPONENT_HEADER_LAYER_INDEX } from '../../common/keys';
+import type { IViewportScrollState } from '../../services/scroll-manager.service';
import { SheetScrollManagerService } from '../../services/scroll-manager.service';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
import { getCoordByOffset, getSheetObject } from '../utils/component-tools';
@@ -403,7 +404,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
const scene = sheetObject.scene;
const scale = Math.max(scene.scaleX, scene.scaleY);
- const currentScroll = this._scrollManagerService.getCurrentScrollInfo();
+ const currentScroll = this._scrollManagerService.getCurrentScrollState();
const skeletonViewHeight = (sheetObject.engine.height - skeleton.columnHeaderHeight) / scale;
const start = currentScroll?.sheetViewStartRow ?? 0;
@@ -597,7 +598,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
// alert(`moveColumnTo: ${this._changeToColumn}`);
}
- const sheetViewScroll = this._scrollManagerService.getCurrentScrollInfo() || {
+ const sheetViewScroll = this._scrollManagerService.getCurrentScrollState() || {
sheetViewStartRow: 0,
sheetViewStartColumn: 0,
};
@@ -721,15 +722,17 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
return;
}
- const { viewMain, viewRowBottom, viewColumnRight, viewMainLeft, viewMainTop } = viewports;
+ const { viewRowBottom, viewColumnRight, viewMainLeft, viewMainTop } = viewports;
this.disposeWithMe(
- viewMain.onScrollAfter$.subscribeEvent((param: IScrollObserverParam) => {
+ this._scrollManagerService.validViewportScrollInfo$.subscribe((param: Nullable<IViewportScrollState>) => {
+ if (!param) return;
+
const { scrollX, scrollY, viewportScrollX, viewportScrollY } = param;
if (viewRowBottom.isActive) {
viewRowBottom
- .updateScroll({
+ .updateScrollVal({
scrollY,
viewportScrollY,
});
@@ -737,14 +740,14 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
if (viewColumnRight.isActive) {
viewColumnRight
- .updateScroll({
+ .updateScrollVal({
scrollX,
viewportScrollX,
});
}
if (viewMainLeft.isActive) {
viewMainLeft
- .updateScroll({
+ .updateScrollVal({
scrollY,
viewportScrollY,
});
@@ -752,7 +755,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
if (viewMainTop.isActive) {
viewMainTop
- .updateScroll({
+ .updateScrollVal({
scrollX,
viewportScrollX,
});
@@ -884,9 +887,9 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
right: 0,
});
viewMainTop
- .updateScroll({
+ .updateScrollVal({
viewportScrollY: startSheetView.startY,
- x: viewMain.scrollX,
+ rawScrollX: viewMain.scrollX,
viewportScrollX: viewMain.viewportScrollX,
});
viewRowTop.resizeWhenFreezeChange({
@@ -896,7 +899,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
height: topGap,
});
viewRowTop
- .updateScroll({
+ .updateScrollVal({
viewportScrollY: startSheetView.startY,
});
viewRowBottom.resizeWhenFreezeChange({
@@ -939,9 +942,9 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
right: 0,
});
viewMainLeft
- .updateScroll({
+ .updateScrollVal({
viewportScrollX: startSheetView.startX,
- y: viewMain.scrollY,
+ rawScrollY: viewMain.scrollY,
viewportScrollY: viewMain.viewportScrollY,
});
viewColumnLeft.resizeWhenFreezeChange({
@@ -951,7 +954,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
height: columnHeaderHeightAndMarginTop,
});
viewColumnLeft
- .updateScroll({
+ .updateScrollVal({
viewportScrollX: startSheetView.startX,
});
viewColumnRight.resizeWhenFreezeChange({
@@ -1003,9 +1006,9 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
bottom: 0,
});
viewMainLeft
- .updateScroll({
+ .updateScrollVal({
viewportScrollX: startSheetView.startX,
- y: viewMain.scrollY,
+ rawScrollY: viewMain.scrollY,
viewportScrollY: viewMain.viewportScrollY,
});
viewMainTop.resizeWhenFreezeChange({
@@ -1015,9 +1018,9 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
right: 0,
});
viewMainTop
- .updateScroll({
+ .updateScrollVal({
viewportScrollY: startSheetView.startY,
- x: viewMain.scrollX,
+ rawScrollX: viewMain.scrollX,
viewportScrollX: viewMain.viewportScrollX,
});
viewMainLeftTop.resizeWhenFreezeChange({
@@ -1028,7 +1031,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
});
viewMainLeftTop
- .updateScroll({
+ .updateScrollVal({
viewportScrollX: startSheetView.startX,
viewportScrollY: startSheetView.startY,
});
@@ -1041,7 +1044,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
});
viewRowTop
- .updateScroll({
+ .updateScrollVal({
viewportScrollY: startSheetView.startY,
});
@@ -1060,7 +1063,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM
});
viewColumnLeft
- .updateScroll({
+ .updateScrollVal({
viewportScrollX: startSheetView.startX,
});
diff --git a/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts
index cbe0c7f309..d244e49cb8 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts
@@ -38,10 +38,11 @@ import { Subscription } from 'rxjs';
import { SHEET_COMPONENT_HEADER_LAYER_INDEX, SHEET_VIEW_KEY } from '../../common/keys';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
import {
+ HEADER_MENU_SHAPE_SIZE,
HEADER_MENU_SHAPE_THUMB_SIZE,
- HEADER_MENU_SHAPE_WIDTH_HEIGHT,
HEADER_RESIZE_SHAPE_TYPE,
HeaderMenuResizeShape,
+ MAX_HEADER_MENU_SHAPE_SIZE,
} from '../../views/header-resize-shape';
import { getCoordByOffset, getTransformCoord } from '../utils/component-tools';
@@ -172,7 +173,7 @@ export class HeaderResizeRenderController extends Disposable implements IRenderM
const scale = Math.max(scaleX, scaleY);
- const HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE = HEADER_MENU_SHAPE_WIDTH_HEIGHT / scale;
+ const HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE = HEADER_MENU_SHAPE_SIZE / scale;
if (initialType === HEADER_RESIZE_TYPE.ROW) {
let top = startY - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2;
@@ -202,7 +203,7 @@ export class HeaderResizeRenderController extends Disposable implements IRenderM
return false;
}
- const rowSize = rowHeaderWidth / 3;
+ const rowSize = Math.min(MAX_HEADER_MENU_SHAPE_SIZE, rowHeaderWidth / 3);
this._rowResizeRect.transformByState({
left: rowHeaderWidth / 2 - rowSize / 2,
diff --git a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-contextmenu.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-contextmenu.render-controller.ts
index c1c79733b4..3c4633c811 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-contextmenu.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-contextmenu.render-controller.ts
@@ -20,6 +20,7 @@ import { type IPointerEvent, type IRenderContext, type IRenderModule, SHEET_VIEW
import { type ISelectionWithStyle, SheetsSelectionsService } from '@univerjs/sheets';
import { IContextMenuService, ILayoutService, MenuPosition } from '@univerjs/ui';
import { ISheetSelectionRenderService } from '../../../services/selection/base-selection-render.service';
+import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';
/**
* On mobile devices, the context menu would popup when
@@ -32,7 +33,8 @@ export class SheetContextMenuMobileRenderController extends Disposable implement
@ILayoutService private readonly _layoutService: ILayoutService,
@IContextMenuService private readonly _contextMenuService: IContextMenuService,
@Inject(SheetsSelectionsService) private readonly _selectionManagerService: SheetsSelectionsService,
- @ISheetSelectionRenderService private readonly _selectionRenderService: ISheetSelectionRenderService
+ @ISheetSelectionRenderService private readonly _selectionRenderService: ISheetSelectionRenderService,
+ @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService
) {
super();
@@ -68,7 +70,9 @@ export class SheetContextMenuMobileRenderController extends Disposable implement
let clientX = 0;
let clientY = 0;
- const rowHeaderWidth = 46;
+ const skeleton = this._sheetSkeletonManagerService.getCurrent()!.skeleton;
+ const rowHeaderWidth = skeleton.rowHeaderWidth;
+
// TODO @lumixraku popup should positioned by transform not topleft.
// using transform & transform-origin would be easy to position popup
switch (rangeType) {
diff --git a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-scroll.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-scroll.render-controller.ts
index 141b4d813d..62157b932a 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-scroll.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-scroll.render-controller.ts
@@ -23,7 +23,6 @@ import {
IUniverInstanceService,
RANGE_TYPE,
toDisposable,
- UniverInstanceType,
} from '@univerjs/core';
import type { IMouseEvent, IPoint, IPointerEvent, IRenderContext, IRenderModule, IScrollObserverParam } from '@univerjs/engine-render';
import { IRenderManagerService, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';
@@ -32,7 +31,7 @@ import { ScrollToCellOperation, SheetsSelectionsService } from '@univerjs/sheets
import { ScrollCommand, SetScrollRelativeCommand } from '../../../commands/commands/set-scroll.command';
import type { IExpandSelectionCommandParams } from '../../../commands/commands/set-selection.command';
import { ExpandSelectionCommand, MoveSelectionCommand, MoveSelectionEnterAndTabCommand } from '../../../commands/commands/set-selection.command';
-import type { IScrollManagerParam, IScrollManagerSearchParam } from '../../../services/scroll-manager.service';
+import type { IScrollState, IScrollStateSearchParam, IViewportScrollState } from '../../../services/scroll-manager.service';
import { SheetScrollManagerService } from '../../../services/scroll-manager.service';
import type { ISheetSkeletonManagerParam } from '../../../services/sheet-skeleton-manager.service';
import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';
@@ -82,7 +81,6 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
this._initCommandListener();
this._initScrollEventListener();
this._initPointerScrollEvent();
- this._scrollInfo$Handler();
this._initSkeletonListener();
}
@@ -160,54 +158,90 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
return snapshot.freeze;
}
+ // eslint-disable-next-line max-lines-per-function
private _initScrollEventListener() {
- const scene = this._getSheetObject()?.scene;
+ const { scene } = this._context;
if (scene == null) return;
const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
if (!viewportMain) return;
+ //#region scrollInfo$ subscriber ---> viewport.scrollTo
+ this.disposeWithMe(
+ toDisposable(
+ // wheel event --> set-scroll.command('sheet.operation.set-scroll') --> scroll.operation.ts -->
+ // scrollManagerService.setScrollInfoAndEmitEvent ---> scrollManagerService.setScrollInfo(raw value, may be negative) &&
+ // _notifyCurrentScrollInfo
+ this._scrollManagerService.rawScrollInfo$.subscribe((rawScrollInfo: Nullable<IScrollState>) => {
+ if (rawScrollInfo == null) {
+ viewportMain.scrollToViewportPos({
+ viewportScrollX: 0,
+ viewportScrollY: 0,
+ });
+ return;
+ }
+
+ const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
+ if (!skeleton) return;
+
+ // data source: scroll-manager.service.ts@_scrollInfo
+ const { sheetViewStartRow, sheetViewStartColumn, offsetX, offsetY } = rawScrollInfo;
+
+ const { startX, startY } = skeleton.getCellByIndexWithNoHeader(
+ sheetViewStartRow,
+ sheetViewStartColumn
+ );
+
+ // viewportScrollXByEvent is not same as viewportScrollX, by event, the value may be negative, or over max
+ const viewportScrollX = startX + offsetX;
+ const viewportScrollY = startY + offsetY;
+
+ // const config = viewportMain.transViewportScroll2ScrollValue(viewportScrollXByEvent, viewportScrollYByEvent);
+ viewportMain.scrollToViewportPos({ viewportScrollX, viewportScrollY });
+ })
+ )
+ );
+ //#endregion
+
+ //#region viewport.onScrollAfter$ --> setScrollInfoToCurrSheet & validViewportScrollInfo$
this.disposeWithMe(
- // set scrollInfo, the event is triggered in viewport@_scrollTo
viewportMain.onScrollAfter$.subscribeEvent((scrollAfterParam: IScrollObserverParam) => {
+ if (!scrollAfterParam) return;
const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
- if (skeleton == null) {
- return;
- }
-
+ if (skeleton == null) return;
const sheetObject = this._getSheetObject();
- if (skeleton == null || sheetObject == null) {
- return;
- }
+ if (skeleton == null || sheetObject == null) return;
+
+ const { viewportScrollX, viewportScrollY, scrollX, scrollY } = scrollAfterParam;
- const { viewportScrollX = 0, viewportScrollY = 0 } = scrollAfterParam;
- // console.log('onScrollAfter$', viewportScrollY);
// according to the actual scroll position, the most suitable row, column and offset combination is recalculated.
const { row, column, rowOffset, columnOffset } = skeleton.getDecomposedOffset(
viewportScrollX,
viewportScrollY
);
- // lastestScrollInfo derived from viewportScrollX, viewportScrollY from onScrollAfter$
- const lastestScrollInfo: IScrollManagerParam = {
+ const scrollInfo = {
sheetViewStartRow: row,
sheetViewStartColumn: column,
offsetX: columnOffset,
offsetY: rowOffset,
};
- // console.log('lastestScrollInfo', viewportScrollY, lastestScrollInfo);
- this._scrollManagerService.justSetScrollInfoToCurrSheet(lastestScrollInfo);
+ // lastestScrollInfo derived from viewportScrollX, viewportScrollY from onScrollAfter$
+ this._scrollManagerService.setScrollStateToCurrSheet(scrollInfo);
this._scrollManagerService.validViewportScrollInfo$.next({
- scrollX: scrollAfterParam.scrollX || 0,
- scrollY: scrollAfterParam.scrollY || 0,
- viewportScrollX: scrollAfterParam.viewportScrollX || 0,
- viewportScrollY: scrollAfterParam.viewportScrollY || 0,
+ ...scrollInfo,
+ scrollX,
+ scrollY,
+ viewportScrollX,
+ viewportScrollY,
});
// snapshot is diff by diff people!
// this._scrollManagerService.setScrollInfoToSnapshot({ ...lastestScrollInfo, viewportScrollX, viewportScrollY });
})
);
+ //#endregion
+ //#region scroll by bar
this.disposeWithMe(
viewportMain.onScrollByBar$.subscribeEvent((param) => {
const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
@@ -236,54 +270,7 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
});
})
);
- }
-
- /**
- * for row & col selection.
- * x value of row seleciton controlPoints is always half of viewport wide.
- * y value of col selection controlPoints is always half of viewport height.
- *
- */
- private _scrollInfo$Handler() {
- const { unitId } = this._context;
- const scene = this._renderManagerService.getRenderById(unitId)?.scene;
- if (!scene) return;
- const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
- if (!viewportMain) return;
-
- this.disposeWithMe(
- toDisposable(
- // wheel event --> set-scroll.command('sheet.operation.set-scroll') --> scroll.operation.ts --> scrollManagerService.setScrollInfo(raw value, may be negative) --> scrollInfo$.next --> current fn() --> viewport.scrollTo
- // --> onScrollAfterObserver.notify ---> scrollManagerService.setScrollInfo again!(valid scroll value)
- this._scrollManagerService.rawScrollInfo$.subscribe((param) => {
- if (param == null) {
- viewportMain.scrollTo({
- x: 0,
- y: 0,
- });
- return;
- }
-
- const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
- if (!skeleton) return;
-
- // data source: scroll-manager.service.ts@_scrollInfo
- const { sheetViewStartRow, sheetViewStartColumn, offsetX, offsetY } = param;
-
- const { startX, startY } = skeleton.getCellByIndexWithNoHeader(
- sheetViewStartRow,
- sheetViewStartColumn
- );
-
- // viewportScrollXByEvent is not same as viewportScrollX, by event, the value may be negative, or over max
- const viewportScrollXByEvent = startX + offsetX;
- const viewportScrollYByEvent = startY + offsetY;
-
- const config = viewportMain.transViewportScroll2ScrollValue(viewportScrollXByEvent, viewportScrollYByEvent);
- viewportMain.scrollTo(config);
- })
- )
- );
+ //#endregion
}
private _initSkeletonListener() {
@@ -292,19 +279,22 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
if (param == null) {
return;
}
- this._scrollManagerService.setSearchParam(param as unknown as IScrollManagerSearchParam);
+ const scrollParam = { unitId: param.unitId, sheetId: param.sheetId } as IScrollStateSearchParam;
+ this._scrollManagerService.setSearchParam(scrollParam);
const sheetObject = this._getSheetObject();
if (!sheetObject) return;
const scene = sheetObject.scene;
const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
- const currScrollInfo = this._scrollManagerService.getScrollInfoByParam(param as unknown as IScrollManagerSearchParam);
+ const currScrollInfo = this._scrollManagerService.getScrollStateByParam(scrollParam);
+ const { viewportScrollX, viewportScrollY } = this._scrollManagerService.calcViewportScrollFromRowColOffset(currScrollInfo as unknown as Nullable<IViewportScrollState>);
if (viewportMain) {
- // if (currScrollInfo) {
- viewportMain.viewportScrollX = currScrollInfo?.viewportScrollX || 0;
- viewportMain.viewportScrollY = currScrollInfo?.viewportScrollY || 0;
- // }
- // _updateSceneSize --> scene@transformByState --> viewport@resizeCanvas
- // --> viewport@scroll --> viewport onScrollAfter$
+ if (currScrollInfo) {
+ viewportMain.viewportScrollX = viewportScrollX;
+ viewportMain.viewportScrollY = viewportScrollY;
+ } else {
+ viewportMain.viewportScrollX = 0;
+ viewportMain.viewportScrollY = 0;
+ }
this._updateSceneSize(param as unknown as ISheetSkeletonManagerParam);
}
})));
@@ -317,7 +307,7 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
private _initPointerScrollEvent() {
const sheetObject = this._getSheetObject();
if (!sheetObject) return;
- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ // const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const scrollManagerService = this._scrollManagerService;
const scene = sheetObject.scene;
@@ -342,24 +332,6 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
this._commandService.executeCommand(SetScrollRelativeCommand.id, { offsetY, offsetX });
}
- const _currentScroll: Readonly<Nullable<IScrollManagerParam>> = scrollManagerService.getCurrentScrollInfo();
- // const { unitId } = this._context;
- // const sheetId = workbook.getActiveSheet()!.getSheetId();
- // const {
- // sheetViewStartRow = 0,
- // sheetViewStartColumn = 0,
- // offsetX: currentOffsetX = 0,
- // offsetY: currentOffsetY = 0,
- // } = currentScroll || {};
- // scrollManagerService.setScrollInfoAndEmitEvent({
- // unitId,
- // sheetId,
- // sheetViewStartRow, // + ySplit,
- // sheetViewStartColumn, // + xSplit,
- // offsetX: currentOffsetX + velocity.x, // currentOffsetX + offsetX may be negative or over max
- // offsetY: currentOffsetY + velocity.y,
- // });
-
if (Math.abs(velocity.x) > 1 || Math.abs(velocity.y) > 1) {
scrollInertiaAnimationID = requestAnimationFrame(pointerScrollInertia);
} else {
@@ -401,25 +373,7 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
}
// get scrollInfo from packages/sheets-ui/src/commands/commands/set-scroll.command.ts
- const _currentScroll = scrollManagerService.getCurrentScrollInfo();
- // const {
- // sheetViewStartRow = 0,
- // sheetViewStartColumn = 0,
- // offsetX: currentOffsetX = 0,
- // offsetY: currentOffsetY = 0,
- // } = currentScroll || {};
- // console.log('spreadsheet into moving', deltaX, deltaY, currentOffsetX, currentOffsetY);
-
- // scrollManagerService.setScrollInfoAndEmitEvent({
- // unitId,
- // sheetId,
- // sheetViewStartRow, // + ySplit,
- // sheetViewStartColumn, // + xSplit,
- // offsetX: currentOffsetX + deltaX, // currentOffsetX + offsetX may be negative or over max
- // offsetY: currentOffsetY + deltaY,
- // });
- // console.log('before set scrollInfo', currentOffsetY, deltaY);
- // console.log('after set scrollInfo', scrollManagerService.getCurrentScrollInfo());
+ const _currentScroll = scrollManagerService.getCurrentScrollState();
lastPointerPos.x = e.offsetX;
lastPointerPos.y = e.offsetY;
@@ -427,14 +381,14 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
state.stopPropagation();
});
- spreadsheet.onPointerUp$.subscribeEvent((evt: IPointerEvent | IMouseEvent, state) => {
+ spreadsheet.onPointerUp$.subscribeEvent((_evt: IPointerEvent | IMouseEvent) => {
_pointerScrolling = false;
scrollInertiaAnimationID = requestAnimationFrame(pointerScrollInertia);
});
// trigger by scene.input-manager@_onPointerMove because currObject has changed
spreadsheet.onPointerLeave$.subscribeEvent(() => {
- // this._pointerScrolling = false;
+ _pointerScrolling = false;
});
spreadsheet.onPointerOut$.subscribeEvent(() => {
_pointerScrolling = false;
@@ -624,7 +578,7 @@ export class MobileSheetsScrollRenderController extends Disposable implements IR
if (startSheetViewRow === undefined && startSheetViewColumn === undefined) return false;
- const { offsetX, offsetY } = this._scrollManagerService.getCurrentScrollInfo() || {};
+ const { offsetX, offsetY } = this._scrollManagerService.getCurrentScrollState() || {};
return this._commandService.syncExecuteCommand(ScrollCommand.id, {
sheetViewStartRow: startSheetViewRow,
sheetViewStartColumn: startSheetViewColumn,
diff --git a/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts
index f76a6f1941..18a2ebd82f 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts
@@ -30,7 +30,7 @@ import { getSelectionsService, ScrollToCellOperation } from '@univerjs/sheets';
import { ScrollCommand } from '../../commands/commands/set-scroll.command';
import type { IExpandSelectionCommandParams } from '../../commands/commands/set-selection.command';
import { ExpandSelectionCommand, MoveSelectionCommand, MoveSelectionEnterAndTabCommand } from '../../commands/commands/set-selection.command';
-import type { IScrollManagerParam, IScrollManagerSearchParam } from '../../services/scroll-manager.service';
+import type { IScrollState, IScrollStateSearchParam, IViewportScrollState } from '../../services/scroll-manager.service';
import { SheetScrollManagerService } from '../../services/scroll-manager.service';
import type { ISheetSkeletonManagerParam } from '../../services/sheet-skeleton-manager.service';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
@@ -78,7 +78,6 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
private _init() {
this._initCommandListener();
this._initScrollEventListener();
- this._scrollSubscribeBinding();
this._initSkeletonListener();
}
@@ -156,13 +155,50 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
return snapshot.freeze;
}
+ // eslint-disable-next-line max-lines-per-function
private _initScrollEventListener() {
- const scene = this._getSheetObject()?.scene;
+ const { scene } = this._context;
if (scene == null) return;
const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
if (!viewportMain) return;
+ //#region scrollInfo$ subscriber ---> viewport.scrollTo
+ this.disposeWithMe(
+ toDisposable(
+ // wheel event --> set-scroll.command('sheet.operation.set-scroll') --> scroll.operation.ts -->
+ // scrollManagerService.setScrollInfoAndEmitEvent ---> scrollManagerService.setScrollInfo(raw value, may be negative) &&
+ // _notifyCurrentScrollInfo
+ this._scrollManagerService.rawScrollInfo$.subscribe((rawScrollInfo: Nullable<IScrollState>) => {
+ const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
+ if (!skeleton) return;
+
+ if (rawScrollInfo == null) {
+ viewportMain.scrollToViewportPos({
+ viewportScrollX: 0,
+ viewportScrollY: 0,
+ });
+ return;
+ }
+
+ // prev scrolling state from rawScrollInfo$
+ const { sheetViewStartRow, sheetViewStartColumn, offsetX, offsetY } = rawScrollInfo;
+
+ const { startX, startY } = skeleton.getCellByIndexWithNoHeader(
+ sheetViewStartRow,
+ sheetViewStartColumn
+ );
+
+ const viewportScrollX = startX + offsetX;
+ const viewportScrollY = startY + offsetY;
+
+ viewportMain.scrollToViewportPos({ viewportScrollX, viewportScrollY });
+ })
+ )
+ );
+ //#endregion
+
+ //#region viewport.onScrollAfter$ --> setScrollInfoToCurrSheet & validViewportScrollInfo$
this.disposeWithMe(
// set scrollInfo, the event is triggered in viewport@_scrollToScrollbarPos
viewportMain.onScrollAfter$.subscribeEvent((scrollAfterParam: IScrollObserverParam) => {
@@ -176,7 +212,8 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
return;
}
- const { viewportScrollX = 0, viewportScrollY = 0 } = scrollAfterParam;
+ //#region set scrollInfo with validScrollValue
+ const { viewportScrollX, viewportScrollY, scrollX, scrollY } = scrollAfterParam;
// according to the actual scroll position, the most suitable row, column and offset combination is recalculated.
const { row, column, rowOffset, columnOffset } = skeleton.getDecomposedOffset(
@@ -184,28 +221,29 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
viewportScrollY
);
- // Refresh the scroll details in the scroll manager service.
- // The raw offsetX parameter from the scroll command might be out of bounds, being either negative or exceeding the maximum value.
- // Additionally, there's no need to manually update viewportScrollXY in the latest scroll info; the _scrollManagerService's _setScrollInfo(setScrollInfoToCurrSheetWithoutNotify) method takes care of this.
- const lastestScrollInfo: IScrollManagerParam = {
+ const scrollInfo = {
sheetViewStartRow: row,
sheetViewStartColumn: column,
offsetX: columnOffset,
offsetY: rowOffset,
- viewportScrollX,
- viewportScrollY,
};
- this._scrollManagerService.justSetScrollInfoToCurrSheet(lastestScrollInfo);
+ this._scrollManagerService.setScrollStateToCurrSheet(scrollInfo);
+ //#endregion
+
this._scrollManagerService.validViewportScrollInfo$.next({
- scrollX: scrollAfterParam.scrollX || 0,
- scrollY: scrollAfterParam.scrollY || 0,
- viewportScrollX: scrollAfterParam.viewportScrollX || 0,
- viewportScrollY: scrollAfterParam.viewportScrollY || 0,
+ ...scrollInfo,
+ viewportScrollX,
+ viewportScrollY,
+ scrollX,
+ scrollY,
});
// snapshot is diff by diff people!
// this._scrollManagerService.setScrollInfoToSnapshot({ ...lastestScrollInfo, viewportScrollX, viewportScrollY });
})
);
+ //#endregion
+
+ //#region scroll by bar
this.disposeWithMe(
viewportMain.onScrollByBar$.subscribeEvent((param) => {
const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
@@ -234,47 +272,7 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
});
})
);
- }
-
- private _scrollSubscribeBinding() {
- const { scene } = this._context;
- if (!scene) return;
- const viewMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
- if (!viewMain) return;
-
- this.disposeWithMe(
- toDisposable(
- // wheel event --> set-scroll.command('sheet.operation.set-scroll') --> scroll.operation.ts --> scrollManagerService.setScrollInfo(raw value, may be negative) --> scrollInfo$.next --> current fn() --> viewport.scrollTo
- // --> onScrollAfterObserver.notify ---> scrollManagerService.setScrollInfo again!(valid scroll value)
- this._scrollManagerService.rawScrollInfo$.subscribe((param) => {
- const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
- if (!skeleton) return;
-
- if (param == null) {
- viewMain.scrollTo({
- x: 0,
- y: 0,
- });
- return;
- }
-
- // data source: scroll-manager.service.ts@_scrollInfo
- const { sheetViewStartRow, sheetViewStartColumn, offsetX, offsetY } = param;
-
- const { startX, startY } = skeleton.getCellByIndexWithNoHeader(
- sheetViewStartRow,
- sheetViewStartColumn
- );
-
- // viewportScrollXByEvent is not same as viewportScrollX, by event, the value may be negative, or over max
- const viewportScrollXByEvent = startX + offsetX;
- const viewportScrollYByEvent = startY + offsetY;
-
- const config = viewMain.transViewportScroll2ScrollValue(viewportScrollXByEvent, viewportScrollYByEvent);
- viewMain.scrollTo({ x: config.x, y: config.y });
- })
- )
- );
+ //#endregion
}
private _initSkeletonListener() {
@@ -283,15 +281,22 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
if (param == null) {
return;
}
- this._scrollManagerService.setSearchParam(param as unknown as IScrollManagerSearchParam);
+ const scrollParam = { unitId: param.unitId, sheetId: param.sheetId } as IScrollStateSearchParam;
+ this._scrollManagerService.setSearchParam(scrollParam);
const sheetObject = this._getSheetObject();
if (!sheetObject) return;
const scene = sheetObject.scene;
const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
- const currScrollInfo = this._scrollManagerService.getScrollInfoByParam(param as unknown as IScrollManagerSearchParam);
+ const currScrollInfo = this._scrollManagerService.getScrollStateByParam(scrollParam);
+ const { viewportScrollX, viewportScrollY } = this._scrollManagerService.calcViewportScrollFromRowColOffset(currScrollInfo as unknown as Nullable<IViewportScrollState>);
if (viewportMain) {
- viewportMain.viewportScrollX = currScrollInfo?.viewportScrollX || 0;
- viewportMain.viewportScrollY = currScrollInfo?.viewportScrollY || 0;
+ if (currScrollInfo) {
+ viewportMain.viewportScrollX = viewportScrollX;
+ viewportMain.viewportScrollY = viewportScrollY;
+ } else {
+ viewportMain.viewportScrollX = 0;
+ viewportMain.viewportScrollY = 0;
+ }
this._updateSceneSize(param as unknown as ISheetSkeletonManagerParam);
}
})));
@@ -478,7 +483,7 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
if (startSheetViewRow === undefined && startSheetViewColumn === undefined) return false;
- const { offsetX, offsetY } = this._scrollManagerService.getCurrentScrollInfo() || {};
+ const { offsetX, offsetY } = this._scrollManagerService.getCurrentScrollState() || {};
return this._commandService.syncExecuteCommand(ScrollCommand.id, {
sheetViewStartRow: startSheetViewRow,
sheetViewStartColumn: startSheetViewColumn,
diff --git a/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts
index 711082a088..662edd5240 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts
@@ -423,10 +423,10 @@ export class SheetRenderController extends RxDisposable implements IRenderModule
const isLimitedStore = viewMain.limitedScroll();
if (evt.inputIndex === PointerInput.MouseWheelX) {
const deltaFactor = Math.abs(evt.deltaX);
- // let magicNumber = deltaFactor < 40 ? 2 : deltaFactor < 80 ? 3 : 4;
+ // let magicNumber = deltaFactor < 40 ? 2 : deltaFactor < 80 ? 3 : 4;
const scrollNum = deltaFactor;
- // 展示更多右侧内容,evt.deltaX > 0
- // 展示更多左侧内容, evt.deltaX < 0
+ // show more content on the right,evt.deltaX > 0
+ // show more content on the left, evt.deltaX < 0
if (evt.deltaX > 0) {
offsetX = scrollNum;
} else {
@@ -434,7 +434,7 @@ export class SheetRenderController extends RxDisposable implements IRenderModule
}
this._commandService.executeCommand(SetScrollRelativeCommand.id, { offsetX });
- // 临界点时执行浏览器行为
+ // 临界点时执行浏览器行为
if (scene.getParent().classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {
if (!isLimitedStore?.isLimitedX) {
state.stopPropagation();
diff --git a/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts b/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts
index 7c30b4662e..d79b2f97a0 100644
--- a/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts
+++ b/packages/sheets-ui/src/mobile-sheets-ui-plugin.ts
@@ -100,7 +100,6 @@ export class UniverSheetsMobileUIPlugin extends Plugin {
[IAutoFillService, { useClass: AutoFillService }],
[SheetPrintInterceptorService],
- [SheetScrollManagerService],
// This would be removed from global injector and moved into RenderUnit provider.
// [SheetSkeletonManagerService],
[ISheetSelectionRenderService, { useClass: MobileSheetsSelectionRenderService }],
@@ -161,6 +160,7 @@ export class UniverSheetsMobileUIPlugin extends Plugin {
[SheetSkeletonManagerService],
[SheetRenderController],
[ISheetSelectionRenderService, { useClass: MobileSheetsSelectionRenderService }],
+ [SheetScrollManagerService],
] as Dependency[]).forEach((renderDep) => {
this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, renderDep));
});
diff --git a/packages/sheets-ui/src/services/drag-manager.service.ts b/packages/sheets-ui/src/services/drag-manager.service.ts
index 5399b8fd0b..7dc4ff5606 100644
--- a/packages/sheets-ui/src/services/drag-manager.service.ts
+++ b/packages/sheets-ui/src/services/drag-manager.service.ts
@@ -80,7 +80,7 @@ export class DragManagerService extends Disposable {
const skeletonParam = currentRender.with(SheetSkeletonManagerService).getCurrent();
const scrollManagerService = currentRender.with(SheetScrollManagerService);
- const scrollInfo = scrollManagerService.getCurrentScrollInfo();
+ const scrollInfo = scrollManagerService.getCurrentScrollState();
if (!skeletonParam || !scrollInfo || !currentRender) return;
diff --git a/packages/sheets-ui/src/services/hover-manager.service.ts b/packages/sheets-ui/src/services/hover-manager.service.ts
index 85f699b08b..e126f3260a 100644
--- a/packages/sheets-ui/src/services/hover-manager.service.ts
+++ b/packages/sheets-ui/src/services/hover-manager.service.ts
@@ -86,7 +86,7 @@ export class HoverManagerService extends Disposable {
const currentRender = this._renderManagerService.getRenderById(workbook.getUnitId());
const skeletonParam = currentRender?.with(SheetSkeletonManagerService).getWorksheetSkeleton(worksheet.getSheetId());
const scrollManagerService = currentRender?.with(SheetScrollManagerService);
- const scrollInfo = scrollManagerService?.getCurrentScrollInfo();
+ const scrollInfo = scrollManagerService?.getCurrentScrollState();
if (!skeletonParam || !scrollInfo || !currentRender) return;
diff --git a/packages/sheets-ui/src/services/scroll-manager.service.ts b/packages/sheets-ui/src/services/scroll-manager.service.ts
index af68f54a77..198af6ee54 100644
--- a/packages/sheets-ui/src/services/scroll-manager.service.ts
+++ b/packages/sheets-ui/src/services/scroll-manager.service.ts
@@ -20,14 +20,7 @@ import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
import { Inject } from '@univerjs/core';
import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
-export interface IViewportScrollState {
- scrollX: number;
- scrollY: number;
- viewportScrollX: number;
- viewportScrollY: number;
-}
-
-export interface IScrollManagerParam {
+export interface IScrollState {
/**
* offsetX from startRow, coordinate same as viewport, not scrollbar
*/
@@ -44,27 +37,23 @@ export interface IScrollManagerParam {
* current start column in viewport visible area
*/
sheetViewStartColumn: number;
+}
- /**
- * overall offsetX from sheet cotent topleft, should be same as startRow * rowHeight + offsetY
- * coordinate same as viewport, not scrollbar
- */
- viewportScrollX?: number;
- /**
- * overall offsetY from sheet content topleft, should be same as startColumn * columnWidth + offsetX
- * coordinate same as viewport, not scrollbar
- */
- viewportScrollY?: number;
+export interface IViewportScrollState extends IScrollState {
+ scrollX: number;
+ scrollY: number;
+ viewportScrollX: number;
+ viewportScrollY: number;
}
-export interface IScrollManagerSearchParam {
+export interface IScrollStateSearchParam {
unitId: string;
sheetId: string;
}
-export interface IScrollManagerWithSearchParam extends IScrollManagerSearchParam, IScrollManagerParam {}
+export interface IScrollStateWithSearchParam extends IScrollStateSearchParam, IScrollState { }
-export type IScrollInfo = Map<string, Map<string, IScrollManagerParam>>;
+export type IScrollStateMap = Map<string, Map<string, IScrollState>>;
/**
* This service manages and sets the virtual scrolling of the canvas content area.
@@ -76,11 +65,11 @@ export class SheetScrollManagerService implements IRenderModule {
/**
* a map holds all scroll info for each sheet
*/
- private readonly _scrollInfoMap: IScrollInfo = new Map();
+ private readonly _scrollStateMap: IScrollStateMap = new Map();
/**
* a subject for current sheet scrollInfo
*/
- private readonly _scrollInfo$ = new BehaviorSubject<Nullable<IScrollManagerParam>>(null);
+ private readonly _scrollInfo$ = new BehaviorSubject<Nullable<IScrollState>>(null);
/**
* a subject for current sheet scrollInfo ( events, ex wheel event and point events add deltaXY to rawScrollInfo$)
*/
@@ -88,6 +77,8 @@ export class SheetScrollManagerService implements IRenderModule {
/**
* a subject for current valid scrollInfo, viewport@_scrollCore would limit rawScrollInfo$ exclude negative value or over max value.
* use this subject not rawScrollInfo$ when get scrolling state of viewport.
+ * The value of this subject is the same as the value of onScrollAfter$
+ *
*/
readonly validViewportScrollInfo$ = new BehaviorSubject<Nullable<IViewportScrollState>>(null);
/**
@@ -95,7 +86,7 @@ export class SheetScrollManagerService implements IRenderModule {
* use this subject not rawScrollInfo$ when get scrolling state of viewport.
*/
- private _searchParamForScroll: Nullable<IScrollManagerSearchParam> = null;
+ private _searchParamForScroll: Nullable<IScrollStateSearchParam> = null;
constructor(
private readonly _context: IRenderContext<Workbook>,
@@ -108,99 +99,78 @@ export class SheetScrollManagerService implements IRenderModule {
this._scrollInfo$.complete();
}
- setSearchParam(param: IScrollManagerSearchParam) {
+ setSearchParam(param: IScrollStateSearchParam) {
this._searchParamForScroll = param;
}
- setSearchParamAndRefresh(param: IScrollManagerSearchParam) {
+ setSearchParamAndRefresh(param: IScrollStateSearchParam) {
this._searchParamForScroll = param;
- this._notifyCurrentScrollInfo(param);
+ this._scrollStateNext(param);
}
- getScrollInfoByParam(param: IScrollManagerSearchParam): Readonly<Nullable<IScrollManagerParam>> {
+ getScrollStateByParam(param: IScrollStateSearchParam): Readonly<Nullable<IScrollState>> {
return this._getCurrentScroll(param);
}
- getCurrentScrollInfo(): Readonly<Nullable<IScrollManagerParam>> {
+ getCurrentScrollState(): Readonly<Nullable<IScrollState>> {
return this._getCurrentScroll(this._searchParamForScroll);
}
- setScrollInfoToSnapshot(scrollInfo: IScrollManagerParam) {
- if (this._searchParamForScroll == null) {
- return;
- }
-
- const { sheetId } = this._searchParamForScroll;
- const workbook = this._context.unit;
- const worksheet = workbook?.getSheetBySheetId(sheetId);
- const snapshot = worksheet?.getConfig();
- if (snapshot) {
- snapshot.scrollLeft = scrollInfo.viewportScrollX || 0;
- snapshot.scrollTop = scrollInfo.viewportScrollY || 0;
- }
- }
-
/**
- * set scrollInfo by cmd,
- * call _setScrollInfo twice after one scrolling.
- * first time set scrollInfo by scrollOperation, but offsetXY is derived from scroll event.
- * second time set scrollInfo by viewport.scrollTo(scrol.render-controller --> onScrollAfterObserver), this time offsetXY has been limited.
- *
- * wheelevent --> sheetCanvasView --> set-scroll.command('sheet.command.set-scroll-relative') --> scrollOperation --> scrollManagerService.setScrollInfo --> scrollInfo$.next --> [email protected] & notify -->
- * scroll.render-controller@onScrollAfter$ --> this.setScrollInfoToCurrSheetWithoutNotify --> this._setScrollInfo({}, false)
- * call _setScrollInfo again, a loop!, so we should call setScrollInfoToCurrSheetWithoutNotify
+ * set scrollInfo by cmd, call by scroll operation
* @param param
*/
- setScrollInfoAndEmitEvent(param: IScrollManagerWithSearchParam) {
- this._setScrollInfo(param, true);
+ setScrollInfoAndEmitEvent(param: IScrollStateWithSearchParam) {
+ this._setScrollState(param);
+ this._scrollStateNext(param);
}
- setScrollInfoToCurrSheetAndEmitEvent(scrollInfo: IScrollManagerParam) {
+ /**
+ * call by set frozen
+ * @param scrollInfo
+ */
+ setScrollStateToCurrSheetAndEmitEvent(scrollInfo: IScrollState) {
if (this._searchParamForScroll == null) {
return;
}
- this._setScrollInfo({
+ this._setScrollState({
...this._searchParamForScroll,
...scrollInfo,
- }, true);
+ });
+ this._scrollStateNext(this._searchParamForScroll);
}
/**
- * call _setScrollInfo but no _scrollInfo$.next
+ * set _scrollStateMap but no _scrollInfo$.next
* @param scroll
*/
- justSetScrollInfoToCurrSheet(scroll: IScrollManagerParam) {
+ setScrollStateToCurrSheet(scroll: IScrollState) {
if (this._searchParamForScroll == null) {
return;
}
- this._setScrollInfo(
- {
- ...this._searchParamForScroll,
- ...scroll,
- },
- false
- );
+ this._setScrollState({
+ ...this._searchParamForScroll,
+ ...scroll,
+ });
}
clear(): void {
if (this._searchParamForScroll == null) {
return;
}
- this._clearByParam(this._searchParamForScroll);
+ this._clearByParamAndNotify(this._searchParamForScroll);
}
- calcViewportScrollFromRowColOffset(scrollInfo: IScrollManagerWithSearchParam) {
- const { unitId } = scrollInfo;
- const workbookScrollInfo = this._scrollInfoMap.get(unitId);
- if (workbookScrollInfo == null) {
+ calcViewportScrollFromRowColOffset(scrollInfo: Nullable<IViewportScrollState>) {
+ if (!scrollInfo) {
return {
- scrollTop: 0,
- scrollLeft: 0,
+ viewportScrollX: 0,
+ viewportScrollY: 0,
};
}
- // const scrollInfo = workbookScrollInfo.get(param.sheetId);
+
let { sheetViewStartColumn, sheetViewStartRow, offsetX, offsetY } = scrollInfo;
sheetViewStartRow = sheetViewStartRow || 0;
offsetY = offsetY || 0;
@@ -208,41 +178,34 @@ export class SheetScrollManagerService implements IRenderModule {
const skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();
const rowAcc = skeleton?.rowHeightAccumulation[sheetViewStartRow - 1] || 0;
const colAcc = skeleton?.columnWidthAccumulation[sheetViewStartColumn - 1] || 0;
- const overallScrollX = colAcc + offsetX;
- const overallScrollY = rowAcc + offsetY;
+ const viewportScrollX = colAcc + offsetX;
+ const viewportScrollY = rowAcc + offsetY;
return {
- overallScrollX,
- overallScrollY,
+ viewportScrollX,
+ viewportScrollY,
};
}
- private _setScrollInfo(scrollInfo: IScrollManagerWithSearchParam, notifyScrollInfo = true): void {
+ private _setScrollState(scrollInfo: IScrollStateWithSearchParam): void {
const { unitId, sheetId, sheetViewStartColumn, sheetViewStartRow, offsetX, offsetY } = scrollInfo;
- if (!this._scrollInfoMap.has(unitId)) {
- this._scrollInfoMap.set(unitId, new Map());
+ if (!this._scrollStateMap.has(unitId)) {
+ this._scrollStateMap.set(unitId, new Map());
}
- const worksheetScrollInfoMap = this._scrollInfoMap.get(unitId)!;
- const overallOffsetByRowColOffset = this.calcViewportScrollFromRowColOffset(scrollInfo);
- const newScrollInfo: IScrollManagerParam = {
+ const worksheetScrollInfoMap = this._scrollStateMap.get(unitId)!;
+ const newScrollInfo: IScrollState = {
sheetViewStartRow,
sheetViewStartColumn,
offsetX,
offsetY,
- viewportScrollX: overallOffsetByRowColOffset.overallScrollX,
- viewportScrollY: overallOffsetByRowColOffset.overallScrollY,
};
- // console.log('newScrollInfo', newScrollInfo);
worksheetScrollInfoMap.set(sheetId, newScrollInfo);
- if (notifyScrollInfo === true) {
- this._notifyCurrentScrollInfo({ unitId, sheetId });
- }
}
- private _clearByParam(param: IScrollManagerSearchParam): void {
- this._setScrollInfo({
+ private _clearByParamAndNotify(param: IScrollStateSearchParam): void {
+ this._setScrollState({
...param,
sheetViewStartRow: 0,
sheetViewStartColumn: 0,
@@ -250,21 +213,21 @@ export class SheetScrollManagerService implements IRenderModule {
offsetY: 0,
});
- this._notifyCurrentScrollInfo(param);
+ this._scrollStateNext(param);
}
- private _getCurrentScroll(param: Nullable<IScrollManagerSearchParam>) {
+ private _getCurrentScroll(param: Nullable<IScrollStateSearchParam>) {
if (param == null) {
return;
}
const { unitId, sheetId } = param;
- return this._scrollInfoMap.get(unitId)?.get(sheetId);
+ return this._scrollStateMap.get(unitId)?.get(sheetId);
}
- private _notifyCurrentScrollInfo(param: IScrollManagerSearchParam): void {
+ private _scrollStateNext(param: IScrollStateSearchParam): void {
const scrollInfo = this._getCurrentScroll(param);
- // subscriber is scrollManagerService.rawScrollInfo$.subscribe
+ // subscriber can be found in scrollManagerService.rawScrollInfo$.subscribe
this._scrollInfo$.next(scrollInfo);
}
}
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 e343ed80c8..01167de847 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
@@ -576,16 +576,16 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
if (moveOffsetY < viewportMain.top && (selection?.endRow ?? 0) < (freeze?.startRow ?? 0)) {
scrollOffsetY = viewportMain.top;
} else if (isCrossingY && yCrossTime % 2 === 1) {
- viewportMain.scrollTo({
- y: 0,
+ viewportMain.scrollToViewportPos({
+ viewportScrollY: 0,
});
}
} else if (startKey === SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT) {
if (moveOffsetX < viewportMain.left && (selection?.endColumn ?? 0) < (freeze?.startColumn ?? 0)) {
scrollOffsetX = viewportMain.left;
} else if (isCrossingX && xCrossTime % 2 === 1) {
- viewportMain.scrollTo({
- x: 0,
+ viewportMain.scrollToViewportPos({
+ viewportScrollX: 0,
});
}
} else if (startKey === endKey) {
@@ -627,7 +627,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
const shouldResetY = startXY.y !== endXY.y && isCrossingY && yCrossTime % 2 === 1;
if (shouldResetX || shouldResetY) {
- viewportMain.scrollTo({
+ viewportMain.scrollToBarPos({
x: shouldResetX ? startXY.x : undefined,
y: shouldResetY ? startXY.y : undefined,
});
diff --git a/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts b/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts
index c67ac422a7..67c477db82 100644
--- a/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts
+++ b/packages/sheets-ui/src/services/selection/mobile-selection-render.service.ts
@@ -692,8 +692,6 @@ export class MobileSheetsSelectionRenderService extends BaseSelectionRenderServi
const { scene } = this._context;
const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
if (!viewportMain) return;
- // const sub = this._scrollManagerService.scrollInfo$.subscribe((param) => {
- // const sub = viewportMain.onScrollAfter$.subscribeEvent((param) => {
const sub = this._scrollManagerService.validViewportScrollInfo$.subscribe((param) => {
if (param == null) {
return;
diff --git a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
index ab8b67ec9c..59fc9fd83e 100644
--- a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
+++ b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
@@ -880,7 +880,7 @@ export class SelectionShapeExtension {
}
if (this._isSelectionInViewport(movingRange, currentViewport)) {
- viewportMain.scrollTo({
+ viewportMain.scrollToBarPos({
x: scrollTimer.scrollTimerType === ScrollTimerType.X ? 0 : undefined,
y: scrollTimer.scrollTimerType === ScrollTimerType.Y ? 0 : undefined,
});
diff --git a/packages/sheets-ui/src/views/header-resize-shape.ts b/packages/sheets-ui/src/views/header-resize-shape.ts
index 2e3f76f076..a38331ce9d 100644
--- a/packages/sheets-ui/src/views/header-resize-shape.ts
+++ b/packages/sheets-ui/src/views/header-resize-shape.ts
@@ -32,14 +32,16 @@ export const HEADER_MENU_SHAPE_RECT_BACKGROUND_FILL = 'rgba(120, 120, 120, 0.01)
export const HEADER_MENU_SHAPE_RECT_FILL = 'rgb(68, 71, 70)';
-export const HEADER_MENU_SHAPE_WIDTH_HEIGHT = 12;
+export const HEADER_MENU_SHAPE_SIZE = 12;
+
+export const MAX_HEADER_MENU_SHAPE_SIZE = 44;
export const HEADER_MENU_SHAPE_THUMB_SIZE = 4;
export class HeaderMenuResizeShape<
T extends IHeaderMenuShapeResizeProps = IHeaderMenuShapeResizeProps
> extends Shape<T> {
- private _size: number = HEADER_MENU_SHAPE_WIDTH_HEIGHT;
+ private _size: number = HEADER_MENU_SHAPE_SIZE;
private _color: string = HEADER_MENU_SHAPE_RECT_FILL;
@@ -75,7 +77,7 @@ export class HeaderMenuResizeShape<
const scale = Math.max(scaleX, scaleY);
- const HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE = HEADER_MENU_SHAPE_WIDTH_HEIGHT / scale;
+ const HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE = HEADER_MENU_SHAPE_SIZE / scale;
const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = HEADER_MENU_SHAPE_THUMB_SIZE / scale;
@@ -135,13 +137,13 @@ export class HeaderMenuResizeShape<
if (this.mode === HEADER_RESIZE_SHAPE_TYPE.VERTICAL) {
this.transformByState({
- width: HEADER_MENU_SHAPE_WIDTH_HEIGHT,
+ width: HEADER_MENU_SHAPE_SIZE,
height: this.size,
});
} else {
this.transformByState({
width: this.size,
- height: HEADER_MENU_SHAPE_WIDTH_HEIGHT,
+ height: HEADER_MENU_SHAPE_SIZE,
});
}
diff --git a/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts b/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
index 6981523072..2fdfa38a18 100644
--- a/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
+++ b/packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
@@ -318,7 +318,7 @@ export class ZenEditorController extends RxDisposable {
const viewport = scene.getViewport(DOC_VIEWPORT_KEY.VIEW_MAIN) as Viewport;
if (scrollToX !== Number.POSITIVE_INFINITY && viewport != null) {
const actualX = viewport.transScroll2ViewportScrollValue(scrollToX, 0).x;
- viewport.scrollTo({
+ viewport.scrollToBarPos({
x: actualX,
});
}
diff --git a/packages/slides/src/views/render/adaptors/docs-adaptor.ts b/packages/slides/src/views/render/adaptors/docs-adaptor.ts
index b48669239e..5b10bdd6a2 100644
--- a/packages/slides/src/views/render/adaptors/docs-adaptor.ts
+++ b/packages/slides/src/views/render/adaptors/docs-adaptor.ts
@@ -349,7 +349,7 @@ export class DocsAdaptor extends ObjectAdaptor {
if (scrollToX !== Number.POSITIVE_INFINITY && viewport != null) {
const actualX = viewport.transScroll2ViewportScrollValue(scrollToX, 0).x;
- viewport.scrollTo({
+ viewport.scrollToBarPos({
x: actualX,
});
}
diff --git a/packages/slides/src/views/render/adaptors/spreadsheet-adaptor.ts b/packages/slides/src/views/render/adaptors/spreadsheet-adaptor.ts
index 7dc49b043b..c7f2767755 100644
--- a/packages/slides/src/views/render/adaptors/spreadsheet-adaptor.ts
+++ b/packages/slides/src/views/render/adaptors/spreadsheet-adaptor.ts
@@ -204,13 +204,13 @@ export class SpreadsheetAdaptor extends ObjectAdaptor {
const { scrollX, scrollY, viewportScrollX, viewportScrollY } = param;
viewTop
- .updateScroll({
+ .updateScrollVal({
scrollX,
viewportScrollX,
});
viewLeft
- .updateScroll({
+ .updateScrollVal({
scrollY,
viewportScrollY,
});
diff --git a/packages/slides/src/views/render/canvas-view.ts b/packages/slides/src/views/render/canvas-view.ts
index e96fa3eafe..3f5cc92262 100644
--- a/packages/slides/src/views/render/canvas-view.ts
+++ b/packages/slides/src/views/render/canvas-view.ts
@@ -112,7 +112,7 @@ export class CanvasView extends RxDisposable {
const { x, y } = viewMain.transViewportScroll2ScrollValue(viewPortLeft, viewPortTop);
- viewMain.scrollTo({
+ viewMain.scrollToBarPos({
x,
y,
});