@univerjs/sheets-ui 0.2.3 → 0.2.4-alpha.0

package/lib/types/commands/commands/__tests__/create-command-test-bed.d.ts

@@ -1,9 +1,8 @@
-import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
-import { Dependency, Injector } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Workbook, Injector, Univer } from '@univerjs/core';
 
 export interface ITestBed {
     univer: Univer;
     get: Injector['get'];
     sheet: Workbook;
 }
-export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): ITestBed;
+export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[], renderDependencies?: Dependency[]): ITestBed;

package/lib/types/commands/commands/__tests__/create-selection-command-test-bed.d.ts

@@ -3,24 +3,24 @@ import { IWorkbookData } from '@univerjs/core';
 export declare function createSelectionCommandTestBed(workbookData?: IWorkbookData): {
     univer: import('@univerjs/core').Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };
 export declare function createFrozenCommandTestBed(workbookData?: IWorkbookData): {
     univer: import('@univerjs/core').Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };

package/lib/types/commands/operations/cell-edit.operation.d.ts

@@ -6,5 +6,7 @@ export declare const SetCellEditVisibleWithF2Operation: IOperation<IEditorBridge
 /**
  * When the editor is not clicked to change the cursor,
  * the arrow keys will exit editing and move the cell.
+ *
+ * @deprecated Should not use operation as an event.
  */
 export declare const SetCellEditVisibleArrowOperation: IOperation<IEditorBridgeServiceVisibleParam>;

package/lib/types/common/utils.d.ts

@@ -1,6 +1,5 @@
-import { IMutationInfo, IPosition, IRange, Workbook, Worksheet } from '@univerjs/core';
+import { IAccessor, IMutationInfo, IPosition, IRange, Workbook, Worksheet } from '@univerjs/core';
 import { ISheetLocation } from '@univerjs/sheets';
-import { IAccessor } from '@wendellhu/redi';
 import { IBoundRectNoAngle, IRender, Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
 import { ICollaborator } from '@univerjs/protocol';
 import { ISheetSkeletonManagerParam } from '../services/sheet-skeleton-manager.service';

package/lib/types/controllers/auto-fill.controller.d.ts

@@ -1,6 +1,5 @@
-import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, ICommandService, Injector, IUniverInstanceService } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
-import { Injector } from '@wendellhu/redi';
 import { IAutoFillService } from '../services/auto-fill/auto-fill.service';
 import { IEditorBridgeService } from '../services/editor-bridge.service';
 import { SheetsRenderService } from '../services/sheets-render.service';

package/lib/types/controllers/auto-height.controller.d.ts

@@ -1,6 +1,5 @@
-import { IRange, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IRange, Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
 import { ISetWorksheetRowAutoHeightMutationParams, SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
-import { Injector } from '@wendellhu/redi';
 import { RenderManagerService } from '@univerjs/engine-render';
 
 export declare class AutoHeightController extends Disposable {

package/lib/types/controllers/clipboard/clipboard.controller.d.ts

@@ -1,6 +1,5 @@
-import { ICommandService, IConfigService, IContextService, IUniverInstanceService, LocaleService, RxDisposable } from '@univerjs/core';
+import { ICommandService, IConfigService, IContextService, Injector, IUniverInstanceService, LocaleService, RxDisposable } from '@univerjs/core';
 import { IMessageService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { ISheetClipboardService } from '../../services/clipboard/clipboard.service';
 

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

@@ -1,5 +1,4 @@
-import { IDocumentBody, IMutationInfo, Nullable, ObjectMatrix } from '@univerjs/core';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor, IDocumentBody, IMutationInfo, Nullable, ObjectMatrix } from '@univerjs/core';
 import { ICellDataWithSpanInfo, ICopyPastePayload, ISheetDiscreteRangeLocation } from '../../services/clipboard/type';
 import { IDiscreteRange } from '../utils/range-tools';
 

package/lib/types/controllers/editor/__tests__/create-test-bed.d.ts

@@ -1,5 +1,4 @@
-import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
-import { Dependency, Injector } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Workbook, Injector, Univer } from '@univerjs/core';
 
 export interface ITestBed {
     univer: Univer;

package/lib/types/controllers/editor/editing.render-controller.d.ts

@@ -1,4 +1,4 @@
-import { ICellData, Workbook, Disposable, ICommandService, IContextService, IUndoRedoService, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { DocumentDataModel, ICellData, IDocumentData, Workbook, Disposable, ICommandService, IContextService, IResourceLoaderService, IUndoRedoService, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { TextSelectionManagerService } from '@univerjs/docs';
 import { IDocumentLayoutObject, IRenderContext, IRenderModule, IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { IEditorService } from '@univerjs/ui';
@@ -11,32 +11,39 @@ export declare class EditingRenderController extends Disposable implements IRend
     private readonly _context;
     private readonly _undoRedoService;
     private readonly _contextService;
-    /** @deprecated This controller should not directly use univerInstanceService. Instead, it should call editor service. */
-    private readonly _univerInstanceService;
+    private readonly _instanceSrv;
     private readonly _renderManagerService;
     private readonly _editorBridgeService;
     private readonly _cellEditorManagerService;
     private readonly _textSelectionRenderManager;
-    private readonly _selectionManagerService;
     private readonly _lexerTreeBuilder;
     private readonly _textSelectionManagerService;
     private readonly _commandService;
     protected readonly _localService: LocaleService;
     private readonly _editorService;
+    private readonly _resourceLoaderService;
     /**
      * It is used to distinguish whether the user has actively moved the cursor in the editor, mainly through mouse clicks.
      */
     private _cursorChange;
-    constructor(_context: IRenderContext<Workbook>, _undoRedoService: IUndoRedoService, _contextService: IContextService, 
-    /** @deprecated This controller should not directly use univerInstanceService. Instead, it should call editor service. */
-    _univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _editorBridgeService: IEditorBridgeService, _cellEditorManagerService: ICellEditorManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _selectionManagerService: SheetsSelectionsService, _lexerTreeBuilder: LexerTreeBuilder, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService, _localService: LocaleService, _editorService: IEditorService);
+    /** If the corresponding unit is active and prepared for editing. */
+    private _isUnitEditing;
+    private _workbookSelections;
+    private _d;
+    constructor(_context: IRenderContext<Workbook>, selectionManagerService: SheetsSelectionsService, _undoRedoService: IUndoRedoService, _contextService: IContextService, _instanceSrv: IUniverInstanceService, _renderManagerService: IRenderManagerService, _editorBridgeService: IEditorBridgeService, _cellEditorManagerService: ICellEditorManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _lexerTreeBuilder: LexerTreeBuilder, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService, _localService: LocaleService, _editorService: IEditorService, _resourceLoaderService: IResourceLoaderService);
+    dispose(): void;
+    private _disposeCurrent;
     private _init;
     private _initEditorVisibilityListener;
     private _listenEditorFocus;
     private _getEditorSkeleton;
     private _getEditorViewModel;
     private _initialCursorSync;
-    private _initialEditFocusListener;
+    /**
+     * Should update current editing cell info when selection is changed.
+     * @param d DisposableCollection
+     */
+    private _subscribeToCurrentCell;
     private _fitTextSize;
     /**
      * Mainly used to pre-calculate the width of the editor,
@@ -55,6 +62,10 @@ export declare class EditingRenderController extends Disposable implements IRend
     private _addBackground;
     private _handleEditorVisible;
     private _resetBodyStyle;
+    /**
+     * Should activate the editor when the user inputs text.
+     * @param d DisposableCollection
+     */
     private _initialKeyboardListener;
     private _showEditorByKeyboard;
     /**
@@ -66,7 +77,11 @@ export declare class EditingRenderController extends Disposable implements IRend
     private _handleEditorInvisible;
     private _exitInput;
     private _moveCursor;
+    /**
+     * The user's operations follow the sequence of opening the editor and then moving the cursor.
+     * The logic here predicts the user's first cursor movement behavior based on this rule
+     */
     private _cursorStateListener;
     private _moveInEditor;
 }
-export declare function getCellDataByInput(cellData: ICellData, documentLayoutObject: IDocumentLayoutObject, lexerTreeBuilder: LexerTreeBuilder): ICellData | null;
+export declare function getCellDataByInput(cellData: ICellData, documentLayoutObject: IDocumentLayoutObject, lexerTreeBuilder: LexerTreeBuilder, getSnapshot: (data: DocumentDataModel) => IDocumentData): ICellData | null;

package/lib/types/controllers/format-painter/format-painter.controller.d.ts

@@ -1,5 +1,4 @@
-import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Disposable, ICommandService, Injector, IUniverInstanceService } from '@univerjs/core';
 import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { IFormatPainterService } from '../../services/format-painter/format-painter.service';

package/lib/types/controllers/hover-render.controller.d.ts

@@ -2,14 +2,14 @@ import { Workbook, Disposable } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { HoverManagerService } from '../services/hover-manager.service';
 import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';
-import { ScrollManagerService } from '../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../services/scroll-manager.service';
 
 export declare class HoverRenderController extends Disposable implements IRenderModule {
     private readonly _context;
     private _hoverManagerService;
     private _sheetSkeletonManagerService;
     private _scrollManagerService;
-    constructor(_context: IRenderContext<Workbook>, _hoverManagerService: HoverManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _scrollManagerService: ScrollManagerService);
+    constructor(_context: IRenderContext<Workbook>, _hoverManagerService: HoverManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _scrollManagerService: SheetScrollManagerService);
     private _initPointerEvent;
     private _initScrollEvent;
 }

package/lib/types/controllers/menu/__tests__/create-menu-test-bed.d.ts

@@ -3,12 +3,12 @@ import { Univer } from '@univerjs/core';
 export declare function createMenuTestBed(): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };

package/lib/types/controllers/menu/border.menu.d.ts

@@ -1,5 +1,5 @@
 import { IBorderInfo } from '@univerjs/sheets';
 import { IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function CellBorderSelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<IBorderInfo, IBorderInfo>;

package/lib/types/controllers/menu/clear.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function ClearSelectionMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string>;
 export declare function ClearSelectionContentMenuItemFactory(accessor: IAccessor): IMenuButtonItem;

package/lib/types/controllers/menu/delete.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function DeleteRangeMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string>;
 export declare function RemoveColMenuItemFactory(accessor: IAccessor): IMenuButtonItem;

package/lib/types/controllers/menu/insert.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function ColInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string>;
 export declare function RowInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string>;

package/lib/types/controllers/menu/menu-util.d.ts

@@ -1,5 +1,4 @@
-import { IPermissionTypes, Workbook, WorkbookPermissionPointConstructor, Worksheet, IUniverInstanceService } from '@univerjs/core';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor, IPermissionTypes, Workbook, WorkbookPermissionPointConstructor, Worksheet, IUniverInstanceService } from '@univerjs/core';
 import { Observable } from 'rxjs';
 
 interface IActive {

package/lib/types/controllers/menu/menu.d.ts

@@ -1,6 +1,5 @@
-import { HorizontalAlign, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import { HorizontalAlign, VerticalAlign, WrapStrategy, IAccessor } from '@univerjs/core';
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
 
 export declare enum SheetMenuPosition {
     ROW_HEADER_CONTEXT_MENU = "ROW_HEADER_CONTEXT_MENU",

package/lib/types/controllers/menu/merge.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function CellMergeMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string>;
 export declare function CellMergeAllMenuItemFactory(accessor: IAccessor): IMenuButtonItem<string>;

package/lib/types/controllers/menu/permission-menu-util.d.ts

@@ -1,4 +1,4 @@
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare function getAddPermissionHidden$(accessor: IAccessor): import('rxjs').Observable<boolean>;
 export declare function getEditPermissionHidden$(accessor: IAccessor): import('rxjs').Observable<boolean>;

package/lib/types/controllers/menu/permission.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuButtonItem, IMenuItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor } from '@univerjs/core';
 
 export declare const tmpIcon = "data-validation-single";
 export declare function sheetPermissionToolbarMenuFactory(accessor: IAccessor): IMenuItem;

package/lib/types/controllers/menu/sheet.menu.d.ts

@@ -1,5 +1,5 @@
+import { IAccessor } from '@univerjs/core';
 import { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { IAccessor } from '@wendellhu/redi';
 
 export declare function DeleteSheetMenuItemFactory(accessor: IAccessor): IMenuButtonItem;
 export declare function CopySheetMenuItemFactory(accessor: IAccessor): IMenuButtonItem;

package/lib/types/controllers/mobile/mobile-sheet-ui.controller.d.ts

@@ -1,6 +1,5 @@
-import { Disposable, ICommandService } from '@univerjs/core';
+import { Disposable, ICommandService, Injector } from '@univerjs/core';
 import { MenuConfig, ComponentManager, ILayoutService, IMenuService, IShortcutService, IUIPartsService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 
 export interface IUniverSheetsUIConfig {
     menu: MenuConfig;

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

@@ -19,7 +19,9 @@ export declare class SheetPermissionInterceptorBaseController extends Disposable
     private readonly _contextService;
     private readonly _definedNamesService;
     disposableCollection: DisposableCollection;
+    private _showPermissionDialog;
     constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _permissionService: IPermissionService, _selectionManagerService: SheetsSelectionsService, _dialogService: IDialogService, _rangeProtectionRuleModel: RangeProtectionRuleModel, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _autoFillService: IAutoFillService, _localeService: LocaleService, _lexerTreeBuilder: LexerTreeBuilder, _contextService: IContextService, _definedNamesService: IDefinedNamesService);
+    setShowPermissionDialog(value: boolean): void;
     haveNotPermissionHandle(errorMsg: string): void;
     private _getPermissionCheck;
     private _initialize;

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

@@ -1,6 +1,5 @@
-import { Workbook, DisposableCollection, IPermissionService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { Workbook, DisposableCollection, Injector, IPermissionService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { RangeProtectionRenderModel } from '@univerjs/sheets';
-import { Injector } from '@wendellhu/redi';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { StatusBarController } from '../status-bar.controller';
 

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

@@ -1,6 +1,5 @@
-import { Disposable, IPermissionService } from '@univerjs/core';
+import { Disposable, Injector, IPermissionService } from '@univerjs/core';
 import { MenuConfig, ComponentManager, IMenuService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 import { RangeProtectionRuleModel } from '@univerjs/sheets';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';

package/lib/types/controllers/render-controllers/editor-bridge.render-controller.d.ts

@@ -1,4 +1,4 @@
-import { Workbook, ICommandService, RxDisposable } from '@univerjs/core';
+import { Workbook, ICommandService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IRangeSelectorService } from '@univerjs/ui';
@@ -6,17 +6,19 @@ import { IEditorBridgeService } from '../../services/editor-bridge.service';
 
 export declare class EditorBridgeRenderController extends RxDisposable implements IRenderModule {
     private readonly _context;
+    private readonly _instanceSrv;
     private readonly _commandService;
     private readonly _editorBridgeService;
     private readonly _selectionManagerService;
     private readonly _rangeSelectorService;
-    constructor(_context: IRenderContext<Workbook>, _commandService: ICommandService, _editorBridgeService: IEditorBridgeService, _selectionManagerService: SheetsSelectionsService, _rangeSelectorService: IRangeSelectorService);
-    private _initialize;
+    private _d;
+    constructor(_context: IRenderContext<Workbook>, _instanceSrv: IUniverInstanceService, _commandService: ICommandService, _editorBridgeService: IEditorBridgeService, _selectionManagerService: SheetsSelectionsService, _rangeSelectorService: IRangeSelectorService);
+    private _init;
+    private _disposeCurrent;
     private _initSelectionChangeListener;
     private _updateEditorPosition;
-    private _handleSelectionChange;
     private _initEventListener;
-    private _onCanvasPointerDown;
+    private _tryHideEditor;
     private _hideEditor;
     private _initialRangeSelector;
     private _rangeSelector;

package/lib/types/controllers/render-controllers/freeze.render-controller.d.ts

@@ -1,8 +1,7 @@
-import { Workbook, Disposable, ICommandService, InterceptorManager, ThemeService } from '@univerjs/core';
+import { Workbook, Disposable, ICommandService, Injector, InterceptorManager, ThemeService } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
-import { Injector } from '@wendellhu/redi';
-import { ScrollManagerService } from '../../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 
 export declare const FREEZE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, null>;
@@ -37,7 +36,7 @@ export declare class HeaderFreezeRenderController extends Disposable implements
     interceptor: InterceptorManager<{
         FREEZE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, null>;
     }>;
-    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: ScrollManagerService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _injector: Injector);
+    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: SheetScrollManagerService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _injector: Injector);
     dispose(): void;
     private _initialize;
     private _createFreeze;

package/lib/types/controllers/render-controllers/mobile/mobile-scroll.render-controller.d.ts

@@ -1,7 +1,7 @@
 import { IRange, Workbook, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
-import { ScrollManagerService } from '../../../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';
 
 /**
@@ -15,7 +15,7 @@ export declare class MobileSheetsScrollRenderController extends Disposable imple
     private readonly _selectionManagerService;
     private readonly _scrollManagerService;
     protected readonly _univerInstanceService: IUniverInstanceService;
-    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: ScrollManagerService, _univerInstanceService: IUniverInstanceService);
+    constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _selectionManagerService: SheetsSelectionsService, _scrollManagerService: SheetScrollManagerService, _univerInstanceService: IUniverInstanceService);
     scrollToRange(range: IRange): boolean;
     private _init;
     private _initCommandListener;

package/lib/types/controllers/render-controllers/scroll.render-controller.d.ts

@@ -1,7 +1,6 @@
-import { IRange, Workbook, Disposable, ICommandService } from '@univerjs/core';
+import { IRange, Workbook, Disposable, ICommandService, Injector } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
-import { Injector } from '@wendellhu/redi';
-import { ScrollManagerService } from '../../services/scroll-manager.service';
+import { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 
 /**
@@ -14,7 +13,7 @@ export declare class SheetsScrollRenderController extends Disposable implements
     private readonly _commandService;
     private readonly _renderManagerService;
     private readonly _scrollManagerService;
-    constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _scrollManagerService: ScrollManagerService);
+    constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _scrollManagerService: SheetScrollManagerService);
     scrollToRange(range: IRange): boolean;
     private _init;
     private _initCommandListener;

package/lib/types/controllers/sheet-ui.controller.d.ts

@@ -1,6 +1,5 @@
-import { Disposable, ICommandService } from '@univerjs/core';
+import { Disposable, ICommandService, Injector } from '@univerjs/core';
 import { MenuConfig, ComponentManager, ILayoutService, IMenuService, IShortcutService, IUIPartsService } from '@univerjs/ui';
-import { Injector } from '@wendellhu/redi';
 
 export interface IUniverSheetsUIConfig {
     menu: MenuConfig;

package/lib/types/controllers/utils/range-tools.d.ts

@@ -1,5 +1,4 @@
-import { IAccessor } from '@wendellhu/redi';
-import { ICellData, IObjectMatrixPrimitiveType, IRange } from '@univerjs/core';
+import { IAccessor, ICellData, IObjectMatrixPrimitiveType, IRange } from '@univerjs/core';
 
 export interface IDiscreteRange {
     rows: number[];

package/lib/types/controllers/utils/selections-tools.d.ts

@@ -1,6 +1,5 @@
-import { RANGE_TYPE } from '@univerjs/core';
+import { IAccessor, RANGE_TYPE } from '@univerjs/core';
 import { ISelectionWithStyle } from '@univerjs/sheets';
-import { IAccessor } from '@wendellhu/redi';
 
 export declare function getSheetSelectionsDisabled$(accessor: IAccessor): import('rxjs').Observable<boolean>;
 export declare function checkInHeaderRanges(selections: Readonly<ISelectionWithStyle[]>, num: number, rType: RANGE_TYPE.ROW | RANGE_TYPE.COLUMN): false | ISelectionWithStyle;

package/lib/types/mobile-sheets-ui-plugin.d.ts

@@ -1,5 +1,4 @@
-import { IUniverInstanceService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, IUniverInstanceService, Plugin, UniverInstanceType } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { IUniverSheetsUIConfig } from './controllers/sheet-ui.controller';
 

package/lib/types/services/auto-fill/auto-fill.service.d.ts

@@ -1,6 +1,5 @@
-import { Nullable, Direction, Disposable, ICommandService, IUndoRedoService, IUniverInstanceService } from '@univerjs/core';
+import { IDisposable, Nullable, Direction, Disposable, ICommandService, IUndoRedoService, IUniverInstanceService } from '@univerjs/core';
 import { SheetsSelectionsService } from '@univerjs/sheets';
-import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 import { IAutoFillLocation, IAutoFillRule, ISheetAutoFillHook, APPLY_TYPE } from './type';
 
@@ -67,4 +66,4 @@ export declare class AutoFillService extends Disposable implements IAutoFillServ
     setShowMenu(show: boolean): void;
     fillData(triggerUnitId: string, triggerSubUnitId: string): boolean;
 }
-export declare const IAutoFillService: import('@wendellhu/redi').IdentifierDecorator<AutoFillService>;
+export declare const IAutoFillService: import('@univerjs/core').IdentifierDecorator<AutoFillService>;

package/lib/types/services/auto-fill/type.d.ts

@@ -1,5 +1,4 @@
-import { Direction, ICellData, IMutationInfo, Nullable } from '@univerjs/core';
-import { IAccessor } from '@wendellhu/redi';
+import { Direction, IAccessor, ICellData, IMutationInfo, Nullable } from '@univerjs/core';
 import { IDiscreteRange } from '../../controllers/utils/range-tools';
 
 export declare enum AutoFillHookType {

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

@@ -1,7 +1,6 @@
-import { Nullable, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { IDisposable, Nullable, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IRenderManagerService, BaseObject, Viewport } from '@univerjs/engine-render';
 import { IPopup, ICanvasPopupService } from '@univerjs/ui';
-import { IDisposable } from '@wendellhu/redi';
 import { RefRangeService } from '@univerjs/sheets';
 
 export interface ICanvasPopup extends Pick<IPopup, 'direction' | 'excludeOutside' | 'closeOnSelfTarget' | 'componentKey' | 'offset' | 'onClickOutside'> {

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

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { ISheetLocation } from '@univerjs/sheets';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetCanvasPopManagerService } from './canvas-pop-manager.service';

package/lib/types/services/clipboard/__tests__/clipboard-test-bed.d.ts

@@ -1,5 +1,4 @@
-import { IWorkbookData, Univer } from '@univerjs/core';
-import { Dependency, IDisposable } from '@wendellhu/redi';
+import { Dependency, IDisposable, IWorkbookData, Univer } from '@univerjs/core';
 
 export declare class testMarkSelectionService {
     addShape(): string | null;
@@ -19,12 +18,12 @@ export declare class testPlatformService {
 export declare function clipboardTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };

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

@@ -1,7 +1,6 @@
-import { IRange, Nullable, Disposable, ErrorService, ICommandService, ILogService, IUndoRedoService, IUniverInstanceService, LocaleService, ObjectMatrix, ThemeService } from '@univerjs/core';
+import { IDisposable, IRange, Nullable, Disposable, ErrorService, ICommandService, ILogService, Injector, IUndoRedoService, IUniverInstanceService, LocaleService, ObjectMatrix, ThemeService } from '@univerjs/core';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IClipboardInterfaceService, INotificationService, IPlatformService } from '@univerjs/ui';
-import { IDisposable, Injector } from '@wendellhu/redi';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { IMarkSelectionService } from '../mark-selection/mark-selection.service';
 import { IDiscreteRange } from '../../controllers/utils/range-tools';
@@ -34,7 +33,7 @@ export interface ISheetClipboardService {
     addClipboardHook(hook: ISheetClipboardHook): IDisposable;
     getClipboardHooks(): ISheetClipboardHook[];
 }
-export declare const ISheetClipboardService: import('@wendellhu/redi').IdentifierDecorator<ISheetClipboardService>;
+export declare const ISheetClipboardService: import('@univerjs/core').IdentifierDecorator<ISheetClipboardService>;
 export declare class SheetClipboardService extends Disposable implements ISheetClipboardService {
     private readonly _logService;
     private readonly _univerInstanceService;