@univerjs/sheets-ui 0.2.7 → 0.2.9

package/lib/types/services/clipboard/html-to-usm/parse-node-style.d.ts

@@ -1,3 +1,2 @@
 import { ITextStyle } from '@univerjs/core';
-
 export declare function extractNodeStyle(node: HTMLElement, predefinedStyles?: Record<string, string>): ITextStyle;

package/lib/types/services/clipboard/html-to-usm/paste-plugins/plugin-lark.d.ts

@@ -1,3 +1,2 @@
 import { IPastePlugin } from './type';
-
 export declare const LarkPastePlugin: IPastePlugin;

package/lib/types/services/clipboard/html-to-usm/paste-plugins/plugin-univer.d.ts

@@ -1,3 +1,2 @@
 import { IPastePlugin } from './type';
-
 export declare const UniverPastePlugin: IPastePlugin;

package/lib/types/services/clipboard/html-to-usm/paste-plugins/plugin-word.d.ts

@@ -1,3 +1,2 @@
 import { IPastePlugin } from './type';
-
 export declare const WordPastePlugin: IPastePlugin;

package/lib/types/services/clipboard/html-to-usm/paste-plugins/type.d.ts

@@ -1,5 +1,4 @@
 import { IDocumentBody, ITextStyle } from '@univerjs/core';
-
 export interface IStyleRule {
     filter: string | string[] | ((node: HTMLElement) => boolean);
     getStyle(node: HTMLElement): ITextStyle;

package/lib/types/services/clipboard/html-to-usm/utils.d.ts

@@ -1,5 +1,4 @@
 import { IParagraph, IParagraphStyle, Nullable } from '@univerjs/core';
-
 export default function parseToDom(rawHtml: string): HTMLBodyElement;
 export declare function getParagraphStyle(el: HTMLElement): Nullable<IParagraphStyle>;
 export declare function generateParagraphs(dataStream: string, prevParagraph?: IParagraph): IParagraph[];

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

@@ -1,6 +1,5 @@
 import { ICellData, IDocumentData, IMutationInfo, IRange, ObjectMatrix } from '@univerjs/core';
 import { IDiscreteRange } from '../../controllers/utils/range-tools';
-
 export declare enum COPY_TYPE {
     COPY = "COPY",
     CUT = "CUT"

package/lib/types/services/clipboard/usm-to-html/convertor.d.ts

@@ -1,6 +1,5 @@
 import { ICellData, IRange, ObjectMatrix } from '@univerjs/core';
 import { ISheetClipboardHook } from '../type';
-
 export declare class USMToHtmlService {
     convert(matrix: ObjectMatrix<ICellData & {
         rowSpan?: number | undefined;

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

@@ -1,7 +1,6 @@
 import { ICellData, IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';
 import { ISetRangeValuesMutationParams } from '@univerjs/sheets';
 import { IDiscreteRange } from '../../controllers/utils/range-tools';
-
 /**
  *
  *

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

@@ -1,7 +1,6 @@
 import { Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
 import { IDragEvent, IRenderManagerService } from '@univerjs/engine-render';
 import { IHoverCellPosition } from './hover-manager.service';
-
 export interface IDragCellPosition extends IHoverCellPosition {
     dataTransfer: DataTransfer;
 }

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

@@ -1,6 +1,5 @@
 import { IDisposable, IPosition, Nullable } from '@univerjs/core';
 import { Observable } from 'rxjs';
-
 export interface ICellEditorManagerParam extends Partial<IPosition> {
     show: boolean;
 }

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

@@ -1,6 +1,5 @@
 import { IDisposable, Nullable } from '@univerjs/core';
 import { Observable } from 'rxjs';
-
 export interface IFormulaEditorManagerService {
     position$: Observable<Nullable<DOMRect>>;
     focus$: Observable<boolean>;

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

@@ -3,7 +3,6 @@ import { Engine, IDocumentLayoutObject, Scene, DeviceInputEventType, IRenderMana
 import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
 import { IEditorService, KeyCode } from '@univerjs/ui';
 import { Observable } from 'rxjs';
-
 export interface IEditorBridgeServiceVisibleParam {
     visible: boolean;
     eventType: DeviceInputEventType;

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

@@ -2,7 +2,6 @@ import { IMutationInfo, IRange, IStyleData, Disposable, ICommandService, ILogSer
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { Observable } from 'rxjs';
 import { IMarkSelectionService } from '../mark-selection/mark-selection.service';
-
 export interface IFormatPainterService {
     status$: Observable<FormatPainterStatus>;
     addHook(hooks: IFormatPainterHook): void;

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';
-
 export interface IHoverCellPosition {
     position: IPosition;
     location: ISheetLocation;

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

@@ -2,7 +2,6 @@ import { Disposable, IUniverInstanceService, ThemeService } from '@univerjs/core
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { ISelectionWithStyle } from '@univerjs/sheets';
 import { SelectionControl } from '../selection/selection-shape';
-
 export interface IMarkSelectionService {
     addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;
     removeShape(id: string): void;

package/lib/types/services/permission/sheet-permission-panel.model.d.ts

@@ -1,13 +1,17 @@
 import { IRange, Nullable } from '@univerjs/core';
 import { IRangeProtectionRule, IWorksheetProtectionRule } from '@univerjs/sheets';
-
 export declare enum viewState {
     othersCanView = "othersCanView",
     noOneElseCanView = "noOneElseCanView"
 }
+export declare enum editState {
+    designedUserCanEdit = "designedUserCanEdit",
+    onlyMe = "onlyMe"
+}
 type IPermissionPanelBaseRule = IRangeProtectionRule | IWorksheetProtectionRule;
 export type IPermissionPanelRule = IPermissionPanelBaseRule & {
     viewStatus?: viewState;
+    editStatus?: editState;
     ranges: IRange[];
 };
 export declare class SheetPermissionPanelModel {
@@ -15,12 +19,16 @@ export declare class SheetPermissionPanelModel {
     private _rule$;
     private _oldRule;
     private _rangeErrorMsg$;
+    private _visible;
+    setVisible(v: boolean): void;
+    getVisible(): boolean;
     rangeErrorMsg$: import('rxjs').Observable<string>;
     setRangeErrorMsg(msg: string): void;
     rule$: import('rxjs').Observable<IPermissionPanelRule>;
     get rule(): IPermissionPanelRule;
     setRule(ruleObj: Partial<IPermissionPanelRule>): void;
     resetRule(): void;
+    reset(): void;
     get oldRule(): Nullable<IPermissionPanelRule>;
     setOldRule(ruleObj: Nullable<IPermissionPanelRule>): void;
 }

package/lib/types/services/permission/sheet-permission-user-list.service.d.ts

@@ -1,5 +1,4 @@
 import { ICollaborator } from '@univerjs/protocol';
-
 export declare class SheetPermissionUserManagerService {
     private _userList;
     private _oldCollaboratorList;
@@ -11,6 +10,7 @@ export declare class SheetPermissionUserManagerService {
     get allUserList(): ICollaborator[];
     setAllUserList(userList: ICollaborator[]): void;
     setUserList(userList: ICollaborator[]): void;
+    reset(): void;
     get oldCollaboratorList(): ICollaborator[];
     setOldCollaboratorList(userList: ICollaborator[]): void;
     get selectUserList(): ICollaborator[];

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

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

package/lib/types/services/print-interceptor.service.d.ts

@@ -1,6 +1,5 @@
 import { IRange, Disposable, InterceptorManager } from '@univerjs/core';
 import { Scene } from '@univerjs/engine-render';
-
 interface ISheetPos {
     unitId: string;
     subUnitId: string;

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

@@ -2,7 +2,6 @@ import { Nullable, Workbook } from '@univerjs/core';
 import { BehaviorSubject } from 'rxjs';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
-
 export interface IScrollState {
     /**
      * offsetX from startRow, coordinate same as viewport, not scrollbar

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

@@ -1,10 +1,10 @@
 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 { IMouseEvent, IPointerEvent, IRenderModule, Scene, SpreadsheetSkeleton, Viewport, ScrollTimer, ScrollTimerType } from '@univerjs/engine-render';
 import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { Observable, Subscription, BehaviorSubject, Subject } from 'rxjs';
+import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 import { SelectionControl } from './selection-shape';
-
 export interface IControlFillConfig {
     oldRange: IRange;
     newRange: IRange;
@@ -43,7 +43,7 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     protected readonly _injector: Injector;
     protected readonly _themeService: ThemeService;
     protected readonly _shortcutService: IShortcutService;
-    protected readonly _renderManagerService: IRenderManagerService;
+    protected readonly _sheetSkeletonManagerService: SheetSkeletonManagerService;
     private _downObserver;
     protected _scenePointerMoveSub: Nullable<Subscription>;
     protected _scenePointerUpSub: Nullable<Subscription>;
@@ -71,11 +71,6 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     protected _skipLastEnabled: boolean;
     protected _singleSelectionEnabled: boolean;
     protected readonly _selectionMoveEnd$: BehaviorSubject<ISelectionWithCoordAndStyle[]>;
-    /**
-     * trigger when selection move end(pointerup)
-     * and then update selection model in selectionManagerService
-     * selectionMoveEnd$ ---> _updateSelections --> selectionOperation@selectionManagerService.setSelections
-     */
     readonly selectionMoveEnd$: Observable<ISelectionWithCoordAndStyle[]>;
     protected readonly _selectionMoving$: Subject<ISelectionWithCoordAndStyle[]>;
     readonly selectionMoving$: Observable<ISelectionWithCoordAndStyle[]>;
@@ -93,50 +88,35 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
             scene: Scene;
         }>;
     }>;
-    constructor(_injector: Injector, _themeService: ThemeService, _shortcutService: IShortcutService, _renderManagerService: IRenderManagerService);
+    constructor(_injector: Injector, _themeService: ThemeService, _shortcutService: IShortcutService, _sheetSkeletonManagerService: SheetSkeletonManagerService);
     private _initMoving;
-    protected _setStyle(style: ISelectionStyle): void;
-    protected _resetStyle(): void;
+    protected _setSelectionStyle(style: ISelectionStyle): void;
+    /**
+     * Reset this._selectionStyle to default normal selection style
+     */
+    protected _resetSelectionStyle(): void;
     /** @deprecated This should not be provided by the selection render service. */
     getViewPort(): Viewport;
     setSingleSelectionEnabled(enabled?: boolean): void;
     /**
-     * add a selection
-     *
-     * in PC:init & pointerup would call this function.
-     *
-     * init
-     * selectionController@_initSkeletonChangeListener --> selectionManagerService.add --> selectionManagerService._selectionMoveEnd$ --> this.addControlToCurrentByRangeData
-     *
-     * selectionMoveEnd$ --> this.addSelectionControlBySelectionData
-     *
-     *
-     *
-     * pointer
-     * engine@_pointerDownEvent --> spreadsheet?.onPointerDownObserve --> eventTrigger --> scene@disableEvent() --> then scene.input-manager currentObject is always scene until scene@enableEvent.
-     * engine@_pointerUpEvent --> scene.input-manager@_onPointerUp --> this._selectionMoveEnd$ --> _selectionManagerService.selectionMoveEnd$ --> this.addControlToCurrentByRangeData
-     *
-     * but in mobile, we do not call disableEvent() in eventTrigger,
-     * so pointerup --> scene.input-manager currentObject is spreadsheet --> this.eventTrigger
-     *
-     *
-     * columnHeader pointerup$ --> selectionMoveEnd$ --> selectionManagerService@setSelections -->
-     * selectionManagerService@_emitOnEnd -->
-     * _workbookSelections.selectionMoveEnd$ --> _addSelectionControlBySelectionData
-     *
-     * @param selectionData
+     * Add a selection in spreadsheet, create a new SelectionControl and then update this control by range derives from selection.
+     * @param {ISelectionWithCoordAndStyle} selection
      */
     protected _addSelectionControlBySelectionData(selection: ISelectionWithCoordAndStyle): void;
     newSelectionControl(scene: Scene, _rangeType: RANGE_TYPE): SelectionControl;
     /**
      * Update the corresponding selectionControl based on selectionsData.
-     * selectionData[i] ---- selectionControls[i]
+     * selectionData[i] syncs selectionControls[i]
      * @param selections
      */
     updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
     refreshSelectionMoveStart(): void;
     protected _changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;
     getSkeleton(): SpreadsheetSkeleton;
+    /**
+     * Generate selectionData from this._selectionControls.model .
+     * @returns {ISelectionWithCoordAndStyle[]} {range, primary, style}[]
+     */
     getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
     getSelectionControls(): SelectionControl[];
     protected _clearSelectionControls(): void;
@@ -164,7 +144,16 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
      * @param _zIndex Stacking order of the selection object
      * @param rangeType Determines whether the selection is made normally according to the range or by rows and columns
      */
-    protected _onPointerDown(evt: IPointerEvent | IMouseEvent, _zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): false | undefined;
+    protected _onPointerDown(evt: IPointerEvent | IMouseEvent, _zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): void;
+    /**
+     * Init pointer move listener, bind in each pointer down, unbind in each pointer up
+     * @param viewportMain
+     * @param activeSelectionControl
+     * @param rangeType
+     * @param scrollTimerType
+     * @param moveStartPosX
+     * @param moveStartPosY
+     */
     protected _setupPointerMoveListener(viewportMain: Nullable<Viewport>, activeSelectionControl: SelectionControl, rangeType: RANGE_TYPE, scrollTimerType: ScrollTimerType | undefined, moveStartPosX: number, moveStartPosY: number): void;
     /** @deprecated Use the function `attachSelectionWithCoord` instead`. */
     attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
@@ -174,8 +163,14 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     /**
      * When mousedown and mouseup need to go to the coordination and undo stack, when mousemove does not need to go to the coordination and undo stack
      */
-    protected _moving(offsetX: number, offsetY: number, activeSelectionControl: Nullable<SelectionControl>, rangeType: RANGE_TYPE): false | undefined;
-    protected _updateSelectionControlRange(control: SelectionControl, newSelectionRange: IRangeWithCoord, highlight: Nullable<ISelectionCellWithMergeInfo>): void;
+    protected _movingHandler(offsetX: number, offsetY: number, activeSelectionControl: Nullable<SelectionControl>, rangeType: RANGE_TYPE): false | undefined;
+    /**
+     * Update the selection control by range.
+     * @param control
+     * @param newSelectionRange
+     * @param highlight
+     */
+    protected _updateSelectionControlByRange(control: SelectionControl, newSelectionRange: IRangeWithCoord, highlight: Nullable<ISelectionCellWithMergeInfo>): void;
     protected _clearUpdatingListeners(): void;
     protected _addEndingListeners(): void;
     protected _getCellRangeByCursorPosition(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
@@ -184,6 +179,10 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     }): Nullable<ISelectionWithCoord>;
     protected _checkClearPreviousControls(evt: IPointerEvent | IMouseEvent): void;
     private _performSelectionByTwoCells;
+    /**
+     * Reset all this.selectionControls by selectionsData.
+     * @param selectionsData
+     */
     protected _refreshSelectionControl(selectionsData: readonly ISelectionWithStyle[]): void;
 }
 export declare function getAllSelection(skeleton: SpreadsheetSkeleton): ISelectionWithStyle;

package/lib/types/services/selection/const.d.ts

@@ -1,5 +1,4 @@
 import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
-
 export declare const RANGE_MOVE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, null>;
 export declare const RANGE_FILL_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, {
     x: number;

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

@@ -1,12 +1,11 @@
 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 { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, Viewport } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 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';
-
 declare enum ExpandingControl {
     BOTTOM_RIGHT = "bottom-right",
     TOP_LEFT = "top-left",
@@ -20,14 +19,13 @@ export declare class MobileSheetsSelectionRenderService extends BaseSelectionRen
     private readonly _logService;
     private readonly _commandService;
     private readonly _contextService;
-    private readonly _sheetSkeletonManagerService;
     private readonly _scrollManagerService;
     private readonly _workbookSelections;
     private _renderDisposable;
     _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: SheetScrollManagerService);
+    constructor(_context: IRenderContext<Workbook>, injector: Injector, themeService: ThemeService, shortcutService: IShortcutService, selectionManagerService: SheetsSelectionsService, sheetSkeletonManagerService: SheetSkeletonManagerService, _logService: ILogService, _commandService: ICommandService, _contextService: IContextService, _scrollManagerService: SheetScrollManagerService);
     private _init;
     private _initSkeletonChangeListener;
     private _initSelectionChangeListener;
@@ -66,7 +64,7 @@ export declare class MobileSheetsSelectionRenderService extends BaseSelectionRen
      *
      * In Mobile version, new selection is determined by cursor cell and current of activeSelectionControl.model
      */
-    protected _moving(offsetX: number, offsetY: number, activeSelectionControl: MobileSelectionControl, rangeType: RANGE_TYPE): false | undefined;
+    protected _movingHandler(offsetX: number, offsetY: number, activeSelectionControl: MobileSelectionControl, rangeType: RANGE_TYPE): false | undefined;
     private _updateControlPointWhenScrolling;
 }
 export {};

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

@@ -2,7 +2,6 @@ import { IRangeWithCoord, Nullable, ThemeService, RANGE_TYPE } from '@univerjs/c
 import { IRectProps, Scene, Rect } from '@univerjs/engine-render';
 import { ISelectionStyle } from '@univerjs/sheets';
 import { SelectionControl } from './selection-shape';
-
 export declare class MobileSelectionControl extends SelectionControl {
     protected _scene: Scene;
     protected _zIndex: number;
@@ -35,7 +34,7 @@ export declare class MobileSelectionControl extends SelectionControl {
     set rangeType(value: RANGE_TYPE);
     dispose(): void;
     updateRange(range: IRangeWithCoord): void;
-    protected _updateControl(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number): void;
+    protected _updateControlStyleAndLayout(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number): void;
     getViewportMainScrollInfo(): {
         viewportScrollX: number;
         viewportScrollY: number;

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

@@ -1,5 +1,4 @@
 import { IRangeWithCoord, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, RANGE_TYPE } from '@univerjs/core';
-
 export declare class SelectionRenderModel implements IRangeWithCoord {
     private _startColumn;
     private _startRow;
@@ -10,9 +9,7 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
     private _endX;
     private _endY;
     /**
-     * highlight cell of selection
-     * when there is no merge info
-     * top left cell of current selection (or bottomLeft of current selection)
+     * The highlight cell of a selection. aka: current cell
      */
     private _primary;
     private _rangeType;
@@ -41,6 +38,12 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
     setRangeType(rangeType: RANGE_TYPE): void;
     getValue(): ISelectionWithCoord;
     setValue(newSelectionRange: IRangeWithCoord, currentCell: Nullable<ISelectionCellWithMergeInfo>): void;
+    /**
+     * Set primary cell.
+     *
+     * TODO @lumixraku there are 3 concepts for same thing, primary and current and highlight, primary is better cuz selectionModel is using primary.
+     * @param currentCell
+     */
     setCurrentCell(currentCell: Nullable<ISelectionCellWithMergeInfo>): void;
     clearCurrentCell(): void;
 }

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

@@ -1,24 +1,21 @@
 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';
 import { BaseSelectionRenderService } from './base-selection-render.service';
-
 /**
  * This services controls rendering of normal selections in a render unit.
  * The normal selections would also be used by Auto Fill and Copy features.
  */
 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;
@@ -26,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

@@ -1,7 +1,6 @@
 import { Injector, IRangeWithCoord, ThemeService } from '@univerjs/core';
 import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
 import { SelectionControl } from './selection-shape';
-
 export interface ISelectionShapeTargetSelection {
     originControl: SelectionControl;
     targetSelection: IRangeWithCoord;
@@ -42,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

@@ -3,7 +3,6 @@ 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__",
@@ -39,7 +38,7 @@ 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;
@@ -74,12 +73,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>;
@@ -87,8 +91,6 @@ 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);
     get zIndex(): number;
@@ -115,8 +117,6 @@ export declare class SelectionControl extends Disposable {
     get bottomCenterWidget(): Rect<IRectProps>;
     get bottomRightWidget(): Rect<IRectProps>;
     get themeService(): ThemeService;
-    get selectionStyle(): Nullable<ISelectionStyle>;
-    set selectionStyle(style: Nullable<ISelectionStyle>);
     get selectionModel(): SelectionRenderModel;
     set selectionModel(model: SelectionRenderModel);
     get defaultStyle(): ISelectionStyle;
@@ -131,18 +131,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>, rowHeaderWidth: number, columnHeaderHeight: number): 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;
@@ -154,11 +163,6 @@ 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 _initialWidget;

package/lib/types/services/selection/util.d.ts

@@ -1,6 +1,5 @@
 import { ISelectionCell, ISelectionCellWithMergeInfo } from '@univerjs/core';
 import { SpreadsheetSkeleton } from '@univerjs/engine-render';
 import { ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
-
 export declare function attachSelectionWithCoord(selection: ISelectionWithStyle, skeleton: SpreadsheetSkeleton): ISelectionWithCoordAndStyle;
 export declare function attachPrimaryWithCoord(primary: ISelectionCell, skeleton: SpreadsheetSkeleton): ISelectionCellWithMergeInfo;

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

@@ -1,7 +1,6 @@
 import { Disposable, IDisposable } from '@univerjs/core';
 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,5 @@
 import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable, Injector } from '@univerjs/core';
 import { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render';
-
 export interface ISheetSkeletonManagerParam {
     unitId?: string;
     sheetId: string;