@univerjs/sheets-ui 0.1.9 → 0.1.11

package/lib/types/services/mark-selection/mark-selection.service.d.ts

@@ -1,9 +1,9 @@
-import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
-import { SelectionShape } from '../selection/selection-shape';
-import { ISelectionRenderService } from '../selection/selection-render.service';
-import { ISelectionWithStyle } from '@univerjs/sheets';
-import { IRenderManagerService } from '@univerjs/engine-render';
 import { Disposable, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { ISelectionWithStyle } from '@univerjs/sheets';
+import { ISelectionRenderService } from '../selection/selection-render.service';
+import { SelectionShape } from '../selection/selection-shape';
+import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 
 export interface IMarkSelectionService {
     addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;

package/lib/types/services/selection/__test__/create-service-test-bed.d.ts

@@ -1,5 +1,5 @@
-import { Dependency, Injector } from '@wendellhu/redi';
 import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
+import { Dependency, Injector } from '@wendellhu/redi';
 
 export interface ITestBed {
     univer: Univer;

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

@@ -1,11 +1,11 @@
-import { SelectionShape } from './selection-shape';
-import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
-import { Observable } from 'rxjs';
-import { Injector } from '@wendellhu/redi';
-import { IShortcutService } from '@univerjs/ui';
-import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
-import { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport, ScrollTimerType } from '@univerjs/engine-render';
 import { IRange, IRangeWithCoord, ISelection, ISelectionCell, ISelectionCellWithCoord, Nullable, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport, ScrollTimerType } from '@univerjs/engine-render';
+import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
+import { IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
+import { Observable } from 'rxjs';
+import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
+import { SelectionShape } from './selection-shape';
 
 export interface IControlFillConfig {
     oldRange: IRange;
@@ -16,6 +16,7 @@ export interface ISelectionRenderService {
     readonly controlFillConfig$: Observable<IControlFillConfig | null>;
     readonly selectionMoving$: Observable<ISelectionWithCoordAndStyle[]>;
     readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
+    readonly usable$: Observable<boolean>;
     enableHeaderHighlight(): void;
     disableHeaderHighlight(): void;
     enableDetectMergedCell(): void;
@@ -32,14 +33,15 @@ export interface ISelectionRenderService {
     disableSkipRemainLast(): void;
     addControlToCurrentByRangeData(data: ISelectionWithCoordAndStyle): void;
     updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
-    changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;
+    changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport): void;
+    /** @deprecated This should not be provided by the selection render service. */
     getViewPort(): Viewport;
     getCurrentControls(): SelectionShape[];
     getActiveSelections(): Nullable<ISelection[]>;
     getActiveRange(): Nullable<IRange>;
     getActiveSelection(): Nullable<SelectionShape>;
     getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
-    convertSelectionRangeToData(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
+    convertSelectionToCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
     convertRangeDataToSelection(range: IRange): Nullable<IRangeWithCoord>;
     convertCellRangeToInfo(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithCoord>;
     eventTrigger(evt: IPointerEvent | IMouseEvent, zIndex: number, rangeType: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): void;
@@ -58,6 +60,8 @@ export interface ISelectionRenderService {
  * you can adjust the style and performance of each selection area.
  * This service is used in conjunction with the SelectionManagerService
  * to implement functions related to the selection area in univer.
+ *
+ * @todo Refactor it to RenderController.
  */
 export declare class SelectionRenderService implements ISelectionRenderService {
     private readonly _themeService;
@@ -100,6 +104,12 @@ export declare class SelectionRenderService implements ISelectionRenderService {
      */
     readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
     private _activeViewport;
+    /**
+     * This service relies on the scene and skeleton to work
+     * Use usable$ to check if this service works
+     */
+    private readonly _usable$;
+    readonly usable$: Observable<boolean>;
     constructor(_themeService: ThemeService, _shortcutService: IShortcutService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _injector: Injector);
     enableHeaderHighlight(): void;
     disableHeaderHighlight(): void;
@@ -132,7 +142,7 @@ export declare class SelectionRenderService implements ISelectionRenderService {
      */
     updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
     refreshSelectionMoveStart(): void;
-    changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;
+    changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport): void;
     getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
     getCurrentControls(): SelectionShape[];
     private _clearSelectionControls;
@@ -168,7 +178,7 @@ export declare class SelectionRenderService implements ISelectionRenderService {
      * @returns
      */
     eventTrigger(evt: IPointerEvent | IMouseEvent, zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): false | undefined;
-    convertSelectionRangeToData(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
+    convertSelectionToCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
     convertRangeDataToSelection(range: IRange): Nullable<IRangeWithCoord>;
     convertCellRangeToInfo(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithCoord>;
     /**
@@ -179,4 +189,7 @@ export declare class SelectionRenderService implements ISelectionRenderService {
     private _addCancelObserver;
     private _getSelectedRangeWithMerge;
 }
+/**
+ * @deprecated Should be refactored to RenderUnit.
+ */
 export declare const ISelectionRenderService: import('@wendellhu/redi').IdentifierDecorator<SelectionRenderService>;

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

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

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

@@ -1,8 +1,8 @@
-import { SelectionRenderModel } from './selection-render-model';
-import { Subject } from 'rxjs';
-import { ISelectionStyle, ISelectionWithCoordAndStyle } from '@univerjs/sheets';
-import { Scene, Group, Rect } from '@univerjs/engine-render';
 import { IRangeWithCoord, ISelectionCellWithCoord, Nullable, ThemeService, Disposable } from '@univerjs/core';
+import { Scene, Group, Rect } from '@univerjs/engine-render';
+import { ISelectionStyle, ISelectionWithCoordAndStyle } from '@univerjs/sheets';
+import { Subject } from 'rxjs';
+import { SelectionRenderModel } from './selection-render-model';
 
 /**
  * The main selection canvas component

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

@@ -1,7 +1,7 @@
-import { IScrollState } from '../../views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar';
-import { Observable } from 'rxjs';
-import { IDisposable } from '@wendellhu/redi';
 import { Disposable } from '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
+import { Observable } from 'rxjs';
+import { IScrollState } from '../../views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar';
 
 export interface ISheetBarMenuHandler {
     handleSheetBarMenu(): void;

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

@@ -1,6 +1,6 @@
-import { IDisposable, Injector } from '@wendellhu/redi';
+import { Nullable, IUniverInstanceService } from '@univerjs/core';
 import { SpreadsheetSkeleton } from '@univerjs/engine-render';
-import { Nullable, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { IDisposable, Injector } from '@wendellhu/redi';
 
 export interface ISheetSkeletonManagerParam {
     unitId: string;
@@ -20,11 +20,12 @@ export interface ISheetSkeletonManagerSearch {
  * Each application and sub-table has its own viewModel (skeleton).
  * The viewModel is also a temporary storage variable, which does not need to be persisted,
  * so it is managed uniformly through the service.
+ *
+ * @todo RenderUnit - We should move this to RenderUnit as well after all dependents have been moved.
  */
 export declare class SheetSkeletonManagerService implements IDisposable {
     private readonly _univerInstanceService;
     private readonly _injector;
-    private readonly _localeService;
     private _currentSkeleton;
     private _sheetSkeletonParam;
     private readonly _currentSkeleton$;
@@ -34,7 +35,7 @@ export declare class SheetSkeletonManagerService implements IDisposable {
      */
     private readonly _currentSkeletonBefore$;
     readonly currentSkeletonBefore$: import('rxjs').Observable<Nullable<ISheetSkeletonManagerParam>>;
-    constructor(_univerInstanceService: IUniverInstanceService, _injector: Injector, _localeService: LocaleService);
+    constructor(_univerInstanceService: IUniverInstanceService, _injector: Injector);
     dispose(): void;
     /** @deprecated */
     getCurrent(): Nullable<ISheetSkeletonManagerParam>;

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

@@ -1,6 +1,6 @@
-import { IDisposable } from '@wendellhu/redi';
-import { KeyCode } from '@univerjs/ui';
 import { 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,7 +1,7 @@
-import { Observable } from 'rxjs';
-import { IDisposable } from '@wendellhu/redi';
-import { IFunctionNames } from '@univerjs/engine-formula';
 import { Nullable } from '@univerjs/core';
+import { IFunctionNames } from '@univerjs/engine-formula';
+import { IDisposable } from '@wendellhu/redi';
+import { Observable } from 'rxjs';
 
 export interface IStatusBarService {
     state$: Observable<Nullable<IStatusBarServiceStatus>>;

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

@@ -1,6 +1,6 @@
-import { IRenderManagerService } from '@univerjs/engine-render';
-import { Injector } from '@wendellhu/redi';
 import { IUniverInstanceService, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
+import { Injector } from '@wendellhu/redi';
+import { IRenderManagerService } from '@univerjs/engine-render';
 
 export declare class UniverSheetsUIPlugin extends Plugin {
     readonly _injector: Injector;

package/lib/types/views/cell-alert/CellAlertPopup.d.ts

@@ -1,5 +1,5 @@
-import { ICanvasPopup } from '../../services/canvas-pop-manager.service';
 import { default as React } from 'react';
+import { ICanvasPopup } from '../../services/canvas-pop-manager.service';
 
 export declare function CellAlert({ popup }: {
     popup: ICanvasPopup;

package/lib/types/views/defined-name/DefinedNameInput.d.ts

@@ -1,5 +1,5 @@
-import { IDefinedNamesServiceParam } from '@univerjs/engine-formula';
 import { default as React } from 'react';
+import { IDefinedNamesServiceParam } from '@univerjs/engine-formula';
 
 export interface IDefinedNameInputProps extends Omit<IDefinedNamesServiceParam, 'id'> {
     inputId: string;

package/lib/types/views/operate-container/AutoFillPopupMenu.d.ts

@@ -1,5 +1,5 @@
-import { APPLY_TYPE } from '../../services/auto-fill/type';
 import { default as React } from 'react';
+import { APPLY_TYPE } from '../../services/auto-fill/type';
 
 export interface IAnchorPoint {
     row: number;

package/lib/types/views/sheet-bar/sheet-bar-tabs/SheetBarItem.d.ts

@@ -1,5 +1,5 @@
-import { default as React } from 'react';
 import { BooleanNumber } from '@univerjs/core';
+import { default as React } from 'react';
 
 export interface IBaseSheetBarProps {
     label?: string;

package/lib/types/views/sheet-canvas-view.d.ts

@@ -1,24 +1,16 @@
+import { Workbook, ICommandService, RxDisposable } from '@univerjs/core';
+import { IRenderContext, IRenderController, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';
-import { IRenderManagerService } from '@univerjs/engine-render';
-import { ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 
-/**
- * @todo RenderUnit
- */
-export declare class SheetCanvasView extends RxDisposable {
-    private readonly _univerInstanceService;
+export declare class SheetCanvasView extends RxDisposable implements IRenderController {
+    private readonly _context;
     private readonly _commandService;
     private readonly _renderManagerService;
     private readonly _sheetSkeletonManagerService;
-    private _scene;
     private readonly _fps$;
     readonly fps$: import('rxjs').Observable<string>;
-    constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService);
-    private _initialize;
+    constructor(_context: IRenderContext<Workbook>, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService);
     dispose(): void;
-    private _init;
-    private _dispose;
-    private _create;
     private _addNewRender;
     private _addComponent;
     private _addViewport;

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

@@ -1,5 +1,5 @@
-import { default as React } from 'react';
 import { IFunctionNames } from '@univerjs/engine-formula';
+import { default as React } from 'react';
 
 export interface IStatisticItem {
     name: IFunctionNames;