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

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';
@@ -59,7 +62,7 @@ export { DragManagerService } from './services/drag-manager.service';
 export { CellAlertManagerService, CellAlertType, type ICellAlert } from './services/cell-alert-manager.service';
 export { HoverRenderController } from './controllers/hover-render.controller';
 export { DragRenderController } from './controllers/drag-render.controller';
-export { RANGE_SELECTOR_COMPONENT_KEY, SHEET_VIEW_KEY } from './common/keys';
+export { EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, RANGE_SELECTOR_COMPONENT_KEY, SHEET_VIEW_KEY } from './common/keys';
 export { type ICanvasPopup, SheetCanvasPopManagerService } from './services/canvas-pop-manager.service';
 export { mergeSetRangeValues } from './services/clipboard/utils';
 export type { IAutoFillLocation } from './services/auto-fill/type';
@@ -90,9 +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';
@@ -104,17 +108,17 @@ export { HideColConfirmCommand, HideRowConfirmCommand } from './commands/command
 export { ResetRangeTextColorCommand, SetRangeBoldCommand, SetRangeFontFamilyCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeStrickThroughCommand, SetRangeSubscriptCommand, SetRangeSuperscriptCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, } from './commands/commands/inline-format.command';
 export { InsertRangeMoveDownConfirmCommand } from './commands/commands/insert-range-move-down-confirm.command';
 export { InsertRangeMoveRightConfirmCommand } from './commands/commands/insert-range-move-right-confirm.command';
-export { AddRangeProtectionCommand, AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, DeleteRangeProtectionFromContextMenuCommand, DeleteRangeSelectionCommand, SetProtectionCommand, SetRangeProtectionCommand, SetRangeProtectionFromContextMenuCommand, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand, } from './commands/commands/range-protection.command';
+export { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, DeleteRangeProtectionFromContextMenuCommand, SetRangeProtectionFromContextMenuCommand, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand, } from './commands/commands/range-protection.command';
 export { RefillCommand } from './commands/commands/refill.command';
 export { RemoveColConfirmCommand, RemoveRowConfirmCommand } from './commands/commands/remove-row-col-confirm.command';
 export { RemoveSheetConfirmCommand } from './commands/commands/remove-sheet-confirm.command';
 export { ApplyFormatPainterCommand, SetInfiniteFormatPainterCommand, SetOnceFormatPainterCommand } from './commands/commands/set-format-painter.command';
-export { CancelFrozenCommand, SetColumnFrozenCommand, SetRowFrozenCommand, SetSelectionFrozenCommand } from './commands/commands/set-frozen.command';
+export { SetColumnFrozenCommand, SetRowFrozenCommand, SetSelectionFrozenCommand } from './commands/commands/set-frozen.command';
 export { type IScrollCommandParams, type IScrollToCellCommandParams, type ISetScrollRelativeCommandParams, ResetScrollCommand, ScrollCommand, ScrollToCellCommand, SetScrollRelativeCommand, } from './commands/commands/set-scroll.command';
 export { ExpandSelectionCommand, JumpOver, MoveSelectionCommand, MoveSelectionEnterAndTabCommand, SelectAllCommand } from './commands/commands/set-selection.command';
 export { ChangeZoomRatioCommand, SetZoomRatioCommand } from './commands/commands/set-zoom-ratio.command';
 export { ShowMenuListCommand } from './commands/commands/unhide.command';
-export { AddWorksheetProtectionCommand, ChangeSheetProtectionFromSheetBarCommand, DeleteWorksheetProtectionCommand, DeleteWorksheetProtectionFormSheetBarCommand, SetWorksheetProtectionCommand, } from './commands/commands/worksheet-protection.command';
+export { ChangeSheetProtectionFromSheetBarCommand, DeleteWorksheetProtectionFormSheetBarCommand, } from './commands/commands/worksheet-protection.command';
 export { SetActivateCellEditOperation } from './commands/operations/activate-cell-edit.operation';
 export { SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation, SetCellEditVisibleWithF2Operation } from './commands/operations/cell-edit.operation';
 export { RenameSheetOperation } from './commands/operations/rename-sheet.operation';
@@ -125,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/locale/zh-CN.d.ts

@@ -602,6 +602,7 @@ declare const locale: {
             setCellStyle: string;
             copy: string;
             alert: string;
+            search: string;
             alertContent: string;
             userEmpty: string;
             listEmpty: string;

package/lib/types/services/canvas-pop-manager.service.d.ts

@@ -1,7 +1,7 @@
 import { INeedCheckDisposable, Nullable, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { BaseObject, IBoundRectNoAngle, Viewport, IRenderManagerService } from '@univerjs/engine-render';
+import { ISheetLocationBase, RefRangeService } from '@univerjs/sheets';
 import { IPopup, ICanvasPopupService } from '@univerjs/ui';
-import { RefRangeService } from '@univerjs/sheets';
 export interface ICanvasPopup extends Omit<IPopup, 'anchorRect' | 'anchorRect$' | 'unitId' | 'subUnitId' | 'canvasElement'> {
     mask?: boolean;
     extraProps?: Record<string, any>;
@@ -13,6 +13,7 @@ export declare class SheetCanvasPopManagerService extends Disposable {
     private readonly _refRangeService;
     private readonly _commandService;
     constructor(_globalPopupManagerService: ICanvasPopupService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _refRangeService: RefRangeService, _commandService: ICommandService);
+    private _createHiddenRectObserver;
     private _createPositionObserver;
     /**
      * attach a popup to canvas object
@@ -21,7 +22,7 @@ export declare class SheetCanvasPopManagerService extends Disposable {
      * @returns disposable
      */
     attachPopupToObject(targetObject: BaseObject, popup: ICanvasPopup): INeedCheckDisposable;
-    attachPopupByPosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, _unitId?: string, _subUnitId?: string): Nullable<INeedCheckDisposable>;
+    attachPopupByPosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, location: ISheetLocationBase): Nullable<INeedCheckDisposable>;
     attachPopupToAbsolutePosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, _unitId?: string, _subUnitId?: string): {
         dispose: () => void;
         canDispose: () => boolean;

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

@@ -1,4 +1,16 @@
-import { IParagraph, IParagraphStyle, Nullable } from '@univerjs/core';
+import { IParagraph, IParagraphStyle, ITextRun, Nullable } from '@univerjs/core';
+import { ICellDataWithSpanInfo } from '../type';
 export default function parseToDom(rawHtml: string): HTMLBodyElement;
 export declare function getParagraphStyle(el: HTMLElement): Nullable<IParagraphStyle>;
 export declare function generateParagraphs(dataStream: string, prevParagraph?: IParagraph): IParagraph[];
+export declare function convertToCellStyle(cell: ICellDataWithSpanInfo, dataStream: string, textRuns: ITextRun[] | undefined): ICellDataWithSpanInfo | {
+    s: import('@univerjs/core').ITextStyle | undefined;
+    p?: Nullable<import('@univerjs/core').IDocumentData>;
+    v?: Nullable<import('@univerjs/core').CellValue>;
+    t?: Nullable<import('@univerjs/core').CellValueType>;
+    f?: Nullable<string>;
+    si?: Nullable<string>;
+    custom?: import('@univerjs/core').CustomData;
+    rowSpan?: number;
+    colSpan?: number;
+};

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

@@ -1,6 +1,6 @@
-import { ICellData, ICellDataForSheetInterceptor, IDisposable, IPosition, ISelectionCell, Nullable, Workbook, Worksheet, Disposable, IContextService, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { IDisposable, IPosition, ISelectionCell, Nullable, Disposable, IContextService, IUniverInstanceService, ThemeService } from '@univerjs/core';
 import { Engine, IDocumentLayoutObject, Scene, DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';
-import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
+import { SheetsSelectionsService, SheetInterceptorService } from '@univerjs/sheets';
 import { KeyCode } from '@univerjs/ui';
 import { Observable } from 'rxjs';
 import { IEditorService } from '@univerjs/docs-ui';
@@ -37,22 +37,11 @@ export interface ICellEditorLayout {
 }
 export interface IEditorBridgeServiceParam extends ICellEditorState, ICellEditorLayout {
 }
-interface ISheetLocationForEditor extends ISheetLocation {
-    origin: Nullable<ICellData>;
-}
-declare const BEFORE_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-declare const AFTER_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-declare const AFTER_CELL_EDIT_ASYNC: import('@univerjs/core').IInterceptor<Promise<Nullable<ICellDataForSheetInterceptor>>, ISheetLocationForEditor>;
 export interface IEditorBridgeService {
     currentEditCellState$: Observable<Nullable<ICellEditorState>>;
     currentEditCellLayout$: Observable<Nullable<ICellEditorLayout>>;
     currentEditCell$: Observable<Nullable<IEditorBridgeServiceParam>>;
     visible$: Observable<IEditorBridgeServiceVisibleParam>;
-    interceptor: InterceptorManager<{
-        BEFORE_CELL_EDIT: typeof BEFORE_CELL_EDIT;
-        AFTER_CELL_EDIT: typeof AFTER_CELL_EDIT;
-        AFTER_CELL_EDIT_ASYNC: typeof AFTER_CELL_EDIT_ASYNC;
-    }>;
     dispose(): void;
     refreshEditCellState(): void;
     refreshEditCellPosition(resetSizeOnly?: boolean): void;
@@ -69,9 +58,9 @@ export interface IEditorBridgeService {
     disableForceKeepVisible(): void;
     isForceKeepVisible(): boolean;
     getCurrentEditorId(): Nullable<string>;
-    beforeSetRangeValue(workbook: Workbook, worksheet: Worksheet, row: number, column: number, cellData: ICellData): Promise<Nullable<ICellData>>;
 }
 export declare class EditorBridgeService extends Disposable implements IEditorBridgeService, IDisposable {
+    private readonly _sheetInterceptorService;
     private readonly _renderManagerService;
     private readonly _themeService;
     private readonly _univerInstanceService;
@@ -110,12 +99,7 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     readonly visible$: Observable<IEditorBridgeServiceVisibleParam>;
     private readonly _afterVisible$;
     readonly afterVisible$: Observable<IEditorBridgeServiceVisibleParam>;
-    readonly interceptor: InterceptorManager<{
-        BEFORE_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-        AFTER_CELL_EDIT: import('@univerjs/core').IInterceptor<ICellDataForSheetInterceptor, ISheetLocationForEditor>;
-        AFTER_CELL_EDIT_ASYNC: import('@univerjs/core').IInterceptor<Promise<Nullable<ICellDataForSheetInterceptor>>, ISheetLocationForEditor>;
-    }>;
-    constructor(_renderManagerService: IRenderManagerService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService, _refSelectionsService: SheetsSelectionsService, _contextService: IContextService);
+    constructor(_sheetInterceptorService: SheetInterceptorService, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService, _refSelectionsService: SheetsSelectionsService, _contextService: IContextService);
     refreshEditCellState(): void;
     refreshEditCellPosition(resetSizeOnly?: boolean): void;
     setEditCell(param: ICurrentEditCellParam): void;
@@ -152,7 +136,5 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     isForceKeepVisible(): boolean;
     changeEditorDirty(dirtyStatus: boolean): void;
     getEditorDirty(): boolean;
-    beforeSetRangeValue(workbook: Workbook, worksheet: Worksheet, row: number, column: number, cellData: ICellData): Promise<Nullable<ICellDataForSheetInterceptor>>;
 }
 export declare const IEditorBridgeService: import('@wendellhu/redi').IdentifierDecorator<EditorBridgeService>;
-export {};

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/permission/sheet-permission-panel.model.d.ts

@@ -1,35 +1,14 @@
-import { IRange, Nullable } from '@univerjs/core';
+import { IRange } 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;
+export declare const DEFAULT_RANGE_RULE: IRangeProtectionRule;
+export type IPermissionPanelRule = (IRangeProtectionRule | IWorksheetProtectionRule) & {
     ranges: IRange[];
+    id: string;
 };
 export declare class SheetPermissionPanelModel {
     private _rule;
-    private _rule$;
-    private _oldRule;
-    private _rangeErrorMsg$;
     private _visible;
     setVisible(v: boolean): void;
     getVisible(): boolean;
-    rangeErrorMsg$: import('rxjs').Observable<string | undefined>;
-    setRangeErrorMsg(msg: string | undefined): 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;
 }
-export {};

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

@@ -3,13 +3,10 @@ export declare class SheetPermissionUserManagerService {
     private _userList;
     private _oldCollaboratorList;
     private _selectUserList;
-    private _allUserList;
     private _selectUserList$;
     selectUserList$: import('rxjs').Observable<ICollaborator[]>;
     get userList(): ICollaborator[];
-    get allUserList(): ICollaborator[];
-    setAllUserList(userList: ICollaborator[]): void;
-    setUserList(userList: ICollaborator[]): void;
+    setCanEditUserList(userList: ICollaborator[]): void;
     reset(): void;
     get oldCollaboratorList(): ICollaborator[];
     setOldCollaboratorList(userList: ICollaborator[]): void;

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;