@univerjs/sheets-drawing-ui 0.2.6 → 0.2.7

package/lib/es/index.js

@@ -2,11 +2,11 @@ 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, IUndoRedoService, LocaleService, IUniverInstanceService, useDependency, RxDisposable, UniverInstanceType, connectInjector, toDisposable, FOCUSING_COMMON_DRAWINGS, OnLifecycle, LifecycleStages, Inject, Injector, IContextService, Disposable, Direction, FOCUSING_FORMULA_EDITOR, EDITOR_ACTIVATED, Rectangle, DrawingTypeEnum as DrawingTypeEnum$1, DisposableCollection, Tools, UserManagerService, IPermissionService, Plugin, DependentOn } from "@univerjs/core";
+import { CommandType, ICommandService, IUndoRedoService, LocaleService, IUniverInstanceService, useDependency, RxDisposable, UniverInstanceType, connectInjector, toDisposable, FOCUSING_COMMON_DRAWINGS, OnLifecycle, LifecycleStages, Inject, Injector, IContextService, Disposable, Direction, FOCUSING_FX_BAR_EDITOR, EDITOR_ACTIVATED, Rectangle, DrawingTypeEnum as DrawingTypeEnum$1, DisposableCollection, generateRandomId, Tools, UserManagerService, IPermissionService, Plugin, DependentOn } from "@univerjs/core";
 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, SHEET_VIEWPORT_KEY, RENDER_CLASS_TYPE } from "@univerjs/engine-render";
+import { IRenderManagerService, getGroupState, transformObjectOutOfGroup, precisionTo, Rect, DRAWING_OBJECT_LAYER_INDEX, pxToNum, 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 } from "rxjs";
 import { ISidebarService, BuiltInUIPart, IUIPartsService, IMessageService, MenuItemType, MenuPosition, MenuGroup, getMenuHiddenObservable, KeyCode, ComponentManager, IMenuService, IShortcutService, CanvasFloatDomService } from "@univerjs/ui";
@@ -926,7 +926,7 @@ const imageCommonPanel = "univer-image-common-panel", imageCommonPanelGrid = "un
   }, "handler")
 };
 function whenSheetDrawingFocused(contextService) {
-  return !contextService.getContextValue(FOCUSING_FORMULA_EDITOR) && !contextService.getContextValue(EDITOR_ACTIVATED) && contextService.getContextValue(FOCUSING_COMMON_DRAWINGS);
+  return !contextService.getContextValue(FOCUSING_FX_BAR_EDITOR) && !contextService.getContextValue(EDITOR_ACTIVATED) && contextService.getContextValue(FOCUSING_COMMON_DRAWINGS);
 }
 __name(whenSheetDrawingFocused, "whenSheetDrawingFocused");
 const MoveDrawingDownShortcutItem = {
@@ -1788,20 +1788,20 @@ function transformBound2DOMBound(originBound, scene, skeleton, worksheet) {
 }
 __name(transformBound2DOMBound, "transformBound2DOMBound");
 const calcPosition = /* @__PURE__ */ __name((targetObject, currentRender, skeleton, worksheet) => {
-  const { scene } = currentRender, { left, top, width, height, angle } = targetObject, bound = {
+  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 = {
     left,
     right: left + width,
     top,
     bottom: top + height
   }, offsetBound = transformBound2DOMBound(bound, scene, skeleton, worksheet);
   return {
-    startX: offsetBound.left,
-    endX: offsetBound.right,
-    startY: offsetBound.top,
-    endY: offsetBound.bottom,
+    startX: offsetBound.left * scaleAdjust + leftOffset,
+    endX: offsetBound.right * scaleAdjust + leftOffset,
+    startY: offsetBound.top * scaleAdjust + topOffset,
+    endY: offsetBound.bottom * scaleAdjust + topOffset,
     rotate: angle,
-    width,
-    height,
+    width: width * scaleAdjust,
+    height: height * scaleAdjust,
     absolute: offsetBound.absolute
   };
 }, "calcPosition");
@@ -1991,14 +1991,14 @@ let SheetCanvasFloatDomManagerService = (_a5 = class extends Disposable {
       })
     );
   }
-  addFloatDomToPosition(layer) {
+  addFloatDomToPosition(layer, propId) {
     const target = getSheetCommandTarget(this._univerInstanceService, {
       unitId: layer.unitId,
       subUnitId: layer.subUnitId
     });
     if (!target)
       throw new Error("cannot find current target!");
-    const { unitId, subUnitId } = target, { initPosition, componentKey, data } = layer, id = Tools.generateRandomId(), sheetTransform = this._getPosition(initPosition, unitId);
+    const { unitId, subUnitId } = target, { initPosition, componentKey, data } = layer, id = propId != null ? propId : generateRandomId(), sheetTransform = this._getPosition(initPosition, unitId);
     if (sheetTransform == null)
       return;
     this._ensureMap(unitId, subUnitId).set(id, layer);
@@ -2441,14 +2441,14 @@ let UniverSheetsDrawingUIPlugin = (_a9 = class extends Plugin {
       }],
       [DrawingPopupMenuController],
       [SheetDrawingPrintingController],
-      [SheetDrawingPermissionController]
+      [SheetDrawingPermissionController],
+      [SheetsDrawingCopyPasteController]
     ].forEach((dependency) => this._injector.add(dependency));
   }
   _registerRenderModules() {
     [
       [SheetDrawingUpdateController],
-      [SheetDrawingTransformAffectedController],
-      [SheetsDrawingCopyPasteController]
+      [SheetDrawingTransformAffectedController]
     ].forEach((m) => {
       this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, m));
     });
@@ -2467,6 +2467,7 @@ export {
   DeleteDrawingsCommand,
   EditSheetDrawingOperation,
   GroupSheetDrawingCommand,
+  IMAGE_MENU_ID,
   InsertCellImageOperation,
   InsertFloatImageOperation,
   InsertSheetDrawingCommand,

package/lib/types/index.d.ts

@@ -27,3 +27,4 @@ export { ClearSheetDrawingTransformerOperation } from './commands/operations/cle
 export { EditSheetDrawingOperation } from './commands/operations/edit-sheet-drawing.operation';
 export { InsertFloatImageOperation, InsertCellImageOperation } from './commands/operations/insert-image.operation';
 export { SidebarSheetDrawingOperation } from './commands/operations/open-drawing-panel.operation';
+export { IMAGE_MENU_ID } from './views/menu/image.menu';

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

@@ -62,7 +62,7 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
     private _getPosition;
     private _featureUpdateListener;
     private _deleteListener;
-    addFloatDomToPosition(layer: ICanvasFloatDom): {
+    addFloatDomToPosition(layer: ICanvasFloatDom, propId?: string): {
         id: string;
         dispose: () => void;
     } | undefined;

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

@@ -2,6 +2,7 @@ import { IMenuItem } from '@univerjs/ui';
 import { IAccessor } from '@univerjs/core';
 
 export declare const IMAGE_UPLOAD_ICON = "addition-and-subtraction-single";
+export declare const IMAGE_MENU_ID = "sheet.menu.image";
 export declare function ImageMenuFactory(accessor: IAccessor): IMenuItem;
 export declare function UploadFloatImageMenuFactory(_accessor: IAccessor): IMenuItem;
 export declare function UploadCellImageMenuFactory(_accessor: IAccessor): IMenuItem;