@univerjs/sheets-drawing-ui 0.4.1-nightly.202410251606 → 0.4.1-nightly.202410261605

package/lib/es/index.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "sym
 import { CommandType, ICommandService, IUndoRedoService, LocaleService, IUniverInstanceService, useDependency, Inject, Injector, IContextService, RxDisposable, UniverInstanceType, connectInjector, toDisposable, FOCUSING_COMMON_DRAWINGS, Disposable, Direction, FOCUSING_FX_BAR_EDITOR, EDITOR_ACTIVATED, Tools, UserManagerService, IPermissionService, Rectangle, DisposableCollection, fromEventSubject, generateRandomId, DependentOn, Plugin, registerDependencies, touchDependencies, IConfigService } from "@univerjs/core";
 import { IDrawingManagerService, IImageIoService, DrawingTypeEnum, ArrangeTypeEnum, DRAWING_IMAGE_ALLOW_IMAGE_LIST, DRAWING_IMAGE_COUNT_LIMIT, ImageUploadStatusType, DRAWING_IMAGE_ALLOW_SIZE, getImageSize, DRAWING_IMAGE_WIDTH_LIMIT, DRAWING_IMAGE_HEIGHT_LIMIT, getDrawingShapeKeyByDrawingSearch, UniverDrawingPlugin } from "@univerjs/drawing";
 import { ImageCropperObject, COMPONENT_IMAGE_POPUP_MENU, OpenImageCropOperation, ImageResetSizeOperation, DrawingCommonPanel, DrawingRenderService, UniverDrawingUIPlugin } from "@univerjs/drawing-ui";
-import { IRenderManagerService, precisionTo, getGroupState, transformObjectOutOfGroup, RENDER_CLASS_TYPE, Rect, DRAWING_OBJECT_LAYER_INDEX, SHEET_VIEWPORT_KEY } from "@univerjs/engine-render";
+import { IRenderManagerService, precisionTo, getGroupState, transformObjectOutOfGroup, RENDER_CLASS_TYPE, Rect, ObjectType, DRAWING_OBJECT_LAYER_INDEX, SHEET_VIEWPORT_KEY } from "@univerjs/engine-render";
 import { ISheetDrawingService, SetDrawingApplyMutation, DrawingApplyType, SheetDrawingAnchorType, UniverSheetsDrawingPlugin } from "@univerjs/sheets-drawing";
 import { SheetCanvasPopManagerService, attachRangeWithCoord, ISheetSelectionRenderService, SheetSkeletonManagerService, getCurrentRangeDisable$, COPY_TYPE, PREDEFINED_HOOK_NAME, virtualizeDiscreteRanges, ISheetClipboardService, SheetPrintInterceptorService, VIEWPORT_KEY, SetZoomRatioOperation } from "@univerjs/sheets-ui";
 import { ISidebarService, IUIPartsService, BuiltInUIPart, ILocalFileService, IMessageService, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, KeyCode, ComponentManager, IMenuManagerService, IShortcutService, CanvasFloatDomService } from "@univerjs/ui";
@@ -2188,6 +2188,8 @@ let SheetCanvasFloatDomManagerService = (_a9 = class extends Disposable {
     __publicField(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
     __publicField(this, "_transformChange$", new Subject());
     __publicField(this, "transformChange$", this._transformChange$.asObservable());
+    __publicField(this, "_add$", new Subject());
+    __publicField(this, "add$", this._add$.asObservable());
     __publicField(this, "_remove$", new Subject());
     __publicField(this, "remove$", this._remove$.asObservable());
     __publicField(this, "_hooks", []);
@@ -2199,6 +2201,9 @@ let SheetCanvasFloatDomManagerService = (_a9 = class extends Disposable {
     let subUnitMap = unitMap.get(subUnitId);
     return subUnitMap || (subUnitMap = /* @__PURE__ */ new Map(), unitMap.set(subUnitId, subUnitMap)), subUnitMap;
   }
+  getFloatDomInfo(id) {
+    return this._domLayerInfoMap.get(id);
+  }
   _getSceneAndTransformerByDrawingSearch(unitId) {
     if (unitId == null)
       return;
@@ -2247,10 +2252,10 @@ let SheetCanvasFloatDomManagerService = (_a9 = class extends Disposable {
             width,
             height,
             zIndex: this._drawingManagerService.getDrawingOrder(unitId, subUnitId).length - 1
-          };
-          drawingType === DrawingTypeEnum.DRAWING_CHART && (imageConfig.fill = "white", imageConfig.rotateEnabled = !1);
+          }, isChart = drawingType === DrawingTypeEnum.DRAWING_CHART;
+          isChart && (imageConfig.fill = "white", imageConfig.rotateEnabled = !1);
           const rect = new Rect(rectShapeKey, imageConfig);
-          scene.addObject(rect, DRAWING_OBJECT_LAYER_INDEX), floatDomParam.allowTransform !== !1 && scene.attachTransformerTo(rect);
+          isChart && rect.setObjectType(ObjectType.CHART), scene.addObject(rect, DRAWING_OBJECT_LAYER_INDEX), floatDomParam.allowTransform !== !1 && scene.attachTransformerTo(rect);
           const map2 = this._ensureMap(unitId, subUnitId), disposableCollection = new DisposableCollection(), initPosition = calcPosition(rect, renderObject.renderObject, skeleton.skeleton, target.worksheet), position$ = new BehaviorSubject(initPosition), info = {
             dispose: disposableCollection,
             rect,
@@ -2383,7 +2388,7 @@ let SheetCanvasFloatDomManagerService = (_a9 = class extends Disposable {
       })
     );
   }
-  addFloatDomToPosition(layer, propId) {
+  addFloatDomToPosition(layer, propId, executeCommand = !0) {
     const target = getSheetCommandTarget(this._univerInstanceService, {
       unitId: layer.unitId,
       subUnitId: layer.subUnitId
@@ -2410,14 +2415,15 @@ let SheetCanvasFloatDomManagerService = (_a9 = class extends Disposable {
       data,
       allowTransform
     };
-    return this._commandService.executeCommand(InsertSheetDrawingCommand.id, {
+    return executeCommand && this._commandService.executeCommand(InsertSheetDrawingCommand.id, {
       unitId,
       drawings: [sheetDrawingParam]
-    }), {
+    }), this._add$.next({ unitId, subUnitId, id }), {
       id,
       dispose: /* @__PURE__ */ __name(() => {
         this._removeDom(id, !0);
-      }, "dispose")
+      }, "dispose"),
+      sheetDrawingParam
     };
   }
   _removeDom(id, removeDrawing = !1) {

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

@@ -1,8 +1,9 @@
 import { IDisposable, IPosition, ITransformState, Serializable, Worksheet, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { IBoundRectNoAngle, Scene, SpreadsheetSkeleton, IRenderManagerService } from '@univerjs/engine-render';
+import { IBoundRectNoAngle, Scene, SpreadsheetSkeleton, IRenderManagerService, Rect } from '@univerjs/engine-render';
+import { ISheetFloatDom, ISheetDrawingService } from '@univerjs/sheets-drawing';
+import { IFloatDomLayout, CanvasFloatDomService } from '@univerjs/ui';
 import { DrawingTypeEnum, IDrawingManagerService } from '@univerjs/drawing';
-import { ISheetDrawingService } from '@univerjs/sheets-drawing';
-import { CanvasFloatDomService } from '@univerjs/ui';
+import { BehaviorSubject } from 'rxjs';
 export interface ICanvasFloatDom {
     /**
      * whether allow transform float-dom
@@ -34,6 +35,13 @@ export interface ICanvasFloatDom {
      */
     type?: DrawingTypeEnum;
 }
+interface ICanvasFloatDomInfo {
+    position$: BehaviorSubject<IFloatDomLayout>;
+    dispose: IDisposable;
+    rect: Rect;
+    unitId: string;
+    subUnitId: string;
+}
 export declare function transformBound2DOMBound(originBound: IBoundRectNoAngle, scene: Scene, skeleton: SpreadsheetSkeleton, worksheet: Worksheet): {
     absolute: {
         left: boolean;
@@ -61,6 +69,12 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
         id: string;
         value: ITransformState;
     }>;
+    private _add$;
+    add$: import('rxjs').Observable<{
+        unitId: string;
+        subUnitId: string;
+        id: string;
+    }>;
     private _remove$;
     remove$: import('rxjs').Observable<{
         unitId: string;
@@ -70,6 +84,7 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
     private _hooks;
     constructor(_renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _drawingManagerService: IDrawingManagerService, _canvasFloatDomService: CanvasFloatDomService, _sheetDrawingService: ISheetDrawingService);
     private _ensureMap;
+    getFloatDomInfo(id: string): ICanvasFloatDomInfo | undefined;
     private _getSceneAndTransformerByDrawingSearch;
     private _getFloatDomProps;
     private _drawingAddListener;
@@ -77,10 +92,12 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
     private _getPosition;
     private _featureUpdateListener;
     private _deleteListener;
-    addFloatDomToPosition(layer: ICanvasFloatDom, propId?: string): {
+    addFloatDomToPosition(layer: ICanvasFloatDom, propId?: string, executeCommand?: boolean): {
         id: string;
         dispose: () => void;
+        sheetDrawingParam: ISheetFloatDom;
     } | undefined;
     private _removeDom;
     addHook(hook: ISheetCanvasFloatDomHook): IDisposable;
 }
+export {};