@univerjs/sheets-ui 1.0.2 → 1.0.4

package/lib/index.js

@@ -1,9 +1,9 @@
-import { BreakLineCommand, CoverContentCommand, DOCS_COMPONENT_MAIN_LAYER_INDEX, DOCS_VIEW_KEY, DOC_VERTICAL_PADDING, DeleteLeftCommand, DeleteRightCommand, DocSelectionRenderService, EnterCommand, IEditorService, IMEInputCommand, MobileRichTextToolbar, MoveCursorOperation, MoveSelectionOperation, NodePositionConvertToCursor, ReplaceSnapshotCommand, SetDocInputStyleCommand, SetInlineFormatBoldCommand, SetInlineFormatCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatSubscriptCommand, SetInlineFormatSuperscriptCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand, UniverDocsUIPlugin, VIEWPORT_KEY, convertBodyToHtml, getCanvasOffsetByEngine, getLineBounding } from "@univerjs/docs-ui";
+import { BreakLineCommand, CoverContentCommand, DOCS_COMPONENT_MAIN_LAYER_INDEX, DOCS_VIEW_KEY, DOC_VERTICAL_PADDING, DeleteLeftCommand, DeleteRightCommand, DocSelectionRenderService, EnterCommand, IEditorService, IMEInputCommand, InnerPasteCommand, MobileRichTextToolbar, MoveCursorOperation, MoveSelectionOperation, NodePositionConvertToCursor, ReplaceSnapshotCommand, SetDocInputStyleCommand, SetInlineFormatBoldCommand, SetInlineFormatCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatSubscriptCommand, SetInlineFormatSuperscriptCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand, UniverDocsUIPlugin, VIEWPORT_KEY, convertBodyToHtml, getCanvasOffsetByEngine, getLineBounding } from "@univerjs/docs-ui";
 import { AbsoluteRefType, BaselineOffset, BooleanNumber, BorderStyleTypes, BorderType, CellModeEnum, CellValueType, ColorKit, CommandType, CustomRangeType, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DEFAULT_WORKSHEET_COLUMN_COUNT, DEFAULT_WORKSHEET_COLUMN_WIDTH, DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY, DEFAULT_WORKSHEET_ROW_COUNT, DEFAULT_WORKSHEET_ROW_HEIGHT, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DataStreamTreeTokenType, DependentOn, Direction, Disposable, DisposableCollection, DocumentFlavor, EDITOR_ACTIVATED, ErrorService, FOCUSING_COMMENT_EDITOR, FOCUSING_COMMON_DRAWINGS, FOCUSING_EDITOR_INPUT_FORMULA, FOCUSING_EDITOR_STANDALONE, FOCUSING_FX_BAR_EDITOR, FOCUSING_SHAPE_TEXT_EDITOR, FOCUSING_SHEET, FOCUSING_UNIVER_EDITOR, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, LocaleType, LookUp, NilCommand, ObjectMatrix, Optional, Plugin, PresetListType, Quantity, RANGE_TYPE, Range, Rectangle, RxDisposable, SHEET_EDITOR_UNITS, ThemeService, Tools, UndoCommandId, UniverInstanceType, UserManagerService, VerticalAlign, Workbook, WorksheetHiddenState, WrapStrategy, cloneCellData, cloneCellDataMatrix, cloneCellDataWithSpanAndDisplay, composeStyles, convertCellToRange, createDocumentModelWithStyle, createIdentifier, createInterceptorKey, createParagraphId, createSectionId, dateKit, debounce, extractPureTextFromCell, fromEventSubject, generateRandomId, get, getEmptyCell, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, getReverseDirection, handleStyleToString, isDefaultFormat, isFormulaString, isNotNullOrUndefined, isRealNum, isSafeUrl, isTextFormat, isValidRange, merge, mergeOverrideWithDependencies, nameCharacterCheck, numberToABC, numfmt, registerDependencies, sequenceExecute, set, skipParseTagNames, sortRules, splitIntoGrid, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
 import { AUTO_FILL_APPLY_TYPE, AUTO_FILL_HOOK_TYPE, AddMergeUndoMutationFactory, AddRangeProtectionCommand, AddRangeProtectionMutation, AddWorksheetMergeAllCommand, AddWorksheetMergeCommand, AddWorksheetMergeHorizontalCommand, AddWorksheetMergeMutation, AddWorksheetMergeVerticalCommand, AddWorksheetProtectionCommand, AutoClearContentCommand, AutoFillCommand, AutoFillController, BEFORE_CELL_EDIT, BorderStyleManagerService, COMMAND_LISTENER_SKELETON_CHANGE, COMMAND_LISTENER_VALUE_CHANGE, CancelFrozenCommand, CancelMarkDirtyRowAutoHeightOperation, ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, CopySheetCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeleteRangeProtectionCommand, DeleteRangeProtectionMutation, DeleteWorksheetProtectionCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, EditStateEnum, IAutoFillService, IExclusiveRangeService, INTERCEPTOR_POINT, INumfmtService, IRefSelectionsService, InsertColBeforeCommand, InsertColCommand, InsertColMutation, InsertDefinedNameCommand, InsertMultiColsLeftCommand, InsertMultiColsRightCommand, InsertMultiRowsAboveCommand, InsertMultiRowsAfterCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowBeforeCommand, InsertRowCommand, InsertRowMutation, InsertSheetCommand, InsertSheetMutation, MAX_CELL_PER_SHEET_KEY, MERGE_CELL_INTERCEPTOR_CHECK, MarkDirtyRowAutoHeightOperation, MergeCellController, MoveColsCommand, MoveColsMutation, MoveRangeCommand, MoveRangeMutation, MoveRowsCommand, MoveRowsMutation, REF_SELECTIONS_ENABLED, RangeProtectionCache, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, RefRangeService, RefSelectionsService, RefillCommand, RemoveColCommand, RemoveColMutation, RemoveDefinedNameCommand, RemoveMergeUndoMutationFactory, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, RemoveSheetMutation, RemoveWorksheetMergeCommand, RemoveWorksheetMergeMutation, ResetBackgroundColorCommand, ResetTextColorCommand, SCOPE_WORKBOOK_VALUE_DEFINED_NAME, SELECTIONS_ENABLED, SELECTION_CONTROL_BORDER_BUFFER_COLOR, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, SHEETS_PLUGIN_CONFIG_KEY, ScrollToCellOperation, SelectionMoveType, SetBackgroundColorCommand, SetBoldCommand, SetBorderBasicCommand, SetBorderCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetDefinedNameCommand, SetFontFamilyCommand, SetFontSizeCommand, SetFrozenCommand, SetFrozenMutation, SetFrozenMutationFactory, SetHorizontalTextAlignCommand, SetItalicCommand, SetProtectionCommand, SetRangeValuesCommand, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSelectionsOperation, SetShrinkToFitCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetStrikeThroughCommand, SetStyleCommand, SetTabColorCommand, SetTabColorMutation, SetTextColorCommand, SetTextRotationCommand, SetTextWrapCommand, SetUnderlineCommand, SetVerticalTextAlignCommand, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SetWorksheetColWidthMutation, SetWorksheetColWidthMutationFactory, SetWorksheetHideCommand, SetWorksheetHideMutation, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetOrderMutation, SetWorksheetPermissionPointsCommand, SetWorksheetRowAutoHeightMutation, SetWorksheetRowAutoHeightMutationFactory, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetWorksheetShowCommand, SheetCopyDownCommand, SheetCopyRightCommand, SheetInterceptorService, SheetPermissionCheckController, SheetPermissionInitController, SheetSkeletonService, SheetsSelectionsService, TextToNumberCommand, ToggleCellCheckboxCommand, ToggleGridlinesCommand, ToggleGridlinesMutation, UniverSheetsPlugin, ViewStateEnum, WorkbookCopyPermission, WorkbookCreateProtectPermission, WorkbookCreateSheetPermission, WorkbookDeleteColumnPermission, WorkbookDeleteRowPermission, WorkbookDeleteSheetPermission, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookInsertColumnPermission, WorkbookInsertRowPermission, WorkbookManageCollaboratorPermission, WorkbookRenameSheetPermission, WorksheetCopyPermission, WorksheetDeleteColumnPermission, WorksheetDeleteProtectionPermission, WorksheetDeleteRowPermission, WorksheetEditPermission, WorksheetInsertColumnPermission, WorksheetInsertRowPermission, WorksheetManageCollaboratorPermission, WorksheetProtectionPointModel, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission, adjustRangeOnMutation, alignToMergedCellsBorders, attachPrimaryWithCoord, attachRangeWithCoord, attachSelectionWithCoord, baseProtectionActions, convertPrimaryWithCoordToPrimary, convertSelectionDataToRange, countCells, defaultLargeSheetOperationConfig, deserializeListOptions, discreteRangeToRange, expandToContinuousRange, findFirstNonEmptyCell, getAddMergeMutationRangeByType, getAllWorksheetPermissionPoint, getCellAtRowCol, getCellType, getCellValue, getClearContentMutationParamsForRanges, getMoveRangeCommandMutations, getPrimaryForRange, getSelectionsService, getSheetCommandTarget, isCellImage, rangeToDiscreteRange, serializeListOptions, setEndForRange, validateDefinedName } from "@univerjs/sheets";
 import { AnchoredContextMenu, BuiltInUIPart, COLOR_PICKER_COMPONENT, ComponentContainer, ComponentManager, ContextMenuGroup, ContextMenuPosition, CopyCommand, CutCommand, DISABLE_AUTO_FOCUS_KEY, FILE_PNG_CLIPBOARD_MIME_TYPE, FILE__BMP_CLIPBOARD_MIME_TYPE, FILE__JPEG_CLIPBOARD_MIME_TYPE, FILE__WEBP_CLIPBOARD_MIME_TYPE, FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT, FONT_SIZE_COMPONENT, FONT_SIZE_LIST, FormatPainterSessionService, HTML_CLIPBOARD_MIME_TYPE, ICanvasPopupService, IClipboardInterfaceService, IContextMenuService, IDialogService, IFontService, ILayoutService, IMenuManagerService, IMessageService, INotificationService, IPlatformService, IRibbonService, IShortcutService, ISidebarService, IUIPartsService, IUIRuntimeScopeService, IWorkbenchService, IconManager, KeyCode, MenuItemType, MetaKeys, MobileDrawer, MobileMenu, MobileZoomIndicator, PLAIN_TEXT_CLIPBOARD_MIME_TYPE, PasteCommand, RibbonPosition, RibbonStartGroup, RibbonViewGroup, SheetPasteShortKeyCommandName, Slider, ToggleFullscreenOperation, ToolbarItem, UI_PLUGIN_CONFIG_KEY, UniverMobileUIPlugin, ZoomInput, bindFormatPainterCanvas, connectInjector, getEmbedBoundaryOwner, getEmbedChildUnitId, getMenuHiddenObservable, handleStringToStyle, imageMimeTypeSet, sanitizeParsedHtml, textTrim, useComponentsOfPart, useConfigValue, useDependency, useEvent, useObservable, useSidebarClick, useToolbarItemStatus, useVirtualList } from "@univerjs/ui";
-import { CURSOR_TYPE, DashedRect, DeviceInputEventType, DeviceType, FIX_ONE_PIXEL_BLUR_OFFSET, Group, IRenderManagerService, Layer, RENDER_CLASS_TYPE, RENDER_RAW_FORMULA_KEY, Rect, RegularPolygon, SHEET_EXTENSION_PREFIX, SHEET_VIEWPORT_KEY, ScrollBar, ScrollTimer, ScrollTimerType, Shape, SheetExtension, Spreadsheet, SpreadsheetColumnHeader, SpreadsheetRowHeader, TRANSFORM_CHANGE_OBSERVABLE_TYPE, UniverRenderEnginePlugin, Vector2, Viewport, calculateCellImageRect, cancelRequestFrame, convertTextRotation, convertTransformToOffsetX, convertTransformToOffsetY, fixLineWidthByScale, getCurrentTypeOfRenderer, getNextWheelZoomRatio, ptToPixel, requestNewFrame, withCurrentTypeOfRenderer } from "@univerjs/engine-render";
-import { BehaviorSubject, EMPTY, Observable, Subject, Subscription, combineLatest, combineLatestWith, distinctUntilChanged, filter, from, fromEvent, isObservable, map, merge as merge$1, of, shareReplay, skip, startWith, switchMap, takeUntil, throttleTime, withLatestFrom } from "rxjs";
+import { CURSOR_TYPE, DashedRect, DeviceInputEventType, DeviceType, FIX_ONE_PIXEL_BLUR_OFFSET, Group, IRenderManagerService, Layer, NORMAL_TEXT_SELECTION_PLUGIN_STYLE, RENDER_CLASS_TYPE, RENDER_RAW_FORMULA_KEY, Rect, RegularPolygon, SHEET_EXTENSION_PREFIX, SHEET_VIEWPORT_KEY, ScrollBar, ScrollTimer, ScrollTimerType, Shape, SheetExtension, Spreadsheet, SpreadsheetColumnHeader, SpreadsheetRowHeader, TRANSFORM_CHANGE_OBSERVABLE_TYPE, UniverRenderEnginePlugin, Vector2, Viewport, calculateCellImageRect, cancelRequestFrame, convertTextRotation, convertTransformToOffsetX, convertTransformToOffsetY, fixLineWidthByScale, getCurrentTypeOfRenderer, getNextWheelZoomRatio, ptToPixel, requestNewFrame, withCurrentTypeOfRenderer } from "@univerjs/engine-render";
+import { BehaviorSubject, EMPTY, Observable, Subject, Subscription, combineLatest, combineLatestWith, distinctUntilChanged, filter, from, fromEvent, isObservable, map, merge as merge$1, of, shareReplay, skip, startWith, switchMap, takeUntil, tap, throttleTime, withLatestFrom } from "rxjs";
 import { DocSelectionManagerService, DocSkeletonManagerService, DocStateChangeManagerService, InsertTextCommand, RichTextEditingMutation, SetTextSelectionsOperation, UniverDocsPlugin } from "@univerjs/docs";
 import { ObjectScope, UnitAction, UnitObject, UnitRole } from "@univerjs/protocol";
 import { ActionRow, Avatar, Button, Calendar, CascaderList, ColorPicker, ColorPickerPanel, ConfigContext, Confirm, Dropdown, DropdownMenu, FormLayout, Input, InputNumber, MessageType, MobileActionRow, MobileActionRowGroup, MobileColorPicker, MobileColorPresets, MobileConfirm, MobileDialog, MobileDropdown, MobileDropdownMenu, MobileSelect, Radio, RadioGroup, Select, Separator, Switch, TimeInput, Tooltip, borderBottomClassName, borderClassName, borderLeftClassName, borderRightClassName, borderTopClassName, clsx, resetButtonClassName, scrollbarClassName, useMobileKeyboardViewportLayout } from "@univerjs/design";
@@ -437,6 +437,15 @@ const SetColumnHeaderHeightCommand = {
 	}
 };
 
+//#endregion
+//#region src/common/selection-input.ts
+function isSheetContextMenuGesture(event, isMac, refSelectionsEnabled) {
+	return event.button === 2 || isMac && !refSelectionsEnabled && event.button === 0 && event.ctrlKey;
+}
+function isSheetMultiSelectModifier(event, isMac) {
+	return isMac ? event.metaKey : event.ctrlKey;
+}
+
 //#endregion
 //#region src/services/selection/selection-layer.ts
 var SelectionLayer = class extends Layer {
@@ -941,9 +950,15 @@ var BaseSelectionRenderService = class extends Disposable {
 			rangeWithCoord
 		};
 	}
+	_isContextMenuGesture(evt) {
+		return isSheetContextMenuGesture(evt, this._injector.get(IPlatformService).isMac, this.inRefSelectionMode());
+	}
+	_isMultiSelectModifier(evt) {
+		return isSheetMultiSelectModifier(evt, this._injector.get(IPlatformService).isMac);
+	}
 	_checkClearPreviousControls(evt) {
 		if (this.getSelectionControls().length === 0) return;
-		if (!evt.ctrlKey && !evt.metaKey && !evt.shiftKey && !this._remainLastEnabled || this._singleSelectionEnabled && !evt.shiftKey) this._clearAllSelectionControls();
+		if (this._isContextMenuGesture(evt) && !this.inRefSelectionMode() || !this._isMultiSelectModifier(evt) && !evt.shiftKey && !this._remainLastEnabled || this._singleSelectionEnabled && !evt.shiftKey) this._clearAllSelectionControls();
 	}
 	_makeSelectionByTwoCells(currentCell, startSelectionRange, skeleton, rangeType, activeControl) {
 		const { actualRow, actualColumn, mergeInfo: actualMergeInfo } = currentCell;
@@ -1849,6 +1864,7 @@ var SelectionShapeExtension = class {
 //#endregion
 //#region src/services/selection/selection-control.ts
 const SELECTION_TITLE_HIGHLIGHT_ALPHA = .3;
+const SELECTION_MOVE_DURATION = 120;
 /**
 * The main selection canvas component, includes leftControl,rightControl,topControl,bottomControl,backgroundControlTop,backgroundControlMiddleLeft,backgroundControlMiddleRight,backgroundControlBottom,fillControl
 */
@@ -1858,6 +1874,9 @@ var SelectionControl = class extends Disposable {
 		this._scene = _scene;
 		this._zIndex = _zIndex;
 		this._themeService = _themeService;
+		_defineProperty(this, "_moveAnimationFrame", -1);
+		_defineProperty(this, "_animatedRange", null);
+		_defineProperty(this, "_restoreMoveEvents", null);
 		_defineProperty(this, "_isHelperSelection", true);
 		_defineProperty(this, "_enableAutoFill", true);
 		_defineProperty(this, "_showAutoFill", false);
@@ -1969,6 +1988,7 @@ var SelectionControl = class extends Disposable {
 		scene.addObject(this._selectionShapeGroup, 1);
 		this.disposeWithMe(toDisposable(scene.onTransformChange$.subscribeEvent((state) => {
 			if (state.type !== TRANSFORM_CHANGE_OBSERVABLE_TYPE.scale) return;
+			this._stopMoveAnimation();
 			this._updateLayoutOfSelectionControl(this._currentStyle);
 			this._updateControlCoord();
 		})));
@@ -2131,6 +2151,11 @@ var SelectionControl = class extends Disposable {
 		if (this._controlExtension) this._controlExtension.setDisabled(disable);
 	}
 	setEvent(state) {
+		if (this._animatedRange) {
+			this._stopMoveAnimation();
+			this._updateLayoutOfSelectionControl();
+			this._updateControlCoord();
+		}
 		this.leftControl.evented = state;
 		this.rightControl.evented = state;
 		this.topControl.evented = state;
@@ -2157,7 +2182,7 @@ var SelectionControl = class extends Disposable {
 		autofillStrokeWidth /= scale < 1 ? 1 : scale;
 		const borderBuffer = SELECTION_CONTROL_BORDER_BUFFER_WIDTH / scale;
 		const fixOnePixelBlurOffset = FIX_ONE_PIXEL_BLUR_OFFSET / scale;
-		const { startX, startY, endX, endY } = this._selectionRenderModel;
+		const { startX, startY, endX, endY } = this._animatedRange ?? this._selectionRenderModel;
 		this.leftControl.transformByState({
 			height: endY - startY,
 			left: -leftAdjustWidth + fixOnePixelBlurOffset,
@@ -2238,19 +2263,20 @@ var SelectionControl = class extends Disposable {
 			this._autoFillControl.show();
 		} else this._autoFillControl.hide();
 		this._updateBackgroundControl(currentStyle);
-		this._updateHeaderBackground(currentStyle);
+		if (!this._animatedRange) this._updateHeaderBackground(currentStyle);
 		this._updateWidgets(currentStyle);
 	}
 	/**
 	* update selection control coordination by curr selection model
 	*/
 	_updateControlCoord() {
-		const { startX, startY } = this._selectionRenderModel;
+		const { startX, startY } = this._animatedRange ?? this._selectionRenderModel;
 		this.selectionShapeGroup.show();
 		this.selectionShapeGroup.translate(startX, startY);
 		this.selectionShapeGroup.makeDirtyNoDebounce(true);
 	}
 	updateStyle(style) {
+		this._stopMoveAnimation();
 		this._updateLayoutOfSelectionControl(style);
 		this._updateControlCoord();
 	}
@@ -2264,6 +2290,7 @@ var SelectionControl = class extends Disposable {
 	* @param primaryWithCoord
 	*/
 	updateRange(rangeWithCoord, primaryWithCoord) {
+		this._stopMoveAnimation();
 		this._selectionRenderModel.setValue(rangeWithCoord, primaryWithCoord);
 		this._showAutoFill = primaryWithCoord !== null;
 		this._updateLayoutOfSelectionControl();
@@ -2273,7 +2300,11 @@ var SelectionControl = class extends Disposable {
 	* Update range and primary range and style.
 	* @param selectionWthCoord
 	*/
-	updateRangeBySelectionWithCoord(selectionWthCoord, sk) {
+	updateRangeBySelectionWithCoord(selectionWthCoord, sk, animate = false) {
+		const previousRange = this._animatedRange ?? this.getRange();
+		const targetRange = selectionWthCoord.rangeWithCoord;
+		const rangeChanged = !Rectangle.equals(this.model, targetRange) || this.model.startX !== targetRange.startX || this.model.startY !== targetRange.startY || this.model.endX !== targetRange.endX || this.model.endY !== targetRange.endY;
+		if (animate || rangeChanged || selectionWthCoord.primaryWithCoord === null) this._stopMoveAnimation();
 		if (sk) {
 			this._rowHeaderWidth = sk.rowHeaderWidth;
 			this._columnHeaderHeight = sk.columnHeaderHeight;
@@ -2284,6 +2315,47 @@ var SelectionControl = class extends Disposable {
 		this._showAutoFill = selectionWthCoord.primaryWithCoord !== null;
 		this._updateLayoutOfSelectionControl(selectionWthCoord.style);
 		this._updateControlCoord();
+		if (animate && rangeChanged && !window.matchMedia("(prefers-reduced-motion: reduce)").matches) this._animateMove(previousRange);
+	}
+	_animateMove(from) {
+		const target = this.getRange();
+		const startedAt = Tools.now();
+		const eventedShapes = this.selectionShapeGroup.getObjects().filter((shape) => shape.evented);
+		eventedShapes.forEach((shape) => {
+			shape.evented = false;
+		});
+		this._restoreMoveEvents = () => eventedShapes.forEach((shape) => {
+			shape.evented = true;
+		});
+		this._animatedRange = from;
+		this._updateLayoutOfSelectionControl();
+		this._updateControlCoord();
+		const frame = () => {
+			const progress = Math.min(1, (Tools.now() - startedAt) / SELECTION_MOVE_DURATION);
+			const eased = 1 - (1 - progress) ** 3;
+			if (progress === 1) this._stopMoveAnimation();
+			this._animatedRange = progress < 1 ? {
+				...target,
+				startX: from.startX + (target.startX - from.startX) * eased,
+				startY: from.startY + (target.startY - from.startY) * eased,
+				endX: from.endX + (target.endX - from.endX) * eased,
+				endY: from.endY + (target.endY - from.endY) * eased
+			} : null;
+			this._updateLayoutOfSelectionControl();
+			this._updateControlCoord();
+			this._moveAnimationFrame = progress < 1 ? requestNewFrame(frame) : -1;
+		};
+		this._moveAnimationFrame = requestNewFrame(frame);
+	}
+	_stopMoveAnimation() {
+		var _this$_restoreMoveEve;
+		if (this._moveAnimationFrame !== -1) {
+			cancelRequestFrame(this._moveAnimationFrame);
+			this._moveAnimationFrame = -1;
+		}
+		this._animatedRange = null;
+		(_this$_restoreMoveEve = this._restoreMoveEvents) === null || _this$_restoreMoveEve === void 0 || _this$_restoreMoveEve.call(this);
+		this._restoreMoveEvents = null;
 	}
 	/**
 	* Update primary range.
@@ -2298,40 +2370,22 @@ var SelectionControl = class extends Disposable {
 		this._selectionRenderModel.setCurrentCell(primaryCell);
 	}
 	clearHighlight() {
+		this._stopMoveAnimation();
 		this._showAutoFill = false;
 		this._selectionRenderModel.clearCurrentCell();
 		this._updateLayoutOfSelectionControl(this._currentStyle);
+		this._updateControlCoord();
 	}
 	getScene() {
 		return this._scene;
 	}
 	dispose() {
-		var _this$_leftBorder, _this$_rightBorder, _this$_topBorder, _this$_bottomBorder, _this$_backgroundCont, _this$_backgroundCont2, _this$_backgroundCont3, _this$_backgroundCont4, _this$_selectionShape, _this$_rowHeaderBackg, _this$_rowHeaderBorde, _this$_rowHeaderGroup, _this$_rowHeaderBackg2, _this$_columnHeaderBa, _this$_columnHeaderBo, _this$_columnHeaderGr, _this$_topLeftWidget, _this$_topCenterWidge, _this$_topRightWidget, _this$_middleLeftWidg, _this$_middleRightWid, _this$_bottomLeftWidg, _this$_bottomCenterWi, _this$_bottomRightWid, _this$_controlExtensi;
-		(_this$_leftBorder = this._leftBorder) === null || _this$_leftBorder === void 0 || _this$_leftBorder.dispose();
-		(_this$_rightBorder = this._rightBorder) === null || _this$_rightBorder === void 0 || _this$_rightBorder.dispose();
-		(_this$_topBorder = this._topBorder) === null || _this$_topBorder === void 0 || _this$_topBorder.dispose();
-		(_this$_bottomBorder = this._bottomBorder) === null || _this$_bottomBorder === void 0 || _this$_bottomBorder.dispose();
-		(_this$_backgroundCont = this._backgroundControlTop) === null || _this$_backgroundCont === void 0 || _this$_backgroundCont.dispose();
-		(_this$_backgroundCont2 = this._backgroundControlMiddleLeft) === null || _this$_backgroundCont2 === void 0 || _this$_backgroundCont2.dispose();
-		(_this$_backgroundCont3 = this._backgroundControlMiddleRight) === null || _this$_backgroundCont3 === void 0 || _this$_backgroundCont3.dispose();
-		(_this$_backgroundCont4 = this._backgroundControlBottom) === null || _this$_backgroundCont4 === void 0 || _this$_backgroundCont4.dispose();
-		this._autoFillControl.dispose();
-		(_this$_selectionShape = this._selectionShapeGroup) === null || _this$_selectionShape === void 0 || _this$_selectionShape.dispose();
-		(_this$_rowHeaderBackg = this._rowHeaderBackground) === null || _this$_rowHeaderBackg === void 0 || _this$_rowHeaderBackg.dispose();
-		(_this$_rowHeaderBorde = this._rowHeaderBorder) === null || _this$_rowHeaderBorde === void 0 || _this$_rowHeaderBorde.dispose();
-		(_this$_rowHeaderGroup = this._rowHeaderGroup) === null || _this$_rowHeaderGroup === void 0 || _this$_rowHeaderGroup.dispose();
-		(_this$_rowHeaderBackg2 = this._rowHeaderBackground) === null || _this$_rowHeaderBackg2 === void 0 || _this$_rowHeaderBackg2.dispose();
-		(_this$_columnHeaderBa = this._columnHeaderBackground) === null || _this$_columnHeaderBa === void 0 || _this$_columnHeaderBa.dispose();
-		(_this$_columnHeaderBo = this._columnHeaderBorder) === null || _this$_columnHeaderBo === void 0 || _this$_columnHeaderBo.dispose();
-		(_this$_columnHeaderGr = this._columnHeaderGroup) === null || _this$_columnHeaderGr === void 0 || _this$_columnHeaderGr.dispose();
-		(_this$_topLeftWidget = this._topLeftWidget) === null || _this$_topLeftWidget === void 0 || _this$_topLeftWidget.dispose();
-		(_this$_topCenterWidge = this._topCenterWidget) === null || _this$_topCenterWidge === void 0 || _this$_topCenterWidge.dispose();
-		(_this$_topRightWidget = this._topRightWidget) === null || _this$_topRightWidget === void 0 || _this$_topRightWidget.dispose();
-		(_this$_middleLeftWidg = this._middleLeftWidget) === null || _this$_middleLeftWidg === void 0 || _this$_middleLeftWidg.dispose();
-		(_this$_middleRightWid = this._middleRightWidget) === null || _this$_middleRightWid === void 0 || _this$_middleRightWid.dispose();
-		(_this$_bottomLeftWidg = this._bottomLeftWidget) === null || _this$_bottomLeftWidg === void 0 || _this$_bottomLeftWidg.dispose();
-		(_this$_bottomCenterWi = this._bottomCenterWidget) === null || _this$_bottomCenterWi === void 0 || _this$_bottomCenterWi.dispose();
-		(_this$_bottomRightWid = this._bottomRightWidget) === null || _this$_bottomRightWid === void 0 || _this$_bottomRightWid.dispose();
+		var _this$_controlExtensi;
+		this._stopMoveAnimation();
+		this._stopAntLineAnimation();
+		this._selectionShapeGroup.dispose();
+		this._rowHeaderGroup.dispose();
+		this._columnHeaderGroup.dispose();
 		(_this$_controlExtensi = this._controlExtension) === null || _this$_controlExtensi === void 0 || _this$_controlExtensi.dispose();
 		super.dispose();
 		this._dispose$.next(this);
@@ -2431,12 +2485,12 @@ var SelectionControl = class extends Disposable {
 		this._rowHeaderGroup.makeDirty(true);
 	}
 	_updateBackgroundControl(style) {
-		const { startX, startY, endX, endY } = this._selectionRenderModel;
+		const { startX, startY, endX, endY } = this._animatedRange ?? this._selectionRenderModel;
 		const scale = this._getScale();
 		const { fill = style.fill } = style;
 		let { strokeWidth } = style;
 		strokeWidth /= scale;
-		const highlightSelection = this._selectionRenderModel.highlightToSelection();
+		const highlightSelection = this._animatedRange ?? this._selectionRenderModel.highlightToSelection();
 		if (!highlightSelection) {
 			this._backgroundControlTop.resize(endX - startX, endY - startY);
 			this._backgroundControlTop.setProps({ fill });
@@ -2497,7 +2551,7 @@ var SelectionControl = class extends Disposable {
 		this._backgroundControlBottom.setProps({ fill });
 	}
 	_updateWidgets(style) {
-		const { startX, startY, endX, endY } = this._selectionRenderModel;
+		const { startX, startY, endX, endY } = this._animatedRange ?? this._selectionRenderModel;
 		const { stroke = style.stroke, widgets = style.widgets, widgetStroke = style.widgetStroke } = style;
 		const scale = this._getScale();
 		let { widgetSize, widgetStrokeWidth } = style;
@@ -4621,6 +4675,19 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
 			const start = pasteTarget.pastedRange.rows[0];
 			const end = range.rows[range.rows.length - 1] - range.rows[0] + start;
 			pasteTarget.pastedRange.rows = Array.from(new Array(end + 1).keys()).slice(start);
+			if (!skipCellCopy) {
+				if (!await this._injector.get(SheetInterceptorService).beforeCommandExecute({
+					id: MoveRangeCommand.id,
+					params: {
+						fromUnitId: copyUnitId,
+						fromSubUnitId: copySubUnitId,
+						fromRange: discreteRangeToRange(range),
+						toUnitId: target.unitId,
+						toSubUnitId: target.subUnitId,
+						toRange: discreteRangeToRange(pasteTarget.pastedRange)
+					}
+				})) return false;
+			}
 		}
 		const pasteRes = this._pasteUSM({
 			cellMatrix,
@@ -4779,14 +4846,18 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
 		const pasteRangeStartColumn = cols[0];
 		const pasteRangeEndColumn = cols[cols.length - 1];
 		const needAutoHeight = [];
-		for (let r = pasteRangeStartRow; r <= pasteRangeEndRow; r++) if (!rowManager.getRow(r)) {
-			const autoHeight = skeleton.calculateAutoHeightInRange([{
-				startRow: r,
-				endRow: r,
-				startColumn: pasteRangeStartColumn,
-				endColumn: pasteRangeEndColumn
-			}]).filter((info) => info.autoHeight !== defaultRowHeight);
-			needAutoHeight.push(...autoHeight);
+		for (let r = pasteRangeStartRow; r <= pasteRangeEndRow; r++) {
+			const rowData = rowManager.getRow(r);
+			const hasLegacyManualHeight = (rowData === null || rowData === void 0 ? void 0 : rowData.ia) == null && (rowData === null || rowData === void 0 ? void 0 : rowData.ah) == null && typeof (rowData === null || rowData === void 0 ? void 0 : rowData.h) === "number";
+			if (!((rowData === null || rowData === void 0 ? void 0 : rowData.ia) === BooleanNumber.FALSE || hasLegacyManualHeight)) {
+				const autoHeight = skeleton.calculateAutoHeightInRange([{
+					startRow: r,
+					endRow: r,
+					startColumn: pasteRangeStartColumn,
+					endColumn: pasteRangeEndColumn
+				}]).filter((info) => info.autoHeight !== defaultRowHeight);
+				needAutoHeight.push(...autoHeight);
+			}
 		}
 		if (needAutoHeight.length > 0) {
 			const setWorksheetRowAutoHeightMutationParams = {
@@ -6947,6 +7018,30 @@ const SetFirstColumnFrozenCommand = {
 	}
 };
 
+//#endregion
+//#region src/config/config.ts
+const SHEETS_UI_PLUGIN_CONFIG_KEY = "sheets-ui.config";
+const configSymbol = Symbol(SHEETS_UI_PLUGIN_CONFIG_KEY);
+const defaultPluginConfig = {
+	allowArrowKeyWrapOnSheetBoundary: true,
+	formulaBar: true,
+	protectedRangeShadow: true,
+	maxAutoHeightCount: 1e3
+};
+/**
+* Convert the protectedRangeShadow config to shadow strategy
+* - true -> 'always'
+* - false -> 'none'
+* - string values remain unchanged
+* @param config The protectedRangeShadow config value
+* @returns The shadow strategy
+*/
+function convertToShadowStrategy(config) {
+	if (config === true) return "always";
+	if (config === false) return "none";
+	return config || "always";
+}
+
 //#endregion
 //#region src/services/select-all/select-all.service.ts
 var SelectAllService = class extends Disposable {
@@ -7040,7 +7135,9 @@ const MoveSelectionCommand = {
 			}
 		}
 		const startRange = getStartRange(range, primary, direction);
-		const next = jumpOver === 1 ? findNextGapRange(startRange, direction, worksheet) : findNextRange(startRange, direction, worksheet);
+		const config = accessor.get(IConfigService).getConfig(SHEETS_UI_PLUGIN_CONFIG_KEY);
+		const allowWrap = (config === null || config === void 0 ? void 0 : config.allowArrowKeyWrapOnSheetBoundary) ?? true;
+		const next = jumpOver === 1 ? findNextGapRange(startRange, direction, worksheet) : findNextRange(startRange, direction, worksheet, void 0, true, 1, allowWrap);
 		const destRange = getCellAtRowCol(next.startRow, next.startColumn, worksheet);
 		if (Rectangle.equals(destRange, startRange)) return false;
 		const unitId = workbook.getUnitId();
@@ -7163,13 +7260,7 @@ const MoveSelectionEnterAndTabCommand = {
 					keycode: KeyCode.TAB
 				});
 			}
-			/**
-			* The start range is from the primary selection range.
-			* If the edited cell is the last row/column of the worksheet, and the submitted operation is Enter/Tab to move down/right, the next selected cell should still be the current cell (not move to the first row/column of the worksheet).
-			*/
-			const isLastRowCell = keycode === KeyCode.ENTER && direction === Direction.DOWN && startRange.endRow === worksheet.getMaxRows() - 1;
-			const isLastColumnCell = keycode === KeyCode.TAB && direction === Direction.RIGHT && startRange.endColumn === worksheet.getMaxColumns() - 1;
-			const next = isLastRowCell || isLastColumnCell ? startRange : findNextRange(startRange, direction, worksheet);
+			const next = findNextRange(startRange, direction, worksheet, void 0, true, 1, false);
 			const destRange = getCellAtRowCol(next.startRow, next.startColumn, worksheet);
 			if (Rectangle.equals(destRange, startRange)) return false;
 			resultRange = {
@@ -7213,11 +7304,19 @@ const ExpandSelectionCommand = {
 		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService));
 		if (!target) return false;
 		const { worksheet, unitId, subUnitId } = target;
-		const selection = getSelectionsService(accessor).getCurrentLastSelection();
+		const selectionsService = getSelectionsService(accessor, params.fromCurrentSelection);
+		const selection = selectionsService.getCurrentLastSelection();
 		if (!selection) return false;
 		const { jumpOver, direction, extra } = params;
 		let { range: startRange, primary } = selection;
 		if (extra === "formula-editor") {
+			if (params.fromCurrentSelection && primary) startRange = {
+				startRow: primary.startRow,
+				endRow: primary.endRow,
+				startColumn: primary.startColumn,
+				endColumn: primary.endColumn,
+				rangeType: RANGE_TYPE.NORMAL
+			};
 			if (startRange.startRow === startRange.endRow && startRange.startColumn === startRange.endColumn) {
 				const mergedCell = worksheet.getMergedCell(startRange.startRow, startRange.startColumn);
 				if (mergedCell) startRange = {
@@ -7226,18 +7325,21 @@ const ExpandSelectionCommand = {
 				};
 			}
 			if (!primary) {
-				const lastSelectionPrimary = getSelectionsService(accessor).getCurrentLastSelectionPrimaryCell();
+				const lastSelectionPrimary = selectionsService.getCurrentLastSelectionPrimaryCell();
 				if (lastSelectionPrimary && Rectangle.contains(startRange, lastSelectionPrimary)) primary = lastSelectionPrimary;
 			}
 		}
-		const destRange = !checkIfShrink({
+		const isShrink = checkIfShrink({
 			range: startRange,
 			primary
-		}, direction, worksheet) ? jumpOver === 1 ? expandToNextGapRange(startRange, direction, worksheet) : expandToNextCell(startRange, direction, worksheet) : jumpOver === 1 ? shrinkToNextGapRange(startRange, {
+		}, direction, worksheet);
+		let destRange;
+		if (isShrink) destRange = jumpOver === 1 ? shrinkToNextGapRange(startRange, {
 			...Rectangle.clone(primary),
 			rangeType: RANGE_TYPE.NORMAL
 		}, direction, worksheet) : shrinkToNextCell(startRange, direction, worksheet);
-		destRange.rangeType = selection.range.rangeType;
+		else destRange = jumpOver === 1 ? expandToNextGapRange(startRange, direction, worksheet) : expandToNextCell(startRange, direction, worksheet);
+		destRange.rangeType = startRange.rangeType;
 		if (Rectangle.equals(destRange, startRange)) return false;
 		return accessor.get(ICommandService).syncExecuteCommand(SetSelectionsOperation.id, {
 			unitId,
@@ -8288,7 +8390,7 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
 	}
 	refreshEditCellPosition(resetSizeOnly) {
 		if (!this._currentEditCell || !this._currentEditCellState) return;
-		const { unitId, sheetId, primary, scene, engine } = this._currentEditCell;
+		const { unitId, sheetId, primary: selectedCell, scene, engine } = this._currentEditCell;
 		const workbook = this._getWorkbookForEditUnit(unitId);
 		if (!workbook || workbook.getUnitId() !== unitId) return;
 		const worksheet = workbook.getActiveSheet();
@@ -8296,6 +8398,7 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
 		if (!this._renderManagerService.getRenderUnitById(unitId)) return;
 		const skeleton = this._sheetSkeletonService.getSkeleton(unitId, sheetId);
 		if (!skeleton) return;
+		const primary = worksheet.getCellInfoInMergeData(selectedCell.actualRow, selectedCell.actualColumn);
 		const primaryWithCoord = attachPrimaryWithCoord(skeleton, primary);
 		const actualRangeWithCoord = convertCellToRange(primaryWithCoord);
 		const canvasOffset = getCanvasOffsetByEngine(engine);
@@ -8393,7 +8496,7 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
 	getLatestEditCellState() {
 		var _documentLayoutObject, _documentLayoutObject2;
 		if (!this._currentEditCell) return;
-		const { unitId, sheetId, primary, scene, engine } = this._currentEditCell;
+		const { unitId, sheetId, primary: selectedCell, scene, engine } = this._currentEditCell;
 		const workbook = this._getWorkbookForEditUnit(unitId);
 		if (!workbook || workbook.getUnitId() !== unitId) return;
 		const worksheet = workbook.getActiveSheet();
@@ -8401,6 +8504,7 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
 		if (!this._renderManagerService.getRenderUnitById(unitId)) return;
 		const skeleton = this._sheetSkeletonService.getSkeleton(unitId, sheetId);
 		if (!skeleton) return;
+		const primary = worksheet.getCellInfoInMergeData(selectedCell.actualRow, selectedCell.actualColumn);
 		const { startRow, startColumn } = primary;
 		const primaryWithCoord = attachPrimaryWithCoord(skeleton, primary);
 		const actualRangeWithCoord = convertCellToRange(primaryWithCoord);
@@ -8772,29 +8876,6 @@ const SetActivateCellEditOperation = {
 	}
 };
 
-//#endregion
-//#region src/config/config.ts
-const SHEETS_UI_PLUGIN_CONFIG_KEY = "sheets-ui.config";
-const configSymbol = Symbol(SHEETS_UI_PLUGIN_CONFIG_KEY);
-const defaultPluginConfig = {
-	formulaBar: true,
-	protectedRangeShadow: true,
-	maxAutoHeightCount: 1e3
-};
-/**
-* Convert the protectedRangeShadow config to shadow strategy
-* - true -> 'always'
-* - false -> 'none'
-* - string values remain unchanged
-* @param config The protectedRangeShadow config value
-* @returns The shadow strategy
-*/
-function convertToShadowStrategy(config) {
-	if (config === true) return "always";
-	if (config === false) return "none";
-	return config || "always";
-}
-
 //#endregion
 //#region src/commands/operations/cell-edit.operation.ts
 const SetCellEditVisibleOperation = {
@@ -10973,27 +11054,6 @@ function generateArrowSelectionShortCutItem() {
 			}
 		});
 	}
-	for (const [binding, macArrow, direction] of [[
-		KeyCode.HOME,
-		KeyCode.ARROW_LEFT,
-		Direction.LEFT
-	], [
-		KeyCode.END,
-		KeyCode.ARROW_RIGHT,
-		Direction.RIGHT
-	]]) for (const extend of [false, true]) {
-		const shift = extend ? MetaKeys.SHIFT : 0;
-		shortcutList.push({
-			id: extend ? MoveSelectionOperation.id : MoveCursorOperation.id,
-			binding: binding | shift,
-			mac: macArrow | MetaKeys.CTRL_COMMAND | shift,
-			preconditions: whenEditorDidNotInputFormulaActivated,
-			staticParameters: {
-				direction,
-				granularity: "line"
-			}
-		});
-	}
 	return shortcutList;
 }
 const StartEditWithF2Shortcut = {
@@ -11394,14 +11454,15 @@ function getPercentOffset(editCellState, dataStream) {
 }
 function getPercentEditorSelection(editCellState, visibleParam, dataStream) {
 	const percentOffset = getPercentOffset(editCellState, dataStream);
-	if (percentOffset == null) return null;
-	const { eventType, initialValue, keycode } = visibleParam;
-	if (eventType === DeviceInputEventType.Dblclick || eventType === DeviceInputEventType.Keyboard && keycode === KeyCode.F2) return {
+	if (percentOffset == null || visibleParam.eventType !== DeviceInputEventType.Keyboard) return null;
+	const { initialValue, keycode } = visibleParam;
+	if (isFormulaString(dataStream) && keycode === KeyCode.F2) return null;
+	if (keycode === KeyCode.F2) return {
 		startOffset: percentOffset,
 		endOffset: percentOffset,
 		collapsed: true
 	};
-	if (eventType !== DeviceInputEventType.Keyboard || keycode === KeyCode.BACKSPACE || keycode === KeyCode.DELETE || !/^\d/.test(initialValue ?? "")) return null;
+	if (keycode === KeyCode.BACKSPACE || keycode === KeyCode.DELETE || !/^\d/.test(initialValue ?? "")) return null;
 	return {
 		startOffset: 0,
 		endOffset: percentOffset,
@@ -11586,28 +11647,38 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 	*/
 	_commandExecutedListener(d) {
 		d.add(this._commandService.beforeCommandExecuted((command) => {
-			var _this$_getDocumentDat;
-			if (command.id !== InsertTextCommand.id) return;
-			const params = command.params;
+			var _this$_getDocumentDat, _pasteParams$doc$body, _this$_textSelectionM;
+			if (command.id !== InsertTextCommand.id && command.id !== InnerPasteCommand.id) return;
+			const insertParams = command.id === InsertTextCommand.id ? command.params : null;
+			const pasteParams = command.id === InnerPasteCommand.id ? command.params : null;
+			const unitId = (insertParams === null || insertParams === void 0 ? void 0 : insertParams.unitId) ?? (pasteParams === null || pasteParams === void 0 ? void 0 : pasteParams.unitId);
 			const visibleParam = this._editorBridgeService.isVisible();
 			const editCellState = this._editorBridgeService.getEditLocation();
-			if (params.unitId !== DOCS_NORMAL_EDITOR_UNIT_ID_KEY || !visibleParam.visible || editCellState == null) return;
+			if (unitId !== DOCS_NORMAL_EDITOR_UNIT_ID_KEY || !visibleParam.visible || editCellState == null) return;
 			const dataStream = (_this$_getDocumentDat = this._getDocumentDataModel()) === null || _this$_getDocumentDat === void 0 || (_this$_getDocumentDat = _this$_getDocumentDat.getBody()) === null || _this$_getDocumentDat === void 0 ? void 0 : _this$_getDocumentDat.dataStream;
 			if (dataStream == null) return;
 			const percentOffset = getPercentOffset(editCellState, dataStream);
-			if (percentOffset != null && !this._editorBridgeService.getEditorDirty() && visibleParam.eventType === DeviceInputEventType.Keyboard && /^\d/.test(visibleParam.initialValue ?? "") && /^\d/.test(params.body.dataStream)) {
-				params.range = {
-					startOffset: 0,
-					endOffset: percentOffset,
+			if (percentOffset == null) return;
+			if (insertParams && !this._editorBridgeService.getEditorDirty() && visibleParam.eventType === DeviceInputEventType.Keyboard && /^\d/.test(visibleParam.initialValue ?? "") && /^\d/.test(insertParams.body.dataStream)) insertParams.range = {
+				startOffset: 0,
+				endOffset: percentOffset + (insertParams.body.dataStream.endsWith("%") ? 1 : 0),
+				collapsed: false
+			};
+			const selectionParams = {
+				unitId,
+				subUnitId: unitId
+			};
+			const ranges = insertParams ? [insertParams.range] : this._textSelectionManagerService.getTextRanges(selectionParams);
+			const input = (insertParams === null || insertParams === void 0 ? void 0 : insertParams.body.dataStream) ?? (pasteParams === null || pasteParams === void 0 || (_pasteParams$doc$body = pasteParams.doc.body) === null || _pasteParams$doc$body === void 0 ? void 0 : _pasteParams$doc$body.dataStream);
+			if (!isFormulaString(dataStream) && (input === null || input === void 0 ? void 0 : input.endsWith("%")) && (ranges === null || ranges === void 0 ? void 0 : ranges.length) === 1 && ranges[0].endOffset === percentOffset && (!pasteParams || !((_this$_textSelectionM = this._textSelectionManagerService.getRectRanges(selectionParams)) === null || _this$_textSelectionM === void 0 ? void 0 : _this$_textSelectionM.length))) {
+				const range = {
+					...ranges[0],
+					endOffset: percentOffset + 1,
 					collapsed: false
 				};
-				return;
+				if (insertParams) insertParams.range = range;
+				else if (pasteParams) pasteParams.selections = [range];
 			}
-			if (percentOffset != null && params.body.dataStream === "%" && params.range.collapsed && params.range.startOffset === percentOffset && params.range.endOffset === percentOffset) params.range = {
-				...params.range,
-				endOffset: percentOffset + 1,
-				collapsed: false
-			};
 		}));
 		d.add(this._commandService.onCommandExecuted((command) => {
 			if (command.id === RichTextEditingMutation.id) {
@@ -11641,7 +11712,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		}));
 	}
 	_handleEditorVisible(param) {
-		var _this$_sheetCellEdito4, _documentDataModel$ge, _this$_renderManagerS5;
+		var _documentDataModel$ge, _this$_renderManagerS6;
 		const { eventType, keycode } = param;
 		this._cursorChange = eventType === DeviceInputEventType.PointerDown || eventType === DeviceInputEventType.Dblclick ? 2 : 1;
 		const editCellState = this._editorBridgeService.getEditLocation();
@@ -11660,21 +11731,25 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		this._editorBridgeService.refreshEditCellPosition(false);
 		const editorObject = this._getEditorObject();
 		if (editorObject == null) return;
-		const { document, scene } = editorObject;
+		const { document } = editorObject;
 		this._contextService.setContextValue(EDITOR_ACTIVATED, true);
 		const documentDataModel = this._getDocumentDataModel();
 		const skeleton = this._getEditorSkeleton(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 		if (!skeleton || !documentDataModel) return;
-		(_this$_sheetCellEdito4 = this._sheetCellEditorResizeService) === null || _this$_sheetCellEdito4 === void 0 || _this$_sheetCellEdito4.fitTextSize(() => {
-			const viewMain = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);
-			viewMain === null || viewMain === void 0 || viewMain.scrollToViewportPos({
-				viewportScrollX: Number.POSITIVE_INFINITY,
-				viewportScrollY: Number.POSITIVE_INFINITY
-			});
-		});
+		this._resizeEditorOnOpen(param, editorObject, !!isInArrayFormulaRange);
 		const clearAndEdit = () => {
+			const resetPointerSelection = isInArrayFormulaRange && eventType === DeviceInputEventType.PointerDown;
+			const editorId = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR) ? DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY : this._editorBridgeService.getCurrentEditorId();
+			if (resetPointerSelection) {
+				var _this$_renderManagerS5;
+				(_this$_renderManagerS5 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS5 === void 0 || _this$_renderManagerS5.with(DocSelectionRenderService).cancelPointerSelection();
+			}
 			this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
 			document.makeDirty();
+			if (resetPointerSelection) {
+				var _this$_getEditorSkele;
+				(_this$_getEditorSkele = this._getEditorSkeleton(editorId)) === null || _this$_getEditorSkele === void 0 || _this$_getEditorSkele.calculate();
+			}
 			if (keycode === KeyCode.BACKSPACE || eventType === DeviceInputEventType.Dblclick) {
 				skeleton.calculate();
 				this._editorBridgeService.changeEditorDirty(true);
@@ -11686,6 +11761,27 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 				unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
 				subUnitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY
 			});
+			if (resetPointerSelection && editorId !== DOCS_NORMAL_EDITOR_UNIT_ID_KEY) {
+				const selectionTarget = {
+					unitId: editorId,
+					subUnitId: editorId
+				};
+				const previousSelection = this._textSelectionManagerService.getSelectionInfo(selectionTarget);
+				this._textSelectionManagerService.replaceSelectionInfoWithoutRefresh({
+					textRanges: [{
+						startOffset: 0,
+						endOffset: 0,
+						collapsed: true,
+						isActive: true
+					}],
+					rectRanges: [],
+					segmentId: "",
+					segmentPage: -1,
+					style: (previousSelection === null || previousSelection === void 0 ? void 0 : previousSelection.style) ?? NORMAL_TEXT_SELECTION_PLUGIN_STYLE,
+					isEditing: true
+				}, selectionTarget);
+				this._textSelectionManagerService.refreshSelection(selectionTarget, true);
+			}
 		};
 		const replaceSelection = (selection) => {
 			this._textSelectionManagerService.replaceDocRanges([selection], {
@@ -11696,36 +11792,54 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		const percentSelection = getPercentEditorSelection(editCellState, param, (_documentDataModel$ge = documentDataModel.getBody()) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.dataStream);
 		const cellImage = isCellImage(documentDataModel.getSnapshot());
 		this._submitEmptyCellImageEdit = cellImage && eventType === DeviceInputEventType.Keyboard && keycode === KeyCode.BACKSPACE;
-		if (cellImage) clearAndEdit();
+		if (cellImage || isInArrayFormulaRange) clearAndEdit();
 		else if (eventType === DeviceInputEventType.Keyboard && keycode === KeyCode.F2) {
 			var _documentDataModel$ge2;
 			document.makeDirty();
-			this._textSelectionManagerService.replaceDocRanges([{
+			replaceSelection({
 				startOffset: 0,
-				endOffset: 0
-			}]);
+				endOffset: 0,
+				collapsed: true
+			});
 			const endOffset = (((_documentDataModel$ge2 = documentDataModel.getBody()) === null || _documentDataModel$ge2 === void 0 ? void 0 : _documentDataModel$ge2.dataStream.length) ?? 2) - 2;
-			if (percentSelection) replaceSelection(percentSelection);
-			else this._textSelectionManagerService.replaceDocRanges([{
+			replaceSelection(percentSelection ?? {
 				startOffset: endOffset,
-				endOffset
-			}], {
-				unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
-				subUnitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY
+				endOffset,
+				collapsed: true
 			});
-		} else if (eventType === DeviceInputEventType.Keyboard || eventType === DeviceInputEventType.Dblclick && isInArrayFormulaRange) {
+		} else if (eventType === DeviceInputEventType.Keyboard) {
 			if (percentSelection) replaceSelection(percentSelection);
 			else clearAndEdit();
 		} else if (eventType === DeviceInputEventType.Dblclick) {
 			if (this._contextService.getContextValue(FOCUSING_EDITOR_INPUT_FORMULA)) return;
-			const cursor = documentDataModel.getBody().dataStream.length - 2 || 0;
-			if (percentSelection) replaceSelection(percentSelection);
-			else this._textSelectionManagerService.replaceDocRanges([{
-				startOffset: cursor,
-				endOffset: cursor
-			}]);
+			const dataStream = documentDataModel.getBody().dataStream;
+			const endOffset = (!isFormulaString(dataStream) ? getPercentOffset(editCellState, dataStream) : null) ?? dataStream.length - 2;
+			replaceSelection({
+				startOffset: endOffset,
+				endOffset,
+				collapsed: true
+			});
 		}
-		(_this$_renderManagerS5 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS5 === void 0 || _this$_renderManagerS5.scene.resetCursor();
+		(_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS6 === void 0 || _this$_renderManagerS6.scene.resetCursor();
+	}
+	_resizeEditorOnOpen(param, editorObject, isInArrayFormulaRange) {
+		var _this$_sheetCellEdito4;
+		const pointerPosition = param.eventType === DeviceInputEventType.Dblclick ? param.pointerPosition : void 0;
+		(_this$_sheetCellEdito4 = this._sheetCellEditorResizeService) === null || _this$_sheetCellEdito4 === void 0 || _this$_sheetCellEdito4.fitTextSize(() => {
+			var _scene$getViewport;
+			if (pointerPosition && this._editorBridgeService.isVisible() !== param) return;
+			const { engine, scene } = editorObject;
+			(_scene$getViewport = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)) === null || _scene$getViewport === void 0 || _scene$getViewport.scrollToViewportPos({
+				viewportScrollX: pointerPosition ? 0 : Number.POSITIVE_INFINITY,
+				viewportScrollY: pointerPosition ? 0 : Number.POSITIVE_INFINITY
+			});
+			if (!pointerPosition || isInArrayFormulaRange) return;
+			const rect = engine.getCanvasElement().getBoundingClientRect();
+			if (rect.width > 0 && rect.height > 0) {
+				var _this$_renderManagerS7;
+				(_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS7 === void 0 || _this$_renderManagerS7.with(DocSelectionRenderService).setCursorManually((pointerPosition.x - rect.left) * engine.width / rect.width, (pointerPosition.y - rect.top) * engine.height / rect.height, true, true, { strict: false });
+			}
+		});
 	}
 	_cacheEmptyCellTextStyle() {
 		var _this$_editorBridgeSe, _sourceBody$textRuns;
@@ -11858,8 +11972,8 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		const editorUnitId = this._editorBridgeService.getCurrentEditorId();
 		if (editorUnitId == null || !this._editorService.isSheetEditor(editorUnitId)) return;
 		if (editorUnitId === DOCS_NORMAL_EDITOR_UNIT_ID_KEY) {
-			var _this$_getEditorSkele;
-			(_this$_getEditorSkele = this._getEditorSkeleton(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_getEditorSkele === void 0 || _this$_getEditorSkele.resetInitialWidth();
+			var _this$_getEditorSkele2;
+			(_this$_getEditorSkele2 = this._getEditorSkeleton(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_getEditorSkele2 === void 0 || _this$_getEditorSkele2.resetInitialWidth();
 		}
 		this._clearEditorHistory();
 	}
@@ -11925,12 +12039,12 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		return this._univerInstanceService.getUnit(DOCS_NORMAL_EDITOR_UNIT_ID_KEY, UniverInstanceType.UNIVER_DOC);
 	}
 	_getEditorSkeleton(editorId) {
-		var _this$_renderManagerS6;
-		return (_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS6 === void 0 ? void 0 : _this$_renderManagerS6.with(DocSkeletonManagerService).getSkeleton();
+		var _this$_renderManagerS8;
+		return (_this$_renderManagerS8 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS8 === void 0 ? void 0 : _this$_renderManagerS8.with(DocSkeletonManagerService).getSkeleton();
 	}
 	_getEditorViewModel(editorId) {
-		var _this$_renderManagerS7;
-		return (_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS7 === void 0 ? void 0 : _this$_renderManagerS7.with(DocSkeletonManagerService).getViewModel();
+		var _this$_renderManagerS9;
+		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(DocSkeletonManagerService).getViewModel();
 	}
 	_getEditingUnit() {
 		return this._editingUnit ? this._univerInstanceService.getUnit(this._editingUnit, UniverInstanceType.UNIVER_SHEET) : null;
@@ -13901,14 +14015,15 @@ let HoverManagerService = class HoverManagerService extends Disposable {
 			location: getLocationBase(activeCell.location)
 		});
 	}
-	triggerDbClick(unitId, offsetX, offsetY) {
+	triggerDbClick(unitId, event) {
 		const deps = this._getCalcDeps(unitId);
 		if (!deps) return;
 		const { currentRender, workbook, worksheet, skeletonParam } = deps;
-		const activeCell = this._calcActiveCell(currentRender, workbook, worksheet, skeletonParam, offsetX, offsetY);
+		const activeCell = this._calcActiveCell(currentRender, workbook, worksheet, skeletonParam, event.offsetX, event.offsetY);
 		if (activeCell) this._currentDbClickedCell$.next({
 			...activeCell,
-			location: getLocationBase(activeCell.location)
+			location: getLocationBase(activeCell.location),
+			event
 		});
 	}
 	triggerScroll() {
@@ -13978,7 +14093,7 @@ let HoverRenderController = class HoverRenderController extends Disposable {
 			if (!skeletonParam) return;
 			const { mainComponent, unitId, components } = this._context;
 			if (!mainComponent) return;
-			disposeSet.add(mainComponent.onPointerEnter$.subscribeEvent((evt) => {
+			disposeSet.add(mainComponent.onPointerEnter$.subscribeEvent(() => {
 				this._active = true;
 			}));
 			disposeSet.add(fromEventSubject(mainComponent.onPointerMove$).subscribe((evt) => {
@@ -13995,7 +14110,7 @@ let HoverRenderController = class HoverRenderController extends Disposable {
 				this._hoverManagerService.triggerClick(unitId, evt.offsetX, evt.offsetY);
 			}));
 			disposeSet.add(mainComponent.onDblclick$.subscribeEvent((evt) => {
-				this._hoverManagerService.triggerDbClick(unitId, evt.offsetX, evt.offsetY);
+				this._hoverManagerService.triggerDbClick(unitId, evt);
 			}));
 			disposeSet.add(mainComponent.onPointerLeave$.subscribeEvent(() => {
 				this._active = false;
@@ -17188,6 +17303,10 @@ const MoveRangeConfirmCommand = {
 	id: "sheet.command.move-range-confirm",
 	handler: async (accessor, params) => {
 		if (!params) return false;
+		if (!await accessor.get(SheetInterceptorService).beforeCommandExecute({
+			id: MoveRangeCommand.id,
+			params
+		})) return false;
 		const commandService = accessor.get(ICommandService);
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const sourceTarget = getSheetCommandTarget(univerInstanceService, {
@@ -19184,7 +19303,7 @@ function WrapTextMenuItemFactory(accessor) {
 			const disposable = accessor.get(ICommandService).onCommandExecuted((c) => {
 				var _selectionManagerServ14;
 				const id = c.id;
-				if (id !== SetTextWrapCommand.id && id !== SetSelectionsOperation.id && id !== SetWorksheetActiveOperation.id) return;
+				if (id !== SetRangeValuesMutation.id && id !== SetSelectionsOperation.id && id !== SetWorksheetActiveOperation.id) return;
 				const primary = (_selectionManagerServ14 = selectionManagerService.getCurrentLastSelection()) === null || _selectionManagerServ14 === void 0 ? void 0 : _selectionManagerServ14.primary;
 				let tb;
 				if (primary != null) {
@@ -19216,33 +19335,34 @@ function ShrinkToFitMenuItemFactory(accessor) {
 	const commandService = accessor.get(ICommandService);
 	const univerInstanceService = accessor.get(IUniverInstanceService);
 	const selectionManagerService = accessor.get(SheetsSelectionsService);
+	const style$ = deriveStateFromActiveSheet$(univerInstanceService, {}, ({ worksheet }) => new Observable((subscriber) => {
+		const update = () => {
+			var _selectionManagerServ16;
+			const primary = (_selectionManagerServ16 = selectionManagerService.getCurrentLastSelection()) === null || _selectionManagerServ16 === void 0 ? void 0 : _selectionManagerServ16.primary;
+			subscriber.next(primary != null ? worksheet.getComposedCellStyle(primary.startRow, primary.startColumn) ?? {} : {});
+		};
+		const disposable = commandService.onCommandExecuted((command) => {
+			if ([
+				SetRangeValuesMutation.id,
+				SetSelectionsOperation.id,
+				SetWorksheetActiveOperation.id
+			].includes(command.id)) update();
+		});
+		update();
+		return disposable.dispose;
+	}));
 	return {
 		id: SetShrinkToFitCommand.id,
 		type: MenuItemType.BUTTON,
 		icon: "ShrinkToFitIcon",
 		title: "sheets-ui.toolbar.shrinkToFit",
 		tooltip: "sheets-ui.toolbar.shrinkToFit",
-		activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable((subscriber) => {
-			const update = () => {
-				var _selectionManagerServ16, _worksheet$getCompose;
-				const primary = (_selectionManagerServ16 = selectionManagerService.getCurrentLastSelection()) === null || _selectionManagerServ16 === void 0 ? void 0 : _selectionManagerServ16.primary;
-				subscriber.next(primary != null && ((_worksheet$getCompose = worksheet.getComposedCellStyle(primary.startRow, primary.startColumn)) === null || _worksheet$getCompose === void 0 ? void 0 : _worksheet$getCompose.stf) === BooleanNumber.TRUE);
-			};
-			const disposable = commandService.onCommandExecuted((command) => {
-				if ([
-					SetRangeValuesMutation.id,
-					SetSelectionsOperation.id,
-					SetWorksheetActiveOperation.id
-				].includes(command.id)) update();
-			});
-			update();
-			return disposable.dispose;
-		})),
-		disabled$: getCurrentRangeDisable$(accessor, {
+		activated$: style$.pipe(map((style) => style.stf === BooleanNumber.TRUE && style.tb !== WrapStrategy.WRAP)),
+		disabled$: combineLatest([getCurrentRangeDisable$(accessor, {
 			workbookTypes: [WorkbookEditablePermission],
 			worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
 			rangeTypes: [RangeProtectionPermissionEditPoint]
-		}),
+		}), style$]).pipe(map(([disabled, style]) => disabled || style.tb === WrapStrategy.WRAP)),
 		hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)
 	};
 }
@@ -19400,6 +19520,15 @@ function PasteSpacialMenuItemFactory(accessor) {
 		hidden$: getObservableWithExclusiveRange$(accessor, getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET))
 	};
 }
+const PASTE_RIBBON_MENU_ID = "sheet.menu.paste";
+function PasteRibbonMenuItemFactory(accessor) {
+	return {
+		...PasteSpacialMenuItemFactory(accessor),
+		id: PASTE_RIBBON_MENU_ID,
+		title: "sheets-ui.rightClick.paste",
+		hidden$: combineLatest([getObservableWithExclusiveRange$(accessor, getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)), accessor.get(IContextService).subscribeContextValue$(FOCUSING_SHAPE_TEXT_EDITOR).pipe(startWith(false))]).pipe(map(([hidden, editing]) => hidden || editing))
+	};
+}
 function PasteValueMenuItemFactory(accessor) {
 	return {
 		id: SheetPasteValueCommand.id,
@@ -20325,6 +20454,39 @@ function ZoomRatioMenuItemFactory(accessor) {
 //#region src/menu/schema.ts
 const menuSchema = {
 	[RibbonPosition.START]: {
+		[RibbonStartGroup.HISTORY]: { [PASTE_RIBBON_MENU_ID]: {
+			order: 4,
+			gridLayout: {
+				row: 1,
+				column: 3,
+				rowSpan: 2,
+				showLabel: true
+			},
+			menuItemFactory: PasteRibbonMenuItemFactory,
+			[SheetPasteCommand.name]: {
+				order: 0,
+				menuItemFactory: (accessor) => ({
+					...PasteMenuItemFactory(accessor),
+					icon: void 0
+				})
+			},
+			[SheetPasteValueCommand.id]: {
+				order: 1,
+				menuItemFactory: PasteValueMenuItemFactory
+			},
+			[SheetPasteFormatCommand.id]: {
+				order: 2,
+				menuItemFactory: PasteFormatMenuItemFactory
+			},
+			[SheetPasteColWidthCommand.id]: {
+				order: 3,
+				menuItemFactory: PasteColWidthMenuItemFactory
+			},
+			[SheetPasteBesidesBorderCommand.id]: {
+				order: 4,
+				menuItemFactory: PasteBesidesBorderMenuItemFactory
+			}
+		} },
 		[RibbonStartGroup.FORMAT]: {
 			[SetRangeFontFamilyCommand.id]: {
 				order: 1,
@@ -21051,14 +21213,12 @@ function useWorkbooks() {
 
 //#endregion
 //#region src/views/editor-container/focus-editor.ts
-const SHEET_CELL_EDITOR_ELEMENT_ID = `__editor_${DOCS_NORMAL_EDITOR_UNIT_ID_KEY}`;
-const SHEET_CELL_EDITOR_SELECTION_CONTAINER_ID = `univer-doc-selection-container-${DOCS_NORMAL_EDITOR_UNIT_ID_KEY}`;
-function focusSheetCellEditorElement(ownerDocument = document) {
-	const element = ownerDocument.getElementById(SHEET_CELL_EDITOR_ELEMENT_ID);
-	if (element == null || ownerDocument.activeElement === element) return false;
-	if (!element.hasAttribute("tabindex")) element.tabIndex = -1;
-	element.focus({ preventScroll: true });
-	return ownerDocument.activeElement === element;
+function focusSheetCellEditorElement(editorService) {
+	var _editorService$getEdi;
+	const selection = (_editorService$getEdi = editorService.getEditor(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _editorService$getEdi === void 0 ? void 0 : _editorService$getEdi.docSelectionRenderService;
+	if (!selection || selection.isFocusing) return false;
+	selection.focus();
+	return selection.isFocusing;
 }
 function registerSheetCellEditorRuntimePortal(options) {
 	const ownerDocument = options.ownerDocument ?? (typeof document === "undefined" ? void 0 : document);
@@ -21071,8 +21231,10 @@ function registerSheetCellEditorRuntimePortal(options) {
 	const frameHandles = [];
 	let observer;
 	const tryRegister = () => {
+		var _options$editorServic;
 		if (disposed) return;
-		const portalRoot = resolveSheetCellEditorPortalRoot(ownerDocument);
+		const selection = (_options$editorServic = options.editorService.getEditor(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _options$editorServic === void 0 ? void 0 : _options$editorServic.docSelectionRenderService;
+		const portalRoot = (selection === null || selection === void 0 ? void 0 : selection.selectionContainer.isConnected) ? selection.selectionContainer : null;
 		if (portalRoot === registeredPortalRoot) return;
 		portalRegistration === null || portalRegistration === void 0 || portalRegistration.dispose();
 		portalRegistration = void 0;
@@ -21087,7 +21249,7 @@ function registerSheetCellEditorRuntimePortal(options) {
 				role: "child-editor",
 				element: portalRoot
 			}));
-			const editorElement = ownerDocument.getElementById(SHEET_CELL_EDITOR_ELEMENT_ID);
+			const editorElement = selection === null || selection === void 0 ? void 0 : selection.inputElement;
 			if (editorElement && editorElement !== portalRoot) rootRegistration.add(options.focusCoordinator.registerElement({
 				embedId: options.embedId,
 				role: "child-editor",
@@ -21130,9 +21292,6 @@ function registerSheetCellEditorRuntimePortal(options) {
 	}));
 	return collection;
 }
-function resolveSheetCellEditorPortalRoot(ownerDocument = document) {
-	return ownerDocument.getElementById(SHEET_CELL_EDITOR_SELECTION_CONTAINER_ID) ?? ownerDocument.getElementById(SHEET_CELL_EDITOR_ELEMENT_ID);
-}
 
 //#endregion
 //#region src/views/editor-container/hooks.ts
@@ -21202,19 +21361,6 @@ const EDITOR_DEFAULT_POSITION = {
 };
 const CELL_EDITOR_DARK_SURFACE_THEME_COLOR = "gray.800";
 const CELL_EDITOR_LIGHT_SURFACE_THEME_COLOR = "gray.0";
-/**
-* @returns the host background color for the cell editor.
-*/
-function getCellEditorHostBackgroundColor(editState, options = {}) {
-	var _options$getColorFrom;
-	const cellFill = editState === null || editState === void 0 ? void 0 : editState.documentLayoutObject.fill;
-	if (cellFill && !isTransparentColor(cellFill)) return cellFill;
-	return (_options$getColorFrom = options.getColorFromTheme) === null || _options$getColorFrom === void 0 ? void 0 : _options$getColorFrom.call(options, options.darkMode ? CELL_EDITOR_DARK_SURFACE_THEME_COLOR : CELL_EDITOR_LIGHT_SURFACE_THEME_COLOR);
-}
-function isTransparentColor(color) {
-	const normalizedColor = color.trim().toLowerCase().replace(/\s+/g, "");
-	return normalizedColor === "transparent" || normalizedColor === "rgba(0,0,0,0)";
-}
 function shouldRefocusCellEditorAfterPointerDown(options) {
 	const { root, target, activeElement, isEditorFocusing } = options;
 	if (!root || !(target instanceof HTMLElement) || !(activeElement instanceof HTMLElement)) return true;
@@ -21279,10 +21425,13 @@ function EditorContainer({ hidden = false }) {
 	const workbook = editState ? instanceService.getUnit(editState.unitId, UniverInstanceType.UNIVER_SHEET) ?? null : null;
 	const activeSheet = useActiveWorksheet(workbook);
 	const darkMode = useObservable(themeService.darkMode$, themeService.darkMode);
+	const cellFill = editState === null || editState === void 0 ? void 0 : editState.documentLayoutObject.fill;
+	const normalizedFill = cellFill === null || cellFill === void 0 ? void 0 : cellFill.trim().toLowerCase().replace(/\s+/g, "");
+	const editorBackgroundColor = cellFill && normalizedFill !== "transparent" && normalizedFill !== "rgba(0,0,0,0)" ? cellFill : themeService.getColorFromTheme(darkMode ? CELL_EDITOR_DARK_SURFACE_THEME_COLOR : CELL_EDITOR_LIGHT_SURFACE_THEME_COLOR);
 	const [showEditCellAddress, setShowEditCellAddress] = useState(false);
 	const editSheetName = editState ? workbook === null || workbook === void 0 || (_workbook$getSheetByS = workbook.getSheetBySheetId(editState.sheetId)) === null || _workbook$getSheetByS === void 0 ? void 0 : _workbook$getSheetByS.getName() : null;
 	const editCellAddress = editState ? `${activeSheet && editSheetName && activeSheet.getSheetId() !== editState.sheetId ? `'${quoteSheetName(editSheetName)}'!` : ""}${numberToABC(editState.column)}${editState.row + 1}` : null;
-	const editorBorderColor = genNormalSelectionStyle(themeService).stroke;
+	const { stroke: editorBorderColor, strokeWidth: editorBorderWidth } = genNormalSelectionStyle(themeService);
 	const focusCoordinator = injector.has(ISheetEmbedRuntimeFocusCoordinator) ? injector.get(ISheetEmbedRuntimeFocusCoordinator) : void 0;
 	const resolveRuntimeFocusState = () => {
 		var _instanceService$getF;
@@ -21371,21 +21520,18 @@ function EditorContainer({ hidden = false }) {
 		const focusCellEditorElement = () => {
 			const scope = rootRef.current ? resolveSheetEmbedRuntimeDomScope(rootRef.current) ?? resolveActiveSheetEmbedRuntimeDomScope(ownerDocument) : resolveActiveSheetEmbedRuntimeDomScope(ownerDocument);
 			if (shouldPreserveEmbedInteractiveFocus(scope === null || scope === void 0 ? void 0 : scope.embedId, ownerDocument)) return;
-			focusSheetCellEditorElement(ownerDocument);
+			focusSheetCellEditorElement(editorService);
 			if (delayedFocusTimer != null) ownerWindow.clearTimeout(delayedFocusTimer);
 			delayedFocusTimer = ownerWindow.setTimeout(() => {
 				delayedFocusTimer = void 0;
 				if (shouldPreserveEmbedInteractiveFocus(scope === null || scope === void 0 ? void 0 : scope.embedId, ownerDocument)) return;
-				focusSheetCellEditorElement(ownerDocument);
+				focusSheetCellEditorElement(editorService);
 			}, 0);
 		};
 		const focusEditor = () => {
 			if (contextService.getContextValue(FOCUSING_FX_BAR_EDITOR)) return;
 			const scope = rootRef.current ? resolveSheetEmbedRuntimeDomScope(rootRef.current) ?? resolveActiveSheetEmbedRuntimeDomScope(ownerDocument) : resolveActiveSheetEmbedRuntimeDomScope(ownerDocument);
 			if (shouldPreserveEmbedControlFocus(scope === null || scope === void 0 ? void 0 : scope.embedId, ownerDocument)) return;
-			const editor = editorService.getEditor(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
-			const docSelectionRenderService = editor === null || editor === void 0 ? void 0 : editor.render.with(DocSelectionRenderService);
-			if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
 			focusCellEditorElement();
 		};
 		focusEditor();
@@ -21437,6 +21583,7 @@ function EditorContainer({ hidden = false }) {
 			element: editorRoot
 		}));
 		collection.add(registerSheetCellEditorRuntimePortal({
+			editorService,
 			embedId: scope.embedId,
 			ownerDocument: rootRef.current.ownerDocument,
 			interactionBoundaryService,
@@ -21447,10 +21594,7 @@ function EditorContainer({ hidden = false }) {
 			let pointerRetryFrame = 0;
 			const focusEditor = () => {
 				if (contextService.getContextValue(FOCUSING_FX_BAR_EDITOR) || shouldPreserveEmbedControlFocus(scope.embedId, ownerDocument)) return;
-				const editor = editorService.getEditor(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
-				const docSelectionRenderService = editor === null || editor === void 0 ? void 0 : editor.render.with(DocSelectionRenderService);
-				if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
-				focusSheetCellEditorElement(ownerDocument);
+				focusSheetCellEditorElement(editorService);
 			};
 			const refocusEditorAfterRuntimePointer = (event) => {
 				if (!focusCoordinator.isChildUnitRuntimeEvent(scope.childUnitId, event.target, event) || isEmbedRuntimeEditorOrPopup(event.target)) return;
@@ -21485,6 +21629,7 @@ function EditorContainer({ hidden = false }) {
 		const ownerDocument = ((_rootRef$current2 = rootRef.current) === null || _rootRef$current2 === void 0 ? void 0 : _rootRef$current2.ownerDocument) ?? document;
 		const interactionBoundaryService = injector.has(ISheetEmbedInteractionBoundaryService) ? injector.get(ISheetEmbedInteractionBoundaryService) : void 0;
 		const portalRegistration = registerSheetCellEditorRuntimePortal({
+			editorService,
 			embedId: activeSessionScope.embedId,
 			ownerDocument,
 			interactionBoundaryService,
@@ -21494,12 +21639,12 @@ function EditorContainer({ hidden = false }) {
 		let delayedFocusTimer;
 		const focusCellEditorElement = () => {
 			if (shouldPreserveEmbedInteractiveFocus(activeSessionScope.embedId, ownerDocument)) return;
-			focusSheetCellEditorElement(ownerDocument);
+			focusSheetCellEditorElement(editorService);
 			if (delayedFocusTimer != null) ownerWindow.clearTimeout(delayedFocusTimer);
 			delayedFocusTimer = ownerWindow.setTimeout(() => {
 				delayedFocusTimer = void 0;
 				if (shouldPreserveEmbedInteractiveFocus(activeSessionScope.embedId, ownerDocument)) return;
-				focusSheetCellEditorElement(ownerDocument);
+				focusSheetCellEditorElement(editorService);
 			}, 0);
 		};
 		const focusHiddenEditor = () => {
@@ -21547,9 +21692,9 @@ function EditorContainer({ hidden = false }) {
 		visible === null || visible === void 0 ? void 0 : visible.visible
 	]);
 	useEffect(() => {
+		var _rootRef$current3;
+		const ownerWindow = (_rootRef$current3 = rootRef.current) === null || _rootRef$current3 === void 0 ? void 0 : _rootRef$current3.ownerDocument.defaultView;
 		return () => {
-			var _rootRef$current3;
-			const ownerWindow = (_rootRef$current3 = rootRef.current) === null || _rootRef$current3 === void 0 ? void 0 : _rootRef$current3.ownerDocument.defaultView;
 			if (ownerWindow && pointerRefocusTimerRef.current != null) ownerWindow.clearTimeout(pointerRefocusTimerRef.current);
 		};
 	}, []);
@@ -21571,12 +21716,11 @@ function EditorContainer({ hidden = false }) {
 		if (pointerRefocusTimerRef.current != null) ownerWindow.clearTimeout(pointerRefocusTimerRef.current);
 		pointerRefocusTimerRef.current = ownerWindow.setTimeout(() => {
 			pointerRefocusTimerRef.current = void 0;
-			if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
-			focusSheetCellEditorElement(ownerDocument);
+			focusSheetCellEditorElement(editorService);
 		}, 0);
 	});
 	const handleClickSideBar = useEvent(() => {
-		if (editorBridgeService.isVisible().visible) commandService.executeCommand(SetCellEditVisibleOperation.id, {
+		if (editorBridgeService.isVisible().visible) return commandService.executeCommand(SetCellEditVisibleOperation.id, {
 			visible: false,
 			eventType: DeviceInputEventType.PointerUp,
 			unitId: editState === null || editState === void 0 ? void 0 : editState.unitId
@@ -21585,7 +21729,7 @@ function EditorContainer({ hidden = false }) {
 	useSidebarClick(handleClickSideBar);
 	const keyCodeConfig = useKeyEventConfig(editState === null || editState === void 0 ? void 0 : editState.unitId);
 	const onMoveInEditor = useEvent((keycode, metaKey) => {
-		commandService.executeCommand(SetCellEditVisibleArrowOperation.id, {
+		return commandService.executeCommand(SetCellEditVisibleArrowOperation.id, {
 			keycode,
 			visible: false,
 			eventType: DeviceInputEventType.Keyboard,
@@ -21605,41 +21749,51 @@ function EditorContainer({ hidden = false }) {
 			height: state.height,
 			opacity: hidden ? 0 : void 0,
 			pointerEvents: hidden ? "none" : void 0,
-			backgroundColor: getCellEditorHostBackgroundColor(editState, {
-				darkMode,
-				getColorFromTheme: themeService.getColorFromTheme.bind(themeService)
-			})
+			backgroundColor: editorBackgroundColor
 		},
-		children: [(visible === null || visible === void 0 ? void 0 : visible.visible) && showEditCellAddress && editCellAddress && /* @__PURE__ */ jsx("div", {
-			"data-u-comp": "sheet-cell-editor-address",
-			className: "univer-pointer-events-none univer-absolute univer-left-0 univer-top-0 univer-z-10 univer-whitespace-nowrap univer-rounded-t univer-px-1.5 univer-text-xs univer-leading-5",
-			style: {
-				backgroundColor: editorBorderColor,
-				color: themeService.getColorFromTheme("gray.0"),
-				transform: "translateY(-100%)"
-			},
-			children: editCellAddress
-		}), FormulaEditor && /* @__PURE__ */ jsx(FormulaEditor, {
-			editorId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
-			className: "univer-relative univer-flex univer-size-full [&_canvas]:univer-absolute",
-			initValue: "",
-			onChange: () => {},
-			isFocus: !hidden && (visible === null || visible === void 0 ? void 0 : visible.visible),
-			unitId: editState === null || editState === void 0 ? void 0 : editState.unitId,
-			subUnitId: editState === null || editState === void 0 ? void 0 : editState.sheetId,
-			keyboardEventConfig: keyCodeConfig,
-			onMoveInEditor,
-			isSupportAcrossSheet: true,
-			resetSelectionOnBlur: false,
-			isSingle: false,
-			autoScrollbar: false,
-			onFormulaSelectingChange: (isSelecting) => {
-				if (isSelecting) editorBridgeService.enableForceKeepVisible();
-				else editorBridgeService.disableForceKeepVisible();
-			},
-			disableContextMenu: false,
-			canvasStyle: { backgroundColor: "transparent" }
-		})]
+		children: [
+			(visible === null || visible === void 0 ? void 0 : visible.visible) && showEditCellAddress && editCellAddress && /* @__PURE__ */ jsx("div", {
+				"data-u-comp": "sheet-cell-editor-address",
+				className: "univer-pointer-events-none univer-absolute univer-left-0 univer-top-0 univer-z-10 univer-whitespace-nowrap univer-rounded-t univer-px-1.5 univer-text-xs univer-leading-5",
+				style: {
+					backgroundColor: editorBorderColor,
+					color: themeService.getColorFromTheme("gray.0"),
+					transform: "translateY(-100%)"
+				},
+				children: editCellAddress
+			}),
+			FormulaEditor && /* @__PURE__ */ jsx(FormulaEditor, {
+				editorId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
+				className: "univer-relative univer-flex univer-size-full [&_canvas]:univer-absolute",
+				initValue: "",
+				onChange: () => {},
+				isFocus: !hidden && (visible === null || visible === void 0 ? void 0 : visible.visible),
+				unitId: editState === null || editState === void 0 ? void 0 : editState.unitId,
+				subUnitId: editState === null || editState === void 0 ? void 0 : editState.sheetId,
+				keyboardEventConfig: keyCodeConfig,
+				onMoveInEditor,
+				isSupportAcrossSheet: true,
+				resetSelectionOnBlur: false,
+				isSingle: false,
+				autoScrollbar: false,
+				borderless: true,
+				onFormulaSelectingChange: (isSelecting) => {
+					if (isSelecting) editorBridgeService.enableForceKeepVisible();
+					else editorBridgeService.disableForceKeepVisible();
+				},
+				disableContextMenu: false,
+				canvasStyle: { backgroundColor: "transparent" }
+			}),
+			(visible === null || visible === void 0 ? void 0 : visible.visible) && /* @__PURE__ */ jsx("div", {
+				"aria-hidden": true,
+				className: "univer-pointer-events-none univer-absolute univer-left-0 univer-top-0 univer-z-10 univer-box-border",
+				style: {
+					width: state.width + editorBorderWidth,
+					height: state.height + editorBorderWidth,
+					border: `${editorBorderWidth}px solid ${editorBorderColor}`
+				}
+			})
+		]
 	});
 }
 
@@ -21684,7 +21838,7 @@ function getAbsoluteRefStringFromSelection(workbook, selections, lexerTreeBuilde
 
 //#endregion
 //#region src/views/defined-name/DefinedNameOverlay.tsx
-function DefinedNameOverlay({ search, isInputEvent }) {
+function DefinedNameOverlay({ search, isInputEvent, onClose }) {
 	const commandService = useDependency(ICommandService);
 	const localeService = useDependency(LocaleService);
 	const definedNamesService = useDependency(IDefinedNamesService);
@@ -21728,8 +21882,9 @@ function DefinedNameOverlay({ search, isInputEvent }) {
 		itemHeight: 30,
 		overscan: 6
 	});
-	const openSlider = () => {
-		commandService.executeCommand(SidebarDefinedNameOperation.id, { value: "open" });
+	const openSlider = async () => {
+		onClose();
+		await commandService.executeCommand(SidebarDefinedNameOperation.id, { value: "open" });
 	};
 	const focusDefinedName = async (definedName) => {
 		const { formulaOrRefString, id } = definedName;
@@ -21754,8 +21909,9 @@ function DefinedNameOverlay({ search, isInputEvent }) {
 				children: virtualDefinedNames.map(({ data: definedName, index }) => {
 					return /* @__PURE__ */ jsx("li", {
 						className: "univer-cursor-pointer univer-px-2 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-600",
-						onClick: () => {
-							focusDefinedName(definedName);
+						onClick: async () => {
+							onClose();
+							await focusDefinedName(definedName);
 						},
 						children: /* @__PURE__ */ jsxs("div", {
 							"data-u-comp": "defined-name-overlay-row",
@@ -21809,6 +21965,7 @@ function DefinedName({ disable }) {
 	const themeService = useDependency(ThemeService);
 	const [open, setOpen] = useState(false);
 	const [isInputEvent, setIsInputEvent] = useState(false);
+	const nameBoxRef = useRef(null);
 	const inputRef = useRef(null);
 	const getDefinedNameMap = () => {
 		const definedNameMap = definedNamesService.getDefinedNameMap(unitId);
@@ -21961,6 +22118,7 @@ function DefinedName({ disable }) {
 		return selections;
 	}
 	return /* @__PURE__ */ jsxs("div", {
+		ref: nameBoxRef,
 		"data-u-comp": "defined-name",
 		className: "univer-relative univer-box-border univer-flex univer-h-full univer-w-24 univer-border-r-gray-200 univer-py-1.5 univer-transition-all",
 		children: [/* @__PURE__ */ jsx("input", {
@@ -21972,11 +22130,14 @@ function DefinedName({ disable }) {
 			onKeyDown: handleKeyDown,
 			onBlur: () => setIsInputEvent(false)
 		}), /* @__PURE__ */ jsx(Dropdown, {
+			align: "start",
+			anchorRef: nameBoxRef,
 			overlay: /* @__PURE__ */ jsx("div", {
 				className: "univer-z-[1001]",
 				children: /* @__PURE__ */ jsx(DefinedNameOverlay, {
 					search: inputValue,
-					isInputEvent
+					isInputEvent,
+					onClose: () => setOpen(false)
 				})
 			}),
 			disabled: disable,
@@ -24854,7 +25015,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.0.2";
+var version = "1.0.4";
 
 //#endregion
 //#region src/views/cell-popup/config.ts
@@ -25481,16 +25642,20 @@ let FormatPainterController = class FormatPainterController extends Disposable {
 	_initialize() {
 		this._addDefaultHook();
 		const session = this._injector.get(FormatPainterSessionService);
+		let disabled = true;
+		const disabled$ = this._injector.invoke(ClearSelectionFormatMenuItemFactory).disabled$;
 		this.disposeWithMe(session.register({
 			id: "sheet-cells",
 			priority: 0,
 			clear: () => this._commandService.executeCommand(ClearSelectionFormatCommand.id),
-			changes$: this._selectionManagerService.selectionMoveEnd$,
+			changes$: disabled$.pipe(tap((value) => {
+				disabled = value;
+			})),
 			isActive: () => {
 				var _this$_univerInstance;
 				return ((_this$_univerInstance = this._univerInstanceService.getFocusedUnit()) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.type) === UniverInstanceType.UNIVER_SHEET;
 			},
-			canStart: () => !!this._selectionManagerService.getCurrentLastSelection(),
+			canStart: () => !disabled && !!this._selectionManagerService.getCurrentLastSelection(),
 			capture: () => {
 				const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 				const format = this._collectSelectionRangeFormat();
@@ -26428,6 +26593,66 @@ const BorderDashed = ({ className }) => /* @__PURE__ */ jsxs("svg", {
 	]
 });
 
+//#endregion
+//#region src/views/border-panel/border-line/icons/BorderDotted.tsx
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+const BorderDotted = ({ className }) => /* @__PURE__ */ jsxs("svg", {
+	className,
+	width: "120",
+	height: "2",
+	viewBox: "0 0 120 2",
+	fill: "none",
+	xmlns: "http://www.w3.org/2000/svg",
+	children: [
+		/* @__PURE__ */ jsx("path", { d: "M0.491699 1.69537H1.4917V0.695374H0.491699V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M4.2981 1.69537H5.2981V0.695374H4.2981V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M9.10449 1.69537H8.10449V0.695374H9.10449V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M11.9109 1.69537H12.9109V0.695374H11.9109V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M16.7173 1.69537H15.7173V0.695374H16.7173V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M19.5237 1.69537H20.5237V0.695374H19.5237V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M24.3301 1.69537H23.3301V0.695374H24.3301V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M27.1365 1.69537H28.1365V0.695374H27.1365V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M31.9429 1.69537H30.9429V0.695374H31.9429V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M34.7493 1.69537H35.7493V0.695374H34.7493V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M39.5557 1.69537H38.5557V0.695374H39.5557V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M42.3621 1.69537H43.3621V0.695374H42.3621V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M47.1685 1.69537H46.1685V0.695374H47.1685V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M49.9749 1.69537H50.9749V0.695374H49.9749V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M54.7812 1.69537H53.7812V0.695374H54.7812V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M57.5876 1.69537H58.5876V0.695374H57.5876V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M62.394 1.69537H61.394V0.695374H62.394V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M65.2004 1.69537H66.2004V0.695374H65.2004V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M70.0068 1.69537H69.0068V0.695374H70.0068V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M72.8132 1.69537H73.8132V0.695374H72.8132V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M77.6196 1.69537H76.6196V0.695374H77.6196V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M80.426 1.69537H81.426V0.695374H80.426V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M85.2324 1.69537H84.2324V0.695374H85.2324V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M88.0388 1.69537H89.0388V0.695374H88.0388V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M92.8452 1.69537H91.8452V0.695374H92.8452V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M95.6516 1.69537H96.6516V0.695374H95.6516V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M100.458 1.69537H99.458V0.695374H100.458V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M103.264 1.69537H104.264V0.695374H103.264V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M108.071 1.69537H107.071V0.695374H108.071V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M110.877 1.69537H111.877V0.695374H110.877V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M115.684 1.69537H114.684V0.695374H115.684V1.69537Z" }),
+		/* @__PURE__ */ jsx("path", { d: "M118.49 1.69537H119.49V0.695374H118.49V1.69537Z" })
+	]
+});
+
 //#endregion
 //#region src/views/border-panel/border-line/icons/BorderDouble.tsx
 /**
@@ -26801,6 +27026,7 @@ function BorderLine(props) {
 		case BorderStyleTypes.DASH_DOT: return /* @__PURE__ */ jsx(BorderDashDot, { className });
 		case BorderStyleTypes.DASH_DOT_DOT: return /* @__PURE__ */ jsx(BorderDashDotDot, { className });
 		case BorderStyleTypes.DASHED: return /* @__PURE__ */ jsx(BorderDashed, { className });
+		case BorderStyleTypes.DOTTED: return /* @__PURE__ */ jsx(BorderDotted, { className });
 		case BorderStyleTypes.HAIR: return /* @__PURE__ */ jsx(BorderHair, { className });
 		case BorderStyleTypes.MEDIUM: return /* @__PURE__ */ jsx(BorderMedium, { className });
 		case BorderStyleTypes.MEDIUM_DASH_DOT: return /* @__PURE__ */ jsx(BorderMediumDashDot, { className });
@@ -26815,31 +27041,21 @@ function BorderLine(props) {
 
 //#endregion
 //#region src/views/border-panel/BorderPanel.tsx
-function getBorderColor(borderData) {
-	if (!borderData) return;
-	for (const key in borderData) {
-		var _border$cl;
-		const border = borderData[key];
-		if (border === null || border === void 0 || (_border$cl = border.cl) === null || _border$cl === void 0 ? void 0 : _border$cl.rgb) return border.cl.rgb;
-	}
-}
-function getBorderStyle(borderData) {
-	if (!borderData) return;
-	for (const key in borderData) {
-		var _border$cl2;
-		const border = borderData[key];
-		if (border === null || border === void 0 || (_border$cl2 = border.cl) === null || _border$cl2 === void 0 ? void 0 : _border$cl2.rgb) return border.s;
-	}
-}
 function BorderPanel(props) {
 	const iconManager = useDependency(IconManager);
-	const borderStyleManagerService = useDependency(BorderStyleManagerService);
 	const selectionManagerService = useDependency(SheetsSelectionsService);
 	const { direction } = useContext(ConfigContext);
 	const { isAllValuesSame, value: currentValue } = selectionManagerService.getCellStylesProperty("bd");
 	const color = isAllValuesSame ? getBorderColor(currentValue) : void 0;
-	const type = isAllValuesSame ? getBorderStyle(currentValue) : void 0;
 	const { onChange, value, ColorPickerComponent = ColorPicker, DropdownComponent = Dropdown } = props;
+	function getBorderColor(borderData) {
+		if (!borderData) return;
+		for (const key in borderData) {
+			var _border$cl;
+			const border = borderData[key];
+			if (border === null || border === void 0 || (_border$cl = border.cl) === null || _border$cl === void 0 ? void 0 : _border$cl.rgb) return border.cl.rgb;
+		}
+	}
 	function handleClick(v, type) {
 		onChange === null || onChange === void 0 || onChange({
 			...value,
@@ -26857,7 +27073,7 @@ function BorderPanel(props) {
 			/* @__PURE__ */ jsx("div", {
 				className: "univer-box-border univer-grid univer-grid-cols-5 univer-gap-2 univer-text-gray-600 dark:!univer-text-gray-200",
 				children: BORDER_LINE_CHILDREN.map((item) => /* @__PURE__ */ jsx("a", {
-					className: clsx("univer-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-justify-self-center univer-rounded hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", { "univer-bg-gray-200 dark:!univer-bg-gray-600": borderStyleManagerService.getBorderInfo().type === item.value }),
+					className: clsx("univer-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-justify-self-center univer-rounded hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", { "univer-bg-gray-200 dark:!univer-bg-gray-600": value.type === item.value }),
 					onClick: (e) => {
 						e.stopPropagation();
 						handleClick(item.value, "type");
@@ -26889,14 +27105,17 @@ function BorderPanel(props) {
 						className: "univer-rounded-lg univer-p-1.5",
 						children: /* @__PURE__ */ jsx("ul", {
 							className: "univer-m-0 univer-grid univer-list-none univer-gap-1 univer-p-0",
-							children: BORDER_SIZE_CHILDREN.map((item) => /* @__PURE__ */ jsxs("li", {
-								className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-px-1 univer-py-3 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700",
+							children: BORDER_SIZE_CHILDREN.map((item) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx("button", {
+								type: "button",
+								"aria-label": BorderStyleTypes[item.value],
+								"aria-pressed": item.value === value.style,
+								className: clsx("univer-flex univer-w-full univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-border-none univer-bg-transparent univer-px-1 univer-py-3 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", { "univer-bg-gray-200 dark:!univer-bg-gray-600": item.value === value.style }),
 								onClick: () => handleClick(item.value, "style"),
-								children: [item.value === type && /* @__PURE__ */ jsx(CheckMarkIcon, { className: "univer-absolute univer-left-3 univer-text-primary-600" }), /* @__PURE__ */ jsx(BorderLine, {
-									className: "univer-ml-6 univer-fill-gray-900 dark:!univer-fill-gray-0",
+								children: /* @__PURE__ */ jsx(BorderLine, {
+									className: "univer-fill-gray-900 dark:!univer-fill-gray-0",
 									type: item.value
-								})]
-							}, item.value))
+								})
+							}) }, item.value))
 						})
 					}),
 					children: /* @__PURE__ */ jsxs("button", {
@@ -26904,7 +27123,7 @@ function BorderPanel(props) {
 						type: "button",
 						children: [/* @__PURE__ */ jsx(BorderLine, {
 							className: "univer-fill-gray-900 dark:!univer-fill-gray-0",
-							type: type ?? BorderStyleTypes.THIN
+							type: value.style
 						}), /* @__PURE__ */ jsx(MoreDownIcon, { className: "dark:!univer-text-gray-0" })]
 					})
 				}) })]
@@ -28915,7 +29134,8 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
 		let body = Tools.deepClone((_param$documentLayout = param.documentLayoutObject.documentModel) === null || _param$documentLayout === void 0 ? void 0 : _param$documentLayout.getBody());
 		const drawings = Tools.deepClone((_param$documentLayout2 = param.documentLayoutObject.documentModel) === null || _param$documentLayout2 === void 0 ? void 0 : _param$documentLayout2.drawings);
 		const drawingsOrder = Tools.deepClone((_param$documentLayout3 = param.documentLayoutObject.documentModel) === null || _param$documentLayout3 === void 0 ? void 0 : _param$documentLayout3.getDrawingsOrder());
-		if (!body || param.isInArrayFormulaRange === true && this._editorBridgeService.isVisible().eventType === DeviceInputEventType.Dblclick) body = {
+		const { visible } = this._editorBridgeService.isVisible();
+		if (!body || param.isInArrayFormulaRange === true && visible) body = {
 			dataStream: "\r\n",
 			paragraphs: [{
 				startIndex: 0,
@@ -29053,7 +29273,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
 			...formulaEditorStyle,
 			pageSize: { ...formulaEditorStyle.pageSize },
 			renderConfig: { ...formulaEditorStyle.renderConfig },
-			textStyle: { cl: { rgb: this._themeService.getColorFromTheme("gray.900") } }
+			textStyle: { cl: { rgb: this._getFormulaBarTextColor() } }
 		};
 		else snapshot.documentStyle ??= {};
 		let renderConfig = snapshot.documentStyle.renderConfig;
@@ -29076,6 +29296,11 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
 		const isFocusFxBar = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR);
 		renderConfig.isRenderStyle = isFormulaBar === isFocusFxBar ? BooleanNumber.TRUE : BooleanNumber.FALSE;
 	}
+	_getFormulaBarTextColor() {
+		var _this$_editorBridgeSe;
+		const isInheritedFormula = ((_this$_editorBridgeSe = this._editorBridgeService.getEditLocation()) === null || _this$_editorBridgeSe === void 0 ? void 0 : _this$_editorBridgeSe.isInArrayFormulaRange) === true && !this._editorBridgeService.isVisible().visible;
+		return this._themeService.getColorFromTheme(isInheritedFormula ? "gray.300" : "gray.900");
+	}
 	_getSourceStyleRenderValue(isFormulaBar) {
 		return isFormulaBar ? BooleanNumber.FALSE : BooleanNumber.TRUE;
 	}
@@ -32742,10 +32967,14 @@ let MobileCellEditRenderController = class MobileCellEditRenderController extend
 			if (cell.location.unitId !== this._context.unitId) return;
 			const snapshot = (_this$_editorBridgeSe = this._editorBridgeService.getEditCellState()) === null || _this$_editorBridgeSe === void 0 || (_this$_editorBridgeSe = _this$_editorBridgeSe.documentLayoutObject.documentModel) === null || _this$_editorBridgeSe === void 0 ? void 0 : _this$_editorBridgeSe.getSnapshot();
 			if (isCellImage(snapshot)) return;
-			this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
+			this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
 				visible: true,
 				eventType: DeviceInputEventType.Dblclick,
-				unitId: this._context.unitId
+				unitId: this._context.unitId,
+				pointerPosition: {
+					x: cell.event.clientX,
+					y: cell.event.clientY
+				}
 			});
 		}));
 		this.disposeWithMe(hoverManagerService.currentPointerDownCell$.subscribe((cell) => {
@@ -33178,7 +33407,7 @@ let MobileHoverRenderController = class MobileHoverRenderController extends Disp
 					return;
 				}
 				this._resetCompletedTap();
-				this._hoverManagerService.triggerDbClick(unitId, event.offsetX, event.offsetY);
+				this._hoverManagerService.triggerDbClick(unitId, event);
 			},
 			priority: -1
 		}));
@@ -33254,7 +33483,7 @@ let MobileHoverRenderController = class MobileHoverRenderController extends Disp
 				this._suppressEngineDoubleClick = false;
 				this._suppressEngineDoubleClickTimer = null;
 			});
-			this._hoverManagerService.triggerDbClick(unitId, event.offsetX, event.offsetY);
+			this._hoverManagerService.triggerDbClick(unitId, event);
 			return;
 		}
 		this._resetCompletedTap();
@@ -35262,20 +35491,22 @@ const ISheetHostChromeOverrideService = createIdentifier("sheet-ui.host-chrome-o
 //#endregion
 //#region src/controllers/render-controllers/contextmenu.render-controller.ts
 let SheetContextMenuRenderController = class SheetContextMenuRenderController extends Disposable {
-	constructor(_context, _contextMenuService, _selectionManagerService, _selectionRenderService, _injector) {
+	constructor(_context, _contextMenuService, _selectionManagerService, _selectionRenderService, _injector, _platformService, _contextService) {
 		super();
 		this._context = _context;
 		this._contextMenuService = _contextMenuService;
 		this._selectionManagerService = _selectionManagerService;
 		this._selectionRenderService = _selectionRenderService;
 		this._injector = _injector;
+		this._platformService = _platformService;
+		this._contextService = _contextService;
 		this._init();
 		this._initEmbedRuntimeSessionListener();
 	}
 	_init() {
 		var _this$_context;
 		const spreadsheetSubscription = ((_this$_context = this._context) === null || _this$_context === void 0 || (_this$_context = _this$_context.mainComponent) === null || _this$_context === void 0 ? void 0 : _this$_context.onPointerDown$).subscribeEvent((event) => {
-			if (event.button === 2) {
+			if (this._isContextMenuGesture(event)) {
 				const selections = this._selectionManagerService.getCurrentSelections();
 				const currentSelection = selections === null || selections === void 0 ? void 0 : selections[0];
 				if (!currentSelection) return;
@@ -35305,20 +35536,23 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 		this.disposeWithMe(spreadsheetSubscription);
 		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
 		const rowHeaderSub = this._context.components.get("__SpreadsheetRowHeader__").onPointerDown$.subscribeEvent((event) => {
-			if (event.button === 2) {
+			if (this._isContextMenuGesture(event)) {
 				if (this._shouldSuppressHostContextMenu()) return;
 				this._contextMenuService.triggerContextMenu(event, ContextMenuPosition.ROW_HEADER);
 			}
 		});
 		this.disposeWithMe(rowHeaderSub);
 		const colHeaderObserver = spreadsheetColumnHeader.onPointerDown$.subscribeEvent((event) => {
-			if (event.button === 2) {
+			if (this._isContextMenuGesture(event)) {
 				if (this._shouldSuppressHostContextMenu()) return;
 				this._contextMenuService.triggerContextMenu(event, ContextMenuPosition.COL_HEADER);
 			}
 		});
 		this.disposeWithMe(colHeaderObserver);
 	}
+	_isContextMenuGesture(event) {
+		return isSheetContextMenuGesture(event, this._platformService.isMac, this._contextService.getContextValue(REF_SELECTIONS_ENABLED));
+	}
 	_initEmbedRuntimeSessionListener() {
 		const runtimeFocusCoordinator = this._getSheetEmbedRuntimeFocusCoordinator();
 		if (!runtimeFocusCoordinator) return;
@@ -35341,7 +35575,9 @@ SheetContextMenuRenderController = __decorate([
 	__decorateParam(1, IContextMenuService),
 	__decorateParam(2, Inject(SheetsSelectionsService)),
 	__decorateParam(3, ISheetSelectionRenderService),
-	__decorateParam(4, Inject(Injector))
+	__decorateParam(4, Inject(Injector)),
+	__decorateParam(5, IPlatformService),
+	__decorateParam(6, IContextService)
 ], SheetContextMenuRenderController);
 function shouldHideSheetHostContextMenuForEmbedSession(hostUnitId, activeScope) {
 	return (activeScope === null || activeScope === void 0 ? void 0 : activeScope.hostUnitId) === hostUnitId && activeScope.sessionMode !== "host-passive";
@@ -35353,7 +35589,7 @@ function shouldSuppressSheetContextMenuForEmbedOverride(hostUnitId, override) {
 //#endregion
 //#region src/controllers/render-controllers/desktop-cell-edit.render-controller.ts
 let DesktopCellEditRenderController = class DesktopCellEditRenderController extends RxDisposable {
-	constructor(_context, _instanceService, _commandService, _editorBridgeService, _selectionManagerService, _contextService, _renderManagerService, _embedRuntimeFocusCoordinator) {
+	constructor(_context, _instanceService, _commandService, _editorBridgeService, _selectionManagerService, _contextService, _renderManagerService, _platformService, _embedRuntimeFocusCoordinator) {
 		super();
 		this._context = _context;
 		this._instanceService = _instanceService;
@@ -35362,6 +35598,7 @@ let DesktopCellEditRenderController = class DesktopCellEditRenderController exte
 		this._selectionManagerService = _selectionManagerService;
 		this._contextService = _contextService;
 		this._renderManagerService = _renderManagerService;
+		this._platformService = _platformService;
 		this._embedRuntimeFocusCoordinator = _embedRuntimeFocusCoordinator;
 		_defineProperty(this, "_d", void 0);
 		this.disposeWithMe(this._instanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
@@ -35389,13 +35626,17 @@ let DesktopCellEditRenderController = class DesktopCellEditRenderController exte
 		const { spreadsheet, spreadsheetColumnHeader, spreadsheetLeftTopPlaceholder, spreadsheetRowHeader } = sheetObject;
 		d.add(spreadsheet.onDblclick$.subscribeEvent((evt) => {
 			var _this$_editorBridgeSe;
-			if (evt.button === 2) return;
+			if (isSheetContextMenuGesture(evt, this._platformService.isMac, this._contextService.getContextValue(REF_SELECTIONS_ENABLED))) return;
 			const snapshot = (_this$_editorBridgeSe = this._editorBridgeService.getEditCellState()) === null || _this$_editorBridgeSe === void 0 || (_this$_editorBridgeSe = _this$_editorBridgeSe.documentLayoutObject.documentModel) === null || _this$_editorBridgeSe === void 0 ? void 0 : _this$_editorBridgeSe.getSnapshot();
 			if (isCellImage(snapshot)) return;
-			this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
+			this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
 				visible: true,
 				eventType: DeviceInputEventType.Dblclick,
-				unitId: this._context.unitId
+				unitId: this._context.unitId,
+				pointerPosition: {
+					x: evt.clientX,
+					y: evt.clientY
+				}
 			});
 		}));
 		d.add(spreadsheet.onPointerDown$.subscribeEvent({
@@ -35524,7 +35765,8 @@ DesktopCellEditRenderController = __decorate([
 	__decorateParam(4, Inject(SheetsSelectionsService)),
 	__decorateParam(5, IContextService),
 	__decorateParam(6, IRenderManagerService),
-	__decorateParam(7, Optional(ISheetEmbedRuntimeFocusCoordinator))
+	__decorateParam(7, IPlatformService),
+	__decorateParam(8, Optional(ISheetEmbedRuntimeFocusCoordinator))
 ], DesktopCellEditRenderController);
 function resolvePointerEventPayload(payload) {
 	return Array.isArray(payload) ? payload[0] : payload;
@@ -35688,38 +35930,34 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 		const { spreadsheetRowHeader, spreadsheetColumnHeader, spreadsheet, spreadsheetLeftTopPlaceholder } = sheetObject;
 		const { scene } = this._context;
 		this.disposeWithMe(spreadsheet === null || spreadsheet === void 0 ? void 0 : spreadsheet.onPointerDown$.subscribeEvent((evt, state) => {
-			if (this.isSelectionDisabled()) return;
-			if (this.inRefSelectionMode()) return;
+			if (this.isSelectionDisabled() || this.inRefSelectionMode()) return;
 			this._onPointerDown(evt, spreadsheet.zIndex + 1, RANGE_TYPE.NORMAL, this._getActiveViewport(evt));
-			if (evt.button !== 2) state.stopPropagation();
+			if (!this._isContextMenuGesture(evt)) state.stopPropagation();
 		}));
 		this.disposeWithMe(spreadsheetRowHeader === null || spreadsheetRowHeader === void 0 ? void 0 : spreadsheetRowHeader.onPointerDown$.subscribeEvent((evt, state) => {
-			if (this.isSelectionDisabled()) return;
-			if (this.inRefSelectionMode()) return;
+			if (this.isSelectionDisabled() || this.inRefSelectionMode()) return;
 			const skeleton = this._sheetSkeletonManagerService.getCurrentParam().skeleton;
 			const { row } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);
 			if (isThisRowSelected(this._workbookSelections.getCurrentSelections(), row)) return;
 			this._onPointerDown(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.ROW, this._getActiveViewport(evt), ScrollTimerType.Y);
-			if (evt.button !== 2) state.stopPropagation();
+			if (!this._isContextMenuGesture(evt)) state.stopPropagation();
 		}));
 		this.disposeWithMe(spreadsheetColumnHeader === null || spreadsheetColumnHeader === void 0 ? void 0 : spreadsheetColumnHeader.onPointerDown$.subscribeEvent((evt, state) => {
-			if (this.isSelectionDisabled()) return;
-			if (this.inRefSelectionMode()) return;
+			if (this.isSelectionDisabled() || this.inRefSelectionMode()) return;
 			const skeleton = this._sheetSkeletonManagerService.getCurrentParam().skeleton;
 			const { column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);
 			if (isThisColSelected(this._workbookSelections.getCurrentSelections(), column)) return;
 			this._onPointerDown(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.COLUMN, this._getActiveViewport(evt), ScrollTimerType.X);
-			if (evt.button !== 2) state.stopPropagation();
+			if (!this._isContextMenuGesture(evt)) state.stopPropagation();
 		}));
 		this.disposeWithMe(spreadsheetLeftTopPlaceholder === null || spreadsheetLeftTopPlaceholder === void 0 ? void 0 : spreadsheetLeftTopPlaceholder.onPointerDown$.subscribeEvent((evt, state) => {
-			if (this.isSelectionDisabled()) return;
-			if (this.inRefSelectionMode()) return;
+			if (this.isSelectionDisabled() || this.inRefSelectionMode()) return;
 			this._reset();
 			const skeleton = this._sheetSkeletonManagerService.getCurrentParam().skeleton;
 			const selectionWithStyle = selectionDataForSelectAll(skeleton);
 			this._addSelectionControlByModelData(selectionWithStyle);
 			this.refreshSelectionMoveEnd();
-			if (evt.button !== 2) state.stopPropagation();
+			if (!this._isContextMenuGesture(evt)) state.stopPropagation();
 		}));
 	}
 	_initThemeChangeListener() {
@@ -35800,7 +36038,7 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 		const sheetId = workbook.getActiveSheet().getSheetId();
 		if (selectionDataWithStyleList.length === 0) return;
 		const selectionWithStyles = selectionDataWithStyleList.map((selectionDataWithStyle) => convertSelectionDataToRange(selectionDataWithStyle));
-		this._commandService.executeCommand(SetSelectionsOperation.id, {
+		this._commandService.syncExecuteCommand(SetSelectionsOperation.id, {
 			unitId,
 			subUnitId: sheetId,
 			type,
@@ -35821,6 +36059,7 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 			const prevSheetId = (_this$_skeleton = this._skeleton) === null || _this$_skeleton === void 0 || (_this$_skeleton = _this$_skeleton.worksheet) === null || _this$_skeleton === void 0 ? void 0 : _this$_skeleton.getSheetId();
 			this._changeRuntime(skeleton, scene, viewportMain);
 			if (prevSheetId !== skeleton.worksheet.getSheetId()) {
+				this._reset();
 				const selections = this._workbookSelections.getCurrentSelections();
 				this._commandService.syncExecuteCommand(SetSelectionsOperation.id, {
 					unitId,
@@ -35855,11 +36094,10 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 		this._rangeType = rangeType;
 		const skeleton = this._skeleton;
 		const scene = this._scene;
-		if (!scene || !skeleton) return;
+		const viewportMain = scene === null || scene === void 0 ? void 0 : scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
+		if (!scene || !skeleton || !viewportMain) return;
 		if (viewport) this._activeViewport = viewport;
 		const { offsetX: evtOffsetX, offsetY: evtOffsetY } = evt;
-		const viewportMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
-		if (!viewportMain) return;
 		const relativeCoords = scene.getCoordRelativeToViewport(Vector2.FromArray([evtOffsetX, evtOffsetY]));
 		const { x: offsetX, y: offsetY } = relativeCoords;
 		this._startViewportPosX = offsetX;
@@ -35869,7 +36107,6 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 		const selectCell = this._skeleton.getCellByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);
 		if (!selectCell) return;
 		switch (rangeType) {
-			case RANGE_TYPE.NORMAL: break;
 			case RANGE_TYPE.ROW:
 				selectCell.startColumn = 0;
 				selectCell.endColumn = this._skeleton.getColumnCount() - 1;
@@ -35896,6 +36133,11 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 		selectionWithStyle.range.rangeType = rangeType;
 		const activeSelectionControl = this._updateSelectionControl(evt, selectionWithStyle);
 		if (!activeSelectionControl) return;
+		if (this._isContextMenuGesture(evt)) {
+			this._selectionMoveStart$.next(this.getSelectionDataWithStyle());
+			this.endSelection();
+			return;
+		}
 		scene.disableObjectsEvent();
 		this._clearUpdatingListeners();
 		this._addEndingListeners();
@@ -35907,20 +36149,32 @@ let SheetSelectionRenderService = class SheetSelectionRenderService extends Base
 		(_this$_scene$getEngin = this._scene.getEngine()) === null || _this$_scene$getEngin === void 0 || _this$_scene$getEngin.setCapture();
 	}
 	_updateSelectionControl(evt, selection) {
-		const cursorRange = attachSelectionWithCoord(selection, this._skeleton).rangeWithCoord;
+		const selectionWithCoord = attachSelectionWithCoord(selection, this._skeleton);
+		const cursorRange = selectionWithCoord.rangeWithCoord;
 		this._startRangeWhenPointerDown = { ...cursorRange };
 		const controls = this.getSelectionControls();
 		const isSelected = controls.some((control) => Rectangle.contains(control.model, cursorRange));
-		if (evt.button === 2 && isSelected) return;
-		if (evt.button === 0 && (evt.ctrlKey || evt.metaKey) && !evt.shiftKey && !this._singleSelectionEnabled && this._rangeType === RANGE_TYPE.NORMAL && isSelected) this._selectionBeforeModifierClick = this.getSelectionDataWithStyle().map(convertSelectionDataToRange);
+		if (this._isContextMenuGesture(evt) && isSelected) return;
+		if (evt.button === 0 && !this._isContextMenuGesture(evt) && this._isMultiSelectModifier(evt) && !evt.shiftKey && !this._singleSelectionEnabled && this._rangeType === RANGE_TYPE.NORMAL && isSelected) this._selectionBeforeModifierClick = this.getSelectionDataWithStyle().map(convertSelectionDataToRange);
 		let activeControl = this.getActiveSelectionControl();
+		if (activeControl && this._canAnimateSelection(evt, activeControl, cursorRange)) {
+			activeControl.updateRangeBySelectionWithCoord(selectionWithCoord, this._skeleton, true);
+			return activeControl;
+		}
 		this._checkClearPreviousControls(evt);
 		const currentCell = activeControl === null || activeControl === void 0 ? void 0 : activeControl.model.currentCell;
-		if (evt.shiftKey && currentCell && activeControl) this._makeSelectionByTwoCells(currentCell, cursorRange, this._skeleton, this._rangeType, activeControl);
+		if (!this._isContextMenuGesture(evt) && evt.shiftKey && currentCell && activeControl) this._makeSelectionByTwoCells(currentCell, cursorRange, this._skeleton, this._rangeType, activeControl);
 		else activeControl = this.newSelectionControl(this._scene, this._skeleton, selection);
 		for (let i = 0; i < controls.length - 1; i++) controls[i].clearHighlight();
 		return activeControl;
 	}
+	_canAnimateSelection(evt, control, target) {
+		if (this.getSelectionControls().length !== 1 || this._rangeType !== RANGE_TYPE.NORMAL || this._remainLastEnabled || evt.button !== 0 || evt.ctrlKey || evt.metaKey || evt.shiftKey || evt.altKey) return false;
+		const current = control.getCurrentCellInfo();
+		if (!current || !Rectangle.equals(control.model, current)) return false;
+		const freeze = this._skeleton.worksheet.getFreeze();
+		return current.startRow < freeze.startRow === target.startRow < freeze.startRow && current.startColumn < freeze.startColumn === target.startColumn < freeze.startColumn;
+	}
 	endSelection() {
 		const previousSelections = this._selectionBeforeModifierClick;
 		this._selectionBeforeModifierClick = null;
@@ -36110,4 +36364,4 @@ UniverSheetsUIPlugin = __decorate([
 ], UniverSheetsUIPlugin);
 
 //#endregion
-export { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, ApplyFormatPainterCommand, AutoFillPopupMenu, AutoFillUIController, AutoHeightController, AutoWidthController, BORDER_LINE_CHILDREN, BORDER_SIZE_CHILDREN, BaseSelectionRenderService, BorderLine, COPY_SPECIAL_MENU_ID, COPY_TYPE, CellAlertManagerService, CellAlertType, CellCustomRenderController, CellEditorManagerService, CellPopupManagerService, ChangeSheetProtectionFromSheetBarCommand, ChangeZoomRatioCommand, DeleteRangeMoveLeftConfirmCommand, DeleteRangeMoveUpConfirmCommand, DeleteRangeProtectionFromContextMenuCommand, DeleteWorksheetProtectionFormSheetBarCommand, DragManagerService, DragRenderController, EMBEDDING_FORMULA_EDITOR, EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, EditingRenderController, EditorBridgeService, EditorContainer, ExpandSelectionCommand, FORMULA_CLIPBOARD_MIME_TYPE, FormatPainterStatus, FormulaBar, FormulaEditorController, HEADER_UNHIDE_RANGE_VISIBLE_CHECK, HeaderFreezeRenderController, HeaderMoveRenderController, HeaderResizeRenderController, HeaderUnhideRangeAxis, HeaderUnhideRangeService, HeaderUnhideRenderController, HideColConfirmCommand, HideRowConfirmCommand, HoverManagerService, HoverRenderController, ICellEditorManagerService, IEditorBridgeService, IFormatPainterService, IFormulaEditorManagerService, IMarkSelectionService, IRepeatLastActionService, ISheetBarService, ISheetCellDropdownManagerService, ISheetClipboardService, ISheetEmbedFloatingGeometryService, ISheetEmbedInteractionBoundaryService, ISheetEmbedRuntimeFocusCoordinator, ISheetEmbedRuntimeService, ISheetHostChromeOverrideService, ISheetSelectionRenderService, IStatusBarService, InsertRangeMoveDownConfirmCommand, InsertRangeMoveRightConfirmCommand, JumpOver, MOBILE_CONTEXT_MENU, MOBILE_EXPANDING_SELECTION, MOBILE_FORMULA_FUNCTION_PANEL_OPEN, MOBILE_PINCH_ZOOMING, MarkSelectionService, MobileSelectionControl, MoveSelectionCommand, MoveSelectionEnterAndTabCommand, PASTE_SPECIAL_MENU_ID, PREDEFINED_HOOK_NAME, PREDEFINED_HOOK_NAME_COPY, PREDEFINED_HOOK_NAME_PASTE, RANGE_SELECTOR_COMPONENT_KEY, RANGE_SELECTOR_SYMBOLS, RemoveColConfirmCommand, RemoveRowConfirmCommand, RemoveSheetConfirmCommand, RenameSheetOperation, RepeatLastActionPermission, ResetRangeTextColorCommand, ResetScrollCommand, SELECTION_SHAPE_DEPTH, SHEETS_UI_PLUGIN_CONFIG_KEY, SHEET_EMBED_CHILD_TYPE_ATTRIBUTE, SHEET_EMBED_CHILD_UNIT_ID_ATTRIBUTE, SHEET_EMBED_FLOAT_DOM_ATTRIBUTE, SHEET_EMBED_HOST_UNIT_ID_ATTRIBUTE, SHEET_EMBED_ID_ATTRIBUTE, SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE, SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE, SHEET_FOOTER_BAR_HEIGHT, SHEET_UI_PLUGIN_NAME, SHEET_VIEW_KEY, ScrollCommand, ScrollToCellCommand, ScrollToRangeOperation, SelectAllCommand, SelectionControl, SelectionControl as SelectionShape, SelectionShapeExtension, SetActivateCellEditOperation, SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation, SetCellEditVisibleWithF2Operation, SetColumnFrozenCommand, SetColumnHeaderHeightCommand, SetFirstColumnFrozenCommand, SetFirstRowFrozenCommand, SetFormatPainterOperation, SetInfiniteFormatPainterCommand, SetOnceFormatPainterCommand, SetRangeBoldCommand, SetRangeFontDecreaseCommand, SetRangeFontFamilyCommand, SetRangeFontIncreaseCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeProtectionFromContextMenuCommand, SetRangeStrickThroughCommand, SetRangeSubscriptCommand, SetRangeSuperscriptCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, SetRowFrozenCommand, SetRowHeaderWidthCommand, SetScrollOperation, SetScrollRelativeCommand, SetSelectionFrozenCommand, SetWorksheetColAutoWidthCommand, SetZoomRatioCommand, SetZoomRatioOperation, SheetBar, SheetBarService, SheetCanvasPopManagerService, SheetCellDropdownManagerService, SheetCellEditorResizeService, SheetClipboardController, SheetClipboardService, SheetContextMenuMobileRenderController, SheetCopyCommand, SheetCutCommand, SheetMenuPosition, SheetPasteBesidesBorderCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteFormatCommand, SheetPasteShortKeyCommand, SheetPasteValueCommand, SheetPermissionCheckUIController, SheetPermissionOpenDialogOperation, SheetPermissionOpenPanelOperation, SheetPermissionRenderManagerService, SheetPermissionUserManagerService, SheetPrintInterceptorService, SheetPrintingResourceCollector, SheetRenderController, SheetScrollManagerService, SheetSelectionRenderService, SheetSkeletonManagerService, SheetUIController, SheetsRenderService, SheetsScrollRenderController, menuSchema as SheetsUIMenuSchema, SheetsUIPart, ShowMenuListCommand, SidebarDefinedNameOperation, StatusBarController, StatusBarService, UNIVER_SHEET_PERMISSION_USER_PART, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand, calculateDocSkeletonRects, matchedSelectionByRowColIndex as checkInHeaderRanges, deriveStateFromActiveSheet$, functionDisplayNames, genNormalSelectionStyle, genSelectionByRange, selectionDataForSelectAll as getAllSelection, getCellRealRange, getCoordByCell, getCoordByOffset, getCurrentExclusiveRangeInterest$, getCurrentRangeDisable$, getCustomRangePosition, getEditingCustomRangePosition, getEditorObject, getMatrixPlainText, getObservableWithExclusiveRange$, getRepeatRange, getSheetObject, getTopLeftSelectionOfCurrSheet, getTransformCoord, getViewportByCell, isEmbeddingFormulaEditor, isRangeSelector, menuClipboardDisabledObservable, mergeSetRangeValues, resolveActiveSheetEmbedRuntimeDomScope, resolveSheetEmbedRuntimeDomScope, useActiveWorkbook, useActiveWorksheet, useHighlightRange, useKeyEventConfig, useWorkbooks, virtualizeDiscreteRanges, whenFormulaEditorActivated, whenSheetEditorActivated, whenSheetEditorFocused };
+export { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, ApplyFormatPainterCommand, AutoFillPopupMenu, AutoFillUIController, AutoHeightController, AutoWidthController, BORDER_LINE_CHILDREN, BORDER_SIZE_CHILDREN, BaseSelectionRenderService, BorderLine, COPY_SPECIAL_MENU_ID, COPY_TYPE, CellAlertManagerService, CellAlertType, CellCustomRenderController, CellEditorManagerService, CellPopupManagerService, ChangeSheetProtectionFromSheetBarCommand, ChangeZoomRatioCommand, DEFINED_NAME_CONTAINER, DeleteRangeMoveLeftConfirmCommand, DeleteRangeMoveUpConfirmCommand, DeleteRangeProtectionFromContextMenuCommand, DeleteWorksheetProtectionFormSheetBarCommand, DragManagerService, DragRenderController, EMBEDDING_FORMULA_EDITOR, EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, EditingRenderController, EditorBridgeService, EditorContainer, ExpandSelectionCommand, FORMULA_CLIPBOARD_MIME_TYPE, FormatPainterStatus, FormulaBar, FormulaEditorController, HEADER_UNHIDE_RANGE_VISIBLE_CHECK, HeaderFreezeRenderController, HeaderMoveRenderController, HeaderResizeRenderController, HeaderUnhideRangeAxis, HeaderUnhideRangeService, HeaderUnhideRenderController, HideColConfirmCommand, HideRowConfirmCommand, HoverManagerService, HoverRenderController, ICellEditorManagerService, IEditorBridgeService, IFormatPainterService, IFormulaEditorManagerService, IMarkSelectionService, IRepeatLastActionService, ISheetBarService, ISheetCellDropdownManagerService, ISheetClipboardService, ISheetEmbedFloatingGeometryService, ISheetEmbedInteractionBoundaryService, ISheetEmbedRuntimeFocusCoordinator, ISheetEmbedRuntimeService, ISheetHostChromeOverrideService, ISheetSelectionRenderService, IStatusBarService, InsertRangeMoveDownConfirmCommand, InsertRangeMoveRightConfirmCommand, JumpOver, MOBILE_CONTEXT_MENU, MOBILE_EXPANDING_SELECTION, MOBILE_FORMULA_FUNCTION_PANEL_OPEN, MOBILE_PINCH_ZOOMING, MarkSelectionService, MobileSelectionControl, MoveSelectionCommand, MoveSelectionEnterAndTabCommand, PASTE_SPECIAL_MENU_ID, PREDEFINED_HOOK_NAME, PREDEFINED_HOOK_NAME_COPY, PREDEFINED_HOOK_NAME_PASTE, RANGE_SELECTOR_COMPONENT_KEY, RANGE_SELECTOR_SYMBOLS, RemoveColConfirmCommand, RemoveRowConfirmCommand, RemoveSheetConfirmCommand, RenameSheetOperation, RepeatLastActionPermission, ResetRangeTextColorCommand, ResetScrollCommand, SELECTION_SHAPE_DEPTH, SHEETS_UI_PLUGIN_CONFIG_KEY, SHEET_EMBED_CHILD_TYPE_ATTRIBUTE, SHEET_EMBED_CHILD_UNIT_ID_ATTRIBUTE, SHEET_EMBED_FLOAT_DOM_ATTRIBUTE, SHEET_EMBED_HOST_UNIT_ID_ATTRIBUTE, SHEET_EMBED_ID_ATTRIBUTE, SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE, SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE, SHEET_FOOTER_BAR_HEIGHT, SHEET_UI_PLUGIN_NAME, SHEET_VIEW_KEY, ScrollCommand, ScrollToCellCommand, ScrollToRangeOperation, SelectAllCommand, SelectionControl, SelectionControl as SelectionShape, SelectionShapeExtension, SetActivateCellEditOperation, SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation, SetCellEditVisibleWithF2Operation, SetColumnFrozenCommand, SetColumnHeaderHeightCommand, SetFirstColumnFrozenCommand, SetFirstRowFrozenCommand, SetFormatPainterOperation, SetInfiniteFormatPainterCommand, SetOnceFormatPainterCommand, SetRangeBoldCommand, SetRangeFontDecreaseCommand, SetRangeFontFamilyCommand, SetRangeFontIncreaseCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeProtectionFromContextMenuCommand, SetRangeStrickThroughCommand, SetRangeSubscriptCommand, SetRangeSuperscriptCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, SetRowFrozenCommand, SetRowHeaderWidthCommand, SetScrollOperation, SetScrollRelativeCommand, SetSelectionFrozenCommand, SetWorksheetColAutoWidthCommand, SetZoomRatioCommand, SetZoomRatioOperation, SheetBar, SheetBarService, SheetCanvasPopManagerService, SheetCellDropdownManagerService, SheetCellEditorResizeService, SheetClipboardController, SheetClipboardService, SheetContextMenuMobileRenderController, SheetCopyCommand, SheetCutCommand, SheetMenuPosition, SheetPasteBesidesBorderCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteFormatCommand, SheetPasteShortKeyCommand, SheetPasteValueCommand, SheetPermissionCheckUIController, SheetPermissionOpenDialogOperation, SheetPermissionOpenPanelOperation, SheetPermissionRenderManagerService, SheetPermissionUserManagerService, SheetPrintInterceptorService, SheetPrintingResourceCollector, SheetRenderController, SheetScrollManagerService, SheetSelectionRenderService, SheetSkeletonManagerService, SheetUIController, SheetsRenderService, SheetsScrollRenderController, menuSchema as SheetsUIMenuSchema, SheetsUIPart, ShowMenuListCommand, SidebarDefinedNameOperation, StatusBarController, StatusBarService, UNIVER_SHEET_PERMISSION_USER_PART, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand, calculateDocSkeletonRects, matchedSelectionByRowColIndex as checkInHeaderRanges, deriveStateFromActiveSheet$, functionDisplayNames, genNormalSelectionStyle, genSelectionByRange, selectionDataForSelectAll as getAllSelection, getCellRealRange, getCoordByCell, getCoordByOffset, getCurrentExclusiveRangeInterest$, getCurrentRangeDisable$, getCustomRangePosition, getEditingCustomRangePosition, getEditorObject, getMatrixPlainText, getObservableWithExclusiveRange$, getRepeatRange, getSheetObject, getTopLeftSelectionOfCurrSheet, getTransformCoord, getViewportByCell, isEmbeddingFormulaEditor, isRangeSelector, menuClipboardDisabledObservable, mergeSetRangeValues, resolveActiveSheetEmbedRuntimeDomScope, resolveSheetEmbedRuntimeDomScope, useActiveWorkbook, useActiveWorksheet, useHighlightRange, useKeyEventConfig, useWorkbooks, virtualizeDiscreteRanges, whenFormulaEditorActivated, whenSheetEditorActivated, whenSheetEditorFocused };