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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: selection should stop response after a popup shown (#4156)
lumixa4b38af4cdb4
diff --git a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts b/packages/docs-ui/src/services/selection/doc-selection-render.service.tsindex 8c2989d53f..a3351bf1f5 100644--- a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts+++ b/packages/docs-ui/src/services/selection/doc-selection-render.service.ts@@ -1025,7 +1025,7 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMothis.deactivate();- this._context.scene?.getEngine()?.setRemainCapture();+ this._context.scene?.getEngine()?.setCapture();}__attachScrollEvent() {@@ -1261,4 +1261,3 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMothis._onPointerDown$.complete();}}-diff --git a/packages/docs-ui/src/services/selection/text-range.ts b/packages/docs-ui/src/services/selection/text-range.tsindex 7093f5e6ae..4ff510ee8e 100644--- a/packages/docs-ui/src/services/selection/text-range.ts+++ b/packages/docs-ui/src/services/selection/text-range.ts@@ -476,8 +476,8 @@ export class TextRange implements IDocRange {}this._anchorShape = anchor;-this._scene.addObject(anchor, TEXT_RANGE_LAYER_INDEX);+ this.activeStatic();}private _setCursorList(cursorList: ITextRange[]) {diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.tsindex 2c7482d55c..f173aa9d2d 100644--- a/packages/engine-render/src/base-object.ts+++ b/packages/engine-render/src/base-object.ts@@ -676,16 +676,6 @@ export abstract class BaseObject extends Disposable {return true;}- // triggerKeyDown(evt: IKeyboardEvent) {- // // this.onKeyDownObservable.notifyObservers(evt);- // this._parent?.triggerKeyDown(evt);- // }-- // triggerKeyUp(evt: IKeyboardEvent) {- // // this.onKeyUpObservable.notifyObservers(evt);- // this._parent?.triggerKeyUp(evt);- // }-triggerPointerOut(evt: IPointerEvent | IMouseEvent) {if (!this.onPointerOut$.emitEvent(evt)?.stopPropagation) {this._parent?.triggerPointerOut(evt);@@ -718,6 +708,14 @@ export abstract class BaseObject extends Disposable {return true;}+ triggerPointerCancel(evt: IPointerEvent) {+ if (!this.onPointerEnter$.emitEvent(evt)?.stopPropagation) {+ this._parent?.triggerPointerCancel(evt);+ return false;+ }+ return true;+ }+triggerDragLeave(evt: IDragEvent | IMouseEvent) {if (!this.onDragLeave$.emitEvent(evt)?.stopPropagation) {this._parent?.triggerDragLeave(evt);diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.tsindex 070b08aa5f..a6bcc7e27d 100644--- a/packages/engine-render/src/engine.ts+++ b/packages/engine-render/src/engine.ts@@ -30,6 +30,13 @@ import { getPointerPrefix, getSizeForDom, IsSafari, requestNewFrame } from './baimport { Canvas, CanvasRenderMode } from './canvas';import { observeClientRect } from './floating/util';+export interface IEngineOption {+ elementWidth: number;+ elementHeight: number;+ dpr?: number;+ renderMode?: CanvasRenderMode;+}+export class Engine extends Disposable {renderEvenInBackground = true;@@ -41,6 +48,9 @@ export class Engine extends Disposable {readonly renderFrameTimeMetric$ = new Subject<ITimeMetric>();readonly renderFrameTags$ = new Subject<[string, any]>();+ /**+ * Pass event to scene.input-manager+ */onInputChanged$ = new EventSubject<IEvent>();onTransformChange$ = new EventSubject<ITransformChangeState>();@@ -79,8 +89,6 @@ export class Engine extends Disposable {private _renderFrameTasks = new Array<() => void>();- private _renderFunction = (_timestamp: number) => { /* empty */ };-private _requestNewFrameHandler: number = -1;/**@@ -140,10 +148,37 @@ export class Engine extends Disposable {private _unitId: string = ''; // unitId- constructor(elemWidth: number = 1, elemHeight: number = 1, pixelRatio?: number, mode?: CanvasRenderMode) {+ constructor();+ constructor(unitId: string, options?: IEngineOption);+ constructor(elemW: number, elemH: number, dpr?: number, renderMode?: CanvasRenderMode);+ constructor(...args: any[]) {super();+ let elemWidth = 1;+ let elemHeight = 1;+ let pixelRatio = 1;+ let renderMode = CanvasRenderMode.Rendering;++ if (args[0] && typeof args[0] === 'string') {+ this._unitId = args[0];+ const options = args[1] ?? {+ elemWidth: 1,+ elemHeight: 1,+ pixelRatio: 1,+ renderMode: CanvasRenderMode.Rendering,+ };+ elemWidth = options.elementWidth;+ elemHeight = options.elementHeight;+ pixelRatio = options.pixelRatio ?? 1;+ renderMode = options.renderMode ?? CanvasRenderMode.Rendering;+ } else {+ elemWidth = args[0] ?? 1;+ elemHeight = args[1] ?? 1;+ pixelRatio = args[2] ?? 1;+ renderMode = args[3] ?? CanvasRenderMode.Rendering;+ }+this._canvas = new Canvas({- mode,+ mode: renderMode,width: elemWidth,height: elemHeight,pixelRatio,@@ -153,7 +188,7 @@ export class Engine extends Disposable {this._handlePointerAction();this._handleDragAction();- if (mode !== CanvasRenderMode.Printing) {+ if (renderMode !== CanvasRenderMode.Printing) {this._matchMediaHandler();}}@@ -162,6 +197,10 @@ export class Engine extends Disposable {this._performanceMonitor = new PerformanceMonitor();}+ get unitId(): string {+ return this._unitId;+ }+get elapsedTime(): number {return Tools.now() - this._renderStartTime;}@@ -247,7 +286,7 @@ export class Engine extends Disposable {* To ensure mouse events remain bound to the host element,* preventing the events from becoming ineffective once the mouse leaves the host.*/- setRemainCapture() {+ setCapture() {try {this.getCanvasElement().setPointerCapture(this._remainCapture);} catch {@@ -380,7 +419,7 @@ export class Engine extends Disposable {if (!this._renderingQueueLaunched) {this._renderStartTime = performance.now();this._renderingQueueLaunched = true;- this._renderFunction = this._renderFunctionCore.bind(this);+ // this._renderFunction = this._renderFunctionCore.bind(this);this._requestNewFrameHandler = requestNewFrame(this._renderFunction);}}@@ -394,6 +433,31 @@ export class Engine extends Disposable {this.startRenderLoop();}+ /**+ * call itself by raf+ * Exec all function in _renderFrameTasks in _renderFrame()+ */+ private _renderFunction = (timestamp: number) => {+ let shouldRender = true;+ if (!this.renderEvenInBackground) {+ shouldRender = false;+ }++ if (shouldRender) {+ // Start new frame+ this._beginFrame(timestamp);+ // exec functions in _renderFrameTasks+ this._renderFrame(timestamp);+ this._endFrame(timestamp);+ }++ if (this._renderFrameTasks.length > 0) {+ this._requestNewFrameHandler = requestNewFrame(this._renderFunction);+ } else {+ this._renderingQueueLaunched = false;+ }+ };+/*** stop executing a render loop function and remove it from the execution array* @param renderFunction defines the function to be removed. If not provided all functions will be removed.@@ -492,38 +556,11 @@ export class Engine extends Disposable {return window;}- /**- * call itself by raf- * Exec all function in _renderFrameTasks in _renderFrame()- */- private _renderFunctionCore(timestamp: number): void {- let shouldRender = true;- if (!this.renderEvenInBackground) {- shouldRender = false;- }-- if (shouldRender) {- // Start new frame- this._beginFrame(timestamp);- this._renderFrame(timestamp);- this._endFrame(timestamp);- }-- if (this._renderFrameTasks.length > 0) {- this._requestNewFrameHandler = requestNewFrame(this._renderFunction);- } else {- this._renderingQueueLaunched = false;- }- }-private _handleKeyboardAction() {const keyboardDownEvent = (evt: KeyboardEvent) => {const deviceEvent = evt as unknown as IKeyboardEvent;deviceEvent.deviceType = DeviceType.Keyboard;deviceEvent.inputIndex = evt.keyCode;- // deviceEvent.previousState = 0;- // deviceEvent.currentState = 1;-this.onInputChanged$.emitEvent(deviceEvent);};@@ -531,9 +568,6 @@ export class Engine extends Disposable {const deviceEvent = evt as unknown as IKeyboardEvent;deviceEvent.deviceType = DeviceType.Keyboard;deviceEvent.inputIndex = evt.keyCode;- // deviceEvent.previousState = 1;- // deviceEvent.currentState = 0;-this.onInputChanged$.emitEvent(deviceEvent);};diff --git a/packages/engine-render/src/index.ts b/packages/engine-render/src/index.tsindex 31f9bf4fb0..b0e1026aff 100644--- a/packages/engine-render/src/index.ts+++ b/packages/engine-render/src/index.ts@@ -49,5 +49,4 @@ export * from './scene-viewer';export * from './scroll-timer';export * from './shape';export { ThinEngine } from './thin-engine';-export { ThinScene } from './thin-scene';export * from './viewport';diff --git a/packages/engine-render/src/layer.ts b/packages/engine-render/src/layer.tsindex 388710490f..e783012e83 100644--- a/packages/engine-render/src/layer.ts+++ b/packages/engine-render/src/layer.ts@@ -189,7 +189,6 @@ export class Layer extends Disposable {makeDirty(state: boolean = true) {this._dirty = state;-/*** parent is SceneViewer, make it dirty*/diff --git a/packages/engine-render/src/render-manager/render-manager.service.ts b/packages/engine-render/src/render-manager/render-manager.service.tsindex 2b18d77430..78d95a80bb 100644--- a/packages/engine-render/src/render-manager/render-manager.service.ts+++ b/packages/engine-render/src/render-manager/render-manager.service.ts@@ -196,7 +196,7 @@ export class RenderManagerService extends Disposable implements IRenderManagerSe* @returns renderUnit:IRender*/createRender(unitId: string): IRender {- const renderer = this._createRender(unitId, new Engine());+ const renderer = this._createRender(unitId, new Engine(unitId));this._renderCreated$.next(renderer);return renderer;}diff --git a/packages/engine-render/src/scene.input-manager.ts b/packages/engine-render/src/scene.input-manager.tsindex ead273b967..59ba177aa9 100644--- a/packages/engine-render/src/scene.input-manager.ts+++ b/packages/engine-render/src/scene.input-manager.ts@@ -149,7 +149,7 @@ export class InputManager extends Disposable {if (this._checkDirectSceneEventTrigger(!isStop, this._currentObject)) {this._scene.onPointerMove$.emitEvent(evt);- this._scene.getEngine()?.setRemainCapture();+ this._scene.getEngine()?.setCapture();}}@@ -185,10 +185,14 @@ export class InputManager extends Disposable {_onPointerCancel(evt: IPointerEvent) {this._scene.onPointerCancel$.emitEvent(evt);+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);+ currentObject?.triggerPointerCancel(evt);}_onPointerOut(evt: IPointerEvent) {this._scene.onPointerOut$.emitEvent(evt);+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);+ currentObject?.triggerPointerOut(evt);}_onMouseWheel(evt: IWheelEvent) {@@ -196,19 +200,22 @@ export class InputManager extends Disposable {const isStop = currentObject?.triggerMouseWheel(evt);// for doc- const viewportMain = (this._scene as Scene).getMainViewport();+ const viewportMain = this._scene.getMainViewport();viewportMain.onMouseWheel$.emitEvent(evt);+ // what is checkDirectSceneEventTrigger?? for what ???if (this._checkDirectSceneEventTrigger(!isStop, currentObject)) {this._scene.onMouseWheel$.emitEvent(evt);}}_onKeyDown(evt: IKeyboardEvent) {+ // currently nobody using this. use `fromGlobalEvent('keydown')` from rx.js instead.this._scene.onKeyDown$.emitEvent(evt);}_onKeyUp(evt: IKeyboardEvent) {+ // currently nobody using this. use `fromGlobalEvent('keyup')` from rx.js instead.this._scene.onKeyUp$.emitEvent(evt);}@@ -233,7 +240,7 @@ export class InputManager extends Disposable {if (this._checkDirectSceneEventTrigger(!isStop, this._currentObject)) {this._scene.onDragOver$.emitEvent(evt);- this._scene.getEngine()?.setRemainCapture();+ this._scene.getEngine()?.setCapture();}}diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.tsindex 209905e001..256d41e577 100644--- a/packages/engine-render/src/scene.ts+++ b/packages/engine-render/src/scene.ts@@ -79,7 +79,15 @@ export class Scene extends Disposable {onDblclick$ = new EventSubject<IPointerEvent | IMouseEvent>();onTripleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();onMouseWheel$ = new EventSubject<IWheelEvent>();++ /**+ * @deprecated use `fromGlobalEvent('keydown')` from rx.js instead.+ */onKeyDown$ = new EventSubject<IKeyboardEvent>();++ /**+ * @deprecated use `fromGlobalEvent('keyup')` from rx.js instead.+ */onKeyUp$ = new EventSubject<IKeyboardEvent>();private _beforeRender$ = new BehaviorSubject<Nullable<Canvas>>(null);@@ -1004,19 +1012,19 @@ export class Scene extends Disposable {return isPickedObject;}- triggerKeyDown(evt: IKeyboardEvent) {- this.onKeyDown$.emitEvent(evt);+ // triggerKeyDown(evt: IKeyboardEvent) {+ // this.onKeyDown$.emitEvent(evt);// if (this._parent instanceof SceneViewer) {// this._parent?.triggerKeyDown(evt);// }- }+ // }- triggerKeyUp(evt: IKeyboardEvent) {- this.onKeyUp$.emitEvent(evt);+ // triggerKeyUp(evt: IKeyboardEvent) {+ // this.onKeyUp$.emitEvent(evt);// if (this._parent instanceof SceneViewer) {// this._parent?.triggerKeyUp(evt);// }- }+ // }triggerPointerUp(evt: IPointerEvent | IMouseEvent) {if (@@ -1115,6 +1123,14 @@ export class Scene extends Disposable {return true;}+ triggerPointerCancel(evt: IPointerEvent) {+ if (this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {+ (this._parent as SceneViewer)?.triggerPointerCancel(evt);+ return false;+ }+ return true;+ }+triggerPointerEnter(evt: IPointerEvent | IMouseEvent) {// this.onPointerEnter$.emitEvent(evt);if (diff --git a/packages/engine-render/src/shape/scroll-bar.ts b/packages/engine-render/src/shape/scroll-bar.tsindex 856175cff8..7fb39c7803 100644--- a/packages/engine-render/src/shape/scroll-bar.ts+++ b/packages/engine-render/src/shape/scroll-bar.ts@@ -383,7 +383,7 @@ export class ScrollBar extends BaseScrollBar {});this._lastY = e.offsetY;- mainScene.getEngine()?.setRemainCapture();+ mainScene.getEngine()?.setCapture();});this._verticalPointerUpSub = mainScene.onPointerUp$.subscribeEvent((_evt: unknown, _state: EventState) => {@@ -480,7 +480,7 @@ export class ScrollBar extends BaseScrollBar {x: e.offsetX - this._lastX,});this._lastX = e.offsetX;- mainScene.getEngine()?.setRemainCapture();+ mainScene.getEngine()?.setCapture();});this._horizonPointerUpSub = mainScene.onPointerUp$.subscribeEvent((evt: unknown, state: EventState) => {const srcElement = this.horizonThumbRect;diff --git a/packages/engine-render/src/thin-scene.ts b/packages/engine-render/src/thin-scene.tsdeleted file mode 100644index b31066863c..0000000000--- a/packages/engine-render/src/thin-scene.ts+++ /dev/null@@ -1,271 +0,0 @@-/**- * Copyright 2023-present DreamNum Inc.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { Nullable } from '@univerjs/core';-import type { BaseObject } from './base-object';--import type { CURSOR_TYPE } from './basics/const';-import type { IDragEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';-import type { ITransformChangeState } from './basics/interfaces';-import type { Vector2 } from './basics/vector2';-import type { UniverRenderingContext } from './context';-import type { Engine } from './engine';-import { Disposable, EventSubject } from '@univerjs/core';-import { RENDER_CLASS_TYPE } from './basics/const';-import { Transform } from './basics/transform';--export abstract class ThinScene extends Disposable {- onTransformChange$ = new EventSubject<ITransformChangeState>();-- onFileLoaded$ = new EventSubject<string>();-- onPointerDown$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onPointerMove$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onPointerUp$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onPointerEnter$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onPointerOut$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onPointerCancel$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onPointerLeave$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onDragEnter$ = new EventSubject<IDragEvent>();-- onDragOver$ = new EventSubject<IDragEvent>();-- onDragLeave$ = new EventSubject<IDragEvent>();-- onDrop$ = new EventSubject<IDragEvent>();-- onDblclick$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onTripleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();-- onMouseWheel$ = new EventSubject<IWheelEvent>();-- onKeyDown$ = new EventSubject<IKeyboardEvent>();-- onKeyUp$ = new EventSubject<IKeyboardEvent>();-- debounceParentTimeout: number = -1;-- private _sceneKey: string = '';-- private _width: number = 100;-- private _height: number = 100;-- private _scaleX: number = 1;-- private _scaleY: number = 1;-- private _transform = new Transform();-- private _evented = true;-- constructor(sceneKey: string) {- super();- this._sceneKey = sceneKey;- }-- get classType() {- return RENDER_CLASS_TYPE.SCENE;- }-- get transform() {- return this._transform;- }-- get width() {- return this._width;- }-- get height() {- return this._height;- }-- get scaleX() {- return this._scaleX;- }-- get scaleY() {- return this._scaleY;- }-- get sceneKey() {- return this._sceneKey;- }-- get objectsEvented() {- return this._evented;- }-- set transform(trans: Transform) {- this._transform = trans;- }-- set width(num: number) {- this._width = num;- }-- set height(num: number) {- this._height = num;- }-- set scaleX(scaleX: number) {- this._scaleX = scaleX;- }-- set scaleY(scaleY: number) {- this._scaleY = scaleY;- }-- enableObjectsEvent() {- this._evented = true;- }-- /**- * If scene.event is disabled, scene.pick(curosrPos) return null.- * Then only scene itself can response to pointer event, all objects under the scene would not.- * see sceneInputManager@_onPointerMove- */- disableObjectsEvent() {- this._evented = false;- }-- triggerKeyDown(evt: IKeyboardEvent) {- this.onKeyDown$.emitEvent(evt);- // if (this._parent instanceof SceneViewer) {- // this._parent?.triggerKeyDown(evt);- // }- }-- triggerKeyUp(evt: IKeyboardEvent) {- this.onKeyUp$.emitEvent(evt);- // if (this._parent instanceof SceneViewer) {- // this._parent?.triggerKeyUp(evt);- // }- }-- abstract triggerPointerUp(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerMouseWheel(evt: IWheelEvent): void;-- abstract triggerPointerMove(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerDblclick(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerTripleClick(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerPointerDown(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerPointerOut(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerPointerLeave(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerPointerOver(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerPointerEnter(evt: IPointerEvent | IMouseEvent): void;-- abstract triggerDragEnter(evt: IDragEvent | IMouseEvent): void;-- abstract triggerDragOver(evt: IDragEvent | IMouseEvent): void;-- abstract triggerDragLeave(evt: IDragEvent | IMouseEvent): void;-- abstract triggerDrop(evt: IDragEvent | IMouseEvent): void;-- abstract render(parentCtx?: UniverRenderingContext): void;-- abstract getParent(): any;-- override dispose(): void {- this.onTransformChange$.complete();- this.onFileLoaded$.complete();- this.onPointerDown$.complete();- this.onPointerMove$.complete();- this.onPointerUp$.complete();- this.onPointerEnter$.complete();- this.onPointerLeave$.complete();- this.onDragEnter$.complete();- this.onDragOver$.complete();- this.onDragLeave$.complete();- this.onDrop$.complete();- this.onDblclick$.complete();- this.onTripleClick$.complete();- this.onMouseWheel$.complete();- this.onKeyDown$.complete();- this.onKeyUp$.complete();- this.onPointerOut$.complete();- this.onPointerCancel$.complete();-- super.dispose();- }-- abstract getObject(oKey: string): Nullable<BaseObject>;-- abstract addObject(o: BaseObject, zIndex?: number): void;-- abstract addObjects(objects: BaseObject[], zIndex?: number): void;-- abstract getEngine(): Nullable<Engine>;-- abstract setObjectBehavior(o: BaseObject): void;-- attachTransformerTo(o: BaseObject) { }-- detachTransformerFrom(o: BaseObject) { }-- makeDirtyNoParent(state: boolean = true): ThinScene {- return this;- }-- makeDirty(state: boolean = true) {- return this;- }-- abstract pick(coord: Vector2): Nullable<BaseObject | ThinScene>;-- getViewports(): any[] {- return [];- }-- abstract addViewport(...viewport: any[]): void;-- abstract removeViewport(key: string): void;-- getAncestorScale() {- return {- scaleX: 1,- scaleY: 1,- };- }-- getPrecisionScale() {- return {- scaleX: 1,- scaleY: 1,- };- }-- abstract setCursor(val: CURSOR_TYPE): void;-- abstract resetCursor(): void;-}diff --git a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts b/packages/sheets-ui/src/commands/commands/set-scroll.command.tsindex 23ac3048d1..24dfbe2eda 100644--- a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts+++ b/packages/sheets-ui/src/commands/commands/set-scroll.command.ts@@ -80,7 +80,7 @@ export const SetScrollRelativeCommand: ICommand<ISetScrollRelativeCommandParams>/*** This command is used to manage the scroll position of the current view by specifying the cell index of the top left cell- * Usually triggered by dragging srcollbar and click scrolltrack or moving selection range.+ * Usually triggered by dragging scroll bar and click scroll track or moving selection range.* NOT same as SetScrollRelativeCommand which usually trigger by wheelevent.*/export const ScrollCommand: ICommand<IScrollCommandParams> = {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.tsindex 6e67d0001b..d629b4a451 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@@ -180,7 +180,9 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM// with shift, scrollY will be scrollXif (evt.shiftKey) {- offsetX = evt.deltaY * MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR;+ // mac is weird, when using track pad, scroll vertical with shift key, should get delta value from deltaY.+ // but when using with mousewheel, scroll with shift key, only deltaX has value.+ offsetX = (evt.deltaY || evt.deltaX) * MOUSE_WHEEL_SPEED_SMOOTHING_FACTOR;} else {offsetY = evt.deltaY;}diff --git a/packages/sheets-ui/src/facade/__tests__/create-test-bed.ts b/packages/sheets-ui/src/facade/__tests__/create-test-bed.tsindex 523cdab519..df0d22c4c7 100644--- a/packages/sheets-ui/src/facade/__tests__/create-test-bed.ts+++ b/packages/sheets-ui/src/facade/__tests__/create-test-bed.ts@@ -95,7 +95,10 @@ export interface ITestBed {class RenderManagerServiceTestBed extends RenderManagerService {override createRender(unitId: string): IRender {- const renderer = this._createRender(unitId, new Engine(100, 100));+ const renderer = this._createRender(unitId, new Engine(unitId, {+ elementWidth: 100,+ elementHeight: 100,+ }));return renderer;}}diff --git a/packages/sheets-ui/src/services/scroll-manager.service.ts b/packages/sheets-ui/src/services/scroll-manager.service.tsindex 4ca806a5fe..5d925d3c91 100644--- a/packages/sheets-ui/src/services/scroll-manager.service.ts+++ b/packages/sheets-ui/src/services/scroll-manager.service.ts@@ -30,7 +30,7 @@ export interface IScrollState {*/offsetY: number;/**- * currrent start row in viewport visible area+ * current start row in viewport visible area*/sheetViewStartRow: number;/**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.tsindex f9770c3572..10ba168131 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@@ -661,10 +661,8 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSeleunitId,sheetId,};- this._scene.getEngine()?.setRemainCapture();const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN)!;-const targetViewport = this._getViewportByCell(currSelectionRange.endRow, currSelectionRange.endColumn) ?? viewportMain;const scrollXY = scene.getScrollXYInfoByViewport(diff --git a/packages/sheets-ui/src/services/selection/selection-render.service.ts b/packages/sheets-ui/src/services/selection/selection-render.service.tsindex 10e2443b68..2ecd5c8a1f 100644--- a/packages/sheets-ui/src/services/selection/selection-render.service.ts+++ b/packages/sheets-ui/src/services/selection/selection-render.service.ts@@ -369,6 +369,7 @@ export class SheetSelectionRenderService extends BaseSelectionRenderService implthis._clearUpdatingListeners();this._addEndingListeners();scene.getTransformer()?.clearSelectedObjects();+this._setupPointerMoveListener(viewportMain, activeSelectionControl!, rangeType, scrollTimerType, offsetX, offsetY);this._escapeShortcutDisposable = this._shortcutService.forceEscape();@@ -384,5 +385,7 @@ export class SheetSelectionRenderService extends BaseSelectionRenderService implthis._escapeShortcutDisposable?.dispose();this._escapeShortcutDisposable = null;});++ this._scene.getEngine()?.setCapture();}}