@univerjs/core 0.1.15 → 0.1.16

package/lib/types/services/instance/instance.service.d.ts

@@ -59,19 +59,26 @@ export declare class UniverInstanceService extends Disposable implements IUniver
     createUnit<T, U extends UnitModel>(type: UnitType, data: T): U;
     private readonly _ctorByType;
     registerCtorForType<T extends UnitModel>(type: UnitType, ctor: new () => T): IDisposable;
+    private _currentUnits;
     private readonly _currentUnits$;
-    readonly currentUnits$: Observable<{
-        [type: number]: Nullable<UnitModel<object, number>>;
-    }>;
+    readonly currentUnits$: Observable<Map<number, Nullable<UnitModel<object, number>>>>;
     getCurrentTypeOfUnit$<T>(type: number): Observable<Nullable<T>>;
     getCurrentUnitForType<T>(type: UnitType): Nullable<T>;
     setCurrentUnitForType(unitId: string): void;
+    private _removeCurrentUnitForType;
     private readonly _unitAdded$;
     readonly unitAdded$: Observable<UnitModel<object, number>>;
     getTypeOfUnitAdded$<T extends UnitModel<object, number>>(type: UnitType): Observable<T>;
+    /**
+     * Add a unit into Univer.
+     *
+     * @ignore
+     *
+     * @param unit The unit to be added.
+     */
     __addUnit(unit: UnitModel): void;
     private _unitDisposed$;
-    unitDisposed$: Observable<UnitModel<object, number>>;
+    readonly unitDisposed$: Observable<UnitModel<object, number>>;
     getTypeOfUnitDisposed$<T extends UnitModel<object, number>>(type: UniverInstanceType): Observable<T>;
     getUnit<T extends UnitModel = UnitModel>(id: string, type?: UnitType): Nullable<T>;
     getCurrentUniverDocInstance(): Nullable<DocumentDataModel>;

package/lib/types/services/permission/permission.service.d.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { Observable, BehaviorSubject } from 'rxjs';
 import { Disposable } from '../../shared';
 import { IPermissionPoint, IPermissionService } from './type';
 
@@ -7,11 +7,12 @@ export declare class PermissionService extends Disposable implements IPermission
     private _permissionPointUpdate$;
     permissionPointUpdate$: Observable<IPermissionPoint<unknown>>;
     deletePermissionPoint(permissionId: string): void;
-    addPermissionPoint<T = boolean>(item: IPermissionPoint<T>): boolean;
+    addPermissionPoint<T = boolean>(_item: IPermissionPoint<T> | BehaviorSubject<IPermissionPoint<T>>): boolean;
     updatePermissionPoint<T = boolean>(permissionId: string, value: T): void;
     clearPermissionMap(): void;
     getPermissionPoint<T = boolean>(permissionId: string): IPermissionPoint<T> | undefined;
     getPermissionPoint$<T = boolean>(permissionId: string): Observable<IPermissionPoint<T>> | undefined;
-    composePermission$(permissionIdList: string[]): Observable<IPermissionPoint<unknown>[]>;
-    composePermission(permissionIdList: string[]): IPermissionPoint<unknown>[];
+    composePermission$(permissionIdList: string[]): Observable<IPermissionPoint<any>[]>;
+    composePermission(permissionIdList: string[]): IPermissionPoint<any>[];
+    getAllPermissionPoint(): Map<string, BehaviorSubject<IPermissionPoint<unknown>>>;
 }

package/lib/types/services/permission/type.d.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { UnitAction, UnitObject } from '@univerjs/protocol';
 import { Nullable } from '../../common/type-utils';
 import { IRange } from '../../types/interfaces';
@@ -31,12 +31,13 @@ export interface IPermissionParam {
 export interface IPermissionService {
     permissionPointUpdate$: Observable<IPermissionPoint<unknown>>;
     deletePermissionPoint(permissionId: string): void;
-    addPermissionPoint<T = boolean>(permissionPoint: IPermissionPoint<T>): boolean;
+    addPermissionPoint<T = boolean>(permissionPoint: IPermissionPoint<T> | BehaviorSubject<IPermissionPoint<T>>): boolean;
     updatePermissionPoint<T = boolean>(permissionId: string, value: T): void;
     getPermissionPoint<T = boolean>(permissionId: string): Nullable<IPermissionPoint<T>>;
     getPermissionPoint$<T = boolean>(permissionId: string): Nullable<Observable<IPermissionPoint<T>>>;
     clearPermissionMap(): void;
     composePermission$(permissionId: string[]): Observable<IPermissionPoint<unknown>[]>;
     composePermission(permissionId: string[]): IPermissionPoint<unknown>[];
+    getAllPermissionPoint(): Map<string, Observable<IPermissionPoint<unknown>>>;
 }
 export declare const IPermissionService: import('@wendellhu/redi').IdentifierDecorator<IPermissionService>;

package/lib/types/shared/common.d.ts

@@ -1,5 +1,5 @@
 import { IRange } from '../types/interfaces';
-import { ICellData } from '../types/interfaces/i-cell-data';
+import { ICellData, ICellDataForSheetInterceptor } from '../types/interfaces/i-cell-data';
 import { IDocumentData } from '../types/interfaces/i-document-data';
 import { IRangeWithCoord, ISelectionCell, ISelectionCellWithCoord } from '../types/interfaces/i-selection-data';
 import { IColorStyle, IStyleData } from '../types/interfaces/i-style-data';
@@ -8,6 +8,7 @@ import { Nullable } from './types';
 export declare function makeCellToSelection(cellInfo: Nullable<ISelectionCellWithCoord>): Nullable<IRangeWithCoord>;
 export declare function makeCellRangeToRangeData(cellInfo: Nullable<ISelectionCell>): Nullable<IRange>;
 export declare function isEmptyCell(cell: Nullable<ICellData>): boolean;
+export declare function isCellCoverable(cell: Nullable<ICellDataForSheetInterceptor>): boolean;
 export declare function getColorStyle(color: Nullable<IColorStyle>): Nullable<string>;
 /**
  * A string starting with an equal sign is a formula

package/lib/types/shared/rectangle.d.ts

@@ -1,4 +1,4 @@
-import { IRange } from '../types/interfaces/i-range';
+import { IRange, IRectLTRB } from '../types/interfaces/i-range';
 import { Nullable } from './types';
 
 /**
@@ -19,15 +19,6 @@ export declare class Rectangle {
     static moveVertical: (range: IRange, step?: number, length?: number) => IRange;
     static moveOffset: (range: IRange, offsetX: number, offsetY: number) => IRange;
     static subtract(range1: IRange, range2: IRange): IRange[];
-    static hasIntersectionBetweenTwoBounds(rect1: {
-        left: number;
-        top: number;
-        right: number;
-        bottom: number;
-    }, rect2: {
-        left: number;
-        top: number;
-        right: number;
-        bottom: number;
-    }): boolean;
+    static hasIntersectionBetweenTwoRect(rect1: IRectLTRB, rect2: IRectLTRB): boolean;
+    static getIntersectionBetweenTwoRect(rect1: IRectLTRB, rect2: IRectLTRB): Required<IRectLTRB> | null;
 }

package/lib/types/sheets/workbook.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { ILogService } from '../services/log/log.service';
 import { Nullable } from '../shared';
-import { IGridRange, IRangeType, IWorkbookData, IWorksheetData } from '../types/interfaces';
+import { IRangeType, IWorkbookData, IWorksheetData } from '../types/interfaces';
 import { UnitModel, UniverInstanceType } from '../common/unit';
 import { Styles } from './styles';
 import { Worksheet } from './worksheet';
@@ -63,15 +63,15 @@ export declare class Workbook extends UnitModel<IWorkbookData, UniverInstanceTyp
     getConfig(): IWorkbookData;
     getIndexBySheetId(sheetId: string): number;
     /**
-     *
-     * @returns
+     * Get the active sheet
      */
-    getRawActiveSheet(): Nullable<Worksheet>;
+    getActiveSheet(): Nullable<Worksheet>;
     /**
-     * Get the active sheet. If there is no active sheet, the first sheet would
+     * If there is no active sheet, the first sheet would
      * be set active.
+     * @returns
      */
-    getActiveSheet(): Worksheet;
+    ensureActiveSheet(): Worksheet;
     setActiveSheet(worksheet: Nullable<Worksheet>): void;
     removeSheet(sheetId: string): boolean;
     getActiveSheetIndex(): number;
@@ -83,45 +83,6 @@ export declare class Workbook extends UnitModel<IWorkbookData, UniverInstanceTyp
     getSheetBySheetId(sheetId: string): Nullable<Worksheet>;
     getSheetByIndex(index: number): Nullable<Worksheet>;
     getHiddenWorksheets(): string[];
-    /**
-     * transform any range type to range data
-     *
-     * @remarks
-     * e.g.,
-     * "A1:B1", "Sheet2!A1:B1"
-     *
-     * or
-     *
-     * {
-     *  row:[0,1],
-     *  column:[0,1]
-     * }
-     *
-     * or
-     *
-     * {
-     *    startRow:0 ,
-     *    startColumn:0,
-     *    endRow:1,
-     *    endColumn:1,
-     * }
-     *
-     * to
-     *
-     * {
-     *    startRow:0 ,
-     *    startColumn:0,
-     *    endRow:1,
-     *    endColumn:1,
-     * }
-     *
-     *   IRangeType[] is to prevent type detection
-     *
-     * @param range support all range types
-     *
-     * @returns range data
-     */
-    transformRangeType(range: IRangeType | IRangeType[]): IGridRange;
     load(config: IWorkbookData): void;
     /**
      * Check if sheet name is unique
@@ -141,13 +102,6 @@ export declare class Workbook extends UnitModel<IWorkbookData, UniverInstanceTyp
      * @returns New sheet name
      */
     generateNewSheetName(name: string): string;
-    /**
-     * Get the range array based on the range string and sheet id
-     *
-     * @param txt - range string
-     * @returns
-     */
-    private _getCellRange;
     /**
      * Get Default Sheet
      */

package/lib/types/types/interfaces/i-cell-data.d.ts

@@ -56,6 +56,10 @@ export interface ICellDataForSheetInterceptor extends ICellData {
     markers?: ICellMarks;
     customRender?: Nullable<ICellCustomRender[]>;
     interceptorAutoHeight?: number;
+    /**
+     * can cell be covered when sibling is overflow
+     */
+    coverable?: boolean;
 }
 export declare function isICellData(value: any): value is ICellData;
 export declare function getCellValueType(cell: ICellData): CellValueType | null | undefined;

package/lib/types/types/interfaces/i-range.d.ts

@@ -183,3 +183,11 @@ export interface IOptionData {
  */
 export interface ICopyToOptionsData extends IOptionData {
 }
+export interface IRectLTRB {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+    width?: number;
+    height?: number;
+}