@univerjs/sheets-ui 0.1.6 → 0.1.8

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

@@ -1,4 +1,5 @@
-import { ICellData, IMutationInfo, IRange, ObjectMatrix } from '@univerjs/core';
+import { IDiscreteRange } from '../../controllers/utils/range-tools';
+import { ICellData, IDocumentData, IMutationInfo, IRange, ObjectMatrix } from '@univerjs/core';
 
 export declare enum COPY_TYPE {
     COPY = "COPY",
@@ -17,13 +18,23 @@ export interface IParsedCellValue {
     properties?: IClipboardPropertyItem;
     content: string;
 }
+export interface IParsedCellValueByClipboard {
+    rowSpan?: number;
+    colSpan?: number;
+    style?: string;
+    content?: string;
+    richTextParma?: {
+        p?: IDocumentData;
+        v?: string;
+    };
+}
 export interface IUniverSheetCopyDataModel {
     rowProperties?: IClipboardPropertyItem[];
     colProperties?: IClipboardPropertyItem[] | null;
     cellMatrix: ObjectMatrix<ICellDataWithSpanInfo>;
 }
 export interface IPasteTarget {
-    pastedRange: IRange;
+    pastedRange: IDiscreteRange;
     subUnitId: string;
     unitId: string;
 }
@@ -37,6 +48,11 @@ export interface ISheetRangeLocation {
     subUnitId: string;
     unitId: string;
 }
+export interface ISheetDiscreteRangeLocation {
+    range: IDiscreteRange;
+    subUnitId: string;
+    unitId: string;
+}
 export interface ISpecialPasteInfo {
     label: string;
     icon?: string;
@@ -93,25 +109,25 @@ export interface ISheetClipboardHook {
      *
      * @returns if it block copying it should return false
      */
-    onBeforePaste?(pasteTo: ISheetRangeLocation): boolean;
+    onBeforePaste?(pasteTo: ISheetDiscreteRangeLocation): boolean;
     /**
      *
      * @param row
      * @param col
      */
-    onPasteCells?(pasteFrom: ISheetRangeLocation | null, pasteTo: ISheetRangeLocation, data: ObjectMatrix<ICellDataWithSpanInfo>, payload: ICopyPastePayload): {
+    onPasteCells?(pasteFrom: ISheetDiscreteRangeLocation | null, pasteTo: ISheetDiscreteRangeLocation, data: ObjectMatrix<ICellDataWithSpanInfo>, payload: ICopyPastePayload): {
         undos: IMutationInfo[];
         redos: IMutationInfo[];
     };
-    onPasteRows?(pasteTo: ISheetRangeLocation, rowProperties: IClipboardPropertyItem[], payload: ICopyPastePayload): {
+    onPasteRows?(pasteTo: ISheetDiscreteRangeLocation, rowProperties: IClipboardPropertyItem[], payload: ICopyPastePayload): {
         undos: IMutationInfo[];
         redos: IMutationInfo[];
     };
-    onPasteColumns?(pasteTo: ISheetRangeLocation, colProperties: IClipboardPropertyItem[], payload: ICopyPastePayload): {
+    onPasteColumns?(pasteTo: ISheetDiscreteRangeLocation, colProperties: IClipboardPropertyItem[], payload: ICopyPastePayload): {
         undos: IMutationInfo[];
         redos: IMutationInfo[];
     };
-    onPastePlainText?(pasteTo: ISheetRangeLocation, text: string, payload: ICopyPastePayload): {
+    onPastePlainText?(pasteTo: ISheetDiscreteRangeLocation, text: string, payload: ICopyPastePayload): {
         undos: IMutationInfo[];
         redos: IMutationInfo[];
     };
@@ -120,5 +136,5 @@ export interface ISheetClipboardHook {
      * The callback would be called before the clipboard service decides what region need to be copied from or pasted to.
      * It would jump over these filtered rows when copying or pasting.
      */
-    getFilteredOutRows?(): number[];
+    getFilteredOutRows?(range: IRange): number[];
 }

package/lib/types/services/clipboard/utils.d.ts

@@ -1,3 +1,4 @@
+import { IDiscreteRange } from '../../controllers/utils/range-tools';
 import { ISetRangeValuesMutationParams } from '@univerjs/sheets';
 import { ICellData, IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';
 
@@ -17,3 +18,5 @@ export declare function clipboardItemIsFromExcel(html: string): Promise<boolean>
 export declare function mergeCellValues(...cellValues: IObjectMatrixPrimitiveType<Nullable<ICellData>>[]): IObjectMatrixPrimitiveType<Nullable<ICellData>> | IObjectMatrixPrimitiveType<IObjectMatrixPrimitiveType<Nullable<ICellData>>>;
 export declare function getRangeValuesMergeable(m1: IMutationInfo<ISetRangeValuesMutationParams>, m2: IMutationInfo<ISetRangeValuesMutationParams>): boolean;
 export declare function mergeSetRangeValues(mutations: IMutationInfo[]): IMutationInfo<object>[];
+export declare function rangeIntersectWithDiscreteRange(range: IRange, discrete: IDiscreteRange): true | undefined;
+export declare function discreteRangeContainsRange(discrete: IDiscreteRange, range: IRange): boolean;

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

@@ -25,11 +25,11 @@ export interface ICellEditorManagerService {
 export declare class CellEditorManagerService implements ICellEditorManagerService, IDisposable {
     private _state;
     private _rect;
-    private _focus;
     private readonly _state$;
     readonly state$: Observable<Nullable<ICellEditorManagerParam>>;
     private readonly _rect$;
     readonly rect$: Observable<Nullable<ICellEditorBoundingClientRect>>;
+    private _focus;
     private readonly _focus$;
     readonly focus$: Observable<boolean>;
     dispose(): void;

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

@@ -64,7 +64,7 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     private readonly _sheetSkeletonManagerService;
     private readonly _selectionRenderService;
     private readonly _themeService;
-    private readonly _currentUniverService;
+    private readonly _univerInstanceService;
     private readonly _editorService;
     private _editorUnitId;
     private _isForceKeepVisible;
@@ -83,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(_sheetSkeletonManagerService: SheetSkeletonManagerService, _selectionRenderService: ISelectionRenderService, _themeService: ThemeService, _currentUniverService: IUniverInstanceService, _editorService: IEditorService);
+    constructor(_sheetSkeletonManagerService: SheetSkeletonManagerService, _selectionRenderService: ISelectionRenderService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService);
     refreshEditCellState(): void;
     setEditCell(param: ICurrentEditCellParam): void;
     getEditCellState(): Readonly<Nullable<IEditorBridgeServiceParam>>;

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

@@ -1,24 +1,23 @@
 import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
 import { ScrollManagerService } from './scroll-manager.service';
-import { ISelectionRenderService } from '..';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { ISheetLocation } from '@univerjs/sheets';
-import { IPosition, Nullable, IUniverInstanceService } from '@univerjs/core';
+import { IPosition, Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
 
 export interface IHoverCellPosition {
     position: IPosition;
     location: ISheetLocation;
 }
-export declare class HoverManagerService {
+export declare class HoverManagerService extends Disposable {
     private readonly _univerInstanceService;
     private readonly _scrollManagerService;
     private readonly _sheetSkeletonManagerService;
     private readonly _renderManagerService;
-    private readonly _selectionRenderService;
     private _currentCell$;
     currentCell$: import('rxjs').Observable<Nullable<IHoverCellPosition>>;
     private _lastPosition;
-    constructor(_univerInstanceService: IUniverInstanceService, _scrollManagerService: ScrollManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService);
+    constructor(_univerInstanceService: IUniverInstanceService, _scrollManagerService: ScrollManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _renderManagerService: IRenderManagerService);
+    private _initCellDisposableListener;
     private _calcActiveCell;
     onMouseMove(offsetX: number, offsetY: number): void;
     onScrollStart(): void;

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, SelectionManagerService } from '@univerjs/sheets';
+import { ISelectionWithStyle } from '@univerjs/sheets';
 import { IRenderManagerService } from '@univerjs/engine-render';
-import { Disposable, ICommandService, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { Disposable, IUniverInstanceService, ThemeService } from '@univerjs/core';
 
 export interface IMarkSelectionService {
     addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;
@@ -25,12 +25,10 @@ export declare class MarkSelectionService extends Disposable implements IMarkSel
     private readonly _currentService;
     private readonly _renderManagerService;
     private readonly _selectionRenderService;
-    private readonly _commandService;
     private readonly _sheetSkeletonManagerService;
     private readonly _themeService;
-    private readonly _selectionManagerService;
     private _shapeMap;
-    constructor(_currentService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _commandService: ICommandService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService);
+    constructor(_currentService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _themeService: ThemeService);
     addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;
     refreshShapes(): void;
     getShapeMap(): Map<string, IMarkSelectionInfo>;

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

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

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

@@ -22,7 +22,7 @@ export interface ISheetSkeletonManagerSearch {
  * so it is managed uniformly through the service.
  */
 export declare class SheetSkeletonManagerService implements IDisposable {
-    private readonly _currentUniverService;
+    private readonly _univerInstanceService;
     private readonly _injector;
     private readonly _localeService;
     private _currentSkeleton;
@@ -34,10 +34,13 @@ export declare class SheetSkeletonManagerService implements IDisposable {
      */
     private readonly _currentSkeletonBefore$;
     readonly currentSkeletonBefore$: import('rxjs').Observable<Nullable<ISheetSkeletonManagerParam>>;
-    constructor(_currentUniverService: IUniverInstanceService, _injector: Injector, _localeService: LocaleService);
+    constructor(_univerInstanceService: IUniverInstanceService, _injector: Injector, _localeService: LocaleService);
     dispose(): void;
+    /** @deprecated */
     getCurrent(): Nullable<ISheetSkeletonManagerParam>;
+    getUnitSkeleton(unitId: string, sheetId: string): Nullable<ISheetSkeletonManagerParam>;
     setCurrent(searchParam: ISheetSkeletonManagerSearch): Nullable<ISheetSkeletonManagerParam>;
+    removeSkeleton(searchParam: Pick<ISheetSkeletonManagerSearch, 'unitId'>): void;
     private _compareSearch;
     private _setCurrent;
     reCalculate(): void;
@@ -45,6 +48,6 @@ export declare class SheetSkeletonManagerService implements IDisposable {
     makeDirtyCurrent(state?: boolean): void;
     makeDirty(searchParm: ISheetSkeletonManagerSearch, state?: boolean): void;
     getOrCreateSkeleton(searchParam: ISheetSkeletonManagerSearch): SpreadsheetSkeleton | undefined;
-    private _getCurrentBySearch;
+    private _getSkeleton;
     private _buildSkeleton;
 }

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

@@ -16,11 +16,11 @@ export interface IShortcutExperienceParam extends IShortcutExperienceSearch {
  * including the combined use of enter and tab, the highlighting experience of formulas in the editor, and so on.
  */
 export declare class ShortcutExperienceService implements IDisposable {
-    private readonly _currentUniverService;
+    private readonly _univerInstanceService;
     private readonly _localeService;
     private _current;
     private _shortcutParam;
-    constructor(_currentUniverService: IUniverInstanceService, _localeService: LocaleService);
+    constructor(_univerInstanceService: IUniverInstanceService, _localeService: LocaleService);
     dispose(): void;
     getCurrentBySearch(searchParm: Nullable<IShortcutExperienceSearch>): Nullable<IShortcutExperienceParam>;
     getCurrent(): Nullable<IShortcutExperienceParam>;

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

@@ -1,13 +1,17 @@
+import { IRenderManagerService } from '@univerjs/engine-render';
 import { Injector } from '@wendellhu/redi';
-import { IUniverInstanceService, LocaleService, Plugin, PluginType } from '@univerjs/core';
+import { IUniverInstanceService, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export declare class UniverSheetsUIPlugin extends Plugin {
     readonly _injector: Injector;
     private readonly _localeService;
-    private readonly _currentUniverService;
-    static type: PluginType;
-    constructor(config: undefined, _injector: Injector, _localeService: LocaleService, _currentUniverService: IUniverInstanceService);
+    private readonly _renderManagerService;
+    private readonly _univerInstanceService;
+    static pluginName: string;
+    static type: UniverInstanceType;
+    constructor(_config: undefined, _injector: Injector, _localeService: LocaleService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService);
     onStarting(injector: Injector): void;
     onReady(): void;
+    private _registerRenderControllers;
     private _markSheetAsFocused;
 }

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

@@ -1,3 +1,6 @@
+import { ICanvasPopup } from '../../services/canvas-pop-manager.service';
 import { default as React } from 'react';
 
-export declare function CellAlert(): React.JSX.Element;
+export declare function CellAlert({ popup }: {
+    popup: ICanvasPopup;
+}): React.JSX.Element | null;

package/lib/types/views/header-unhide-shape.d.ts

@@ -1,6 +1,6 @@
 import { IShapeProps, UniverRenderingContext, Shape } from '@univerjs/engine-render';
 
-export declare const enum HeaderUnhideShapeType {
+export declare enum HeaderUnhideShapeType {
     ROW = 0,
     COLUMN = 1
 }

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

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

package/lib/types/views/sheet-container/SheetContainer.d.ts

@@ -1,5 +1,5 @@
 import { default as React } from 'react';
 
-export declare function RenderSheetFooter(): React.JSX.Element;
-export declare function RenderSheetHeader(): React.JSX.Element;
-export declare function RenderSheetContent(): React.JSX.Element;
+export declare function RenderSheetFooter(): React.JSX.Element | null;
+export declare function RenderSheetHeader(): React.JSX.Element | null;
+export declare function RenderSheetContent(): React.JSX.Element | null;