fix(sheet): render refresh

packages/base-render/src/Component/Sheets/SheetSkeleton.ts

@@ -355,8 +355,9 @@ export class SpreadsheetSkeleton extends Skeleton {
  }
 
  const { mergeData } = this._config;
-
- this._rowColumnSegment = this.getRowColumnSegment(bounds);
+ if (bounds != null) {
+ this._rowColumnSegment = this.getRowColumnSegment(bounds);
+ }
  this._dataMergeCache = mergeData && this._getMergeCells(mergeData, this._rowColumnSegment);
  this._calculateStylesCache();
  // this._overflowCache = this._calculateOverflowCache();
@@ -822,7 +823,14 @@ export class SpreadsheetSkeleton extends Skeleton {
  return rowHeightAccumulation[lastRowIndex] + columnHeaderHeightAndMarginTop;
  }
 
- getCellByIndex(row: number, column: number, scaleX: number, scaleY: number) {
+ /**
+ * Return cell information corresponding to the current coordinates, including the merged cell object.
+ * @param row Specified Row Coordinate
+ * @param column Specified Column Coordinate
+ * @param scaleX render scene scale x-axis, current Horizontal Scale, scene.getAncestorScale
+ * @param scaleY render scene scale y-axis, current Vertical Scale, scene.getAncestorScale
+ */
+ getCellByIndex(row: number, column: number, scaleX: number, scaleY: number): ISelectionCellWithCoord {
  const {
  rowHeightAccumulation,
  columnWidthAccumulation,

packages/base-sheets/src/Basics/Const/COMMAND_LISTENER_CONST.ts

@@ -28,10 +28,10 @@ export const COMMAND_LISTENER_SKELETON_CHANGE = [
  AddWorksheetMergeMutation.id,
  RemoveWorksheetMergeMutation.id,
  MoveRowsMutation.id,
- SetRangeValuesMutation.id,
- SetBorderStylesMutation.id,
  SetColHiddenMutation.id,
  SetColVisibleMutation.id,
  SetRowHiddenMutation.id,
  SetRowVisibleMutation.id,
 ];
+
+export const COMMAND_LISTENER_VALUE_CHANGE = [SetBorderStylesMutation.id, SetRangeValuesMutation.id];

packages/base-sheets/src/Basics/selection.ts

@@ -105,6 +105,14 @@ export function getNormalSelectionStyle(themeService: ThemeService): ISelectionS
  };
 }
 
+/**
+ * Process a selection with coordinates and style,
+ * and extract the coordinate information, because the render needs coordinates when drawing.
+ * Since the selection.manager.service is unrelated to the coordinates,
+ * it only accepts data of type ISelectionWithStyle, so a conversion is necessary.
+ * @param selectionWithCoordAndStyle Selection with coordinates and style
+ * @returns
+ */
 export function convertSelectionDataToRange(
  selectionWithCoordAndStyle: ISelectionWithCoordAndStyle
 ): ISelectionWithStyle {
@@ -137,6 +145,13 @@ export function convertSelectionDataToRange(
  return result;
 }
 
+/**
+ * Convert the coordinates of a single cell into a selection data.
+ * @param row Specified Row Coordinate
+ * @param column Specified Column Coordinate
+ * @param mergeData Obtain the data of merged cells through the worksheet object.
+ * @returns ISelectionWithStyle
+ */
 export function transformCellDataToSelectionData(
  row: number,
  column: number,

packages/base-sheets/src/Controller/sheet-render.controller.ts

@@ -91,13 +91,11 @@ export class SheetRenderController extends Disposable {
  }
 
  private _commandExecutedListener() {
- const updateCommandList = COMMAND_LISTENER_SKELETON_CHANGE;
-
  this.disposeWithMe(
  this._commandService.onCommandExecuted((command: ICommandInfo) => {
- if (updateCommandList.includes(command.id)) {
-  const workbook = this._currentUniverService.getCurrentUniverSheetInstance();
-  const unitId = workbook.getUnitId();
+ const workbook = this._currentUniverService.getCurrentUniverSheetInstance();
+ const unitId = workbook.getUnitId();
+ if (COMMAND_LISTENER_SKELETON_CHANGE.includes(command.id)) {
  const worksheet = workbook.getActiveSheet();
  const sheetId = worksheet.getSheetId();
  const params = command.params;
@@ -123,8 +121,11 @@ export class SheetRenderController extends Disposable {
  commandId: command.id,
  });
  }
+ // else if (COMMAND_LISTENER_VALUE_CHANGE.includes(command.id)) {
+ // this._sheetSkeletonManagerService.reCalculate();
+ // }
 
- this._renderManagerService.getCurrent()?.mainComponent?.makeDirty(); // refresh spreadsheet
+ this._renderManagerService.getRenderById(unitId)?.mainComponent?.makeDirty(); // refresh spreadsheet
  })
  );
  }

packages/base-sheets/src/commands/commands/set-selections.command.ts

@@ -33,9 +33,18 @@ import {
 
 // TODO@wzhudev: we also need to handle when the current selection is the whole spreadsheet, whole rows or whole columns
 
+// TODO@DR-UNIVER: moveStepPage and moveStepEnd implement
+export enum JumpOver {
+ moveStopeOne,
+ moveGap,
+ moveStepPage,
+ moveStepEnd,
+}
+
 export interface IMoveSelectionCommandParams {
  direction: Direction;
- jumpOver?: boolean;
+ jumpOver?: JumpOver;
+ nextStep?: number;
 }
 
 /**
@@ -61,9 +70,10 @@ export const MoveSelectionCommand: ICommand<IMoveSelectionCommandParams> = {
  const startRange = getStartRange(range, primary, direction);
 
  // the start range is from the primary selection range
- const next = jumpOver
- ? findNextGapRange(startRange, direction, worksheet)
- : findNextRange(startRange, direction, worksheet);
+ const next =
+ jumpOver === JumpOver.moveGap
+ ? findNextGapRange(startRange, direction, worksheet)
+ : findNextRange(startRange, direction, worksheet);
  const destRange = getCellAtRowCol(next.startRow, next.startColumn, worksheet);
 
  if (Rectangle.equals(destRange, startRange)) {
@@ -140,6 +150,7 @@ export const MoveSelectionEnterAndTabCommand: ICommand<IMoveSelectionEnterAndTab
  let resultRange;
  const { startRow, endRow, startColumn, endColumn } = range;
  if (startRow < endRow || startColumn < endColumn) {
+ // Handle the situation of moving the active cell within the selection area.
  shortcutExperienceService.remove({
  unitId,
  sheetId,
@@ -182,6 +193,7 @@ export const MoveSelectionEnterAndTabCommand: ICommand<IMoveSelectionEnterAndTab
  },
  };
  } else {
+ // Handle the regular situation of moving the selection area.
  if (keycode === KeyCode.TAB) {
  if (shortcutExperienceParam == null) {
  shortcutExperienceService.addOrUpdate({
@@ -241,8 +253,8 @@ export const MoveSelectionEnterAndTabCommand: ICommand<IMoveSelectionEnterAndTab
 
 export interface IExpandSelectionCommandParams {
  direction: Direction;
-
- jumpOver?: boolean;
+ jumpOver?: JumpOver;
+ nextStep?: number;
 }
 
 // Though the command's name is "expand-selection", it actually does not expand but shrink the selection.
@@ -269,10 +281,10 @@ export const ExpandSelectionCommand: ICommand<IExpandSelectionCommandParams> = {
  const isShrink = checkIfShrink(selection, direction, currentWorksheet);
 
  const destRange = !isShrink
- ? jumpOver
+ ? jumpOver === JumpOver.moveGap
  ? expandToNextGapRange(startRange, direction, currentWorksheet)
  : expandToNextCell(startRange, direction, currentWorksheet)
- : jumpOver
+ : jumpOver === JumpOver.moveGap
  ? shrinkToNextGapRange(
  startRange,
  // TODO: should fix on SelectionManagerService's side

packages/base-sheets/src/commands/commands/utils/selection-util.ts

@@ -62,7 +62,8 @@ export function findNextRange(
  direction: Direction,
  worksheet: Worksheet,
  boundary?: IRange,
- isFindNext: boolean = true
+ isFindNext: boolean = true,
+ nextStep: number = 1
 ): IRange {
  let destRange: IRange = { ...startRange };
 
@@ -82,7 +83,7 @@ export function findNextRange(
  let next: number;
  switch (direction) {
  case Direction.UP:
- next = startRange.startRow - 1;
+ next = startRange.startRow - nextStep;
  while (next > -1 && !worksheet.getRowVisible(next)) {
  next -= 1;
  }
@@ -99,7 +100,7 @@ export function findNextRange(
  }
  break;
  case Direction.DOWN:
- next = startRange.endRow + 1;
+ next = startRange.endRow + nextStep;
  while (next < worksheet.getRowCount() && !worksheet.getRowVisible(next)) {
  next += 1;
  }
@@ -116,7 +117,7 @@ export function findNextRange(
  }
  break;
  case Direction.LEFT:
- next = startRange.startColumn - 1;
+ next = startRange.startColumn - nextStep;
  while (next > -1 && !worksheet.getColVisible(next)) {
  next -= 1;
  }
@@ -133,7 +134,7 @@ export function findNextRange(
  }
  break;
  case Direction.RIGHT:
- next = startRange.endColumn + 1;
+ next = startRange.endColumn + nextStep;
  while (next < worksheet.getColumnCount() && !worksheet.getColVisible(next)) {
  next += 1;
  }

packages/base-sheets/src/index.ts

@@ -87,6 +87,7 @@ export type {
 export {
  ExpandSelectionCommand,
  type IMoveSelectionEnterAndTabCommandParams,
+ JumpOver,
  MoveSelectionCommand,
  MoveSelectionEnterAndTabCommand,
  SelectAllCommand,

packages/base-sheets/src/services/sheet-skeleton-manager.service.ts

@@ -61,11 +61,7 @@ export class SheetSkeletonManagerService implements IDisposable {
  setCurrent(searchParam: ISheetSkeletonManagerSearch): Nullable<ISheetSkeletonManagerParam> {
  const param = this._getCurrentBySearch(searchParam);
  if (param != null) {
- if (param.dirty) {
- param.skeleton.makeDirty(true);
- param.dirty = false;
- }
- param.skeleton.calculate();
+ this._reCalculate(param);
  } else {
  const { unitId, sheetId } = searchParam;
 
@@ -98,6 +94,22 @@ export class SheetSkeletonManagerService implements IDisposable {
  return this.getCurrent();
  }
 
+ reCalculate() {
+ const param = this.getCurrent();
+ if (param == null) {
+ return;
+ }
+ this._reCalculate(param);
+ }
+
+ private _reCalculate(param: ISheetSkeletonManagerParam) {
+ if (param.dirty) {
+ param.skeleton.makeDirty(true);
+ param.dirty = false;
+ }
+ param.skeleton.calculate();
+ }
+
  makeDirtyCurrent(state: boolean = true) {
  this.makeDirty(this._currentSkeleton, state);
  }

packages/base-ui/src/controllers/shared-shortcut.controller.ts

@@ -25,6 +25,8 @@ export class SharedController extends Disposable {
  @ICommandService private readonly _commandService: ICommandService
  ) {
  super();
+
+ this.initialize();
  }
 
  initialize(): void {

packages/ui-plugin-sheets/src/controller/sheet-ui.controller.ts

@@ -110,12 +110,7 @@ import {
  EditorDeleteLeftShortcutInActive,
  generateArrowSelectionShortCuItem,
 } from './shortcuts/editor.shortcut';
-import {
- SetColHiddenShortcutItem,
- SetRedoShortcutItem,
- SetRowHiddenShortcutItem,
- SetUndoShortcutItem,
-} from './shortcuts/operation.shortcut';
+import { SetColHiddenShortcutItem, SetRowHiddenShortcutItem } from './shortcuts/operation.shortcut';
 import {
  ExpandSelectionDownShortcutItem,
  ExpandSelectionEndDownShortcutItem,
@@ -320,8 +315,6 @@ export class SheetUIController extends Disposable {
  EditorCursorEscShortcut,
 
  // operation shortcuts
- SetUndoShortcutItem,
- SetRedoShortcutItem,
  SetRowHiddenShortcutItem,
  SetColHiddenShortcutItem,
  ].forEach((item) => {

packages/ui-plugin-sheets/src/controller/shortcuts/operation.shortcut.ts

@@ -1,22 +1,21 @@
 import { SetColHiddenCommand, SetRowHiddenCommand } from '@univerjs/base-sheets';
 import { IShortcutItem, KeyCode, MetaKeys } from '@univerjs/base-ui';
-import { RedoCommand, UndoCommand } from '@univerjs/core';
 
 import { whenEditorNotActivated } from './utils';
 
-export const SetUndoShortcutItem: IShortcutItem = {
- id: UndoCommand.id,
- // when focusing on any other input tag do not trigger this shortcut
- preconditions: (contextService) => whenEditorNotActivated(contextService),
- binding: KeyCode.Z | MetaKeys.CTRL_COMMAND,
-};
+// export const SetUndoShortcutItem: IShortcutItem = {
+//  id: UndoCommand.id,
+//  // when focusing on any other input tag do not trigger this shortcut
+//  preconditions: (contextService) => whenEditorNotActivated(contextService),
+//  binding: KeyCode.Z | MetaKeys.CTRL_COMMAND,
+// };
 
-export const SetRedoShortcutItem: IShortcutItem = {
- id: RedoCommand.id,
- // when focusing on any other input tag do not trigger this shortcut
- preconditions: (contextService) => whenEditorNotActivated(contextService),
- binding: KeyCode.Y | MetaKeys.CTRL_COMMAND,
-};
+// export const SetRedoShortcutItem: IShortcutItem = {
+//  id: RedoCommand.id,
+//  // when focusing on any other input tag do not trigger this shortcut
+//  preconditions: (contextService) => whenEditorNotActivated(contextService),
+//  binding: KeyCode.Y | MetaKeys.CTRL_COMMAND,
+// };
 
 export const SetRowHiddenShortcutItem: IShortcutItem = {
  id: SetRowHiddenCommand.id,