@univerjs/slides-ui 1.0.0-alpha.6 → 1.0.0-alpha.8

package/lib/cjs/index.js

@@ -12,7 +12,7 @@ let _univerjs_docs_ui = require("@univerjs/docs-ui");
 let rxjs = require("rxjs");
 let _univerjs_docs = require("@univerjs/docs");
 
-//#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) {
@@ -23,7 +23,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];
@@ -36,14 +36,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,
@@ -54,7 +54,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#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);
@@ -62,7 +62,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);
@@ -200,7 +200,7 @@ let SlideRenderController = class SlideRenderController extends _univerjs_core.R
 		};
 	}
 	_thumbSceneRender(pageId, slide) {
-		const render = this._renderManagerService.getRenderById(pageId);
+		const render = this._renderManagerService.getRenderUnitById(pageId);
 		if (render == null) return;
 		const { engine: thumbEngine } = render;
 		if (thumbEngine == null) return;
@@ -375,7 +375,7 @@ let CanvasView = class CanvasView extends _univerjs_core.RxDisposable {
 		this._renderManagerService = _renderManagerService;
 	}
 	_getSlideRenderControllerFromRenderUnit(unitId) {
-		return this._renderManagerService.getRenderById(unitId).with(SlideRenderController);
+		return this._renderManagerService.getRenderUnitById(unitId).with(SlideRenderController);
 	}
 	createThumbs(unitId) {
 		this._getSlideRenderControllerFromRenderUnit(unitId).createThumbs();
@@ -1150,10 +1150,22 @@ function SlideAddTextMenuItemFactory(_accessor) {
 const menuSchema = { [_univerjs_ui.RibbonStartGroup.FORMAT]: {
 	[SlideAddTextCommand.id]: {
 		order: 0,
+		gridLayout: {
+			row: 1,
+			column: 1,
+			rowSpan: 2,
+			showLabel: true
+		},
 		menuItemFactory: SlideAddTextMenuItemFactory
 	},
 	[SLIDES_IMAGE_MENU_ID]: {
 		order: 0,
+		gridLayout: {
+			row: 1,
+			column: 2,
+			rowSpan: 2,
+			showLabel: true
+		},
 		menuItemFactory: SlideImageMenuFactory,
 		[InsertSlideFloatImageCommand.id]: {
 			order: 0,
@@ -1162,6 +1174,12 @@ const menuSchema = { [_univerjs_ui.RibbonStartGroup.FORMAT]: {
 	},
 	[SHAPE_MENU_ID]: {
 		order: 0,
+		gridLayout: {
+			row: 1,
+			column: 3,
+			rowSpan: 2,
+			showLabel: true
+		},
 		menuItemFactory: SlideShapeMenuFactory,
 		[InsertSlideShapeRectangleCommand.id]: {
 			order: 0,
@@ -1303,7 +1321,7 @@ function SlideSideBar() {
 			if (ref.current) {
 				var _renderManagerService;
 				const slide = slideList[index];
-				(_renderManagerService = renderManagerService.getRenderById(slide.id)) === null || _renderManagerService === void 0 || _renderManagerService.engine.setContainer(ref.current);
+				(_renderManagerService = renderManagerService.getRenderUnitById(slide.id)) === null || _renderManagerService === void 0 || _renderManagerService.engine.mount(ref.current);
 			}
 		});
 		if (divRefs.length > 0) commandService.syncExecuteCommand(SetSlidePageThumbOperation.id, { unitId: currentSlide === null || currentSlide === void 0 ? void 0 : currentSlide.getUnitId() });
@@ -1483,7 +1501,7 @@ SlidesUIController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/slides-ui";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/config/config.ts
@@ -1628,7 +1646,6 @@ let SlideEditorBridgeService = class SlideEditorBridgeService extends _univerjs_
 		_defineProperty(this, "visible$", this._visible$.asObservable());
 		_defineProperty(this, "_afterVisible$", new rxjs.BehaviorSubject(this._visibleParam));
 		_defineProperty(this, "afterVisible$", this._afterVisible$.asObservable());
-		_defineProperty(this, "endEditing$", new rxjs.Subject());
 		_defineProperty(this, "_currentEditRectInfo", void 0);
 	}
 	dispose() {
@@ -1707,7 +1724,7 @@ let SlideEditorBridgeService = class SlideEditorBridgeService extends _univerjs_
 			left: 0,
 			top: 0
 		};
-		const renderUnit = this._renderManagerService.getRenderById(unitId);
+		const renderUnit = this._renderManagerService.getRenderUnitById(unitId);
 		const mainScene = renderUnit === null || renderUnit === void 0 ? void 0 : renderUnit.scene;
 		const mainViewport = mainScene === null || mainScene === void 0 ? void 0 : mainScene.getViewport(_univerjs_slides.SLIDE_KEY.VIEW);
 		const slideMainRect = mainScene === null || mainScene === void 0 ? void 0 : mainScene.getObject(_univerjs_slides.SLIDE_KEY.COMPONENT);
@@ -1746,52 +1763,6 @@ let SlideEditorBridgeService = class SlideEditorBridgeService extends _univerjs_
 	getCurrentEditorId() {
 		return this._editorUnitId;
 	}
-	/**
-	* @deprecated
-	*/
-	genDocData(target) {
-		const editorUnitId = this.getCurrentEditorId();
-		const content = target.text;
-		const fontSize = target.fs;
-		return {
-			id: editorUnitId,
-			body: {
-				dataStream: `${content}\r\n`,
-				textRuns: [{
-					st: 0,
-					ed: content.length
-				}],
-				paragraphs: [{
-					paragraphStyle: {},
-					startIndex: content.length + 1
-				}],
-				sectionBreaks: [{
-					sectionId: (0, _univerjs_core.createSectionId)(/* @__PURE__ */ new Set()),
-					startIndex: content.length + 2
-				}]
-			},
-			documentStyle: {
-				marginBottom: 0,
-				marginLeft: 0,
-				marginRight: 0,
-				marginTop: 0,
-				pageSize: {
-					width: Infinity,
-					height: Infinity
-				},
-				textStyle: { fs: fontSize },
-				renderConfig: {
-					verticalAlign: _univerjs_core.VerticalAlign.MIDDLE,
-					centerAngle: 0,
-					vertexAngle: 0,
-					wrapStrategy: 0
-				}
-			},
-			drawings: {},
-			drawingsOrder: [],
-			settings: { zoomRatio: 1 }
-		};
-	}
 };
 SlideEditorBridgeService = __decorate([
 	__decorateParam(0, _univerjs_docs_ui.IEditorService),
@@ -1878,11 +1849,11 @@ let SlideEditingRenderController = class SlideEditingRenderController extends _u
 	}
 	_getEditorSkeleton(editorId) {
 		var _this$_renderManagerS;
-		return (_this$_renderManagerS = this._renderManagerService.getRenderById(editorId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
+		return (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
 	}
 	_getEditorViewModel(editorId) {
 		var _this$_renderManagerS2;
-		return (_this$_renderManagerS2 = this._renderManagerService.getRenderById(editorId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(_univerjs_docs.DocSkeletonManagerService).getViewModel();
+		return (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(_univerjs_docs.DocSkeletonManagerService).getViewModel();
 	}
 	_initialCursorSync(d) {
 		d.add(this._cellEditorManagerService.focus$.pipe((0, rxjs.filter)((f) => !!f)).subscribe(() => {
@@ -1903,9 +1874,14 @@ let SlideEditingRenderController = class SlideEditingRenderController extends _u
 			const { vertexAngle: angle } = (0, _univerjs_engine_render.convertTextRotation)(textRotation);
 			documentModel.updateDocumentId(editorUnitId);
 			if (wrapStrategy === _univerjs_core.WrapStrategy.WRAP && angle === 0) documentModel.updateDocumentDataPageSize((endX - startX) / scaleX);
-			this._instanceSrv.changeDoc(editorUnitId, documentModel);
-			this._contextService.setContextValue(_univerjs_core.FOCUSING_EDITOR_BUT_HIDDEN, true);
-			this._textSelectionManagerService.replaceTextRanges([{
+			const snapshot = documentModel.getSnapshot();
+			if (this._instanceSrv.getUnit(editorUnitId, _univerjs_core.UniverInstanceType.UNIVER_DOC) == null) this._instanceSrv.createUnit(_univerjs_core.UniverInstanceType.UNIVER_DOC, snapshot);
+			else this._commandService.syncExecuteCommand(_univerjs_docs_ui.ReplaceSnapshotCommand.id, {
+				unitId: editorUnitId,
+				snapshot
+			});
+			this._instanceSrv.setCurrentUnitForType(editorUnitId);
+			this._textSelectionManagerService.replaceDocRanges([{
 				startOffset: 0,
 				endOffset: 0
 			}]);
@@ -2092,11 +2068,11 @@ let SlideEditingRenderController = class SlideEditingRenderController extends _u
 		this._fitTextSize(position, canvasOffset, skeleton, documentLayoutObject, scaleX, scaleY);
 		const cursor = documentDataModel.getBody().dataStream.length - 2 || 0;
 		(_scene$getViewport = scene.getViewport(_univerjs_docs_ui.VIEWPORT_KEY.VIEW_MAIN)) === null || _scene$getViewport === void 0 || _scene$getViewport.scrollToViewportPos({ viewportScrollX: Number.POSITIVE_INFINITY });
-		this._textSelectionManagerService.replaceTextRanges([{
+		this._textSelectionManagerService.replaceDocRanges([{
 			startOffset: cursor,
 			endOffset: cursor
 		}]);
-		(_this$_renderManagerS3 = this._renderManagerService.getRenderById(unitId)) === null || _this$_renderManagerS3 === void 0 || _this$_renderManagerS3.scene.resetCursor();
+		(_this$_renderManagerS3 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS3 === void 0 || _this$_renderManagerS3.scene.resetCursor();
 	}
 	_resetBodyStyle(body, removeStyle = false) {
 		body.dataStream = _univerjs_core.DEFAULT_EMPTY_DOCUMENT_VALUE;
@@ -2238,7 +2214,7 @@ SlideEditingRenderController = __decorate([
 ], SlideEditingRenderController);
 function getEditorObject(unitId, renderManagerService) {
 	if (unitId == null) return;
-	const currentRender = renderManagerService.getRenderById(unitId);
+	const currentRender = renderManagerService.getRenderUnitById(unitId);
 	if (currentRender == null) return;
 	const { mainComponent, scene, engine, components } = currentRender;
 	return {
@@ -2344,7 +2320,6 @@ let SlideEditorBridgeRenderController = class SlideEditorBridgeRenderController
 		if (!this._instanceSrv.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SLIDE)) return false;
 		curRichText.refreshDocumentByDocData();
 		curRichText.resizeToContentSize();
-		this._editorBridgeService.endEditing$.next(curRichText);
 		const richText = {
 			bl: 1,
 			fs: curRichText.fs,
@@ -2464,7 +2439,7 @@ let SlideCanvasPopMangerService = class SlideCanvasPopMangerService extends _uni
 	}
 	attachPopupToObject(targetObject, popup) {
 		const unitId = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SLIDE).getUnitId();
-		const currentRender = this._renderManagerService.getRenderById(unitId);
+		const currentRender = this._renderManagerService.getRenderUnitById(unitId);
 		if (!currentRender) return { dispose: () => {} };
 		const { position, position$, disposable } = this._createObjectPositionObserver(targetObject, currentRender);
 		const id = this._globalPopupManagerService.addPopup({
@@ -2706,6 +2681,7 @@ _defineProperty(UniverSlidesUIPlugin, "packageName", name);
 _defineProperty(UniverSlidesUIPlugin, "version", version);
 _defineProperty(UniverSlidesUIPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SLIDE);
 UniverSlidesUIPlugin = __decorate([
+	(0, _univerjs_core.DependentOn)(_univerjs_docs.UniverDocsPlugin, _univerjs_drawing.UniverDrawingPlugin, _univerjs_engine_render.UniverRenderEnginePlugin, _univerjs_slides.UniverSlidesPlugin, _univerjs_ui.UniverUIPlugin, _univerjs_docs_ui.UniverDocsUIPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, _univerjs_engine_render.IRenderManagerService),
 	__decorateParam(3, _univerjs_core.IUniverInstanceService),

package/lib/cjs/locale/ru-RU.js

@@ -1,44 +1,44 @@
 
 //#region src/locale/ru-RU.ts
 const locale = { "slides-ui": {
-	append: "Append Slide",
-	text: { insert: { title: "Insert Text" } },
+	append: "Добавить слайд",
+	text: { insert: { title: "Вставить текст" } },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "Вставить фигуру",
+		rectangle: "Вставить прямоугольник",
+		ellipse: "Вставить эллипс"
 	} },
 	image: { insert: {
-		title: "Insert Image",
-		float: "Insert Float Image"
+		title: "Вставить изображение",
+		float: "Вставить плавающее изображение"
 	} },
 	popup: {
-		edit: "Edit",
-		delete: "Delete"
+		edit: "Изменить",
+		delete: "Удалить"
 	},
 	sidebar: {
-		text: "Edit Text",
-		shape: "Edit Shape",
-		image: "Edit Image"
+		text: "Изменить текст",
+		shape: "Изменить фигуру",
+		image: "Изменить изображение"
 	},
 	"image-panel": {
 		arrange: {
-			title: "Arrange",
-			forward: "Bring Forward",
-			backward: "Send Backward",
-			front: "Bring to Front",
-			back: "Send to Back"
+			title: "Упорядочить",
+			forward: "Переложить вперёд",
+			backward: "Переложить назад",
+			front: "На передний план",
+			back: "На задний план"
 		},
 		transform: {
-			title: "Transform",
-			width: "Width (px)",
-			height: "Height (px)",
-			x: "X (px)",
-			y: "Y (px)",
-			rotate: "Rotate (°)"
+			title: "Преобразование",
+			width: "Ширина (пкс)",
+			height: "Высота (пкс)",
+			x: "X (пкс)",
+			y: "Y (пкс)",
+			rotate: "Повернуть (°)"
 		}
 	},
-	panel: { fill: { title: "Fill Color" } }
+	panel: { fill: { title: "Цвет заливки" } }
 } };
 
 //#endregion

package/lib/cjs/locale/vi-VN.js

@@ -1,44 +1,44 @@
 
 //#region src/locale/vi-VN.ts
 const locale = { "slides-ui": {
-	append: "Append Slide",
-	text: { insert: { title: "Insert Text" } },
+	append: "Thêm trang chiếu",
+	text: { insert: { title: "Chèn văn bản" } },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "Chèn hình",
+		rectangle: "Chèn hình chữ nhật",
+		ellipse: "Chèn hình elip"
 	} },
 	image: { insert: {
-		title: "Insert Image",
-		float: "Insert Float Image"
+		title: "Chèn hình ảnh",
+		float: "Chèn hình ảnh nổi"
 	} },
 	popup: {
-		edit: "Edit",
-		delete: "Delete"
+		edit: "Chỉnh sửa",
+		delete: "Xóa"
 	},
 	sidebar: {
-		text: "Edit Text",
-		shape: "Edit Shape",
-		image: "Edit Image"
+		text: "Chỉnh sửa văn bản",
+		shape: "Chỉnh sửa hình",
+		image: "Chỉnh sửa hình ảnh"
 	},
 	"image-panel": {
 		arrange: {
-			title: "Arrange",
-			forward: "Bring Forward",
-			backward: "Send Backward",
-			front: "Bring to Front",
-			back: "Send to Back"
+			title: "Sắp xếp",
+			forward: "Chuyển lên trên",
+			backward: "Chuyển xuống dưới",
+			front: "Đưa lên trên cùng",
+			back: "Đưa xuống dưới cùng"
 		},
 		transform: {
-			title: "Transform",
-			width: "Width (px)",
-			height: "Height (px)",
+			title: "Biến đổi",
+			width: "Chiều rộng (px)",
+			height: "Chiều cao (px)",
 			x: "X (px)",
 			y: "Y (px)",
-			rotate: "Rotate (°)"
+			rotate: "Xoay (°)"
 		}
 	},
-	panel: { fill: { title: "Fill Color" } }
+	panel: { fill: { title: "Màu tô" } }
 } };
 
 //#endregion

package/lib/cjs/locale/zh-HK.js

@@ -1,44 +1,44 @@
 
 //#region src/locale/zh-HK.ts
 const locale = { "slides-ui": {
-	append: "Append Slide",
-	text: { insert: { title: "Insert Text" } },
+	append: "新增幻灯片",
+	text: { insert: { title: "插入文字" } },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "插入圖形",
+		rectangle: "插入矩形",
+		ellipse: "插入橢圓"
 	} },
 	image: { insert: {
-		title: "Insert Image",
-		float: "Insert Float Image"
+		title: "插入圖片",
+		float: "插入浮動圖片"
 	} },
 	popup: {
-		edit: "Edit",
-		delete: "Delete"
+		edit: "編輯",
+		delete: "刪除"
 	},
 	sidebar: {
-		text: "Edit Text",
-		shape: "Edit Shape",
-		image: "Edit Image"
+		text: "編輯文字",
+		shape: "編輯圖形",
+		image: "編輯圖片"
 	},
 	"image-panel": {
 		arrange: {
-			title: "Arrange",
-			forward: "Bring Forward",
-			backward: "Send Backward",
-			front: "Bring to Front",
-			back: "Send to Back"
+			title: "排列",
+			forward: "上移一層",
+			backward: "下移一層",
+			front: "至頂",
+			back: "至底"
 		},
 		transform: {
-			title: "Transform",
-			width: "Width (px)",
-			height: "Height (px)",
+			title: "變換",
+			width: "寬度 (px)",
+			height: "高度 (px)",
 			x: "X (px)",
 			y: "Y (px)",
-			rotate: "Rotate (°)"
+			rotate: "旋轉 (°)"
 		}
 	},
-	panel: { fill: { title: "Fill Color" } }
+	panel: { fill: { title: "填色" } }
 } };
 
 //#endregion

package/lib/cjs/locale/zh-TW.js

@@ -1,44 +1,44 @@
 
 //#region src/locale/zh-TW.ts
 const locale = { "slides-ui": {
-	append: "Append Slide",
-	text: { insert: { title: "Insert Text" } },
+	append: "新增幻灯片",
+	text: { insert: { title: "插入文字" } },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "插入圖形",
+		rectangle: "插入矩形",
+		ellipse: "插入橢圓"
 	} },
 	image: { insert: {
-		title: "Insert Image",
-		float: "Insert Float Image"
+		title: "插入圖片",
+		float: "插入浮動圖片"
 	} },
 	popup: {
-		edit: "Edit",
-		delete: "Delete"
+		edit: "編輯",
+		delete: "刪除"
 	},
 	sidebar: {
-		text: "Edit Text",
-		shape: "Edit Shape",
-		image: "Edit Image"
+		text: "編輯文字",
+		shape: "編輯圖形",
+		image: "編輯圖片"
 	},
 	"image-panel": {
 		arrange: {
-			title: "Arrange",
-			forward: "Bring Forward",
-			backward: "Send Backward",
-			front: "Bring to Front",
-			back: "Send to Back"
+			title: "排列",
+			forward: "上移一層",
+			backward: "下移一層",
+			front: "至頂",
+			back: "至底"
 		},
 		transform: {
-			title: "Transform",
-			width: "Width (px)",
-			height: "Height (px)",
+			title: "變換",
+			width: "寬度 (px)",
+			height: "高度 (px)",
 			x: "X (px)",
 			y: "Y (px)",
-			rotate: "Rotate (°)"
+			rotate: "旋轉 (°)"
 		}
 	},
-	panel: { fill: { title: "Fill Color" } }
+	panel: { fill: { title: "填色" } }
 } };
 
 //#endregion