@univerjs/sheets-drawing-ui 0.2.8 → 0.2.10

package/lib/es/index.js

@@ -6,7 +6,7 @@ import { CommandType, ICommandService, IUndoRedoService, LocaleService, IUniverI
 import { ImageCropperObject, COMPONENT_IMAGE_POPUP_MENU, OpenImageCropOperation, ImageResetSizeOperation, DrawingCommonPanel, DrawingRenderService, UniverDrawingUIPlugin } from "@univerjs/drawing-ui";
 import { ISheetDrawingService, SetDrawingApplyMutation, DrawingApplyType, SheetDrawingAnchorType, UniverSheetsDrawingPlugin } from "@univerjs/sheets-drawing";
 import { IDrawingManagerService, IImageIoService, ArrangeTypeEnum, DrawingTypeEnum, DRAWING_IMAGE_COUNT_LIMIT, ImageUploadStatusType, DRAWING_IMAGE_ALLOW_SIZE, getImageSize, DRAWING_IMAGE_WIDTH_LIMIT, DRAWING_IMAGE_HEIGHT_LIMIT, DRAWING_IMAGE_ALLOW_IMAGE_LIST, getDrawingShapeKeyByDrawingSearch, UniverDrawingPlugin } from "@univerjs/drawing";
-import { IRenderManagerService, getGroupState, transformObjectOutOfGroup, precisionTo, Rect, DRAWING_OBJECT_LAYER_INDEX, pxToNum, SHEET_VIEWPORT_KEY, RENDER_CLASS_TYPE } from "@univerjs/engine-render";
+import { IRenderManagerService, getGroupState, transformObjectOutOfGroup, precisionTo, Rect, DRAWING_OBJECT_LAYER_INDEX, SHEET_VIEWPORT_KEY, RENDER_CLASS_TYPE } from "@univerjs/engine-render";
 import { SheetCanvasPopManagerService, attachRangeWithCoord, SheetSkeletonManagerService, ISheetSelectionRenderService, getCurrentRangeDisable$, SetScrollOperation, SetZoomRatioOperation, SheetPrintInterceptorService, COPY_TYPE, PREDEFINED_HOOK_NAME, virtualizeDiscreteRanges, ISheetClipboardService } from "@univerjs/sheets-ui";
 import { takeUntil, Subject, BehaviorSubject, combineLatest, map, filter, distinctUntilChanged, first } from "rxjs";
 import { ISidebarService, BuiltInUIPart, IUIPartsService, IMessageService, MenuItemType, MenuPosition, MenuGroup, getMenuHiddenObservable, KeyCode, ComponentManager, IMenuService, IShortcutService, CanvasFloatDomService } from "@univerjs/ui";
@@ -121,7 +121,7 @@ let DrawingPopupMenuController = (_a = class extends RxDisposable {
     this._renderManagerService.has(unitId) && !this._initImagePopupMenu.has(unitId) && (this._popupMenuListener(unitId), this._initImagePopupMenu.add(unitId));
   }
   _hasCropObject(scene) {
-    const objects = scene.getAllObjects();
+    const objects = scene.getAllObjectsByOrder();
     for (const object of objects)
       if (object instanceof ImageCropperObject)
         return !0;
@@ -473,7 +473,7 @@ let SheetDrawingUpdateController = (_a2 = class extends Disposable {
   constructor(_context, _skeletonManagerService, _commandService, _selectionRenderService, _imageIoService, _sheetDrawingService, _drawingManagerService, _contextService, _messageService, _localeService, selectionManagerService) {
     super();
     __publicField(this, "_workbookSelections");
-    this._context = _context, this._skeletonManagerService = _skeletonManagerService, this._commandService = _commandService, this._selectionRenderService = _selectionRenderService, this._imageIoService = _imageIoService, this._sheetDrawingService = _sheetDrawingService, this._drawingManagerService = _drawingManagerService, this._contextService = _contextService, this._messageService = _messageService, this._localeService = _localeService, this._workbookSelections = selectionManagerService.getWorkbookSelections(this._context.unitId), this._initCommandListeners(), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener(), this._drawingAddListener();
+    this._context = _context, this._skeletonManagerService = _skeletonManagerService, this._commandService = _commandService, this._selectionRenderService = _selectionRenderService, this._imageIoService = _imageIoService, this._sheetDrawingService = _sheetDrawingService, this._drawingManagerService = _drawingManagerService, this._contextService = _contextService, this._messageService = _messageService, this._localeService = _localeService, this._workbookSelections = selectionManagerService.getWorkbookSelections(this._context.unitId), this._initCommandListeners(), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
   }
   /**
    * Upload image to cell or float image
@@ -648,24 +648,6 @@ let SheetDrawingUpdateController = (_a2 = class extends Disposable {
       })
     );
   }
-  _drawingAddListener() {
-    this.disposeWithMe(
-      this._sheetDrawingService.add$.subscribe((params) => {
-        this._registerDrawing(params);
-      })
-    );
-  }
-  _registerDrawing(params) {
-    params.forEach((param) => {
-      const drawingParam = this._sheetDrawingService.getDrawingByParam(param);
-      if (drawingParam == null || drawingParam.unitId !== this._context.unitId)
-        return;
-      const { sheetTransform } = drawingParam;
-      drawingParam.transform = drawingPositionToTransform(sheetTransform, this._selectionRenderService, this._skeletonManagerService);
-    });
-    const unitId = params[0].unitId;
-    this._drawingManagerService.registerDrawingData(unitId, this._sheetDrawingService.getDrawingDataForUnit(unitId)), this._drawingManagerService.initializeNotification(unitId);
-  }
 }, __name(_a2, "SheetDrawingUpdateController"), _a2);
 SheetDrawingUpdateController = __decorateClass$8([
   __decorateParam$8(1, Inject(SheetSkeletonManagerService)),
@@ -1788,20 +1770,20 @@ function transformBound2DOMBound(originBound, scene, skeleton, worksheet) {
 }
 __name(transformBound2DOMBound, "transformBound2DOMBound");
 const calcPosition = /* @__PURE__ */ __name((targetObject, currentRender, skeleton, worksheet) => {
-  const { scene, engine } = currentRender, { left, top, width, height, angle } = targetObject, canvasElement = engine.getCanvasElement(), canvasClientRect = canvasElement.getBoundingClientRect(), widthOfCanvas = pxToNum(canvasElement.style.width), { top: topOffset, left: leftOffset, width: domWidth } = canvasClientRect, scaleAdjust = domWidth / widthOfCanvas, bound = {
+  const { scene } = currentRender, { left, top, width, height, angle } = targetObject, bound = {
     left,
     right: left + width,
     top,
     bottom: top + height
   }, offsetBound = transformBound2DOMBound(bound, scene, skeleton, worksheet);
   return {
-    startX: offsetBound.left * scaleAdjust + leftOffset,
-    endX: offsetBound.right * scaleAdjust + leftOffset,
-    startY: offsetBound.top * scaleAdjust + topOffset,
-    endY: offsetBound.bottom * scaleAdjust + topOffset,
+    startX: offsetBound.left,
+    endX: offsetBound.right,
+    startY: offsetBound.top,
+    endY: offsetBound.bottom,
     rotate: angle,
-    width: width * scaleAdjust,
-    height: height * scaleAdjust,
+    width,
+    height,
     absolute: offsetBound.absolute
   };
 }, "calcPosition");
@@ -1895,7 +1877,8 @@ let SheetCanvasFloatDomManagerService = (_a5 = class extends Disposable {
               canvas.dispatchEvent(new WheelEvent(evt.type, evt));
             }, "onWheel"),
             props: (_c = (_b = map2.get(drawingId)) == null ? void 0 : _b.props) != null ? _c : this._getFloatDomProps(drawingId),
-            data
+            data,
+            unitId
           });
           const listener = rect.onTransformChange$.subscribeEvent(() => {
             const newPosition = calcPosition(rect, renderObject.renderObject, skeleton.skeleton, target.worksheet);
@@ -2147,7 +2130,7 @@ let SheetDrawingPermissionController = (_a7 = class extends Disposable {
             const unitId2 = workbook.getUnitId(), subUnitId2 = sheet.getSheetId(), drawingData = this._drawingManagerService.getDrawingData(unitId2, subUnitId2), drawingDataValues = Object.values(drawingData), renderObject = this._renderManagerService.getRenderById(unitId2), scene = renderObject == null ? void 0 : renderObject.scene;
             if (scene == null)
               return;
-            scene.getAllObjects().forEach((object) => {
+            scene.getAllObjectsByOrder().forEach((object) => {
               object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId)) && scene.removeObject(object);
             });
           }
@@ -2176,7 +2159,7 @@ let SheetDrawingPermissionController = (_a7 = class extends Disposable {
             const unitId2 = workbook.getUnitId(), subUnitId2 = sheet.getSheetId(), drawingData = this._drawingManagerService.getDrawingData(unitId2, subUnitId2), drawingDataValues = Object.values(drawingData), renderObject = this._renderManagerService.getRenderById(unitId2), scene = renderObject == null ? void 0 : renderObject.scene;
             if (scene == null)
               return;
-            scene.getAllObjects().forEach((object) => {
+            scene.getAllObjectsByOrder().forEach((object) => {
               object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId)) && scene.detachTransformerFrom(object);
             });
           }
@@ -2204,7 +2187,7 @@ let SheetDrawingPermissionController = (_a7 = class extends Disposable {
           ).subscribe({
             next: /* @__PURE__ */ __name((permission) => {
               initialViewPermission = permission, this._drawingManagerService.setDrawingVisible(permission);
-              const objects = scene.getAllObjects(), drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId), drawingDataValues = Object.values(drawingData);
+              const objects = scene.getAllObjectsByOrder(), drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId), drawingDataValues = Object.values(drawingData);
               permission ? this._drawingManagerService.addNotification(drawingDataValues) : (objects.forEach((object) => {
                 object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId)) && scene.removeObject(object);
               }), transformer.clearSelectedObjects());
@@ -2243,7 +2226,7 @@ let SheetDrawingPermissionController = (_a7 = class extends Disposable {
           ).subscribe({
             next: /* @__PURE__ */ __name((permission) => {
               initialEditPermission = permission, this._drawingManagerService.setDrawingEditable(permission);
-              const objects = scene.getAllObjects(), drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId), drawingDataValues = Object.values(drawingData);
+              const objects = scene.getAllObjectsByOrder(), drawingData = this._drawingManagerService.getDrawingData(unitId, subUnitId), drawingDataValues = Object.values(drawingData);
               permission ? (objects.forEach((object) => {
                 object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId)) && scene.attachTransformerTo(object);
               }), this._drawingManagerService.addNotification(drawingDataValues)) : (objects.forEach((object) => {
@@ -2259,7 +2242,7 @@ let SheetDrawingPermissionController = (_a7 = class extends Disposable {
               const unitId2 = workbook.getUnitId(), subUnitId2 = sheet.getSheetId(), drawingData = this._drawingManagerService.getDrawingData(unitId2, subUnitId2), drawingDataValues = Object.values(drawingData), renderObject2 = this._renderManagerService.getRenderById(unitId2), scene2 = renderObject2 == null ? void 0 : renderObject2.scene;
               if (scene2 == null)
                 return;
-              this._drawingManagerService.setDrawingEditable(!0), scene2.getAllObjects().forEach((object) => {
+              this._drawingManagerService.setDrawingEditable(!0), scene2.getAllObjectsByOrder().forEach((object) => {
                 object.classType === RENDER_CLASS_TYPE.IMAGE && drawingDataValues.some((item) => object.oKey.includes(item.drawingId)) && scene2.detachTransformerFrom(object);
               });
             }, "complete")
@@ -2420,21 +2403,22 @@ var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPrope
   return kind && result && __defProp$1(target, key, result), result;
 }, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a9;
 let SheetsDrawingRenderController = (_a9 = class extends Disposable {
-  constructor(_context, _sheetDrawingService, _lifecycleService) {
-    super(), this._context = _context, this._sheetDrawingService = _sheetDrawingService, this._lifecycleService = _lifecycleService, this._init();
+  constructor(_context, _sheetDrawingService, _drawingManagerService, _lifecycleService) {
+    super(), this._context = _context, this._sheetDrawingService = _sheetDrawingService, this._drawingManagerService = _drawingManagerService, this._lifecycleService = _lifecycleService, this._init();
   }
   _init() {
     this._drawingInitializeListener();
   }
   _drawingInitializeListener() {
     this._lifecycleService.lifecycle$.pipe(filter((e) => e === LifecycleStages.Steady), first()).subscribe(() => {
-      this._context.type === UniverInstanceType.UNIVER_SHEET && this._sheetDrawingService.initializeNotification(this._context.unitId);
+      this._context.type === UniverInstanceType.UNIVER_SHEET && (this._sheetDrawingService.initializeNotification(this._context.unitId), this._drawingManagerService.initializeNotification(this._context.unitId));
     });
   }
 }, __name(_a9, "SheetsDrawingRenderController"), _a9);
 SheetsDrawingRenderController = __decorateClass$1([
   __decorateParam$1(1, ISheetDrawingService),
-  __decorateParam$1(2, Inject(LifecycleService))
+  __decorateParam$1(2, IDrawingManagerService),
+  __decorateParam$1(3, Inject(LifecycleService))
 ], SheetsDrawingRenderController);
 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--)

package/lib/types/controllers/render-controllers/sheet-drawing.render-controller.d.ts

@@ -1,11 +1,13 @@
 import { Disposable, LifecycleService } from '@univerjs/core';
+import { IDrawingManagerService } from '@univerjs/drawing';
 import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { ISheetDrawingService } from '@univerjs/sheets-drawing';
 export declare class SheetsDrawingRenderController extends Disposable implements IRenderModule {
     private _context;
     private readonly _sheetDrawingService;
+    private readonly _drawingManagerService;
     private _lifecycleService;
-    constructor(_context: IRenderContext, _sheetDrawingService: ISheetDrawingService, _lifecycleService: LifecycleService);
+    constructor(_context: IRenderContext, _sheetDrawingService: ISheetDrawingService, _drawingManagerService: IDrawingManagerService, _lifecycleService: LifecycleService);
     private _init;
     private _drawingInitializeListener;
 }

package/lib/types/controllers/sheet-drawing-update.controller.d.ts

@@ -30,6 +30,4 @@ export declare class SheetDrawingUpdateController extends Disposable implements
     private _updateImageListener;
     private _groupDrawingListener;
     private _focusDrawingListener;
-    private _drawingAddListener;
-    private _registerDrawing;
 }

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

@@ -4,10 +4,22 @@ import { IBoundRectNoAngle, Scene, SpreadsheetSkeleton, IRenderManagerService }
 import { ISheetDrawingService } from '@univerjs/sheets-drawing';
 import { CanvasFloatDomService } from '@univerjs/ui';
 export interface ICanvasFloatDom {
+    /**
+     * whether allow transform float-dom
+     */
     allowTransform: boolean;
+    /**
+     * initial position of float-dom
+     */
     initPosition: IPosition;
     componentKey: string;
+    /**
+     * unitId of workbook, if not set, will use current workbook
+     */
     unitId?: string;
+    /**
+     * subUnitId of worksheet, if not set, will use current worksheet
+     */
     subUnitId?: string;
     /**
      * @deprecated Please use `data`. for saving to disk, everything add to float-dom must be serializable.