@univerjs/docs-drawing-ui 0.2.11 → 0.2.12

package/lib/es/index.js

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { CommandType, ICommandService, IUniverInstanceService, TextX, JSONX, MemoryCursor, TextXActionType, LocaleService, RxDisposable, UniverInstanceType, toDisposable, FOCUSING_COMMON_DRAWINGS, OnLifecycle, LifecycleStages, Inject, IContextService, useDependency, PositionedObjectLayoutType, BooleanNumber, ObjectRelativeFromH, ObjectRelativeFromV, Tools, WrapTextType, Direction, IUndoRedoService, FOCUSING_UNIVER_EDITOR, Disposable, Injector, fromEventSubject, LifecycleService, UndoCommand, RedoCommand, throttle, COLORS, Plugin, DependentOn } from "@univerjs/core";
+import { CommandType, ICommandService, IUniverInstanceService, TextX, JSONX, MemoryCursor, TextXActionType, LocaleService, RxDisposable, UniverInstanceType, toDisposable, FOCUSING_COMMON_DRAWINGS, OnLifecycle, LifecycleStages, Inject, IContextService, useDependency, PositionedObjectLayoutType, BooleanNumber, ObjectRelativeFromH, ObjectRelativeFromV, Tools, WrapTextType, Direction, IUndoRedoService, FOCUSING_UNIVER_EDITOR, Disposable, Injector, fromEventSubject, LifecycleService, UndoCommand, RedoCommand, throttle, COLORS, Plugin, DependentOn, IConfigService } from "@univerjs/core";
 import { ImageCropperObject, COMPONENT_IMAGE_POPUP_MENU, OpenImageCropOperation, ImageResetSizeOperation, DrawingCommonPanel, UniverDrawingUIPlugin } from "@univerjs/drawing-ui";
 import { IDrawingManagerService, DRAWING_IMAGE_ALLOW_IMAGE_LIST, ArrangeTypeEnum, DRAWING_IMAGE_COUNT_LIMIT, ImageUploadStatusType, DRAWING_IMAGE_ALLOW_SIZE, getImageSize, DrawingTypeEnum, getDrawingShapeKeyByDrawingSearch, DRAWING_IMAGE_WIDTH_LIMIT, DRAWING_IMAGE_HEIGHT_LIMIT, IImageIoService, UniverDrawingPlugin } from "@univerjs/drawing";
 import { IDocDrawingService, UniverDocsDrawingPlugin } from "@univerjs/docs-drawing";
@@ -10,7 +10,7 @@ import { ITextSelectionRenderManager, IRenderManagerService, DocumentEditArea, L
 import { takeUntil, Observable, BehaviorSubject, filter, debounceTime } from "rxjs";
 import { DocCanvasPopManagerService, docDrawingPositionToTransform } from "@univerjs/docs-ui";
 import { RichTextEditingMutation, getRichTextEditPath, TextSelectionManagerService, DocSkeletonManagerService, getRetainAndDeleteFromReplace, getCustomBlockIdsInSelections, SetDocZoomRatioOperation, getDocObject } from "@univerjs/docs";
-import { ISidebarService, MenuItemType, MenuPosition, MenuGroup, getMenuHiddenObservable, KeyCode, ComponentManager, IMenuService, IShortcutService, IMessageService, IEditorService } from "@univerjs/ui";
+import { ISidebarService, MenuItemType, getMenuHiddenObservable, KeyCode, RibbonStartGroup, ComponentManager, IMenuManagerService, IShortcutService, IMessageService, IEditorService } from "@univerjs/ui";
 import React, { forwardRef, useRef, createElement, useState, useEffect } from "react";
 import clsx from "clsx";
 import { RadioGroup, Radio, InputNumber, Select, Checkbox, MessageType } from "@univerjs/design";
@@ -145,15 +145,19 @@ let DocDrawingPopupMenuController = (_a = class extends RxDisposable {
           const oKey = object.oKey, drawingParam = this._drawingManagerService.getDrawingOKey(oKey);
           if (!drawingParam)
             return;
-          const { unitId: unitId2, subUnitId, drawingId } = drawingParam;
-          disposePopups.push(this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(object, {
-            componentKey: COMPONENT_IMAGE_POPUP_MENU,
-            direction: "horizontal",
-            offset: [2, 0],
-            extraProps: {
-              menuItems: this._getImageMenuItems(unitId2, subUnitId, drawingId)
-            }
-          }))), !this._drawingManagerService.getFocusDrawings().find((drawing) => drawing.unitId === unitId2 && drawing.subUnitId === subUnitId && drawing.drawingId === drawingId) && this._drawingManagerService.focusDrawing([{
+          const { unitId: unitId2, subUnitId, drawingId } = drawingParam, popup = this._canvasPopManagerService.attachPopupToObject(
+            object,
+            {
+              componentKey: COMPONENT_IMAGE_POPUP_MENU,
+              direction: "horizontal",
+              offset: [2, 0],
+              extraProps: {
+                menuItems: this._getImageMenuItems(unitId2, subUnitId, drawingId)
+              }
+            },
+            unitId2
+          );
+          disposePopups.push(this.disposeWithMe(popup)), !this._drawingManagerService.getFocusDrawings().find((drawing) => drawing.unitId === unitId2 && drawing.subUnitId === subUnitId && drawing.drawingId === drawingId) && this._drawingManagerService.focusDrawing([{
             unitId: unitId2,
             subUnitId,
             drawingId
@@ -335,8 +339,6 @@ function ImageMenuFactory(accessor) {
   return {
     id: IMAGE_MENU_ID,
     type: MenuItemType.SUBITEMS,
-    positions: [MenuPosition.TOOLBAR_START],
-    group: MenuGroup.TOOLBAR_LAYOUT,
     icon: ImageUploadIcon,
     tooltip: "docImage.title",
     disabled$: getDisableWhenSelectionInTableObservable(accessor),
@@ -352,7 +354,6 @@ function UploadFloatImageMenuFactory(_accessor) {
     label: {
       name: COMPONENT_DOC_UPLOAD_FILE_MENU
     },
-    positions: [IMAGE_MENU_ID],
     hidden$: getMenuHiddenObservable(_accessor, UniverInstanceType.UNIVER_DOC)
   };
 }
@@ -1388,6 +1389,17 @@ const MoveDrawingDownShortcutItem = {
   preconditions: whenDocDrawingFocused,
   binding: KeyCode.DELETE,
   mac: KeyCode.BACKSPACE
+}, menuSchema = {
+  [RibbonStartGroup.LAYOUT]: {
+    [IMAGE_MENU_ID]: {
+      order: 0,
+      menuItemFactory: ImageMenuFactory,
+      [IMAGE_MENU_UPLOAD_FLOAT_ID]: {
+        order: 0,
+        menuItemFactory: UploadFloatImageMenuFactory
+      }
+    }
+  }
 };
 var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -1395,20 +1407,15 @@ var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPrope
   return kind && result && __defProp$5(target, key, result), result;
 }, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5"), _a2;
 let DocDrawingUIController = (_a2 = class extends Disposable {
-  constructor(_injector, _componentManager, _menuService, _commandService, _shortcutService) {
-    super(), this._injector = _injector, this._componentManager = _componentManager, this._menuService = _menuService, this._commandService = _commandService, this._shortcutService = _shortcutService, this._init();
+  constructor(_injector, _componentManager, _menuManagerService, _commandService, _shortcutService) {
+    super(), this._injector = _injector, this._componentManager = _componentManager, this._menuManagerService = _menuManagerService, this._commandService = _commandService, this._shortcutService = _shortcutService, this._init();
   }
   _initCustomComponents() {
     const componentManager = this._componentManager;
     this.disposeWithMe(componentManager.register(ImageUploadIcon, AddImageSingle)), this.disposeWithMe(componentManager.register(COMPONENT_DOC_UPLOAD_FILE_MENU, UploadFileMenu)), this.disposeWithMe(componentManager.register(COMPONENT_DOC_DRAWING_PANEL, DocDrawingPanel));
   }
   _initMenus() {
-    [
-      ImageMenuFactory,
-      UploadFloatImageMenuFactory
-    ].forEach((factory) => {
-      this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), {}));
-    });
+    this._menuManagerService.mergeMenu(menuSchema);
   }
   _initCommands() {
     [
@@ -1451,7 +1458,7 @@ DocDrawingUIController = __decorateClass$5([
   OnLifecycle(LifecycleStages.Ready, DocDrawingUIController),
   __decorateParam$5(0, Inject(Injector)),
   __decorateParam$5(1, Inject(ComponentManager)),
-  __decorateParam$5(2, IMenuService),
+  __decorateParam$5(2, IMenuManagerService),
   __decorateParam$5(3, ICommandService),
   __decorateParam$5(4, IShortcutService)
 ], DocDrawingUIController);
@@ -2453,6 +2460,7 @@ DocDrawingTransformerController = __decorateClass$1([
   __decorateParam$1(3, IRenderManagerService),
   __decorateParam$1(4, ITextSelectionRenderManager)
 ], DocDrawingTransformerController);
+const PLUGIN_CONFIG_KEY = "docs-drawing-ui.config", defaultPluginConfig = {};
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -2461,8 +2469,10 @@ var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnProperty
 const PLUGIN_NAME = "DOCS_DRAWING_UI_PLUGIN";
 var _a7;
 let UniverDocsDrawingUIPlugin = (_a7 = class extends Plugin {
-  constructor(_config, _injector, _renderManagerSrv) {
-    super(), this._injector = _injector, this._renderManagerSrv = _renderManagerSrv;
+  constructor(_config = defaultPluginConfig, _injector, _renderManagerSrv, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._renderManagerSrv = _renderManagerSrv, this._configService = _configService;
+    const { ...rest } = this._config;
+    this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
@@ -2485,7 +2495,8 @@ __publicField2(UniverDocsDrawingUIPlugin, "pluginName", PLUGIN_NAME);
 UniverDocsDrawingUIPlugin = __decorateClass([
   DependentOn(UniverDrawingUIPlugin, UniverDrawingPlugin, UniverDocsDrawingPlugin),
   __decorateParam(1, Inject(Injector)),
-  __decorateParam(2, IRenderManagerService)
+  __decorateParam(2, IRenderManagerService),
+  __decorateParam(3, IConfigService)
 ], UniverDocsDrawingUIPlugin);
 export {
   COMPONENT_DOC_UPLOAD_FILE_MENU,

package/lib/types/controllers/config.schema.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 declare const PLUGIN_CONFIG_KEY = "docs-drawing-ui.config";
+export declare const configSymbol: unique symbol;
+export interface IUniverDocsDrawingUIConfig {
+}
+export declare const defaultPluginConfig: IUniverDocsDrawingUIConfig;

package/lib/types/controllers/doc-drawing.controller.d.ts

@@ -1,12 +1,12 @@
 import { Disposable, ICommandService, Injector } from '@univerjs/core';
-import { ComponentManager, IMenuService, IShortcutService } from '@univerjs/ui';
+import { ComponentManager, IMenuManagerService, IShortcutService } from '@univerjs/ui';
 export declare class DocDrawingUIController extends Disposable {
     private readonly _injector;
     private readonly _componentManager;
-    private readonly _menuService;
+    private readonly _menuManagerService;
     private readonly _commandService;
     private readonly _shortcutService;
-    constructor(_injector: Injector, _componentManager: ComponentManager, _menuService: IMenuService, _commandService: ICommandService, _shortcutService: IShortcutService);
+    constructor(_injector: Injector, _componentManager: ComponentManager, _menuManagerService: IMenuManagerService, _commandService: ICommandService, _shortcutService: IShortcutService);
     private _initCustomComponents;
     private _initMenus;
     private _initCommands;

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

@@ -0,0 +1,2 @@
+import { MenuSchemaType } from '@univerjs/ui';
+export declare const menuSchema: MenuSchemaType;

package/lib/types/plugin.d.ts

@@ -1,11 +1,14 @@
-import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
+import { IConfigService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
+import { IUniverDocsDrawingUIConfig } from './controllers/config.schema';
 export declare class UniverDocsDrawingUIPlugin extends Plugin {
+    private readonly _config;
     protected _injector: Injector;
     private readonly _renderManagerSrv;
+    private readonly _configService;
     static type: UniverInstanceType;
     static pluginName: string;
-    constructor(_config: undefined, _injector: Injector, _renderManagerSrv: IRenderManagerService);
+    constructor(_config: Partial<IUniverDocsDrawingUIConfig>, _injector: Injector, _renderManagerSrv: IRenderManagerService, _configService: IConfigService);
     onStarting(): void;
     onReady(): void;
 }

package/lib/types/views/menu/image.menu.d.ts

@@ -2,5 +2,6 @@ import { IMenuItem } from '@univerjs/ui';
 import { IAccessor } from '@univerjs/core';
 export declare const ImageUploadIcon = "addition-and-subtraction-single";
 export declare const IMAGE_MENU_ID = "doc.menu.image";
+export declare const IMAGE_MENU_UPLOAD_FLOAT_ID = "doc.menu.image.upload.float";
 export declare function ImageMenuFactory(accessor: IAccessor): IMenuItem;
 export declare function UploadFloatImageMenuFactory(_accessor: IAccessor): IMenuItem;