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: refactor selection render modules' dependencies (#3149)

Wenzhao Hu3bba3723ad49
diff --git a/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts b/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts
index 4d88212cde..1a81c94bcd 100644
--- a/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts
+++ b/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts
@@ -17,7 +17,7 @@
import type { IDisposable, Nullable, Workbook } from '@univerjs/core';
import { DisposableCollection, Inject, Injector, RANGE_TYPE, ThemeService, toDisposable } from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule } from '@univerjs/engine-render';
-import { IRenderManagerService, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
+import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
import { convertSelectionDataToRange, getNormalSelectionStyle, IRefSelectionsService, type ISelectionWithCoordAndStyle, type ISelectionWithStyle, type SheetsSelectionsService, type WorkbookSelections } from '@univerjs/sheets';
import { attachSelectionWithCoord, BaseSelectionRenderService, checkInHeaderRanges, getAllSelection, getCoordByOffset, getSheetObject, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
import { IShortcutService } from '@univerjs/ui';
@@ -39,15 +39,14 @@ export class RefSelectionsRenderService extends BaseSelectionRenderService imple
@Inject(Injector) injector: Injector,
@Inject(ThemeService) themeService: ThemeService,
@IShortcutService shortcutService: IShortcutService,
- @IRenderManagerService renderManagerService: IRenderManagerService,
- @IRefSelectionsService private readonly _refSelectionsService: SheetsSelectionsService,
- @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService
+ @Inject(SheetSkeletonManagerService) sheetSkeletonManagerService: SheetSkeletonManagerService,
+ @IRefSelectionsService private readonly _refSelectionsService: SheetsSelectionsService
) {
super(
injector,
themeService,
shortcutService,
- renderManagerService
+ sheetSkeletonManagerService
);
this._workbookSelections = this._refSelectionsService.getWorkbookSelections(this._context.unitId);
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 2155ed24dd..b48a62cb62 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
@@ -25,10 +25,8 @@ import type {
Nullable,
ThemeService,
} from '@univerjs/core';
-import {
- createIdentifier, Disposable, InterceptorManager, makeCellToSelection, RANGE_TYPE, UniverInstanceType,
-} from '@univerjs/core';
-import type { IMouseEvent, IPointerEvent, IRenderManagerService, IRenderModule, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render';
+import { createIdentifier, Disposable, InterceptorManager, makeCellToSelection, RANGE_TYPE } from '@univerjs/core';
+import type { IMouseEvent, IPointerEvent, IRenderModule, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render';
import { ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
import { getNormalSelectionStyle, transformCellDataToSelectionData } from '@univerjs/sheets';
@@ -36,7 +34,7 @@ import type { IShortcutService } from '@univerjs/ui';
import type { Observable, Subscription } from 'rxjs';
import { BehaviorSubject, Subject } from 'rxjs';
-import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
+import type { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
import { RANGE_FILL_PERMISSION_CHECK, RANGE_MOVE_PERMISSION_CHECK } from './const';
import { SelectionControl } from './selection-shape';
import { SelectionShapeExtension } from './selection-shape-extension';
@@ -171,7 +169,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
protected readonly _themeService: ThemeService,
// WTF: why shortcutService is injected here?
protected readonly _shortcutService: IShortcutService,
- protected readonly _renderManagerService: IRenderManagerService
+ protected readonly _sheetSkeletonManagerService: SheetSkeletonManagerService
) {
super();
this._resetStyle();
@@ -335,8 +333,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
}
protected _getFreeze() {
- const freeze = this._renderManagerService.withCurrentTypeOfUnit(UniverInstanceType.UNIVER_SHEET, SheetSkeletonManagerService)
- ?.getCurrent()?.skeleton.getWorksheetConfig().freeze;
+ const freeze = this._sheetSkeletonManagerService.getCurrent()?.skeleton.getWorksheetConfig().freeze;
return freeze;
}
@@ -413,7 +410,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
this._downObserver = null;
}
- resetAndEndSelection() {
+ resetAndEndSelection(): void {
this.endSelection();
this._reset();
}
@@ -434,7 +431,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
rangeType: RANGE_TYPE = RANGE_TYPE.NORMAL,
viewport?: Viewport,
scrollTimerType: ScrollTimerType = ScrollTimerType.ALL
- ) {
+ ): void {
this._shouldDetectMergedCells = rangeType === RANGE_TYPE.NORMAL;
const skeleton = this._skeleton;
@@ -459,7 +456,7 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
const scrollXY = scene.getVpScrollXYInfoByPosToVp(relativeCoords);
const { scaleX, scaleY } = scene.getAncestorScale();
const cursorCellRangeInfo = this._getCellRangeByCursorPosition(viewportPosX, viewportPosY, scaleX, scaleY, scrollXY);
- if (!cursorCellRangeInfo) return false;
+ if (!cursorCellRangeInfo) return;
const { rangeWithCoord: cursorCellRange, primaryWithCoord: primaryCursorCellRange } = cursorCellRangeInfo;
const cursorCellRangeWithRangeType: IRangeWithCoord = { ...cursorCellRange, rangeType };
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 67c477db82..0d4c1fc32f 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
@@ -36,7 +36,7 @@ import {
toDisposable,
} from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, Viewport } from '@univerjs/engine-render';
-import { IRenderManagerService, ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
+import { ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
import type { ISelectionWithCoordAndStyle, ISetSelectionsOperationParams, WorkbookSelections } from '@univerjs/sheets';
import { convertSelectionDataToRange, DISABLE_NORMAL_SELECTIONS, SelectionMoveType, SetSelectionsOperation, SheetsSelectionsService } from '@univerjs/sheets';
import { IShortcutService } from '@univerjs/ui';
@@ -73,19 +73,18 @@ export class MobileSheetsSelectionRenderService extends BaseSelectionRenderServi
@Inject(Injector) injector: Injector,
@Inject(ThemeService) themeService: ThemeService,
@IShortcutService shortcutService: IShortcutService,
- @IRenderManagerService renderManagerService: IRenderManagerService,
@Inject(SheetsSelectionsService) selectionManagerService: SheetsSelectionsService,
+ @Inject(SheetSkeletonManagerService) sheetSkeletonManagerService: SheetSkeletonManagerService,
@ILogService private readonly _logService: ILogService,
@ICommandService private readonly _commandService: ICommandService,
@IContextService private readonly _contextService: IContextService,
- @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,
@Inject(SheetScrollManagerService) private readonly _scrollManagerService: SheetScrollManagerService
) {
super(
injector,
themeService,
shortcutService,
- renderManagerService
+ sheetSkeletonManagerService
);
this._workbookSelections = selectionManagerService.getWorkbookSelections(this._context.unitId);
this._init();
diff --git a/packages/sheets-ui/src/services/selection/selection-render.service.ts b/packages/sheets-ui/src/services/selection/selection-render.service.ts
index cac14ede4c..1842c3cd23 100644
--- a/packages/sheets-ui/src/services/selection/selection-render.service.ts
+++ b/packages/sheets-ui/src/services/selection/selection-render.service.ts
@@ -17,7 +17,7 @@
import type { IDisposable, Nullable, Workbook } from '@univerjs/core';
import { ICommandService, IContextService, ILogService, Inject, Injector, RANGE_TYPE, ThemeService, toDisposable } from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule } from '@univerjs/engine-render';
-import { IRenderManagerService, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
+import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';
import type { ISelectionWithCoordAndStyle, ISetSelectionsOperationParams, WorkbookSelections } from '@univerjs/sheets';
import { convertSelectionDataToRange, DISABLE_NORMAL_SELECTIONS, SelectionMoveType, SetSelectionsOperation, SheetsSelectionsService } from '@univerjs/sheets';
import { IShortcutService } from '@univerjs/ui';
@@ -44,21 +44,20 @@ export class SheetSelectionRenderService extends BaseSelectionRenderService impl
@Inject(Injector) injector: Injector,
@Inject(ThemeService) themeService: ThemeService,
@IShortcutService shortcutService: IShortcutService,
- @IRenderManagerService renderManagerService: IRenderManagerService,
- @Inject(SheetsSelectionsService) private readonly _selectionManagerService: SheetsSelectionsService,
+ @Inject(SheetsSelectionsService) selectionManagerService: SheetsSelectionsService,
+ @Inject(SheetSkeletonManagerService) sheetSkeletonManagerService: SheetSkeletonManagerService,
@ILogService private readonly _logService: ILogService,
@ICommandService private readonly _commandService: ICommandService,
- @IContextService private readonly _contextService: IContextService,
- @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService
+ @IContextService private readonly _contextService: IContextService
) {
super(
injector,
themeService,
shortcutService,
- renderManagerService
+ sheetSkeletonManagerService
);
- this._workbookSelections = _selectionManagerService.getWorkbookSelections(this._context.unitId);
+ this._workbookSelections = selectionManagerService.getWorkbookSelections(this._context.unitId);
this._init();
}