@univerjs/sheets 0.1.6 → 0.1.7

package/lib/types/commands/commands/remove-row-col.command.d.ts

@@ -7,7 +7,7 @@ export declare const RemoveRowCommandId = "sheet.command.remove-row";
 /**
  * This command would remove the selected rows. These selected rows can be non-continuous.
  */
-export declare const RemoveRowCommand: ICommand;
+export declare const RemoveRowCommand: ICommand<IRemoveRowColCommandParams>;
 export declare const RemoveColCommandId = "sheet.command.remove-col";
 /**
  * This command would remove the selected columns. These selected rows can be non-continuous.

package/lib/types/commands/utils/handle-merge-operation.d.ts

@@ -1,4 +1,4 @@
-import { ISetSelectionsOperationParams } from '../..';
+import { ISetSelectionsOperationParams } from '../operations/selection.operation';
 import { IAddMergeCommandParams } from '../commands/add-worksheet-merge.command';
 import { IRange } from '@univerjs/core';
 import { IAccessor } from '@wendellhu/redi';

package/lib/types/index.d.ts

@@ -83,7 +83,7 @@ export type { ISetRangeValuesMutationParams } from './commands/mutations/set-ran
 export { SetRangeValuesMutation } from './commands/mutations/set-range-values.mutation';
 export { SetRangeValuesUndoMutationFactory } from './commands/mutations/set-range-values.mutation';
 export { type ISetRangeValuesRangeMutationParams } from './commands/mutations/set-range-values.mutation';
-export { type ISetRowHiddenMutationParams, type ISetRowVisibleMutationParams, SetRowHiddenMutation, SetRowVisibleMutation } from './commands/mutations/set-row-visible.mutation';
+export { type ISetRowHiddenMutationParams, type ISetRowVisibleMutationParams, SetRowHiddenMutation, SetRowVisibleMutation, } from './commands/mutations/set-row-visible.mutation';
 export { SetTabColorMutation } from './commands/mutations/set-tab-color.mutation';
 export { type ISetTabColorMutationParams } from './commands/mutations/set-tab-color.mutation';
 export { type ISetWorksheetColWidthMutationParams, SetWorksheetColWidthMutation, SetWorksheetColWidthMutationFactory, } from './commands/mutations/set-worksheet-col-width.mutation';
@@ -108,7 +108,7 @@ export { INumfmtService } from './services/numfmt/type';
 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';
-export { handleBaseInsertRange, handleBaseMoveRowsCols, handleBaseRemoveRange, handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleIRemoveCol, handleIRemoveRow, handleMoveCols, handleMoveRange, handleMoveRows, rotateRange, runRefRangeMutations, handleDefaultRangeChangeWithEffectRefCommands, handleOtherDefaultRangeChangeWithEffectRefCommands, } from './services/ref-range/util';
+export { handleBaseInsertRange, handleBaseMoveRowsCols, handleBaseRemoveRange, handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleIRemoveCol, handleIRemoveRow, handleMoveCols, handleMoveRange, handleMoveRows, rotateRange, runRefRangeMutations, handleCommonDefaultRangeChangeWithEffectRefCommands, handleDefaultRangeChangeWithEffectRefCommands, } from './services/ref-range/util';
 export { INTERCEPTOR_POINT } from './services/sheet-interceptor/interceptor-const';
 export { SheetInterceptorService } from './services/sheet-interceptor/sheet-interceptor.service';
 export type { ISheetLocation } from './services/sheet-interceptor/utils/interceptor';

package/lib/types/services/ref-range/__tests__/ref-range.service.spec.d.ts

@@ -0,0 +1,14 @@
+import { Univer } from '@univerjs/core';
+
+export declare function createRefRangeTestBed(): {
+    univer: Univer;
+    get: {
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp | undefined): T;
+        <T_1>(id: import('@wendellhu/redi').DependencyIdentifier<T_1>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_1[];
+        <T_2>(id: import('@wendellhu/redi').DependencyIdentifier<T_2>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_2 | null;
+        <T_3>(id: import('@wendellhu/redi').DependencyIdentifier<T_3>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_3;
+        <T_4>(id: import('@wendellhu/redi').DependencyIdentifier<T_4>, quantity?: import('@wendellhu/redi').Quantity | undefined, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_4 | T_4[] | null;
+        <T_5>(id: import('@wendellhu/redi').DependencyIdentifier<T_5>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp | undefined, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_5 | T_5[] | null;
+    };
+    sheet: import('@univerjs/core').Workbook;
+};

package/lib/types/services/ref-range/__tests__/watch-range.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};

package/lib/types/services/ref-range/ref-range.service.d.ts

@@ -2,7 +2,7 @@ import { EffectRefRangeParams } from './type';
 import { SheetInterceptorService } from '../sheet-interceptor/sheet-interceptor.service';
 import { SelectionManagerService } from '../selection-manager.service';
 import { IDisposable } from '@wendellhu/redi';
-import { IMutationInfo, IRange, Disposable, InterceptorManager, IUniverInstanceService } from '@univerjs/core';
+import { IMutationInfo, IRange, Nullable, Disposable, ICommandService, InterceptorManager, IUniverInstanceService } from '@univerjs/core';
 
 type RefRangCallback = (params: EffectRefRangeParams) => {
     redos: IMutationInfo[];
@@ -10,10 +10,12 @@ type RefRangCallback = (params: EffectRefRangeParams) => {
     preRedos?: IMutationInfo[];
     preUndos?: IMutationInfo[];
 };
+export type WatchRangeCallback = (before: IRange, after: Nullable<IRange>) => void;
 /**
  * Collect side effects caused by ref range change
  */
 export declare class RefRangeService extends Disposable {
+    private readonly _commandService;
     private _sheetInterceptorService;
     private _univerInstanceService;
     private _selectionManagerService;
@@ -21,7 +23,9 @@ export declare class RefRangeService extends Disposable {
         MERGE_REDO: import('@univerjs/core').IInterceptor<IMutationInfo<object>[], null>;
         MERGE_UNDO: import('@univerjs/core').IInterceptor<IMutationInfo<object>[], null>;
     }>;
-    constructor(_sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _selectionManagerService: SelectionManagerService);
+    private _watchRanges;
+    constructor(_commandService: ICommandService, _sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _selectionManagerService: SelectionManagerService);
+    watchRange(unitId: string, subUnitId: string, range: IRange, callback: WatchRangeCallback): IDisposable;
     private _refRangeManagerMap;
     private _serializer;
     private _onRefRangeChange;

package/lib/types/services/ref-range/util.d.ts

@@ -1,5 +1,9 @@
 import { IDeleteRangeMoveLeftCommand, IDeleteRangeMoveUpCommand, IInsertColCommand, IInsertRangeMoveDownCommand, IInsertRangeMoveRightCommand, IInsertRowCommand, IMoveColsCommand, IMoveRangeCommand, IMoveRowsCommand, IOperator, IRemoveRowColCommand } from './type';
-import { ICommandInfo, IRange, RANGE_TYPE } from '@univerjs/core';
+import { ISheetCommandSharedParams } from '../../commands/utils/interface';
+import { IMoveRangeMutationParams } from '../../commands/mutations/move-range.mutation';
+import { IInsertColMutationParams, IInsertRowMutationParams, IRemoveColMutationParams, IRemoveRowsMutationParams, IRemoveSheetMutationParams } from '../../basics';
+import { IMoveColumnsMutationParams, IMoveRowsMutationParams } from '../../commands/mutations/move-rows-cols.mutation';
+import { ICommandInfo, IMutationInfo, IRange, Nullable, RANGE_TYPE } from '@univerjs/core';
 
 export declare const handleRangeTypeInput: (range: IRange) => {
     startColumn: number;
@@ -32,10 +36,11 @@ export declare const handleBaseMoveRowsCols: (fromRange: ILine, toRange: ILine,
     step: number;
 };
 export declare const handleMoveRows: (params: IMoveRowsCommand, targetRange: IRange) => IOperator[];
-export declare const handleMoveRowsOther: (params: IMoveRowsCommand, targetRange: IRange) => IRange[] | null;
+export declare const handleMoveRowsCommon: (params: IMoveRowsCommand, targetRange: IRange) => IRange[];
 export declare const handleMoveCols: (params: IMoveColsCommand, targetRange: IRange) => IOperator[];
-export declare const handleMoveColsOther: (params: IMoveColsCommand, targetRange: IRange) => IRange[] | null;
+export declare const handleMoveColsCommon: (params: IMoveColsCommand, targetRange: IRange) => IRange[];
 export declare const handleMoveRange: (param: IMoveRangeCommand, targetRange: IRange) => IOperator[];
+export declare const handleMoveRangeCommon: (param: IMoveRangeCommand, targetRange: IRange) => IRange[];
 export declare const handleBaseRemoveRange: (_removeRange: IRange, _targetRange: IRange) => {
     step: number;
     length: number;
@@ -49,10 +54,24 @@ export declare const handleBaseInsertRange: (_insertRange: IRange, _targetRange:
 export declare const handleInsertRow: (param: IInsertRowCommand, targetRange: IRange) => IOperator[];
 export declare const handleInsertCol: (param: IInsertColCommand, targetRange: IRange) => IOperator[];
 export declare const handleInsertRangeMoveDown: (param: IInsertRangeMoveDownCommand, targetRange: IRange) => IOperator[];
+export declare const handleInsertRangeMoveDownCommon: (param: IInsertRangeMoveDownCommand, targetRange: IRange) => IRange[];
 export declare const handleInsertRangeMoveRight: (param: IInsertRangeMoveRightCommand, targetRange: IRange) => IOperator[];
+export declare const handleInsertRangeMoveRightCommon: (param: IInsertRangeMoveRightCommand, targetRange: IRange) => IRange[];
 export declare const handleDeleteRangeMoveLeft: (param: IDeleteRangeMoveLeftCommand, targetRange: IRange) => IOperator[];
+export declare const handleDeleteRangeMoveLeftCommon: (param: IDeleteRangeMoveLeftCommand, targetRange: IRange) => IRange[];
 export declare const handleDeleteRangeMoveUp: (param: IDeleteRangeMoveUpCommand, targetRange: IRange) => IOperator[];
+export declare const handleDeleteRangeMoveUpCommon: (param: IDeleteRangeMoveUpCommand, targetRange: IRange) => IRange[];
 export declare const runRefRangeMutations: (operators: IOperator[], range: IRange) => IRange | null;
 export declare const handleDefaultRangeChangeWithEffectRefCommands: (range: IRange, commandInfo: ICommandInfo) => IRange | null;
-export declare const handleOtherDefaultRangeChangeWithEffectRefCommands: (range: IRange, commandInfo: ICommandInfo) => IRange | IRange[] | null;
+type MutationsAffectRange = ISheetCommandSharedParams | IRemoveSheetMutationParams | IMoveRowsMutationParams | IMoveColumnsMutationParams | IRemoveRowsMutationParams | IRemoveColMutationParams | IInsertColMutationParams | IInsertRowMutationParams | IMoveRangeMutationParams;
+export declare const handleCommonDefaultRangeChangeWithEffectRefCommands: (range: IRange, commandInfo: ICommandInfo) => IRange | IRange[] | null;
+/**
+ * This function should work as a pure function.
+ *
+ * @pure
+ * @param range
+ * @param mutation
+ * @returns the adjusted range
+ */
+export declare function adjustRangeOnMutation(range: Readonly<IRange>, mutation: IMutationInfo<MutationsAffectRange>): Nullable<IRange>;
 export {};