@univerjs/drawing-ui 1.0.0-beta.0 → 1.0.0-beta.1

package/lib/cjs/locale/ko-KR.js

@@ -89,29 +89,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/cjs/locale/pl-PL.js

@@ -89,29 +89,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/cjs/locale/pt-BR.js

@@ -89,29 +89,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/cjs/locale/ru-RU.js

@@ -89,29 +89,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/cjs/locale/sk-SK.js

@@ -89,29 +89,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/cjs/locale/vi-VN.js

@@ -89,29 +89,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/cjs/locale/zh-CN.js

@@ -89,29 +89,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/cjs/locale/zh-HK.js

@@ -89,29 +89,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/cjs/locale/zh-TW.js

@@ -89,29 +89,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/es/index.js

@@ -1,9 +1,9 @@
-import { ArrangeTypeEnum, BooleanNumber, CommandType, DependentOn, Disposable, DrawingTypeEnum, ICommandService, IConfigService, IImageIoService, IURLImageService, IUniverInstanceService, ImageSourceType, Inject, Injector, LocaleService, Plugin, PositionedObjectLayoutType, UniverInstanceType, checkIfMove, debounce, generateRandomId, merge, toDisposable } from "@univerjs/core";
+import { ArrangeTypeEnum, BooleanNumber, CommandType, DependentOn, Disposable, DisposableCollection, DrawingTypeEnum, ICommandService, IConfigService, IImageIoService, IURLImageService, IUniverInstanceService, ImageSourceType, Inject, Injector, LocaleService, Plugin, PositionedObjectLayoutType, UniverInstanceType, checkIfMove, debounce, generateRandomId, merge, toDisposable } from "@univerjs/core";
 import { DRAWING_GROUPABLE_TYPES, IDrawingManagerService, SetDrawingSelectedOperation, UniverDrawingPlugin, getDrawingShapeKeyByDrawingSearch, isGroupableDrawingType, resolveDrawingRotateEnabled } from "@univerjs/drawing";
 import { CURSOR_TYPE, Canvas, DRAWING_OBJECT_LAYER_INDEX, DrawingGroupObject, Group, IRenderManagerService, Image, RENDER_CLASS_TYPE, Rect, Shape, UniverRenderEnginePlugin, Vector2, degToRad, getGroupState, precisionTo, transformObjectOutOfGroup } from "@univerjs/engine-render";
-import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IDialogService, IGalleryService, IMenuManagerService, IMessageService, IconManager, MenuItemType, useDependency, useObservable } from "@univerjs/ui";
+import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IDialogService, IGalleryService, IMenuManagerService, IMessageService, IShortcutService, IconManager, KeyCode, MenuItemType, useDependency, useObservable } from "@univerjs/ui";
 import { BehaviorSubject, Observable, bufferTime, filter, map, merge as merge$1, of, startWith, switchMap } from "rxjs";
-import { ArrowDownIcon, ArrowUpIcon, AutofillDoubleIcon, BottomIcon, ChartIcon, CreateCopyIcon, CropIcon, DeleteIcon, DocSettingIcon, EyeIcon, EyelashIcon, GroupIcon, LocateFixedIcon, LockIcon, MoreDownIcon, MoreRightIcon, MoveDownIcon, MoveUpIcon, TextWrapShapeIcon, TopmostIcon, UngroupIcon, UnlockIcon } from "@univerjs/icons";
+import { ArrowDownIcon, ArrowUpIcon, AutofillDoubleIcon, BottomIcon, ChartIcon, CreateCopyIcon, CropIcon, DeleteIcon, DocSettingIcon, EyeIcon, EyelashIcon, GroupIcon, LocateFixedIcon, LockIcon, MoreDownIcon, MoveDownIcon, MoveUpIcon, TextWrapShapeIcon, TopmostIcon, UngroupIcon, UnlockIcon } from "@univerjs/icons";
 import { Button, Checkbox, Dropdown, DropdownMenu, Input, InputNumber, MessageType, Select, Separator, Tooltip, borderClassName, clsx } from "@univerjs/design";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -236,21 +236,21 @@ const CancelDrawingGroupOperation = {
 const OpenImageCropOperation = {
 	id: "sheet.operation.open-image-crop",
 	type: CommandType.OPERATION,
-	handler: (accessor, params) => {
+	handler: (_accessor, _params) => {
 		return true;
 	}
 };
 const CloseImageCropOperation = {
 	id: "sheet.operation.close-image-crop",
 	type: CommandType.OPERATION,
-	handler: (accessor, params) => {
+	handler: (_accessor, _params) => {
 		return true;
 	}
 };
 const AutoImageCropOperation = {
 	id: "sheet.operation.Auto-image-crop",
 	type: CommandType.OPERATION,
-	handler: (accessor, params) => {
+	handler: (_accessor, _params) => {
 		return true;
 	}
 };
@@ -624,7 +624,7 @@ const menuSchema = { [ContextMenuPosition.DRAWING]: { [ContextMenuGroup.OTHERS]:
 //#endregion
 //#region package.json
 var name = "@univerjs/drawing-ui";
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.1";
 
 //#endregion
 //#region src/config/config.ts
@@ -697,11 +697,11 @@ function ImagePopupMenu(props) {
 			open: visible,
 			onOpenChange: onVisibleChange,
 			children: /* @__PURE__ */ jsxs("div", {
-				className: clsx("univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-800", borderClassName, {
+				className: clsx("univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1 univer-text-gray-900 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-800", borderClassName, {
 					"univer-bg-gray-100 dark:!univer-bg-gray-800": visible,
-					"univer-bg-white dark:!univer-bg-gray-900": !visible
+					"univer-bg-gray-0 dark:!univer-bg-gray-900": !visible
 				}),
-				children: [/* @__PURE__ */ jsx(AutofillDoubleIcon, { className: "univer-fill-primary-600 univer-text-gray-900 dark:!univer-text-white" }), showMore && /* @__PURE__ */ jsx(MoreDownIcon, { className: "dark:!univer-text-white" })]
+				children: [/* @__PURE__ */ jsx(AutofillDoubleIcon, { className: "univer-fill-primary-600 univer-text-gray-900 dark:!univer-text-gray-0" }), showMore && /* @__PURE__ */ jsx(MoreDownIcon, { className: "dark:!univer-text-gray-0" })]
 			})
 		})
 	});
@@ -742,7 +742,7 @@ function ToolbarDropdownButton(props) {
 		open,
 		onOpenChange: setOpen,
 		overlay: /* @__PURE__ */ jsx("div", {
-			className: "univer-min-w-32 univer-rounded-lg univer-border univer-border-solid univer-border-gray-200 univer-bg-white univer-p-1 univer-shadow-lg dark:!univer-border-gray-700 dark:!univer-bg-gray-900",
+			className: "univer-min-w-32 univer-rounded-lg univer-border univer-border-solid univer-border-gray-200 univer-bg-gray-0 univer-p-1 univer-shadow-lg dark:!univer-border-gray-700 dark:!univer-bg-gray-900",
 			children: props.options.map((option) => /* @__PURE__ */ jsxs("button", {
 				type: "button",
 				onClick: () => {
@@ -831,7 +831,7 @@ function DocImageFloatingToolbar(props) {
 			event.stopPropagation();
 			event.preventDefault();
 		},
-		className: clsx("univer-box-border univer-flex univer-items-center univer-rounded univer-bg-white univer-px-1 univer-py-1 univer-shadow-sm dark:!univer-border-gray-700 dark:!univer-bg-gray-900", borderClassName),
+		className: clsx("univer-box-border univer-flex univer-items-center univer-rounded univer-bg-gray-0 univer-px-1 univer-py-1 univer-shadow-sm dark:!univer-border-gray-700 dark:!univer-bg-gray-900", borderClassName),
 		children: [/* @__PURE__ */ jsx(ToolbarGroup, { children: /* @__PURE__ */ jsx(ToolbarDropdownButton, {
 			title: ((_wrappingStyleOptions = wrappingStyleOptions.find((option) => option.value === wrappingStyle)) === null || _wrappingStyleOptions === void 0 ? void 0 : _wrappingStyleOptions.label) ?? localeService.t("drawing-ui.image-text-wrap.inline"),
 			value: wrappingStyle,
@@ -856,11 +856,14 @@ function DocChartFloatingToolbar(props) {
 	const [hidden, setHidden] = useState(false);
 	const chartTypeItem = props.menuItems.find((item) => item.type === "select");
 	const actionItems = props.menuItems.filter((item) => item.type !== "select" && item.icon).sort((a, b) => a.index - b.index);
-	const chartTypeOptions = ((chartTypeItem === null || chartTypeItem === void 0 ? void 0 : chartTypeItem.options) ?? []).map((option) => ({
-		label: String(option.label),
-		value: option.value,
-		icon: /* @__PURE__ */ jsx(ChartIcon, {})
-	}));
+	const chartTypeOptions = ((chartTypeItem === null || chartTypeItem === void 0 ? void 0 : chartTypeItem.options) ?? []).map((option) => {
+		const Icon = option.icon ? iconManager.get(option.icon) : ChartIcon;
+		return {
+			label: String(option.label),
+			value: option.value,
+			icon: /* @__PURE__ */ jsx(Icon, {})
+		};
+	});
 	const executeMenuItem = (item) => {
 		if (!item || item.disable) return;
 		if (item.hideOnClick) setHidden(true);
@@ -873,7 +876,7 @@ function DocChartFloatingToolbar(props) {
 			event.stopPropagation();
 			event.preventDefault();
 		},
-		className: clsx("univer-box-border univer-flex univer-items-center univer-rounded univer-bg-white univer-px-1 univer-py-1 univer-shadow-sm dark:!univer-border-gray-700 dark:!univer-bg-gray-900", borderClassName),
+		className: clsx("univer-box-border univer-flex univer-items-center univer-rounded univer-bg-gray-0 univer-px-1 univer-py-1 univer-shadow-sm dark:!univer-border-gray-700 dark:!univer-bg-gray-900", borderClassName),
 		children: [chartTypeItem && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(ToolbarGroup, { children: /* @__PURE__ */ jsx(ToolbarDropdownButton, {
 			title: localeService.t(chartTypeItem.label),
 			value: chartTypeItem.value ?? ((_chartTypeOptions$ = chartTypeOptions[0]) === null || _chartTypeOptions$ === void 0 ? void 0 : _chartTypeOptions$.value) ?? "",
@@ -1953,7 +1956,7 @@ var ImageCropperObject = class extends Shape {
 //#endregion
 //#region src/controllers/image-cropper.controller.ts
 let ImageCropperController = class ImageCropperController extends Disposable {
-	constructor(_commandService, _drawingManagerService, _renderManagerService, _univerInstanceService, _messageService, _localeService) {
+	constructor(_commandService, _drawingManagerService, _renderManagerService, _univerInstanceService, _messageService, _localeService, _shortcutService) {
 		super();
 		this._commandService = _commandService;
 		this._drawingManagerService = _drawingManagerService;
@@ -1961,7 +1964,13 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 		this._univerInstanceService = _univerInstanceService;
 		this._messageService = _messageService;
 		this._localeService = _localeService;
+		this._shortcutService = _shortcutService;
 		_defineProperty(this, "_sceneListenerOnImageMap", /* @__PURE__ */ new WeakSet());
+		_defineProperty(this, "_cropShortcutDisposables", new DisposableCollection());
+		_defineProperty(this, "_cropSnapshots", /* @__PURE__ */ new WeakMap());
+		_defineProperty(this, "_pendingCropSnapshot", null);
+		_defineProperty(this, "_activeCropSession", null);
+		this.disposeWithMe(this._cropShortcutDisposables);
 		this._init();
 	}
 	_init() {
@@ -1996,12 +2005,17 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 				return;
 			}
 			if (imageShape == null) return;
-			this._updateCropperObject(cropType, imageShape);
-			this._commandService.executeCommand(OpenImageCropOperation.id, {
-				unitId,
-				subUnitId,
-				drawingId
-			});
+			this._pendingCropSnapshot = this._captureCropSnapshot(imageShape);
+			try {
+				this._updateCropperObject(cropType, imageShape);
+				this._commandService.syncExecuteCommand(OpenImageCropOperation.id, {
+					unitId,
+					subUnitId,
+					drawingId
+				});
+			} finally {
+				this._pendingCropSnapshot = null;
+			}
 		}));
 	}
 	_calculateSrcRectByRatio(left, top, width, height, numerator, denominator) {
@@ -2069,6 +2083,7 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 			if (command.id !== OpenImageCropOperation.id) return;
 			const params = command.params;
 			if (params == null) return;
+			if (this._activeCropSession != null) this._commandService.syncExecuteCommand(CloseImageCropOperation.id, { isAuto: true });
 			const { unitId, subUnitId, drawingId } = params;
 			const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 			const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
@@ -2103,12 +2118,20 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 				prstGeom: imageShape.prstGeom,
 				applyTransform: imageShape.calculateTransformWithSrcRect()
 			});
+			this._cropSnapshots.set(imageCropperObject, this._pendingCropSnapshot ?? this._captureCropSnapshot(imageShape));
+			this._pendingCropSnapshot = null;
 			scene.addObject(imageCropperObject, imageShape.getLayerIndex() + 1).attachTransformerTo(imageCropperObject);
+			this._activeCropSession = {
+				scene,
+				imageShape,
+				imageCropperObject
+			};
 			transformer === null || transformer === void 0 || transformer.createControlForCopper(imageCropperObject);
 			this._addHoverForImageCopper(imageCropperObject);
 			imageShape.openRenderByCropper();
 			transformer === null || transformer === void 0 || transformer.refreshControls();
 			imageCropperObject.makeDirty(true);
+			this._registerCropShortcuts();
 			this._commandService.syncExecuteCommand(SetDrawingSelectedOperation.id, [{
 				unitId,
 				subUnitId,
@@ -2123,39 +2146,40 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 	_initCloseCrop() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id !== CloseImageCropOperation.id) return;
-			const currentUnit = this._univerInstanceService.getFocusedUnit();
-			if (currentUnit == null) return;
-			const unitId = currentUnit.getUnitId();
-			const renderObject = this._renderManagerService.getRenderUnitById(unitId);
-			const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
-			if (scene == null) return true;
-			const imageCropperObject = this._searchCropObject(scene);
-			if (imageCropperObject == null) return;
-			const imageShape = this._getApplyObjectByCropObject(imageCropperObject);
-			if (imageShape == null) return;
+			const cropSession = this._activeCropSession;
+			if (cropSession == null) return;
+			const { scene, imageShape, imageCropperObject } = cropSession;
 			const transformer = scene.getTransformerByCreate();
 			transformer.detachFrom(imageCropperObject);
 			transformer.clearCopperControl();
-			const srcRect = this._getSrcRectByTransformState(imageShape, imageCropperObject);
-			const drawingParam = this._drawingManagerService.getDrawingOKey(imageShape.oKey);
-			if (drawingParam != null) {
-				const { left, top, height, width } = imageCropperObject;
-				this._drawingManagerService.featurePluginUpdateNotification([{
-					...drawingParam,
-					transform: {
-						...drawingParam.transform,
-						left,
-						top,
-						height,
-						width
-					},
-					srcRect: srcRect.srcRectAngle
-				}]);
+			const params = command.params;
+			if (params === null || params === void 0 ? void 0 : params.isCancel) this._restoreCropSnapshot(imageShape, imageCropperObject);
+			else {
+				const srcRect = this._getSrcRectByTransformState(imageShape, imageCropperObject);
+				const drawingParam = this._drawingManagerService.getDrawingOKey(imageShape.oKey);
+				if (drawingParam != null) {
+					const { left, top, height, width } = imageCropperObject;
+					this._drawingManagerService.featurePluginUpdateNotification([{
+						...drawingParam,
+						transform: {
+							...drawingParam.transform,
+							left,
+							top,
+							height,
+							width
+						},
+						srcRect: srcRect.srcRectAngle
+					}]);
+				}
+				imageShape.setSrcRect({ ...srcRect.srcRectAngle });
 			}
-			imageShape.setSrcRect({ ...srcRect.srcRectAngle });
 			imageShape.closeRenderByCropper();
 			imageShape.makeDirty(true);
-			imageCropperObject === null || imageCropperObject === void 0 || imageCropperObject.dispose();
+			transformer.refreshControls();
+			this._cropSnapshots.delete(imageCropperObject);
+			imageCropperObject.dispose();
+			this._activeCropSession = null;
+			this._cropShortcutDisposables.dispose();
 		}));
 		const sheetUnit$ = this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => workbook ? workbook.activeSheet$ : of(null)));
 		this.disposeWithMe(sheetUnit$.subscribe(() => {
@@ -2171,6 +2195,33 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 		if (applyObject == null) return null;
 		return applyObject;
 	}
+	_captureCropSnapshot(imageShape) {
+		return {
+			transform: imageShape.getState(),
+			srcRect: imageShape.srcRect == null ? imageShape.srcRect : { ...imageShape.srcRect }
+		};
+	}
+	_restoreCropSnapshot(imageShape, imageCropperObject) {
+		const snapshot = this._cropSnapshots.get(imageCropperObject);
+		if (snapshot) {
+			imageShape.transformByStateCloseCropper(snapshot.transform);
+			imageShape.setSrcRect(snapshot.srcRect);
+		}
+	}
+	_registerCropShortcuts() {
+		this._cropShortcutDisposables.dispose();
+		this._cropShortcutDisposables.add(this._shortcutService.registerShortcut({
+			id: CloseImageCropOperation.id,
+			binding: KeyCode.ENTER,
+			priority: 1e3
+		}));
+		this._cropShortcutDisposables.add(this._shortcutService.registerShortcut({
+			id: CloseImageCropOperation.id,
+			binding: KeyCode.ESC,
+			priority: 1e3,
+			staticParameters: { isCancel: true }
+		}));
+	}
 	_addListenerOnImage(scene) {
 		const transformer = scene.getTransformerByCreate();
 		let startTransform = null;
@@ -2223,8 +2274,8 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 		}));
 	}
 	_getSrcRectByTransformState(applyObject, imageCropperObject) {
-		const { left, top, height, width, strokeWidth, angle: copperAngle } = imageCropperObject;
-		const { left: applyLeft, top: applyTop, width: applyWidth, height: applyHeight, angle: applyAngle, strokeWidth: applyStrokeWidth } = applyObject;
+		const { left, top, height, width } = imageCropperObject;
+		const { left: applyLeft, top: applyTop, width: applyWidth, height: applyHeight, angle: applyAngle } = applyObject;
 		const newLeft = left - applyLeft;
 		const newTop = top - applyTop;
 		const srcRect = {
@@ -2260,7 +2311,8 @@ ImageCropperController = __decorate([
 	__decorateParam(2, IRenderManagerService),
 	__decorateParam(3, IUniverInstanceService),
 	__decorateParam(4, IMessageService),
-	__decorateParam(5, Inject(LocaleService))
+	__decorateParam(5, Inject(LocaleService)),
+	__decorateParam(6, IShortcutService)
 ], ImageCropperController);
 
 //#endregion
@@ -2746,7 +2798,7 @@ function ObjectListPanelBase(props) {
 						["locked", labels.filterLocked]
 					].map(([mode, label]) => /* @__PURE__ */ jsx("button", {
 						type: "button",
-						className: clsx("univer-h-7 univer-min-w-0 univer-flex-1 univer-rounded-md univer-border univer-border-solid univer-px-2 univer-text-xs univer-outline-none univer-transition-colors dark:!univer-border-gray-700", filterMode === mode ? "dark:!univer-bg-primary-900/30 univer-border-primary-500 univer-bg-primary-50 univer-text-primary-600 dark:!univer-text-primary-200" : "univer-border-gray-200 univer-bg-white univer-text-gray-600 hover:univer-bg-gray-50 dark:!univer-bg-gray-900 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-800"),
+						className: clsx("univer-h-7 univer-min-w-0 univer-flex-1 univer-rounded-md univer-border univer-border-solid univer-px-2 univer-text-xs univer-outline-none univer-transition-colors dark:!univer-border-gray-700", filterMode === mode ? "dark:!univer-bg-primary-900/30 univer-border-primary-500 univer-bg-primary-50 univer-text-primary-600 dark:!univer-text-primary-200" : "univer-border-gray-200 univer-bg-gray-0 univer-text-gray-600 hover:univer-bg-gray-50 dark:!univer-bg-gray-900 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-800"),
 						"aria-pressed": filterMode === mode,
 						onClick: () => setFilterMode(mode),
 						children: /* @__PURE__ */ jsx("span", {
@@ -2776,7 +2828,7 @@ function ObjectListPanelBase(props) {
 								children: [
 									section.id ? /* @__PURE__ */ jsx("span", {
 										className: "univer-flex univer-size-4 univer-shrink-0 univer-items-center univer-justify-center",
-										children: sectionCollapsed ? /* @__PURE__ */ jsx(MoreRightIcon, {}) : /* @__PURE__ */ jsx(MoreDownIcon, {})
+										children: /* @__PURE__ */ jsx(MoreDownIcon, { className: clsx({ "-univer-rotate-90 rtl:univer-rotate-90": sectionCollapsed }) })
 									}) : /* @__PURE__ */ jsx("span", { className: "univer-size-4 univer-shrink-0" }),
 									/* @__PURE__ */ jsx("span", {
 										className: "univer-min-w-0 univer-flex-1 univer-truncate univer-text-left",
@@ -2885,11 +2937,11 @@ function ObjectListRow(props) {
 					event.stopPropagation();
 					onToggleExpanded();
 				},
-				children: item.expanded ? /* @__PURE__ */ jsx(MoreDownIcon, {}) : /* @__PURE__ */ jsx(MoreRightIcon, {})
+				children: /* @__PURE__ */ jsx(MoreDownIcon, { className: clsx({ "-univer-rotate-90 rtl:univer-rotate-90": !item.expanded }) })
 			}) : /* @__PURE__ */ jsx("span", { className: "univer-size-5 univer-shrink-0" }),
 			showName ? /* @__PURE__ */ jsx(Input, {
 				className: clsx("univer-h-7 univer-w-0 univer-min-w-0 univer-flex-1", disabled && "univer-cursor-not-allowed"),
-				inputClass: clsx("!univer-h-7 univer-min-w-0 univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap !univer-rounded !univer-border-transparent !univer-bg-transparent !univer-px-1 univer-text-sm univer-text-gray-900 !univer-shadow-none focus:!univer-border-primary-500 focus:!univer-bg-white focus:!univer-ring-1 focus:!univer-ring-primary-100 disabled:!univer-bg-transparent disabled:univer-opacity-100 dark:!univer-text-gray-100 dark:focus:!univer-bg-gray-900 dark:focus:!univer-ring-primary-900", disabled && "univer-text-gray-400 dark:!univer-text-gray-500"),
+				inputClass: clsx("!univer-h-7 univer-min-w-0 univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap !univer-rounded !univer-border-transparent !univer-bg-transparent !univer-px-1 univer-text-sm univer-text-gray-900 !univer-shadow-none focus:!univer-border-primary-500 focus:!univer-bg-gray-0 focus:!univer-ring-1 focus:!univer-ring-primary-100 disabled:!univer-bg-transparent disabled:univer-opacity-100 dark:!univer-text-gray-100 dark:focus:!univer-bg-gray-900 dark:focus:!univer-ring-primary-900", disabled && "univer-text-gray-400 dark:!univer-text-gray-500"),
 				inputStyle: {
 					maxWidth: "100%",
 					boxSizing: "border-box"
@@ -2983,7 +3035,7 @@ function ObjectDetailsEditor(props) {
 					className: "univer-text-xs univer-text-gray-500 dark:!univer-text-gray-400",
 					children: labels.description
 				}), /* @__PURE__ */ jsx("textarea", {
-					className: "univer-box-border univer-min-h-16 univer-w-full univer-resize-none univer-rounded-md univer-border univer-border-solid univer-border-gray-200 univer-bg-white univer-p-2 univer-text-sm univer-text-gray-900 univer-outline-none focus:univer-border-primary-500 focus:univer-ring-1 focus:univer-ring-primary-100 disabled:univer-cursor-not-allowed disabled:univer-opacity-70 dark:!univer-border-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-gray-100 dark:focus:!univer-ring-primary-900",
+					className: "univer-box-border univer-min-h-16 univer-w-full univer-resize-none univer-rounded-md univer-border univer-border-solid univer-border-gray-200 univer-bg-gray-0 univer-p-2 univer-text-sm univer-text-gray-900 univer-outline-none focus:univer-border-primary-500 focus:univer-ring-1 focus:univer-ring-primary-100 disabled:univer-cursor-not-allowed disabled:univer-opacity-70 dark:!univer-border-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-gray-100 dark:focus:!univer-ring-primary-900",
 					value: draftDescription,
 					disabled,
 					placeholder: labels.descriptionPlaceholder,
@@ -3061,7 +3113,7 @@ const DrawingAlign = (props) => {
 		}), /* @__PURE__ */ jsx("div", {
 			className: "univer-relative univer-mt-2.5 univer-flex univer-h-full",
 			children: /* @__PURE__ */ jsx("div", {
-				className: "univer-w-full univer-text-gray-900 dark:!univer-text-white",
+				className: "univer-w-full univer-text-gray-900 dark:!univer-text-gray-0",
 				children: /* @__PURE__ */ jsx(Select, {
 					value: alignValue,
 					options: alignOptions,