@univerjs/sheets 0.2.2 → 0.2.4-alpha.0

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

@@ -1,16 +1,15 @@
-import { IWorkbookData, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Univer } from '@univerjs/core';
 
 export declare const TEST_WORKBOOK_DATA_DEMO: IWorkbookData;
 export declare function createTestBase(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };

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

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

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

@@ -1,6 +1,5 @@
-import { IMutationInfo, IRange, Nullable, Disposable, ICommandService, InterceptorManager, IUniverInstanceService } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
-import { SelectionManagerService } from '../selection-manager.service';
+import { IDisposable, IMutationInfo, IRange, Nullable, Disposable, ICommandService, InterceptorManager, IUniverInstanceService } from '@univerjs/core';
+import { SheetsSelectionsService } from '../selections/selection-manager.service';
 import { SheetInterceptorService } from '../sheet-interceptor/sheet-interceptor.service';
 import { EffectRefRangeParams } from './type';
 
@@ -24,7 +23,7 @@ export declare class RefRangeService extends Disposable {
         MERGE_UNDO: import('@univerjs/core').IInterceptor<IMutationInfo<object>[], null>;
     }>;
     private _watchRanges;
-    constructor(_commandService: ICommandService, _sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _selectionManagerService: SelectionManagerService);
+    constructor(_commandService: ICommandService, _sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _selectionManagerService: SheetsSelectionsService);
     watchRange(unitId: string, subUnitId: string, range: IRange, callback: WatchRangeCallback, skipIntersects?: boolean): IDisposable;
     private _refRangeManagerMap;
     private _serializer;

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

@@ -3,26 +3,30 @@ import { IMoveColumnsMutationParams, IMoveRowsMutationParams } from '../../comma
 import { IInsertColMutationParams, IInsertRowMutationParams, IRemoveColMutationParams, IRemoveRowsMutationParams, IRemoveSheetMutationParams } from '../../basics';
 import { IMoveRangeMutationParams } from '../../commands/mutations/move-range.mutation';
 import { ISheetCommandSharedParams } from '../../commands/utils/interface';
-import { SelectionManagerService } from '../selection-manager.service';
+import { SheetsSelectionsService } from '../selections/selection-manager.service';
 import { EffectRefRangeParams, IDeleteRangeMoveLeftCommand, IDeleteRangeMoveUpCommand, IInsertColCommand, IInsertRangeMoveDownCommand, IInsertRangeMoveRightCommand, IInsertRowCommand, IMoveColsCommand, IMoveRangeCommand, IMoveRowsCommand, IOperator, IRemoveRowColCommand, IReorderRangeCommand } from './type';
 
 export declare const handleRangeTypeInput: (range: IRange) => {
-    startColumn: number;
-    endColumn: number;
     rangeType?: RANGE_TYPE;
     startAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
     endAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
     startRow: number;
     endRow: number;
-};
-export declare const handleRangeTypeOutput: (range: IRange, maxRow: number, maxCol: number) => {
+    unitId?: string;
+    sheetId?: string;
     startColumn: number;
     endColumn: number;
+};
+export declare const handleRangeTypeOutput: (range: IRange, maxRow: number, maxCol: number) => {
     rangeType?: RANGE_TYPE;
     startAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
     endAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
     startRow: number;
     endRow: number;
+    unitId?: string;
+    sheetId?: string;
+    startColumn: number;
+    endColumn: number;
 };
 export declare const rotateRange: (range: IRange) => IRange;
 interface ILine {
@@ -67,7 +71,7 @@ export declare const handleDeleteRangeMoveUpCommon: (param: IDeleteRangeMoveUpCo
 export declare const runRefRangeMutations: (operators: IOperator[], range: IRange) => IRange | null;
 export declare const handleDefaultRangeChangeWithEffectRefCommands: (range: IRange, commandInfo: ICommandInfo) => IRange | null;
 export declare const handleDefaultRangeChangeWithEffectRefCommandsSkipNoInterests: (range: IRange, commandInfo: ICommandInfo, deps: {
-    selectionManagerService: SelectionManagerService;
+    selectionManagerService: SheetsSelectionsService;
 }) => IRange | null;
 type MutationsAffectRange = ISheetCommandSharedParams | IRemoveSheetMutationParams | IMoveRowsMutationParams | IMoveColumnsMutationParams | IRemoveRowsMutationParams | IRemoveColMutationParams | IInsertColMutationParams | IInsertRowMutationParams | IMoveRangeMutationParams;
 export declare const handleCommonDefaultRangeChangeWithEffectRefCommands: (range: IRange, commandInfo: ICommandInfo) => IRange | IRange[] | null;
@@ -81,7 +85,7 @@ export declare const handleCommonDefaultRangeChangeWithEffectRefCommands: (range
  */
 export declare function adjustRangeOnMutation(range: Readonly<IRange>, mutation: IMutationInfo<MutationsAffectRange>): Nullable<IRange>;
 export declare function getEffectedRangesOnCommand(command: EffectRefRangeParams, deps: {
-    selectionManagerService: SelectionManagerService;
+    selectionManagerService: SheetsSelectionsService;
 }): IRange[];
 export declare function getEffectedRangesOnMutation(mutation: IMutationInfo<MutationsAffectRange>): IRange[] | undefined;
 export {};

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

@@ -0,0 +1,19 @@
+import { IUniverInstanceService } from '@univerjs/core';
+import { SheetsSelectionsService } from './selection-manager.service';
+
+/**
+ * Ref selections service reuses code of `SelectionManagerService`. And it only contains ref selections
+ * when user is editing formula.
+ *
+ * Its data should be cleared by the caller quit editing formula and reconstructed when user starts editing.
+ */
+export declare const IRefSelectionsService: import('@univerjs/core').IdentifierDecorator<SheetsSelectionsService>;
+/**
+ * RefSelectionsService treats `selectionMoveStart$` `selectionMoving$` and `selectionMoveEnd$` differently
+ * than `SheetsSelectionsService`. Because ref selections can be in different workbooks.
+ */
+export declare class RefSelectionsService extends SheetsSelectionsService {
+    constructor(_instanceSrv: IUniverInstanceService);
+    protected _init(): void;
+    private _getAliveWorkbooks$;
+}

package/lib/types/services/selections/selection-manager.service.d.ts

@@ -0,0 +1,75 @@
+import { ISelectionCell, Nullable, Workbook, Disposable, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { Observable } from 'rxjs';
+import { ISelectionWithStyle } from '../../basics/selection';
+
+export interface ISelectionManagerSearchParam {
+    unitId: string;
+    sheetId: string;
+}
+export declare enum SelectionMoveType {
+    MOVE_START = 0,
+    MOVING = 1,
+    MOVE_END = 2
+}
+export declare class SheetsSelectionsService extends RxDisposable {
+    protected readonly _instanceSrv: IUniverInstanceService;
+    private get _currentSelectionPos();
+    selectionMoveStart$: Observable<Nullable<ISelectionWithStyle[]>>;
+    selectionMoving$: Observable<Nullable<ISelectionWithStyle[]>>;
+    selectionMoveEnd$: Observable<ISelectionWithStyle[]>;
+    constructor(_instanceSrv: IUniverInstanceService);
+    protected _init(): void;
+    /** Clear all selections in all workbooks. */
+    clear(): void;
+    getCurrentSelections(): Readonly<ISelectionWithStyle[]>;
+    getCurrentLastSelection(): Readonly<Nullable<ISelectionWithStyle & {
+        primary: ISelectionCell;
+    }>>;
+    addSelections(selectionsData: ISelectionWithStyle[]): void;
+    addSelections(unitId: string, worksheetId: string, selectionDatas: ISelectionWithStyle[]): void;
+    setSelections(selectionDatas: ISelectionWithStyle[], type?: SelectionMoveType): void;
+    setSelections(unitId: string, worksheetId: string, selectionDatas: ISelectionWithStyle[], type?: SelectionMoveType): void;
+    clearCurrentSelections(): void;
+    /**
+     * Determine whether multiple current selections overlap
+     *
+     * @deprecated this should be extracted to an pure function
+     */
+    isOverlapping(): boolean;
+    protected _getCurrentSelections(): ISelectionWithStyle[];
+    getWorkbookSelections(unitId: string): WorkbookSelections;
+    protected _workbookSelections: Map<string, WorkbookSelections>;
+    protected _ensureWorkbookSelection(unitId: string): WorkbookSelections;
+    protected _removeWorkbookSelection(unitId: string): void;
+}
+/**
+ * This class manages selections in a single workbook.
+ */
+export declare class WorkbookSelections extends Disposable {
+    private readonly _workbook;
+    private readonly _selectionMoveStart$;
+    readonly selectionMoveStart$: Observable<Nullable<ISelectionWithStyle[]>>;
+    private readonly _selectionMoving$;
+    readonly selectionMoving$: Observable<Nullable<ISelectionWithStyle[]>>;
+    private readonly _selectionMoveEnd$;
+    readonly selectionMoveEnd$: Observable<ISelectionWithStyle[]>;
+    private readonly _beforeSelectionMoveEnd$;
+    readonly beforeSelectionMoveEnd$: Observable<ISelectionWithStyle[]>;
+    constructor(_workbook: Workbook);
+    dispose(): void;
+    /** Clear all selections in this workbook. */
+    clear(): void;
+    addSelections(sheetId: string, selectionDatas: ISelectionWithStyle[]): void;
+    setSelections(sheetId: string, selectionDatas: ISelectionWithStyle[], type?: SelectionMoveType): void;
+    getCurrentSelections(): Readonly<ISelectionWithStyle[]>;
+    getSelectionOfWorksheet(sheetId: string): ISelectionWithStyle[];
+    private _getCurrentSelections;
+    getCurrentLastSelection(): Readonly<Nullable<ISelectionWithStyle & {
+        primary: ISelectionCell;
+    }>>;
+    private _worksheetSelections;
+    private _ensureSheetSelection;
+    private _emitOnEnd;
+}
+/** An context key to disable normal selections if its value is set to `true`. */
+export declare const DISABLE_NORMAL_SELECTIONS = "DISABLE_NORMAL_SELECTIONS";

package/lib/types/services/sheet-interceptor/__tests__/create-core-test-bed.d.ts

@@ -1,15 +1,14 @@
-import { IWorkbookData, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Univer } from '@univerjs/core';
 
 export declare function createCoreTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };

package/lib/types/services/sheet-interceptor/sheet-interceptor.service.d.ts

@@ -1,5 +1,4 @@
-import { ICommandInfo, IInterceptor, IUndoRedoCommandInfosByInterceptor, Disposable, IUniverInstanceService } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { ICommandInfo, IDisposable, IInterceptor, IUndoRedoCommandInfosByInterceptor, Disposable, IUniverInstanceService } from '@univerjs/core';
 
 export interface ICommandInterceptor {
     priority?: number;

package/lib/types/sheets-plugin.d.ts

@@ -1,5 +1,4 @@
-import { DependencyOverride, ICommandService, IConfigService, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { DependencyOverride, ICommandService, IConfigService, Injector, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export interface IUniverSheetsConfig {
     notExecuteFormula?: boolean;