@univerjs/sheets-drawing-ui 0.6.10-experimental.20250411-f5b7b16 → 0.6.10-experimental.20250419-8830bd4

package/lib/locale/en-US.js

@@ -28,16 +28,6 @@ const e = {
     exceedMaxCount: "Only {0} images can be uploaded at a time",
     invalidImage: "Invalid image"
   },
-  "sheet-drawing-view": "Drawing",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "Move Drawing down",
-      "drawing-move-up": "Move Drawing up",
-      "drawing-move-left": "Move Drawing left",
-      "drawing-move-right": "Move Drawing right",
-      "drawing-delete": "Delete Drawing"
-    }
-  },
   "cell-image": {
     pasteTitle: "Paste as cell image",
     pasteContent: "Pasting a cell image will overwrite the existing content of the cell, continue pasting",

package/lib/locale/fa-IR.js

@@ -28,16 +28,6 @@ const e = {
     exceedMaxCount: "فقط {0} تصویر می‌توانند همزمان آپلود شوند",
     invalidImage: "تصویر نامعتبر است"
   },
-  "sheet-drawing-view": "طراحی",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "جابه‌جایی طراحی به پایین",
-      "drawing-move-up": "جابه‌جایی طراحی به بالا",
-      "drawing-move-left": "جابه‌جایی طراحی به چپ",
-      "drawing-move-right": "جابه‌جایی طراحی به راست",
-      "drawing-delete": "حذف طراحی"
-    }
-  },
   "cell-image": {
     pasteTitle: "چسباندن به عنوان تصویر سلول",
     pasteContent: "چسباندن تصویر سلول محتوای موجود سلول را پاک خواهد کرد، ادامه چسباندن",

package/lib/locale/fr-FR.js

@@ -28,16 +28,6 @@ const e = {
     exceedMaxCount: "Seulement {0} images peuvent être téléchargées à la fois",
     invalidImage: "Image invalide"
   },
-  "sheet-drawing-view": "Dessin",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "Déplacer le dessin vers le bas",
-      "drawing-move-up": "Déplacer le dessin vers le haut",
-      "drawing-move-left": "Déplacer le dessin vers la gauche",
-      "drawing-move-right": "Déplacer le dessin vers la droite",
-      "drawing-delete": "Supprimer le dessin"
-    }
-  },
   "cell-image": {
     pasteTitle: "Coller comme image de cellule",
     pasteContent: "Coller une image de cellule écrasera le contenu existant de la cellule, continuer le collage",

package/lib/locale/ru-RU.js

@@ -28,16 +28,6 @@ const e = {
     exceedMaxCount: "За один раз можно загрузить только {0} изображений",
     invalidImage: "Недопустимое изображение"
   },
-  "sheet-drawing-view": "Drawing",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "Move Drawing down",
-      "drawing-move-up": "Move Drawing up",
-      "drawing-move-left": "Move Drawing left",
-      "drawing-move-right": "Move Drawing right",
-      "drawing-delete": "Delete Drawing"
-    }
-  },
   "cell-image": {
     pasteTitle: "Вставить как изображение ячейки",
     pasteContent: "Вставка изображения ячейки перезапишет существующее содержимое ячейки, продолжить вставку",

package/lib/locale/vi-VN.js

@@ -1,4 +1,4 @@
-const n = {
+const h = {
   sheetImage: {
     title: "Hình ảnh",
     upload: {
@@ -28,16 +28,6 @@ const n = {
     exceedMaxCount: "Chỉ có thể tải lên {0} hình ảnh một lần",
     invalidImage: "Hình ảnh không hợp lệ"
   },
-  "sheet-drawing-view": "Drawing",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "Move Drawing down",
-      "drawing-move-up": "Move Drawing up",
-      "drawing-move-left": "Move Drawing left",
-      "drawing-move-right": "Move Drawing right",
-      "drawing-delete": "Delete Drawing"
-    }
-  },
   "cell-image": {
     pasteTitle: "Dán như hình ảnh ô",
     pasteContent: "Dán hình ảnh ô sẽ ghi đè lên nội dung hiện có của ô, tiếp tục dán",
@@ -45,5 +35,5 @@ const n = {
   }
 };
 export {
-  n as default
+  h as default
 };

package/lib/locale/zh-CN.js

@@ -28,16 +28,6 @@ const e = {
     exceedMaxCount: "图片只能一次上传{0}张",
     invalidImage: "无效图片"
   },
-  "sheet-drawing-view": "绘图",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "下移绘图",
-      "drawing-move-up": "上移绘图",
-      "drawing-move-left": "左移绘图",
-      "drawing-move-right": "右移绘图",
-      "drawing-delete": "删除绘图"
-    }
-  },
   "cell-image": {
     pasteTitle: "粘贴为单元格图片",
     pasteContent: "粘贴单元格图片将覆盖单元格中的现有内容，继续粘贴",

package/lib/locale/zh-TW.js

@@ -28,16 +28,6 @@ const e = {
     exceedMaxCount: "圖片只能一次上傳{0}張",
     invalidImage: "無效圖片"
   },
-  "sheet-drawing-view": "繪圖",
-  shortcut: {
-    sheet: {
-      "drawing-move-down": "下移繪圖",
-      "drawing-move-up": "上移繪圖",
-      "drawing-move-left": "左移繪圖",
-      "drawing-move-right": "右移繪圖",
-      "drawing-delete": "刪除繪圖"
-    }
-  },
   "cell-image": {
     pasteTitle: "粘貼為儲存格圖片",
     pasteContent: "粘貼儲存格圖片將覆蓋儲存格中的現有內容，繼續粘貼",

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

@@ -1,13 +1,19 @@
-import { Disposable } from '@univerjs/core';
+import { Disposable, Injector } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { DrawingRenderService } from '@univerjs/drawing-ui';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetPrintInterceptorService } from '@univerjs/sheets-ui';
+import { ComponentManager } from '@univerjs/ui';
+import { SheetCanvasFloatDomManagerService } from '../services/canvas-float-dom-manager.service';
 export declare class SheetDrawingPrintingController extends Disposable {
     private readonly _sheetPrintInterceptorService;
     private readonly _drawingRenderService;
     private readonly _drawingManagerService;
     private readonly _renderManagerService;
-    constructor(_sheetPrintInterceptorService: SheetPrintInterceptorService, _drawingRenderService: DrawingRenderService, _drawingManagerService: IDrawingManagerService, _renderManagerService: IRenderManagerService);
+    private readonly _canvasFloatDomManagerService;
+    private readonly _componetManager;
+    private readonly _injector;
+    constructor(_sheetPrintInterceptorService: SheetPrintInterceptorService, _drawingRenderService: DrawingRenderService, _drawingManagerService: IDrawingManagerService, _renderManagerService: IRenderManagerService, _canvasFloatDomManagerService: SheetCanvasFloatDomManagerService, _componetManager: ComponentManager, _injector: Injector);
     private _initPrinting;
+    private _initPrintingDom;
 }

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

@@ -43,16 +43,6 @@ declare const locale: {
         exceedMaxCount: string;
         invalidImage: string;
     };
-    'sheet-drawing-view': string;
-    shortcut: {
-        sheet: {
-            'drawing-move-down': string;
-            'drawing-move-up': string;
-            'drawing-move-left': string;
-            'drawing-move-right': string;
-            'drawing-delete': string;
-        };
-    };
     'cell-image': {
         pasteTitle: string;
         pasteContent: string;

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

@@ -1,5 +1,5 @@
 import { IDisposable, IPosition, IRange, ITransformState, Serializable, Worksheet, Disposable, DrawingTypeEnum, ICommandService, IUniverInstanceService, LifecycleService } from '@univerjs/core';
-import { IBoundRectNoAngle, Scene, SpreadsheetSkeleton, IRenderManagerService, Rect } from '@univerjs/engine-render';
+import { BaseObject, IBoundRectNoAngle, Scene, SpreadsheetSkeleton, IRenderManagerService, Rect } from '@univerjs/engine-render';
 import { IFloatDomLayout, CanvasFloatDomService } from '@univerjs/ui';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { ISheetDrawingService } from '@univerjs/sheets-drawing';
@@ -22,10 +22,6 @@ export interface ICanvasFloatDom {
      * 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.
-     */
-    props?: Record<string, any>;
     /**
      * data of component, will save to snapshot, json-like data
      */
@@ -44,7 +40,7 @@ declare enum ScrollDirectionResponse {
     HORIZONTAL = "HORIZONTAL",
     VERTICAL = "VERTICAL"
 }
-interface ICanvasFloatDomInfo {
+export interface ICanvasFloatDomInfo {
     position$: BehaviorSubject<IFloatDomLayout>;
     dispose: IDisposable;
     rect: Rect;
@@ -53,6 +49,7 @@ interface ICanvasFloatDomInfo {
     boundsOfViewArea?: IBoundRectNoAngle;
     scrollDirectionResponse?: ScrollDirectionResponse;
     domAnchor?: IDOMAnchor;
+    id: string;
 }
 export interface IDOMAnchor {
     width: number;
@@ -81,10 +78,16 @@ export interface ILimitBound extends IBoundRectNoAngle {
  * @param worksheet
  * @returns ILimitBound
  */
-export declare function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, scene: Scene, skeleton: SpreadsheetSkeleton, worksheet: Worksheet, floatDomInfo?: ICanvasFloatDomInfo): ILimitBound;
-export interface ISheetCanvasFloatDomHook {
-    onGetFloatDomProps: (id: string) => Record<string, any>;
-}
+export declare function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, scene: Scene, skeleton: SpreadsheetSkeleton, worksheet: Worksheet, floatDomInfo?: ICanvasFloatDomInfo, skipBoundsOfViewArea?: boolean): ILimitBound;
+/**
+ * Calculate the position of the floating dom, limited by bounds of viewMain in transformBound2DOMBound
+ * @param floatObject
+ * @param renderUnit
+ * @param skeleton
+ * @param worksheet
+ * @returns {IFloatDomLayout} position
+ */
+export declare const calcSheetFloatDomPosition: (floatObject: BaseObject, scene: Scene, skeleton: SpreadsheetSkeleton, worksheet: Worksheet, floatDomInfo?: ICanvasFloatDomInfo) => IFloatDomLayout;
 export declare class SheetCanvasFloatDomManagerService extends Disposable {
     private _renderManagerService;
     private _univerInstanceService;
@@ -93,10 +96,6 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
     private readonly _canvasFloatDomService;
     private readonly _sheetDrawingService;
     protected readonly _lifecycleService: LifecycleService;
-    /**
-     * for update dom container position when scrolling and zoom
-     */
-    private _domLayerMap;
     /**
      * for update dom container position when scrolling and zoom
      */
@@ -119,18 +118,11 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
         subUnitId: string;
         id: string;
     }>;
-    private _hooks;
     constructor(_renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _drawingManagerService: IDrawingManagerService, _canvasFloatDomService: CanvasFloatDomService, _sheetDrawingService: ISheetDrawingService, _lifecycleService: LifecycleService);
     private _bindScrollEvent;
-    /**
-     * For scrolling and zoom
-     * @param unitId
-     * @param subUnitId
-     */
-    private _ensureMap;
     getFloatDomInfo(id: string): ICanvasFloatDomInfo | undefined;
+    getFloatDomsBySubUnitId(unitId: string, subUnitId: string): ICanvasFloatDomInfo[];
     private _getSceneAndTransformerByDrawingSearch;
-    private _getFloatDomProps;
     private _drawingAddListener;
     private _scrollUpdateListener;
     private _getPosition;
@@ -142,7 +134,6 @@ export declare class SheetCanvasFloatDomManagerService extends Disposable {
         dispose: () => void;
     } | undefined;
     private _removeDom;
-    addHook(hook: ISheetCanvasFloatDomHook): IDisposable;
     addFloatDomToRange(range: IRange, config: ICanvasFloatDom, domAnchor: Partial<IDOMAnchor>, propId?: string): {
         id: string;
         dispose: () => void;

package/lib/types/views/printing-float-dom/index.d.ts

@@ -0,0 +1,16 @@
+import { Worksheet } from '@univerjs/core';
+import { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import { IFloatDomData } from '@univerjs/sheets-drawing';
+import { IFloatDom, IFloatDomLayout } from '@univerjs/ui';
+export interface IPrintingFloatDomProps {
+    floatDomInfos: IFloatDomData[];
+    scene: Scene;
+    skeleton: SpreadsheetSkeleton;
+    worksheet: Worksheet;
+}
+export declare const FloatDomSingle: import('react').MemoExoticComponent<(props: {
+    layer: IFloatDom;
+    id: string;
+    position: IFloatDomLayout;
+}) => import("react/jsx-runtime").JSX.Element | null>;
+export declare const PrintingFloatDom: (props: IPrintingFloatDomProps) => import("react/jsx-runtime").JSX.Element;