@univerjs/drawing-ui 1.0.0-alpha.7 → 1.0.0-alpha.8

package/lib/index.js

@@ -1,7 +1,7 @@
-import { ArrangeTypeEnum, BooleanNumber, CommandType, Disposable, 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, getDrawingShapeKeyByDrawingSearch, isGroupableDrawingType, resolveDrawingRotateEnabled } from "@univerjs/drawing";
-import { CURSOR_TYPE, Canvas, DRAWING_OBJECT_LAYER_INDEX, DrawingGroupObject, Group, IRenderManagerService, Image, RENDER_CLASS_TYPE, Rect, Shape, 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 { 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 { 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, UniverUIPlugin, 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 { Button, Checkbox, Dropdown, DropdownMenu, Input, InputNumber, MessageType, Select, Separator, Tooltip, borderClassName, clsx } from "@univerjs/design";
@@ -626,7 +626,7 @@ const menuSchema = { [ContextMenuPosition.DRAWING]: { [ContextMenuGroup.OTHERS]:
 //#endregion
 //#region package.json
 var name = "@univerjs/drawing-ui";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/config/config.ts
@@ -900,7 +900,7 @@ function DocChartFloatingToolbar(props) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -908,7 +908,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -963,7 +963,7 @@ let ComponentsController = class ComponentsController extends Disposable {
 ComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, Inject(IconManager))], ComponentsController);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -974,7 +974,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -987,14 +987,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -1369,7 +1369,7 @@ let DrawingUpdateController = class DrawingUpdateController extends Disposable {
 	}
 	_getSceneAndTransformerByDrawingSearch(unitId) {
 		if (unitId == null) return;
-		const renderObject = this._renderManagerService.getRenderById(unitId);
+		const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 		const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 		if (scene == null) return null;
 		return {
@@ -1981,7 +1981,7 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 			const drawingParams = this._drawingManagerService.getFocusDrawings();
 			if (drawingParams.length !== 1) return;
 			const { unitId, subUnitId, drawingId } = drawingParams[0];
-			const renderObject = this._renderManagerService.getRenderById(unitId);
+			const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 			const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 			if (scene == null) return true;
 			if (this._searchCropObject(scene) != null) this._commandService.syncExecuteCommand(CloseImageCropOperation.id, { isAuto: true });
@@ -2073,7 +2073,7 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 			const params = command.params;
 			if (params == null) return;
 			const { unitId, subUnitId, drawingId } = params;
-			const renderObject = this._renderManagerService.getRenderById(unitId);
+			const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 			const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 			if (scene == null) return true;
 			if (!this._sceneListenerOnImageMap.has(scene)) {
@@ -2129,7 +2129,7 @@ let ImageCropperController = class ImageCropperController extends Disposable {
 			const currentUnit = this._univerInstanceService.getFocusedUnit();
 			if (currentUnit == null) return;
 			const unitId = currentUnit.getUnitId();
-			const renderObject = this._renderManagerService.getRenderById(unitId);
+			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);
@@ -2299,7 +2299,7 @@ let ImageUpdateController = class ImageUpdateController extends Disposable {
 	}
 	_getSceneAndTransformerByDrawingSearch(unitId) {
 		if (unitId == null) return;
-		const renderObject = this._renderManagerService.getRenderById(unitId);
+		const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 		const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 		if (scene == null) return null;
 		return {
@@ -2534,7 +2534,11 @@ let UniverDrawingUIPlugin = class UniverDrawingUIPlugin extends Plugin {
 _defineProperty(UniverDrawingUIPlugin, "pluginName", "UNIVER_DRAWING_UI_PLUGIN");
 _defineProperty(UniverDrawingUIPlugin, "packageName", name);
 _defineProperty(UniverDrawingUIPlugin, "version", version);
-UniverDrawingUIPlugin = __decorate([__decorateParam(1, Inject(Injector)), __decorateParam(2, IConfigService)], UniverDrawingUIPlugin);
+UniverDrawingUIPlugin = __decorate([
+	DependentOn(UniverDrawingPlugin, UniverRenderEnginePlugin, UniverUIPlugin),
+	__decorateParam(1, Inject(Injector)),
+	__decorateParam(2, IConfigService)
+], UniverDrawingUIPlugin);
 
 //#endregion
 //#region src/views/object-list-panel/object-list-panel-layer.ts
@@ -3155,7 +3159,7 @@ const DrawingGroup = (props) => {
 	const GroupIcon = iconManager.get("GroupIcon");
 	const UngroupIcon = iconManager.get("UngroupIcon");
 	const drawingParam = drawings[0];
-	const transformer = drawingParam ? (_renderManagerService = renderManagerService.getRenderById(drawingParam.unitId)) === null || _renderManagerService === void 0 || (_renderManagerService = _renderManagerService.scene) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.getTransformerByCreate() : void 0;
+	const transformer = drawingParam ? (_renderManagerService = renderManagerService.getRenderUnitById(drawingParam.unitId)) === null || _renderManagerService === void 0 || (_renderManagerService = _renderManagerService.scene) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.getTransformerByCreate() : void 0;
 	const { groupShow, groupBtnShow, ungroupBtnShow } = useObservable(transformer ? () => merge$1(transformer.clearControl$.pipe(filter((changeSelf) => changeSelf === true), map(() => ({
 		groupShow: false,
 		groupBtnShow: false,
@@ -3234,7 +3238,7 @@ const DrawingTransform = (props) => {
 	var _renderManagerService, _scene$getEngine;
 	const renderManagerService = useDependency(IRenderManagerService);
 	const drawingParam = props.drawings[0];
-	const scene = drawingParam ? (_renderManagerService = renderManagerService.getRenderById(drawingParam.unitId)) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.scene : void 0;
+	const scene = drawingParam ? (_renderManagerService = renderManagerService.getRenderUnitById(drawingParam.unitId)) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.scene : void 0;
 	const topScene = scene === null || scene === void 0 || (_scene$getEngine = scene.getEngine()) === null || _scene$getEngine === void 0 ? void 0 : _scene$getEngine.activeScene;
 	if (!(drawingParam === null || drawingParam === void 0 ? void 0 : drawingParam.transform) || !scene || !topScene) return null;
 	return /* @__PURE__ */ jsx(DrawingTransformContent, { ...props });
@@ -3247,7 +3251,7 @@ function DrawingTransformContent(props) {
 	const drawingParam = drawings[0];
 	const transform = drawingParam.transform;
 	const { unitId, subUnitId, drawingId, drawingType } = drawingParam;
-	const scene = renderManagerService.getRenderById(unitId).scene;
+	const scene = renderManagerService.getRenderUnitById(unitId).scene;
 	const topScene = scene.getEngine().activeScene;
 	const transformer = scene.getTransformerByCreate();
 	const { width: originWidth = 0, height: originHeight = 0, left: originX = 0, top: originY = 0, angle: originRotation = 0 } = transform;
@@ -3614,7 +3618,7 @@ const DrawingCommonPanel = (props) => {
 	const localeService = useDependency(LocaleService);
 	const { drawings, hasArrange = true, hasTransform = true, hasAlign = true, hasCropper = true, hasGroup = true } = props;
 	const drawingParam = drawings[0];
-	const renderObject = drawingParam ? renderManagerService.getRenderById(drawingParam.unitId) : void 0;
+	const renderObject = drawingParam ? renderManagerService.getRenderUnitById(drawingParam.unitId) : void 0;
 	const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 	const transformer = scene === null || scene === void 0 ? void 0 : scene.getTransformerByCreate();
 	const { arrangeShow, transformShow, alignShow, cropperShow, nullShow } = useObservable(() => merge$1(drawingManagerService.focus$.pipe(map(getPanelShowState)), ...transformer ? [transformer.clearControl$.pipe(filter((changeSelf) => changeSelf === true), map(() => getPanelShowState([]))), transformer.changeStart$.pipe(map((state) => getPanelShowState(getUpdateParams(state.objects, drawingManagerService))))] : []), getPanelShowState(drawings), false, [drawingManagerService, transformer]);

package/lib/locale/fr-FR.js

@@ -17,7 +17,7 @@ const locale = { "drawing-ui": {
 		nameInput: "Nom de l'objet",
 		description: "Description",
 		descriptionPlaceholder: "Ajouter une description",
-		details: "Details",
+		details: "Détails",
 		locate: "Localiser",
 		expand: "Développer",
 		collapse: "Réduire",

package/lib/locale/ru-RU.js

@@ -88,22 +88,22 @@ const locale = { "drawing-ui": {
 		null: "Нет выбранных объектов"
 	},
 	"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)"
+		title: "Обтекание текстом",
+		wrappingStyle: "Стиль обтекания",
+		square: "Вокруг рамки",
+		topAndBottom: "Сверху и снизу",
+		inline: "В тексте",
+		behindText: "За текстом",
+		inFrontText: "Перед текстом",
+		wrapText: "Обтекание",
+		bothSide: "С обеих сторон",
+		leftOnly: "Только слева",
+		rightOnly: "Только справа",
+		distanceFromText: "Расстояние от текста",
+		top: "Сверху (пкс)",
+		left: "Слева (пкс)",
+		bottom: "Снизу (пкс)",
+		right: "Справа (пкс)"
 	},
 	"image-popup": {
 		replace: "Заменить",

package/lib/locale/vi-VN.js

@@ -88,22 +88,22 @@ const locale = { "drawing-ui": {
 		null: "Không có đối tượng nào được chọn"
 	},
 	"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)"
+		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ế",