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

package/lib/index.js

@@ -1,7 +1,7 @@
 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 { ComponentManager, ContextMenuGroup, ContextMenuPosition, IDialogService, IGalleryService, IMenuManagerService, IMessageService, IconManager, 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 { Button, Checkbox, Dropdown, DropdownMenu, Input, InputNumber, MessageType, Select, Separator, Tooltip, borderClassName, clsx } from "@univerjs/design";
@@ -271,19 +271,17 @@ function isKnownDrawingUINonRotatableType(drawingType) {
 	return drawingType === DrawingTypeEnum.DRAWING_CHART;
 }
 function resolveDrawingUIRotateEnabled(drawing, options = {}) {
-	var _options$isKnownNonRo;
 	return resolveDrawingRotateEnabled(drawing, {
 		...options,
-		isKnownNonRotatableType: (_options$isKnownNonRo = options.isKnownNonRotatableType) !== null && _options$isKnownNonRo !== void 0 ? _options$isKnownNonRo : isKnownDrawingUINonRotatableType
+		isKnownNonRotatableType: options.isKnownNonRotatableType ?? isKnownDrawingUINonRotatableType
 	});
 }
 
 //#endregion
 //#region src/controllers/utils.ts
 function getDrawingRenderObject(scene, drawingSearch) {
-	var _scene$getObjectInclu;
 	const key = getDrawingShapeKeyByDrawingSearch(drawingSearch);
-	return (_scene$getObjectInclu = scene.getObjectIncludeInGroup(key)) !== null && _scene$getObjectInclu !== void 0 ? _scene$getObjectInclu : null;
+	return scene.getObjectIncludeInGroup(key) ?? null;
 }
 function disposeDrawingRenderObject(scene, drawingSearch) {
 	const object = getDrawingRenderObject(scene, drawingSearch);
@@ -626,7 +624,7 @@ const menuSchema = { [ContextMenuPosition.DRAWING]: { [ContextMenuGroup.OTHERS]:
 //#endregion
 //#region package.json
 var name = "@univerjs/drawing-ui";
-var version = "1.0.0-alpha.8";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -726,7 +724,7 @@ function ToolbarGroup(props) {
 }
 function ToolbarButton(props) {
 	return /* @__PURE__ */ jsx(Tooltip, {
-		title: useDependency(LocaleService).t(props.titleKey),
+		title: props.title,
 		placement: "bottom",
 		children: /* @__PURE__ */ jsx("button", {
 			type: "button",
@@ -738,9 +736,8 @@ function ToolbarButton(props) {
 	});
 }
 function ToolbarDropdownButton(props) {
-	var _props$options$find;
 	const [open, setOpen] = useState(false);
-	const activeOption = (_props$options$find = props.options.find((option) => option.value === props.value)) !== null && _props$options$find !== void 0 ? _props$options$find : props.options[0];
+	const activeOption = props.options.find((option) => option.value === props.value) ?? props.options[0];
 	return /* @__PURE__ */ jsx(Dropdown, {
 		open,
 		onOpenChange: setOpen,
@@ -774,11 +771,11 @@ function ToolbarDropdownButton(props) {
 	});
 }
 function DocImageFloatingToolbar(props) {
-	var _univerInstanceServic, _wrappingStyleOptions, _wrappingStyleOptions2;
+	var _wrappingStyleOptions;
 	const commandService = useDependency(ICommandService);
 	const iconManager = useDependency(IconManager);
 	const localeService = useDependency(LocaleService);
-	const documentDataModel = (_univerInstanceServic = useDependency(IUniverInstanceService).getUnit(props.unitId, UniverInstanceType.UNIVER_DOC)) !== null && _univerInstanceServic !== void 0 ? _univerInstanceServic : void 0;
+	const documentDataModel = useDependency(IUniverInstanceService).getUnit(props.unitId, UniverInstanceType.UNIVER_DOC) ?? void 0;
 	const [wrappingStyle, setWrappingStyle] = useState(() => getWrappingStyle(documentDataModel, props.drawingId));
 	const [hidden, setHidden] = useState(false);
 	const actionItems = props.menuItems.filter((item) => item.type !== "select" && item.icon).sort((a, b) => a.index - b.index);
@@ -836,14 +833,14 @@ function DocImageFloatingToolbar(props) {
 		},
 		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),
 		children: [/* @__PURE__ */ jsx(ToolbarGroup, { children: /* @__PURE__ */ jsx(ToolbarDropdownButton, {
-			title: (_wrappingStyleOptions = (_wrappingStyleOptions2 = wrappingStyleOptions.find((option) => option.value === wrappingStyle)) === null || _wrappingStyleOptions2 === void 0 ? void 0 : _wrappingStyleOptions2.label) !== null && _wrappingStyleOptions !== void 0 ? _wrappingStyleOptions : localeService.t("drawing-ui.image-text-wrap.inline"),
+			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,
 			options: wrappingStyleOptions,
 			onChange: updateWrappingStyle
 		}) }), actionItems.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Separator, { orientation: "vertical" }), /* @__PURE__ */ jsx(ToolbarGroup, { children: actionItems.map((item) => {
 			const Icon = iconManager.get(item.icon);
 			return /* @__PURE__ */ jsx(ToolbarButton, {
-				titleKey: item.label,
+				title: localeService.t(item.label),
 				disabled: item.disable,
 				onClick: () => executeMenuItem(item),
 				children: /* @__PURE__ */ jsx(Icon, {})
@@ -852,14 +849,14 @@ function DocImageFloatingToolbar(props) {
 	});
 }
 function DocChartFloatingToolbar(props) {
-	var _chartTypeItem$option, _ref, _chartTypeItem$value, _chartTypeOptions$;
+	var _chartTypeOptions$;
 	const commandService = useDependency(ICommandService);
 	const iconManager = useDependency(IconManager);
 	const localeService = useDependency(LocaleService);
 	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$option = chartTypeItem === null || chartTypeItem === void 0 ? void 0 : chartTypeItem.options) !== null && _chartTypeItem$option !== void 0 ? _chartTypeItem$option : []).map((option) => ({
+	const chartTypeOptions = ((chartTypeItem === null || chartTypeItem === void 0 ? void 0 : chartTypeItem.options) ?? []).map((option) => ({
 		label: String(option.label),
 		value: option.value,
 		icon: /* @__PURE__ */ jsx(ChartIcon, {})
@@ -879,7 +876,7 @@ function DocChartFloatingToolbar(props) {
 		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),
 		children: [chartTypeItem && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(ToolbarGroup, { children: /* @__PURE__ */ jsx(ToolbarDropdownButton, {
 			title: localeService.t(chartTypeItem.label),
-			value: (_ref = (_chartTypeItem$value = chartTypeItem.value) !== null && _chartTypeItem$value !== void 0 ? _chartTypeItem$value : (_chartTypeOptions$ = chartTypeOptions[0]) === null || _chartTypeOptions$ === void 0 ? void 0 : _chartTypeOptions$.value) !== null && _ref !== void 0 ? _ref : "",
+			value: chartTypeItem.value ?? ((_chartTypeOptions$ = chartTypeOptions[0]) === null || _chartTypeOptions$ === void 0 ? void 0 : _chartTypeOptions$.value) ?? "",
 			options: chartTypeOptions,
 			onChange: (value) => {
 				if (!chartTypeItem.disable) {
@@ -890,7 +887,7 @@ function DocChartFloatingToolbar(props) {
 		}) }), actionItems.length > 0 && /* @__PURE__ */ jsx(Separator, { orientation: "vertical" })] }), actionItems.length > 0 && /* @__PURE__ */ jsx(ToolbarGroup, { children: actionItems.map((item) => {
 			const Icon = iconManager.get(item.icon);
 			return /* @__PURE__ */ jsx(ToolbarButton, {
-				titleKey: item.label,
+				title: localeService.t(item.label),
 				disabled: item.disable,
 				onClick: () => executeMenuItem(item),
 				children: /* @__PURE__ */ jsx(Icon, {})
@@ -2535,7 +2532,7 @@ _defineProperty(UniverDrawingUIPlugin, "pluginName", "UNIVER_DRAWING_UI_PLUGIN")
 _defineProperty(UniverDrawingUIPlugin, "packageName", name);
 _defineProperty(UniverDrawingUIPlugin, "version", version);
 UniverDrawingUIPlugin = __decorate([
-	DependentOn(UniverDrawingPlugin, UniverRenderEnginePlugin, UniverUIPlugin),
+	DependentOn(UniverDrawingPlugin, UniverRenderEnginePlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, IConfigService)
 ], UniverDrawingUIPlugin);
@@ -2604,21 +2601,17 @@ function normalizeText(value) {
 	return value.trim();
 }
 function hasCapability(panelCapabilities, item, key, fallback = true) {
-	var _ref, _item$capabilities$ke, _item$capabilities;
-	return (_ref = (_item$capabilities$ke = item === null || item === void 0 || (_item$capabilities = item.capabilities) === null || _item$capabilities === void 0 ? void 0 : _item$capabilities[key]) !== null && _item$capabilities$ke !== void 0 ? _item$capabilities$ke : panelCapabilities === null || panelCapabilities === void 0 ? void 0 : panelCapabilities[key]) !== null && _ref !== void 0 ? _ref : fallback;
+	var _item$capabilities;
+	return (item === null || item === void 0 || (_item$capabilities = item.capabilities) === null || _item$capabilities === void 0 ? void 0 : _item$capabilities[key]) ?? (panelCapabilities === null || panelCapabilities === void 0 ? void 0 : panelCapabilities[key]) ?? fallback;
 }
 function ObjectListPanelBase(props) {
-	var _selectedItem$canMove, _selectedItem$canMove2, _capabilities$reorder;
 	const { items, selectedIds, allObjectIds, focusedId, labels, showHeader = true, capabilities, onSelect, onSetVisible, onCommitName, onCommitDescription, onMoveForward, onMoveBackward, onToggleExpanded, onToggleSelectable, onLocate, onReorder } = props;
 	const selectedIdSet = useMemo(() => new Set(selectedIds), [selectedIds]);
 	const [draggingId, setDraggingId] = useState(null);
 	const [searchQuery, setSearchQuery] = useState("");
 	const [filterMode, setFilterMode] = useState("all");
 	const [collapsedSectionIds, setCollapsedSectionIds] = useState(() => /* @__PURE__ */ new Set());
-	const selectedItem = useMemo(() => {
-		var _ref2, _items$find;
-		return (_ref2 = (_items$find = items.find((item) => item.id === focusedId)) !== null && _items$find !== void 0 ? _items$find : items.find((item) => selectedIdSet.has(item.id))) !== null && _ref2 !== void 0 ? _ref2 : null;
-	}, [
+	const selectedItem = useMemo(() => items.find((item) => item.id === focusedId) ?? items.find((item) => selectedIdSet.has(item.id)) ?? null, [
 		focusedId,
 		items,
 		selectedIdSet
@@ -2626,11 +2619,10 @@ function ObjectListPanelBase(props) {
 	const visibleItems = useMemo(() => {
 		const normalizedQuery = normalizeText(searchQuery).toLocaleLowerCase();
 		return items.filter((item) => {
-			var _item$description;
 			if (filterMode === "hidden" && item.visible !== false) return false;
 			if (filterMode === "locked" && item.selectable !== false) return false;
 			if (!normalizedQuery) return true;
-			return item.name.toLocaleLowerCase().includes(normalizedQuery) || ((_item$description = item.description) !== null && _item$description !== void 0 ? _item$description : "").toLocaleLowerCase().includes(normalizedQuery);
+			return item.name.toLocaleLowerCase().includes(normalizedQuery) || (item.description ?? "").toLocaleLowerCase().includes(normalizedQuery);
 		});
 	}, [
 		filterMode,
@@ -2640,8 +2632,7 @@ function ObjectListPanelBase(props) {
 	const visibleItemSections = useMemo(() => {
 		const sectionMap = /* @__PURE__ */ new Map();
 		visibleItems.forEach((item) => {
-			var _item$sectionId, _item$sectionTitle;
-			const sectionId = (_item$sectionId = item.sectionId) !== null && _item$sectionId !== void 0 ? _item$sectionId : "";
+			const sectionId = item.sectionId ?? "";
 			const existingSection = sectionMap.get(sectionId);
 			if (existingSection) {
 				existingSection.items.push(item);
@@ -2649,35 +2640,30 @@ function ObjectListPanelBase(props) {
 			}
 			sectionMap.set(sectionId, {
 				id: sectionId,
-				title: (_item$sectionTitle = item.sectionTitle) !== null && _item$sectionTitle !== void 0 ? _item$sectionTitle : "",
+				title: item.sectionTitle ?? "",
 				items: [item]
 			});
 		});
-		return [...sectionMap.values()].sort((a, b) => {
-			var _sectionOrder$get, _sectionOrder$get2;
-			return ((_sectionOrder$get = sectionOrder.get(a.id)) !== null && _sectionOrder$get !== void 0 ? _sectionOrder$get : 3) - ((_sectionOrder$get2 = sectionOrder.get(b.id)) !== null && _sectionOrder$get2 !== void 0 ? _sectionOrder$get2 : 3);
-		});
+		return [...sectionMap.values()].sort((a, b) => (sectionOrder.get(a.id) ?? 3) - (sectionOrder.get(b.id) ?? 3));
 	}, [visibleItems]);
 	const showSectionHeaders = visibleItemSections.length > 1 || visibleItemSections.some((section) => section.id === "floating");
-	const allIds = useMemo(() => allObjectIds !== null && allObjectIds !== void 0 ? allObjectIds : items.map((item) => item.id), [allObjectIds, items]);
+	const allIds = useMemo(() => allObjectIds ?? items.map((item) => item.id), [allObjectIds, items]);
 	const selectedIndex = selectedItem ? items.findIndex((item) => item.id === selectedItem.id) : -1;
-	const canMoveForward = !!selectedItem && !!onMoveForward && !selectedItem.disabled && ((_selectedItem$canMove = selectedItem.canMoveForward) !== null && _selectedItem$canMove !== void 0 ? _selectedItem$canMove : selectedIndex > 0) && hasCapability(capabilities, selectedItem, "arrange");
-	const canMoveBackward = !!selectedItem && !!onMoveBackward && !selectedItem.disabled && ((_selectedItem$canMove2 = selectedItem.canMoveBackward) !== null && _selectedItem$canMove2 !== void 0 ? _selectedItem$canMove2 : selectedIndex >= 0 && selectedIndex < items.length - 1) && hasCapability(capabilities, selectedItem, "arrange");
+	const canMoveForward = !!selectedItem && !!onMoveForward && !selectedItem.disabled && (selectedItem.canMoveForward ?? selectedIndex > 0) && hasCapability(capabilities, selectedItem, "arrange");
+	const canMoveBackward = !!selectedItem && !!onMoveBackward && !selectedItem.disabled && (selectedItem.canMoveBackward ?? (selectedIndex >= 0 && selectedIndex < items.length - 1)) && hasCapability(capabilities, selectedItem, "arrange");
 	const showArrangeControls = hasCapability(capabilities, selectedItem, "arrange") && (!!onMoveForward || !!onMoveBackward);
 	const showLocateControl = !!onLocate && hasCapability(capabilities, selectedItem, "locate");
-	const canReorder = !!onReorder && ((_capabilities$reorder = capabilities === null || capabilities === void 0 ? void 0 : capabilities.reorder) !== null && _capabilities$reorder !== void 0 ? _capabilities$reorder : true);
+	const canReorder = !!onReorder && ((capabilities === null || capabilities === void 0 ? void 0 : capabilities.reorder) ?? true);
 	const findItem = (objectId) => {
-		var _items$find2;
-		return objectId ? (_items$find2 = items.find((item) => item.id === objectId)) !== null && _items$find2 !== void 0 ? _items$find2 : null : null;
+		return objectId ? items.find((item) => item.id === objectId) ?? null : null;
 	};
 	const handleDrop = (targetId) => {
-		var _source$parentId, _target$parentId, _source$sectionId, _target$sectionId;
 		const source = findItem(draggingId);
 		const target = findItem(targetId);
 		setDraggingId(null);
 		if (!source || !target || source.id === target.id || source.disabled || target.disabled) return;
-		if (((_source$parentId = source.parentId) !== null && _source$parentId !== void 0 ? _source$parentId : "") !== ((_target$parentId = target.parentId) !== null && _target$parentId !== void 0 ? _target$parentId : "")) return;
-		if (((_source$sectionId = source.sectionId) !== null && _source$sectionId !== void 0 ? _source$sectionId : "") !== ((_target$sectionId = target.sectionId) !== null && _target$sectionId !== void 0 ? _target$sectionId : "")) return;
+		if ((source.parentId ?? "") !== (target.parentId ?? "")) return;
+		if ((source.sectionId ?? "") !== (target.sectionId ?? "")) return;
 		if (source.canReorder === false || target.canReorder === false) return;
 		onReorder === null || onReorder === void 0 || onReorder(source.id, target.id);
 	};
@@ -2835,12 +2821,11 @@ function ObjectListPanelBase(props) {
 	});
 }
 function ObjectListRow(props) {
-	var _item$level;
 	const { item, selected, labels, showLock, showName, showVisible, draggable, dragging, onSelect, onToggleExpanded, onToggleVisible, onToggleSelectable, onCommitName, onDragStart, onDragEnd, onDrop } = props;
 	const [draftName, setDraftName] = useState(item.name);
 	const skipCommitOnBlurRef = useRef(false);
 	const disabled = item.disabled === true;
-	const level = (_item$level = item.level) !== null && _item$level !== void 0 ? _item$level : 0;
+	const level = item.level ?? 0;
 	const locked = item.selectable === false;
 	useEffect(() => {
 		setDraftName(item.name);
@@ -2951,15 +2936,13 @@ function ObjectListRow(props) {
 	});
 }
 function ObjectDetailsEditor(props) {
-	var _item$name, _item$description2;
 	const { item, labels, showName, showDescription, onCommitName, onCommitDescription } = props;
-	const [draftName, setDraftName] = useState((_item$name = item === null || item === void 0 ? void 0 : item.name) !== null && _item$name !== void 0 ? _item$name : "");
-	const [draftDescription, setDraftDescription] = useState((_item$description2 = item === null || item === void 0 ? void 0 : item.description) !== null && _item$description2 !== void 0 ? _item$description2 : "");
+	const [draftName, setDraftName] = useState((item === null || item === void 0 ? void 0 : item.name) ?? "");
+	const [draftDescription, setDraftDescription] = useState((item === null || item === void 0 ? void 0 : item.description) ?? "");
 	const disabled = (item === null || item === void 0 ? void 0 : item.disabled) === true;
 	useEffect(() => {
-		var _item$name2, _item$description3;
-		setDraftName((_item$name2 = item === null || item === void 0 ? void 0 : item.name) !== null && _item$name2 !== void 0 ? _item$name2 : "");
-		setDraftDescription((_item$description3 = item === null || item === void 0 ? void 0 : item.description) !== null && _item$description3 !== void 0 ? _item$description3 : "");
+		setDraftName((item === null || item === void 0 ? void 0 : item.name) ?? "");
+		setDraftDescription((item === null || item === void 0 ? void 0 : item.description) ?? "");
 	}, [
 		item === null || item === void 0 ? void 0 : item.description,
 		item === null || item === void 0 ? void 0 : item.id,
@@ -3007,8 +2990,7 @@ function ObjectDetailsEditor(props) {
 					"aria-label": labels.description,
 					onChange: (event) => setDraftDescription(event.currentTarget.value),
 					onBlur: () => {
-						var _item$description4;
-						if (!disabled && normalizeText(draftDescription) !== ((_item$description4 = item.description) !== null && _item$description4 !== void 0 ? _item$description4 : "")) onCommitDescription(draftDescription);
+						if (!disabled && normalizeText(draftDescription) !== (item.description ?? "")) onCommitDescription(draftDescription);
 					}
 				})]
 			})