chore(refactor): init merge cell service

packages/core/src/sheets/worksheet.ts

@@ -146,6 +146,11 @@ export class Worksheet {
  return new Worksheet(copy, this._styles);
  }
 
+ /**
+ * @deprecated use merge-cell-service
+ * @return {*} {IRange[]}
+ * @memberof Worksheet
+ */
  getMergeData(): IRange[] {
  return this._snapshot.mergeData;
  }
@@ -194,12 +199,18 @@ export class Worksheet {
  }
 
  /**
+ * @deprecated @TODO:@gggpound should migrate to the service
  * Get cell matrix from a given range and pick out non-first cells of merged cells.
- *
  * Notice that `ICellData` here is not after copying. In another word, the object matrix here should be
  * considered as a slice of the original worksheet data matrix.
+ * PERF: we could not skip indexes with merged cells, because we have already known the merged cells' range
+ * @param {number} row
+ * @param {number} col
+ * @param {number} endRow
+ * @param {number} endCol
+ * @return {*} {(ObjectMatrix<ICellData & { rowSpan?: number; colSpan?: number }>)}
+ * @memberof Worksheet
  */
- // PERF: we could not skip indexes with merged cells, because we have already known the merged cells' range
  getMatrixWithMergedCells(
  row: number,
  col: number,

packages/engine-render/src/basics/tools.ts

@@ -483,6 +483,16 @@ export function getCellPositionByIndex(
  };
 }
 
+/**
+ * @deprecated @TODO:@gggpound should migrate to the service
+ * @export
+ * @param {number} row
+ * @param {number} column
+ * @param {number[]} rowHeightAccumulation
+ * @param {number[]} columnWidthAccumulation
+ * @param {IRange[]} mergeData
+ * @return {*} {ISelectionCellWithCoord}
+ */
 export function getCellByIndex(
  row: number,
  column: number,
@@ -560,7 +570,13 @@ export function getCellByIndex(
 }
 
 /**
- * Determines whether the cell(row, column) is within the range of the merged cells.
+ * @deprecated use `getMergedCell` instead
+ * Determines whether the cell(row, column) is within the range of the merged cells
+ * @export
+ * @param {number} row
+ * @param {number} column
+ * @param {IRange[]} [mergeData]
+ * @return {*} {ISelectionCell}
  */
 export function getCellInfoInMergeData(row: number, column: number, mergeData?: IRange[]): ISelectionCell {
  let isMerged = false; // The upper left cell only renders the content

packages/engine-render/src/components/sheets/spreadsheet.ts

@@ -105,9 +105,6 @@ export class Spreadsheet extends SheetComponent {
  }
 
  override draw(ctx: UniverRenderingContext, bounds?: IViewportBound) {
- // const { parent = { scaleX: 1, scaleY: 1 } } = this;
- // const mergeData = this.getMergeData();
- // const showGridlines = this.getShowGridlines() || 1;
  const spreadsheetSkeleton = this.getSkeleton();
  if (!spreadsheetSkeleton) {
  return;

packages/sheets-find/src/domain/text-find.ts

@@ -16,8 +16,7 @@
 
 import type { ICellData, IGridRange, Nullable, Range, Worksheet } from '@univerjs/core';
 import { FormatType, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
-import { SelectionManagerService, transformCellDataToSelectionData } from '@univerjs/sheets';
-import { ISelectionRenderService } from '@univerjs/sheets-ui';
+import { MergeCellService, SelectionManagerService, transformCellDataToSelectionData } from '@univerjs/sheets';
 import { Inject } from '@wendellhu/redi';
 
 import type { FindType } from '../i-data';
@@ -50,8 +49,7 @@ export class TextFinder {
  constructor(
  @IUniverInstanceService private readonly _currentUniverService: IUniverInstanceService,
  @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,
- @ISelectionRenderService
- private readonly _selectionRenderService: ISelectionRenderService
+ @Inject(MergeCellService) private _mergeCellService: MergeCellService
  ) {}
 
  /**
@@ -341,7 +339,7 @@ export class TextFinder {
  const workbook = this._currentUniverService.getCurrentUniverSheetInstance();
  const unitId = workbook.getUnitId();
  const sheetId = range.sheetId;
- const mergeData = workbook.getActiveSheet().getMergeData();
+ const mergeData = this._mergeCellService.getMergeData(unitId, sheetId);
 
  const selectionRange = transformCellDataToSelectionData(
  range.range.startColumn,

packages/sheets-formula/src/controllers/prompt.controller.ts

@@ -53,16 +53,12 @@ import {
  normalizeSheetName,
  sequenceNodeType,
 } from '@univerjs/engine-formula';
-import {
- DeviceInputEventType,
- getCellInfoInMergeData,
- IRenderManagerService,
- ITextSelectionRenderManager,
-} from '@univerjs/engine-render';
+import { DeviceInputEventType, IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import type { ISelectionWithStyle } from '@univerjs/sheets';
 import {
  convertSelectionDataToRange,
  getNormalSelectionStyle,
+ MergeCellService,
  NORMAL_SELECTION_PLUGIN_NAME,
  SelectionManagerService,
 } from '@univerjs/sheets';
@@ -155,7 +151,8 @@ export class PromptController extends Disposable {
  @Inject(IDescriptionService) private readonly _descriptionService: IDescriptionService,
  @Inject(TextSelectionManagerService) private readonly _textSelectionManagerService: TextSelectionManagerService,
  @IFormulaInputService private readonly _formulaInputService: IFormulaInputService,
- @Inject(DocViewModelManagerService) private readonly _docViewModelManagerService: DocViewModelManagerService
+ @Inject(DocViewModelManagerService) private readonly _docViewModelManagerService: DocViewModelManagerService,
+ @Inject(MergeCellService) private _mergeCellService: MergeCellService
  ) {
  super();
 
@@ -1369,7 +1366,7 @@ export class PromptController extends Disposable {
  return;
  }
 
- const { unitId, sheetId, skeleton } = this._getCurrentUnitIdAndSheetId();
+ const { unitId, sheetId } = this._getCurrentUnitIdAndSheetId();
 
  this._formulaInputService.enableLockedSelectionChange();
 
@@ -1381,7 +1378,7 @@ export class PromptController extends Disposable {
 
  let { startRow, endRow, startColumn, endColumn } = toRange;
 
- const primary = getCellInfoInMergeData(startRow, startColumn, skeleton?.mergeData);
+ const primary = this._mergeCellService.getCellInfoInfo(unitId, sheetId, startRow, startColumn);
 
  if (primary) {
  const {

packages/sheets-ui/src/controllers/auto-fill.controller.ts

@@ -30,7 +30,7 @@ import {
  toDisposable,
  Tools,
 } from '@univerjs/core';
-import { DeviceInputEventType, getCellInfoInMergeData } from '@univerjs/engine-render';
+import { DeviceInputEventType } from '@univerjs/engine-render';
 import type {
  IAddWorksheetMergeMutationParams,
  IRemoveWorksheetMergeMutationParams,
@@ -41,6 +41,7 @@ import {
  AddWorksheetMergeMutation,
  ClearSelectionContentCommand,
  getAddMergeMutationRangeByType,
+ MergeCellService,
  NORMAL_SELECTION_PLUGIN_NAME,
  RemoveMergeUndoMutationFactory,
  RemoveWorksheetMergeMutation,
@@ -83,7 +84,8 @@ export class AutoFillController extends Disposable {
  @IEditorBridgeService private readonly _editorBridgeService: IEditorBridgeService,
  @Inject(SheetInterceptorService) private readonly _sheetInterceptorService: SheetInterceptorService,
  @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,
- @Inject(Injector) private readonly _injector: Injector
+ @Inject(Injector) private readonly _injector: Injector,
+ @Inject(MergeCellService) private mergeCellService: MergeCellService
  ) {
  super();
  this._defaultHook = {
@@ -599,15 +601,15 @@ export class AutoFillController extends Disposable {
  }
 
  private _getMergeApplyData(source: IRange, target: IRange, direction: Direction, csLen: number) {
- const mergeData = this._univerInstanceService.getCurrentUniverSheetInstance().getActiveSheet().getMergeData();
+ const workbook = this._univerInstanceService.getCurrentUniverSheetInstance();
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
  const applyMergeRanges = [];
  for (let i = source.startRow; i <= source.endRow; i++) {
  for (let j = source.startColumn; j <= source.endColumn; j++) {
- const { isMergedMainCell, startRow, startColumn, endRow, endColumn } = getCellInfoInMergeData(
- i,
- j,
- mergeData
- );
+ const { isMergedMainCell, startRow, startColumn, endRow, endColumn } =
+ this.mergeCellService.getCellInfoInfo(unitId, subUnitId, i, j);
  if (isMergedMainCell) {
  if (direction === Direction.DOWN) {
  let windowStartRow = startRow + csLen;
@@ -799,17 +801,12 @@ export class AutoFillController extends Disposable {
  };
  // delete cross merge
  const deleteMergeRanges: IRange[] = [];
- const mergeData = this._univerInstanceService
- .getUniverSheetInstance(unitId)
- ?.getSheetBySheetId(subUnitId)
- ?.getMergeData();
- if (mergeData) {
- mergeData.forEach((merge) => {
- if (Rectangle.intersects(merge, target)) {
- deleteMergeRanges.push(merge);
- }
- });
- }
+ const mergeData = this.mergeCellService.getMergeData(unitId, subUnitId);
+ mergeData.forEach((merge) => {
+ if (Rectangle.intersects(merge, target)) {
+ deleteMergeRanges.push(merge);
+ }
+ });
  const removeMergeMutationParams: IRemoveWorksheetMergeMutationParams = {
  unitId,
  subUnitId,

packages/sheets-ui/src/controllers/clipboard/utils.ts

@@ -25,6 +25,7 @@ import type {
 import {
  AddMergeUndoMutationFactory,
  AddWorksheetMergeMutation,
+ MergeCellService,
  MoveRangeCommand,
  MoveRangeMutation,
  NORMAL_SELECTION_PLUGIN_NAME,
@@ -352,6 +353,7 @@ export function getClearAndSetMergeMutations(
  matrix: ObjectMatrix<ICellDataWithSpanInfo>,
  accessor: IAccessor
 ) {
+ const mergeCellService = accessor.get(MergeCellService);
  const redoMutationsInfo: IMutationInfo[] = [];
  const undoMutationsInfo: IMutationInfo[] = [];
  const { unitId, subUnitId, range } = pasteTo;
@@ -387,35 +389,30 @@ export function getClearAndSetMergeMutations(
  // remove current range's all merged Cell
  if (hasMerge) {
  // get all merged cells
- const currentService = accessor.get(IUniverInstanceService) as IUniverInstanceService;
- const workbook = currentService.getUniverSheetInstance(unitId);
- const worksheet = workbook?.getSheetBySheetId(subUnitId);
- if (workbook && worksheet) {
- const mergeData = worksheet.getMergeData();
- const mergedCellsInRange = mergeData.filter((rect) =>
- Rectangle.intersects({ startRow, startColumn, endRow, endColumn }, rect)
- );
-
- const removeMergeMutationParams: IRemoveWorksheetMergeMutationParams = {
- unitId,
- subUnitId,
- ranges: mergedCellsInRange,
- };
- redoMutationsInfo.push({
- id: RemoveWorksheetMergeMutation.id,
- params: removeMergeMutationParams,
- });
+ const mergeData = mergeCellService.getMergeData(unitId, subUnitId);
+ const mergedCellsInRange = mergeData.filter((rect) =>
+ Rectangle.intersects({ startRow, startColumn, endRow, endColumn }, rect)
+ );
+
+ const removeMergeMutationParams: IRemoveWorksheetMergeMutationParams = {
+ unitId,
+ subUnitId,
+ ranges: mergedCellsInRange,
+ };
+ redoMutationsInfo.push({
+ id: RemoveWorksheetMergeMutation.id,
+ params: removeMergeMutationParams,
+ });
 
-  const undoRemoveMergeMutationParams: IAddWorksheetMergeMutationParams = RemoveMergeUndoMutationFactory(
-  accessor,
-  removeMergeMutationParams
-  );
+ const undoRemoveMergeMutationParams: IAddWorksheetMergeMutationParams = RemoveMergeUndoMutationFactory(
+ accessor,
+ removeMergeMutationParams
+ );
 
- undoMutationsInfo.push({
- id: AddWorksheetMergeMutation.id,
- params: undoRemoveMergeMutationParams,
- });
- }
+ undoMutationsInfo.push({
+ id: AddWorksheetMergeMutation.id,
+ params: undoRemoveMergeMutationParams,
+ });
  }
 
  // set merged cell info

packages/sheets-ui/src/controllers/selection.controller.ts

@@ -31,6 +31,7 @@ import type { ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs
 import {
  convertSelectionDataToRange,
  getNormalSelectionStyle,
+ MergeCellService,
  NORMAL_SELECTION_PLUGIN_NAME,
  SelectionManagerService,
  SelectionMoveType,
@@ -57,7 +58,8 @@ export class SelectionController extends Disposable {
  @ISelectionRenderService
  private readonly _selectionRenderService: ISelectionRenderService,
  @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,
- @Inject(ThemeService) private readonly _themeService: ThemeService
+ @Inject(ThemeService) private readonly _themeService: ThemeService,
+ @Inject(MergeCellService) private _mergeCellService: MergeCellService
  ) {
  super();