@univerjs/sheets-ui 0.2.3 → 0.2.4

package/lib/types/commands/commands/__tests__/create-command-test-bed.d.ts

@@ -6,4 +6,4 @@ export interface ITestBed {
     get: Injector['get'];
     sheet: Workbook;
 }
-export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): ITestBed;
+export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[], renderDependencies?: Dependency[]): ITestBed;

package/lib/types/commands/operations/cell-edit.operation.d.ts

@@ -6,5 +6,7 @@ export declare const SetCellEditVisibleWithF2Operation: IOperation<IEditorBridge
 /**
  * When the editor is not clicked to change the cursor,
  * the arrow keys will exit editing and move the cell.
+ *
+ * @deprecated Should not use operation as an event.
  */
 export declare const SetCellEditVisibleArrowOperation: IOperation<IEditorBridgeServiceVisibleParam>;

package/lib/types/controllers/editor/editing.render-controller.d.ts

@@ -1,4 +1,4 @@
-import { ICellData, Workbook, Disposable, ICommandService, IContextService, IUndoRedoService, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { DocumentDataModel, ICellData, IDocumentData, Workbook, Disposable, ICommandService, IContextService, IResourceLoaderService, IUndoRedoService, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { TextSelectionManagerService } from '@univerjs/docs';
 import { IDocumentLayoutObject, IRenderContext, IRenderModule, IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { IEditorService } from '@univerjs/ui';
@@ -11,32 +11,39 @@ export declare class EditingRenderController extends Disposable implements IRend
     private readonly _context;
     private readonly _undoRedoService;
     private readonly _contextService;
-    /** @deprecated This controller should not directly use univerInstanceService. Instead, it should call editor service. */
-    private readonly _univerInstanceService;
+    private readonly _instanceSrv;
     private readonly _renderManagerService;
     private readonly _editorBridgeService;
     private readonly _cellEditorManagerService;
     private readonly _textSelectionRenderManager;
-    private readonly _selectionManagerService;
     private readonly _lexerTreeBuilder;
     private readonly _textSelectionManagerService;
     private readonly _commandService;
     protected readonly _localService: LocaleService;
     private readonly _editorService;
+    private readonly _resourceLoaderService;
     /**
      * It is used to distinguish whether the user has actively moved the cursor in the editor, mainly through mouse clicks.
      */
     private _cursorChange;
-    constructor(_context: IRenderContext<Workbook>, _undoRedoService: IUndoRedoService, _contextService: IContextService, 
-    /** @deprecated This controller should not directly use univerInstanceService. Instead, it should call editor service. */
-    _univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _editorBridgeService: IEditorBridgeService, _cellEditorManagerService: ICellEditorManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _selectionManagerService: SheetsSelectionsService, _lexerTreeBuilder: LexerTreeBuilder, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService, _localService: LocaleService, _editorService: IEditorService);
+    /** If the corresponding unit is active and prepared for editing. */
+    private _isUnitEditing;
+    private _workbookSelections;
+    private _d;
+    constructor(_context: IRenderContext<Workbook>, selectionManagerService: SheetsSelectionsService, _undoRedoService: IUndoRedoService, _contextService: IContextService, _instanceSrv: IUniverInstanceService, _renderManagerService: IRenderManagerService, _editorBridgeService: IEditorBridgeService, _cellEditorManagerService: ICellEditorManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _lexerTreeBuilder: LexerTreeBuilder, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService, _localService: LocaleService, _editorService: IEditorService, _resourceLoaderService: IResourceLoaderService);
+    dispose(): void;
+    private _disposeCurrent;
     private _init;
     private _initEditorVisibilityListener;
     private _listenEditorFocus;
     private _getEditorSkeleton;
     private _getEditorViewModel;
     private _initialCursorSync;
-    private _initialEditFocusListener;
+    /**
+     * Should update current editing cell info when selection is changed.
+     * @param d DisposableCollection
+     */
+    private _subscribeToCurrentCell;
     private _fitTextSize;
     /**
      * Mainly used to pre-calculate the width of the editor,
@@ -55,6 +62,10 @@ export declare class EditingRenderController extends Disposable implements IRend
     private _addBackground;
     private _handleEditorVisible;
     private _resetBodyStyle;
+    /**
+     * Should activate the editor when the user inputs text.
+     * @param d DisposableCollection
+     */
     private _initialKeyboardListener;
     private _showEditorByKeyboard;
     /**
@@ -66,7 +77,11 @@ export declare class EditingRenderController extends Disposable implements IRend
     private _handleEditorInvisible;
     private _exitInput;
     private _moveCursor;
+    /**
+     * The user's operations follow the sequence of opening the editor and then moving the cursor.
+     * The logic here predicts the user's first cursor movement behavior based on this rule
+     */
     private _cursorStateListener;
     private _moveInEditor;
 }
-export declare function getCellDataByInput(cellData: ICellData, documentLayoutObject: IDocumentLayoutObject, lexerTreeBuilder: LexerTreeBuilder): ICellData | null;
+export declare function getCellDataByInput(cellData: ICellData, documentLayoutObject: IDocumentLayoutObject, lexerTreeBuilder: LexerTreeBuilder, getSnapshot: (data: DocumentDataModel) => IDocumentData): ICellData | null;

package/lib/types/controllers/hover-render.controller.d.ts

@@ -2,14 +2,14 @@ import { Workbook, Disposable } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { HoverManagerService } from '../services/hover-manager.service';
 import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';
-import { ScrollManagerService } from '../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../services/scroll-manager.service';
 
 export declare class HoverRenderController extends Disposable implements IRenderModule {
     private readonly _context;
     private _hoverManagerService;
     private _sheetSkeletonManagerService;
     private _scrollManagerService;
-    constructor(_context: IRenderContext<Workbook>, _hoverManagerService: HoverManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _scrollManagerService: ScrollManagerService);
+    constructor(_context: IRenderContext<Workbook>, _hoverManagerService: HoverManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _scrollManagerService: SheetScrollManagerService);
     private _initPointerEvent;
     private _initScrollEvent;
 }

package/lib/types/controllers/permission/sheet-permission-interceptor-base.controller.d.ts

@@ -19,7 +19,9 @@ export declare class SheetPermissionInterceptorBaseController extends Disposable
     private readonly _contextService;
     private readonly _definedNamesService;
     disposableCollection: DisposableCollection;
+    private _showPermissionDialog;
     constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _permissionService: IPermissionService, _selectionManagerService: SheetsSelectionsService, _dialogService: IDialogService, _rangeProtectionRuleModel: RangeProtectionRuleModel, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _autoFillService: IAutoFillService, _localeService: LocaleService, _lexerTreeBuilder: LexerTreeBuilder, _contextService: IContextService, _definedNamesService: IDefinedNamesService);
+    setShowPermissionDialog(value: boolean): void;
     haveNotPermissionHandle(errorMsg: string): void;
     private _getPermissionCheck;
     private _initialize;

package/lib/types/controllers/render-controllers/editor-bridge.render-controller.d.ts

@@ -1,4 +1,4 @@
-import { Workbook, ICommandService, RxDisposable } from '@univerjs/core';
+import { Workbook, ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IRangeSelectorService } from '@univerjs/ui';
@@ -6,17 +6,19 @@ import { IEditorBridgeService } from '../../services/editor-bridge.service';
 
 export declare class EditorBridgeRenderController extends RxDisposable implements IRenderModule {
     private readonly _context;
+    private readonly _instanceSrv;
     private readonly _commandService;
     private readonly _editorBridgeService;
     private readonly _selectionManagerService;
     private readonly _rangeSelectorService;
-    constructor(_context: IRenderContext<Workbook>, _commandService: ICommandService, _editorBridgeService: IEditorBridgeService, _selectionManagerService: SheetsSelectionsService, _rangeSelectorService: IRangeSelectorService);
-    private _initialize;
+    private _d;
+    constructor(_context: IRenderContext<Workbook>, _instanceSrv: IUniverInstanceService, _commandService: ICommandService, _editorBridgeService: IEditorBridgeService, _selectionManagerService: SheetsSelectionsService, _rangeSelectorService: IRangeSelectorService);
+    private _init;
+    private _disposeCurrent;
     private _initSelectionChangeListener;
     private _updateEditorPosition;
-    private _handleSelectionChange;
     private _initEventListener;
-    private _onCanvasPointerDown;
+    private _tryHideEditor;
     private _hideEditor;
     private _initialRangeSelector;
     private _rangeSelector;

package/lib/types/controllers/render-controllers/freeze.render-controller.d.ts

@@ -2,7 +2,7 @@ import { Workbook, Disposable, ICommandService, InterceptorManager, ThemeService
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
 import { Injector } from '@wendellhu/redi';
-import { ScrollManagerService } from '../../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 
 export declare const FREEZE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, null>;
@@ -37,7 +37,7 @@ export declare class HeaderFreezeRenderController extends Disposable implements
     interceptor: InterceptorManager<{
         FREEZE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, null>;
     }>;
-    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: ScrollManagerService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _injector: Injector);
+    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: SheetScrollManagerService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _injector: Injector);
     dispose(): void;
     private _initialize;
     private _createFreeze;

package/lib/types/controllers/render-controllers/mobile/mobile-scroll.render-controller.d.ts

@@ -1,7 +1,7 @@
 import { IRange, Workbook, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
-import { ScrollManagerService } from '../../../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';
 
 /**
@@ -15,7 +15,7 @@ export declare class MobileSheetsScrollRenderController extends Disposable imple
     private readonly _selectionManagerService;
     private readonly _scrollManagerService;
     protected readonly _univerInstanceService: IUniverInstanceService;
-    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: ScrollManagerService, _univerInstanceService: IUniverInstanceService);
+    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: SheetScrollManagerService, _univerInstanceService: IUniverInstanceService);
     scrollToRange(range: IRange): boolean;
     private _init;
     private _initCommandListener;

package/lib/types/controllers/render-controllers/scroll.render-controller.d.ts

@@ -1,7 +1,7 @@
 import { IRange, Workbook, Disposable, ICommandService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { Injector } from '@wendellhu/redi';
-import { ScrollManagerService } from '../../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 
 /**
@@ -14,7 +14,7 @@ export declare class SheetsScrollRenderController extends Disposable implements
     private readonly _commandService;
     private readonly _renderManagerService;
     private readonly _scrollManagerService;
-    constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _scrollManagerService: ScrollManagerService);
+    constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _scrollManagerService: SheetScrollManagerService);
     scrollToRange(range: IRange): boolean;
     private _init;
     private _initCommandListener;

package/lib/types/services/drag-manager.service.d.ts

@@ -1,6 +1,5 @@
 import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
 import { IDragEvent, IRenderManagerService } from '@univerjs/engine-render';
-import { ScrollManagerService } from './scroll-manager.service';
 import { IHoverCellPosition } from './hover-manager.service';
 
 export interface IDragCellPosition extends IHoverCellPosition {
@@ -8,13 +7,12 @@ export interface IDragCellPosition extends IHoverCellPosition {
 }
 export declare class DragManagerService extends Disposable {
     private readonly _univerInstanceService;
-    private readonly _scrollManagerService;
     private readonly _renderManagerService;
     private _currentCell$;
     currentCell$: import('rxjs').Observable<Nullable<IDragCellPosition>>;
     private _endCell$;
     endCell$: import('rxjs').Observable<Nullable<IDragCellPosition>>;
-    constructor(_univerInstanceService: IUniverInstanceService, _scrollManagerService: ScrollManagerService, _renderManagerService: IRenderManagerService);
+    constructor(_univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService);
     dispose(): void;
     private _initCellDisposableListener;
     private _calcActiveCell;

package/lib/types/services/editor-bridge.service.d.ts

@@ -1,6 +1,6 @@
-import { ICellDataForSheetInterceptor, IPosition, ISelectionCell, Nullable, Disposable, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { ICellDataForSheetInterceptor, IPosition, ISelectionCell, Nullable, Disposable, IContextService, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
 import { Engine, IDocumentLayoutObject, Scene, DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';
-import { ISheetLocation } from '@univerjs/sheets';
+import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
 import { IEditorService, KeyCode } from '@univerjs/ui';
 import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
@@ -8,6 +8,7 @@ import { Observable } from 'rxjs';
 export interface IEditorBridgeServiceVisibleParam {
     visible: boolean;
     eventType: DeviceInputEventType;
+    unitId: string;
     keycode?: KeyCode;
 }
 export interface ICurrentEditCellParam {
@@ -63,6 +64,8 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     private readonly _themeService;
     private readonly _univerInstanceService;
     private readonly _editorService;
+    private readonly _refSelectionsService;
+    private readonly _contextService;
     private _editorUnitId;
     private _isForceKeepVisible;
     private _editorIsDirty;
@@ -80,7 +83,7 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
         AFTER_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocation>;
         AFTER_CELL_EDIT_ASYNC: import('@univerjs/core').IInterceptor<Promise<Nullable<ICellDataForSheetInterceptor>>, ISheetLocation>;
     }>;
-    constructor(_renderManagerService: IRenderManagerService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService);
+    constructor(_renderManagerService: IRenderManagerService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService, _refSelectionsService: SheetsSelectionsService, _contextService: IContextService);
     refreshEditCellState(): void;
     setEditCell(param: ICurrentEditCellParam): void;
     getEditCellState(): Readonly<Nullable<IEditorBridgeServiceParam>>;

package/lib/types/services/hover-manager.service.d.ts

@@ -1,7 +1,6 @@
 import { IPosition, Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
 import { ISheetLocation } from '@univerjs/sheets';
 import { IRenderManagerService } from '@univerjs/engine-render';
-import { ScrollManagerService } from './scroll-manager.service';
 
 export interface IHoverCellPosition {
     position: IPosition;
@@ -9,13 +8,12 @@ export interface IHoverCellPosition {
 }
 export declare class HoverManagerService extends Disposable {
     private readonly _univerInstanceService;
-    private readonly _scrollManagerService;
     private readonly _renderManagerService;
     private _currentCell$;
     currentCell$: import('rxjs').Observable<Nullable<IHoverCellPosition>>;
     currentPosition$: import('rxjs').Observable<Nullable<IHoverCellPosition>>;
     private _lastPosition;
-    constructor(_univerInstanceService: IUniverInstanceService, _scrollManagerService: ScrollManagerService, _renderManagerService: IRenderManagerService);
+    constructor(_univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService);
     dispose(): void;
     private _initCellDisposableListener;
     private _calcActiveCell;

package/lib/types/services/scroll-manager.service.d.ts

@@ -1,6 +1,7 @@
-import { IUniverInstanceService, Nullable } from '@univerjs/core';
+import { Nullable, Workbook } from '@univerjs/core';
 import { BehaviorSubject } from 'rxjs';
-import { IRenderManagerService } from '@univerjs/engine-render';
+import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
 
 export interface IViewportScrollState {
     scrollX: number;
@@ -49,9 +50,9 @@ export type IScrollInfo = Map<string, Map<string, IScrollManagerParam>>;
  *
  * ScrollController subscribes to the changes in service data to refresh the view scrolling.
  */
-export declare class ScrollManagerService {
-    private readonly _univerInstanceService;
-    private readonly _renderManagerService;
+export declare class SheetScrollManagerService implements IRenderModule {
+    private readonly _context;
+    private readonly _sheetSkeletonManagerService;
     /**
      * a map holds all scroll info for each sheet
      */
@@ -74,7 +75,7 @@ export declare class ScrollManagerService {
      * use this subject not rawScrollInfo$ when get scrolling state of viewport.
      */
     private _searchParamForScroll;
-    constructor(_univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService);
+    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService);
     dispose(): void;
     setSearchParam(param: IScrollManagerSearchParam): void;
     setSearchParamAndRefresh(param: IScrollManagerSearchParam): void;

package/lib/types/services/selection/base-selection-render.service.d.ts

@@ -33,6 +33,7 @@ export interface ISheetSelectionRenderService {
     /** @deprecated Use the function `attachPrimaryWithCoord` instead`. */
     attachPrimaryWithCoord(primary: Nullable<Partial<ISelectionCell>>): Nullable<ISelectionCellWithMergeInfo>;
     getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
+    setSingleSelectionEnabled(enabled: boolean): void;
 }
 export declare const ISheetSelectionRenderService: import('@wendellhu/redi').IdentifierDecorator<ISheetSelectionRenderService>;
 /**
@@ -90,6 +91,7 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     protected _resetStyle(): void;
     /** @deprecated This should not be provided by the selection render service. */
     getViewPort(): Viewport;
+    setSingleSelectionEnabled(enabled?: boolean): void;
     /**
      * add a selection
      *
@@ -159,8 +161,7 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
      */
     protected _moving(offsetX: number, offsetY: number, activeSelectionControl: Nullable<SelectionControl>, rangeType: RANGE_TYPE): false | undefined;
     protected _updateSelectionControlRange(control: SelectionControl, newSelectionRange: IRangeWithCoord, highlight: Nullable<ISelectionCellWithMergeInfo>): void;
-    private _clearMove;
-    protected _clearEndingListeners(): void;
+    protected _clearUpdatingListeners(): void;
     protected _addEndingListeners(): void;
     protected _getCellRangeByCursorPosition(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
         x: number;

package/lib/types/services/selection/mobile-selection-render.service.d.ts

@@ -3,7 +3,7 @@ import { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, Viewp
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { Injector } from '@wendellhu/redi';
-import { ScrollManagerService } from '../scroll-manager.service';
+import { SheetScrollManagerService } from '../scroll-manager.service';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 import { BaseSelectionRenderService } from './base-selection-render.service';
 import { MobileSelectionControl } from './mobile-selection-shape';
@@ -28,7 +28,7 @@ export declare class MobileSheetsSelectionRenderService extends BaseSelectionRen
     _expandingSelection: boolean;
     protected _selectionControls: MobileSelectionControl[];
     expandingControlMode: ExpandingControl;
-    constructor(_context: IRenderContext<Workbook>, injector: Injector, themeService: ThemeService, shortcutService: IShortcutService, renderManagerService: IRenderManagerService, selectionManagerService: SheetsSelectionsService, _logService: ILogService, _commandService: ICommandService, _contextService: IContextService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _scrollManagerService: ScrollManagerService);
+    constructor(_context: IRenderContext<Workbook>, injector: Injector, themeService: ThemeService, shortcutService: IShortcutService, renderManagerService: IRenderManagerService, selectionManagerService: SheetsSelectionsService, _logService: ILogService, _commandService: ICommandService, _contextService: IContextService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _scrollManagerService: SheetScrollManagerService);
     private _init;
     private _initSkeletonChangeListener;
     private _initSelectionChangeListener;

package/lib/types/services/selection/selection-render-model.d.ts

@@ -5,9 +5,6 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
     private _startRow;
     private _endColumn;
     private _endRow;
-    /**
-     * value from { startY, endY, startX, endX } = getCellPositionByIndex in basics/tools
-     */
     private _startX;
     private _startY;
     private _endX;
@@ -17,47 +14,28 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
      * when there is no merge info
      * top left cell of current selection (or bottomLeft of current selection)
      */
-    private _currentCell;
+    private _primary;
     private _rangeType;
     get startColumn(): number;
     get startRow(): number;
     get endColumn(): number;
     get endRow(): number;
-    /**
-     * value from { startY, endY, startX, endX } = getCellPositionByIndex in basics/tools
-     */
     get startX(): number;
-    /**
-     * value from { startY, endY, startX, endX } = getCellPositionByIndex in basics/tools
-     */
     get startY(): number;
-    /**
-     * value from { startY, endY, startX, endX } = getCellPositionByIndex in basics/tools
-     */
     get endX(): number;
-    /**
-     * value from { startY, endY, startX, endX } = getCellPositionByIndex in basics/tools
-     */
     get endY(): number;
-    /**
-     * highlight cell of selection
-     */
     get currentCell(): Nullable<ISelectionCellWithMergeInfo>;
     get rangeType(): RANGE_TYPE;
+    /**
+     * @deprecated, Duplicate with `Rectangle`
+     */
     isEqual(rangeWithCoord: IRangeWithCoord): boolean;
+    /**
+     * @deprecated, Duplicate with `Rectangle`
+     */
     isInclude(rangeWithCoord: IRangeWithCoord): boolean;
     highlightToSelection(): IRangeWithCoord | undefined;
-    getRange(): {
-        startColumn: number;
-        startRow: number;
-        endColumn: number;
-        endRow: number;
-        startX: number;
-        startY: number;
-        endX: number;
-        endY: number;
-        rangeType: RANGE_TYPE;
-    };
+    getRange(): IRangeWithCoord;
     getCell(): Nullable<ISelectionCellWithMergeInfo>;
     getRangeType(): RANGE_TYPE;
     setRangeType(rangeType: RANGE_TYPE): void;

package/lib/types/services/sheet-skeleton-manager.service.d.ts

@@ -37,7 +37,7 @@ export declare class SheetSkeletonManagerService extends Disposable implements I
     readonly currentSkeletonBefore$: import('rxjs').Observable<Nullable<ISheetSkeletonManagerParam>>;
     constructor(_context: IRenderContext<Workbook>, _injector: Injector);
     private _initRemoveSheet;
-    getCurrentSkeleton(): SpreadsheetSkeleton;
+    getCurrentSkeleton(): Nullable<SpreadsheetSkeleton>;
     getCurrent(): Nullable<ISheetSkeletonManagerParam>;
     getWorksheetSkeleton(sheetId: string): Nullable<ISheetSkeletonManagerParam>;
     /**

package/lib/types/views/status-bar/CopyableStatisticItem.d.ts

@@ -13,5 +13,5 @@ interface FunctionNameMap {
     [key: string]: string;
 }
 export declare const CopyableStatisticItem: React.FC<IStatisticItem>;
-export declare function formatNumber(item: IStatisticItem): string | 0;
+export declare function formatNumber(item: IStatisticItem): any;
 export {};