@univerjs/docs-drawing-ui 0.25.1 → 1.0.0-alpha.1

package/lib/locale/ar-SA.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "صورة",
 	upload: { float: "إدراج صورة" },
+	shape: { insert: {
+		title: "إدراج شكل",
+		rectangle: "إدراج مستطيل",
+		ellipse: "إدراج قطع ناقص"
+	} },
 	panel: { title: "تحرير الصورة" },
 	"image-popup": {
 		replace: "استبدال",

package/lib/locale/ca-ES.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Imatge",
 	upload: { float: "Insereix imatge" },
+	shape: { insert: {
+		title: "Insereix forma",
+		rectangle: "Insereix rectangle",
+		ellipse: "Insereix el·lipse"
+	} },
 	panel: { title: "Edita la imatge" },
 	"image-popup": {
 		replace: "Reemplaça",

package/lib/locale/de-DE.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Bild",
 	upload: { float: "Bild einfügen" },
+	shape: { insert: {
+		title: "Form einfügen",
+		rectangle: "Rechteck einfügen",
+		ellipse: "Ellipse einfügen"
+	} },
 	panel: { title: "Bild bearbeiten" },
 	"image-popup": {
 		replace: "Ersetzen",

package/lib/locale/en-US.js

@@ -17,6 +17,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Image",
 	upload: { float: "Insert Image" },
+	shape: { insert: {
+		title: "Insert Shape",
+		rectangle: "Insert Rectangle",
+		ellipse: "Insert Ellipse"
+	} },
 	panel: { title: "Edit Image" },
 	"image-popup": {
 		replace: "Replace",

package/lib/locale/es-ES.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Imagen",
 	upload: { float: "Insertar imagen" },
+	shape: { insert: {
+		title: "Insertar forma",
+		rectangle: "Insertar rectángulo",
+		ellipse: "Insertar elipse"
+	} },
 	panel: { title: "Editar imagen" },
 	"image-popup": {
 		replace: "Reemplazar",

package/lib/locale/fa-IR.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "تصویر",
 	upload: { float: "درج تصویر" },
+	shape: { insert: {
+		title: "درج شکل",
+		rectangle: "درج مستطیل",
+		ellipse: "بیضی را درج کنید"
+	} },
 	panel: { title: "ویرایش تصویر" },
 	"image-popup": {
 		replace: "تعویض",

package/lib/locale/fr-FR.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Image",
 	upload: { float: "Insérer une image" },
+	shape: { insert: {
+		title: "Insérer une forme",
+		rectangle: "Insérer un rectangle",
+		ellipse: "Insérer une ellipse"
+	} },
 	panel: { title: "Modifier l'image" },
 	"image-popup": {
 		replace: "Remplacer",

package/lib/locale/id-ID.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Gambar",
 	upload: { float: "Sisipkan Gambar" },
+	shape: { insert: {
+		title: "Sisipkan Bentuk",
+		rectangle: "Sisipkan Persegi Panjang",
+		ellipse: "Sisipkan Elips"
+	} },
 	panel: { title: "Edit Gambar" },
 	"image-popup": {
 		replace: "Ganti",

package/lib/locale/it-IT.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Immagine",
 	upload: { float: "Inserisci immagine" },
+	shape: { insert: {
+		title: "Inserisci Forma",
+		rectangle: "Inserisci Rettangolo",
+		ellipse: "Inserisci Ellisse"
+	} },
 	panel: { title: "Modifica immagine" },
 	"image-popup": {
 		replace: "Sostituisci",

package/lib/locale/ja-JP.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "画像",
 	upload: { float: "画像を挿入" },
+	shape: { insert: {
+		title: "図形の挿入",
+		rectangle: "四角形を挿入",
+		ellipse: "楕円を挿入"
+	} },
 	panel: { title: "画像の編集" },
 	"image-popup": {
 		replace: "置換",

package/lib/locale/ko-KR.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "이미지",
 	upload: { float: "이미지 삽입" },
+	shape: { insert: {
+		title: "도형 삽입",
+		rectangle: "사각형 삽입",
+		ellipse: "타원 삽입"
+	} },
 	panel: { title: "이미지 편집" },
 	"image-popup": {
 		replace: "교체",

package/lib/locale/pl-PL.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Obraz",
 	upload: { float: "Wstaw obraz" },
+	shape: { insert: {
+		title: "Wstaw kształt",
+		rectangle: "Wstaw prostokąt",
+		ellipse: "Wstaw elipsę"
+	} },
 	panel: { title: "Edytuj obraz" },
 	"image-popup": {
 		replace: "Zamień",

package/lib/locale/pt-BR.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Imagem",
 	upload: { float: "Inserir imagem" },
+	shape: { insert: {
+		title: "Inserir Forma",
+		rectangle: "Inserir Retângulo",
+		ellipse: "Inserir Elipse"
+	} },
 	panel: { title: "Editar imagem" },
 	"image-popup": {
 		replace: "Substituir",

package/lib/locale/ru-RU.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Изображение",
 	upload: { float: "Вставить изображение" },
+	shape: { insert: {
+		title: "Insert Shape",
+		rectangle: "Insert Rectangle",
+		ellipse: "Insert Ellipse"
+	} },
 	panel: { title: "Редактировать изображение" },
 	"image-popup": {
 		replace: "Заменить",

package/lib/locale/sk-SK.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Obrázok",
 	upload: { float: "Vložiť obrázok" },
+	shape: { insert: {
+		title: "Vložiť tvar",
+		rectangle: "Vložiť obdĺžnik",
+		ellipse: "Vložiť elipsu"
+	} },
 	panel: { title: "Upraviť obrázok" },
 	"image-popup": {
 		replace: "Nahradiť",

package/lib/locale/vi-VN.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "Hình ảnh",
 	upload: { float: "Chèn hình ảnh" },
+	shape: { insert: {
+		title: "Insert Shape",
+		rectangle: "Insert Rectangle",
+		ellipse: "Insert Ellipse"
+	} },
 	panel: { title: "Chỉnh sửa hình ảnh" },
 	"image-popup": {
 		replace: "Thay thế",

package/lib/locale/zh-CN.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "图片",
 	upload: { float: "插入图片" },
+	shape: { insert: {
+		title: "插入图形",
+		rectangle: "插入矩形",
+		ellipse: "插入椭圆"
+	} },
 	panel: { title: "编辑图片" },
 	"image-popup": {
 		replace: "替换",

package/lib/locale/zh-HK.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "圖片",
 	upload: { float: "插入圖片" },
+	shape: { insert: {
+		title: "Insert Shape",
+		rectangle: "Insert Rectangle",
+		ellipse: "Insert Ellipse"
+	} },
 	panel: { title: "編圖" },
 	"image-popup": {
 		replace: "替換",

package/lib/locale/zh-TW.js

@@ -2,6 +2,11 @@
 const locale = { "docs-drawing-ui": {
 	title: "圖片",
 	upload: { float: "插入圖片" },
+	shape: { insert: {
+		title: "Insert Shape",
+		rectangle: "Insert Rectangle",
+		ellipse: "Insert Ellipse"
+	} },
 	panel: { title: "編圖" },
 	"image-popup": {
 		replace: "替換",

package/lib/types/commands/commands/insert-shape.command.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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.
+ */
+import type { ICommand } from '@univerjs/core';
+export declare const InsertDocRectangleShapeCommand: ICommand<object, boolean>;
+export declare const InsertDocEllipseShapeCommand: ICommand<object, boolean>;

package/lib/types/controllers/components.controller.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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.
+ */
+import { Disposable } from '@univerjs/core';
+import { ComponentManager } from '@univerjs/ui';
+export declare class ComponentsController extends Disposable {
+    private readonly _componentManager;
+    constructor(_componentManager: ComponentManager);
+    private _registerComponents;
+}

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

@@ -13,13 +13,75 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel } from '@univerjs/core';
-import type { IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable, IRenderContext, IRenderModule } from '@univerjs/engine-render';
-import { Disposable, ICommandService, IUniverInstanceService, LifecycleService } from '@univerjs/core';
+import type { DocumentDataModel, ITransformState } from '@univerjs/core';
+import type { IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable, IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { AlignTypeH, AlignTypeV, BooleanNumber, Disposable, ICommandService, IUniverInstanceService, LifecycleService, ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType } from '@univerjs/core';
 import { DocSkeletonManagerService } from '@univerjs/docs';
 import { IEditorService } from '@univerjs/docs-ui';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { DocRefreshDrawingsService } from '../../services/doc-refresh-drawings.service';
+interface IDrawingParamsWithBehindText {
+    unitId: string;
+    subUnitId: string;
+    drawingId: string;
+    behindText: boolean;
+    hidden?: boolean;
+    transform: ITransformState;
+    transforms: ITransformState[];
+    isMultiTransform: BooleanNumber;
+}
+interface IDrawingClipBounds {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+}
+export declare function getDocsDrawingPageClipBounds(config: {
+    docsLeft: number;
+    docsTop: number;
+    pageOffsetLeft: number;
+    pageOffsetTop: number;
+    clipOffsetLeft?: number;
+    clipOffsetTop?: number;
+    page: Pick<IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, 'pageWidth' | 'pageHeight'>;
+}): IDrawingClipBounds | undefined;
+export declare function getDocsDrawingClipPage(config: {
+    drawing: Pick<IDrawingParamsWithBehindText, 'behindText'> & {
+        transform?: Pick<ITransformState, 'width' | 'height'>;
+    };
+    hostPage?: Pick<IDocumentSkeletonPage, 'pageWidth' | 'pageHeight'>;
+    page: Pick<IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, 'pageWidth' | 'pageHeight'>;
+}): Pick<IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, 'pageWidth' | 'pageHeight'>;
+export declare function getDocsPageRelativeDrawingLeft(config: {
+    hostPage: Pick<IDocumentSkeletonPage, 'pageWidth'>;
+    positionH: {
+        align?: AlignTypeH;
+        posOffset?: number;
+        relativeFrom?: ObjectRelativeFromH;
+    };
+    width: number;
+}): number | undefined;
+export declare function getDocsPageRelativeDrawingTop(config: {
+    hostPage: Pick<IDocumentSkeletonPage, 'pageHeight'>;
+    positionV: {
+        align?: AlignTypeV;
+        posOffset?: number;
+        relativeFrom?: ObjectRelativeFromV;
+    };
+    height: number;
+}): number | undefined;
+export declare function getDocsPageRelativeDrawingAnchorPage(config: {
+    page: Pick<IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, 'pageWidth' | 'pageHeight'>;
+    clipPage: Pick<IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, 'pageWidth' | 'pageHeight'>;
+    hostPage?: Pick<IDocumentSkeletonPage, 'pageWidth' | 'pageHeight'>;
+}): Pick<IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, 'pageWidth' | 'pageHeight'> | undefined;
+export declare function getDocsDrawingBehindText(config: {
+    drawingOrigin: {
+        layoutType?: PositionedObjectLayoutType;
+        behindDoc?: BooleanNumber;
+    };
+    hostPage?: Pick<IDocumentSkeletonPage, 'pageWidth' | 'pageHeight'>;
+}): boolean;
 export declare function getDocsTableCellDrawingOffset(unitId: string, table: IDocumentSkeletonTable, row: IDocumentSkeletonRow, cell: IDocumentSkeletonPage): {
     left: number;
     top: number;
@@ -40,8 +102,10 @@ export declare class DocDrawingTransformUpdateController extends Disposable impl
     private _commandExecutedListener;
     private _initResize;
     private _refreshDrawing;
+    private _getStaleNonMultiDrawings;
     private _handleMultiDrawingsTransform;
     private _calculateDrawingPosition;
     private _calculateTableCellDrawingPositions;
     private _drawingInitializeListener;
 }
+export {};

package/lib/types/controllers/{doc-drawing.controller.d.ts → ui.controller.d.ts}

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService } from '@univerjs/core';
-import { ComponentManager, IMenuManagerService, IShortcutService } from '@univerjs/ui';
+import { IMenuManagerService, IShortcutService } from '@univerjs/ui';
 export declare class DocDrawingUIController extends Disposable {
-    private readonly _componentManager;
     private readonly _menuManagerService;
     private readonly _commandService;
     private readonly _shortcutService;
-    constructor(_componentManager: ComponentManager, _menuManagerService: IMenuManagerService, _commandService: ICommandService, _shortcutService: IShortcutService);
+    constructor(_menuManagerService: IMenuManagerService, _commandService: ICommandService, _shortcutService: IShortcutService);
     private _initCustomComponents;
     private _initMenus;
     private _initCommands;

package/lib/types/index.d.ts

@@ -18,6 +18,7 @@ export { DeleteDocDrawingsCommand } from './commands/commands/delete-doc-drawing
 export { GroupDocDrawingCommand } from './commands/commands/group-doc-drawing.command';
 export { InsertDocDrawingCommand } from './commands/commands/insert-doc-drawing.command';
 export { InsertDocImageCommand } from './commands/commands/insert-image.command';
+export { InsertDocEllipseShapeCommand, InsertDocRectangleShapeCommand } from './commands/commands/insert-shape.command';
 export { MoveDocDrawingsCommand } from './commands/commands/move-drawings.command';
 export { RemoveDocDrawingCommand } from './commands/commands/remove-doc-drawing.command';
 export { SetDocDrawingArrangeCommand } from './commands/commands/set-drawing-arrange.command';
@@ -28,6 +29,7 @@ export { SidebarDocDrawingOperation } from './commands/operations/open-drawing-p
 export { type IUniverDocsDrawingUIConfig } from './config/config';
 export { DocFloatDomController } from './controllers/doc-float-dom.controller';
 export { DOCS_IMAGE_MENU_ID } from './menu/image.menu';
+export { DOCS_SHAPE_BELOW_MENU_ID, DOCS_SHAPE_MENU_ID } from './menu/shape.menu';
 export { UniverDocsDrawingUIPlugin } from './plugin';
 export { DocDrawingPosition } from './views/doc-image-panel/DocDrawingPosition';
 export { DocDrawingTextWrap } from './views/doc-image-panel/DocDrawingTextWrap';

package/lib/types/locale/en-US.d.ts

@@ -19,6 +19,13 @@ declare const locale: {
         upload: {
             float: string;
         };
+        shape: {
+            insert: {
+                title: string;
+                rectangle: string;
+                ellipse: string;
+            };
+        };
         panel: {
             title: string;
         };

package/lib/types/locale/types.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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.
+ */
+import type { LocaleLeafKeys } from '@univerjs/core';
+import type enUS from './en-US';
+export type LocaleKey = LocaleLeafKeys<typeof enUS>;

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

@@ -15,7 +15,9 @@
  */
 import type { IAccessor } from '@univerjs/core';
 import type { IMenuItem } from '@univerjs/ui';
+import type { LocaleKey } from '../locale/types';
 export declare const DOCS_IMAGE_MENU_ID = "doc.menu.image";
 export declare const IMAGE_MENU_UPLOAD_FLOAT_ID: string;
-export declare function ImageMenuFactory(accessor: IAccessor): IMenuItem;
-export declare function UploadFloatImageMenuFactory(_accessor: IAccessor): IMenuItem;
+export declare function ImageMenuFactory(accessor: IAccessor): IMenuItem<LocaleKey>;
+export declare function UploadFloatImageMenuFactory(accessor: IAccessor): IMenuItem<LocaleKey>;
+export declare function UploadFloatImageBelowMenuFactory(accessor: IAccessor): IMenuItem<LocaleKey>;

package/lib/types/menu/shape.menu.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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.
+ */
+import type { IAccessor } from '@univerjs/core';
+import type { IMenuButtonItem, IMenuItem } from '@univerjs/ui';
+import type { LocaleKey } from '../locale/types';
+export declare const DOCS_SHAPE_MENU_ID = "doc.command.menu-insert-shape";
+export declare const DOCS_SHAPE_BELOW_MENU_ID = "doc.command.menu-insert-shape.below";
+export declare function ShapeMenuFactory(accessor: IAccessor): IMenuItem<LocaleKey>;
+export declare function ShapeBelowMenuFactory(accessor: IAccessor): IMenuItem<LocaleKey>;
+export declare function InsertRectangleShapeMenuFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey>;
+export declare function InsertEllipseShapeMenuFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey>;
+export declare function InsertRectangleShapeBelowMenuFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey>;
+export declare function InsertEllipseShapeBelowMenuFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey>;

package/lib/types/views/{printing-float-dom/index.d.ts → DocPrintingFloatDom.d.ts}

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { Injector } from '@univerjs/core';
 import type { IDocFloatDom } from '@univerjs/docs-drawing';
 import type { DocumentSkeleton, IBoundRectNoAngle, Scene } from '@univerjs/engine-render';
 export interface IPrintingFloatDomProps {
@@ -26,4 +27,5 @@ export interface IPrintingFloatDomProps {
     };
     bound: IBoundRectNoAngle;
 }
-export declare const DocPrintingFloatDom: (props: IPrintingFloatDomProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DocPrintingFloatDom: (props: IPrintingFloatDomProps) => import("react").JSX.Element;
+export declare function mountDocPrintingFloatDom(props: IPrintingFloatDomProps, root: HTMLElement, injector: Injector): () => void;

package/lib/types/views/doc-image-panel/DocDrawingPanel.d.ts

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const DocDrawingPanel: () => false | import("react/jsx-runtime").JSX.Element;
+export declare const DocDrawingPanel: () => false | import("react").JSX.Element;

package/lib/types/views/doc-image-panel/DocDrawingPosition.d.ts

@@ -17,4 +17,4 @@ import type { IDrawingParam } from '@univerjs/core';
 export interface IDocDrawingPositionProps {
     drawings: IDrawingParam[];
 }
-export declare const DocDrawingPosition: (props: IDocDrawingPositionProps) => import("react/jsx-runtime").JSX.Element | undefined;
+export declare const DocDrawingPosition: (props: IDocDrawingPositionProps) => import("react").JSX.Element | undefined;

package/lib/types/views/doc-image-panel/DocDrawingTextWrap.d.ts

@@ -17,4 +17,4 @@ import type { IDrawingParam } from '@univerjs/core';
 export interface IDocDrawingTextWrapProps {
     drawings: IDrawingParam[];
 }
-export declare const DocDrawingTextWrap: (props: IDocDrawingTextWrapProps) => import("react/jsx-runtime").JSX.Element | null;
+export declare const DocDrawingTextWrap: (props: IDocDrawingTextWrapProps) => import("react").JSX.Element | null;