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: detect row/col index in selection (#3348)
lumixc9fef1be0b0d
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.tsindex d62006315f..bb36bc6b00 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@@ -543,7 +543,7 @@ export class TextSelectionRenderManager extends RxDisposable implements ITextSelthis._removeAllRanges();}- scene.disableEvent();+ scene.disableObjectsEvent();const scrollTimer = ScrollTimer.create(scene);this._scrollTimers.push(scrollTimer);@@ -575,7 +575,7 @@ export class TextSelectionRenderManager extends RxDisposable implements ITextSel[...this._scenePointerMoveSubs, ...this._scenePointerUpSubs].forEach((e) => {e.unsubscribe();});- scene.enableEvent();+ scene.enableObjectsEvent();// Add cursor.if (this._anchorNodePosition && !this._focusNodePosition) {diff --git a/packages/engine-render/src/scene.input-manager.ts b/packages/engine-render/src/scene.input-manager.tsindex f0e94d3648..3e99f6c4d7 100644--- a/packages/engine-render/src/scene.input-manager.ts+++ b/packages/engine-render/src/scene.input-manager.ts@@ -41,6 +41,8 @@ export class InputManager extends Disposable {/** If you need to check double click without raising a single click at first click, enable this flag */static ExclusiveDoubleClickMode = false;+ private _scene!: ThinScene;+/** This is a defensive check to not allow control attachment prior to an already active one. If already attached, previous control is unattached before attaching the new one. */private _alreadyAttached = false;@@ -51,49 +53,30 @@ export class InputManager extends Disposable {// Pointersprivate _onPointerMove!: (evt: IMouseEvent) => void;-private _onPointerDown!: (evt: IPointerEvent) => void;-private _onPointerUp!: (evt: IPointerEvent) => void;-private _onPointerOut!: (evt: IPointerEvent) => void;-private _onPointerCancel!: (evt: IPointerEvent) => void;-private _onPointerEnter!: (evt: IPointerEvent) => void;-private _onPointerLeave!: (evt: IPointerEvent) => void;-private _onMouseWheel!: (evt: IWheelEvent) => void;// Keyboardprivate _onKeyDown!: (evt: IKeyboardEvent) => void;-private _onKeyUp!: (evt: IKeyboardEvent) => void;// Dragprivate _onDragEnter!: (evt: IDragEvent) => void;-private _onDragLeave!: (evt: IDragEvent) => void;-private _onDragOver!: (evt: IDragEvent) => void;-private _onDrop!: (evt: IDragEvent) => void;- private _scene!: ThinScene;-private _currentMouseEnterPicked: Nullable<BaseObject | ThinScene>;-private _startingPosition = new Vector2(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY);-private _delayedTimeout: NodeJS.Timeout | number = -1;-private _delayedTripeTimeout: NodeJS.Timeout | number = -1;-private _doubleClickOccurred = 0;-private _tripleClickState = false;-private _currentObject: Nullable<BaseObject | ThinScene>;constructor(scene: ThinScene) {@@ -178,7 +161,7 @@ export class InputManager extends Disposable {evt.pointerId = 0;}- this._currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ this._currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);const _isStop = this._currentObject?.triggerPointerMove(evt);this.mouseLeaveEnterHandler(evt);@@ -215,7 +198,7 @@ export class InputManager extends Disposable {if ((evt as IPointerEvent).pointerId === undefined) {(evt as unknown as PointerEvent).pointerId = 0;}- const currentObject = this._currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ const currentObject = this._currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);// Math.random() < 0.01 && console.log('!!!scene _onPointerMove', currentObject?.oKey);const isStop = currentObject?.triggerPointerMove(evt);@@ -233,8 +216,7 @@ export class InputManager extends Disposable {(evt as unknown as PointerEvent).pointerId = 0;}- const currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);-+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);const isStop = currentObject?.triggerPointerDown(evt);if (this._checkDirectSceneEventTrigger(!isStop, currentObject)) {@@ -248,7 +230,7 @@ export class InputManager extends Disposable {evt.pointerId = 0;}- const currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);const isStop = currentObject?.triggerPointerUp(evt);if (this._checkDirectSceneEventTrigger(!isStop, currentObject)) {@@ -267,7 +249,7 @@ export class InputManager extends Disposable {};this._onMouseWheel = (evt: IWheelEvent) => {- const currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);const isStop = currentObject?.triggerMouseWheel(evt);this._scene.getViewports().forEach((vp: Viewport) => {@@ -292,7 +274,7 @@ export class InputManager extends Disposable {};this._onDragEnter = (evt: IDragEvent) => {- this._currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ this._currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);this._currentObject?.triggerDragOver(evt);this.dragLeaveEnterHandler(evt);@@ -305,7 +287,7 @@ export class InputManager extends Disposable {};this._onDragOver = (evt: IDragEvent) => {- this._currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ this._currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);const isStop = this._currentObject?.triggerDragOver(evt);this.dragLeaveEnterHandler(evt);@@ -317,7 +299,7 @@ export class InputManager extends Disposable {};this._onDrop = (evt: IDragEvent) => {- const currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);const isStop = currentObject?.triggerDrop(evt);if (this._checkDirectSceneEventTrigger(!isStop, currentObject)) {@@ -436,7 +418,13 @@ export class InputManager extends Disposable {this._alreadyAttached = false;}- private _getCurrentObject(offsetX: number, offsetY: number) {+ /**+ * Just call this._scene?.pick, nothing special.+ * @param offsetX+ * @param offsetY+ * @returns+ */+ private _getObjectAtPos(offsetX: number, offsetY: number) {return this._scene?.pick(Vector2.FromArray([offsetX, offsetY]));}@@ -454,7 +442,7 @@ export class InputManager extends Disposable {isNotInSceneViewer = parent.classType !== RENDER_CLASS_TYPE.SCENE_VIEWER;}}- return (!this._scene.evented && isTrigger && isNotInSceneViewer) || notObject;+ return (!this._scene.objectsEvented && isTrigger && isNotInSceneViewer) || notObject;}/**diff --git a/packages/engine-render/src/scene.transformer.ts b/packages/engine-render/src/scene.transformer.tsindex f7e92cdd58..23f28fe1be 100644--- a/packages/engine-render/src/scene.transformer.ts+++ b/packages/engine-render/src/scene.transformer.ts@@ -351,7 +351,7 @@ export class Transformer extends Disposable implements ITransformerConfig {this._addCancelObserver(scene);- scene.disableEvent();+ scene.disableObjectsEvent();const scrollTimer = ScrollTimer.create(scene);scrollTimer.startScroll(evtOffsetX, evtOffsetY);@@ -393,7 +393,7 @@ export class Transformer extends Disposable implements ITransformerConfig {const scenePointerUpSub = scene.onPointerUp$.subscribeEvent((event) => {scenePointerMoveSub?.unsubscribe();scenePointerUpSub?.unsubscribe();- scene.enableEvent();+ scene.enableObjectsEvent();!isCropper && this.refreshControls();scrollTimer.dispose();@@ -913,7 +913,7 @@ export class Transformer extends Disposable implements ITransformerConfig {if (topScene == null) {return;}- topScene.disableEvent();+ topScene.disableObjectsEvent();const scrollTimer = ScrollTimer.create(topScene);scrollTimer.startScroll(evtOffsetX, evtOffsetY);const { scrollX, scrollY } = getCurrentScrollXY(scrollTimer);@@ -959,7 +959,7 @@ export class Transformer extends Disposable implements ITransformerConfig {// topScene.onPointerUp$.remove(this._topScenePointerUpSub);this._topScenePointerMoveSub?.unsubscribe();this._topScenePointerUpSub?.unsubscribe();- topScene.enableEvent();+ topScene.enableObjectsEvent();topScene.resetCursor();scrollTimer.dispose();this._startStateMap.clear();@@ -1030,7 +1030,7 @@ export class Transformer extends Disposable implements ITransformerConfig {return;}- topScene.disableEvent();+ topScene.disableObjectsEvent();const viewportActualXY = topScene.getVpScrollXYInfoByPosToVp(Vector2.create(evtOffsetX, evtOffsetY));@@ -1062,7 +1062,7 @@ export class Transformer extends Disposable implements ITransformerConfig {// topScenePointerUpSub?.dispose();topScenePointerMoveSub?.unsubscribe();topScenePointerUpSub?.unsubscribe();- topScene.enableEvent();+ topScene.enableObjectsEvent();topScene.resetCursor();this.refreshControls();diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.tsindex bd767d0251..dcaad6a297 100644--- a/packages/engine-render/src/scene.ts+++ b/packages/engine-render/src/scene.ts@@ -808,24 +808,28 @@ export class Scene extends ThinScene {super.dispose();}- // Determine the only object selected- override pick(vec: Vector2): Nullable<BaseObject | Scene | ThinScene> {- let pickedViewport = this.getActiveViewportByCoord(vec);+ /**+ * Get the object under the pointer, if scene.event is disabled, the object is null.+ * @param {Vector2} coord+ * @return {Nullable<BaseObject | Scene | ThinScene>} object under the pointer+ */+ override pick(coord: Vector2): Nullable<BaseObject | Scene | ThinScene> {+ let pickedViewport = this.getActiveViewportByCoord(coord);if (!pickedViewport) {pickedViewport = this._viewports[0];}- if (!this.evented || !pickedViewport) {- return;+ if (!this.objectsEvented || !pickedViewport) {+ return null;}- const scrollBarRect = pickedViewport.pickScrollBar(vec);+ const scrollBarRect = pickedViewport.pickScrollBar(coord);if (scrollBarRect) {return scrollBarRect;}- const vecFromSheetContent = pickedViewport.transformVector2SceneCoord(vec);+ const vecFromSheetContent = pickedViewport.transformVector2SceneCoord(coord);let isPickedObject: Nullable<BaseObject | Scene | ThinScene> = null;diff --git a/packages/engine-render/src/shape/scroll-bar.ts b/packages/engine-render/src/shape/scroll-bar.tsindex 06d5ce50f9..1588121746 100644--- a/packages/engine-render/src/shape/scroll-bar.ts+++ b/packages/engine-render/src/shape/scroll-bar.ts@@ -365,7 +365,7 @@ export class ScrollBar extends BaseScrollBar {srcElement?.setProps({fill: this.thumbActiveBackgroundColor!,});- mainScene.disableEvent();+ mainScene.disableObjectsEvent();this.makeViewDirty(true);state.stopPropagation();}));@@ -388,7 +388,7 @@ export class ScrollBar extends BaseScrollBar {const srcElement = this.verticalThumbRect;this._isVerticalMove = false;// srcElement.fill = this._thumbBackgroundColor!;- mainScene.enableEvent();+ mainScene.enableObjectsEvent();srcElement?.setProps({fill: this.thumbBackgroundColor!,});@@ -455,7 +455,7 @@ export class ScrollBar extends BaseScrollBar {fill: this.thumbActiveBackgroundColor!,});this.makeViewDirty(true);- mainScene.disableEvent();+ mainScene.disableObjectsEvent();state.stopPropagation();}));@@ -473,7 +473,7 @@ export class ScrollBar extends BaseScrollBar {this._horizonPointerUpSub = mainScene.onPointerUp$.subscribeEvent((evt: unknown, state: EventState) => {const srcElement = this.horizonThumbRect;this._isHorizonMove = false;- mainScene.enableEvent();+ mainScene.enableObjectsEvent();// srcElement.fill = this._thumbBackgroundColor!;srcElement?.setProps({fill: this.thumbBackgroundColor!,diff --git a/packages/engine-render/src/thin-scene.ts b/packages/engine-render/src/thin-scene.tsindex ddcc9f7489..c2de393703 100644--- a/packages/engine-render/src/thin-scene.ts+++ b/packages/engine-render/src/thin-scene.ts@@ -114,7 +114,7 @@ export abstract class ThinScene extends Disposable {return this._sceneKey;}- get evented() {+ get objectsEvented() {return this._evented;}@@ -138,11 +138,16 @@ export abstract class ThinScene extends Disposable {this._scaleY = scaleY;}- enableEvent() {+ enableObjectsEvent() {this._evented = true;}- disableEvent() {+ /**+ * 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;}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.tsindex d12b9136e1..3068e649a2 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@@ -488,7 +488,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderMscene.setCursor(CURSOR_TYPE.GRABBING);- scene.disableEvent();+ scene.disableObjectsEvent();const last = this._getCurrentLastVisible();const lastRowY = last === undefined ? Number.POSITIVE_INFINITY : skeleton.rowHeightAccumulation[last.lastRow];@@ -566,7 +566,7 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderM// eslint-disable-next-line max-lines-per-function, complexitythis._scenePointerUpSub = scene.onPointerUp$.subscribeEvent(() => {scene.resetCursor();- scene.enableEvent();+ scene.enableObjectsEvent();this._clearObserverEvent();const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;diff --git a/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.tsindex 32473b99f1..0cd828bb73 100644--- a/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts@@ -45,7 +45,7 @@ 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 { getCoordByOffset } from '../utils/component-tools';-import { checkInHeaderRanges } from '../utils/selections-tools';+import { matchedSelectionByRowColIndex } from '../utils/selections-tools';const HEADER_MOVE_CONTROLLER_BACKGROUND = '__SpreadsheetHeaderMoveControllerBackground__';@@ -70,7 +70,7 @@ export class HeaderMoveRenderController extends Disposable implements IRenderModprivate _headerPointerMoveSubs: Nullable<Subscription>;private _headerPointerLeaveSubs: Nullable<Subscription>;- private _scenePointerMoveSub: Nullable<Subscription>;+ private _dragHeaderMoveSub: Nullable<Subscription>;private _scenePointerUpSub: Nullable<Subscription>;private _scrollTimer: Nullable<ScrollTimer>;@@ -109,9 +109,9 @@ export class HeaderMoveRenderController extends Disposable implements IRenderMod// scene.onPointerMove$.remove(this._scenePointerMoveSub);// scene.onPointerUp$.remove(this._scenePointerUpSub);- this._scenePointerMoveSub?.unsubscribe();+ this._dragHeaderMoveSub?.unsubscribe();this._scenePointerUpSub?.unsubscribe();- this._scenePointerMoveSub = null;+ this._dragHeaderMoveSub = null;this._scenePointerUpSub = null;this._scrollTimer?.dispose();}@@ -129,6 +129,7 @@ export class HeaderMoveRenderController extends Disposable implements IRenderModconst eventBindingObject =initialType === RANGE_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;+ // only style cursor style when pointer moveconst pointerMoveHandler = (evt: IPointerEvent | IMouseEvent) => {const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;if (skeleton == null) {@@ -146,13 +147,13 @@ export class HeaderMoveRenderController extends Disposable implements IRenderModconst currentSelections = this._workbookSelections.getCurrentSelections();const { row, column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);- const matchSelectionData = checkInHeaderRanges(+ const matchSelectionData = matchedSelectionByRowColIndex(currentSelections,initialType === RANGE_TYPE.ROW ? row : column,initialType);- if (matchSelectionData === false) {+ if (!matchSelectionData) {scene.resetCursor();return;}@@ -206,15 +207,16 @@ export class HeaderMoveRenderController extends Disposable implements IRenderMod}const currentSelections = this._workbookSelections.getCurrentSelections();- const matchSelectionData = checkInHeaderRanges(+ const matchSelectionData = matchedSelectionByRowColIndex(currentSelections,initialType === RANGE_TYPE.ROW ? row : column,initialType);- if (matchSelectionData === false) {+ if (!matchSelectionData) {return;}+ // if matchSelectionData true, then into grab header mode.const startScrollXY = scene.getVpScrollXYInfoByPosToVp(Vector2.FromArray([this._startOffsetX, this._startOffsetY])@@ -224,7 +226,7 @@ export class HeaderMoveRenderController extends Disposable implements IRenderModscene.setCursor(CURSOR_TYPE.GRABBING);- scene.disableEvent();+ scene.disableObjectsEvent();let scrollTimerInitd = false;let scrollTimer: ScrollTimer;@@ -235,16 +237,13 @@ export class HeaderMoveRenderController extends Disposable implements IRenderMod}scrollTimer = ScrollTimer.create(scene, scrollType);-+ this._scrollTimer = scrollTimer;const mainViewport = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);-scrollTimer.startScroll(newEvtOffsetX, newEvtOffsetY, mainViewport);-- this._scrollTimer = scrollTimer;scrollTimerInitd = true;};- this._scenePointerMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {+ this._dragHeaderMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {initScrollTimer();const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;@@ -276,7 +275,7 @@ export class HeaderMoveRenderController extends Disposable implements IRenderModthis._scenePointerUpSub = scene.onPointerUp$.subscribeEvent(() => {this._disposeBackgroundAndLine();scene.resetCursor();- scene.enableEvent();+ scene.enableObjectsEvent();this._clearObserverEvent();this._scrollTimer?.dispose();@@ -472,9 +471,9 @@ export class HeaderMoveRenderController extends Disposable implements IRenderMod// const scene = this._context.scene;// scene.onPointerMove$.remove(this._scenePointerMoveSub);// scene.onPointerUp$.remove(this._scenePointerUpSub);- this._scenePointerMoveSub?.unsubscribe();+ this._dragHeaderMoveSub?.unsubscribe();this._scenePointerUpSub?.unsubscribe();- this._scenePointerMoveSub = null;+ this._dragHeaderMoveSub = null;this._scenePointerUpSub = null;}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.tsindex e787ecefd1..d285782d24 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@@ -370,7 +370,7 @@ export class HeaderResizeRenderController extends Disposable implements IRenderMscene.addObject(this._resizeHelperShape, SHEET_COMPONENT_HEADER_LAYER_INDEX);- scene.disableEvent();+ scene.disableObjectsEvent();// TODO: do it in another way// this._editorBridgeService.changeVisible({@@ -460,7 +460,7 @@ export class HeaderResizeRenderController extends Disposable implements IRenderMthis._resizeHelperShape?.dispose();this._resizeHelperShape = null;- scene.enableEvent();+ scene.enableObjectsEvent();if (isStartMove) {scene.resetCursor();diff --git a/packages/sheets-ui/src/controllers/utils/selections-tools.ts b/packages/sheets-ui/src/controllers/utils/selections-tools.tsindex f6d3b52c64..cb4275ddd8 100644--- a/packages/sheets-ui/src/controllers/utils/selections-tools.ts+++ b/packages/sheets-ui/src/controllers/utils/selections-tools.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import type { IAccessor, Workbook } from '@univerjs/core';+import type { IAccessor, Nullable, Workbook } from '@univerjs/core';import { IUniverInstanceService, RANGE_TYPE, Rectangle, UniverInstanceType } from '@univerjs/core';import type { ISelectionWithStyle } from '@univerjs/sheets';import { MERGE_CELL_INTERCEPTOR_CHECK, MergeCellController, RangeProtectionRuleModel, SheetsSelectionsService } from '@univerjs/sheets';@@ -67,23 +67,60 @@ export function getSheetSelectionsDisabled$(accessor: IAccessor) {);}-export function checkInHeaderRanges(+/**+ * Detect if this row is selected+ * @param selections+ * @param rowIndex+ * @returns boolean+ */+export function isThisRowSelected(selections: Readonly<ISelectionWithStyle[]>,- num: number,- rType: RANGE_TYPE.ROW | RANGE_TYPE.COLUMN-): false | ISelectionWithStyle {+ rowIndex: number+): boolean {+ return !!matchedSelectionByRowColIndex(selections, rowIndex, RANGE_TYPE.ROW);+}++/**+ * Detect if this col is selected+ * @param selections+ * @param colIndex+ * @returns boolean+ */+export function isThisColSelected(+ selections: Readonly<ISelectionWithStyle[]>,+ colIndex: number+): boolean {+ return !!matchedSelectionByRowColIndex(selections, colIndex, RANGE_TYPE.COLUMN);+}++/**+ * Detect this row/col is in selections.+ * @param selections+ * @param indexOfRowCol+ * @param rowOrCol+ * @returns boolean+ */+export function matchedSelectionByRowColIndex(+ selections: Readonly<ISelectionWithStyle[]>,+ indexOfRowCol: number,+ rowOrCol: RANGE_TYPE.ROW | RANGE_TYPE.COLUMN+): Nullable<ISelectionWithStyle> {const matchSelectionData = selections.find((sel) => {const range = sel.range;- const { startRow, endRow, startColumn, endColumn, rangeType } = range;+ const { startRow: startRowOfCurrSel, endRow: endRowOfCurrSel, startColumn: startColumnOfCurrSel, endColumn: endColumnOfCurrSel, rangeType: rangeTypeOfCurrSelection } = range;- if (rangeType === RANGE_TYPE.ALL || rangeType === RANGE_TYPE.NORMAL) return false;+ if (rangeTypeOfCurrSelection === RANGE_TYPE.ALL || rangeTypeOfCurrSelection === RANGE_TYPE.NORMAL) return false;- if (rType === RANGE_TYPE.COLUMN && RANGE_TYPE.COLUMN === rangeType) {- return num >= startColumn && num <= endColumn;+ if (rangeTypeOfCurrSelection === rowOrCol) {+ if (rowOrCol === RANGE_TYPE.COLUMN && startColumnOfCurrSel <= indexOfRowCol && indexOfRowCol <= endColumnOfCurrSel) {+ return true;+ }+ if (rowOrCol === RANGE_TYPE.ROW && startRowOfCurrSel <= indexOfRowCol && indexOfRowCol <= endRowOfCurrSel) {+ return true;+ }}-- return rangeType === RANGE_TYPE.ROW && num >= startRow && num <= endRow;+ return false;});- return matchSelectionData ?? false;+ return matchSelectionData;}diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.tsindex 18a84a6de7..cf1d0b2333 100644--- a/packages/sheets-ui/src/index.ts+++ b/packages/sheets-ui/src/index.ts@@ -33,7 +33,7 @@ export {getSheetObject,getTransformCoord,} from './controllers/utils/component-tools';-export { checkInHeaderRanges } from './controllers/utils/selections-tools';+export { matchedSelectionByRowColIndex as checkInHeaderRanges } from './controllers/utils/selections-tools';export { useActiveWorkbook, useActiveWorksheet, useWorkbooks } from './components/hook';export { whenSheetEditorFocused } from './controllers/shortcuts/utils';export type { IEditorBridgeServiceParam } from './services/editor-bridge.service';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 f424435279..8f9150a616 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@@ -514,7 +514,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSelethis._selectionMoveStart$.next(this.getSelectionDataWithStyle());- scene.disableEvent();+ scene.disableObjectsEvent();this._clearUpdatingListeners();this._addEndingListeners();@@ -856,7 +856,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSeleprotected _clearUpdatingListeners(): void {const scene = this._scene;- scene.enableEvent();+ scene.enableObjectsEvent();this._scenePointerMoveSub?.unsubscribe();this._scenePointerMoveSub = null;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.tsindex a1f20e7a84..e0fe180084 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@@ -43,7 +43,7 @@ import { IShortcutService } from '@univerjs/ui';import { distinctUntilChanged, startWith } from 'rxjs';import type { ISheetObjectParam } from '../../controllers/utils/component-tools';import { getCoordByOffset, getSheetObject } from '../../controllers/utils/component-tools';-import { checkInHeaderRanges } from '../../controllers/utils/selections-tools';+import { isThisColSelected, isThisRowSelected } from '../../controllers/utils/selections-tools';import { SheetScrollManagerService } from '../scroll-manager.service';import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';import { BaseSelectionRenderService, getAllSelection, getTopLeftSelection } from './base-selection-render.service';@@ -148,7 +148,7 @@ export class MobileSheetsSelectionRenderService extends BaseSelectionRenderServiconst skeleton = this._sheetSkeletonManagerService.getCurrent()!.skeleton;const { row } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);- const matchSelectionData = checkInHeaderRanges(this._workbookSelections.getCurrentSelections(), row, RANGE_TYPE.ROW);+ const matchSelectionData = isThisRowSelected(this._workbookSelections.getCurrentSelections(), row);if (matchSelectionData) return;this.createNewSelection(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.ROW, this._getActiveViewport(evt));@@ -162,7 +162,7 @@ export class MobileSheetsSelectionRenderService extends BaseSelectionRenderServiconst skeleton = this._sheetSkeletonManagerService.getCurrent()!.skeleton;const { column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);- const matchSelectionData = checkInHeaderRanges(this._workbookSelections.getCurrentSelections(), column, RANGE_TYPE.COLUMN);+ const matchSelectionData = isThisColSelected(this._workbookSelections.getCurrentSelections(), column);if (matchSelectionData) return;this.createNewSelection(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.COLUMN, this._getActiveViewport(evt));this._selectionMoveEnd$.next(this.getSelectionDataWithStyle());diff --git a/packages/sheets-ui/src/services/selection/selection-render.service.ts b/packages/sheets-ui/src/services/selection/selection-render.service.tsindex 002661bfd7..d2acbda909 100644--- a/packages/sheets-ui/src/services/selection/selection-render.service.ts+++ b/packages/sheets-ui/src/services/selection/selection-render.service.ts@@ -25,7 +25,7 @@ import { distinctUntilChanged, startWith } from 'rxjs';import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';import type { ISheetObjectParam } from '../../controllers/utils/component-tools';import { getCoordByOffset, getSheetObject } from '../../controllers/utils/component-tools';-import { checkInHeaderRanges } from '../../controllers/utils/selections-tools';+import { isThisColSelected, isThisRowSelected } from '../../controllers/utils/selections-tools';import { attachSelectionWithCoord } from './util';import { BaseSelectionRenderService, getAllSelection, getTopLeftSelection } from './base-selection-render.service';@@ -89,7 +89,7 @@ export class SheetSelectionRenderService extends BaseSelectionRenderService implconst skeleton = this._sheetSkeletonManagerService.getCurrent()!.skeleton;const { row } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);- const matchSelectionData = checkInHeaderRanges(this._workbookSelections.getCurrentSelections(), row, RANGE_TYPE.ROW);+ const matchSelectionData = isThisRowSelected(this._workbookSelections.getCurrentSelections(), row);if (matchSelectionData) return;this._onPointerDown(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.ROW, this._getActiveViewport(evt), ScrollTimerType.Y);@@ -104,7 +104,7 @@ export class SheetSelectionRenderService extends BaseSelectionRenderService implconst skeleton = this._sheetSkeletonManagerService.getCurrent()!.skeleton;const { column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);- const matchSelectionData = checkInHeaderRanges(this._workbookSelections.getCurrentSelections(), column, RANGE_TYPE.COLUMN);+ const matchSelectionData = isThisColSelected(this._workbookSelections.getCurrentSelections(), column);if (matchSelectionData) return;this._onPointerDown(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.COLUMN, this._getActiveViewport(evt), ScrollTimerType.X);diff --git a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts b/packages/sheets-ui/src/services/selection/selection-shape-extension.tsindex 3ea77758bd..54a5bfa383 100644--- a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts+++ b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts@@ -332,7 +332,7 @@ export class SelectionShapeExtension {this._scrollTimer = scrollTimer;scrollTimer.startScroll(newEvtOffsetX, newEvtOffsetY, viewMain);- scene.disableEvent();+ scene.disableObjectsEvent();this._scenePointerMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;@@ -361,7 +361,7 @@ export class SelectionShapeExtension {const scene = this._scene;scene.resetCursor();this._clearObserverEvent();- scene.enableEvent();+ scene.enableObjectsEvent();this._scrollTimer?.dispose();this._control.selectionMoved$.next(this._targetSelection);@@ -471,7 +471,7 @@ export class SelectionShapeExtension {scrollTimer.startScroll(newEvtOffsetX, newEvtOffsetY);this._scrollTimer = scrollTimer;- scene.disableEvent();+ scene.disableObjectsEvent();this._scenePointerMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;@@ -493,7 +493,7 @@ export class SelectionShapeExtension {const scene = this._scene;scene.resetCursor();this._clearObserverEvent();- scene.enableEvent();+ scene.enableObjectsEvent();this._scrollTimer?.dispose();this._control.selectionScaled$.next(this._targetSelection);@@ -830,7 +830,7 @@ export class SelectionShapeExtension {this._scrollTimer = scrollTimer;- scene.disableEvent();+ scene.disableObjectsEvent();this._controlHandler((o) => {this._fillControlColors.push(o.fill as string);@@ -904,7 +904,7 @@ export class SelectionShapeExtension {const scene = this._scene;scene.resetCursor();this._clearObserverEvent();- scene.enableEvent();+ scene.enableObjectsEvent();this._scrollTimer?.dispose();this._control.refreshSelectionFilled(this._targetSelection);this._isInMergeState = false;