@univerjs/sheets 0.2.13 → 0.2.15

package/lib/es/index.js

@@ -87,7 +87,7 @@ let SheetsSelectionsService = (_a = class extends RxDisposable {
     const { unitId, sheetId } = current;
     this._ensureWorkbookSelection(unitId).setSelections(
       sheetId,
-      unitIdOrSelections,
+      unitIdOrSelections != null ? unitIdOrSelections : selectionDatas,
       worksheetIdOrType != null ? worksheetIdOrType : 2
       /* MOVE_END */
     );
@@ -385,24 +385,6 @@ function getWorksheetDisposableID(unitId, worksheet) {
   return `${unitId}|${worksheet.getSheetId()}`;
 }
 __name(getWorksheetDisposableID, "getWorksheetDisposableID");
-function handleCustom(oldVal, newVal) {
-  const merge2 = mergeCustom(oldVal.custom, newVal.custom);
-  merge2 && Tools.removeNull(merge2), Tools.isEmptyObject(merge2) ? delete oldVal.custom : oldVal.custom = merge2;
-}
-__name(handleCustom, "handleCustom");
-function mergeCustom(oldCustom, newCustom) {
-  return newCustom === null ? newCustom : newCustom === void 0 ? oldCustom : { ...oldCustom, ...newCustom };
-}
-__name(mergeCustom, "mergeCustom");
-function transformCustom(oldCustom, newCustom) {
-  if (!newCustom || !Object.keys(newCustom).length)
-    return oldCustom;
-  const backupCustom = oldCustom || {};
-  for (const k in newCustom)
-    k in backupCustom || (backupCustom[k] = null);
-  return backupCustom;
-}
-__name(transformCustom, "transformCustom");
 function handleStyle(styles, oldVal, newVal) {
   var _a20;
   const oldStyle = styles.getStyleByCell(oldVal);
@@ -553,7 +535,7 @@ const SetRangeValuesUndoMutationFactory = /* @__PURE__ */ __name((accessor, para
   const cellMatrix = worksheet.getCellMatrix(), styles = workbook.getStyles(), undoData = new ObjectMatrix();
   return new ObjectMatrix(cellValue).forValue((row, col, newVal) => {
     const cell = Tools.deepClone(cellMatrix == null ? void 0 : cellMatrix.getValue(row, col)) || {}, oldStyle = styles.getStyleByCell(cell), newStyle = styles.getStyleByCell(newVal);
-    cell.s = transformStyle(oldStyle, newStyle), cell.custom = transformCustom(cell.custom, newVal == null ? void 0 : newVal.custom), undoData.setValue(row, col, setNull(cell));
+    cell.s = transformStyle(oldStyle, newStyle), undoData.setValue(row, col, setNull(cell));
   }), {
     ...params,
     options: {},
@@ -575,7 +557,7 @@ const SetRangeValuesUndoMutationFactory = /* @__PURE__ */ __name((accessor, para
         cellMatrix == null || cellMatrix.setValue(row, col, {});
       else {
         const oldVal = cellMatrix.getValue(row, col) || {}, type = getCellType(styles, newVal, oldVal);
-        newVal.f !== void 0 && (oldVal.f = newVal.f), newVal.si !== void 0 && (oldVal.si = newVal.si), newVal.p !== void 0 && (oldVal.p = newVal.p), newVal.v !== void 0 && (oldVal.v = getCellValue(type, newVal)), oldVal.v !== void 0 && (oldVal.t = type, oldVal.v = getCellValue(type, oldVal)), newVal.s !== void 0 && handleStyle(styles, oldVal, newVal), newVal.custom !== void 0 && handleCustom(oldVal, newVal), cellMatrix.setValue(row, col, Tools.removeNull(oldVal));
+        newVal.f !== void 0 && (oldVal.f = newVal.f), newVal.si !== void 0 && (oldVal.si = newVal.si), newVal.p !== void 0 && (oldVal.p = newVal.p), newVal.v !== void 0 && (oldVal.v = getCellValue(type, newVal)), oldVal.v !== void 0 && (oldVal.t = type, oldVal.v = getCellValue(type, oldVal)), newVal.s !== void 0 && handleStyle(styles, oldVal, newVal), newVal.custom !== void 0 && (oldVal.custom = newVal.custom), cellMatrix.setValue(row, col, Tools.removeNull(oldVal));
       }
     }), !0;
   }, "handler")
@@ -2737,7 +2719,7 @@ const RemoveRowCommandId = "sheet.command.remove-row", RemoveRowCommand = {
     const mergeConfigData = worksheet.getConfig().mergeData, mergeAppendData = params.ranges;
     for (let i = 0; i < mergeAppendData.length; i++)
       mergeConfigData.push(mergeAppendData[i]);
-    return !0;
+    return worksheet.getSpanModel().rebuild(mergeConfigData), !0;
   }, "handler")
 }, RemoveMergeUndoMutationFactory = /* @__PURE__ */ __name((accessor, params) => {
   const universheet = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);
@@ -2772,7 +2754,7 @@ const RemoveRowCommandId = "sheet.command.remove-row", RemoveRowCommand = {
         const configMerge = mergeConfigData[i], removeMerge = mergeRemoveData[j];
         Rectangle.intersects(configMerge, removeMerge) && mergeConfigData.splice(i, 1);
       }
-    return !0;
+    return worksheet.getSpanModel().rebuild(mergeConfigData), !0;
   }, "handler")
 }, RemoveWorksheetMergeCommand = {
   type: CommandType.COMMAND,
@@ -2925,7 +2907,7 @@ const SetBorderBasicCommand = {
     var _a20;
     const commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), univerInstanceService = accessor.get(IUniverInstanceService), selectionManagerService = accessor.get(SheetsSelectionsService), borderStyleManagerService = accessor.get(BorderStyleManagerService), target = getSheetCommandTarget(univerInstanceService, params);
     if (!target) return !1;
-    const { worksheet, unitId, subUnitId } = target, selections = (_a20 = selectionManagerService.getCurrentSelections()) == null ? void 0 : _a20.map((s) => s.range), mergeData = worksheet.getConfig().mergeData;
+    const { worksheet, unitId, subUnitId } = target, selections = (_a20 = selectionManagerService.getCurrentSelections()) == null ? void 0 : _a20.map((s) => s.range);
     if (!(selections != null && selections.length))
       return !1;
     const { style, color, type, activeBorderType } = borderStyleManagerService.getBorderInfo();
@@ -2975,21 +2957,11 @@ const SetBorderBasicCommand = {
       cl: {
         rgb: color
       }
-    }, hasMerge = /* @__PURE__ */ __name((row, column) => {
-      let res = null;
-      return mergeData.forEach((merge2) => {
-        Rectangle.intersects(merge2, {
-          startColumn: column,
-          endColumn: column,
-          startRow: row,
-          endRow: row
-        }) && (res = merge2);
-      }), res;
-    }, "hasMerge");
+    };
     function setBorderStyle(range2, defaultStyle, reserve) {
       range2.startRow < 0 || range2.startColumn < 0 || forEach(range2, (row, column) => {
         var _a21, _b;
-        const rectangle = hasMerge(row, column);
+        const rectangle = worksheet.getMergedCell(row, column);
         let bdStyle = defaultStyle;
         if (rectangle && (defaultStyle.bc_tr || defaultStyle.ml_tr || defaultStyle.bl_tr || defaultStyle.tl_mr || defaultStyle.tl_bc || defaultStyle.tl_br)) {
           if (reserve) {
@@ -3014,7 +2986,7 @@ const SetBorderBasicCommand = {
     }
     __name(setBorderStyle, "setBorderStyle"), top && (setBorderStyle(topRangeOut, { b: null }), setBorderStyle(topRange, { t: Tools.deepClone(border) }, !0)), bottom && (setBorderStyle(bottomRangeOut, { t: null }), setBorderStyle(bottomRange, { b: Tools.deepClone(border) }, !0)), left && (setBorderStyle(leftRangeOut, { r: null }), setBorderStyle(leftRange, { l: Tools.deepClone(border) }, !0)), right && (setBorderStyle(rightRangeOut, { l: null }), setBorderStyle(rightRange, { r: Tools.deepClone(border) }, !0)), tl_br && setBorderStyle(range, { tl_br: Tools.deepClone(border) }, !0), tl_bc && setBorderStyle(range, { tl_bc: Tools.deepClone(border) }, !0), tl_mr && setBorderStyle(range, { tl_mr: Tools.deepClone(border) }, !0), bl_tr && setBorderStyle(range, { bl_tr: Tools.deepClone(border) }, !0), ml_tr && setBorderStyle(range, { ml_tr: Tools.deepClone(border) }, !0), bc_tr && setBorderStyle(range, { bc_tr: Tools.deepClone(border) }, !0), vertical && forEach(range, (row, column) => {
       var _a21, _b, _c, _d;
-      const rectangle = hasMerge(row, column);
+      const rectangle = worksheet.getMergedCell(row, column);
       if (rectangle) {
         if (rectangle.endColumn !== range.endColumn) {
           const style2 = (_a21 = mr.getValue(rectangle.startRow, rectangle.startColumn)) == null ? void 0 : _a21.s;
@@ -3052,7 +3024,7 @@ const SetBorderBasicCommand = {
       }
     }), horizontal && forEach(range, (row, column) => {
       var _a21, _b, _c, _d;
-      const rectangle = hasMerge(row, column);
+      const rectangle = worksheet.getMergedCell(row, column);
       if (rectangle) {
         if (rectangle.endRow !== range.endRow) {
           const style2 = (_a21 = mr.getValue(rectangle.startRow, rectangle.startColumn)) == null ? void 0 : _a21.s;
@@ -3090,7 +3062,7 @@ const SetBorderBasicCommand = {
       }
     }), !top && !bottom && !left && !right && !vertical && !horizontal && !tl_br && !tl_bc && !tl_mr && !bl_tr && !ml_tr && !bc_tr && (setBorderStyle(topRangeOut, { b: null }), setBorderStyle(topRange, { t: null }, !0), setBorderStyle(bottomRangeOut, { t: null }), setBorderStyle(bottomRange, { b: null }, !0), setBorderStyle(leftRangeOut, { r: null }), setBorderStyle(leftRange, { l: null }, !0), setBorderStyle(rightRangeOut, { l: null }), setBorderStyle(rightRange, { r: null }, !0), setBorderStyle(range, { tl_br: null }, !0), setBorderStyle(range, { tl_bc: null }, !0), setBorderStyle(range, { tl_mr: null }, !0), setBorderStyle(range, { bl_tr: null }, !0), setBorderStyle(range, { ml_tr: null }, !0), setBorderStyle(range, { bc_tr: null }, !0), forEach(range, (row, column) => {
       var _a21, _b, _c, _d, _e, _f, _g, _h;
-      const rectangle = hasMerge(row, column);
+      const rectangle = worksheet.getMergedCell(row, column);
       if (rectangle) {
         if (rectangle.endColumn !== range.endColumn) {
           const style2 = (_a21 = mr.getValue(rectangle.startRow, rectangle.startColumn)) == null ? void 0 : _a21.s;
@@ -3237,6 +3209,7 @@ const SetBorderBasicCommand = {
     }, setSelectionOperationParams = {
       unitId,
       subUnitId,
+      reveal: !0,
       selections: ranges.map((r) => ({ range: r, primary: getPrimaryForRange(r, worksheet), style: null }))
     }, undoMutationParams = SetColVisibleUndoMutationFactory(accessor, redoMutationParams), undoSetSelectionsOperationParams = {
       unitId,
@@ -3307,6 +3280,7 @@ const SetBorderBasicCommand = {
     }, undoMutationParams = SetColHiddenUndoMutationFactory(accessor, redoMutationParams), undoSetSelectionsOperationParams = {
       unitId,
       subUnitId,
+      reveal: !0,
       selections: ranges.map((range) => ({
         range,
         primary: getPrimaryForRange(range, worksheet),
@@ -3497,6 +3471,7 @@ const SetFrozenMutationFactory = /* @__PURE__ */ __name((accessor, params) => {
     const { worksheet } = target, redoMutationParams = { unitId, subUnitId, ranges }, setSelectionOperationParams = {
       unitId,
       subUnitId,
+      reveal: !0,
       selections: ranges.map((range) => ({
         range,
         primary: getPrimaryForRange(range, worksheet),
@@ -3574,6 +3549,7 @@ const SetFrozenMutationFactory = /* @__PURE__ */ __name((accessor, params) => {
     }, undoMutationParams = SetRowHiddenUndoMutationFactory(accessor, redoMutationParams), undoSetSelectionsOperationParams = {
       unitId,
       subUnitId,
+      reveal: !0,
       selections: ranges.map((range) => ({
         range,
         primary: getPrimaryForRange(range, worksheet),
@@ -4287,7 +4263,7 @@ const SetStyleCommand = {
     var _a20;
     const { ranges, rowHeight } = params, univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, params);
     if (!target) return !1;
-    const { worksheet } = target, defaultRowHeight = worksheet.getConfig().defaultRowHeight, manager = worksheet.getRowManager();
+    const { worksheet } = target, manager = worksheet.getRowManager(), defaultRowHeight = worksheet.getConfig().defaultRowHeight;
     for (const { startRow, endRow } of ranges)
       for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) {
         const row = manager.getRowOrCreate(rowIndex);
@@ -7388,17 +7364,11 @@ let MergeCellController = (_a11 = class extends Disposable {
       unitId,
       subUnitId,
       ranges: removeMergeData
-    }, undoRemoveMergeParams = RemoveMergeUndoMutationFactory(
-      this._injector,
-      removeMergeParams
-    ), addMergeParams = {
+    }, undoRemoveMergeParams = RemoveMergeUndoMutationFactory(this._injector, removeMergeParams), addMergeParams = {
       unitId,
       subUnitId,
       ranges: addMergeData
-    }, undoAddMergeParams = AddMergeUndoMutationFactory(
-      this._injector,
-      addMergeParams
-    );
+    }, undoAddMergeParams = AddMergeUndoMutationFactory(this._injector, addMergeParams);
     return {
       redos: [
         { id: RemoveWorksheetMergeMutation.id, params: removeMergeParams },
@@ -7434,7 +7404,7 @@ let MergeCellController = (_a11 = class extends Disposable {
         mergeData.forEach((merge2) => {
           let { startRow, endRow, startColumn, endColumn, rangeType } = merge2;
           Rectangle.intersects(merge2, sourceRange) || (isRowMove ? sourceStart < startRow && targetStart > endRow ? (startRow -= moveLength, endRow -= moveLength) : sourceStart > endRow && targetStart <= startRow && (startRow += moveLength, endRow += moveLength) : sourceStart < startColumn && targetStart > endColumn ? (startColumn -= moveLength, endColumn -= moveLength) : sourceStart > endColumn && targetStart <= startColumn && (startColumn += moveLength, endColumn += moveLength)), merge2.startRow === merge2.endRow && merge2.startColumn === merge2.endColumn || adjustedMergedCells.push({ startRow, endRow, startColumn, endColumn, rangeType });
-        }), worksheet.getConfig().mergeData = adjustedMergedCells, this.disposableCollection.dispose();
+        }), worksheet.setMergeData(adjustedMergedCells), this.disposableCollection.dispose();
         const { unitId, subUnitId } = command.params, handler = /* @__PURE__ */ __name((config) => this.refRangeHandle(config, unitId, subUnitId), "handler");
         adjustedMergedCells.forEach((range) => {
           this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
@@ -7451,7 +7421,7 @@ let MergeCellController = (_a11 = class extends Disposable {
         mergeData.forEach((merge2) => {
           let { startRow, endRow, startColumn, endColumn, rangeType } = merge2;
           isAddOperation ? isRowOperation ? operationStart <= startRow && (startRow += operationCount, endRow += operationCount) : operationStart <= startColumn && (startColumn += operationCount, endColumn += operationCount) : isRowOperation ? operationEnd < startRow && (startRow -= operationCount, endRow -= operationCount) : operationEnd < startColumn && (startColumn -= operationCount, endColumn -= operationCount), merge2.startRow === merge2.endRow && merge2.startColumn === merge2.endColumn || adjustedMergedCells.push({ startRow, endRow, startColumn, endColumn, rangeType });
-        }), worksheet.getConfig().mergeData = adjustedMergedCells, this.disposableCollection.dispose();
+        }), worksheet.setMergeData(adjustedMergedCells), this.disposableCollection.dispose();
         const { unitId, subUnitId } = command.params, handler = /* @__PURE__ */ __name((config) => this.refRangeHandle(config, unitId, subUnitId), "handler");
         adjustedMergedCells.forEach((range2) => {
           this.disposableCollection.add(this._refRangeService.registerRefRange(range2, handler, unitId, subUnitId));
@@ -8370,9 +8340,7 @@ function hasValueFromMatrixWithSpanInfo(cell, matrix) {
 }
 __name(hasValueFromMatrixWithSpanInfo, "hasValueFromMatrixWithSpanInfo");
 function getMatrixWithSpanInfo(worksheet, startRow, startColumn, endRow, endColumn) {
-  const matrix = worksheet.getCellMatrix(), mergedCellsInRange = worksheet.getSnapshot().mergeData.filter(
-    (rect) => Rectangle.intersects({ startRow, startColumn, endRow, endColumn }, rect)
-  ), returnCellMatrix = new ObjectMatrix();
+  const matrix = worksheet.getCellMatrix(), mergedCellsInRange = worksheet.getSpanModel().getMergedCellRange(startRow, startColumn, endRow, endColumn), returnCellMatrix = new ObjectMatrix();
   return matrix.forValue((row, col) => {
     const v = matrix.getValue(row, col);
     v && returnCellMatrix.setValue(row, col, v);

package/lib/types/basics/selection.d.ts

@@ -136,6 +136,7 @@ export declare function convertPrimaryWithCoordToPrimary(primaryWithCoord: ISele
     endColumn: number;
 };
 /**
+ * @deprecated Use worksheet.getCellInfoInMergeData or SpreadsheetSkeleton.getCellByIndex instead
  * Convert the coordinates of a single cell into a selection data.
  * @param row Specified Row Coordinate
  * @param column Specified Column Coordinate

package/lib/types/commands/commands/set-border-command.d.ts

@@ -1,4 +1,4 @@
-import { BorderStyleTypes, ICommand, BorderType } from '@univerjs/core';
+import { BorderType, BorderStyleTypes, ICommand } from '@univerjs/core';
 import { IBorderInfo } from '../../services/border-style-manager.service';
 export interface ISetBorderBasicCommandParams {
     unitId?: string;

package/lib/types/commands/operations/selection.operation.d.ts

@@ -6,5 +6,7 @@ export interface ISetSelectionsOperationParams {
     subUnitId: string;
     selections: ISelectionWithStyle[];
     type?: SelectionMoveType;
+    /** If should scroll to the selected range. */
+    reveal?: boolean;
 }
 export declare const SetSelectionsOperation: IOperation<ISetSelectionsOperationParams>;

package/lib/types/controllers/merge-cell.controller.d.ts

@@ -1,9 +1,9 @@
-import { IRange, Dimension, Disposable, DisposableCollection, ICommandService, Injector, InterceptorManager, IUniverInstanceService } from '@univerjs/core';
-import { IRemoveWorksheetMergeMutationParams } from '../basics/interfaces/mutation-interface';
+import { Dimension, Disposable, DisposableCollection, ICommandService, Injector, InterceptorManager, IUniverInstanceService, IRange } from '@univerjs/core';
 import { RefRangeService } from '../services/ref-range/ref-range.service';
-import { EffectRefRangeParams } from '../services/ref-range/type';
 import { SheetsSelectionsService } from '../services/selections/selection-manager.service';
 import { SheetInterceptorService } from '../services/sheet-interceptor/sheet-interceptor.service';
+import { IRemoveWorksheetMergeMutationParams } from '../basics/interfaces/mutation-interface';
+import { EffectRefRangeParams } from '../services/ref-range/type';
 /**
  * calculates the selection based on the merged cell type
  * @param {IRange[]} selection

package/lib/types/index.d.ts

@@ -109,6 +109,7 @@ export { SetWorksheetPermissionPointsCommand } from './commands/commands/set-wor
 export { SetWorksheetRightToLeftCommand } from './commands/commands/set-worksheet-right-to-left.command';
 export { DeltaRowHeightCommand, SetRowHeightCommand, SetWorksheetRowIsAutoHeightCommand, type IDeltaRowHeightCommand, type ISetWorksheetRowIsAutoHeightCommandParams, } from './commands/commands/set-worksheet-row-height.command';
 export { SetWorksheetShowCommand } from './commands/commands/set-worksheet-show.command';
+export type { ISetWorksheetShowCommandParams } from './commands/commands/set-worksheet-show.command';
 export { AddRangeProtectionMutation, FactoryAddRangeProtectionMutation, type IAddRangeProtectionMutationParams } from './commands/mutations/add-range-protection.mutation';
 export { AddWorksheetMergeMutation, AddMergeUndoMutationFactory } from './commands/mutations/add-worksheet-merge.mutation';
 export { AddWorksheetProtectionMutation, type IAddWorksheetProtectionParams } from './commands/mutations/add-worksheet-protection.mutation';