@univerjs/sheets-ui 0.2.4 → 0.2.5

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('@wendellhu/redi').IdentifierDecorator<IFormatPainterService>;
+export declare const IFormatPainterService: import('@univerjs/core').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('@wendellhu/redi').IdentifierDecorator<IMarkSelectionService>;
+export declare const IMarkSelectionService: import('@univerjs/core').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 { IRenderManagerService } from '@univerjs/engine-render';
 import { Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IRenderManagerService } from '@univerjs/engine-render';
 
 export declare class WorksheetProtectionRenderService extends Disposable {
     private _renderManagerService;

package/lib/types/services/scroll-manager.service.d.ts

@@ -3,13 +3,7 @@ import { BehaviorSubject } from 'rxjs';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
 
-export interface IViewportScrollState {
-    scrollX: number;
-    scrollY: number;
-    viewportScrollX: number;
-    viewportScrollY: number;
-}
-export interface IScrollManagerParam {
+export interface IScrollState {
     /**
      * offsetX from startRow, coordinate same as viewport, not scrollbar
      */
@@ -26,24 +20,20 @@ export interface IScrollManagerParam {
      * current start column in viewport visible area
      */
     sheetViewStartColumn: number;
-    /**
-     * overall offsetX from sheet cotent topleft, should be same as startRow * rowHeight + offsetY
-     * coordinate same as viewport, not scrollbar
-     */
-    viewportScrollX?: number;
-    /**
-     * overall offsetY from sheet content topleft, should be same as startColumn * columnWidth + offsetX
-     * coordinate same as viewport, not scrollbar
-     */
-    viewportScrollY?: number;
 }
-export interface IScrollManagerSearchParam {
+export interface IViewportScrollState extends IScrollState {
+    scrollX: number;
+    scrollY: number;
+    viewportScrollX: number;
+    viewportScrollY: number;
+}
+export interface IScrollStateSearchParam {
     unitId: string;
     sheetId: string;
 }
-export interface IScrollManagerWithSearchParam extends IScrollManagerSearchParam, IScrollManagerParam {
+export interface IScrollStateWithSearchParam extends IScrollStateSearchParam, IScrollState {
 }
-export type IScrollInfo = Map<string, Map<string, IScrollManagerParam>>;
+export type IScrollStateMap = Map<string, Map<string, IScrollState>>;
 /**
  * This service manages and sets the virtual scrolling of the canvas content area.
  * It triggers service changes through SetScrollOperation.
@@ -56,7 +46,7 @@ export declare class SheetScrollManagerService implements IRenderModule {
     /**
      * a map holds all scroll info for each sheet
      */
-    private readonly _scrollInfoMap;
+    private readonly _scrollStateMap;
     /**
      * a subject for current sheet scrollInfo
      */
@@ -64,10 +54,12 @@ export declare class SheetScrollManagerService implements IRenderModule {
     /**
      * a subject for current sheet scrollInfo ( events, ex wheel event and point events add deltaXY to rawScrollInfo$)
      */
-    readonly rawScrollInfo$: import('rxjs').Observable<Nullable<IScrollManagerParam>>;
+    readonly rawScrollInfo$: import('rxjs').Observable<Nullable<IScrollState>>;
     /**
      * a subject for current valid scrollInfo, viewport@_scrollCore would limit rawScrollInfo$ exclude negative value or over max value.
      * use this subject not rawScrollInfo$ when get scrolling state of viewport.
+     * The value of this subject is the same as the value of onScrollAfter$
+     *
      */
     readonly validViewportScrollInfo$: BehaviorSubject<Nullable<IViewportScrollState>>;
     /**
@@ -77,43 +69,32 @@ export declare class SheetScrollManagerService implements IRenderModule {
     private _searchParamForScroll;
     constructor(_context: IRenderContext<Workbook>, _sheetSkeletonManagerService: SheetSkeletonManagerService);
     dispose(): void;
-    setSearchParam(param: IScrollManagerSearchParam): void;
-    setSearchParamAndRefresh(param: IScrollManagerSearchParam): void;
-    getScrollInfoByParam(param: IScrollManagerSearchParam): Readonly<Nullable<IScrollManagerParam>>;
-    getCurrentScrollInfo(): Readonly<Nullable<IScrollManagerParam>>;
-    setScrollInfoToSnapshot(scrollInfo: IScrollManagerParam): void;
+    setSearchParam(param: IScrollStateSearchParam): void;
+    setSearchParamAndRefresh(param: IScrollStateSearchParam): void;
+    getScrollStateByParam(param: IScrollStateSearchParam): Readonly<Nullable<IScrollState>>;
+    getCurrentScrollState(): Readonly<Nullable<IScrollState>>;
     /**
-     * set scrollInfo by cmd,
-     * call _setScrollInfo twice after one scrolling.
-     * first time set scrollInfo by scrollOperation, but offsetXY is derived from scroll event.
-     * second time set scrollInfo by viewport.scrollTo(scrol.render-controller --> onScrollAfterObserver), this time offsetXY has been limited.
-     *
-     * wheelevent --> sheetCanvasView -->  set-scroll.command('sheet.command.set-scroll-relative') --> scrollOperation --> scrollManagerService.setScrollInfo  --> scrollInfo$.next --> scroll.render-controller@viewportMain.scrollTo & notify -->
-     * scroll.render-controller@onScrollAfter$ --> this.setScrollInfoToCurrSheetWithoutNotify --> this._setScrollInfo({}, false)
-     * call _setScrollInfo again, a loop!, so we should call setScrollInfoToCurrSheetWithoutNotify
+     * set scrollInfo by cmd, call by scroll operation
      * @param param
      */
-    setScrollInfoAndEmitEvent(param: IScrollManagerWithSearchParam): void;
-    setScrollInfoToCurrSheetAndEmitEvent(scrollInfo: IScrollManagerParam): void;
+    setScrollInfoAndEmitEvent(param: IScrollStateWithSearchParam): void;
+    /**
+     * call by set frozen
+     * @param scrollInfo
+     */
+    setScrollStateToCurrSheetAndEmitEvent(scrollInfo: IScrollState): void;
     /**
-     * call _setScrollInfo but no _scrollInfo$.next
+     * set _scrollStateMap but no _scrollInfo$.next
      * @param scroll
      */
-    justSetScrollInfoToCurrSheet(scroll: IScrollManagerParam): void;
+    setScrollStateToCurrSheet(scroll: IScrollState): void;
     clear(): void;
-    calcViewportScrollFromRowColOffset(scrollInfo: IScrollManagerWithSearchParam): {
-        scrollTop: number;
-        scrollLeft: number;
-        overallScrollX?: undefined;
-        overallScrollY?: undefined;
-    } | {
-        overallScrollX: number;
-        overallScrollY: number;
-        scrollTop?: undefined;
-        scrollLeft?: undefined;
+    calcViewportScrollFromRowColOffset(scrollInfo: Nullable<IViewportScrollState>): {
+        viewportScrollX: number;
+        viewportScrollY: number;
     };
-    private _setScrollInfo;
-    private _clearByParam;
+    private _setScrollState;
+    private _clearByParamAndNotify;
     private _getCurrentScroll;
-    private _notifyCurrentScrollInfo;
+    private _scrollStateNext;
 }

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

@@ -1,8 +1,7 @@
-import { IInterceptor, IRange, IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, ThemeService, Disposable, InterceptorManager, RANGE_TYPE } from '@univerjs/core';
+import { IInterceptor, Injector, 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';
 
@@ -15,6 +14,7 @@ export interface ISheetSelectionRenderService {
     readonly controlFillConfig$: Observable<IControlFillConfig | null>;
     readonly selectionMoving$: Observable<ISelectionWithCoordAndStyle[]>;
     readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
+    get selectionMoving(): boolean;
     interceptor: InterceptorManager<{
         RANGE_MOVE_PERMISSION_CHECK: IInterceptor<boolean, null>;
         RANGE_FILL_PERMISSION_CHECK: IInterceptor<boolean, {
@@ -35,7 +35,7 @@ export interface ISheetSelectionRenderService {
     getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
     setSingleSelectionEnabled(enabled: boolean): void;
 }
-export declare const ISheetSelectionRenderService: import('@wendellhu/redi').IdentifierDecorator<ISheetSelectionRenderService>;
+export declare const ISheetSelectionRenderService: import('@univerjs/core').IdentifierDecorator<ISheetSelectionRenderService>;
 /**
  * The basic implementation of selection rendering logics. It is designed to be reused for different purposes.
  */
@@ -76,6 +76,8 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
     readonly selectionMoving$: Observable<ISelectionWithCoordAndStyle[]>;
     protected readonly _selectionMoveStart$: Subject<ISelectionWithCoordAndStyle[]>;
     readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
+    private _selectionMoving;
+    get selectionMoving(): boolean;
     protected _activeViewport: Nullable<Viewport>;
     readonly interceptor: InterceptorManager<{
         RANGE_MOVE_PERMISSION_CHECK: IInterceptor<boolean, null>;
@@ -87,6 +89,7 @@ export declare class BaseSelectionRenderService extends Disposable implements IS
         }>;
     }>;
     constructor(_injector: Injector, _themeService: ThemeService, _shortcutService: IShortcutService, _renderManagerService: IRenderManagerService);
+    private _initMoving;
     protected _setStyle(style: ISelectionStyle): void;
     protected _resetStyle(): void;
     /** @deprecated This should not be provided by the selection render service. */

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

@@ -1,8 +1,7 @@
-import { Workbook, ICommandService, IContextService, ILogService, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, IContextService, ILogService, Injector, 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,8 +1,7 @@
-import { Workbook, ICommandService, IContextService, ILogService, ThemeService } from '@univerjs/core';
+import { Workbook, ICommandService, IContextService, ILogService, Injector, 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,6 +1,5 @@
-import { IRangeWithCoord, ThemeService } from '@univerjs/core';
+import { Injector, 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,5 +1,4 @@
-import { Disposable } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { Disposable, IDisposable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { IScrollState } from '../../views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar';
 
@@ -20,7 +19,7 @@ export interface ISheetBarService {
     triggerSheetBarMenu(): void;
     registerSheetBarMenuHandler(handler: ISheetBarMenuHandler): IDisposable;
 }
-export declare const ISheetBarService: import('@wendellhu/redi').IdentifierDecorator<ISheetBarService>;
+export declare const ISheetBarService: import('@univerjs/core').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,6 +1,5 @@
-import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable } from '@univerjs/core';
+import { IRange, IRangeWithCoord, Nullable, Workbook, Disposable, Injector } 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,6 +1,5 @@
-import { IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { IDisposable, 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,6 +1,5 @@
-import { ISelection, ITextRangeParam, Nullable, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { IDisposable, 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,6 +1,5 @@
-import { Nullable } from '@univerjs/core';
+import { IDisposable, Nullable } from '@univerjs/core';
 import { IFunctionNames } from '@univerjs/engine-formula';
-import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 
 export interface IStatusBarService {
@@ -31,4 +30,4 @@ export declare class StatusBarService implements IStatusBarService, IDisposable
     getFunctions(): Readonly<IStatusBarFunction[]>;
     addFunctions(functions: IStatusBarFunction[]): void;
 }
-export declare const IStatusBarService: import('@wendellhu/redi').IdentifierDecorator<StatusBarService>;
+export declare const IStatusBarService: import('@univerjs/core').IdentifierDecorator<StatusBarService>;

package/lib/types/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/views/header-resize-shape.d.ts

@@ -11,7 +11,8 @@ export declare enum HEADER_RESIZE_SHAPE_TYPE {
 }
 export declare const HEADER_MENU_SHAPE_RECT_BACKGROUND_FILL = "rgba(120, 120, 120, 0.01)";
 export declare const HEADER_MENU_SHAPE_RECT_FILL = "rgb(68, 71, 70)";
-export declare const HEADER_MENU_SHAPE_WIDTH_HEIGHT = 12;
+export declare const HEADER_MENU_SHAPE_SIZE = 12;
+export declare const MAX_HEADER_MENU_SHAPE_SIZE = 44;
 export declare const HEADER_MENU_SHAPE_THUMB_SIZE = 4;
 export declare class HeaderMenuResizeShape<T extends IHeaderMenuShapeResizeProps = IHeaderMenuShapeResizeProps> extends Shape<T> {
     private _size;