@univerjs/sheets 0.23.0 → 0.24.0

package/lib/index.js

@@ -1624,7 +1624,7 @@ const MoveRangeMutation = {
 	handler: (accessor, params) => {
 		const { from, to } = params;
 		if (!from || !to) return false;
-		const workbook = accessor.get(IUniverInstanceService).getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = accessor.get(IUniverInstanceService).getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return false;
 		const fromWorksheet = workbook.getSheetBySheetId(params.from.subUnitId);
 		const toWorksheet = workbook.getSheetBySheetId(params.to.subUnitId);
@@ -3838,7 +3838,7 @@ function discreteRangeToRange(discreteRange) {
 }
 function rangeToDiscreteRange(range, accessor, unitId, subUnitId) {
 	const univerInstanceService = accessor.get(IUniverInstanceService);
-	const workbook = unitId ? univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET) : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+	const workbook = unitId ? univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET) : univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 	const worksheet = subUnitId ? workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId) : workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
 	if (!worksheet) return null;
 	const { startRow, endRow, startColumn, endColumn } = range;
@@ -4265,7 +4265,7 @@ var WorkbookSelectionModel = class extends Disposable {
 //#region src/services/selections/selection.service.ts
 let SheetsSelectionsService = class SheetsSelectionsService extends RxDisposable {
 	get _currentSelectionPos() {
-		const workbook = this._instanceSrv.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = this._instanceSrv.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return null;
 		const worksheet = workbook.getActiveSheet();
 		return {
@@ -4446,7 +4446,7 @@ let SheetsSelectionsService = class SheetsSelectionsService extends RxDisposable
 	*/
 	getCellStylesProperty(property) {
 		var _this$_instanceSrv$ge;
-		const worksheet = (_this$_instanceSrv$ge = this._instanceSrv.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) === null || _this$_instanceSrv$ge === void 0 ? void 0 : _this$_instanceSrv$ge.getActiveSheet();
+		const worksheet = (_this$_instanceSrv$ge = this._instanceSrv.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET)) === null || _this$_instanceSrv$ge === void 0 ? void 0 : _this$_instanceSrv$ge.getActiveSheet();
 		const selections = this.getCurrentSelections();
 		if (!worksheet || selections.length === 0) return {
 			isAllValuesSame: false,
@@ -5373,7 +5373,7 @@ const SetRangeValuesCommand = {
 };
 
 //#endregion
-//#region src/commands/utils/handle-range-mutation.ts
+//#region src/commands/utils/handle-range.mutation.ts
 /**
 * InsertRange is not a mutation but combination of `SetRangeValuesMutation` and `MoveRangeMutation`.
 * @param accessor
@@ -8581,7 +8581,7 @@ let MergeCellController = class MergeCellController extends Disposable {
 				case ClearSelectionAllCommand.id:
 				case ClearSelectionFormatCommand.id: {
 					var _self$_selectionManag;
-					const workbook = self._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+					const workbook = self._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 					const unitId = workbook.getUnitId();
 					const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
 					if (!worksheet) return {
@@ -9531,7 +9531,7 @@ MergeCellController = __decorate([
 ], MergeCellController);
 function getWorkbook(univerInstanceService, unitId) {
 	if (unitId) return univerInstanceService.getUniverSheetInstance(unitId);
-	return univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+	return univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 }
 function getWorksheet(workbook, subUnitId) {
 	if (subUnitId) return workbook.getSheetBySheetId(subUnitId);
@@ -13093,7 +13093,7 @@ var BorderStyleManagerService = class {
 };
 
 //#endregion
-//#region src/commands/commands/set-border-command.ts
+//#region src/commands/commands/set-border.command.ts
 function forEach(range, action) {
 	const { startRow, startColumn, endRow, endColumn } = range;
 	for (let i = startRow; i <= endRow; i++) for (let j = startColumn; j <= endColumn; j++) action(i, j);
@@ -16762,7 +16762,7 @@ const SplitTextToColumnsCommand = {
 const INumfmtService = createIdentifier("INumfmtService");
 
 //#endregion
-//#region src/commands/mutations/numfmt-mutation.ts
+//#region src/commands/mutations/numfmt.mutation.ts
 const factorySetNumfmtUndoMutation = (accessor, option) => {
 	const numfmtService = accessor.get(INumfmtService);
 	const { values, unitId, subUnitId } = option;
@@ -18523,7 +18523,7 @@ let SheetPermissionInitController = class SheetPermissionInitController extends
 	}
 	async initWorkbookPermissionChange(_unitId) {
 		var _this$_univerInstance;
-		const unitId = _unitId || ((_this$_univerInstance = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getUnitId());
+		const unitId = _unitId || ((_this$_univerInstance = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getUnitId());
 		if (!unitId) return;
 		return this._authzIoService.allowed({
 			objectID: unitId,
@@ -19222,7 +19222,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "0.23.0";
+var version = "0.24.0";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts
@@ -19700,8 +19700,8 @@ SheetPermissionViewModelController = __decorate([
 ], SheetPermissionViewModelController);
 
 //#endregion
-//#region src/services/exclusive-range/exclusive-range-service.ts
-const IExclusiveRangeService = createIdentifier("univer.exclusive-range-service");
+//#region src/services/exclusive-range/exclusive-range.service.ts
+const IExclusiveRangeService = createIdentifier("univer.exclusive-range.service");
 var ExclusiveRangeService = class extends Disposable {
 	constructor(..._args) {
 		super(..._args);
@@ -19882,7 +19882,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
 	}
 	_onRefRangeChange() {
 		const registerRefRange = (unitId, subUnitId) => {
-			const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 			if (!workbook) return;
 			if (!(workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId))) return;
 			this.disposableCollection.dispose();
@@ -19911,7 +19911,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
 				registerRefRange(unitId, subUnitId);
 			}
 		}));
-		const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 		if (workbook) {
 			const sheet = workbook.getActiveSheet();
 			if (!sheet) return;
@@ -20283,7 +20283,7 @@ let RangeProtectionRefRangeService = class RangeProtectionRefRangeService extend
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (mutationIdArrByMove.includes(command.id)) {
 				if (!command.params) return;
-				const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+				const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 				if (!workbook) return;
 				const worksheet = workbook.getSheetBySheetId(command.params.subUnitId);
 				if (!worksheet) return;
@@ -20562,7 +20562,7 @@ RangeProtectionService = __decorate([
 ], RangeProtectionService);
 
 //#endregion
-//#region src/services/range-theme-service.ts
+//#region src/services/range-theme.service.ts
 let SheetRangeThemeService = class SheetRangeThemeService extends Disposable {
 	constructor(_sheetRangeThemeModel) {
 		super();

package/lib/types/facade/f-worksheet.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { CellValue, CustomData, ICellData, IColumnRange, IDisposable, IFreeze, IObjectArrayPrimitiveType, IRange, IRowRange, IStyleData, Nullable, Workbook, Worksheet } from '@univerjs/core';
+import type { CellValue, CustomData, IColumnRange, IFreeze, IObjectArrayPrimitiveType, IRange, IRowRange, IStyleData, Nullable, Workbook, Worksheet } from '@univerjs/core';
 import type { FDefinedName } from './f-defined-name';
 import type { FWorkbook } from './f-workbook';
-import { BooleanNumber, ICommandService, ILogService, Injector, ObjectMatrix } from '@univerjs/core';
+import { BooleanNumber, ICommandService, ILogService, Injector } from '@univerjs/core';
 import { FBaseInitialable } from '@univerjs/core/facade';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { FRange } from './f-range';
@@ -940,7 +940,6 @@ export declare class FWorksheet extends FBaseInitialable {
      * Sets the frozen state of the current sheet.
      * @param {IFreeze} freeze - the scrolling viewport start range and count of freezed rows and columns.
      * that means if you want to freeze the first 3 rows and 2 columns, you should set freeze as { startRow: 3, startColumn: 2, xSplit: 2, ySplit: 3 }
-     * @deprecated use `setFrozenRows` and `setFrozenColumns` instead.
      * @returns {FWorksheet} This worksheet instance for chaining
      * @example
      * ```typescript
@@ -1157,14 +1156,6 @@ export declare class FWorksheet extends FBaseInitialable {
      * ```
      */
     getTabColor(): string | undefined;
-    /**
-     * @deprecated use `univerAPI.addEvent(univerAPI.Event.SheetValueChanged, (params) => {})` instead
-     */
-    onCellDataChange(callback: (cellValue: ObjectMatrix<Nullable<ICellData>>) => void): IDisposable;
-    /**
-     * @deprecated use `univerAPI.addEvent(univerAPI.Event.BeforeSheetEditEnd, (params) => {})` instead
-     */
-    onBeforeCellDataChange(callback: (cellValue: ObjectMatrix<Nullable<ICellData>>) => void): IDisposable;
     /**
      * Hides this sheet. Has no effect if the sheet is already hidden. If this method is called on the only visible sheet, it throws an exception.
      * @returns {FWorksheet} Returns the current worksheet instance for method chaining
@@ -1282,7 +1273,7 @@ export declare class FWorksheet extends FBaseInitialable {
     clearFormats(): FWorksheet;
     /**
      * Returns a Range corresponding to the dimensions in which data is present.
-     * This is functionally equivalent to creating a Range bounded by A1 and (Sheet.getLastColumn(), Sheet.getLastRow()).
+     * Empty cells with style or formatting will also be included in the data range. If there is no data on the sheet, returns a Range corresponding to the top-left cell of the sheet (A1).
      * @returns {FRange} The range of the data in the sheet.
      * @example
      * ```ts
@@ -1295,12 +1286,6 @@ export declare class FWorksheet extends FBaseInitialable {
      * ```
      */
     getDataRange(): FRange;
-    /**
-     * @deprecated use `getLastColumn` instead.
-     * Returns the column index of the last column that contains content.
-     * @returns {number} the column index of the last column that contains content.
-     */
-    getLastColumns(): number;
     /**
      * Returns the column index of the last column that contains content.
      * @returns {number} the column index of the last column that contains content.
@@ -1315,12 +1300,6 @@ export declare class FWorksheet extends FBaseInitialable {
      * ```
      */
     getLastColumn(): number;
-    /**
-     * @deprecated use `getLastRow` instead.
-     * Returns the row index of the last row that contains content.
-     * @returns {number} the row index of the last row that contains content.
-     */
-    getLastRows(): number;
     /**
      * Returns the row index of the last row that contains content.
      * @returns {number} the row index of the last row that contains content.

package/lib/types/index.d.ts

@@ -55,7 +55,7 @@ export { type IRemoveColByRangeCommandParams, type IRemoveRowByRangeCommandParam
 export { type IRemoveSheetCommandParams, RemoveSheetCommand } from './commands/commands/remove-sheet.command';
 export { type IRemoveWorksheetMergeCommandParams, RemoveWorksheetMergeCommand } from './commands/commands/remove-worksheet-merge.command';
 export { type IReorderRangeCommandParams, ReorderRangeCommand } from './commands/commands/reorder-range.command';
-export { type ISetBorderBasicCommandParams, type ISetBorderColorCommandParams, type ISetBorderCommandParams, type ISetBorderPositionCommandParams, type ISetBorderStyleCommandParams, SetBorderBasicCommand, SetBorderColorCommand, SetBorderCommand, SetBorderPositionCommand, SetBorderStyleCommand, } from './commands/commands/set-border-command';
+export { type ISetBorderBasicCommandParams, type ISetBorderColorCommandParams, type ISetBorderCommandParams, type ISetBorderPositionCommandParams, type ISetBorderStyleCommandParams, SetBorderBasicCommand, SetBorderColorCommand, SetBorderCommand, SetBorderPositionCommand, SetBorderStyleCommand, } from './commands/commands/set-border.command';
 export { type ISetColDataCommandParams, SetColDataCommand } from './commands/commands/set-col-data.command';
 export { type ISetColHiddenCommandParams, type ISetSpecificColsVisibleCommandParams, SetColHiddenCommand, SetSelectedColsVisibleCommand, SetSpecificColsVisibleCommand, } from './commands/commands/set-col-visible.command';
 export { SetDefinedNameCommand } from './commands/commands/set-defined-name.command';
@@ -116,7 +116,7 @@ export { InsertSheetMutation, InsertSheetUndoMutationFactory } from './commands/
 export { type IMarkDirtyFilterChangeMutationParams, MarkDirtyFilterChangeMutation } from './commands/mutations/mark-dirty-filter-change.mutation';
 export { type IMoveRangeMutationParams, MoveRangeMutation } from './commands/mutations/move-range.mutation';
 export { type IMoveColumnsMutationParams, type IMoveRowsMutationParams, MoveColsMutation, MoveColsMutationUndoFactory, MoveRowsMutation, MoveRowsMutationUndoFactory, } from './commands/mutations/move-rows-cols.mutation';
-export { factoryRemoveNumfmtUndoMutation, factorySetNumfmtUndoMutation, type IRemoveNumfmtMutationParams, type ISetCellsNumfmt, type ISetNumfmtMutationParams, RemoveNumfmtMutation, SetNumfmtMutation, transformCellsToRange, } from './commands/mutations/numfmt-mutation';
+export { factoryRemoveNumfmtUndoMutation, factorySetNumfmtUndoMutation, type IRemoveNumfmtMutationParams, type ISetCellsNumfmt, type ISetNumfmtMutationParams, RemoveNumfmtMutation, SetNumfmtMutation, transformCellsToRange, } from './commands/mutations/numfmt.mutation';
 export { type IRegisterWorksheetRangeThemeStyleMutationParams, RegisterWorksheetRangeThemeStyleMutation } from './commands/mutations/register-range-theme.mutation';
 export { RemoveRangeThemeMutation } from './commands/mutations/remove-range-theme.mutation';
 export type { IRemoveRangeThemeMutationParams } from './commands/mutations/remove-range-theme.mutation';
@@ -156,9 +156,9 @@ export { type IScrollToCellOperationParams, ScrollToCellOperation } from './comm
 export { type ISelectRangeCommandParams, type ISetSelectionsOperationParams, SelectRangeCommand, SetSelectionsOperation } from './commands/operations/selection.operation';
 export { type ISetWorksheetActiveOperationParams, SetWorksheetActiveOperation } from './commands/operations/set-worksheet-active.operation';
 export { AddMergeRedoSelectionsOperationFactory, AddMergeUndoSelectionsOperationFactory } from './commands/utils/handle-merge-operation';
-export { handleDeleteRangeMutation } from './commands/utils/handle-range-mutation';
-export { getInsertRangeMutations, getRemoveRangeMutations } from './commands/utils/handle-range-mutation';
-export { handleInsertRangeMutation } from './commands/utils/handle-range-mutation';
+export { handleDeleteRangeMutation } from './commands/utils/handle-range.mutation';
+export { getInsertRangeMutations, getRemoveRangeMutations } from './commands/utils/handle-range.mutation';
+export { handleInsertRangeMutation } from './commands/utils/handle-range.mutation';
 export { type ISheetCommandSharedParams } from './commands/utils/interface';
 export { getSelectionsService } from './commands/utils/selection-command-util';
 export { defaultLargeSheetOperationConfig, type ILargeSheetOperationConfig, type IUniverSheetsConfig, SHEETS_PLUGIN_CONFIG_KEY } from './config/config';
@@ -185,7 +185,7 @@ export { default as AutoFillRules } from './services/auto-fill/rules';
 export { default as AutoFillTools } from './services/auto-fill/tools';
 export { type AUTO_FILL_APPLY_FUNCTIONS, AUTO_FILL_APPLY_TYPE, AUTO_FILL_DATA_TYPE, AUTO_FILL_HOOK_TYPE, type IAutoFillCopyDataInType, type IAutoFillCopyDataInTypeIndexInfo, type IAutoFillCopyDataPiece, type IAutoFillLocation, type IAutoFillRule, type IAutoFillRuleConfirmedData, type ISheetAutoFillHook, } from './services/auto-fill/type';
 export { BorderStyleManagerService, type IBorderInfo } from './services/border-style-manager.service';
-export { ExclusiveRangeService, IExclusiveRangeService } from './services/exclusive-range/exclusive-range-service';
+export { ExclusiveRangeService, IExclusiveRangeService } from './services/exclusive-range/exclusive-range.service';
 export { SheetLazyExecuteScheduleService } from './services/lazy-execute-schedule.service';
 export { NumfmtService } from './services/numfmt/numfmt.service';
 export type { INumfmtItem, INumfmtItemWithCache } from './services/numfmt/type';
@@ -210,7 +210,7 @@ export { WorkbookPermissionService } from './services/permission/workbook-permis
 export { WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from './services/permission/worksheet-permission';
 export type { IWorksheetProtectionRenderCellData } from './services/permission/worksheet-permission/type';
 export { WorksheetPermissionService } from './services/permission/worksheet-permission/worksheet-permission.service';
-export { SheetRangeThemeService } from './services/range-theme-service';
+export { SheetRangeThemeService } from './services/range-theme.service';
 export { RefRangeService } from './services/ref-range/ref-range.service';
 export type { EffectRefRangeParams, IOperator } from './services/ref-range/type';
 export { EffectRefRangId, OperatorType } from './services/ref-range/type';