refactor: remove dependency on context for more modules

.eslintrc.js

@@ -63,7 +63,6 @@ module.exports = {
  'guard-for-in': 'off',
  'no-prototype-builtins': 'off',
  'no-lonely-if': 'off',
- 'prefer-const': 'off',
  radix: 'off',
  'no-nested-ternary': 'off',
  'no-new': 'off',
@@ -109,7 +108,7 @@ module.exports = {
  'grouped-accessor-pairs': 'off',
  '@typescript-eslint/member-ordering': 'error',
  '@typescript-eslint/no-explicit-any': 'warn',
- '@typescript-eslint/no-unsafe-return': 'error'
+ '@typescript-eslint/no-unsafe-return': 'error',
  },
  // https://www.npmjs.com/package/eslint-import-resolver-typescript
  settings: {
@@ -126,4 +125,4 @@ module.exports = {
  },
  },
  },
-};
+};

packages/base-sheets/src/Controller/Selection/SelectionManager.ts

@@ -1,7 +1,25 @@
 import { IMouseEvent, IPointerEvent, Rect, ScrollTimer, Spreadsheet, SpreadsheetColumnTitle, SpreadsheetRowTitle } from '@univerjs/base-render';
 import {
- ActionOperation, Command, DEFAULT_CELL, DEFAULT_SELECTION, Direction, ICellInfo, ICurrentUniverService, IGridRange, IRangeCellData, IRangeData, ISelection, ISelectionData, makeCellToSelection, Nullable,
- Observer, ObserverManager, Range, RangeList, Worksheet
+ ActionOperation,
+ Command,
+ CommandManager,
+ DEFAULT_CELL,
+ DEFAULT_SELECTION,
+ Direction,
+ ICellInfo,
+ ICurrentUniverService,
+ IGridRange,
+ IRangeCellData,
+ IRangeData,
+ ISelection,
+ ISelectionData,
+ makeCellToSelection,
+ Nullable,
+ Observer,
+ ObserverManager,
+ Range,
+ RangeList,
+ Worksheet,
 } from '@univerjs/core';
 import { Inject, Injector } from '@wendellhu/redi';
 
@@ -53,6 +71,7 @@ export class SelectionManager {
  private readonly _sheetView: SheetView,
  private readonly _config: ISheetPluginConfig,
  @ICurrentUniverService private readonly _currentUniverService: ICurrentUniverService,
+ @Inject(CommandManager) private readonly _commandManager: CommandManager,
  @Inject(Injector) private readonly _injector: Injector,
  @Inject(ObserverManager) private readonly _observerManager: ObserverManager,
  /** @deprecated this should be divided into smaller pieces */
@@ -283,15 +302,16 @@ export class SelectionManager {
  models = this._selectionControls.map((control) => control.model.getValue());
  }
 
- const workbook = this._worksheet.getContext().getWorkBook();
- const commandManager = workbook.getCommandManager();
+ const workbook = this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook();
 
  let action: ISetSelectionValueActionData = {
  sheetId: this._worksheet.getSheetId(),
  actionName: SetSelectionValueAction.NAME,
  selections: models,
+ injector: this._injector,
  };
 
+ // TODO@wzhudev: this design is bad, leaking implementation details to its users. Will redesign command system and refactor this.
  action = ActionOperation.make<ISetSelectionValueActionData>(action).removeUndo().getAction();
 
  const command = new Command(
@@ -300,7 +320,7 @@ export class SelectionManager {
  },
  action
  );
- commandManager.invoke(command);
+ this._commandManager.invoke(command);
  }
 
  /**
@@ -322,8 +342,7 @@ export class SelectionManager {
  }
  });
 
- const workbook = this._worksheet.getContext().getWorkBook();
- const commandManager = workbook.getCommandManager();
+ const workbook = this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook();
 
  let action: ISetSelectionValueActionData = {
  sheetId: this._worksheet.getSheetId(),
@@ -339,7 +358,7 @@ export class SelectionManager {
  },
  action
  );
- commandManager.invoke(command);
+ this._commandManager.invoke(command);
  }
 
  setModels(selections: ISelectionModelValue[]) {
@@ -1045,4 +1064,4 @@ export class SelectionManager {
  private getWorksheetId(): string {
  return this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook().getActiveSheet().getSheetId();
  }
-}
+}

packages/base-sheets/src/Model/Action/SetSelectionValueAction.ts

@@ -2,6 +2,7 @@ import { SheetActionBase, ActionObservers, ActionType, ISheetActionData, ICellIn
 
 import { ACTION_NAMES } from '../../Basics/Enum/ACTION_NAMES';
 import { SetSelectionValue } from '../Apply/SetSelectionValue';
+import { ISelectionManager } from '../../Services/tokens';
 
 export interface ISelectionModelValue {
  selection: ISelection;
@@ -33,10 +34,10 @@ export class SetSelectionValueAction extends SheetActionBase<ISetSelectionValueA
  }
 
  do(): ISelectionModelValue[] {
- const { selections } = this._doActionData;
+ const { selections, injector } = this._doActionData;
  const worksheet = this.getWorkSheet();
 
- const result = SetSelectionValue(worksheet, selections);
+ const result = SetSelectionValue(worksheet, selections, injector!.get(ISelectionManager));
 
  this._observers.notifyObservers({
  type: ActionType.REDO,
@@ -59,14 +60,14 @@ export class SetSelectionValueAction extends SheetActionBase<ISetSelectionValueA
  }
 
  undo(): void {
- const { selections, sheetId } = this._oldActionData;
+ const { selections, sheetId, injector } = this._oldActionData;
  const worksheet = this.getWorkSheet();
 
  // update current data
  this._doActionData = {
  actionName: ACTION_NAMES.SET_SELECTION_VALUE_ACTION,
  sheetId,
- selections: SetSelectionValue(worksheet, selections),
+ selections: SetSelectionValue(worksheet, selections, injector!.get(ISelectionManager)),
  };
 
  this._observers.notifyObservers({

packages/base-sheets/src/Model/Apply/SetSelectionValue.ts

@@ -1,5 +1,5 @@
-import { PLUGIN_NAMES, Worksheet } from '@univerjs/core';
-import { SheetPlugin } from '../..';
+import { Worksheet } from '@univerjs/core';
+import { SelectionManager } from '../..';
 import { ISelectionModelValue } from '../Action/SetSelectionValueAction';
 
 /**
@@ -12,12 +12,8 @@ import { ISelectionModelValue } from '../Action/SetSelectionValueAction';
  *
  * @internal
  */
-export function SetSelectionValue(worksheet: Worksheet, selections: ISelectionModelValue[]): ISelectionModelValue[] {
- const selectionManager = worksheet.getContext().getPluginManager().getRequirePluginByName<SheetPlugin>(PLUGIN_NAMES.SPREADSHEET).getSelectionManager();
-
- const result = selectionManager.getCurrentModelsValue();
-
- selectionManager.setModels(selections);
-
+export function SetSelectionValue(_worksheet: Worksheet, selections: ISelectionModelValue[], _selectionManager: SelectionManager): ISelectionModelValue[] {
+ const result = _selectionManager.getCurrentModelsValue();
+ _selectionManager.setModels(selections);
  return result;
 }

packages/core/src/Command/SheetActionBase.ts

@@ -1,3 +1,4 @@
+import { Injector } from '@wendellhu/redi';
 import { Workbook, Worksheet } from '../Sheets/Domain';
 import { ActionBase, IActionData, ActionObservers, CommandUnit } from './index';
 
@@ -7,6 +8,7 @@ import { ActionBase, IActionData, ActionObservers, CommandUnit } from './index';
 export interface ISheetActionData extends IActionData {
  sheetId: string;
  rangeRef?: string;
+ injector?: Injector;
 }
 
 /**