@univerjs/sheets-ui 0.2.8 → 0.2.10

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

@@ -1,5 +1,5 @@
 import { Workbook, ICommandService, IContextService, ILogService, Injector, ThemeService } from '@univerjs/core';
-import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
+import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
@@ -10,14 +10,12 @@ import { BaseSelectionRenderService } from './base-selection-render.service';
  */
 export declare class SheetSelectionRenderService extends BaseSelectionRenderService implements IRenderModule {
     private readonly _context;
-    private readonly _selectionManagerService;
     private readonly _logService;
     private readonly _commandService;
     private readonly _contextService;
-    private readonly _sheetSkeletonManagerService;
     private readonly _workbookSelections;
     private _renderDisposable;
-    constructor(_context: IRenderContext<Workbook>, injector: Injector, themeService: ThemeService, shortcutService: IShortcutService, renderManagerService: IRenderManagerService, _selectionManagerService: SheetsSelectionsService, _logService: ILogService, _commandService: ICommandService, _contextService: IContextService, _sheetSkeletonManagerService: SheetSkeletonManagerService);
+    constructor(_context: IRenderContext<Workbook>, injector: Injector, themeService: ThemeService, shortcutService: IShortcutService, selectionManagerService: SheetsSelectionsService, sheetSkeletonManagerService: SheetSkeletonManagerService, _logService: ILogService, _commandService: ICommandService, _contextService: IContextService);
     private _init;
     private _initEventListeners;
     private _initThemeChangeListener;
@@ -25,8 +23,7 @@ export declare class SheetSelectionRenderService extends BaseSelectionRenderServ
     private _initSelectionChangeListener;
     private _initUserActionSyncListener;
     /**
-     * set new selection range in seletion model
-     * selectionMoveEnd$ ---> _updateSelections --> selectionOperation@selectionManagerService.setSelections
+     * Update selectionData to current sheet.
      * @param selectionDataWithStyleList
      * @param type
      */

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

@@ -41,15 +41,25 @@ export declare class SelectionShapeExtension {
     private _clearObserverEvent;
     private _initialControl;
     private _controlMoving;
+    /**
+     * Drag move whole selectionControl when cusor turns to crosshair. Not for dragging 8 control points.
+     * @param evt
+     */
     private _controlEvent;
     private _initialWidget;
-    private _widgetMoving;
     /**
-     * Events for 8 control point
+     * Pointer down Events for 8 control point.
      * @param evt
      * @param cursor
      */
-    private _widgetEvent;
+    private _widgetPointerDownEvent;
+    /**
+     * Pointer move Events for 8 control point.
+     * @param moveOffsetX
+     * @param moveOffsetY
+     * @param cursor
+     */
+    private _widgetMoving;
     private _initialFill;
     private _fillMoving;
     private _fillEvent;

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

@@ -1,5 +1,5 @@
 import { IRangeWithCoord, ISelectionCellWithMergeInfo, Nullable, ThemeService, Disposable } from '@univerjs/core';
-import { IRectProps, Scene, Group, Rect } from '@univerjs/engine-render';
+import { Scene, Group, Rect } from '@univerjs/engine-render';
 import { ISelectionStyle, ISelectionWidgetConfig, ISelectionWithCoordAndStyle } from '@univerjs/sheets';
 import { Subject } from 'rxjs';
 import { SelectionRenderModel } from './selection-render-model';
@@ -38,13 +38,13 @@ export declare enum SELECTION_MANAGER_KEY {
     bottomRightWidget = "__SpreadSheetSelectionBottomRightWidget__"
 }
 /**
- * The main selection canvas component
+ * The main selection canvas component, includes leftControl,rightControl,topControl,bottomControl,backgroundControlTop,backgroundControlMiddleLeft,backgroundControlMiddleRight,backgroundControlBottom,fillControl
  */
 export declare class SelectionControl extends Disposable {
     protected _scene: Scene;
     protected _zIndex: number;
-    protected _isHeaderHighlight: boolean;
     protected readonly _themeService: ThemeService;
+    protected _highlightHeader: boolean;
     private _leftControl;
     private _rightControl;
     private _topControl;
@@ -58,11 +58,9 @@ export declare class SelectionControl extends Disposable {
     private _rowHeaderBackground;
     private _rowHeaderBorder;
     private _rowHeaderGroup;
-    private _rowHeaderHighlight;
     private _columnHeaderBackground;
     private _columnHeaderBorder;
     private _columnHeaderGroup;
-    private _columnHeaderHighlight;
     private _topLeftWidget;
     private _topCenterWidget;
     private _topRightWidget;
@@ -73,12 +71,17 @@ export declare class SelectionControl extends Disposable {
     private _bottomRightWidget;
     private _dashRect;
     protected _selectionModel: SelectionRenderModel;
-    protected _selectionStyle: Nullable<ISelectionStyle>;
+    private _defaultStyle;
+    private _currentStyle;
     protected _rowHeaderWidth: number;
     protected _columnHeaderHeight: number;
     protected _widgetRects: Rect[];
     private _dispose$;
     readonly dispose$: import('rxjs').Observable<SelectionControl>;
+    /**
+     * eventSource: selectionShapeExtension selectionMoving$.next,
+     * Observer: prompt.controller
+     */
     readonly selectionMoving$: Subject<IRangeWithCoord>;
     readonly selectionMoved$: Subject<IRangeWithCoord>;
     readonly selectionScaling$: Subject<IRangeWithCoord>;
@@ -86,41 +89,40 @@ export declare class SelectionControl extends Disposable {
     readonly selectionFilling$: Subject<Nullable<IRangeWithCoord>>;
     private readonly _selectionFilled$;
     readonly selectionFilled$: import('rxjs').Observable<Nullable<IRangeWithCoord>>;
-    private _defaultStyle;
-    private _currentStyle;
     private _isHelperSelection;
-    constructor(_scene: Scene, _zIndex: number, _isHeaderHighlight: boolean, _themeService: ThemeService);
+    constructor(_scene: Scene, _zIndex: number, _themeService: ThemeService, _highlightHeader?: boolean, options?: {
+        rowHeaderWidth: number;
+        columnHeaderHeight: number;
+    });
     get zIndex(): number;
-    get leftControl(): Rect<IRectProps>;
-    get rightControl(): Rect<IRectProps>;
-    get topControl(): Rect<IRectProps>;
-    get bottomControl(): Rect<IRectProps>;
-    get fillControl(): Rect<IRectProps>;
-    get backgroundControlTop(): Rect<IRectProps>;
-    get backgroundControlBottom(): Rect<IRectProps>;
-    get backgroundControlMiddleLeft(): Rect<IRectProps>;
-    get backgroundControlMiddleRight(): Rect<IRectProps>;
+    get leftControl(): Rect;
+    get rightControl(): Rect;
+    get topControl(): Rect;
+    get bottomControl(): Rect;
+    get fillControl(): Rect;
+    get backgroundControlTop(): Rect;
+    get backgroundControlBottom(): Rect;
+    get backgroundControlMiddleLeft(): Rect;
+    get backgroundControlMiddleRight(): Rect;
     get selectionShape(): Group;
     get columnHeaderGroup(): Group;
     get rowHeaderGroup(): Group;
     get selectionShapeGroup(): Group;
     get model(): SelectionRenderModel;
-    get topLeftWidget(): Rect<IRectProps>;
-    get topCenterWidget(): Rect<IRectProps>;
-    get topRightWidget(): Rect<IRectProps>;
-    get middleLeftWidget(): Rect<IRectProps>;
-    get middleRightWidget(): Rect<IRectProps>;
-    get bottomLeftWidget(): Rect<IRectProps>;
-    get bottomCenterWidget(): Rect<IRectProps>;
-    get bottomRightWidget(): Rect<IRectProps>;
+    get topLeftWidget(): Rect;
+    get topCenterWidget(): Rect;
+    get topRightWidget(): Rect;
+    get middleLeftWidget(): Rect;
+    get middleRightWidget(): Rect;
+    get bottomLeftWidget(): Rect;
+    get bottomCenterWidget(): Rect;
+    get bottomRightWidget(): Rect;
     get themeService(): ThemeService;
-    get selectionStyle(): Nullable<ISelectionStyle>;
-    set selectionStyle(style: Nullable<ISelectionStyle>);
     get selectionModel(): SelectionRenderModel;
     set selectionModel(model: SelectionRenderModel);
     get defaultStyle(): ISelectionStyle;
     set defaultStyle(style: ISelectionStyle);
-    get dashRect(): Rect<IRectProps>;
+    get dashRect(): Rect;
     get currentStyle(): Nullable<ISelectionStyle>;
     set currentStyle(style: Nullable<ISelectionStyle>);
     get isHelperSelection(): boolean;
@@ -130,18 +132,27 @@ export declare class SelectionControl extends Disposable {
     set columnHeaderHeight(height: number);
     setEvent(state: boolean): void;
     refreshSelectionFilled(val: IRangeWithCoord): void;
+    /**
+     * invoked when update selection style & range change, invoked by updateStyle, updateRange, update
+     */
+    protected _updateControlStyleAndLayout(selectionStyle: Nullable<ISelectionStyle>): void;
     updateStyle(style: ISelectionStyle): void;
-    updateRange(range: IRangeWithCoord): void;
+    updateRange(range: IRangeWithCoord, primaryCell: Nullable<ISelectionCellWithMergeInfo>): void;
     /**
-     * update seleciton model(new range)
-     * @param newSelectionRange update new selection range!!
+     * update selection model with new range & primary cell(aka: highlight/current), also update row/col selection size & style.
+     *
+     * @param newSelectionRange
      * @param rowHeaderWidth
      * @param columnHeaderHeight
      * @param style
-     * @param highlight
+     * @param primaryCell primary cell
+     */
+    update(newSelectionRange: IRangeWithCoord, rowHeaderWidth?: number, columnHeaderHeight?: number, style?: Nullable<ISelectionStyle>, primaryCell?: Nullable<ISelectionCellWithMergeInfo>): void;
+    /**
+     * update primary range
+     * @param primaryCell model.current (aka: highlight)
      */
-    update(newSelectionRange: IRangeWithCoord, rowHeaderWidth?: number, columnHeaderHeight?: number, style?: Nullable<ISelectionStyle>, highlight?: Nullable<ISelectionCellWithMergeInfo>): void;
-    updateCurrCell(highlight?: Nullable<ISelectionCellWithMergeInfo>): void;
+    updateCurrCell(primaryCell?: Nullable<ISelectionCellWithMergeInfo>): void;
     clearHighlight(): void;
     getScene(): Scene;
     dispose(): void;
@@ -153,15 +164,10 @@ export declare class SelectionControl extends Disposable {
     getRange(): IRangeWithCoord;
     enableHelperSelection(): void;
     disableHelperSelection(): void;
-    updateStyleId(id: string): void;
-    /**
-     * invoked when update selection style & range change
-     */
-    protected _updateControl(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number): void;
     private _initialize;
-    private _initialTitle;
+    private _initialHeader;
     private _initialWidget;
-    private _updateBackgroundTitle;
+    private _updateHeaderBackground;
     private _updateBackgroundControl;
     private _updateWidgets;
     protected _hasWidgets(widgets: ISelectionWidgetConfig): boolean;

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

@@ -8,6 +8,7 @@ export declare class UniverSheetsUIPlugin extends Plugin {
     private readonly _univerInstanceService;
     static pluginName: string;
     static type: UniverInstanceType;
+    /** @ignore */
     constructor(_config: Partial<IUniverSheetsUIConfig>, _injector: Injector, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService);
     onStarting(): void;
     onReady(): void;

package/lib/types/views/permission/panel/index.d.ts

@@ -3,5 +3,5 @@ interface ISheetPermissionPanelProps {
     showDetail: boolean;
     fromSheetBar: boolean;
 }
-export declare const SheetPermissionPanel: ({ showDetail, fromSheetBar }: ISheetPermissionPanelProps) => React.JSX.Element;
+export declare const SheetPermissionPanel: ({ showDetail, fromSheetBar }: ISheetPermissionPanelProps) => React.JSX.Element | null;
 export {};

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

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