@univerjs/sheets-ui 0.2.7 → 0.2.8

package/lib/es/index.js

@@ -3,12 +3,11 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
 import { DOCS_VIEW_KEY, SetInlineFormatBoldCommand, SetInlineFormatItalicCommand, SetInlineFormatUnderlineCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatSubscriptCommand, SetInlineFormatSuperscriptCommand, SetInlineFormatFontSizeCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatTextColorCommand, SetTextSelectionsOperation, SetInlineFormatCommand, TextSelectionManagerService, BreakLineCommand, DeleteLeftCommand, CoverContentCommand, RichTextEditingMutation, DocSkeletonManagerService, VIEWPORT_KEY, DOCS_COMPONENT_MAIN_LAYER_INDEX, MoveSelectionOperation, MoveCursorOperation, IMEInputCommand, InsertCommand } from "@univerjs/docs";
-import { Disposable, Inject, Injector, CommandType, IUniverInstanceService, ICommandService, UniverInstanceType, LocaleService, Direction, Rectangle, getReverseDirection, RANGE_TYPE, Tools, Workbook, toDisposable, IContextService, UserManagerService, FOCUSING_COMMON_DRAWINGS, IPermissionService, RxDisposable, OnLifecycle, LifecycleStages, ObjectMatrix, isFormulaString, isFormulaId, CellValueType, createIdentifier, IUndoRedoService, createInterceptorKey, makeCellToSelection, ColorKit, Quantity, InterceptorManager, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, EDITOR_ACTIVATED, FOCUSING_EDITOR_STANDALONE, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE, ThemeService, FOCUSING_SHEET, DisposableCollection, getCellInfoInMergeData, sortRules, sequenceExecute, Dimension, ILogService, BorderStyleTypes, useDependency, DEFAULT_EMPTY_DOCUMENT_VALUE, DocumentFlavor, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, HorizontalAlign, VerticalAlign, WrapStrategy, BooleanNumber, FOCUSING_UNIVER_EDITOR, FOCUSING_EDITOR_INPUT_FORMULA, FOCUSING_FX_BAR_EDITOR, LRUMap, BaselineOffset, DataStreamTreeTokenType, skipParseTagNames, ErrorService, extractPureTextFromCell, FontWeight, FontItalic, DEFAULT_STYLES, nameCharacterCheck, debounce, createInternalEditorID, AbsoluteRefType, NilCommand, connectInjector, Range, cellToRange, convertBodyToHtml, handleStyleToString, DEFAULT_WORKSHEET_ROW_HEIGHT, DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY, DEFAULT_WORKSHEET_COLUMN_WIDTH, Optional, IConfigService, FOCUSING_EDITOR_BUT_HIDDEN, LocaleType, IResourceLoaderService, isRealNum, isICellData, IAuthzIoService, isValidRange, Plugin, mergeOverrideWithDependencies, DependentOn } from "@univerjs/core";
+import { Disposable, Inject, Injector, CommandType, IUniverInstanceService, ICommandService, UniverInstanceType, LocaleService, Direction, Rectangle, getReverseDirection, RANGE_TYPE, Tools, Workbook, toDisposable, IContextService, UserManagerService, FOCUSING_COMMON_DRAWINGS, IPermissionService, RxDisposable, OnLifecycle, LifecycleStages, ObjectMatrix, isFormulaString, isFormulaId, CellValueType, numfmt, createIdentifier, IUndoRedoService, createInterceptorKey, makeCellToSelection, ColorKit, Quantity, InterceptorManager, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, EDITOR_ACTIVATED, FOCUSING_EDITOR_STANDALONE, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE, ThemeService, FOCUSING_SHEET, DisposableCollection, getCellInfoInMergeData, sortRules, sequenceExecute, Dimension, ILogService, BorderStyleTypes, useDependency, DEFAULT_EMPTY_DOCUMENT_VALUE, DocumentFlavor, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, HorizontalAlign, VerticalAlign, WrapStrategy, BooleanNumber, FOCUSING_UNIVER_EDITOR, FOCUSING_EDITOR_INPUT_FORMULA, FOCUSING_FX_BAR_EDITOR, LRUMap, BaselineOffset, DataStreamTreeTokenType, skipParseTagNames, ErrorService, extractPureTextFromCell, FontWeight, FontItalic, DEFAULT_STYLES, nameCharacterCheck, debounce, createInternalEditorID, AbsoluteRefType, NilCommand, connectInjector, Range, cellToRange, convertBodyToHtml, handleStyleToString, DEFAULT_WORKSHEET_ROW_HEIGHT, DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY, DEFAULT_WORKSHEET_COLUMN_WIDTH, Optional, IConfigService, FOCUSING_EDITOR_BUT_HIDDEN, LocaleType, IResourceLoaderService, isRealNum, isICellData, IAuthzIoService, isValidRange, Plugin, mergeOverrideWithDependencies, DependentOn } from "@univerjs/core";
 import { SpreadsheetSkeleton, IRenderManagerService, Vector2, SHEET_VIEWPORT_KEY as SHEET_VIEWPORT_KEY$1, RENDER_RAW_FORMULA_KEY, Spreadsheet, Rect, DashedRect, Group, TRANSFORM_CHANGE_OBSERVABLE_TYPE, cancelRequestFrame, requestNewFrame, FIX_ONE_PIXEL_BLUR_OFFSET, CURSOR_TYPE, ScrollTimer, ScrollTimerType, isRectIntersect, DeviceInputEventType, getCanvasOffsetByEngine, convertTextRotation, ptToPixel, hasCJKText, ITextSelectionRenderManager, DEFAULT_PADDING_DATA, ptToPx, ScrollBar, fixLineWidthByScale, Shape, RegularPolygon, Layer, SpreadsheetRowHeader, SpreadsheetColumnHeader, Viewport, PointerInput, RENDER_CLASS_TYPE, SheetExtension } from "@univerjs/engine-render";
-import { getSheetCommandTarget, alignToMergedCellsBorders, getSelectionsService, getCellAtRowCol, SetSelectionsOperation, expandToContinuousRange, ScrollToCellOperation, SheetsSelectionsService, RangeProtectionRuleModel, WorksheetProtectionRuleModel, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, generateNullCellValue, SetRangeValuesUndoMutationFactory, SetRangeValuesMutation, SELECTION_CONTROL_BORDER_BUFFER_COLOR, getNormalSelectionStyle, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, transformCellDataToSelectionData, IRefSelectionsService, SetRangeValuesCommand, SetWorksheetActiveOperation, MoveRangeMutation, RemoveRowMutation, RemoveColMutation, InsertRowMutation, InsertColMutation, MoveRowsMutation, MoveColsMutation, SetWorksheetColWidthMutation, SetWorksheetRowHeightMutation, RemoveSheetMutation, RemoveMergeUndoMutationFactory, RemoveWorksheetMergeMutation, AddWorksheetMergeMutation, getAddMergeMutationRangeByType, AddMergeUndoMutationFactory, AddMergeRedoSelectionsOperationFactory, AddMergeUndoSelectionsOperationFactory, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, SetRowHiddenCommand, SetColHiddenCommand, SetBoldCommand, SetItalicCommand, SetUnderlineCommand, SetStrikeThroughCommand, SetFontSizeCommand, SetFontFamilyCommand, SetTextColorCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, RemoveRowCommand, RemoveColCommand, RemoveSheetCommand, SetFrozenMutationFactory, SetFrozenMutation, BorderStyleManagerService, RangeProtectionPermissionEditPoint, WorksheetSetCellValuePermission, WorksheetEditPermission, SetWorksheetOrderMutation, InsertSheetMutation, SetWorksheetNameMutation, SetWorksheetHideMutation, SetWorksheetShowCommand, SetWorksheetActivateCommand, getPrimaryForRange, WorksheetCopyPermission, WorksheetSetCellStylePermission, ResetTextColorCommand, ResetBackgroundColorCommand, SetBackgroundColorCommand, SetHorizontalTextAlignCommand, SetVerticalTextAlignCommand, SetTextWrapCommand, SetTextRotationCommand, WorkbookCopyPermission, RangeProtectionPermissionViewPoint, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, SetWorksheetRowIsAutoHeightCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectedRowsVisibleCommand, SetColHiddenMutation, SetColVisibleMutation, SetSelectedColsVisibleCommand, SetRowHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetColWidthCommand, SetWorksheetNameCommand, SetWorksheetOrderCommand, WorkbookRenameSheetPermission, SetTabColorMutation, WorkbookCreateSheetPermission, InsertSheetCommand, InsertDefinedNameCommand, SetDefinedNameCommand, RemoveDefinedNameCommand, AddWorksheetProtectionMutation, DeleteWorksheetProtectionMutation, SetWorksheetProtectionMutation, AddRangeProtectionMutation, DeleteRangeProtectionMutation, SetRangeProtectionMutation, ClearSelectionContentCommand, ClearSelectionFormatCommand, ClearSelectionAllCommand, WorksheetDeleteColumnPermission, WorksheetDeleteRowPermission, WorksheetInsertColumnPermission, WorksheetInsertRowPermission, InsertRowBeforeCommand, InsertRowAfterCommand, InsertColBeforeCommand, InsertColAfterCommand, CopySheetCommand, SetTabColorCommand, SetWorksheetHideCommand, WorkbookDeleteSheetPermission, WorkbookHideSheetPermission, SetBorderBasicCommand, MergeCellController, MERGE_CELL_INTERCEPTOR_CHECK, RemoveWorksheetMergeCommand, DISABLE_NORMAL_SELECTIONS, SelectionMoveType, convertSelectionDataToRange, SetWorksheetRowAutoHeightMutationFactory, SetWorksheetRowAutoHeightMutation, SetStyleCommand, SheetInterceptorService, MoveRangeCommand, MAX_CELL_PER_SHEET_KEY, SetFrozenCommand, InsertRowCommand, InsertColCommand, MoveColsCommand, MoveRowsCommand, DeltaRowHeightCommand, DeltaColumnWidthCommand, SetSpecificRowsVisibleCommand, SetSpecificColsVisibleCommand, INumfmtService, COMMAND_LISTENER_SKELETON_CHANGE, COMMAND_LISTENER_VALUE_CHANGE, RefRangeService, INTERCEPTOR_POINT, WorkbookMoveSheetPermission, WorksheetViewPermission, getAllRangePermissionPoint, getAllWorksheetPermissionPointByPointPanel, defaultWorkbookPermissionPoints, getAllWorkbookPermissionPoint, getAllWorksheetPermissionPoint, defaultWorksheetPermissionPoint, WorksheetProtectionPointModel, RangeProtectionRenderModel, setEndForRange, DeleteRangeProtectionCommand, AddRangeProtectionCommand as AddRangeProtectionCommand$1, SetWorksheetPermissionPointsCommand, UniverSheetsPlugin } from "@univerjs/sheets";
+import { getSheetCommandTarget, alignToMergedCellsBorders, getSelectionsService, getCellAtRowCol, SetSelectionsOperation, expandToContinuousRange, ScrollToCellOperation, SheetsSelectionsService, RangeProtectionRuleModel, WorksheetProtectionRuleModel, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, generateNullCellValue, SetRangeValuesUndoMutationFactory, SetRangeValuesMutation, SELECTION_CONTROL_BORDER_BUFFER_COLOR, getNormalSelectionStyle, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, transformCellDataToSelectionData, IRefSelectionsService, SetRangeValuesCommand, SetWorksheetActiveOperation, MoveRangeMutation, RemoveRowMutation, RemoveColMutation, InsertRowMutation, InsertColMutation, MoveRowsMutation, MoveColsMutation, SetWorksheetColWidthMutation, SetWorksheetRowHeightMutation, RemoveSheetMutation, AddMergeUndoMutationFactory, RemoveWorksheetMergeMutation, AddWorksheetMergeMutation, getAddMergeMutationRangeByType, RemoveMergeUndoMutationFactory, AddMergeRedoSelectionsOperationFactory, AddMergeUndoSelectionsOperationFactory, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, SetRowHiddenCommand, SetColHiddenCommand, SetBoldCommand, SetItalicCommand, SetUnderlineCommand, SetStrikeThroughCommand, SetFontSizeCommand, SetFontFamilyCommand, SetTextColorCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, RemoveRowCommand, RemoveColCommand, RemoveSheetCommand, SetFrozenMutationFactory, SetFrozenMutation, BorderStyleManagerService, RangeProtectionPermissionEditPoint, WorksheetSetCellValuePermission, WorksheetEditPermission, SetWorksheetOrderMutation, InsertSheetMutation, SetWorksheetNameMutation, SetWorksheetHideMutation, SetWorksheetShowCommand, SetWorksheetActivateCommand, getPrimaryForRange, WorksheetCopyPermission, WorksheetSetCellStylePermission, ResetTextColorCommand, ResetBackgroundColorCommand, SetBackgroundColorCommand, SetHorizontalTextAlignCommand, SetVerticalTextAlignCommand, SetTextWrapCommand, SetTextRotationCommand, WorkbookCopyPermission, RangeProtectionPermissionViewPoint, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, SetWorksheetRowIsAutoHeightCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectedRowsVisibleCommand, SetColHiddenMutation, SetColVisibleMutation, SetSelectedColsVisibleCommand, SetRowHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetColWidthCommand, SetWorksheetNameCommand, SetWorksheetOrderCommand, WorkbookRenameSheetPermission, SetTabColorMutation, WorkbookCreateSheetPermission, InsertSheetCommand, InsertDefinedNameCommand, SetDefinedNameCommand, RemoveDefinedNameCommand, AddWorksheetProtectionMutation, DeleteWorksheetProtectionMutation, SetWorksheetProtectionMutation, AddRangeProtectionMutation, DeleteRangeProtectionMutation, SetRangeProtectionMutation, ClearSelectionContentCommand, ClearSelectionFormatCommand, ClearSelectionAllCommand, WorksheetDeleteColumnPermission, WorksheetDeleteRowPermission, WorksheetInsertColumnPermission, WorksheetInsertRowPermission, InsertRowBeforeCommand, InsertRowAfterCommand, InsertColBeforeCommand, InsertColAfterCommand, CopySheetCommand, SetTabColorCommand, SetWorksheetHideCommand, WorkbookDeleteSheetPermission, WorkbookHideSheetPermission, SetBorderBasicCommand, MergeCellController, MERGE_CELL_INTERCEPTOR_CHECK, RemoveWorksheetMergeCommand, DISABLE_NORMAL_SELECTIONS, SelectionMoveType, convertSelectionDataToRange, SetWorksheetRowAutoHeightMutationFactory, SetWorksheetRowAutoHeightMutation, SetStyleCommand, SheetInterceptorService, MoveRangeCommand, MAX_CELL_PER_SHEET_KEY, SetFrozenCommand, InsertRowCommand, InsertColCommand, MoveColsCommand, MoveRowsCommand, DeltaRowHeightCommand, DeltaColumnWidthCommand, SetSpecificRowsVisibleCommand, SetSpecificColsVisibleCommand, INumfmtService, COMMAND_LISTENER_SKELETON_CHANGE, COMMAND_LISTENER_VALUE_CHANGE, RefRangeService, INTERCEPTOR_POINT, WorkbookMoveSheetPermission, WorksheetViewPermission, getAllRangePermissionPoint, getAllWorksheetPermissionPointByPointPanel, defaultWorkbookPermissionPoints, getAllWorkbookPermissionPoint, getAllWorksheetPermissionPoint, defaultWorksheetPermissionPoint, WorksheetProtectionPointModel, RangeProtectionRenderModel, setEndForRange, DeleteRangeProtectionCommand, AddRangeProtectionCommand as AddRangeProtectionCommand$1, SetWorksheetPermissionPointsCommand, UniverSheetsPlugin } from "@univerjs/sheets";
 import { BehaviorSubject, switchMap, of, combineLatest, startWith, map, takeUntil, distinctUntilChanged, Subject, merge, EMPTY, Observable, combineLatestWith, filter, Subscription, throttleTime } from "rxjs";
 import { KeyCode, IEditorService, IConfirmService, ComponentManager, useObservable, DISABLE_AUTO_FOCUS_KEY, TextEditor, ISidebarService, ProgressBar, DEFAULT_BACKGROUND_COLOR_RGB, DEFAULT_BACKGROUND_COLOR_RGBA, handleStringToStyle, textTrim, PLAIN_TEXT_CLIPBOARD_MIME_TYPE, HTML_CLIPBOARD_MIME_TYPE, IClipboardInterfaceService, INotificationService, IPlatformService, CopyCommand, CutCommand, PasteCommand, MenuGroup, MenuItemType, MenuPosition, getMenuHiddenObservable, FONT_FAMILY_LIST, FONT_SIZE_LIST, Menu as Menu$1, IMessageService, RangeSelector, IDialogService, MetaKeys, FontFamily, FontFamilyItem, FontSize, BuiltInUIPart, ILayoutService, IShortcutService, IMenuService, IUIPartsService, SetEditorResizeOperation, IContextMenuService, ICanvasPopupService, IRangeSelectorService, UniverMobileUIPlugin } from "@univerjs/ui";
-import { numfmt } from "@univerjs/engine-numfmt";
 import React, { forwardRef, useRef, createElement, useState, useEffect, useCallback, useLayoutEffect, useMemo } from "react";
 import { Dropdown, ColorPicker, Menu, MenuItem, InputNumber, Slider, Input, Tooltip, MessageType, RadioGroup, Radio, Select, Button, Confirm, FormLayout, Avatar, Switch } from "@univerjs/design";
 import clsx from "clsx";
@@ -153,7 +152,7 @@ SheetSkeletonManagerService = __decorateClass$U([
   __decorateParam$T(1, Inject(Injector))
 ], SheetSkeletonManagerService);
 function attachRangeWithCoord(skeleton, range) {
-  const { startRow, startColumn, endRow, endColumn, rangeType } = range, startCell = skeleton.getNoMergeCellPositionByIndex(startRow, startColumn), endCell = skeleton.getNoMergeCellPositionByIndex(endRow, endColumn);
+  const { startRow, startColumn, endRow, endColumn, rangeType } = range, _startRow = endRow < startRow ? endRow : startRow, _endRow = endRow < startRow ? startRow : endRow, _startColumn = endColumn < startColumn ? endColumn : startColumn, _endColumn = endColumn < startColumn ? startColumn : endColumn, startCell = skeleton.getNoMergeCellPositionByIndex(_startRow, _startColumn), endCell = skeleton.getNoMergeCellPositionByIndex(_endRow, _endColumn);
   return {
     startRow,
     startColumn,
@@ -1334,7 +1333,7 @@ SheetsScrollRenderController = __decorateClass$R([
   __decorateParam$Q(5, IRenderManagerService),
   __decorateParam$Q(6, Inject(SheetScrollManagerService))
 ], SheetsScrollRenderController);
-var I = /* @__PURE__ */ ((E) => (E[E.UNIVER_UNKNOWN = 0] = "UNIVER_UNKNOWN", E[E.UNIVER_DOC = 1] = "UNIVER_DOC", E[E.UNIVER_SHEET = 2] = "UNIVER_SHEET", E[E.UNIVER_SLIDE = 3] = "UNIVER_SLIDE", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(I || {}), L = /* @__PURE__ */ ((E) => (E[E.SomeCollaborator = 0] = "SomeCollaborator", E[E.AllCollaborator = 1] = "AllCollaborator", E[E.OneSelf = 2] = "OneSelf", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(L || {}), P = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(P || {}), M = /* @__PURE__ */ ((E) => (E[E.Reader = 0] = "Reader", E[E.Editor = 1] = "Editor", E[E.Owner = 2] = "Owner", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(M || {}), l$1 = /* @__PURE__ */ ((E) => (E[E.Unkonwn = 0] = "Unkonwn", E[E.Workbook = 1] = "Workbook", E[E.Worksheet = 2] = "Worksheet", E[E.SelectRange = 3] = "SelectRange", E[E.Document = 4] = "Document", E[E.Slide = 5] = "Slide", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(l$1 || {});
+var I = /* @__PURE__ */ ((E) => (E[E.UNIVER_UNKNOWN = 0] = "UNIVER_UNKNOWN", E[E.UNIVER_DOC = 1] = "UNIVER_DOC", E[E.UNIVER_SHEET = 2] = "UNIVER_SHEET", E[E.UNIVER_SLIDE = 3] = "UNIVER_SLIDE", E[E.UNIVER_PROJECT = 4] = "UNIVER_PROJECT", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(I || {}), L = /* @__PURE__ */ ((E) => (E[E.SomeCollaborator = 0] = "SomeCollaborator", E[E.AllCollaborator = 1] = "AllCollaborator", E[E.OneSelf = 2] = "OneSelf", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(L || {}), P = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(P || {}), M = /* @__PURE__ */ ((E) => (E[E.Reader = 0] = "Reader", E[E.Editor = 1] = "Editor", E[E.Owner = 2] = "Owner", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(M || {}), l$1 = /* @__PURE__ */ ((E) => (E[E.Unkonwn = 0] = "Unkonwn", E[E.Workbook = 1] = "Workbook", E[E.Worksheet = 2] = "Worksheet", E[E.SelectRange = 3] = "SelectRange", E[E.Document = 4] = "Document", E[E.Slide = 5] = "Slide", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(l$1 || {});
 function getActiveSheet$(univerInstanceService) {
   return univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => workbook ? workbook.activeSheet$.pipe(map((worksheet) => worksheet ? { workbook, worksheet } : null)) : of(null)));
 }
@@ -1557,7 +1556,9 @@ let SheetsRenderService = (_a5 = class extends RxDisposable {
     this._initWorkbookListener(), this._initContextListener();
   }
   _initWorkbookListener() {
-    this._instanceSrv.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => this._createRenderer(workbook)), this._instanceSrv.getAllUnitsForType(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => this._createRenderer(workbook)), this._instanceSrv.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => this._disposeRenderer(workbook));
+    this._instanceSrv.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {
+      this._createRenderer(workbook);
+    }), this._instanceSrv.getAllUnitsForType(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => this._createRenderer(workbook)), this._instanceSrv.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => this._disposeRenderer(workbook));
   }
   _createRenderer(workbook) {
     const unitId = workbook.getUnitId();
@@ -4705,9 +4706,7 @@ let AutoFillController = (_a9 = class extends Disposable {
     const unitId = workbook.getUnitId(), subUnitId = (_a59 = workbook.getActiveSheet()) == null ? void 0 : _a59.getSheetId();
     if (!subUnitId) return;
     this._autoFillService.direction = direction;
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, autoFillSource = rangeToDiscreteRange(source, accessor), autoFillTarget = rangeToDiscreteRange(target, accessor);
+    const autoFillSource = this._injector.invoke((accessor) => rangeToDiscreteRange(source, accessor)), autoFillTarget = this._injector.invoke((accessor) => rangeToDiscreteRange(target, accessor));
     if (!autoFillSource || !autoFillTarget)
       return;
     this._autoFillService.autoFillLocation = {
@@ -4822,11 +4821,7 @@ let AutoFillController = (_a9 = class extends Disposable {
       throw new Error("No active sheet found");
     const currentCellDatas = worksheet.getCellMatrix(), rules = this._autoFillService.getRules(), copyData = [], isVertical = direction === Direction.DOWN || direction === Direction.UP;
     let aArray, bArray;
-    isVertical ? (aArray = source.cols, bArray = source.rows) : (aArray = source.rows, bArray = source.cols);
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    };
-    return aArray.forEach((a) => {
+    return isVertical ? (aArray = source.cols, bArray = source.rows) : (aArray = source.rows, bArray = source.cols), aArray.forEach((a) => {
       const copyDataPiece = this._getEmptyCopyDataPiece(), prevData = {
         type: void 0,
         cellData: void 0
@@ -4834,7 +4829,7 @@ let AutoFillController = (_a9 = class extends Disposable {
       bArray.forEach((b) => {
         let data;
         isVertical ? data = currentCellDatas.getValue(b, a) : data = currentCellDatas.getValue(a, b);
-        const { type, isContinue } = rules.find((r) => r.match(data, accessor)) || otherRule;
+        const { type, isContinue } = rules.find((r) => r.match(data, this._injector)) || otherRule;
         if (isContinue(prevData, data)) {
           const typeInfo = copyDataPiece[type], last = typeInfo[typeInfo.length - 1];
           last.data.push(data), last.index.push(b - bArray[0]);
@@ -4988,9 +4983,7 @@ let AutoFillController = (_a9 = class extends Disposable {
         }
       });
     });
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, deleteMergeRanges = [], mergeData = (_b = (_a59 = this._univerInstanceService.getUniverSheetInstance(unitId)) == null ? void 0 : _a59.getSheetBySheetId(subUnitId)) == null ? void 0 : _b.getMergeData();
+    const deleteMergeRanges = [], mergeData = (_b = (_a59 = this._univerInstanceService.getUniverSheetInstance(unitId)) == null ? void 0 : _a59.getSheetBySheetId(subUnitId)) == null ? void 0 : _b.getMergeData();
     mergeData && mergeData.forEach((merge2) => {
       Rectangle.intersects(merge2, targetRange) && deleteMergeRanges.push(merge2);
     });
@@ -4998,8 +4991,8 @@ let AutoFillController = (_a9 = class extends Disposable {
       unitId,
       subUnitId,
       ranges: deleteMergeRanges
-    }, undoRemoveMergeMutationParams = RemoveMergeUndoMutationFactory(
-      accessor,
+    }, undoRemoveMergeMutationParams = this._injector.invoke(
+      AddMergeUndoMutationFactory,
       removeMergeMutationParams
     );
     deleteMergeRanges.length && (redos.push({ id: RemoveWorksheetMergeMutation.id, params: removeMergeMutationParams }), undos.push({ id: AddWorksheetMergeMutation.id, params: undoRemoveMergeMutationParams }));
@@ -5007,8 +5000,8 @@ let AutoFillController = (_a9 = class extends Disposable {
       subUnitId,
       unitId,
       cellValue: generateNullCellValueRowCol([target])
-    }, undoClearMutationParams = SetRangeValuesUndoMutationFactory(
-      accessor,
+    }, undoClearMutationParams = this._injector.invoke(
+      SetRangeValuesUndoMutationFactory,
       clearMutationParams
     );
     redos.push({ id: SetRangeValuesMutation.id, params: clearMutationParams }), undos.push({ id: SetRangeValuesMutation.id, params: undoClearMutationParams });
@@ -5022,8 +5015,8 @@ let AutoFillController = (_a9 = class extends Disposable {
       subUnitId,
       unitId,
       cellValue: cellValue.getMatrix()
-    }, undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(
-      accessor,
+    }, undoSetRangeValuesMutationParams = this._injector.invoke(
+      SetRangeValuesUndoMutationFactory,
       setRangeValuesMutationParams
     );
     if (undos.push({ id: SetRangeValuesMutation.id, params: undoSetRangeValuesMutationParams }), redos.push({ id: SetRangeValuesMutation.id, params: setRangeValuesMutationParams }), applyMergeRanges != null && applyMergeRanges.length) {
@@ -5031,8 +5024,8 @@ let AutoFillController = (_a9 = class extends Disposable {
         unitId,
         subUnitId,
         ranges
-      }, undoRemoveMutationParams = AddMergeUndoMutationFactory(
-        accessor,
+      }, undoRemoveMutationParams = this._injector.invoke(
+        RemoveMergeUndoMutationFactory,
         addMergeMutationParams
       );
       undos.push({ id: RemoveWorksheetMergeMutation.id, params: undoRemoveMutationParams }), redos.push({ id: AddWorksheetMergeMutation.id, params: addMergeMutationParams });
@@ -8470,9 +8463,7 @@ let SheetClipboardService = (_a13 = class extends Disposable {
     const target = this._getPastingTarget();
     if (!target.subUnitId || !target.selection)
       return !1;
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, range = rangeToDiscreteRange(target.selection.range, accessor, target.unitId, target.subUnitId);
+    const range = this._injector.invoke((accessor) => rangeToDiscreteRange(target.selection.range, accessor, target.unitId, target.subUnitId));
     if (!range)
       return !1;
     const { unitId, subUnitId } = target, hooks = this._clipboardHooks, enabledHooks = [];
@@ -8749,9 +8740,7 @@ let SheetClipboardService = (_a13 = class extends Disposable {
     const target = this._getPastingTarget(), { selection, unitId, subUnitId } = target;
     if (!subUnitId || !selection)
       return null;
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, discreteRange = rangeToDiscreteRange(selection.range, accessor, unitId, subUnitId);
+    const discreteRange = this._injector.invoke((accessor) => rangeToDiscreteRange(selection.range, accessor, unitId, subUnitId));
     if (!discreteRange)
       return null;
     const { ranges: [vRange], mapFunc } = virtualizeDiscreteRanges([discreteRange]), { startRow, startColumn, endRow, endColumn } = vRange, destinationRows = endRow - startRow + 1, destinationColumns = endColumn - startColumn + 1, workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), worksheet = workbook == null ? void 0 : workbook.getActiveSheet();
@@ -8816,9 +8805,7 @@ let SheetClipboardService = (_a13 = class extends Disposable {
     const target = this._getPastingTarget(), { selection, unitId, subUnitId } = target;
     if (!subUnitId || !selection)
       return null;
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, discreteRange = rangeToDiscreteRange(selection.range, accessor, unitId, subUnitId);
+    const discreteRange = this._injector.invoke((accessor) => rangeToDiscreteRange(selection.range, accessor, unitId, subUnitId));
     if (!discreteRange)
       return null;
     const { startColumn, endColumn, startRow, endRow } = cellMatrix.getDataRange(), rowCount = endRow - startRow + 1, colCount = endColumn - startColumn + 1;
@@ -13593,6 +13580,8 @@ function getMoveRangeMutations(from, to, accessor) {
         newToCellValue.setValue(range.startRow, range.startColumn, fromCellMatrix.getValue(row, col));
       });
       const doMoveRangeMutation = {
+        fromRange,
+        toRange,
         from: {
           value: newFromCellValue.getMatrix(),
           subUnitId: fromSubUnitId
@@ -13603,6 +13592,8 @@ function getMoveRangeMutations(from, to, accessor) {
         },
         unitId
       }, undoMoveRangeMutation = {
+        fromRange: toRange,
+        toRange: fromRange,
         from: {
           value: fromCellValue.getMatrix(),
           subUnitId: fromSubUnitId
@@ -13743,7 +13734,8 @@ function getSetCellStyleMutations(pasteTo, matrix, accessor, withRichFormat = !1
       s: Object.assign({}, {
         ...DEFAULT_STYLES,
         pd: DEFAULT_PADDING_DATA,
-        bg: null
+        bg: null,
+        cl: null
       }, value.s)
     };
     withRichFormat && ((_a59 = value.p) != null && _a59.body) && (newValue.p = value.p);
@@ -14171,44 +14163,39 @@ let SheetClipboardController = (_a19 = class extends RxDisposable {
     };
   }
   _onPasteCells(pasteFrom, pasteTo, data, payload) {
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    };
-    return getDefaultOnPasteCellMutations(pasteFrom, pasteTo, data, payload, accessor);
+    return this._injector.invoke((accessor) => getDefaultOnPasteCellMutations(pasteFrom, pasteTo, data, payload, accessor));
   }
   _initSpecialPasteHooks() {
-    const accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, self = this, specialPasteValueHook = {
+    const self = this, specialPasteValueHook = {
       id: PREDEFINED_HOOK_NAME.SPECIAL_PASTE_VALUE,
       specialPasteInfo: {
         label: "specialPaste.value"
       },
-      onPasteCells: /* @__PURE__ */ __name((pasteFrom, pasteTo, data) => getSetCellValueMutations(pasteTo, pasteFrom, data, accessor), "onPasteCells")
+      onPasteCells: /* @__PURE__ */ __name((pasteFrom, pasteTo, data) => this._injector.invoke((accessor) => getSetCellValueMutations(pasteTo, pasteFrom, data, accessor)), "onPasteCells")
     }, specialPasteFormatHook = {
       id: PREDEFINED_HOOK_NAME.SPECIAL_PASTE_FORMAT,
       specialPasteInfo: {
         label: "specialPaste.format"
       },
-      onPasteCells(pasteFrom, pasteTo, matrix) {
-        const redoMutationsInfo = [], undoMutationsInfo = [], { undos: styleUndos, redos: styleRedos } = getClearCellStyleMutations(pasteTo, matrix, accessor);
+      onPasteCells: /* @__PURE__ */ __name((pasteFrom, pasteTo, matrix) => {
+        const redoMutationsInfo = [], undoMutationsInfo = [], { undos: styleUndos, redos: styleRedos } = this._injector.invoke((accessor) => getClearCellStyleMutations(pasteTo, matrix, accessor));
         redoMutationsInfo.push(...styleRedos), undoMutationsInfo.push(...styleUndos);
-        const { undos: mergeUndos, redos: mergeRedos } = getClearAndSetMergeMutations(
+        const { undos: mergeUndos, redos: mergeRedos } = this._injector.invoke((accessor) => getClearAndSetMergeMutations(
           pasteTo,
           matrix,
           accessor
-        );
+        ));
         redoMutationsInfo.push(...mergeRedos), undoMutationsInfo.push(...mergeUndos);
-        const { undos: setStyleUndos, redos: setStyleRedos } = getSetCellStyleMutations(
+        const { undos: setStyleUndos, redos: setStyleRedos } = this._injector.invoke((accessor) => getSetCellStyleMutations(
           pasteTo,
           matrix,
           accessor
-        );
+        ));
         return redoMutationsInfo.push(...setStyleRedos), undoMutationsInfo.push(...setStyleUndos), {
           undos: undoMutationsInfo,
           redos: redoMutationsInfo
         };
-      }
+      }, "onPasteCells")
     }, specialPasteColWidthHook = {
       id: PREDEFINED_HOOK_NAME.SPECIAL_PASTE_COL_WIDTH,
       specialPasteInfo: {
@@ -14252,7 +14239,7 @@ let SheetClipboardController = (_a19 = class extends RxDisposable {
       specialPasteInfo: {
         label: "specialPaste.besidesBorder"
       },
-      onPasteCells(pasteFrom, pasteTo, matrix, payload) {
+      onPasteCells: /* @__PURE__ */ __name((pasteFrom, pasteTo, matrix, payload) => {
         self._currentUniverSheet.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
         const redoMutationsInfo = [], undoMutationsInfo = [], { range, unitId, subUnitId } = pasteTo, valueMatrix = new ObjectMatrix();
         matrix.forValue((row, col, value) => {
@@ -14271,20 +14258,20 @@ let SheetClipboardController = (_a19 = class extends RxDisposable {
           id: SetRangeValuesMutation.id,
           params: setValuesMutation
         });
-        const undoSetValuesMutation = SetRangeValuesUndoMutationFactory(
-          accessor,
+        const undoSetValuesMutation = this._injector.invoke(
+          SetRangeValuesUndoMutationFactory,
           setValuesMutation
         );
         undoMutationsInfo.push({
           id: SetRangeValuesMutation.id,
           params: undoSetValuesMutation
         });
-        const { undos, redos } = getClearAndSetMergeMutations(pasteTo, matrix, accessor);
+        const { undos, redos } = this._injector.invoke((accessor) => getClearAndSetMergeMutations(pasteTo, matrix, accessor));
         return undoMutationsInfo.push(...undos), redoMutationsInfo.push(...redos), {
           redos: redoMutationsInfo,
           undos: undoMutationsInfo
         };
-      }
+      }, "onPasteCells")
     };
     return [specialPasteValueHook, specialPasteFormatHook, specialPasteColWidthHook, specialPasteBesidesBorder];
   }
@@ -14755,7 +14742,9 @@ let EditingRenderController = (_a21 = class extends Disposable {
   }
   _init() {
     const d = new DisposableCollection();
-    return this._subscribeToCurrentCell(d), this._initialKeyboardListener(d), this._initialCursorSync(d), this._listenEditorFocus(d), this._commandExecutedListener(d), this._cursorStateListener(d), d;
+    return this._subscribeToCurrentCell(d), this._initialKeyboardListener(d), this._initialCursorSync(d), this._listenEditorFocus(d), this._commandExecutedListener(d), setTimeout(() => {
+      this._cursorStateListener(d);
+    }, 1e3), d;
   }
   _initEditorVisibilityListener() {
     this.disposeWithMe(this._editorBridgeService.visible$.pipe(distinctUntilChanged((prev, curr) => prev.visible === curr.visible)).subscribe((param) => {
@@ -17049,17 +17038,17 @@ let StatusBarController = (_a29 = class extends Disposable {
     this._statusBarService.setState(null);
   }
   _calculateSelection(selections, primary) {
-    var _a59, _b;
+    var _a59;
     const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook)
       return this._clearResult();
-    const unitId = workbook.getUnitId(), sheetId = (_a59 = workbook.getActiveSheet()) == null ? void 0 : _a59.getSheetId();
+    const unitId = workbook.getUnitId(), sheet = workbook.getActiveSheet(), sheetId = sheet == null ? void 0 : sheet.getSheetId();
     if (!sheetId)
       return this._clearResult();
     const sheetData = {}, arrayFormulaMatrixCell = this._formulaDataModel.getArrayFormulaCellData();
-    if (this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getSheets().forEach((sheet) => {
-      const sheetConfig = sheet.getConfig();
-      sheetData[sheet.getSheetId()] = {
+    if (this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getSheets().forEach((sheet2) => {
+      const sheetConfig = sheet2.getConfig();
+      sheetData[sheet2.getSheetId()] = {
         cellData: new ObjectMatrix(sheetConfig.cellData),
         rowCount: sheetConfig.rowCount,
         columnCount: sheetConfig.columnCount,
@@ -17067,7 +17056,15 @@ let StatusBarController = (_a29 = class extends Disposable {
         columnData: sheetConfig.columnData
       };
     }), selections != null && selections.length) {
-      const refs = selections.map((s) => new RangeReferenceObject(s, sheetId, unitId));
+      const realSelections = [];
+      selections.forEach((selection) => {
+        const { startRow: start, endRow: end } = selection;
+        let prev = null;
+        for (let r = start; r <= end; r++)
+          sheet.getRowVisible(r) ? prev === null && (prev = r) : prev !== null && (realSelections.push({ ...selection, startRow: prev, endRow: r - 1 }), prev = null);
+        prev !== null && realSelections.push({ ...selection, startRow: prev, endRow: end });
+      });
+      const refs = realSelections.map((s) => new RangeReferenceObject(s, sheetId, unitId));
       refs.forEach((ref) => {
         ref.setUnitData({
           [unitId]: sheetData
@@ -17093,7 +17090,7 @@ let StatusBarController = (_a29 = class extends Disposable {
       let pattern = null;
       if (primary) {
         const { actualRow, actualColumn } = primary;
-        pattern = (_b = this._numfmtService.getValue(unitId, sheetId, actualRow, actualColumn)) == null ? void 0 : _b.pattern;
+        pattern = (_a59 = this._numfmtService.getValue(unitId, sheetId, actualRow, actualColumn)) == null ? void 0 : _a59.pattern;
       }
       const newState = {
         values: calcResult.filter((r) => r !== void 0),
@@ -17294,7 +17291,7 @@ let SheetRenderController = (_a30 = class extends RxDisposable {
       this._markViewportDirty(viewports, dirtyBounds), spreadsheet.setDirtyArea(dirtyBounds);
     }
     if (command.id === MoveRangeMutation.id && cmdParams.from && cmdParams.to) {
-      const fromRange = this._cellValueToRange(cmdParams.from.value), toRange = this._cellValueToRange(cmdParams.to.value), dirtyBounds = this._rangeToBounds([fromRange, toRange]);
+      const fromRange = cmdParams.fromRange || this._cellValueToRange(cmdParams.from.value), toRange = cmdParams.toRange || this._cellValueToRange(cmdParams.to.value), dirtyBounds = this._rangeToBounds([fromRange, toRange]);
       this._markViewportDirty(viewports, dirtyBounds), spreadsheet.setDirtyArea(dirtyBounds);
     }
   }
@@ -17302,19 +17299,20 @@ let SheetRenderController = (_a30 = class extends RxDisposable {
    * cellValue data structure:
    * {[row]: { [col]: value}}
    * @param cellValue
-   * @returns
+   * @returns IRange
    */
   _cellValueToRange(cellValue) {
-    const rows = Object.keys(cellValue).map(Number), columns = [];
-    for (const [_row, columnObj] of Object.entries(cellValue))
+    let minCol = 0, maxCol = 0, minRow = 0, maxRow = 0;
+    for (const [_row, columnObj] of Object.entries(cellValue)) {
       for (const column in columnObj)
-        columns.push(Number(column));
-    const startRow = Math.min(...rows), endRow = Math.max(...rows), startColumn = Math.min(...columns), endColumn = Math.max(...columns);
+        minCol > Number(column) && (minCol = Number(column)), maxCol < Number(column) && (maxCol = Number(column));
+      minRow > Number(_row) && (minRow = Number(_row)), maxRow < Number(_row) && (maxRow = Number(_row));
+    }
     return {
-      startRow,
-      endRow,
-      startColumn,
-      endColumn
+      startRow: minRow,
+      endRow: maxRow,
+      startColumn: minCol,
+      endColumn: maxCol
     };
   }
   _rangeToBounds(ranges) {
@@ -17548,7 +17546,8 @@ let SheetCanvasPopManagerService = (_a33 = class extends Disposable {
       unitId,
       subUnitId,
       anchorRect: position,
-      anchorRect$: position$
+      anchorRect$: position$,
+      canvasElement: currentRender.engine.getCanvasElement()
     });
     return {
       dispose: /* @__PURE__ */ __name(() => {
@@ -17585,7 +17584,8 @@ let SheetCanvasPopManagerService = (_a33 = class extends Disposable {
       unitId,
       subUnitId,
       anchorRect: position,
-      anchorRect$: position$
+      anchorRect$: position$,
+      canvasElement: currentRender.engine.getCanvasElement()
     }), disposableCollection = new DisposableCollection();
     disposableCollection.add(positionObserverDisposable), disposableCollection.add(toDisposable(() => {
       this._globalPopupManagerService.removePopup(id), position$.complete();
@@ -18030,9 +18030,7 @@ let FormatPainterController = (_a40 = class extends Disposable {
     };
   }
   _getUndoRedoMutationInfo(unitId, subUnitId, range, format) {
-    const sheetInterceptorService = this._sheetInterceptorService, univerInstanceService = this._univerInstanceService, accessor = {
-      get: this._injector.get.bind(this._injector)
-    }, { merges, styles: stylesMatrix } = format;
+    const sheetInterceptorService = this._sheetInterceptorService, univerInstanceService = this._univerInstanceService, { merges, styles: stylesMatrix } = format;
     if (!stylesMatrix) return { undos: [], redos: [] };
     const { startRow, startColumn, endRow, endColumn } = stylesMatrix.getDataRange(), styleRowsNum = endRow - startRow + 1, styleColsNum = endColumn - startColumn + 1, styleValues = Array.from(
       { length: range.endRow - range.startRow + 1 },
@@ -18079,8 +18077,8 @@ let FormatPainterController = (_a40 = class extends Disposable {
       subUnitId,
       unitId,
       cellValue: realCellValue != null ? realCellValue : cellValue.getMatrix()
-    }, undoSetRangeValuesMutationParams = SetRangeValuesUndoMutationFactory(
-      accessor,
+    }, undoSetRangeValuesMutationParams = this._injector.invoke(
+      SetRangeValuesUndoMutationFactory,
       setRangeValuesMutationParams
     ), { undos: interceptorUndos, redos: interceptorRedos } = sheetInterceptorService.onCommandExecute({
       id: SetRangeValuesCommand.id,
@@ -18095,9 +18093,15 @@ let FormatPainterController = (_a40 = class extends Disposable {
       ranges
     };
     mergeRedos.push({ id: RemoveWorksheetMergeMutation.id, params: removeMergeMutationParams }), mergeRedos.push({ id: AddWorksheetMergeMutation.id, params: addMergeMutationParams });
-    const undoRemoveMergeMutationParams = RemoveMergeUndoMutationFactory(accessor, removeMergeMutationParams), undoMutationParams = AddMergeUndoMutationFactory(accessor, addMergeMutationParams);
+    const undoRemoveMergeMutationParams = this._injector.invoke(
+      RemoveMergeUndoMutationFactory,
+      removeMergeMutationParams
+    ), undoMutationParams = this._injector.invoke(
+      AddMergeUndoMutationFactory,
+      addMergeMutationParams
+    );
     if (mergeUndos.push({ id: RemoveWorksheetMergeMutation.id, params: undoMutationParams }), mergeUndos.push({ id: AddWorksheetMergeMutation.id, params: undoRemoveMergeMutationParams }), willRemoveSomeCell) {
-      const data = getClearContentMutationParamsForRanges(accessor, unitId, worksheet, ranges);
+      const data = this._injector.invoke((accessor) => getClearContentMutationParamsForRanges(accessor, unitId, worksheet, ranges));
       mergeRedos.unshift(...data.redos), mergeUndos.push(...data.undos);
     }
     return {
@@ -18263,7 +18267,6 @@ let SheetPermissionInterceptorBaseController = (_a43 = class extends Disposable
     switch (id) {
       case InsertCommand.id:
       case IMEInputCommand.id:
-      case SetCellEditVisibleOperation.id:
         if (this._contextService.getContextValue(FOCUSING_EDITOR_STANDALONE) === !0)
           break;
         permission = this.permissionCheckWithoutRange({
@@ -18272,6 +18275,15 @@ let SheetPermissionInterceptorBaseController = (_a43 = class extends Disposable
           worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission]
         }), errorMsg = this._localeService.t("permission.dialog.editErr");
         break;
+      case SetCellEditVisibleOperation.id:
+        if (params.visible === !1)
+          break;
+        permission = this.permissionCheckWithoutRange({
+          workbookTypes: [WorkbookEditablePermission],
+          rangeTypes: [RangeProtectionPermissionEditPoint],
+          worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission]
+        }), errorMsg = this._localeService.t("permission.dialog.editErr");
+        break;
       case SetRangeValuesCommand.id:
         isICellData(params.value) && params.value.f ? (permission = this._permissionCheckWithFormula(params), errorMsg = this._localeService.t("permission.dialog.formulaErr")) : permission = this._permissionCheckBySetRangeValue({
           workbookTypes: [WorkbookEditablePermission],
@@ -18716,28 +18728,33 @@ var __defProp$c = Object.defineProperty, __getOwnPropDesc$c = Object.getOwnPrope
 }, "__decorateClass$c"), __decorateParam$c = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$c"), _a45;
 let SheetPermissionInitController = (_a45 = class extends Disposable {
   constructor(_univerInstanceService, _dialogService, _permissionService, _authzIoService, _rangeProtectionRuleModel, _worksheetProtectionRuleModel, _userManagerService, _worksheetProtectionPointRuleModel, _sheetInterceptorService, _selectionProtectionRenderModel) {
-    super(), this._univerInstanceService = _univerInstanceService, this._dialogService = _dialogService, this._permissionService = _permissionService, this._authzIoService = _authzIoService, this._rangeProtectionRuleModel = _rangeProtectionRuleModel, this._worksheetProtectionRuleModel = _worksheetProtectionRuleModel, this._userManagerService = _userManagerService, this._worksheetProtectionPointRuleModel = _worksheetProtectionPointRuleModel, this._sheetInterceptorService = _sheetInterceptorService, this._selectionProtectionRenderModel = _selectionProtectionRenderModel, this._initRangePermissionFromSnapshot(), this._initRangePermissionChange(), this._initWorksheetPermissionFromSnapshot(), this._initWorksheetPermissionChange(), this._initWorksheetPermissionPointsChange(), this.initWorkbookPermissionChange(), this._initUserChange(), this._initViewModelByRangeInterceptor(), this._initViewModelBySheetInterceptor();
+    super(), this._univerInstanceService = _univerInstanceService, this._dialogService = _dialogService, this._permissionService = _permissionService, this._authzIoService = _authzIoService, this._rangeProtectionRuleModel = _rangeProtectionRuleModel, this._worksheetProtectionRuleModel = _worksheetProtectionRuleModel, this._userManagerService = _userManagerService, this._worksheetProtectionPointRuleModel = _worksheetProtectionPointRuleModel, this._sheetInterceptorService = _sheetInterceptorService, this._selectionProtectionRenderModel = _selectionProtectionRenderModel, this._initRangePermissionFromSnapshot(), this._initRangePermissionChange(), this._initWorksheetPermissionFromSnapshot(), this._initWorksheetPermissionChange(), this._initWorksheetPermissionPointsChange(), this._initWorkbookPermissionFromSnapshot(), this._initUserChange(), this._initViewModelByRangeInterceptor(), this._initViewModelBySheetInterceptor();
   }
   _initRangePermissionFromSnapshot() {
-    const allAllowedParams = [], workbook = this._univerInstanceService.getCurrentUnitForType(I.UNIVER_SHEET), unitId = workbook.getUnitId(), allSheets = workbook.getSheets(), permissionIdWithRuleInstanceMap = /* @__PURE__ */ new Map();
-    allSheets.forEach((sheet) => {
-      const subunitId = sheet.getSheetId();
-      this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subunitId).forEach((rule) => {
-        permissionIdWithRuleInstanceMap.set(rule.permissionId, rule), allAllowedParams.push({
-          objectID: rule.permissionId,
-          unitID: unitId,
-          objectType: l$1.SelectRange,
-          actions: [P.View, P.Edit]
+    const initRangePermissionFunc = /* @__PURE__ */ __name((workbook) => {
+      const allAllowedParams = [], unitId = workbook.getUnitId(), allSheets = workbook.getSheets(), permissionIdWithRuleInstanceMap = /* @__PURE__ */ new Map();
+      allSheets.forEach((sheet) => {
+        const subunitId = sheet.getSheetId();
+        this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subunitId).forEach((rule) => {
+          permissionIdWithRuleInstanceMap.set(rule.permissionId, rule), allAllowedParams.push({
+            objectID: rule.permissionId,
+            unitID: unitId,
+            objectType: l$1.SelectRange,
+            actions: [P.View, P.Edit]
+          });
         });
-      });
-    }), allAllowedParams.length && this._authzIoService.batchAllowed(allAllowedParams).then((permissionMap) => {
-      permissionMap.forEach((item) => {
-        const rule = permissionIdWithRuleInstanceMap.get(item.objectID);
-        rule && getAllRangePermissionPoint().forEach((F) => {
-          const instance = new F(unitId, rule.subUnitId, item.objectID), unitActionName = instance.subType, result = item.actions.find((action) => action.action === unitActionName);
-          (result == null ? void 0 : result.allowed) !== void 0 && this._permissionService.updatePermissionPoint(instance.id, result.allowed);
+      }), allAllowedParams.length && this._authzIoService.batchAllowed(allAllowedParams).then((permissionMap) => {
+        permissionMap.forEach((item) => {
+          const rule = permissionIdWithRuleInstanceMap.get(item.objectID);
+          rule && getAllRangePermissionPoint().forEach((F) => {
+            const instance = new F(unitId, rule.subUnitId, item.objectID), unitActionName = instance.subType, result = item.actions.find((action) => action.action === unitActionName);
+            (result == null ? void 0 : result.allowed) !== void 0 && this._permissionService.updatePermissionPoint(instance.id, result.allowed);
+          });
         });
       });
+    }, "initRangePermissionFunc");
+    this._univerInstanceService.getAllUnitsForType(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
+      initRangePermissionFunc(workbook);
     });
   }
   _initRangePermissionChange() {
@@ -18766,8 +18783,9 @@ let SheetPermissionInitController = (_a45 = class extends Disposable {
     );
   }
   initWorkbookPermissionChange(_unitId) {
-    const unitId = _unitId || this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getUnitId();
-    this._authzIoService.allowed({
+    var _a59;
+    const unitId = _unitId || ((_a59 = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a59.getUnitId());
+    unitId && this._authzIoService.allowed({
       objectID: unitId,
       objectType: l$1.Workbook,
       unitID: unitId,
@@ -18779,6 +18797,11 @@ let SheetPermissionInitController = (_a45 = class extends Disposable {
       });
     });
   }
+  _initWorkbookPermissionFromSnapshot() {
+    this._univerInstanceService.getAllUnitsForType(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
+      this.initWorkbookPermissionChange(workbook.getUnitId());
+    });
+  }
   _initWorksheetPermissionChange() {
     this.disposeWithMe(
       this._worksheetProtectionRuleModel.ruleChange$.subscribe((info) => {
@@ -18817,30 +18840,35 @@ let SheetPermissionInitController = (_a45 = class extends Disposable {
     );
   }
   _initWorksheetPermissionFromSnapshot() {
-    const allAllowedParams = [], workbook = this._univerInstanceService.getCurrentUnitForType(I.UNIVER_SHEET), unitId = workbook.getUnitId(), allSheets = workbook.getSheets(), permissionIdWithRuleInstanceMap = /* @__PURE__ */ new Map();
-    allSheets.forEach((sheet) => {
-      const subUnitId = sheet.getSheetId(), rule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
-      rule && (permissionIdWithRuleInstanceMap.set(rule.permissionId, rule), allAllowedParams.push({
-        objectID: rule.permissionId,
-        unitID: unitId,
-        objectType: l$1.Worksheet,
-        actions: [P.Edit, P.View]
-      }));
-      const pointRule = this._worksheetProtectionPointRuleModel.getRule(unitId, subUnitId);
-      pointRule && (permissionIdWithRuleInstanceMap.set(pointRule.permissionId, pointRule), allAllowedParams.push({
-        objectID: pointRule.permissionId,
-        unitID: unitId,
-        objectType: l$1.Worksheet,
-        actions: defaultWorksheetPermissionPoint
-      }));
-    }), allAllowedParams.length && this._authzIoService.batchAllowed(allAllowedParams).then((permissionMap) => {
-      permissionMap.forEach((item) => {
-        const rule = permissionIdWithRuleInstanceMap.get(item.objectID);
-        rule && [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
-          const instance = new F(unitId, rule.subUnitId), unitActionName = instance.subType, result = item.actions.find((action) => action.action === unitActionName);
-          (result == null ? void 0 : result.allowed) !== void 0 && this._permissionService.updatePermissionPoint(instance.id, result.allowed);
+    const initSheetPermissionFunc = /* @__PURE__ */ __name((workbook) => {
+      const allAllowedParams = [], unitId = workbook.getUnitId(), allSheets = workbook.getSheets(), permissionIdWithRuleInstanceMap = /* @__PURE__ */ new Map();
+      allSheets.forEach((sheet) => {
+        const subUnitId = sheet.getSheetId(), rule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+        rule && (permissionIdWithRuleInstanceMap.set(rule.permissionId, rule), allAllowedParams.push({
+          objectID: rule.permissionId,
+          unitID: unitId,
+          objectType: l$1.Worksheet,
+          actions: [P.Edit, P.View]
+        }));
+        const pointRule = this._worksheetProtectionPointRuleModel.getRule(unitId, subUnitId);
+        pointRule && (permissionIdWithRuleInstanceMap.set(pointRule.permissionId, pointRule), allAllowedParams.push({
+          objectID: pointRule.permissionId,
+          unitID: unitId,
+          objectType: l$1.Worksheet,
+          actions: defaultWorksheetPermissionPoint
+        }));
+      }), allAllowedParams.length && this._authzIoService.batchAllowed(allAllowedParams).then((permissionMap) => {
+        permissionMap.forEach((item) => {
+          const rule = permissionIdWithRuleInstanceMap.get(item.objectID);
+          rule && [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+            const instance = new F(unitId, rule.subUnitId), unitActionName = instance.subType, result = item.actions.find((action) => action.action === unitActionName);
+            (result == null ? void 0 : result.allowed) !== void 0 && this._permissionService.updatePermissionPoint(instance.id, result.allowed);
+          });
         });
       });
+    }, "initSheetPermissionFunc");
+    this._univerInstanceService.getAllUnitsForType(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
+      initSheetPermissionFunc(workbook);
     });
   }
   _initUserChange() {
@@ -18863,7 +18891,7 @@ let SheetPermissionInitController = (_a45 = class extends Disposable {
                 _map.has(instance.id) && (instance = _map.get(instance.id)), this._permissionService.addPermissionPoint(instance);
               });
             });
-          }), this.initWorkbookPermissionChange(), this._initWorksheetPermissionFromSnapshot(), this._initRangePermissionFromSnapshot();
+          }), this._initWorkbookPermissionFromSnapshot(), this._initWorksheetPermissionFromSnapshot(), this._initRangePermissionFromSnapshot();
         });
       })
     );
@@ -20332,7 +20360,7 @@ let UniverSheetsUIPlugin = (_a53 = class extends Plugin {
   constructor(_config = {}, _injector, _renderManagerService, _univerInstanceService) {
     super(), this._config = _config, this._injector = _injector, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._config = Tools.deepMerge({}, DefaultSheetUiConfig, this._config);
   }
-  onStarting(injector) {
+  onStarting() {
     mergeOverrideWithDependencies([
       // services
       [ShortcutExperienceService],
@@ -20376,7 +20404,7 @@ let UniverSheetsUIPlugin = (_a53 = class extends Plugin {
       [SheetPermissionInterceptorBaseController],
       [SheetPermissionInitController]
       // [MoveRangeController],
-    ], this._config.override).forEach((d) => injector.add(d)), this._injector.add(
+    ], this._config.override).forEach((d) => this._injector.add(d)), this._injector.add(
       [
         SheetPermissionRenderManagerController,
         {