@univerjs/ui 0.2.6 → 0.2.8

package/lib/types/commands/operations/editor/set-editor-resize.operation.d.ts

@@ -1,3 +1,2 @@
 import { IOperation } from '@univerjs/core';
-
 export declare const SetEditorResizeOperation: IOperation;

package/lib/types/commands/operations/toggle-shortcut-panel.operation.d.ts

@@ -1,4 +1,3 @@
 import { IOperation } from '@univerjs/core';
-
 export declare const ShortcutPanelComponentName = "ShortcutPanel";
 export declare const ToggleShortcutPanelOperation: IOperation;

package/lib/types/common/component-manager.d.ts

@@ -1,7 +1,6 @@
 import { IDisposable } from '@univerjs/core';
 import { defineComponent } from 'vue';
 import { default as React } from 'react';
-
 type ComponentFramework = 'vue3' | 'react';
 interface IComponentOptions {
     framework?: ComponentFramework;

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

@@ -1,4 +1,3 @@
 import { IDisposable } from '@univerjs/core';
-
 export declare function fromGlobalEvent<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean | AddEventListenerOptions): IDisposable;
 export declare function fromEvent<K extends keyof HTMLElementEventMap>(target: HTMLElement, type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): IDisposable;

package/lib/types/common/menu-hidden-observable.d.ts

@@ -1,5 +1,4 @@
 import { IAccessor, UniverInstanceType } from '@univerjs/core';
 import { Observable } from 'rxjs';
-
 export declare function getMenuHiddenObservable(accessor: IAccessor, targetUniverType: UniverInstanceType): Observable<boolean>;
 export declare function getHeaderFooterMenuHiddenObservable(accessor: IAccessor): Observable<boolean>;

package/lib/types/common/menu-merge-configs.d.ts

@@ -1,3 +1,2 @@
 import { MenuConfig, MenuItemConfig } from '../services/menu/menu';
-
 export declare function mergeMenuConfigs<T = MenuConfig>(baseConfig: T, additionalConfig: MenuItemConfig | null): T;

package/lib/types/components/custom-label/CustomLabel.d.ts

@@ -1,7 +1,6 @@
 import { default as React } from 'react';
 import { Observable } from 'rxjs';
 import { IMenuSelectorItem } from '../../services/menu/menu';
-
 export type ICustomLabelProps<T = undefined> = {
     value?: string | number | undefined;
     value$?: Observable<T>;

package/lib/types/components/editor/TextEditor.d.ts

@@ -1,17 +1,17 @@
 import { IDocumentData, Nullable } from '@univerjs/core';
 import { default as React } from 'react';
 import { IEditorCanvasStyle } from '../../services/editor/editor.service';
-
 type MyComponentProps = React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
 export interface ITextEditorProps {
     id: string;
     className?: string;
     snapshot?: IDocumentData;
+    value?: string;
     resizeCallBack?: (editor: Nullable<HTMLDivElement>) => void;
     cancelDefaultResizeListener?: boolean;
-    isSheetEditor?: boolean;
     canvasStyle?: IEditorCanvasStyle;
-    value?: string;
+    isSheetEditor?: boolean;
+    isFormulaEditor?: boolean;
     isSingle?: boolean;
     isReadonly?: boolean;
     onlyInputFormula?: boolean;

package/lib/types/components/font-family/FontFamily.d.ts

@@ -1,4 +1,3 @@
 import { default as React } from 'react';
 import { IFontFamilyProps } from './interface';
-
 export declare const FontFamily: (props: IFontFamilyProps) => React.JSX.Element;

package/lib/types/components/font-family/FontFamilyItem.d.ts

@@ -1,4 +1,3 @@
 import { default as React } from 'react';
 import { IFontFamilyItemProps } from './interface';
-
 export declare const FontFamilyItem: (props: IFontFamilyItemProps) => React.JSX.Element;

package/lib/types/components/font-family/interface.d.ts

@@ -1,5 +1,4 @@
 import { ICustomComponentProps } from '@univerjs/ui';
-
 export interface IFontFamilyProps extends ICustomComponentProps<string> {
     value: string;
 }

package/lib/types/components/font-size/FontSize.d.ts

@@ -1,4 +1,3 @@
 import { default as React } from 'react';
 import { IFontSizeProps } from './interface';
-
 export declare const FontSize: (props: IFontSizeProps) => React.JSX.Element;

package/lib/types/components/font-size/interface.d.ts

@@ -1,6 +1,5 @@
 import { ICustomComponentProps } from '@univerjs/ui';
 import { Observable } from 'rxjs';
-
 export interface IFontSizeProps extends ICustomComponentProps<string> {
     value: string;
     min: number;

package/lib/types/components/hooks/layout.d.ts

@@ -1,5 +1,4 @@
 import { Nullable } from '@univerjs/core';
-
 /**
  * These hooks are used for browser layout
  * Prefer to client-side

package/lib/types/components/hooks/locale.d.ts

@@ -1,4 +1,3 @@
 import { LocaleService } from '@univerjs/core';
-
 export declare function useLocaleService(): LocaleService;
 export declare function t(localeService: LocaleService, key: string, ...args: Array<number | string>): string;

package/lib/types/components/hooks/observable.d.ts

@@ -1,10 +1,10 @@
 import { Nullable } from '@univerjs/core';
 import { Observable } from 'rxjs';
-
 type ObservableOrFn<T> = Observable<T> | (() => Observable<T>);
 export declare function useObservable<T>(observable: ObservableOrFn<T>, defaultValue: T | undefined, shouldHaveSyncValue?: true): T;
 export declare function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue: T): T;
 export declare function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue?: undefined): T | undefined;
+export declare function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue: T, shouldHaveSyncValue?: boolean, deps?: any[]): T;
 export declare function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue: undefined, shouldHaveSyncValue: true, deps?: any[]): T;
 export declare function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue?: T, shouldHaveSyncValue?: boolean, deps?: any[]): T | undefined;
 export {};

package/lib/types/components/hooks/virtual-list.d.ts

@@ -0,0 +1,35 @@
+/**
+ * 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.
+ */
+type ItemHeight<T> = (index: number, data: T) => number;
+export interface IVirtualListOptions<T> {
+    containerTarget: React.RefObject<HTMLElement>;
+    itemHeight: number | ItemHeight<T>;
+    overscan?: number;
+}
+declare const useVirtualList: <T>(list: T[], options: IVirtualListOptions<T>) => readonly [{
+    index: number;
+    data: T;
+}[], {
+    readonly wrapperStyle: {
+        height: string | undefined;
+        marginTop: string | undefined;
+    };
+    readonly scrollTo: (index: number) => void;
+    readonly containerProps: {
+        readonly onScroll: (e: React.UIEvent<HTMLElement, UIEvent>) => void;
+    };
+}];
+export { useVirtualList };

package/lib/types/components/menu/common/hook.d.ts

@@ -1,3 +1,2 @@
 import { IDisplayMenuItem, IMenuItem } from '../../../services/menu/menu';
-
 export declare function useMenuItemState(menuItem: IDisplayMenuItem<IMenuItem>): void;

package/lib/types/components/menu/desktop/Menu.d.ts

@@ -1,6 +1,5 @@
 import { default as React } from 'react';
 import { IValueOption } from '../../../services/menu/menu.ts';
-
 export interface IBaseMenuProps {
     parentKey?: string | number;
     menuType?: string | string[];

package/lib/types/components/menu/mobile/MobileMenu.d.ts

@@ -1,6 +1,5 @@
 import { default as React } from 'react';
 import { IBaseMenuProps } from '../desktop/Menu';
-
 /**
  * The mobile context menu wrapper.
  */

package/lib/types/components/menu/mobile/MobileMenu.stories.d.ts

@@ -1,6 +1,5 @@
 import { Meta } from '@storybook/react';
 import { default as React } from 'react';
-
 declare const meta: Meta;
 export default meta;
 export declare const Playground: {

package/lib/types/components/notification/Notification.d.ts

@@ -1,7 +1,6 @@
 import { Placement } from 'rc-notification/es/interface';
 import { default as React } from 'react';
 import { Subject } from 'rxjs';
-
 export type NotificationType = 'success' | 'info' | 'warning' | 'error';
 export interface INotificationOptions {
     /**

package/lib/types/components/notification/Notification.stories.d.ts

@@ -1,7 +1,6 @@
 import { Meta } from '@storybook/react';
 import { default as React } from 'react';
 import { Notification } from './Notification';
-
 declare const meta: Meta<typeof Notification>;
 export default meta;
 export declare const Playground: {

package/lib/types/components/progress-bar/ProgressBar.d.ts

@@ -1,5 +1,4 @@
 import { default as React } from 'react';
-
 export interface IProgressBarProps {
     barColor: string;
 }

package/lib/types/components/range-selector/RangeSelector.d.ts

@@ -1,6 +1,5 @@
 import { IUnitRangeWithName, Nullable } from '@univerjs/core';
 import { default as React } from 'react';
-
 export interface IRangeSelectorProps {
     id: string;
     value?: string;

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

@@ -1,6 +1,5 @@
 import { Disposable, ErrorService } from '@univerjs/core';
 import { IMessageService } from '../../services/message/message.service';
-
 export declare class ErrorController extends Disposable {
     private readonly _errorService;
     private readonly _messageService;

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

@@ -1,5 +1,4 @@
 import { IAccessor } from '@univerjs/core';
 import { IMenuButtonItem } from '../../services/menu/menu';
-
 export declare function UndoMenuItemFactory(accessor: IAccessor): IMenuButtonItem;
 export declare function RedoMenuItemFactory(accessor: IAccessor): IMenuButtonItem;

package/lib/types/controllers/shared-shortcut.controller.d.ts

@@ -2,7 +2,6 @@ import { Disposable, ICommandService, Injector } from '@univerjs/core';
 import { IMenuService } from '../services/menu/menu.service';
 import { IShortcutItem, IShortcutService } from '../services/shortcut/shortcut.service';
 import { IUniverUIConfig } from './ui/ui.controller';
-
 export declare const CopyShortcutItem: IShortcutItem;
 export declare const CutShortcutItem: IShortcutItem;
 /**

package/lib/types/controllers/shortcut-display/menu.d.ts

@@ -1,4 +1,3 @@
 import { IAccessor } from '@univerjs/core';
 import { IMenuButtonItem } from '../../services/menu/menu';
-
 export declare function ShortcutPanelMenuItemFactory(accessor: IAccessor): IMenuButtonItem;

package/lib/types/controllers/shortcut-display/shortcut-panel.controller.d.ts

@@ -3,7 +3,6 @@ import { ComponentManager } from '../../common/component-manager';
 import { IMenuService } from '../../services/menu/menu.service';
 import { IShortcutService } from '../../services/shortcut/shortcut.service';
 import { IUniverUIConfig } from '../ui/ui.controller';
-
 /**
  * This controller add a side panel to the application to display the shortcuts.
  */

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

@@ -3,7 +3,6 @@ import { IRenderManagerService } from '@univerjs/engine-render';
 import { ILayoutService } from '../../services/layout/layout.service';
 import { IUIPartsService } from '../../services/parts/parts.service';
 import { IUniverUIConfig } from './ui.controller';
-
 export declare class DesktopUIController extends Disposable {
     private readonly _config;
     private readonly _renderManagerService;

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

@@ -3,7 +3,6 @@ import { IRenderManagerService } from '@univerjs/engine-render';
 import { ILayoutService } from '../../services/layout/layout.service';
 import { IUIPartsService } from '../../services/parts/parts.service';
 import { IUIController, IUniverUIConfig } from './ui.controller';
-
 export declare class MobileUIController extends Disposable implements IUIController {
     private readonly _config;
     private readonly _instanceService;

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

@@ -1,6 +1,5 @@
 import { DependencyOverride } from '@univerjs/core';
 import { MenuConfig } from '../../services/menu/menu';
-
 export interface IWorkbenchOptions {
     container?: string | HTMLElement;
     header?: boolean;

package/lib/types/index.d.ts

@@ -19,6 +19,7 @@ export * from './components';
 export { t } from './components/hooks/locale';
 export { useObservable } from './components/hooks/observable';
 export { useEvent } from './components/hooks/event';
+export { useVirtualList } from './components/hooks/virtual-list';
 export { CopyShortcutItem, CutShortcutItem, RedoShortcutItem, SharedController, UndoShortcutItem, } from './controllers/shared-shortcut.controller';
 export { UI_CONFIG_KEY, IUIController, type IWorkbenchOptions, type IUniverUIConfig } from './controllers/ui/ui.controller';
 export { DesktopUIController } from './controllers/ui/ui-desktop.controller';
@@ -46,7 +47,7 @@ export { IGlobalZoneService } from './services/global-zone/global-zone.service';
 export { KeyCode, MetaKeys } from './services/shortcut/keycode';
 export { ShortcutService, type IShortcutItem, IShortcutService } from './services/shortcut/shortcut.service';
 export { DesktopSidebarService } from './services/sidebar/desktop-sidebar.service';
-export { ISidebarService } from './services/sidebar/sidebar.service';
+export { ISidebarService, ILeftSidebarService } from './services/sidebar/sidebar.service';
 export { IZenZoneService } from './services/zen-zone/zen-zone.service';
 export { UniverUIPlugin, DISABLE_AUTO_FOCUS_KEY } from './ui-plugin';
 export { UniverMobileUIPlugin } from './mobile-ui-plugin';
@@ -54,7 +55,7 @@ export * from './utils';
 export { Menu } from './components/menu/desktop/Menu';
 export { type IConfirmPartMethodOptions } from './views/components/confirm-part/interface';
 export { ComponentContainer, useComponentsOfPart, type IComponentContainerProps } from './views/components/ComponentContainer';
-export { IEditorService, EditorService } from './services/editor/editor.service';
+export { IEditorService, EditorService, Editor } from './services/editor/editor.service';
 export { TextEditor } from './components/editor/TextEditor';
 export { RangeSelector } from './components/range-selector/RangeSelector';
 export { ProgressBar } from './components/progress-bar/ProgressBar';
@@ -74,11 +75,14 @@ export { GlobalZone } from './views/components/global-zone/GlobalZone';
 export { builtInGlobalComponents } from './views/parts';
 export { DesktopContextMenu as ContextMenu } from './views/components/context-menu/ContextMenu';
 export { Sidebar } from './views/components/sidebar/Sidebar';
+export { type ISidebarMethodOptions } from './views/components/sidebar/interface';
 export { ZenZone } from './views/components/zen-zone/ZenZone';
 export { CanvasPopup } from './views/components/popup/CanvasPopup';
 export { CanvasFloatDomService, type IFloatDomLayout } from './services/dom/canvas-dom-layer.service';
 export { FloatDom } from './views/components/dom/FloatDom';
 export { MobileContextMenu } from './views/components/context-menu/MobileContextMenu';
 export { Toolbar } from './views/components/doc-bars/Toolbar';
+export { ToolbarItem } from './views/components/doc-bars/ToolbarItem';
+export { ToolbarButton } from './views/components/doc-bars/Button/ToolbarButton';
 export { ToggleShortcutPanelOperation } from './commands/operations/toggle-shortcut-panel.operation';
 export { SetEditorResizeOperation } from './commands/operations/editor/set-editor-resize.operation';

package/lib/types/locale/en-US.d.ts

@@ -1,4 +1,3 @@
 import { default as zhCN } from './zh-CN';
-
 declare const locale: typeof zhCN;
 export default locale;

package/lib/types/locale/ru-RU.d.ts

@@ -1,4 +1,3 @@
 import { default as zhCN } from './zh-CN';
-
 declare const locale: typeof zhCN;
 export default locale;

package/lib/types/locale/vi-VN.d.ts

@@ -1,4 +1,3 @@
 import { default as zhCN } from './zh-CN';
-
 declare const locale: typeof zhCN;
 export default locale;

package/lib/types/locale/zh-TW.d.ts

@@ -1,4 +1,3 @@
 import { default as zhCN } from './zh-CN';
-
 declare const locale: typeof zhCN;
 export default locale;

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

@@ -1,6 +1,5 @@
 import { Injector, Plugin } from '@univerjs/core';
 import { IUniverUIConfig } from './controllers/ui/ui.controller';
-
 export declare const UNIVER_MOBILE_UI_PLUGIN_NAME = "UNIVER_MOBILE_UI_PLUGIN";
 /**
  * @ignore

package/lib/types/services/before-close/before-close.service.d.ts

@@ -1,6 +1,5 @@
 import { IDisposable } from '@univerjs/core';
 import { INotificationService } from '../notification/notification.service';
-
 export interface IBeforeCloseService {
     /**
      * Provide a callback to check if the web page could be closed safely.

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

@@ -1,6 +1,5 @@
 import { Disposable, ILogService, LocaleService } from '@univerjs/core';
 import { INotificationService } from '../notification/notification.service';
-
 export declare const PLAIN_TEXT_CLIPBOARD_MIME_TYPE = "text/plain";
 export declare const HTML_CLIPBOARD_MIME_TYPE = "text/html";
 /**

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

@@ -1,5 +1,4 @@
 import { IMultiCommand } from '@univerjs/core';
-
 export declare const CopyCommand: IMultiCommand;
 export declare const CutCommand: IMultiCommand;
 export declare const PasteCommand: IMultiCommand;

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

@@ -1,7 +1,6 @@
 import { IDisposable } from '@univerjs/core';
 import { Subject } from 'rxjs';
 import { IConfirmPartMethodOptions } from '../../views/components/confirm-part/interface';
-
 export declare const IConfirmService: import('@univerjs/core').IdentifierDecorator<IConfirmService>;
 export interface IConfirmService {
     readonly confirmOptions$: Subject<IConfirmPartMethodOptions[]>;

package/lib/types/services/confirm/desktop-confirm.service.d.ts

@@ -3,7 +3,6 @@ import { Subject } from 'rxjs';
 import { IConfirmPartMethodOptions } from '../../views/components/confirm-part/interface';
 import { IUIPartsService } from '../parts/parts.service';
 import { IConfirmService } from './confirm.service';
-
 export declare class DesktopConfirmService extends Disposable implements IConfirmService {
     protected readonly _injector: Injector;
     protected readonly _uiPartsService: IUIPartsService;

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

@@ -1,6 +1,5 @@
 import { Disposable, IDisposable } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent } from '@univerjs/engine-render';
-
 export interface IContextMenuHandler {
     /** A callback to open context menu with given position and menu type. */
     handleContextMenu(event: IPointerEvent | IMouseEvent, menuType: string): void;

package/lib/types/services/dialog/desktop-dialog.service.d.ts

@@ -3,7 +3,6 @@ import { Subject } from 'rxjs';
 import { IDialogPartMethodOptions } from '../../views/components/dialog-part/interface';
 import { IUIPartsService } from '../parts/parts.service';
 import { IDialogService } from './dialog.service';
-
 export declare class DesktopDialogService extends Disposable implements IDialogService {
     protected readonly _injector: Injector;
     protected readonly _uiPartsService: IUIPartsService;

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

@@ -1,7 +1,6 @@
 import { IDisposable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { IDialogPartMethodOptions } from '../../views/components/dialog-part/interface';
-
 export declare const IDialogService: import('@univerjs/core').IdentifierDecorator<IDialogService>;
 export interface IDialogService {
     open(params: IDialogPartMethodOptions): IDisposable;

package/lib/types/services/dom/canvas-dom-layer.service.d.ts

@@ -1,6 +1,5 @@
 import { IPosition, Serializable } from '@univerjs/core';
 import { Observable } from 'rxjs';
-
 export interface IFloatDomLayout extends IPosition {
     rotate: number;
     width: number;

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

@@ -1,8 +1,7 @@
 import { DocumentDataModel, IDisposable, IDocumentBody, IDocumentData, IPosition, Nullable, Disposable, IContextService, IUniverInstanceService } from '@univerjs/core';
 import { Observable } from 'rxjs';
-import { IRender, ISuccinctTextRangeParam, IRenderManagerService } from '@univerjs/engine-render';
+import { IRender, ISuccinctDocRangeParam, IRenderManagerService } from '@univerjs/engine-render';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
-
 export interface IEditorStateParam extends Partial<IPosition> {
     visible?: boolean;
 }
@@ -15,6 +14,11 @@ export interface IEditorConfigParam {
     cancelDefaultResizeListener?: boolean;
     canvasStyle?: IEditorCanvasStyle;
     isSheetEditor: boolean;
+    /**
+     * If the editor is for formula editing.
+     * @deprecated this is a temp fix before refactoring editor.
+     */
+    isFormulaEditor: boolean;
     isSingle: boolean;
     isReadonly: boolean;
     onlyInputFormula: boolean;
@@ -65,6 +69,8 @@ export declare class Editor {
     getBoundingClientRect(): DOMRect;
     isVisible(): boolean | undefined;
     isSheetEditor(): boolean;
+    /** @deprecated */
+    isFormulaEditor(): boolean;
     getValue(): string;
     getBody(): IDocumentBody | undefined;
     update(param: Partial<IEditorSetParam>): void;
@@ -98,7 +104,7 @@ export interface IEditorService {
     closeRangePrompt(): void;
     blur$: Observable<unknown>;
     blur(): void;
-    focus$: Observable<ISuccinctTextRangeParam>;
+    focus$: Observable<ISuccinctDocRangeParam>;
     focus(editorUnitId?: string): void;
     setValue$: Observable<IEditorSetValueParam>;
     valueChange$: Observable<Readonly<Editor>>;
@@ -141,7 +147,7 @@ export declare class EditorService extends Disposable implements IEditorService,
     private readonly _blur$;
     readonly blur$: Observable<unknown>;
     private readonly _focus$;
-    readonly focus$: Observable<ISuccinctTextRangeParam>;
+    readonly focus$: Observable<ISuccinctDocRangeParam>;
     private readonly _setValue$;
     readonly setValue$: Observable<IEditorSetValueParam>;
     private readonly _valueChange$;
@@ -187,7 +193,6 @@ export declare class EditorService extends Disposable implements IEditorService,
     checkValueLegality(editorUnitId: string): boolean;
     private _refreshValueChange;
     private _getCurrentEditorUnitId;
-    private _refresh;
     private _getBlank;
 }
 export declare const IEditorService: import('@univerjs/core').IdentifierDecorator<IEditorService>;

package/lib/types/services/global-zone/desktop-global-zone.service.d.ts

@@ -3,7 +3,6 @@ import { ForwardRefExoticComponent } from 'react';
 import { Subject } from 'rxjs';
 import { ComponentManager } from '../../common/component-manager';
 import { IGlobalZoneService } from './global-zone.service';
-
 export declare class DesktopGlobalZoneService implements IGlobalZoneService {
     private readonly _componentManager;
     readonly visible$: Subject<boolean>;

package/lib/types/services/global-zone/global-zone.service.d.ts

@@ -1,6 +1,5 @@
 import { IDisposable } from '@univerjs/core';
 import { Subject } from 'rxjs';
-
 export declare const IGlobalZoneService: import('@univerjs/core').IdentifierDecorator<IGlobalZoneService>;
 export interface IGlobalZoneService {
     readonly visible$: Subject<boolean>;

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

@@ -1,6 +1,5 @@
 import { ContextService, IDisposable, Nullable, Disposable, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
 import { IEditorService } from '../editor/editor.service';
-
 type FocusHandlerFn = (unitId: string) => void;
 export declare const FOCUSING_UNIVER = "FOCUSING_UNIVER";
 export interface ILayoutService {
@@ -12,13 +11,13 @@ export interface ILayoutService {
     registerFocusHandler(type: UniverInstanceType, handler: FocusHandlerFn): IDisposable;
     /** Register the root container element. */
     registerRootContainerElement(container: HTMLElement): IDisposable;
-    /** Register a canvas element. */
-    registerCanvasElement(container: HTMLCanvasElement): IDisposable;
+    /** Register a content element. */
+    registerContentElement(container: HTMLElement): IDisposable;
     /** Register an element as a container, especially floating components like Dialogs and Notifications. */
     registerContainerElement(container: HTMLElement): IDisposable;
-    getCanvasElement(): HTMLCanvasElement;
+    getContentElement(): HTMLElement;
     checkElementInCurrentContainers(element: HTMLElement): boolean;
-    checkCanvasIsFocused(): boolean;
+    checkContentIsFocused(): boolean;
 }
 export declare const ILayoutService: import('@univerjs/core').IdentifierDecorator<ILayoutService>;
 /**
@@ -33,18 +32,18 @@ export declare class DesktopLayoutService extends Disposable implements ILayoutS
     private _isFocused;
     get isFocused(): boolean;
     private readonly _focusHandlers;
-    private _canvasContainers;
+    private _contentElements;
     private _allContainers;
     constructor(_contextService: ContextService, _univerInstanceService: IUniverInstanceService, _editorService: IEditorService);
     get rootContainerElement(): Nullable<HTMLElement>;
     focus(): void;
     registerFocusHandler(type: UniverInstanceType, handler: FocusHandlerFn): IDisposable;
-    registerCanvasElement(container: HTMLCanvasElement): IDisposable;
-    getCanvasElement(): HTMLCanvasElement;
+    registerContentElement(container: HTMLElement): IDisposable;
+    getContentElement(): HTMLElement;
     registerRootContainerElement(container: HTMLElement): IDisposable;
     registerContainerElement(container: HTMLElement): IDisposable;
     checkElementInCurrentContainers(element: HTMLElement): boolean;
-    checkCanvasIsFocused(): boolean;
+    checkContentIsFocused(): boolean;
     private _initUniverFocusListener;
     private _initEditorStatus;
     private _blurSheetEditor;

package/lib/types/services/local-storage/local-storage.service.d.ts

@@ -1,5 +1,4 @@
 import { ILocalStorageService } from '@univerjs/core';
-
 export declare class DesktopLocalStorageService implements ILocalStorageService {
     getItem<T>(key: string): Promise<T | null>;
     setItem<T>(key: string, value: T): Promise<T>;

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

@@ -1,6 +1,5 @@
 import { IAccessor } from '@univerjs/core';
 import { Observable } from 'rxjs';
-
 export type OneOrMany<T> = T | T[];
 export declare enum MenuPosition {
     VOID = "void",
@@ -38,6 +37,11 @@ export declare enum MenuItemType {
 interface IMenuItemBase<V> {
     /** ID of the menu item. Normally it should be the same as the ID of the command that it would invoke.  */
     id: string;
+    /**
+     * If two menus reuse the same command (e.g. copy & paste command). They should have the same command
+     * id and different ids.
+     */
+    commandId?: string;
     subId?: string;
     title?: string;
     description?: string;
@@ -66,6 +70,7 @@ export interface IMenuButtonItem<V = undefined> extends IMenuItemBase<V> {
     activated$?: Observable<boolean>;
 }
 export interface IValueOption<T = undefined> {
+    id?: string;
     value?: string | number;
     value$?: Observable<T>;
     label?: string | {
@@ -79,7 +84,7 @@ export interface IValueOption<T = undefined> {
     tooltip?: string;
     style?: object;
     disabled?: boolean;
-    id?: string;
+    commandId?: string;
 }
 export interface ICustomComponentProps<T> {
     value: T;

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

@@ -2,7 +2,6 @@ import { Disposable, IDisposable } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { IShortcutService } from '../shortcut/shortcut.service';
 import { IDisplayMenuItem, IMenuItem, MenuConfig, MenuPosition } from './menu';
-
 export declare const IMenuService: import('@univerjs/core').IdentifierDecorator<IMenuService>;
 export interface IMenuService {
     menuChanged$: Observable<void>;
@@ -29,4 +28,5 @@ export declare class MenuService extends Disposable implements IMenuService {
     getMenuConfig(id: string): MenuConfig | null;
     private _getDisplayMenuItems;
     private _appendMenuToPosition;
+    private _updateMenuItems;
 }