@univerjs/drawing-ui 1.0.0-alpha.8 → 1.0.0-beta.1

package/lib/locale/ca-ES.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Cap objecte seleccionat"
 	},
 	"image-text-wrap": {
-		title: "Ajust del text",
-		wrappingStyle: "Estil d'ajust",
 		square: "Quadrat",
 		topAndBottom: "A dalt i a baix",
 		inline: "En línia amb el text",
 		behindText: "Darrere del text",
-		inFrontText: "Davant del text",
-		wrapText: "Ajusta el text",
-		bothSide: "Ambdós costats",
-		leftOnly: "Només esquerra",
-		rightOnly: "Només dreta",
-		distanceFromText: "Distància del text",
-		top: "A dalt(px)",
-		left: "Esquerra(px)",
-		bottom: "A baix(px)",
-		right: "Dreta(px)"
-	},
-	"image-popup": {
-		replace: "Reemplaça",
-		delete: "Elimina",
-		edit: "Edita",
-		crop: "Retalla",
-		reset: "Restableix la mida"
+		inFrontText: "Davant del text"
 	}
 } };
 

package/lib/locale/de-DE.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Keine Objektauswahl"
 	},
 	"image-text-wrap": {
-		title: "Textumbruch",
-		wrappingStyle: "Umbruchstil",
 		square: "Quadratisch",
 		topAndBottom: "Oben und unten",
 		inline: "Im Textfluss",
 		behindText: "Hinter dem Text",
-		inFrontText: "Vor dem Text",
-		wrapText: "Text umbrechen",
-		bothSide: "Beide Seiten",
-		leftOnly: "Nur links",
-		rightOnly: "Nur rechts",
-		distanceFromText: "Abstand vom Text",
-		top: "Oben(px)",
-		left: "Links(px)",
-		bottom: "Unten(px)",
-		right: "Rechts(px)"
-	},
-	"image-popup": {
-		replace: "Ersetzen",
-		delete: "Löschen",
-		edit: "Bearbeiten",
-		crop: "Zuschneiden",
-		reset: "Größe zurücksetzen"
+		inFrontText: "Vor dem Text"
 	}
 } };
 

package/lib/locale/en-US.js

@@ -102,30 +102,12 @@ const locale = { "drawing-ui": {
 		},
 		null: "No Object Selection"
 	},
-	"image-popup": {
-		replace: "Replace",
-		delete: "Delete",
-		edit: "Edit",
-		crop: "Crop",
-		reset: "Reset Size"
-	},
 	"image-text-wrap": {
-		title: "Text Wrapping",
-		wrappingStyle: "Wrapping Style",
 		square: "Square",
 		topAndBottom: "Top and Bottom",
 		inline: "In line with text",
 		behindText: "Behind text",
-		inFrontText: "In front of text",
-		wrapText: "Wrap text",
-		bothSide: "Both sides",
-		leftOnly: "Left only",
-		rightOnly: "Right only",
-		distanceFromText: "Distance from text",
-		top: "Top(px)",
-		left: "Left(px)",
-		bottom: "Bottom(px)",
-		right: "Right(px)"
+		inFrontText: "In front of text"
 	}
 } };
 

package/lib/locale/es-ES.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Ningún objeto seleccionado"
 	},
 	"image-text-wrap": {
-		title: "Ajuste de texto",
-		wrappingStyle: "Estilo de ajuste",
 		square: "Cuadrado",
 		topAndBottom: "Arriba y abajo",
 		inline: "En línea con el texto",
 		behindText: "Detrás del texto",
-		inFrontText: "Delante del texto",
-		wrapText: "Ajustar texto",
-		bothSide: "Ambos lados",
-		leftOnly: "Solo izquierda",
-		rightOnly: "Solo derecha",
-		distanceFromText: "Distancia del texto",
-		top: "Arriba(px)",
-		left: "Izquierda(px)",
-		bottom: "Abajo(px)",
-		right: "Derecha(px)"
-	},
-	"image-popup": {
-		replace: "Reemplazar",
-		delete: "Eliminar",
-		edit: "Editar",
-		crop: "Recortar",
-		reset: "Restablecer tamaño"
+		inFrontText: "Delante del texto"
 	}
 } };
 

package/lib/locale/fa-IR.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "هیچ شیئی انتخاب نشده است"
 	},
 	"image-text-wrap": {
-		title: "پیچش متن",
-		wrappingStyle: "سبک پیچش",
 		square: "مربع",
 		topAndBottom: "بالا و پایین",
 		inline: "در یک خط با متن",
 		behindText: "پشت متن",
-		inFrontText: "جلوی متن",
-		wrapText: "پیچش متن",
-		bothSide: "هر دو طرف",
-		leftOnly: "فقط سمت چپ",
-		rightOnly: "فقط سمت راست",
-		distanceFromText: "فاصله از متن",
-		top: "بالا(px)",
-		left: "چپ(px)",
-		bottom: "پایین(px)",
-		right: "راست(px)"
-	},
-	"image-popup": {
-		replace: "تعویض",
-		delete: "حذف",
-		edit: "ویرایش",
-		crop: "کراپ",
-		reset: "بازنشانی اندازه"
+		inFrontText: "جلوی متن"
 	}
 } };
 

package/lib/locale/fr-FR.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Aucune sélection d'objet"
 	},
 	"image-text-wrap": {
-		title: "Habillage du texte",
-		wrappingStyle: "Style d'habillage",
 		square: "Carré",
 		topAndBottom: "Haut et bas",
 		inline: "Aligné avec le texte",
 		behindText: "Derrière le texte",
-		inFrontText: "Devant le texte",
-		wrapText: "Habiller le texte",
-		bothSide: "Des deux côtés",
-		leftOnly: "Seulement à gauche",
-		rightOnly: "Seulement à droite",
-		distanceFromText: "Distance du texte",
-		top: "Haut(px)",
-		left: "Gauche(px)",
-		bottom: "Bas(px)",
-		right: "Droite(px)"
-	},
-	"image-popup": {
-		replace: "Remplacer",
-		delete: "Supprimer",
-		edit: "Modifier",
-		crop: "Rogner",
-		reset: "Réinitialiser la taille"
+		inFrontText: "Devant le texte"
 	}
 } };
 

package/lib/locale/id-ID.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Tidak Ada Objek yang Dipilih"
 	},
 	"image-text-wrap": {
-		title: "Pembungkus Teks",
-		wrappingStyle: "Gaya Pembungkus",
 		square: "Kotak",
 		topAndBottom: "Atas dan Bawah",
 		inline: "Sejajar dengan teks",
 		behindText: "Di belakang teks",
-		inFrontText: "Di depan teks",
-		wrapText: "Bungkus teks",
-		bothSide: "Kedua sisi",
-		leftOnly: "Kiri saja",
-		rightOnly: "Kanan saja",
-		distanceFromText: "Jarak dari teks",
-		top: "Atas(px)",
-		left: "Kiri(px)",
-		bottom: "Bawah(px)",
-		right: "Kanan(px)"
-	},
-	"image-popup": {
-		replace: "Ganti",
-		delete: "Hapus",
-		edit: "Edit",
-		crop: "Pangkas",
-		reset: "Atur Ulang Ukuran"
+		inFrontText: "Di depan teks"
 	}
 } };
 

package/lib/locale/it-IT.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Nessun oggetto selezionato"
 	},
 	"image-text-wrap": {
-		title: "Testo a capo",
-		wrappingStyle: "Stile a capo",
 		square: "Quadrato",
 		topAndBottom: "Superiore e inferiore",
 		inline: "In linea con il testo",
 		behindText: "Dietro il testo",
-		inFrontText: "Davanti al testo",
-		wrapText: "Testo a capo",
-		bothSide: "Entrambi i lati",
-		leftOnly: "Solo sinistra",
-		rightOnly: "Solo destra",
-		distanceFromText: "Distanza dal testo",
-		top: "Superiore(px)",
-		left: "Sinistra(px)",
-		bottom: "Inferiore(px)",
-		right: "Destra(px)"
-	},
-	"image-popup": {
-		replace: "Sostituisci",
-		delete: "Elimina",
-		edit: "Modifica",
-		crop: "Ritaglia",
-		reset: "Reimposta dimensione"
+		inFrontText: "Davanti al testo"
 	}
 } };
 

package/lib/locale/ja-JP.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "選択されたオブジェクトがありません"
 	},
 	"image-text-wrap": {
-		title: "文字列の折り返し",
-		wrappingStyle: "折り返しのスタイル",
 		square: "四角形",
 		topAndBottom: "上下",
 		inline: "行内",
 		behindText: "文字列の背面",
-		inFrontText: "文字列の前面",
-		wrapText: "文字列の折り返し",
-		bothSide: "両側",
-		leftOnly: "左のみ",
-		rightOnly: "右のみ",
-		distanceFromText: "文字列からの距離",
-		top: "上(px)",
-		left: "左(px)",
-		bottom: "下(px)",
-		right: "右(px)"
-	},
-	"image-popup": {
-		replace: "置換",
-		delete: "削除",
-		edit: "編集",
-		crop: "トリミング",
-		reset: "サイズをリセット"
+		inFrontText: "文字列の前面"
 	}
 } };
 

package/lib/locale/ko-KR.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "선택된 객체가 없습니다"
 	},
 	"image-text-wrap": {
-		title: "텍스트 감싸기",
-		wrappingStyle: "감싸기 스타일",
 		square: "사각형",
 		topAndBottom: "위아래",
 		inline: "텍스트와 같은 줄",
 		behindText: "텍스트 뒤",
-		inFrontText: "텍스트 앞",
-		wrapText: "텍스트 감싸기",
-		bothSide: "양쪽",
-		leftOnly: "왼쪽만",
-		rightOnly: "오른쪽만",
-		distanceFromText: "텍스트와 거리",
-		top: "위(px)",
-		left: "왼쪽(px)",
-		bottom: "아래(px)",
-		right: "오른쪽(px)"
-	},
-	"image-popup": {
-		replace: "교체",
-		delete: "삭제",
-		edit: "편집",
-		crop: "자르기",
-		reset: "크기 초기화"
+		inFrontText: "텍스트 앞"
 	}
 } };
 

package/lib/locale/pl-PL.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Brak zaznaczonego obiektu"
 	},
 	"image-text-wrap": {
-		title: "Zawijanie tekstu",
-		wrappingStyle: "Styl zawijania",
 		square: "Kwadrat",
 		topAndBottom: "Góra i dół",
 		inline: "W linii z tekstem",
 		behindText: "Za tekstem",
-		inFrontText: "Przed tekstem",
-		wrapText: "Zawijaj tekst",
-		bothSide: "Obie strony",
-		leftOnly: "Tylko lewa",
-		rightOnly: "Tylko prawa",
-		distanceFromText: "Odległość od tekstu",
-		top: "Góra(px)",
-		left: "Lewo(px)",
-		bottom: "Dół(px)",
-		right: "Prawo(px)"
-	},
-	"image-popup": {
-		replace: "Zamień",
-		delete: "Usuń",
-		edit: "Edytuj",
-		crop: "Przytnij",
-		reset: "Resetuj rozmiar"
+		inFrontText: "Przed tekstem"
 	}
 } };
 

package/lib/locale/pt-BR.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Nenhum objeto selecionado"
 	},
 	"image-text-wrap": {
-		title: "Quebra de texto",
-		wrappingStyle: "Estilo de quebra",
 		square: "Quadrado",
 		topAndBottom: "Superior e inferior",
 		inline: "Em linha com o texto",
 		behindText: "Atrás do texto",
-		inFrontText: "À frente do texto",
-		wrapText: "Quebrar texto automaticamente",
-		bothSide: "Ambos os lados",
-		leftOnly: "Somente esquerda",
-		rightOnly: "Somente direita",
-		distanceFromText: "Distância do texto",
-		top: "Superior(px)",
-		left: "Esquerda(px)",
-		bottom: "Inferior(px)",
-		right: "Direita(px)"
-	},
-	"image-popup": {
-		replace: "Substituir",
-		delete: "Excluir",
-		edit: "Editar",
-		crop: "Cortar",
-		reset: "Redefinir tamanho"
+		inFrontText: "À frente do texto"
 	}
 } };
 

package/lib/locale/ru-RU.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Нет выбранных объектов"
 	},
 	"image-text-wrap": {
-		title: "Обтекание текстом",
-		wrappingStyle: "Стиль обтекания",
 		square: "Вокруг рамки",
 		topAndBottom: "Сверху и снизу",
 		inline: "В тексте",
 		behindText: "За текстом",
-		inFrontText: "Перед текстом",
-		wrapText: "Обтекание",
-		bothSide: "С обеих сторон",
-		leftOnly: "Только слева",
-		rightOnly: "Только справа",
-		distanceFromText: "Расстояние от текста",
-		top: "Сверху (пкс)",
-		left: "Слева (пкс)",
-		bottom: "Снизу (пкс)",
-		right: "Справа (пкс)"
-	},
-	"image-popup": {
-		replace: "Заменить",
-		delete: "Удалить",
-		edit: "Редактировать",
-		crop: "Обрезать",
-		reset: "Сбросить размер"
+		inFrontText: "Перед текстом"
 	}
 } };
 

package/lib/locale/sk-SK.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Nie je vybraný žiadny objekt"
 	},
 	"image-text-wrap": {
-		title: "Obtekanie textu",
-		wrappingStyle: "Štýl obtekania",
 		square: "Obdĺžnikové",
 		topAndBottom: "Hore a dole",
 		inline: "V riadku s textom",
 		behindText: "Za textom",
-		inFrontText: "Pred textom",
-		wrapText: "Obtekať text",
-		bothSide: "Obe strany",
-		leftOnly: "Len ľavá",
-		rightOnly: "Len pravá",
-		distanceFromText: "Vzdialenosť od textu",
-		top: "Hore (px)",
-		left: "Vľavo (px)",
-		bottom: "Dole (px)",
-		right: "Vpravo (px)"
-	},
-	"image-popup": {
-		replace: "Nahradiť",
-		delete: "Odstrániť",
-		edit: "Upraviť",
-		crop: "Orezať",
-		reset: "Obnoviť veľkosť"
+		inFrontText: "Pred textom"
 	}
 } };
 

package/lib/locale/vi-VN.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "Không có đối tượng nào được chọn"
 	},
 	"image-text-wrap": {
-		title: "Bố cục văn bản",
-		wrappingStyle: "Kiểu bố cục",
 		square: "Vuông",
 		topAndBottom: "Trên và dưới",
 		inline: "Cùng dòng với văn bản",
 		behindText: "Phía sau văn bản",
-		inFrontText: "Phía trước văn bản",
-		wrapText: "Bọc văn bản",
-		bothSide: "Cả hai bên",
-		leftOnly: "Chỉ bên trái",
-		rightOnly: "Chỉ bên phải",
-		distanceFromText: "Khoảng cách từ văn bản",
-		top: "Trên (px)",
-		left: "Trái (px)",
-		bottom: "Dưới (px)",
-		right: "Phải (px)"
-	},
-	"image-popup": {
-		replace: "Thay thế",
-		delete: "Xóa",
-		edit: "Chỉnh sửa",
-		crop: "Cắt",
-		reset: "Đặt lại kích thước"
+		inFrontText: "Phía trước văn bản"
 	}
 } };
 

package/lib/locale/zh-CN.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "未选中任何对象"
 	},
 	"image-text-wrap": {
-		title: "文字环绕",
-		wrappingStyle: "环绕方式",
 		square: "四周型",
 		topAndBottom: "上下型",
 		inline: "嵌入型",
 		behindText: "衬于文字下方",
-		inFrontText: "浮于文字上方",
-		wrapText: "自动换行",
-		bothSide: "两侧",
-		leftOnly: "左侧",
-		rightOnly: "右侧",
-		distanceFromText: "距正文",
-		top: "上（px）",
-		left: "左（px）",
-		bottom: "下（px）",
-		right: "右（px）"
-	},
-	"image-popup": {
-		replace: "替换",
-		delete: "删除",
-		edit: "编辑",
-		crop: "裁剪",
-		reset: "重置大小"
+		inFrontText: "浮于文字上方"
 	}
 } };
 

package/lib/locale/zh-HK.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "未選取任何物件"
 	},
 	"image-text-wrap": {
-		title: "文繞圖",
-		wrappingStyle: "文繞圖方式",
 		square: "矩形",
 		topAndBottom: "上及下",
 		inline: "與文字排列",
 		behindText: "文字在前",
-		inFrontText: "文字在後",
-		wrapText: "自動換行",
-		bothSide: "兩側",
-		leftOnly: "僅左側",
-		rightOnly: "僅右側",
-		distanceFromText: "與文字距離",
-		top: "上（px）",
-		left: "左（px）",
-		bottom: "下（px）",
-		right: "右（px）"
-	},
-	"image-popup": {
-		replace: "替換",
-		delete: "刪除",
-		edit: "編輯",
-		crop: "裁切",
-		reset: "重置大小"
+		inFrontText: "文字在後"
 	}
 } };
 

package/lib/locale/zh-TW.js

@@ -88,29 +88,11 @@ const locale = { "drawing-ui": {
 		null: "未選取任何物件"
 	},
 	"image-text-wrap": {
-		title: "文繞圖",
-		wrappingStyle: "文繞圖方式",
 		square: "矩形",
 		topAndBottom: "上及下",
 		inline: "與文字排列",
 		behindText: "文字在前",
-		inFrontText: "文字在後",
-		wrapText: "自動換行",
-		bothSide: "兩側",
-		leftOnly: "僅左側",
-		rightOnly: "僅右側",
-		distanceFromText: "與文字距離",
-		top: "上（px）",
-		left: "左（px）",
-		bottom: "下（px）",
-		right: "右（px）"
-	},
-	"image-popup": {
-		replace: "替換",
-		delete: "刪除",
-		edit: "編輯",
-		crop: "裁切",
-		reset: "重置大小"
+		inFrontText: "文字在後"
 	}
 } };
 

package/lib/types/commands/operations/image-crop.operation.d.ts

@@ -15,9 +15,11 @@
  */
 import type { IDrawingSearch, IOperation } from '@univerjs/core';
 export declare const OpenImageCropOperation: IOperation<IDrawingSearch>;
-export declare const CloseImageCropOperation: IOperation<{
+export interface ICloseImageCropOperationParams {
     isAuto?: boolean;
-}>;
+    isCancel?: boolean;
+}
+export declare const CloseImageCropOperation: IOperation<ICloseImageCropOperationParams>;
 export declare enum CropType {
     FREE = "0",
     R1_1 = "1",

package/lib/types/controllers/image-cropper.controller.d.ts

@@ -16,7 +16,7 @@
 import { Disposable, ICommandService, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { IRenderManagerService } from '@univerjs/engine-render';
-import { IMessageService } from '@univerjs/ui';
+import { IMessageService, IShortcutService } from '@univerjs/ui';
 export declare class ImageCropperController extends Disposable {
     private readonly _commandService;
     private readonly _drawingManagerService;
@@ -24,8 +24,13 @@ export declare class ImageCropperController extends Disposable {
     private _univerInstanceService;
     private readonly _messageService;
     private readonly _localeService;
+    private readonly _shortcutService;
     private _sceneListenerOnImageMap;
-    constructor(_commandService: ICommandService, _drawingManagerService: IDrawingManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _messageService: IMessageService, _localeService: LocaleService);
+    private readonly _cropShortcutDisposables;
+    private readonly _cropSnapshots;
+    private _pendingCropSnapshot;
+    private _activeCropSession;
+    constructor(_commandService: ICommandService, _drawingManagerService: IDrawingManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _messageService: IMessageService, _localeService: LocaleService, _shortcutService: IShortcutService);
     private _init;
     private _initAutoCrop;
     private _calculateSrcRectByRatio;
@@ -34,6 +39,9 @@ export declare class ImageCropperController extends Disposable {
     private _searchCropObject;
     private _initCloseCrop;
     private _getApplyObjectByCropObject;
+    private _captureCropSnapshot;
+    private _restoreCropSnapshot;
+    private _registerCropShortcuts;
     private _addListenerOnImage;
     private _addHoverForImageCopper;
     private _endCropListener;

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

@@ -104,30 +104,12 @@ declare const locale: {
             };
             null: string;
         };
-        'image-popup': {
-            replace: string;
-            delete: string;
-            edit: string;
-            crop: string;
-            reset: string;
-        };
         'image-text-wrap': {
-            title: string;
-            wrappingStyle: string;
             square: string;
             topAndBottom: string;
             inline: string;
             behindText: string;
             inFrontText: string;
-            wrapText: string;
-            bothSide: string;
-            leftOnly: string;
-            rightOnly: string;
-            distanceFromText: string;
-            top: string;
-            left: string;
-            bottom: string;
-            right: string;
         };
     };
 };

package/lib/types/views/image-popup-menu/ImagePopupMenu.d.ts

@@ -22,6 +22,7 @@ export interface IImagePopupMenuItem {
     type?: 'button' | 'select';
     value?: string;
     options?: Array<{
+        icon?: string;
         label: unknown;
         value: string;
     }>;