@univerjs/sheets-ui 0.2.3 → 0.2.4-alpha.0

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/cell-editor-manager.service.d.ts

@@ -1,5 +1,4 @@
-import { IPosition, Nullable } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable, IPosition, Nullable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 
 export interface ICellEditorManagerParam extends Partial<IPosition> {
@@ -40,4 +39,4 @@ export declare class CellEditorManagerService implements ICellEditorManagerServi
     setFocus(param?: boolean): void;
     private _refresh;
 }
-export declare const ICellEditorManagerService: import('@wendellhu/redi').IdentifierDecorator<CellEditorManagerService>;
+export declare const ICellEditorManagerService: import('@univerjs/core').IdentifierDecorator<CellEditorManagerService>;

package/lib/types/services/editor/formula-editor-manager.service.d.ts

@@ -1,5 +1,4 @@
-import { Nullable } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable, Nullable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 
 export interface IFormulaEditorManagerService {
@@ -31,4 +30,4 @@ export declare class FormulaEditorManagerService implements IDisposable {
     handleFoldBtnClick(params: boolean): void;
     private _refresh;
 }
-export declare const IFormulaEditorManagerService: import('@wendellhu/redi').IdentifierDecorator<FormulaEditorManagerService>;
+export declare const IFormulaEditorManagerService: import('@univerjs/core').IdentifierDecorator<FormulaEditorManagerService>;

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

@@ -1,13 +1,13 @@
-import { ICellDataForSheetInterceptor, IPosition, ISelectionCell, Nullable, Disposable, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { ICellDataForSheetInterceptor, IDisposable, 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';
 
 export interface IEditorBridgeServiceVisibleParam {
     visible: boolean;
     eventType: DeviceInputEventType;
+    unitId: string;
     keycode?: KeyCode;
 }
 export interface ICurrentEditCellParam {
@@ -63,6 +63,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 +82,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>>;
@@ -114,5 +116,5 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     changeEditorDirty(dirtyStatus: boolean): void;
     getEditorDirty(): boolean;
 }
-export declare const IEditorBridgeService: import('@wendellhu/redi').IdentifierDecorator<EditorBridgeService>;
+export declare const IEditorBridgeService: import('@univerjs/core').IdentifierDecorator<EditorBridgeService>;
 export {};

package/lib/types/services/format-painter/format-painter.service.d.ts

@@ -32,7 +32,7 @@ export declare enum FormatPainterStatus {
     ONCE = 1,
     INFINITE = 2
 }
-export declare const IFormatPainterService: import('@wendellhu/redi').IdentifierDecorator<IFormatPainterService>;
+export declare const IFormatPainterService: import('@univerjs/core').IdentifierDecorator<IFormatPainterService>;
 export declare class FormatPainterService extends Disposable implements IFormatPainterService {
     private readonly _selectionManagerService;
     private readonly _themeService;

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/mark-selection/mark-selection.service.d.ts

@@ -18,7 +18,7 @@ interface IMarkSelectionInfo {
     control: SelectionControl | null;
     exits: string[];
 }
-export declare const IMarkSelectionService: import('@wendellhu/redi').IdentifierDecorator<IMarkSelectionService>;
+export declare const IMarkSelectionService: import('@univerjs/core').IdentifierDecorator<IMarkSelectionService>;
 export declare class MarkSelectionService extends Disposable implements IMarkSelectionService {
     private readonly _currentService;
     private readonly _renderManagerService;

package/lib/types/services/permission/worksheet-permission-render.service.d.ts

@@ -1,5 +1,5 @@
-import { IRenderManagerService } from '@univerjs/engine-render';
 import { Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IRenderManagerService } from '@univerjs/engine-render';
 
 export declare class WorksheetProtectionRenderService extends Disposable {
     private _renderManagerService;

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

@@ -1,8 +1,7 @@
-import { IInterceptor, IRange, IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
+import { IInterceptor, Injector, IRange, IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent, IRenderManagerService, IRenderModule, Scene, SpreadsheetSkeleton, Viewport, ScrollTimer, ScrollTimerType } from '@univerjs/engine-render';
 import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 import { Observable, Subscription, BehaviorSubject, Subject } from 'rxjs';
 import { SelectionControl } from './selection-shape';
 
@@ -33,8 +32,9 @@ 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>;
+export declare const ISheetSelectionRenderService: import('@univerjs/core').IdentifierDecorator<ISheetSelectionRenderService>;
 /**
  * The basic implementation of selection rendering logics. It is designed to be reused for different purposes.
  */
@@ -90,6 +90,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 +160,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

@@ -1,9 +1,8 @@
-import { Workbook, ICommandService, IContextService, ILogService, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, IContextService, ILogService, Injector, RANGE_TYPE, ThemeService } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, Viewport, IRenderManagerService } from '@univerjs/engine-render';
 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 +27,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/selection/selection-render.service.d.ts

@@ -1,8 +1,7 @@
-import { Workbook, ICommandService, IContextService, ILogService, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, IContextService, ILogService, Injector, ThemeService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 import { BaseSelectionRenderService } from './base-selection-render.service';
 

package/lib/types/services/selection/selection-shape-extension.d.ts

@@ -1,6 +1,5 @@
-import { IRangeWithCoord, ThemeService } from '@univerjs/core';
+import { Injector, IRangeWithCoord, ThemeService } from '@univerjs/core';
 import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
-import { Injector } from '@wendellhu/redi';
 import { SelectionControl } from './selection-shape';
 
 export interface ISelectionShapeTargetSelection {

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

@@ -1,5 +1,4 @@
-import { Disposable } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { Disposable, IDisposable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { IScrollState } from '../../views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar';
 
@@ -20,7 +19,7 @@ export interface ISheetBarService {
     triggerSheetBarMenu(): void;
     registerSheetBarMenuHandler(handler: ISheetBarMenuHandler): IDisposable;
 }
-export declare const ISheetBarService: import('@wendellhu/redi').IdentifierDecorator<ISheetBarService>;
+export declare const ISheetBarService: import('@univerjs/core').IdentifierDecorator<ISheetBarService>;
 export declare class SheetBarService extends Disposable implements ISheetBarService {
     readonly renameId$: Observable<string>;
     readonly removeId$: Observable<string>;

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

@@ -1,6 +1,5 @@
-import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable } from '@univerjs/core';
+import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable, Injector } from '@univerjs/core';
 import { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render';
-import { Injector } from '@wendellhu/redi';
 
 export interface ISheetSkeletonManagerParam {
     unitId?: string;
@@ -37,7 +36,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/services/sheets-render.service.d.ts

@@ -1,6 +1,5 @@
-import { IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { IDisposable, IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
-import { IDisposable } from '@wendellhu/redi';
 
 /**
  * This controller is responsible for managing units of a specific kind to be rendered on the canvas.

package/lib/types/services/shortcut-experience.service.d.ts

@@ -1,6 +1,5 @@
-import { ISelection, ITextRangeParam, Nullable, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { IDisposable, ISelection, ITextRangeParam, Nullable, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { KeyCode } from '@univerjs/ui';
-import { IDisposable } from '@wendellhu/redi';
 
 export interface IShortcutExperienceSearch {
     unitId: string;

package/lib/types/services/status-bar.service.d.ts

@@ -1,6 +1,5 @@
-import { Nullable } from '@univerjs/core';
+import { IDisposable, Nullable } from '@univerjs/core';
 import { IFunctionNames } from '@univerjs/engine-formula';
-import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 export interface IStatusBarService {
@@ -31,4 +30,4 @@ export declare class StatusBarService implements IStatusBarService, IDisposable
     getFunctions(): Readonly<IStatusBarFunction[]>;
     addFunctions(functions: IStatusBarFunction[]): void;
 }
-export declare const IStatusBarService: import('@wendellhu/redi').IdentifierDecorator<StatusBarService>;
+export declare const IStatusBarService: import('@univerjs/core').IdentifierDecorator<StatusBarService>;

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

@@ -1,5 +1,4 @@
-import { IUniverInstanceService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, IUniverInstanceService, Plugin, UniverInstanceType } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { IUniverSheetsUIConfig } from './controllers/sheet-ui.controller';