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

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

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

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('@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;
+        <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;
     };
     sheet: import('@univerjs/core').Workbook;
 };
 export declare function createFrozenCommandTestBed(workbookData?: IWorkbookData): {
     univer: import('@univerjs/core').Univer;
     get: {
-        <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;
+        <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;
     };
     sheet: import('@univerjs/core').Workbook;
 };

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

@@ -1,5 +1,6 @@
-import { IAccessor, IMutationInfo, IPosition, IRange, Workbook, Worksheet } from '@univerjs/core';
+import { 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,5 +1,6 @@
-import { Disposable, ICommandService, Injector, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, ICommandService, 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,5 +1,6 @@
-import { IRange, Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
+import { IRange, Disposable, 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,5 +1,6 @@
-import { ICommandService, IConfigService, IContextService, Injector, IUniverInstanceService, LocaleService, RxDisposable } from '@univerjs/core';
+import { ICommandService, IConfigService, IContextService, 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,4 +1,5 @@
-import { IAccessor, IDocumentBody, IMutationInfo, Nullable, ObjectMatrix } from '@univerjs/core';
+import { IDocumentBody, IMutationInfo, Nullable, ObjectMatrix } from '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 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,4 +1,5 @@
-import { Dependency, IWorkbookData, Workbook, Injector, Univer } from '@univerjs/core';
+import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
+import { Dependency, Injector } from '@wendellhu/redi';
 
 export interface ITestBed {
     univer: Univer;

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

@@ -1,4 +1,5 @@
-import { Disposable, ICommandService, Injector, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { Injector } from '@wendellhu/redi';
 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/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('@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;
+        <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;
     };
     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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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,4 +1,5 @@
-import { IAccessor, IPermissionTypes, Workbook, WorkbookPermissionPointConstructor, Worksheet, IUniverInstanceService } from '@univerjs/core';
+import { IPermissionTypes, Workbook, WorkbookPermissionPointConstructor, Worksheet, IUniverInstanceService } from '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 interface IActive {

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

@@ -1,5 +1,6 @@
-import { HorizontalAlign, VerticalAlign, WrapStrategy, IAccessor } from '@univerjs/core';
+import { HorizontalAlign, VerticalAlign, WrapStrategy } 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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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 '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 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,5 +1,6 @@
-import { Disposable, ICommandService, Injector } from '@univerjs/core';
+import { Disposable, ICommandService } 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-formula-render.controller.d.ts

@@ -1,5 +1,6 @@
-import { Workbook, DisposableCollection, Injector, IPermissionService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { Workbook, DisposableCollection, 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,5 +1,6 @@
-import { Disposable, Injector, IPermissionService } from '@univerjs/core';
+import { Disposable, 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/freeze.render-controller.d.ts

@@ -1,6 +1,7 @@
-import { Workbook, Disposable, ICommandService, Injector, InterceptorManager, ThemeService } from '@univerjs/core';
+import { Workbook, Disposable, ICommandService, InterceptorManager, ThemeService } from '@univerjs/core';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
+import { Injector } from '@wendellhu/redi';
 import { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 

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

@@ -1,5 +1,6 @@
-import { IRange, Workbook, Disposable, ICommandService, Injector } from '@univerjs/core';
+import { IRange, Workbook, Disposable, ICommandService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
+import { Injector } from '@wendellhu/redi';
 import { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 

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

@@ -1,5 +1,6 @@
-import { Disposable, ICommandService, Injector } from '@univerjs/core';
+import { Disposable, ICommandService } 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,4 +1,5 @@
-import { IAccessor, ICellData, IObjectMatrixPrimitiveType, IRange } from '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
+import { ICellData, IObjectMatrixPrimitiveType, IRange } from '@univerjs/core';
 
 export interface IDiscreteRange {
     rows: number[];

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

@@ -1,5 +1,6 @@
-import { IAccessor, RANGE_TYPE } from '@univerjs/core';
+import { 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,4 +1,5 @@
-import { Injector, IUniverInstanceService, Plugin, UniverInstanceType } from '@univerjs/core';
+import { IUniverInstanceService, Plugin, UniverInstanceType } from '@univerjs/core';
+import { Injector } from '@wendellhu/redi';
 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,5 +1,6 @@
-import { IDisposable, Nullable, Direction, Disposable, ICommandService, IUndoRedoService, IUniverInstanceService } from '@univerjs/core';
+import { 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';
 
@@ -66,4 +67,4 @@ export declare class AutoFillService extends Disposable implements IAutoFillServ
     setShowMenu(show: boolean): void;
     fillData(triggerUnitId: string, triggerSubUnitId: string): boolean;
 }
-export declare const IAutoFillService: import('@univerjs/core').IdentifierDecorator<AutoFillService>;
+export declare const IAutoFillService: import('@wendellhu/redi').IdentifierDecorator<AutoFillService>;

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

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

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

@@ -1,6 +1,7 @@
-import { IDisposable, Nullable, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { 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 '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
 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,4 +1,5 @@
-import { Dependency, IDisposable, IWorkbookData, Univer } from '@univerjs/core';
+import { IWorkbookData, Univer } from '@univerjs/core';
+import { Dependency, IDisposable } from '@wendellhu/redi';
 
 export declare class testMarkSelectionService {
     addShape(): string | null;
@@ -18,12 +19,12 @@ export declare class testPlatformService {
 export declare function clipboardTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <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;
+        <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;
     };
     sheet: import('@univerjs/core').Workbook;
 };

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

@@ -1,6 +1,7 @@
-import { IDisposable, IRange, Nullable, Disposable, ErrorService, ICommandService, ILogService, Injector, IUndoRedoService, IUniverInstanceService, LocaleService, ObjectMatrix, ThemeService } from '@univerjs/core';
+import { IRange, Nullable, Disposable, ErrorService, ICommandService, ILogService, 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';
@@ -33,7 +34,7 @@ export interface ISheetClipboardService {
     addClipboardHook(hook: ISheetClipboardHook): IDisposable;
     getClipboardHooks(): ISheetClipboardHook[];
 }
-export declare const ISheetClipboardService: import('@univerjs/core').IdentifierDecorator<ISheetClipboardService>;
+export declare const ISheetClipboardService: import('@wendellhu/redi').IdentifierDecorator<ISheetClipboardService>;
 export declare class SheetClipboardService extends Disposable implements ISheetClipboardService {
     private readonly _logService;
     private readonly _univerInstanceService;

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

@@ -1,4 +1,5 @@
-import { IDisposable, IPosition, Nullable } from '@univerjs/core';
+import { IPosition, Nullable } from '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 export interface ICellEditorManagerParam extends Partial<IPosition> {
@@ -39,4 +40,4 @@ export declare class CellEditorManagerService implements ICellEditorManagerServi
     setFocus(param?: boolean): void;
     private _refresh;
 }
-export declare const ICellEditorManagerService: import('@univerjs/core').IdentifierDecorator<CellEditorManagerService>;
+export declare const ICellEditorManagerService: import('@wendellhu/redi').IdentifierDecorator<CellEditorManagerService>;

package/lib/types/services/editor/formula-editor-manager.service.d.ts

@@ -1,4 +1,5 @@
-import { IDisposable, Nullable } from '@univerjs/core';
+import { Nullable } from '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 export interface IFormulaEditorManagerService {
@@ -30,4 +31,4 @@ export declare class FormulaEditorManagerService implements IDisposable {
     handleFoldBtnClick(params: boolean): void;
     private _refresh;
 }
-export declare const IFormulaEditorManagerService: import('@univerjs/core').IdentifierDecorator<FormulaEditorManagerService>;
+export declare const IFormulaEditorManagerService: import('@wendellhu/redi').IdentifierDecorator<FormulaEditorManagerService>;

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

@@ -1,7 +1,8 @@
-import { ICellDataForSheetInterceptor, IDisposable, IPosition, ISelectionCell, Nullable, Disposable, IContextService, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import { ICellDataForSheetInterceptor, IPosition, ISelectionCell, Nullable, Disposable, IContextService, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
 import { Engine, IDocumentLayoutObject, Scene, DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';
 import { ISheetLocation, SheetsSelectionsService } from '@univerjs/sheets';
 import { IEditorService, KeyCode } from '@univerjs/ui';
+import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 export interface IEditorBridgeServiceVisibleParam {
@@ -116,5 +117,5 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
     changeEditorDirty(dirtyStatus: boolean): void;
     getEditorDirty(): boolean;
 }
-export declare const IEditorBridgeService: import('@univerjs/core').IdentifierDecorator<EditorBridgeService>;
+export declare const IEditorBridgeService: import('@wendellhu/redi').IdentifierDecorator<EditorBridgeService>;
 export {};

package/lib/types/services/format-painter/format-painter.service.d.ts

@@ -32,7 +32,7 @@ export declare enum FormatPainterStatus {
     ONCE = 1,
     INFINITE = 2
 }
-export declare const IFormatPainterService: import('@univerjs/core').IdentifierDecorator<IFormatPainterService>;
+export declare const IFormatPainterService: import('@wendellhu/redi').IdentifierDecorator<IFormatPainterService>;
 export declare class FormatPainterService extends Disposable implements IFormatPainterService {
     private readonly _selectionManagerService;
     private readonly _themeService;

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

@@ -18,7 +18,7 @@ interface IMarkSelectionInfo {
     control: SelectionControl | null;
     exits: string[];
 }
-export declare const IMarkSelectionService: import('@univerjs/core').IdentifierDecorator<IMarkSelectionService>;
+export declare const IMarkSelectionService: import('@wendellhu/redi').IdentifierDecorator<IMarkSelectionService>;
 export declare class MarkSelectionService extends Disposable implements IMarkSelectionService {
     private readonly _currentService;
     private readonly _renderManagerService;

package/lib/types/services/permission/worksheet-permission-render.service.d.ts

@@ -1,5 +1,5 @@
-import { Disposable, IUniverInstanceService } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
+import { Disposable, IUniverInstanceService } from '@univerjs/core';
 
 export declare class WorksheetProtectionRenderService extends Disposable {
     private _renderManagerService;

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

@@ -1,7 +1,8 @@
-import { IInterceptor, Injector, IRange, IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
+import { IInterceptor, IRange, IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent, IRenderManagerService, IRenderModule, Scene, SpreadsheetSkeleton, Viewport, ScrollTimer, ScrollTimerType } from '@univerjs/engine-render';
 import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
 import { Observable, Subscription, BehaviorSubject, Subject } from 'rxjs';
 import { SelectionControl } from './selection-shape';
 
@@ -34,7 +35,7 @@ export interface ISheetSelectionRenderService {
     getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
     setSingleSelectionEnabled(enabled: boolean): void;
 }
-export declare const ISheetSelectionRenderService: import('@univerjs/core').IdentifierDecorator<ISheetSelectionRenderService>;
+export declare const ISheetSelectionRenderService: import('@wendellhu/redi').IdentifierDecorator<ISheetSelectionRenderService>;
 /**
  * The basic implementation of selection rendering logics. It is designed to be reused for different purposes.
  */

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

@@ -1,7 +1,8 @@
-import { Workbook, ICommandService, IContextService, ILogService, Injector, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, IContextService, ILogService, RANGE_TYPE, ThemeService } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Scene, Viewport, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
 import { SheetScrollManagerService } from '../scroll-manager.service';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 import { BaseSelectionRenderService } from './base-selection-render.service';

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

@@ -1,7 +1,8 @@
-import { Workbook, ICommandService, IContextService, ILogService, Injector, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, IContextService, ILogService, ThemeService } from '@univerjs/core';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 import { BaseSelectionRenderService } from './base-selection-render.service';
 

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

@@ -1,5 +1,6 @@
-import { Injector, IRangeWithCoord, ThemeService } from '@univerjs/core';
+import { IRangeWithCoord, ThemeService } from '@univerjs/core';
 import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import { Injector } from '@wendellhu/redi';
 import { SelectionControl } from './selection-shape';
 
 export interface ISelectionShapeTargetSelection {

package/lib/types/services/sheet-bar/sheet-bar.service.d.ts

@@ -1,4 +1,5 @@
-import { Disposable, IDisposable } from '@univerjs/core';
+import { Disposable } from '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 import { IScrollState } from '../../views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar';
 
@@ -19,7 +20,7 @@ export interface ISheetBarService {
     triggerSheetBarMenu(): void;
     registerSheetBarMenuHandler(handler: ISheetBarMenuHandler): IDisposable;
 }
-export declare const ISheetBarService: import('@univerjs/core').IdentifierDecorator<ISheetBarService>;
+export declare const ISheetBarService: import('@wendellhu/redi').IdentifierDecorator<ISheetBarService>;
 export declare class SheetBarService extends Disposable implements ISheetBarService {
     readonly renameId$: Observable<string>;
     readonly removeId$: Observable<string>;

package/lib/types/services/sheet-skeleton-manager.service.d.ts

@@ -1,5 +1,6 @@
-import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable, Injector } from '@univerjs/core';
+import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable } from '@univerjs/core';
 import { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import { Injector } from '@wendellhu/redi';
 
 export interface ISheetSkeletonManagerParam {
     unitId?: string;

package/lib/types/services/sheets-render.service.d.ts

@@ -1,5 +1,6 @@
-import { IDisposable, IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
+import { IDisposable } from '@wendellhu/redi';
 
 /**
  * This controller is responsible for managing units of a specific kind to be rendered on the canvas.

package/lib/types/services/shortcut-experience.service.d.ts

@@ -1,5 +1,6 @@
-import { IDisposable, ISelection, ITextRangeParam, Nullable, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { ISelection, ITextRangeParam, Nullable, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { KeyCode } from '@univerjs/ui';
+import { IDisposable } from '@wendellhu/redi';
 
 export interface IShortcutExperienceSearch {
     unitId: string;

package/lib/types/services/status-bar.service.d.ts

@@ -1,5 +1,6 @@
-import { IDisposable, Nullable } from '@univerjs/core';
+import { Nullable } from '@univerjs/core';
 import { IFunctionNames } from '@univerjs/engine-formula';
+import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 export interface IStatusBarService {
@@ -30,4 +31,4 @@ export declare class StatusBarService implements IStatusBarService, IDisposable
     getFunctions(): Readonly<IStatusBarFunction[]>;
     addFunctions(functions: IStatusBarFunction[]): void;
 }
-export declare const IStatusBarService: import('@univerjs/core').IdentifierDecorator<StatusBarService>;
+export declare const IStatusBarService: import('@wendellhu/redi').IdentifierDecorator<StatusBarService>;

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

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