@univerjs/sheets-ui 0.2.4 → 0.2.6

package/lib/types/commands/commands/__tests__/create-command-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/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/commands/utils/selection-utils.d.ts

@@ -30,7 +30,6 @@ export declare function shrinkToNextGapRange(startRange: IRange, anchorRange: IR
  * @param worksheet
  */
 export declare function shrinkToNextCell(startRange: IRange, direction: Direction, worksheet: Worksheet): IRange;
-export declare function expandToContinuousRange(startRange: IRange, directions: IExpandParams, worksheet: Worksheet): IRange;
 export declare function expandToWholeSheet(worksheet: Worksheet): IRange;
 export declare function getStartRange(range: IRange, primary: Nullable<ISelectionCell>, direction: Direction): IRange;
 export declare function checkIfShrink(selection: ISelection, direction: Direction, worksheet: Worksheet): boolean;

package/lib/types/commands/operations/scroll.operation.d.ts

@@ -1,4 +1,4 @@
 import { IOperation } from '@univerjs/core';
-import { IScrollManagerWithSearchParam } from '../../services/scroll-manager.service';
+import { IScrollStateWithSearchParam } from '../../services/scroll-manager.service';
 
-export declare const SetScrollOperation: IOperation<IScrollManagerWithSearchParam>;
+export declare const SetScrollOperation: IOperation<IScrollStateWithSearchParam>;

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/__tests__/mock-function.service.d.ts

@@ -0,0 +1,6 @@
+import { IFunctionInfo, IFunctionNames } from '@univerjs/engine-formula';
+
+export declare class MockFunctionService {
+    getDescriptions(): Map<IFunctionNames, IFunctionInfo>;
+}
+export declare const IMockFunctionService: import('@univerjs/core').IdentifierDecorator<MockFunctionService>;

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

@@ -3,7 +3,7 @@ import { TextSelectionManagerService } from '@univerjs/docs';
 import { IDocumentLayoutObject, IRenderContext, IRenderModule, IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { IEditorService } from '@univerjs/ui';
 import { SheetsSelectionsService } from '@univerjs/sheets';
-import { LexerTreeBuilder } from '@univerjs/engine-formula';
+import { IFunctionService, LexerTreeBuilder } from '@univerjs/engine-formula';
 import { IEditorBridgeService } from '../../services/editor-bridge.service';
 import { ICellEditorManagerService } from '../../services/editor/cell-editor-manager.service';
 
@@ -17,6 +17,7 @@ export declare class EditingRenderController extends Disposable implements IRend
     private readonly _cellEditorManagerService;
     private readonly _textSelectionRenderManager;
     private readonly _lexerTreeBuilder;
+    private readonly _functionService;
     private readonly _textSelectionManagerService;
     private readonly _commandService;
     protected readonly _localService: LocaleService;
@@ -30,7 +31,7 @@ export declare class EditingRenderController extends Disposable implements IRend
     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);
+    constructor(_context: IRenderContext<Workbook>, selectionManagerService: SheetsSelectionsService, _undoRedoService: IUndoRedoService, _contextService: IContextService, _instanceSrv: IUniverInstanceService, _renderManagerService: IRenderManagerService, _editorBridgeService: IEditorBridgeService, _cellEditorManagerService: ICellEditorManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _lexerTreeBuilder: LexerTreeBuilder, _functionService: IFunctionService, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService, _localService: LocaleService, _editorService: IEditorService, _resourceLoaderService: IResourceLoaderService);
     dispose(): void;
     private _disposeCurrent;
     private _init;
@@ -84,4 +85,4 @@ export declare class EditingRenderController extends Disposable implements IRend
     private _cursorStateListener;
     private _moveInEditor;
 }
-export declare function getCellDataByInput(cellData: ICellData, documentLayoutObject: IDocumentLayoutObject, lexerTreeBuilder: LexerTreeBuilder, getSnapshot: (data: DocumentDataModel) => IDocumentData): ICellData | null;
+export declare function getCellDataByInput(cellData: ICellData, documentLayoutObject: IDocumentLayoutObject, lexerTreeBuilder: LexerTreeBuilder, getSnapshot: (data: DocumentDataModel) => IDocumentData, localeService: LocaleService, functionService: IFunctionService): 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/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-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/freeze.render-controller.d.ts

@@ -1,7 +1,6 @@
-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 { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 

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

@@ -3,6 +3,7 @@ import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { IContextMenuService, ILayoutService } from '@univerjs/ui';
 import { ISheetSelectionRenderService } from '../../../services/selection/base-selection-render.service';
+import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';
 
 /**
  * On mobile devices, the context menu would popup when
@@ -15,6 +16,7 @@ export declare class SheetContextMenuMobileRenderController extends Disposable i
     private readonly _contextMenuService;
     private readonly _selectionManagerService;
     private readonly _selectionRenderService;
-    constructor(_context: IRenderContext<Workbook>, _layoutService: ILayoutService, _contextMenuService: IContextMenuService, _selectionManagerService: SheetsSelectionsService, _selectionRenderService: ISheetSelectionRenderService);
+    private readonly _sheetSkeletonManagerService;
+    constructor(_context: IRenderContext<Workbook>, _layoutService: ILayoutService, _contextMenuService: IContextMenuService, _selectionManagerService: SheetsSelectionsService, _selectionRenderService: ISheetSelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService);
     private _init;
 }

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

@@ -22,13 +22,6 @@ export declare class MobileSheetsScrollRenderController extends Disposable imple
     private _scrollToSelectionForExpand;
     private _getFreeze;
     private _initScrollEventListener;
-    /**
-     * for row & col selection.
-     * x value of row seleciton controlPoints is always half of viewport wide.
-     * y value of col selection controlPoints is always half of viewport height.
-     *
-     */
-    private _scrollInfo$Handler;
     private _initSkeletonListener;
     /**
      * for mobile

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

@@ -1,6 +1,5 @@
-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 { SheetScrollManagerService } from '../../services/scroll-manager.service';
 import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
 
@@ -21,7 +20,6 @@ export declare class SheetsScrollRenderController extends Disposable implements
     private _scrollToSelectionForExpand;
     private _getFreeze;
     private _initScrollEventListener;
-    private _scrollSubscribeBinding;
     private _initSkeletonListener;
     private _updateSceneSize;
     private _getSheetObject;

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/char-tools.d.ts

@@ -0,0 +1,23 @@
+import { LocaleType } from '@univerjs/core';
+import { IFunctionService, LexerTreeBuilder } from '@univerjs/engine-formula';
+
+export declare function isCJKLocale(locale: LocaleType): boolean;
+/**
+ * Convert all full-width characters to half-width characters and try to parse them. If the parsing is successful, apply them. If the parsing is not successful, return them to full-width characters.
+ *
+ * Convert full-width characters to half-width characters
+ * 1. Formula
+ * 2. Boolean
+ * 3. Formatted number
+ *
+ * Not converted
+ * 1. Force string
+ * 2. Chinese single and double quotation marks
+ * 3. Characters between single and double quotes in formulas
+ * 4. Other text that cannot be recognized as formulas, Boolean values, or numbers
+ *
+ * @param str
+ * @param lexerTreeBuilder
+ * @returns
+ */
+export declare function normalizeString(str: string, lexerTreeBuilder: LexerTreeBuilder, functionService: IFunctionService): string;

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/index.d.ts

@@ -76,7 +76,6 @@ export type { IRangeProtectionRenderCellData } from './views/permission/extensio
 export { SheetPrintInterceptorService } from './services/print-interceptor.service';
 export { UniverSheetsMobileUIPlugin } from './mobile-sheets-ui-plugin';
 export { MobileSheetBar } from './views/mobile/sheet-bar/MobileSheetBar';
-export { expandToContinuousRange } from './commands/commands/utils/selection-utils';
 export { SheetPermissionInitController } from './controllers/permission/sheet-permission-init.controller';
 export { AddWorksheetMergeCommand, AddWorksheetMergeAllCommand, AddWorksheetMergeVerticalCommand, AddWorksheetMergeHorizontalCommand } from './commands/commands/add-worksheet-merge.command';
 export { AutoFillCommand, AutoClearContentCommand } from './commands/commands/auto-fill.command';
@@ -108,3 +107,4 @@ export { SetZoomRatioOperation } from './commands/operations/set-zoom-ratio.oper
 export { SheetPermissionOpenDialogOperation } from './commands/operations/sheet-permission-open-dialog.operation';
 export { SheetPermissionOpenPanelOperation } from './commands/operations/sheet-permission-open-panel.operation';
 export { SidebarDefinedNameOperation } from './commands/operations/sidebar-defined-name.operation';
+export { attachSelectionWithCoord, attachPrimaryWithCoord } from './services/selection/util';

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';
 
@@ -14,7 +13,7 @@ export declare class UniverSheetsMobileUIPlugin extends Plugin {
     static pluginName: string;
     static type: UniverInstanceType;
     constructor(_config: Partial<IUniverSheetsUIConfig>, _injector: Injector, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService);
-    onStarting(injector: Injector): void;
+    onStarting(): void;
     onReady(): void;
     onRendered(): void;
     private _registerRenderBasics;

package/lib/types/services/auto-fill/__tests__/tool.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};

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/tools.d.ts

@@ -101,3 +101,9 @@ export declare function getAutoFillRepeatRange(sourceRange: IRange, targetRange:
     };
     relativeRange: IRange;
 }[];
+/**
+ * Formulas or Boolean values do not need to update cell.v
+ * @param cell
+ * @returns
+ */
+export declare function needsUpdateCellValue(cell: ICellData): boolean;

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'> {
@@ -31,7 +30,7 @@ export declare class SheetCanvasPopManagerService extends Disposable {
      * @param viewport target viewport
      * @returns disposable
      */
-    attachPopupToCell(row: number, col: number, popup: ICanvasPopup, viewport?: Viewport): Nullable<IDisposable>;
+    attachPopupToCell(row: number, col: number, popup: ICanvasPopup, viewport?: Viewport, showOnSelectionMoving?: boolean): Nullable<IDisposable>;
     private _createCellPositionObserver;
     private _calcCellPositionByCell;
 }

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

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable, Disposable } from '@univerjs/core';
 import { ISheetLocation } from '@univerjs/sheets';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetCanvasPopManagerService } from './canvas-pop-manager.service';
@@ -17,7 +17,7 @@ export interface ICellAlert {
     height: number;
     key: string;
 }
-export declare class CellAlertManagerService {
+export declare class CellAlertManagerService extends Disposable {
     private readonly _renderManagerService;
     private readonly _canvasPopManagerService;
     private _currentAlert$;

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;