@univerjs/sheets-ui 0.5.0-alpha.0 → 0.5.0-beta.0

package/lib/types/consts/permission.d.ts

@@ -2,6 +2,7 @@ import { UnitAction } from '@univerjs/protocol';
 export declare const UNIVER_SHEET_PERMISSION_PLUGIN_NAME = "UNIVER_SHEET_PERMISSION_PLUGIN";
 export declare const UNIVER_SHEET_PERMISSION_PANEL = "UNIVER_SHEET_PERMISSION_PANEL";
 export declare const UNIVER_SHEET_PERMISSION_USER_PART = "UNIVER_SHEET_PERMISSION_USER_PART";
+export declare const UNIVER_SHEET_PERMISSION_BACKGROUND = "UNIVER_SHEET_PERMISSION_BACKGROUND";
 export declare const UNIVER_SHEET_PERMISSION_PANEL_FOOTER = "UNIVER_SHEET_PERMISSION_PANEL_FOOTER";
 export declare const UNIVER_SHEET_PERMISSION_USER_DIALOG = "UNIVER_SHEET_PERMISSION_USER_DIALOG";
 export declare const UNIVER_SHEET_PERMISSION_DIALOG = "UNIVER_SHEET_PERMISSION_DIALOG";

package/lib/types/controllers/config.schema.d.ts

@@ -6,6 +6,7 @@ export interface IUniverSheetsUIConfig {
     menu?: MenuConfig;
     disableAutoFocus?: true;
     override?: DependencyOverride;
+    customComponents?: Set<string>;
     /**
      * Whether to show the formula bar.
      */

package/lib/types/controllers/permission/sheet-permission-render.controller.d.ts

@@ -1,6 +1,6 @@
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { MenuConfig, ComponentManager, IUIPartsService } from '@univerjs/ui';
-import { Disposable, Injector, IPermissionService, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, IConfigService, Injector, IPermissionService, IUniverInstanceService } from '@univerjs/core';
 import { RangeProtectionRuleModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 export interface IUniverSheetsPermissionMenuConfig {
@@ -20,9 +20,10 @@ export declare class SheetPermissionRenderController extends Disposable implemen
     private _rangeProtectionRuleModel;
     private _sheetSkeletonManagerService;
     private _permissionService;
+    private _configService;
     private _rangeProtectionCanViewRenderExtension;
     private _rangeProtectionCanNotViewRenderExtension;
-    constructor(_context: IRenderContext, _rangeProtectionRuleModel: RangeProtectionRuleModel, _sheetSkeletonManagerService: SheetSkeletonManagerService, _permissionService: IPermissionService);
+    constructor(_context: IRenderContext, _rangeProtectionRuleModel: RangeProtectionRuleModel, _sheetSkeletonManagerService: SheetSkeletonManagerService, _permissionService: IPermissionService, _configService: IConfigService);
     private _initRender;
     private _initSkeleton;
 }
@@ -32,8 +33,9 @@ export declare class WorksheetProtectionRenderController extends Disposable impl
     private _univerInstanceService;
     private _sheetSkeletonManagerService;
     private _worksheetProtectionRuleModel;
+    private _configService;
     private _worksheetProtectionRenderExtension;
-    constructor(_context: IRenderContext, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel);
+    constructor(_context: IRenderContext, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _configService: IConfigService);
     private _initRender;
     private _initSkeleton;
 }

package/lib/types/controllers/render-controllers/header-move.render-controller.d.ts

@@ -1,6 +1,6 @@
-import { Disposable, ICommandService, InterceptorManager, IRange, Workbook } from '@univerjs/core';
-import { SheetsSelectionsService } from '@univerjs/sheets';
+import { IRange, Workbook, Disposable, ICommandService, InterceptorManager } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { SheetsSelectionsService } from '@univerjs/sheets';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 export declare const HEADER_MOVE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, IRange>;
 export declare class HeaderMoveRenderController extends Disposable implements IRenderModule {

package/lib/types/facade/f-range.d.ts

@@ -1,5 +1,5 @@
+import { ICellWithCoord, IDisposable, Nullable, DisposableCollection } from '@univerjs/core';
 import { ComponentType, ComponentManager } from '@univerjs/ui';
-import { DisposableCollection, IDisposable, ISelectionCellWithMergeInfo, Nullable } from '@univerjs/core';
 import { FRange } from '@univerjs/sheets/facade';
 import { ICanvasPopup, ICellAlert } from '@univerjs/sheets-ui';
 export interface IFComponentKey {
@@ -21,7 +21,7 @@ interface IFRangeSheetsUIMixin {
      * Return this cell information, including whether it is merged and cell coordinates
      * @returns The cell information
      */
-    getCell(): ISelectionCellWithMergeInfo;
+    getCell(): ICellWithCoord;
     /**
      * Returns the coordinates of this cell,does not include units
      * @returns coordinates of the cell， top, right, bottom, left

package/lib/types/index.d.ts

@@ -47,11 +47,14 @@ export { EditorBridgeService, IEditorBridgeService, type IEditorBridgeServiceVis
 export { MarkSelectionService } from './services/mark-selection/mark-selection.service';
 export { IMarkSelectionService } from './services/mark-selection/mark-selection.service';
 export { SheetSelectionRenderService } from './services/selection/selection-render.service';
-export { getAllSelection, getTopLeftSelection } from './services/selection/base-selection-render.service';
+export { genSelectionByRange, getTopLeftSelectionOfCurrSheet, selectionDataForSelectAll as getAllSelection } from './services/selection/base-selection-render.service';
 export { BaseSelectionRenderService, ISheetSelectionRenderService } from './services/selection/base-selection-render.service';
-export { SelectionControl as SelectionShape } from './services/selection/selection-control';
+export { SelectionControl as SelectionShape, SelectionControl } from './services/selection/selection-control';
+export { SelectionShapeExtension } from './services/selection/selection-shape-extension';
+export { genNormalSelectionStyle } from './services/selection/const';
 export type { ISheetSkeletonManagerParam } from './services/sheet-skeleton-manager.service';
-export { attachRangeWithCoord, SheetSkeletonManagerService } from './services/sheet-skeleton-manager.service';
+export { SheetSkeletonManagerService } from './services/sheet-skeleton-manager.service';
+export { attachPrimaryWithCoord, attachRangeWithCoord, attachSelectionWithCoord } from './services/selection/util';
 export { UniverSheetsUIPlugin } from './plugin';
 export { SheetRenderController } from './controllers/render-controllers/sheet.render-controller';
 export { HoverManagerService } from './services/hover-manager.service';
@@ -90,10 +93,10 @@ export type { IFormatPainterBeforeApplyHookParams, IFormatPainterHook } from './
 export { type IBaseSheetBarProps } from './views/sheet-bar/sheet-bar-tabs/SheetBarItem';
 export { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from './components/font-family/interface';
 export { FONT_SIZE_COMPONENT } from './components/font-size/interface';
-export { attachPrimaryWithCoord, attachSelectionWithCoord } from './services/selection/util';
 export { SELECTION_SHAPE_DEPTH } from './services/selection/const';
 export { isRangeSelector, RANGE_SELECTOR_SYMBOLS } from './controllers/editor/utils/isRangeSelector';
 export { EMBEDDING_FORMULA_EDITOR, isEmbeddingFormulaEditor } from './controllers/editor/utils/isEmbeddingFormulaEditor';
+export { SheetCellEditorResizeService } from './services/editor/cell-editor-resize.service';
 export { menuSchema } from './controllers/menu.schema';
 export { getCellRealRange } from './common/utils';
 export { AddWorksheetMergeAllCommand, AddWorksheetMergeCommand, AddWorksheetMergeHorizontalCommand, AddWorksheetMergeVerticalCommand } from './commands/commands/add-worksheet-merge.command';
@@ -126,3 +129,4 @@ export { SetZoomRatioOperation } from './commands/operations/set-zoom-ratio.oper
 export { SheetPermissionOpenDialogOperation } from './commands/operations/sheet-permission-open-dialog.operation';
 export { SheetPermissionOpenPanelOperation } from './commands/operations/sheet-permission-open-panel.operation';
 export { SidebarDefinedNameOperation } from './commands/operations/sidebar-defined-name.operation';
+export { UNIVER_SHEET_PERMISSION_BACKGROUND, UNIVER_SHEET_PERMISSION_USER_PART } from './consts/permission';

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

@@ -19,7 +19,9 @@ interface IMarkSelectionInfo {
 }
 export declare const IMarkSelectionService: import('@wendellhu/redi').IdentifierDecorator<IMarkSelectionService>;
 /**
- * For condition format selection.
+ * For copy and cut selection.
+ * also for selection when hover on conditional format items in the cf panel on the right.
+ * but hover on panel if data validation, uses another method to draw selection.
  */
 export declare class MarkSelectionService extends Disposable implements IMarkSelectionService {
     private readonly _currentService;

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

@@ -1,6 +1,6 @@
-import { BehaviorSubject } from 'rxjs';
 import { Nullable, Workbook } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { BehaviorSubject } from 'rxjs';
 import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
 export interface IScrollState {
     /**

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

@@ -1,6 +1,6 @@
-import { IFreeze, IInterceptor, Injector, IRange, IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
+import { ICellInfo, ICellWithCoord, IDisposable, IFreeze, IInterceptor, Injector, IRange, IRangeWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent, IRenderModule, Scene, SpreadsheetSkeleton, Viewport, ScrollTimer, ScrollTimerType } from '@univerjs/engine-render';
-import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
+import { ISelectionStyle, ISelectionWithCoord, ISelectionWithStyle } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { Observable, Subscription, BehaviorSubject, Subject } from 'rxjs';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
@@ -10,10 +10,10 @@ export interface IControlFillConfig {
     newRange: IRange;
 }
 export interface ISheetSelectionRenderService {
-    readonly selectionMoveEnd$: Observable<ISelectionWithCoordAndStyle[]>;
+    readonly selectionMoveEnd$: Observable<ISelectionWithCoord[]>;
     readonly controlFillConfig$: Observable<IControlFillConfig | null>;
-    readonly selectionMoving$: Observable<ISelectionWithCoordAndStyle[]>;
-    readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
+    readonly selectionMoving$: Observable<ISelectionWithCoord[]>;
+    readonly selectionMoveStart$: Observable<ISelectionWithCoord[]>;
     get selectionMoving(): boolean;
     interceptor: InterceptorManager<{
         RANGE_MOVE_PERMISSION_CHECK: IInterceptor<boolean, null>;
@@ -29,10 +29,14 @@ export interface ISheetSelectionRenderService {
     getSkeleton(): SpreadsheetSkeleton;
     getSelectionControls(): SelectionControl[];
     /** @deprecated Use the function `attachSelectionWithCoord` instead. */
-    attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
+    attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoord;
     /** @deprecated Use the function `attachPrimaryWithCoord` instead`. */
-    attachPrimaryWithCoord(primary: Nullable<Partial<ISelectionCell>>): Nullable<ISelectionCellWithMergeInfo>;
-    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
+    attachPrimaryWithCoord(primary: Nullable<Partial<ICellInfo>>): Nullable<ICellWithCoord>;
+    /**
+     * @deprecated Please use `getCellWithCoordByOffset` instead.
+     */
+    getSelectionCellByPosition(x: number, y: number): ICellWithCoord;
+    getCellWithCoordByOffset(x: number, y: number): Nullable<ICellWithCoord>;
     setSingleSelectionEnabled(enabled: boolean): void;
     refreshSelectionMoveEnd(): void;
 }
@@ -65,8 +69,8 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     private _cancelUpSubscription;
     protected _skeleton: SpreadsheetSkeleton;
     protected _scene: Scene;
-    protected _isHeaderHighlight: boolean;
-    protected _shouldDetectMergedCells: boolean;
+    protected _highlightHeader: boolean;
+    protected _rangeType: RANGE_TYPE;
     protected _selectionStyle: ISelectionStyle;
     protected _remainLastEnabled: boolean;
     protected _skipLastEnabled: boolean;
@@ -74,15 +78,15 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     /**
      * Mainly emit by pointerup (pointerup is handled in _onPointerdown)
      */
-    protected readonly _selectionMoveEnd$: BehaviorSubject<ISelectionWithCoordAndStyle[]>;
-    readonly selectionMoveEnd$: Observable<ISelectionWithCoordAndStyle[]>;
-    protected readonly _selectionMoving$: Subject<ISelectionWithCoordAndStyle[]>;
-    readonly selectionMoving$: Observable<ISelectionWithCoordAndStyle[]>;
+    protected readonly _selectionMoveEnd$: BehaviorSubject<ISelectionWithCoord[]>;
+    readonly selectionMoveEnd$: Observable<ISelectionWithCoord[]>;
+    protected readonly _selectionMoving$: Subject<ISelectionWithCoord[]>;
+    readonly selectionMoving$: Observable<ISelectionWithCoord[]>;
     /**
      * Mainly emit by pointerdown
      */
-    protected readonly _selectionMoveStart$: Subject<ISelectionWithCoordAndStyle[]>;
-    readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
+    protected readonly _selectionMoveStart$: Subject<ISelectionWithCoord[]>;
+    readonly selectionMoveStart$: Observable<ISelectionWithCoord[]>;
     private _selectionMoving;
     get selectionMoving(): boolean;
     protected _activeViewport: Nullable<Viewport>;
@@ -95,8 +99,12 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
             scene: Scene;
         }>;
     }>;
-    private _escapeShortcutDisposable;
+    protected _escapeShortcutDisposable: Nullable<IDisposable>;
     constructor(_injector: Injector, _themeService: ThemeService, _shortcutService: IShortcutService, _sheetSkeletonManagerService: SheetSkeletonManagerService);
+    /**
+     * If true, the selector will respond to the range of merged cells and automatically extend the selected range. If false, it will ignore the merged cells.
+     */
+    private get _shouldDetectMergedCells();
     private _initMoving;
     protected _setSelectionStyle(style: ISelectionStyle): void;
     /**
@@ -106,29 +114,32 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     /** @deprecated This should not be provided by the selection render service. */
     getViewPort(): Viewport;
     setSingleSelectionEnabled(enabled?: boolean): void;
-    /**
-     * 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, skeleton: SpreadsheetSkeleton): SelectionControl;
+    newSelectionControl(scene: Scene, skeleton: SpreadsheetSkeleton, selection: ISelectionWithStyle): SelectionControl;
     /**
      * Update the corresponding selectionControl based on selectionsData.
      * selectionData[i] syncs selectionControls[i]
-     * @param selections
+     * @param selectionsWithCoord
      */
-    updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
+    resetSelectionsByModelData(selectionsWithStyleList: readonly ISelectionWithStyle[]): void;
     refreshSelectionMoveStart(): void;
     refreshSelectionMoveEnd(): void;
     protected _changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;
     getSkeleton(): SpreadsheetSkeleton;
     /**
      * Generate selectionData from this._selectionControls.model .
-     * @returns {ISelectionWithCoordAndStyle[]} {range, primary, style}[]
+     * @returns {ISelectionWithCoord[]} {range, primary, style}[]
+     */
+    getSelectionDataWithStyle(): ISelectionWithCoord[];
+    /**
+     * @TODO lumixraku DO NOT expose private props.
      */
-    getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
     getSelectionControls(): SelectionControl[];
-    protected _clearSelectionControls(): void;
+    /**
+     * Add a selection in spreadsheet, create a new SelectionControl and then update this control by range derives from selection.
+     * @param {ISelectionWithCoord} selectionWithStyle
+     */
+    protected _addSelectionControlByModelData(selectionWithStyle: ISelectionWithStyle): SelectionControl;
+    protected _clearAllSelectionControls(): void;
     protected _getFreeze(): Nullable<IFreeze>;
     protected _getViewportByCell(row?: number, column?: number): Nullable<Viewport>;
     /**
@@ -136,25 +147,15 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
      */
     getActiveRange(): Nullable<IRange>;
     /**
-     * get active selection control
+     * get active(actually last) selection control
      * @returns T extends SelectionControl
      */
     getActiveSelectionControl<T extends SelectionControl = SelectionControl>(): Nullable<T>;
     endSelection(): void;
     /**
-     * Clear existed selections.
+     * Clear existed selections by workbookSelections.selectionMoveEnd$
      */
     protected _reset(): void;
-    resetAndEndSelection(): void;
-    /**
-     * Handle pointer down event, then trigger selectionMoveStart$.
-     * @param evt
-     * @param _zIndex
-     * @param rangeType
-     * @param viewport
-     * @param scrollTimerType
-     */
-    protected _onPointerDown(evt: IPointerEvent | IMouseEvent, _zIndex: number | undefined, rangeType: RANGE_TYPE | undefined, viewport: Nullable<Viewport>, scrollTimerType?: ScrollTimerType): void;
     /**
      * Init pointer move listener in each pointer down, unbind in each pointer up.
      * Both cell selections and row-column selections are supported by this method.
@@ -167,34 +168,46 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
      */
     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;
+    attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoord;
     /** @deprecated Use the function `attachPrimaryWithCoord` instead`. */
-    attachPrimaryWithCoord(primary: ISelectionCell): ISelectionCellWithMergeInfo;
-    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
+    attachPrimaryWithCoord(primary: ICellInfo): ICellWithCoord;
     /**
-     * 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
+     * @deprecated Please use `getCellWithCoordByOffset` instead.
      */
-    protected _movingHandler(offsetX: number, offsetY: number, activeSelectionControl: Nullable<SelectionControl>, rangeType: RANGE_TYPE): void;
+    getSelectionCellByPosition(x: number, y: number): ICellWithCoord;
+    getCellWithCoordByOffset(x: number, y: number): ICellWithCoord;
     /**
-     * Update the selection control by range.
-     * @param control
-     * @param newSelectionRange
-     * @param highlight
+     * 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 _updateSelectionControlByRange(control: SelectionControl, newSelectionRange: IRangeWithCoord, highlight: Nullable<ISelectionCellWithMergeInfo>): void;
+    protected _movingHandler(offsetX: number, offsetY: number, activeSelectionControl: Nullable<SelectionControl>, rangeType: RANGE_TYPE): void;
     protected _clearUpdatingListeners(): void;
     protected _addEndingListeners(): void;
-    protected _getCellRangeByCursorPosition(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
+    /**
+     * Get visible selection range & coord by offset on viewport. Nearly same as skeleton.getCellWithCoordByOffset
+     * Returning selection is only one cell. primary and range are same cell.
+     *
+     * visible selection range means getCellWithCoordByOffset needs first matched row/col in rowHeightAccumulation & colWidthAccumulation.
+     * Original name: _getCellRangeByCursorPosition
+     *
+     * @param offsetX position X in viewport.
+     * @param offsetY
+     * @param scaleX
+     * @param scaleY
+     * @param scrollXY
+     * @returns {Nullable<ISelectionWithCoord>} selection range with coord.
+     */
+    protected _getSelectionWithCoordByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
         x: number;
         y: number;
     }): Nullable<ISelectionWithCoord>;
     protected _checkClearPreviousControls(evt: IPointerEvent | IMouseEvent): void;
-    private _performSelectionByTwoCells;
-    /**
-     * Reset all this.selectionControls by selectionsData.
-     * @param selectionsData
-     */
-    protected _refreshSelectionControl(selectionsData: readonly ISelectionWithStyle[]): void;
+    protected _makeSelectionByTwoCells(currentCell: ICellWithCoord, startSelectionRange: IRangeWithCoord, skeleton: SpreadsheetSkeleton, rangeType: RANGE_TYPE, activeControl: SelectionControl): void;
 }
-export declare function getAllSelection(skeleton: SpreadsheetSkeleton): ISelectionWithStyle;
-export declare function getTopLeftSelection(skeleton: SpreadsheetSkeleton): Nullable<ISelectionWithStyle>;
+export declare function selectionDataForSelectAll(skeleton: SpreadsheetSkeleton): ISelectionWithStyle;
+export declare function getTopLeftSelectionOfCurrSheet(skeleton: SpreadsheetSkeleton): ISelectionWithStyle;
+/**
+ * @deprecated use `getTopLeftSelectionOfCurrSheet` instead
+ */
+declare const getTopLeftSelection: typeof getTopLeftSelectionOfCurrSheet;
+export { getTopLeftSelection };
+export declare function genSelectionByRange(skeleton: SpreadsheetSkeleton, range: IRange): ISelectionWithStyle;

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

@@ -1,4 +1,6 @@
+import { ThemeService } from '@univerjs/core';
 import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import { ISelectionStyle } from '@univerjs/sheets';
 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;
@@ -10,3 +12,4 @@ export declare enum SELECTION_SHAPE_DEPTH {
     FORMULA_EDITOR_SHOW = 100,// see packages/sheets-formula/src/controllers/formula-editor-show.controller.ts
     MARK_SELECTION = 10000
 }
+export declare function genNormalSelectionStyle(themeService: ThemeService): ISelectionStyle;

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

@@ -1,6 +1,6 @@
 import { Workbook, ICommandService, IContextService, ILogService, Injector, RANGE_TYPE, ThemeService } from '@univerjs/core';
-import { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, Viewport } from '@univerjs/engine-render';
-import { SheetsSelectionsService } from '@univerjs/sheets';
+import { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render';
+import { ISelectionWithStyle, SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { SheetScrollManagerService } from '../scroll-manager.service';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
@@ -34,22 +34,22 @@ export declare class MobileSheetsSelectionRenderService extends BaseSelectionRen
     private _initUserActionSyncListener;
     private _updateSelections;
     /**
-     * invoked when pointerup or longpress on spreadsheet, or pointerdown on row&col
+     * invoked when pointerup or long press on spreadsheet, or pointerdown on row&col
      * then move curr selection to cell at cursor
-     * Main perpose to create a new selection, or update curr selection to a new range.
+     * Main purpose to create a new selection, or update curr selection to a new range.
      * @param evt
      * @param _zIndex
      * @param rangeType
      * @param viewport
      */
-    createNewSelection(evt: IPointerEvent | IMouseEvent, _zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport): false | undefined;
+    createNewSelection(evt: IPointerEvent | IMouseEvent, _zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport): void;
     /**
      * Not same as PC version,
      * new selection control for mobile do one more thing: bind event for two control points.
      * @param scene
      * @param rangeType
      */
-    newSelectionControl(scene: Scene, rangeType: RANGE_TYPE): MobileSelectionControl;
+    newSelectionControl(scene: Scene, skeleton: SpreadsheetSkeleton, selection: ISelectionWithStyle): MobileSelectionControl;
     private _getActiveViewport;
     private _getSheetObject;
     private _normalSelectionDisabled;
@@ -57,7 +57,7 @@ export declare class MobileSheetsSelectionRenderService extends BaseSelectionRen
     private _fillControlPointerDownHandler;
     private _changeCurrCellWhenControlPointerDown;
     /**
-     * Not same as _moving in base selection render service
+     * Not same as _moving in PC (base selection render service)
      * The diff is
      * In base version, new selection is determined by the cursor cell and _startRangeWhenPointerDown
      *

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

@@ -5,9 +5,7 @@ import { SelectionControl } from './selection-control';
 export declare class MobileSelectionControl extends SelectionControl {
     protected _scene: Scene;
     protected _zIndex: number;
-    protected _highlightHeader: boolean;
     protected readonly _themeService: ThemeService;
-    protected _rangeType: RANGE_TYPE;
     /**
      * topLeft controlPointer, it is not visible, just transparent, for handling event.
      */
@@ -16,7 +14,14 @@ export declare class MobileSelectionControl extends SelectionControl {
      * bottomRight controlPointer, it is not visible, just transparent, for handling event.
      */
     private _fillControlBottomRight;
-    constructor(_scene: Scene, _zIndex: number, _highlightHeader: boolean | undefined, _themeService: ThemeService, _rangeType?: RANGE_TYPE);
+    protected _rangeType: RANGE_TYPE;
+    constructor(_scene: Scene, _zIndex: number, _themeService: ThemeService, options?: {
+        highlightHeader?: boolean;
+        enableAutoFill?: boolean;
+        rowHeaderWidth: number;
+        columnHeaderHeight: number;
+        rangeType?: RANGE_TYPE;
+    });
     initControlPoints(): void;
     get fillControlTopLeft(): Rect<IRectProps> | null;
     set fillControlTopLeft(value: Rect);
@@ -25,7 +30,7 @@ export declare class MobileSelectionControl extends SelectionControl {
     get rangeType(): RANGE_TYPE;
     set rangeType(value: RANGE_TYPE);
     dispose(): void;
-    protected _setSizeAndStyleForSelectionControl(style: ISelectionStyle): void;
+    protected _updateLayoutOfSelectionControl(style: ISelectionStyle): void;
     getViewportMainScrollInfo(): {
         viewportScrollX: number;
         viewportScrollY: number;

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

@@ -1,6 +1,7 @@
-import { IRangeWithCoord, ISelectionCellWithMergeInfo, Nullable, ThemeService, Disposable } from '@univerjs/core';
+import { ICellWithCoord, IRangeWithCoord, Nullable, ThemeService, Disposable, RANGE_TYPE } from '@univerjs/core';
 import { Scene, Group, Rect } from '@univerjs/engine-render';
-import { ISelectionStyle, ISelectionWidgetConfig, ISelectionWithCoordAndStyle } from '@univerjs/sheets';
+import { ISelectionStyle, ISelectionWidgetConfig, ISelectionWithCoord } from '@univerjs/sheets';
+import { ISelectionShapeExtensionOption, SelectionShapeExtension } from './selection-shape-extension';
 import { Subject } from 'rxjs';
 import { SelectionRenderModel } from './selection-render-model';
 export declare enum SELECTION_MANAGER_KEY {
@@ -44,7 +45,21 @@ export declare class SelectionControl extends Disposable {
     protected _scene: Scene;
     protected _zIndex: number;
     protected readonly _themeService: ThemeService;
+    private _isHelperSelection;
+    /**
+     * For ref selections, there is no auto fill.
+     */
+    protected _enableAutoFill: boolean;
+    /**
+     * Only normal selections with primary cell has auto fill.
+     * This works for multiple normal selections. Only last selection has primary cell and auto fill.
+     */
+    private _showAutoFill;
+    /**
+     * If rowHeader & col Header would be highlighted with selection.
+     */
     protected _highlightHeader: boolean;
+    protected _selectionRenderModel: SelectionRenderModel;
     private _leftBorder;
     private _rightBorder;
     private _topBorder;
@@ -53,7 +68,7 @@ export declare class SelectionControl extends Disposable {
     private _backgroundControlBottom;
     private _backgroundControlMiddleLeft;
     private _backgroundControlMiddleRight;
-    private _fillControl;
+    private _autoFillControl;
     private _selectionShapeGroup;
     private _rowHeaderBackground;
     private _rowHeaderBorder;
@@ -61,6 +76,7 @@ export declare class SelectionControl extends Disposable {
     private _columnHeaderBackground;
     private _columnHeaderBorder;
     private _columnHeaderGroup;
+    private _dashedRect;
     private _topLeftWidget;
     private _topCenterWidget;
     private _topRightWidget;
@@ -69,13 +85,12 @@ export declare class SelectionControl extends Disposable {
     private _bottomLeftWidget;
     private _bottomCenterWidget;
     private _bottomRightWidget;
-    private _dashedRect;
-    protected _selectionModel: SelectionRenderModel;
     private _defaultStyle;
     private _currentStyle;
     protected _rowHeaderWidth: number;
     protected _columnHeaderHeight: number;
     protected _widgetRects: Rect[];
+    protected _controlExtension: Nullable<SelectionShapeExtension>;
     private _dispose$;
     readonly dispose$: import('rxjs').Observable<SelectionControl>;
     /**
@@ -89,11 +104,16 @@ export declare class SelectionControl extends Disposable {
     readonly selectionFilling$: Subject<Nullable<IRangeWithCoord>>;
     private readonly _selectionFilled$;
     readonly selectionFilled$: import('rxjs').Observable<Nullable<IRangeWithCoord>>;
-    private _isHelperSelection;
-    constructor(_scene: Scene, _zIndex: number, _themeService: ThemeService, _highlightHeader?: boolean, options?: {
+    constructor(_scene: Scene, _zIndex: number, _themeService: ThemeService, options?: {
+        highlightHeader?: boolean;
+        enableAutoFill?: boolean;
         rowHeaderWidth: number;
         columnHeaderHeight: number;
+        rangeType?: RANGE_TYPE;
     });
+    private _initializeSheetBody;
+    private _initialHeader;
+    private _initialWidget;
     get zIndex(): number;
     get leftControl(): Rect;
     get rightControl(): Rect;
@@ -120,29 +140,34 @@ export declare class SelectionControl extends Disposable {
     get themeService(): ThemeService;
     get selectionModel(): SelectionRenderModel;
     set selectionModel(model: SelectionRenderModel);
-    get defaultStyle(): ISelectionStyle;
-    set defaultStyle(style: ISelectionStyle);
+    get currentStyle(): ISelectionStyle;
+    set currentStyle(style: ISelectionStyle);
     get dashedRect(): Rect;
-    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);
+    setControlExtension(options: ISelectionShapeExtensionOption): void;
     setEvent(state: boolean): void;
     refreshSelectionFilled(val: IRangeWithCoord): void;
     /**
      * Update Control Style And Position of SelectionControl
      * @param selectionStyle
      */
-    protected _setSizeAndStyleForSelectionControl(selectionStyle: ISelectionStyle): void;
+    protected _updateLayoutOfSelectionControl(selectionStyle?: Nullable<Partial<ISelectionStyle>>): void;
     /**
-     * update selection control position by curr selection model
+     * update selection control coordination by curr selection model
      */
-    protected _refreshControlPosition(): void;
-    updateStyle(style: ISelectionStyle): void;
-    updateRange(range: IRangeWithCoord, primaryCell: Nullable<ISelectionCellWithMergeInfo>): void;
+    protected _updateControlCoord(): void;
+    updateStyle(style: Partial<ISelectionStyle>): void;
+    /**
+     * Update range, primary may be null, especially for moving handler.
+     * @param range
+     * @param primaryCell
+     */
+    updateRange(range: IRangeWithCoord, primaryCell: Nullable<ICellWithCoord>): void;
+    updateRangeBySelectionWithCoord(selectionWthCoord: ISelectionWithCoord): void;
     /**
      * Update selection model with new range & primary cell(aka: highlight/current), also update row/col selection size & style.
      *
@@ -152,12 +177,12 @@ export declare class SelectionControl extends Disposable {
      * @param style
      * @param primaryCell primary cell
      */
-    update(newSelectionRange: IRangeWithCoord, rowHeaderWidth?: number, columnHeaderHeight?: number, style?: Nullable<ISelectionStyle>, primaryCell?: Nullable<ISelectionCellWithMergeInfo>): void;
+    update(newSelectionRange: IRangeWithCoord, rowHeaderWidth?: number, columnHeaderHeight?: number, style?: Nullable<ISelectionStyle>, primaryCell?: Nullable<ICellWithCoord>): void;
     /**
      * update primary range
      * @param primaryCell model.current (aka: highlight)
      */
-    updateCurrCell(primaryCell?: Nullable<ISelectionCellWithMergeInfo>): void;
+    updateCurrCell(primaryCell: Nullable<ICellWithCoord>): void;
     clearHighlight(): void;
     getScene(): Scene;
     dispose(): void;
@@ -165,13 +190,10 @@ export declare class SelectionControl extends Disposable {
      * Get the cell information of the current selection, considering the case of merging cells
      */
     getCurrentCellInfo(): Nullable<IRangeWithCoord>;
-    getValue(): ISelectionWithCoordAndStyle;
+    getValue(): ISelectionWithCoord;
     getRange(): IRangeWithCoord;
     enableHelperSelection(): void;
     disableHelperSelection(): void;
-    private _initialize;
-    private _initialHeader;
-    private _initialWidget;
     private _updateHeaderBackground;
     private _updateBackgroundControl;
     private _updateWidgets;