@univerjs/sheets-ui 0.1.0-beta.1 → 0.1.0-beta.3

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

@@ -20,6 +20,7 @@ export interface IFormulaEditorManagerService {
     position$: Observable<Nullable<DOMRect>>;
     focus$: Observable<boolean>;
     fxBtnClick$: Observable<boolean>;
+    foldBtnStatus$: Observable<boolean>;
     dispose(): void;
     setPosition(param: DOMRect): void;
     getPosition(): Readonly<Nullable<DOMRect>>;
@@ -34,11 +35,14 @@ export declare class FormulaEditorManagerService implements IDisposable {
     readonly focus$: Observable<boolean>;
     private readonly _fxBtnClick$;
     readonly fxBtnClick$: Observable<boolean>;
+    private readonly _foldBtnStatus$;
+    readonly foldBtnStatus$: Observable<boolean>;
     dispose(): void;
     setPosition(param: DOMRect): void;
     getPosition(): Readonly<Nullable<DOMRect>>;
     setFocus(param?: boolean): void;
     handleFxBtnClick(params: boolean): void;
+    handleFoldBtnClick(params: boolean): void;
     private _refresh;
 }
 export declare const IFormulaEditorManagerService: import("@wendellhu/redi").IdentifierDecorator<FormulaEditorManagerService>;

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

@@ -13,19 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICellDataForSheetInterceptor, IPosition, Nullable } from '@univerjs/core';
-import { Disposable, InterceptorManager } from '@univerjs/core';
-import type { IDocumentLayoutObject } from '@univerjs/engine-render';
+import type { ICellDataForSheetInterceptor, IPosition, ISelectionCell, Nullable } from '@univerjs/core';
+import { Disposable, InterceptorManager, IUniverInstanceService, ThemeService } from '@univerjs/core';
+import type { Engine, IDocumentLayoutObject, Scene } from '@univerjs/engine-render';
 import { DeviceInputEventType } from '@univerjs/engine-render';
 import type { ISheetLocation } from '@univerjs/sheets';
 import type { KeyCode } from '@univerjs/ui';
 import type { IDisposable } from '@wendellhu/redi';
 import type { Observable } from 'rxjs';
+import { ISelectionRenderService } from './selection/selection-render.service';
+import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';
 export interface IEditorBridgeServiceVisibleParam {
     visible: boolean;
     eventType: DeviceInputEventType;
     keycode?: KeyCode;
 }
+export interface ICurrentEditCellParam {
+    scene: Scene;
+    engine: Engine;
+    unitId: string;
+    sheetId: string;
+    primary: ISelectionCell;
+}
 export interface IEditorBridgeServiceParam {
     unitId: string;
     sheetId: string;
@@ -45,15 +54,17 @@ export interface IEditorBridgeServiceParam {
 declare const BEFORE_CELL_EDIT: import("@univerjs/core").IInterceptor<ICellDataForSheetInterceptor, ISheetLocation>;
 declare const AFTER_CELL_EDIT: import("@univerjs/core").IInterceptor<ICellDataForSheetInterceptor, ISheetLocation>;
 export interface IEditorBridgeService {
-    state$: Observable<Nullable<IEditorBridgeServiceParam>>;
+    currentEditCellState$: Observable<Nullable<IEditorBridgeServiceParam>>;
     visible$: Observable<IEditorBridgeServiceVisibleParam>;
     interceptor: InterceptorManager<{
         BEFORE_CELL_EDIT: typeof BEFORE_CELL_EDIT;
         AFTER_CELL_EDIT: typeof AFTER_CELL_EDIT;
     }>;
     dispose(): void;
-    setState(param: IEditorBridgeServiceParam): void;
-    getState(): Readonly<Nullable<IEditorBridgeServiceParam>>;
+    refreshEditCellState(): void;
+    setEditCell(param: ICurrentEditCellParam): void;
+    getEditCellState(): Readonly<Nullable<IEditorBridgeServiceParam>>;
+    getLatestEditCellState(): Readonly<Nullable<IEditorBridgeServiceParam>>;
     changeVisible(param: IEditorBridgeServiceVisibleParam): void;
     changeEditorDirty(dirtyStatus: boolean): void;
     getEditorDirty(): boolean;
@@ -64,12 +75,18 @@ export interface IEditorBridgeService {
     getCurrentEditorId(): Nullable<string>;
 }
 export declare class EditorBridgeService extends Disposable implements IEditorBridgeService, IDisposable {
-    private _state;
+    private readonly _sheetSkeletonManagerService;
+    private readonly _selectionRenderService;
+    private readonly _themeService;
+    private readonly _currentUniverService;
+    private _editorUnitId;
     private _isForceKeepVisible;
     private _editorIsDirty;
     private _visible;
-    private readonly _state$;
-    readonly state$: Observable<Nullable<IEditorBridgeServiceParam>>;
+    private _currentEditCell;
+    private _currentEditCellState;
+    private readonly _currentEditCellState$;
+    readonly currentEditCellState$: Observable<Nullable<IEditorBridgeServiceParam>>;
     private readonly _visible$;
     readonly visible$: Observable<IEditorBridgeServiceVisibleParam>;
     private readonly _afterVisible$;
@@ -78,10 +95,32 @@ export declare class EditorBridgeService extends Disposable implements IEditorBr
         BEFORE_CELL_EDIT: import("@univerjs/core").IInterceptor<ICellDataForSheetInterceptor, ISheetLocation>;
         AFTER_CELL_EDIT: import("@univerjs/core").IInterceptor<ICellDataForSheetInterceptor, ISheetLocation>;
     }>;
-    constructor();
-    setState(param: IEditorBridgeServiceParam): void;
-    getState(): Readonly<Nullable<IEditorBridgeServiceParam>>;
-    getCurrentEditorId(): string | undefined;
+    constructor(_sheetSkeletonManagerService: SheetSkeletonManagerService, _selectionRenderService: ISelectionRenderService, _themeService: ThemeService, _currentUniverService: IUniverInstanceService);
+    refreshEditCellState(): void;
+    setEditCell(param: ICurrentEditCellParam): void;
+    getEditCellState(): Readonly<Nullable<IEditorBridgeServiceParam>>;
+    getLatestEditCellState(): {
+        position: {
+            startX: number;
+            startY: number;
+            endX: number;
+            endY: number;
+        };
+        scaleX: number;
+        scaleY: number;
+        canvasOffset: {
+            left: number;
+            top: number;
+        };
+        row: number;
+        column: number;
+        unitId: string;
+        sheetId: string;
+        documentLayoutObject: IDocumentLayoutObject;
+        editorUnitId: string;
+        isInArrayFormulaRange: Nullable<boolean>;
+    } | undefined;
+    getCurrentEditorId(): string;
     changeVisible(param: IEditorBridgeServiceVisibleParam): void;
     isVisible(): IEditorBridgeServiceVisibleParam;
     enableForceKeepVisible(): void;

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

@@ -18,12 +18,22 @@ import { IRenderManagerService } from '@univerjs/engine-render';
 import type { ISelectionWithStyle } from '@univerjs/sheets';
 import { SelectionManagerService } from '@univerjs/sheets';
 import { ISelectionRenderService } from '../selection/selection-render.service';
+import { SelectionShape } from '../selection/selection-shape';
 import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 export interface IMarkSelectionService {
-    addShape(selection: ISelectionWithStyle, zIndex?: number): string | null;
+    addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;
     removeShape(id: string): void;
     removeAllShapes(): void;
     refreshShapes(): void;
+    getShapeMap(): Map<string, IMarkSelectionInfo>;
+}
+interface IMarkSelectionInfo {
+    unitId: string;
+    subUnitId: string;
+    selection: ISelectionWithStyle;
+    zIndex: number;
+    control: SelectionShape | null;
+    exits: string[];
 }
 export declare const IMarkSelectionService: import("@wendellhu/redi").IdentifierDecorator<IMarkSelectionService>;
 export declare class MarkSelectionService extends Disposable implements IMarkSelectionService {
@@ -36,8 +46,10 @@ export declare class MarkSelectionService extends Disposable implements IMarkSel
     private readonly _selectionManagerService;
     private _shapeMap;
     constructor(_currentService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _commandService: ICommandService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService);
-    addShape(selection: ISelectionWithStyle, zIndex?: number): string | null;
+    addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;
     refreshShapes(): void;
+    getShapeMap(): Map<string, IMarkSelectionInfo>;
     removeShape(id: string): void;
     removeAllShapes(): void;
 }
+export {};

package/lib/types/services/selection/__test__/create-service-test-bed.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+import type { IWorkbookData, Workbook } from '@univerjs/core';
+import { Univer } from '@univerjs/core';
+import type { Dependency } from '@wendellhu/redi';
+import { Injector } from '@wendellhu/redi';
+export interface ITestBed {
+    univer: Univer;
+    get: Injector['get'];
+    sheet: Workbook;
+}
+export declare function createCommandTestBed(workbookConfig?: IWorkbookData, dependencies?: Dependency[]): ITestBed;

package/lib/types/services/selection/__test__/selection-render.test.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/selection/selection-render.service.d.ts

@@ -19,7 +19,9 @@ import type { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport }
 import { ScrollTimerType } from '@univerjs/engine-render';
 import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
 import type { Observable } from 'rxjs';
+import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
 import { SelectionShape } from './selection-shape';
 export interface IControlFillConfig {
     oldRange: IRange;
@@ -45,6 +47,7 @@ export interface ISelectionRenderService {
     enableSkipRemainLast(): void;
     disableSkipRemainLast(): void;
     addControlToCurrentByRangeData(data: ISelectionWithCoordAndStyle): void;
+    updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
     changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;
     getViewPort(): Viewport;
     getCurrentControls(): SelectionShape[];
@@ -57,11 +60,12 @@ export interface ISelectionRenderService {
     convertCellRangeToInfo(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithCoord>;
     eventTrigger(evt: IPointerEvent | IMouseEvent, zIndex: number, rangeType: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): void;
     reset(): void;
+    refreshSelectionMoveStart(): void;
 }
 /**
- * TODO 注册selection拦截，可能在有公式ArrayObject时，fx公式栏显示不同
+ * TODO 注册 selection 拦截，可能在有公式 ArrayObject 时，fx 公式栏显示不同
  *
- * SelectionRenderService 维护viewModel数据list，action也是修改这一层数据，obs监听到数据变动后，自动刷新（control仍然可以持有数据）
+ * SelectionRenderService 维护 viewModel 数据 list，action 也是修改这一层数据，obs 监听到数据变动后，自动刷新（control 仍然可以持有数据）
  *
  * This service is related to the drawing of the selection.
  * By modifying the properties of the service,
@@ -72,6 +76,8 @@ export interface ISelectionRenderService {
 export declare class SelectionRenderService implements ISelectionRenderService {
     private readonly _themeService;
     private readonly _shortcutService;
+    private readonly _sheetSkeletonManagerService;
+    private readonly _injector;
     hasSelection: boolean;
     private _downObserver;
     private _moveObserver;
@@ -107,7 +113,7 @@ export declare class SelectionRenderService implements ISelectionRenderService {
      */
     readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
     private _activeViewport;
-    constructor(_themeService: ThemeService, _shortcutService: IShortcutService);
+    constructor(_themeService: ThemeService, _shortcutService: IShortcutService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _injector: Injector);
     enableHeaderHighlight(): void;
     disableHeaderHighlight(): void;
     enableDetectMergedCell(): void;
@@ -130,10 +136,20 @@ export declare class SelectionRenderService implements ISelectionRenderService {
      * @returns
      */
     addControlToCurrentByRangeData(data: ISelectionWithCoordAndStyle): void;
+    /**
+     * update selection
+     * @param selectionRange
+     * @param curCellRange
+     * @returns
+     */
+    updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
+    refreshSelectionMoveStart(): void;
     changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;
     getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
     getCurrentControls(): SelectionShape[];
     private _clearSelectionControls;
+    private _getFreeze;
+    private _getViewportByCell;
     /**
      * Returns the list of active ranges in the active sheet or null if there are no active ranges.
      * If there is a single range selected, this behaves as a getActiveRange() call.

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

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type IRangeWithCoord, type ThemeService } from '@univerjs/core';
+import type { IRangeWithCoord, ThemeService } from '@univerjs/core';
 import type { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import type { Injector } from '@wendellhu/redi';
 import type { SelectionShape } from './selection-shape';
 export interface ISelectionShapeTargetSelection {
     originControl: SelectionShape;
@@ -25,6 +26,7 @@ export declare class SelectionShapeExtension {
     private _skeleton;
     private _scene;
     private readonly _themeService;
+    private readonly _injector;
     private _startOffsetX;
     private _startOffsetY;
     private _relativeSelectionPositionRow;
@@ -35,12 +37,15 @@ export declare class SelectionShapeExtension {
     private _upObserver;
     private _helperSelection;
     private _scrollTimer;
+    private _activeViewport;
     private _targetSelection;
     private _isInMergeState;
     private _fillControlColors;
-    constructor(_control: SelectionShape, _skeleton: SpreadsheetSkeleton, _scene: Scene, _themeService: ThemeService);
+    constructor(_control: SelectionShape, _skeleton: SpreadsheetSkeleton, _scene: Scene, _themeService: ThemeService, _injector: Injector);
     get isHelperSelection(): boolean;
     dispose(): void;
+    private _getFreeze;
+    private _isSelectionInViewport;
     private _clearObserverEvent;
     private _initialControl;
     private _controlMoving;

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

@@ -94,6 +94,7 @@ export declare class SelectionShape {
     get selectionStyle(): Nullable<ISelectionStyle>;
     get dashRect(): Rect<import("@univerjs/engine-render").IRectProps>;
     get isHelperSelection(): boolean;
+    setEvent(state: boolean): void;
     enableHeaderHighlight(): void;
     disableHeaderHighlight(): void;
     refreshSelectionFilled(val: IRangeWithCoord): void;
@@ -125,6 +126,4 @@ export declare class SelectionShape {
     private _updateWidgets;
     private _hasWidgets;
     private _getScale;
-    private _getPureScale;
-    private _getPixelRatio;
 }

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

@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+import type { ISelection, ITextRangeParam, Nullable } from '@univerjs/core';
+import { IUniverInstanceService, LocaleService } from '@univerjs/core';
+import type { KeyCode } from '@univerjs/ui';
+import type { IDisposable } from '@wendellhu/redi';
+export interface IShortcutExperienceSearch {
+    unitId: string;
+    sheetId: string;
+    keycode: KeyCode;
+}
+export interface IShortcutExperienceParam extends IShortcutExperienceSearch {
+    selection?: ISelection;
+    textSelection?: ITextRangeParam;
+}
+/**
+ * This service is prepared for shortcut experience optimization,
+ * including the combined use of enter and tab, the highlighting experience of formulas in the editor, and so on.
+ */
+export declare class ShortcutExperienceService implements IDisposable {
+    private readonly _currentUniverService;
+    private readonly _localeService;
+    private _current;
+    private _shortcutParam;
+    constructor(_currentUniverService: IUniverInstanceService, _localeService: LocaleService);
+    dispose(): void;
+    getCurrentBySearch(searchParm: Nullable<IShortcutExperienceSearch>): Nullable<IShortcutExperienceParam>;
+    getCurrent(): Nullable<IShortcutExperienceParam>;
+    addOrUpdate(insertParam: IShortcutExperienceParam): Nullable<IShortcutExperienceParam>;
+    remove(searchParm: Nullable<IShortcutExperienceSearch>): Nullable<IShortcutExperienceParam>;
+    private _getCurrentBySearch;
+}

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

@@ -24,10 +24,13 @@ export interface IStatusBarService {
     getState(): Readonly<Nullable<IStatusBarServiceStatus>>;
     getFunctions(): Readonly<IStatusBarFunction[]>;
 }
-export type IStatusBarServiceStatus = Array<{
-    func: IFunctionNames;
-    value: number;
-}>;
+export interface IStatusBarServiceStatus {
+    values: Array<{
+        func: IFunctionNames;
+        value: number;
+    }>;
+    pattern: Nullable<string>;
+}
 export interface IStatusBarFunction {
     func: IFunctionNames;
     filter?: (status: IStatusBarServiceStatus) => boolean;

package/lib/types/views/header-menu-shape.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IShapeProps } from '@univerjs/engine-render';
+import type { IShapeProps, UniverRenderingContext } from '@univerjs/engine-render';
 import { Shape } from '@univerjs/engine-render';
 export interface IHeaderMenuShapeProps extends IShapeProps {
     size?: number;
@@ -33,5 +33,5 @@ export declare class HeaderMenuShape<T extends IHeaderMenuShapeProps = IHeaderMe
     private _mode;
     constructor(key?: string, props?: T);
     setShapeProps(props?: T): void;
-    protected _draw(ctx: CanvasRenderingContext2D): void;
+    protected _draw(ctx: UniverRenderingContext): void;
 }

package/lib/types/views/header-resize-shape.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IShapeProps } from '@univerjs/engine-render';
+import type { IShapeProps, UniverRenderingContext } from '@univerjs/engine-render';
 import { Shape } from '@univerjs/engine-render';
 export interface IHeaderMenuShapeResizeProps extends IShapeProps {
     size?: number;
@@ -36,6 +36,6 @@ export declare class HeaderMenuResizeShape<T extends IHeaderMenuShapeResizeProps
     get size(): number;
     get mode(): HEADER_RESIZE_SHAPE_TYPE;
     get color(): string;
-    protected _draw(ctx: CanvasRenderingContext2D): void;
+    protected _draw(ctx: UniverRenderingContext): void;
     setShapeProps(props?: T): this;
 }

package/lib/types/views/header-unhide-shape.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IShapeProps } from '@univerjs/engine-render';
+import type { IShapeProps, UniverRenderingContext } from '@univerjs/engine-render';
 import { Shape } from '@univerjs/engine-render';
 export declare const enum HeaderUnhideShapeType {
     ROW = 0,
@@ -39,7 +39,7 @@ export declare class HeaderUnhideShape<T extends IHeaderUnhideShapeProps = IHead
     private _unhideType;
     constructor(key?: string, props?: T, onClick?: () => void);
     setShapeProps(props: Partial<IHeaderUnhideShapeProps>): void;
-    protected _draw(ctx: CanvasRenderingContext2D): void;
+    protected _draw(ctx: UniverRenderingContext): void;
     private _drawOnRow;
     /**
      *

package/lib/types/views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar.d.ts

@@ -29,7 +29,7 @@ export interface SlideTabBarConfig {
     currentIndex: number;
     onSlideEnd: (event: MouseEvent, compareIndex: number) => void;
     onChangeName: (id: string, name: string) => void;
-    onChangeTab: (event: FocusEvent, id: string) => void;
+    onChangeTab: (event: MouseEvent, id: string) => void;
     onScroll: (state: IScrollState) => void;
     onNameCheckAlert: (text: string) => boolean;
 }
@@ -53,6 +53,8 @@ export declare class SlideTabItem {
     static make(nodeList: NodeList, slideTabBar: SlideTabBar): SlideTabItem[];
     getSlideTabItem(): HTMLElement;
     getEditor(): HTMLSpanElement | null;
+    focus(): void;
+    selectAll(): void;
     isEditMode(): boolean;
     classList(): DOMTokenList;
     translateX(x: number): 1 | 0 | -1;

package/lib/types/views/status-bar/CopyableStatisticItem.d.ts

@@ -20,11 +20,12 @@ export interface IStatisticItem {
     value: number;
     show: boolean;
     disable: boolean;
+    pattern: string | null;
 }
 export declare const functionDisplayNames: FunctionNameMap;
 interface FunctionNameMap {
     [key: string]: string;
 }
 export declare const CopyableStatisticItem: React.FC<IStatisticItem>;
-export declare function formatNumber(num: number): string;
+export declare function formatNumber(item: IStatisticItem): string;
 export {};