@univerjs/sheets-ui 0.1.17 → 0.2.0

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

@@ -1,12 +1,16 @@
 import { IRangeWithCoord, ThemeService } from '@univerjs/core';
 import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
 import { Injector } from '@wendellhu/redi';
-import { SelectionShape } from './selection-shape';
+import { SelectionControl } from './selection-shape';
 
 export interface ISelectionShapeTargetSelection {
-    originControl: SelectionShape;
+    originControl: SelectionControl;
     targetSelection: IRangeWithCoord;
 }
+/**
+ * for auto-fill (crosshair expand selection range)
+ * drag selection range
+ */
 export declare class SelectionShapeExtension {
     private _control;
     private _skeleton;
@@ -27,7 +31,7 @@ export declare class SelectionShapeExtension {
     private _targetSelection;
     private _isInMergeState;
     private _fillControlColors;
-    constructor(_control: SelectionShape, _skeleton: SpreadsheetSkeleton, _scene: Scene, _themeService: ThemeService, _injector: Injector);
+    constructor(_control: SelectionControl, _skeleton: SpreadsheetSkeleton, _scene: Scene, _themeService: ThemeService, _injector: Injector);
     get isHelperSelection(): boolean;
     dispose(): void;
     private _getFreeze;

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

@@ -1,17 +1,51 @@
-import { IRangeWithCoord, ISelectionCellWithCoord, Nullable, ThemeService, Disposable } from '@univerjs/core';
-import { Scene, Group, Rect } from '@univerjs/engine-render';
-import { ISelectionStyle, ISelectionWithCoordAndStyle } from '@univerjs/sheets';
+import { IRangeWithCoord, ISelectionCellWithMergeInfo, Nullable, ThemeService, Disposable } from '@univerjs/core';
+import { IRectProps, Scene, Group, Rect } from '@univerjs/engine-render';
+import { ISelectionStyle, ISelectionWidgetConfig, ISelectionWithCoordAndStyle } from '@univerjs/sheets';
 import { Subject } from 'rxjs';
 import { SelectionRenderModel } from './selection-render-model';
 
+export declare enum SELECTION_MANAGER_KEY {
+    Selection = "__SpreadsheetSelectionShape__",
+    top = "__SpreadsheetSelectionTopControl__",
+    bottom = "__SpreadsheetSelectionBottomControl__",
+    left = "__SpreadsheetSelectionShapeLeftControl__",
+    right = "__SpreadsheetSelectionShapeRightControl__",
+    backgroundTop = "__SpreadsheetSelectionBackgroundControlTop__",
+    backgroundMiddleLeft = "__SpreadsheetSelectionBackgroundControlMiddleLeft__",
+    backgroundMiddleRight = "__SpreadsheetSelectionBackgroundControlMiddleRight__",
+    backgroundBottom = "__SpreadsheetSelectionBackgroundControlBottom__",
+    fill = "__SpreadsheetSelectionFillControl__",
+    fillTopLeft = "__SpreadsheetSelectionFillControlTopLeft__",
+    fillBottomRight = "__SpreadsheetSelectionFillControlBottomRight__",
+    fillTopLeftInner = "__SpreadsheetSelectionFillControlTopLeftInner__",
+    fillBottomRightInner = "__SpreadsheetSelectionFillControlBottomRightInner__",
+    lineMain = "__SpreadsheetDragLineMainControl__",
+    lineContent = "__SpreadsheetDragLineContentControl__",
+    line = "__SpreadsheetDragLineControl__",
+    dash = "__SpreadsheetDragDashControl__",
+    rowHeaderBackground = "__SpreadSheetSelectionRowHeaderBackground__",
+    rowHeaderBorder = "__SpreadSheetSelectionRowHeaderBorder__",
+    rowHeaderGroup = "__SpreadSheetSelectionRowHeaderGroup__",
+    columnHeaderBackground = "__SpreadSheetSelectionColumnHeaderBackground__",
+    columnHeaderBorder = "__SpreadSheetSelectionColumnHeaderBorder__",
+    columnHeaderGroup = "__SpreadSheetSelectionColumnHeaderGroup__",
+    topLeftWidget = "__SpreadSheetSelectionTopLeftWidget__",
+    topCenterWidget = "__SpreadSheetSelectionTopCenterWidget__",
+    topRightWidget = "__SpreadSheetSelectionTopRightWidget__",
+    middleLeftWidget = "__SpreadSheetSelectionMiddleLeftWidget__",
+    middleRightWidget = "__SpreadSheetSelectionMiddleRightWidget__",
+    bottomLeftWidget = "__SpreadSheetSelectionBottomLeftWidget__",
+    bottomCenterWidget = "__SpreadSheetSelectionBottomCenterWidget__",
+    bottomRightWidget = "__SpreadSheetSelectionBottomRightWidget__"
+}
 /**
  * The main selection canvas component
  */
-export declare class SelectionShape extends Disposable {
-    private _scene;
-    private _zIndex;
-    private _isHeaderHighlight;
-    private readonly _themeService;
+export declare class SelectionControl extends Disposable {
+    protected _scene: Scene;
+    protected _zIndex: number;
+    protected _isHeaderHighlight: boolean;
+    protected readonly _themeService: ThemeService;
     private _leftControl;
     private _rightControl;
     private _topControl;
@@ -21,7 +55,7 @@ export declare class SelectionShape extends Disposable {
     private _backgroundControlMiddleLeft;
     private _backgroundControlMiddleRight;
     private _fillControl;
-    private _selectionShape;
+    private _selectionShapeGroup;
     private _rowHeaderBackground;
     private _rowHeaderBorder;
     private _rowHeaderGroup;
@@ -39,13 +73,13 @@ export declare class SelectionShape extends Disposable {
     private _bottomCenterWidget;
     private _bottomRightWidget;
     private _dashRect;
-    private _selectionModel;
-    private _selectionStyle;
-    private _rowHeaderWidth;
-    private _columnHeaderHeight;
-    private _widgetRects;
+    protected _selectionModel: SelectionRenderModel;
+    protected _selectionStyle: Nullable<ISelectionStyle>;
+    protected _rowHeaderWidth: number;
+    protected _columnHeaderHeight: number;
+    protected _widgetRects: Rect[];
     private _dispose$;
-    readonly dispose$: import('rxjs').Observable<SelectionShape>;
+    readonly dispose$: import('rxjs').Observable<SelectionControl>;
     readonly selectionMoving$: Subject<Nullable<IRangeWithCoord>>;
     readonly selectionMoved$: Subject<Nullable<IRangeWithCoord>>;
     readonly selectionScaling$: Subject<Nullable<IRangeWithCoord>>;
@@ -58,34 +92,59 @@ export declare class SelectionShape extends Disposable {
     private _isHelperSelection;
     constructor(_scene: Scene, _zIndex: number, _isHeaderHighlight: boolean, _themeService: ThemeService);
     get zIndex(): number;
-    get leftControl(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get rightControl(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get topControl(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get bottomControl(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get fillControl(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get backgroundControlTop(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get backgroundControlBottom(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get backgroundControlMiddleLeft(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get backgroundControlMiddleRight(): Rect<import('@univerjs/engine-render').IRectProps>;
+    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 selectionShape(): Group;
+    get columnHeaderGroup(): Group;
+    get rowHeaderGroup(): Group;
+    get selectionShapeGroup(): Group;
     get model(): SelectionRenderModel;
-    get topLeftWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get topCenterWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get topRightWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get middleLeftWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get middleRightWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get bottomLeftWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get bottomCenterWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
-    get bottomRightWidget(): Rect<import('@univerjs/engine-render').IRectProps>;
+    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 themeService(): ThemeService;
     get selectionStyle(): Nullable<ISelectionStyle>;
-    get dashRect(): Rect<import('@univerjs/engine-render').IRectProps>;
+    set selectionStyle(style: Nullable<ISelectionStyle>);
+    get selectionModel(): SelectionRenderModel;
+    set selectionModel(model: SelectionRenderModel);
+    get defaultStyle(): ISelectionStyle;
+    set defaultStyle(style: ISelectionStyle);
+    get dashRect(): Rect<IRectProps>;
+    get currentStyle(): Nullable<ISelectionStyle>;
+    set currentStyle(style: Nullable<ISelectionStyle>);
     get isHelperSelection(): boolean;
+    get rowHeaderWidth(): number;
+    set rowHeaderWidth(width: number);
+    get columnHeaderHeight(): number;
+    set columnHeaderHeight(height: number);
     setEvent(state: boolean): void;
     enableHeaderHighlight(): void;
     disableHeaderHighlight(): void;
     refreshSelectionFilled(val: IRangeWithCoord): void;
     updateStyle(style: ISelectionStyle): void;
-    update(newSelectionRange: IRangeWithCoord, rowHeaderWidth?: number, columnHeaderHeight?: number, style?: Nullable<ISelectionStyle>, highlight?: Nullable<ISelectionCellWithCoord>): void;
+    updateRange(range: IRangeWithCoord): void;
+    /**
+     * update seleciton model(new range)
+     * @param newSelectionRange update new selection range!!
+     * @param rowHeaderWidth
+     * @param columnHeaderHeight
+     * @param style
+     * @param highlight
+     */
+    update(newSelectionRange: IRangeWithCoord, rowHeaderWidth?: number, columnHeaderHeight?: number, style?: Nullable<ISelectionStyle>, highlight?: Nullable<ISelectionCellWithMergeInfo>): void;
+    updateCurrCell(highlight?: Nullable<ISelectionCellWithMergeInfo>): void;
     clearHighlight(): void;
     getScene(): Scene;
     dispose(): void;
@@ -99,18 +158,16 @@ export declare class SelectionShape extends Disposable {
     disableHelperSelection(): void;
     updateStyleId(id: string): void;
     /**
-     * just handle the view
-     *
-     * inner update
+     * invoked when update selection style & range change
      */
-    private _updateControl;
+    protected _updateControl(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number): void;
     private _initialize;
     private _initialTitle;
     private _initialWidget;
     private _updateBackgroundTitle;
     private _updateBackgroundControl;
     private _updateWidgets;
-    private _hasWidgets;
+    protected _hasWidgets(widgets: ISelectionWidgetConfig): boolean;
     private _getScale;
     private _antLineOffset;
     private _antRequestNewFrame;

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

@@ -1,8 +1,9 @@
-import { Nullable, Workbook } from '@univerjs/core';
+import { Disposable, Nullable, Workbook } from '@univerjs/core';
 import { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render';
-import { IDisposable, Injector } from '@wendellhu/redi';
+import { Injector } from '@wendellhu/redi';
 
 export interface ISheetSkeletonManagerParam {
+    unitId?: string;
     sheetId: string;
     skeleton: SpreadsheetSkeleton;
     dirty: boolean;
@@ -22,7 +23,7 @@ export interface ISheetSkeletonManagerSearch {
  * The viewModel is also a temporary storage variable, which does not need to be persisted,
  * so it is managed uniformly through the service.
  */
-export declare class SheetSkeletonManagerService implements IDisposable, IRenderModule {
+export declare class SheetSkeletonManagerService extends Disposable implements IRenderModule {
     private readonly _context;
     private readonly _injector;
     private _currentSkeletonSearchParam;
@@ -35,10 +36,13 @@ export declare class SheetSkeletonManagerService implements IDisposable, IRender
     private readonly _currentSkeletonBefore$;
     readonly currentSkeletonBefore$: import('rxjs').Observable<Nullable<ISheetSkeletonManagerParam>>;
     constructor(_context: IRenderContext<Workbook>, _injector: Injector);
-    dispose(): void;
+    private _initRemoveSheet;
     getCurrentSkeleton(): SpreadsheetSkeleton;
     /** @deprecated */
     getCurrent(): Nullable<ISheetSkeletonManagerParam>;
+    /**
+     * unitId is never read?
+     */
     getUnitSkeleton(unitId: string, sheetId: string): Nullable<ISheetSkeletonManagerParam>;
     setCurrent(searchParam: ISheetSkeletonManagerSearch): Nullable<ISheetSkeletonManagerParam>;
     private _setCurrent;
@@ -46,6 +50,7 @@ export declare class SheetSkeletonManagerService implements IDisposable, IRender
     private _reCalculate;
     makeDirty(searchParm: ISheetSkeletonManagerSearch, state?: boolean): void;
     getOrCreateSkeleton(searchParam: ISheetSkeletonManagerSearch): SpreadsheetSkeleton | undefined;
+    disposeSkeleton(searchParm: ISheetSkeletonManagerSearch): void;
     private _getSkeleton;
     private _buildSkeleton;
 }

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/// <reference types="node" />
 export interface AnimateConfig {
     loop: boolean;
     begin: number;

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;
+export declare function formatNumber(item: IStatisticItem): string | 0;
 export {};