@univerjs/docs-drawing 1.0.0-insiders.20260809-70eefdd → 1.0.0-rc.0

package/LICENSE

@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

package/README.md

@@ -10,7 +10,7 @@
 
 | Package | UMD global | CSS | Locales | Facade entry |
 | --- | --- | :---: | :---: | :---: |
-| `@univerjs/docs-drawing` | `UniverDocsDrawing` | No | No | No |
+| `@univerjs/docs-drawing` | `UniverDocsDrawing` | No | No | Yes |
 
 ## Installation
 
@@ -35,4 +35,3 @@ univer.registerPlugin(UniverDocsDrawingPlugin);
 - [Documentation](https://docs.univer.ai)
 - [NPM package](https://npmjs.com/package/@univerjs/docs-drawing)
 - [GitHub repository](https://github.com/dream-num/univer)
-

package/lib/cjs/facade.js

@@ -11,8 +11,9 @@ let _univerjs_core_facade = require("@univerjs/core/facade");
 * Facade API for an image in a document.
 * @hideconstructor
 */
-var FDocumentImage = class {
+var FDocumentImage = class extends _univerjs_core_facade.FBase {
 	constructor(_document, _imageId, _injector) {
+		super();
 		this._document = _document;
 		this._imageId = _imageId;
 		this._injector = _injector;
@@ -165,8 +166,8 @@ var FDocumentImage = class {
 	* ```
 	*/
 	getImageData() {
-		var _this$_document$getDo;
-		const drawing = (_this$_document$getDo = this._document.getDocumentDataModel().getDrawings()) === null || _this$_document$getDo === void 0 ? void 0 : _this$_document$getDo[this._imageId];
+		var _findDocDrawing;
+		const drawing = (_findDocDrawing = (0, _univerjs_docs_drawing.findDocDrawing)(this._document.getDocumentDataModel().getSnapshot(), this._imageId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing;
 		if (!drawing || drawing.drawingType !== _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE) return null;
 		return drawing;
 	}
@@ -405,7 +406,7 @@ var FDocumentImage = class {
 		});
 	}
 	_getTextRange() {
-		const { body, headers = {}, footers = {} } = this._document.getDocumentDataModel().getSnapshot();
+		const { body, headers = {}, footers = {}, notes = {} } = this._document.getDocumentDataModel().getSnapshot();
 		const segments = [
 			{
 				segmentId: "",
@@ -418,6 +419,10 @@ var FDocumentImage = class {
 			...Object.entries(footers).map(([segmentId, footer]) => ({
 				segmentId,
 				body: footer.body
+			})),
+			...Object.entries(notes).map(([segmentId, note]) => ({
+				segmentId,
+				body: note.body
 			}))
 		];
 		for (const { segmentId, body } of segments) {
@@ -480,15 +485,14 @@ var FDocumentImageMixin = class extends _univerjs_docs_facade.FDocument {
 		return this._injector.createInstance(FDocumentImage, this, imageId, this._injector);
 	}
 	getImage(imageId) {
-		var _this$getDocumentData;
-		const drawing = (_this$getDocumentData = this.getDocumentDataModel().getDrawings()) === null || _this$getDocumentData === void 0 ? void 0 : _this$getDocumentData[imageId];
+		var _findDocDrawing;
+		const drawing = (_findDocDrawing = (0, _univerjs_docs_drawing.findDocDrawing)(this.getDocumentDataModel().getSnapshot(), imageId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing;
 		if (!drawing || drawing.drawingType !== _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE) return null;
 		return this._injector.createInstance(FDocumentImage, this, imageId, this._injector);
 	}
 	getImages() {
-		const documentDataModel = this.getDocumentDataModel();
-		const drawings = documentDataModel.getDrawings() ?? {};
-		return (documentDataModel.getDrawingsOrder() ?? Object.keys(drawings)).filter((drawingId) => {
+		const { drawings, drawingsOrder: drawingIds } = (0, _univerjs_docs_drawing.collectDocDrawings)(this.getDocumentDataModel().getSnapshot());
+		return drawingIds.filter((drawingId) => {
 			var _drawings$drawingId;
 			return ((_drawings$drawingId = drawings[drawingId]) === null || _drawings$drawingId === void 0 ? void 0 : _drawings$drawingId.drawingType) === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE;
 		}).map((drawingId) => this._injector.createInstance(FDocumentImage, this, drawingId, this._injector));

package/lib/cjs/index.js

@@ -11,7 +11,7 @@ const InsertDocDrawingCommand = {
 	id: "doc.command.insert-doc-image",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _documentDataModel$ge, _snapshot$headers, _snapshot$footers;
+		var _documentDataModel$ge, _snapshot$notes, _snapshot$headers, _snapshot$footers;
 		if (!params) return false;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
@@ -23,11 +23,17 @@ const InsertDocDrawingCommand = {
 		const { segmentId = "" } = resolvedTextRange;
 		if (!((_documentDataModel$ge = documentDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.getBody())) return false;
 		const snapshot = documentDataModel.getSnapshot();
-		const targetDrawings = !!((_snapshot$headers = snapshot.headers) === null || _snapshot$headers === void 0 ? void 0 : _snapshot$headers[segmentId]) || !!((_snapshot$footers = snapshot.footers) === null || _snapshot$footers === void 0 ? void 0 : _snapshot$footers[segmentId]) ? drawings.map((drawing) => ({
+		const isFootnote = !!((_snapshot$notes = snapshot.notes) === null || _snapshot$notes === void 0 ? void 0 : _snapshot$notes[segmentId]);
+		if (isFootnote && drawings.some((drawing) => drawing.drawingType !== _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE)) return false;
+		let targetDrawings = !!((_snapshot$headers = snapshot.headers) === null || _snapshot$headers === void 0 ? void 0 : _snapshot$headers[segmentId]) || !!((_snapshot$footers = snapshot.footers) === null || _snapshot$footers === void 0 ? void 0 : _snapshot$footers[segmentId]) ? drawings.map((drawing) => ({
 			...drawing,
 			isMultiTransform: _univerjs_core.BooleanNumber.TRUE,
 			transforms: drawing.transforms ?? (drawing.transform ? [drawing.transform] : null)
 		})) : drawings;
+		if (isFootnote) targetDrawings = drawings.map((drawing) => ({
+			...drawing,
+			layoutType: _univerjs_core.PositionedObjectLayoutType.INLINE
+		}));
 		const actions = _univerjs_core.BuildTextUtils.drawing.add({
 			selection: resolvedTextRange,
 			documentDataModel,
@@ -38,6 +44,7 @@ const InsertDocDrawingCommand = {
 			id: _univerjs_docs.RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId,
 				actions: [],
 				textRanges: []
 			}
@@ -140,13 +147,60 @@ var DocDrawingAdapterService = class {
 	}
 };
 
+//#endregion
+//#region src/services/doc-drawing-source.ts
+/** Resolve persisted drawing ownership independently of the current text selection. */
+function findDocDrawing(snapshot, drawingId) {
+	var _snapshot$drawings;
+	const drawing = (_snapshot$drawings = snapshot.drawings) === null || _snapshot$drawings === void 0 ? void 0 : _snapshot$drawings[drawingId];
+	if (drawing) return {
+		drawing,
+		path: ["drawings", drawingId],
+		segmentId: ""
+	};
+	for (const [segmentId, note] of Object.entries(snapshot.notes ?? {})) {
+		var _note$drawings;
+		const drawing = (_note$drawings = note.drawings) === null || _note$drawings === void 0 ? void 0 : _note$drawings[drawingId];
+		if (drawing) return {
+			drawing,
+			path: [
+				"notes",
+				segmentId,
+				"drawings",
+				drawingId
+			],
+			segmentId
+		};
+	}
+}
+/** The render registry is flat; persisted note resources retain their own scope. */
+function collectDocDrawings(snapshot) {
+	let drawings = snapshot.drawings ?? {};
+	let drawingsOrder = snapshot.drawingsOrder ?? Object.keys(drawings);
+	let copied = false;
+	for (const note of Object.values(snapshot.notes ?? {})) {
+		if (!note.drawings || Object.keys(note.drawings).length === 0) continue;
+		if (!copied) {
+			drawings = { ...drawings };
+			drawingsOrder = [...drawingsOrder];
+			copied = true;
+		}
+		Object.assign(drawings, note.drawings);
+		drawingsOrder.push(...note.drawingsOrder ?? Object.keys(note.drawings));
+	}
+	return {
+		drawings,
+		drawingsOrder
+	};
+}
+
 //#endregion
 //#region src/commands/commands/remove-doc-drawing.command.ts
 const RemoveDocDrawingCommand = {
 	id: "doc.command.remove-doc-image",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _documentDataModel$ge;
+		var _snapshot$notes, _documentDataModel$ge;
 		if (!params) return false;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -158,13 +212,22 @@ const RemoveDocDrawingCommand = {
 		if (!documentDataModel || removeDrawings.length === 0) return false;
 		const activeTextRange = docSelectionManagerService.getActiveTextRange();
 		const contentInsertRange = (!textRange ? null : (0, _univerjs_docs.normalizeTextRange)(textRange)) ?? (0, _univerjs_docs.getContentInsertRange)(accessor, unitId);
-		const segmentId = (contentInsertRange === null || contentInsertRange === void 0 ? void 0 : contentInsertRange.segmentId) ?? (activeTextRange === null || activeTextRange === void 0 ? void 0 : activeTextRange.segmentId) ?? "";
+		const snapshot = documentDataModel.getSnapshot();
+		const noteSegments = removeDrawings.map(({ drawingId }) => {
+			var _findDocDrawing;
+			return ((_findDocDrawing = findDocDrawing(snapshot, drawingId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.segmentId) ?? "";
+		});
+		if (noteSegments.some((id) => id !== noteSegments[0])) return false;
+		const segmentId = noteSegments[0] || ((contentInsertRange === null || contentInsertRange === void 0 ? void 0 : contentInsertRange.segmentId) ?? (activeTextRange === null || activeTextRange === void 0 ? void 0 : activeTextRange.segmentId) ?? "");
+		const footnote = (_snapshot$notes = snapshot.notes) === null || _snapshot$notes === void 0 ? void 0 : _snapshot$notes[segmentId];
+		const source = footnote ?? snapshot;
+		const prefix = footnote ? ["notes", segmentId] : [];
 		const textX = new _univerjs_core.TextX();
 		const jsonX = _univerjs_core.JSONX.getInstance();
 		const customBlocks = ((_documentDataModel$ge = documentDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _documentDataModel$ge === void 0 || (_documentDataModel$ge = _documentDataModel$ge.getBody()) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.customBlocks) ?? [];
 		const removeCustomBlocks = removeDrawings.map((drawing) => customBlocks.find((customBlock) => customBlock.blockId === drawing.drawingId)).filter((block) => !!block).sort((a, b) => a.startIndex > b.startIndex ? 1 : -1);
 		if (removeCustomBlocks.length === 0) return false;
-		const drawings = documentDataModel.getDrawings() ?? {};
+		const drawings = source.drawings ?? {};
 		const removeDrawingParamById = new Map(removeDrawings.map((drawing) => [drawing.drawingId, drawing]));
 		const removeDrawingSnapshots = removeCustomBlocks.map((block) => drawings[block.blockId]).filter((drawing) => drawing != null);
 		const resourceRedoMutations = [];
@@ -204,12 +267,15 @@ const RemoveDocDrawingCommand = {
 			startOffset: cursorIndex,
 			endOffset: cursorIndex
 		}];
+		const historyActions = getHistoryActions(removeDrawings);
 		const doMutation = {
 			id: _univerjs_docs.RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId,
 				actions: [],
-				textRanges
+				textRanges,
+				historyActions
 			}
 		};
 		const rawActions = [];
@@ -226,11 +292,21 @@ const RemoveDocDrawingCommand = {
 			memoryCursor.moveCursorTo(startIndex + 1);
 		}
 		rawActions.push(jsonX.editOp(textX.serialize(), (0, _univerjs_core.getRichTextEditPath)(documentDataModel, segmentId)));
-		for (const block of removeCustomBlocks) {
+		const drawingOrder = source.drawingsOrder ?? [];
+		const resourceBlocks = [...removeCustomBlocks].sort((left, right) => drawingOrder.indexOf(right.blockId) - drawingOrder.indexOf(left.blockId));
+		for (const block of resourceBlocks) {
 			const { blockId } = block;
-			const drawingIndex = documentDataModel.getDrawingsOrder().indexOf(blockId);
-			rawActions.push(jsonX.removeOp(["drawings", blockId], drawings[blockId]));
-			rawActions.push(jsonX.removeOp(["drawingsOrder", drawingIndex], blockId));
+			const drawingIndex = drawingOrder.indexOf(blockId);
+			if (drawings[blockId]) rawActions.push(jsonX.removeOp([
+				...prefix,
+				"drawings",
+				blockId
+			], drawings[blockId]));
+			if (drawingIndex >= 0) rawActions.push(jsonX.removeOp([
+				...prefix,
+				"drawingsOrder",
+				drawingIndex
+			], blockId));
 		}
 		doMutation.params.actions = rawActions.reduce((acc, cur) => _univerjs_core.JSONX.compose(acc, cur), null);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
@@ -243,6 +319,17 @@ const RemoveDocDrawingCommand = {
 		return Boolean(result);
 	}
 };
+function getHistoryActions(drawings) {
+	const historyActions = drawings.flatMap((drawing) => {
+		switch (drawing.drawingType) {
+			case _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE: return [_univerjs_docs.DocHistoryAction.DeleteImage];
+			case _univerjs_core.DrawingTypeEnum.DRAWING_SHAPE: return [_univerjs_docs.DocHistoryAction.DeleteShape];
+			case _univerjs_core.DrawingTypeEnum.DRAWING_CHART: return [_univerjs_docs.DocHistoryAction.DeleteChart];
+			default: return [];
+		}
+	});
+	return [...new Set(historyActions)];
+}
 function executeResourceMutationGroups(mutationGroups, commandService) {
 	const executedUndoGroups = [];
 	for (const mutationGroup of mutationGroups) {
@@ -284,6 +371,16 @@ function getArrangedDrawingOrder(drawingOrder, drawingIds, arrangeType) {
 	}
 	return arrangedDrawingOrder;
 }
+function getDrawingOrderAtIndex(drawingOrder, drawingIds, zOrder) {
+	if (drawingIds.length !== 1) return [...drawingOrder];
+	const arrangedDrawingOrder = [...drawingOrder];
+	const currentIndex = arrangedDrawingOrder.indexOf(drawingIds[0]);
+	if (currentIndex < 0) return arrangedDrawingOrder;
+	const [drawingId] = arrangedDrawingOrder.splice(currentIndex, 1);
+	const targetIndex = (0, _univerjs_core.normalizeDrawingOrderIndex)(zOrder, drawingOrder.length);
+	arrangedDrawingOrder.splice(targetIndex, 0, drawingId);
+	return arrangedDrawingOrder;
+}
 /**
 * Converts the target order into granular JSONX move operations. This avoids replacing
 * the entire drawingsOrder array and keeps collaboration conflicts scoped to moved items.
@@ -312,11 +409,11 @@ const SetDocDrawingArrangeCommand = {
 	handler: (accessor, params) => {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		if (params == null) return false;
-		const { unitId, drawingIds, arrangeType } = params;
+		const { unitId, drawingIds } = params;
 		const documentDataModel = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 		const drawingOrder = documentDataModel === null || documentDataModel === void 0 ? void 0 : documentDataModel.getDrawingsOrder();
 		if (!drawingOrder) return false;
-		const actions = createDrawingOrderActions(drawingOrder, getArrangedDrawingOrder(drawingOrder, drawingIds, arrangeType));
+		const actions = createDrawingOrderActions(drawingOrder, params.zOrder !== void 0 ? getDrawingOrderAtIndex(drawingOrder, drawingIds, params.zOrder) : getArrangedDrawingOrder(drawingOrder, drawingIds, params.arrangeType));
 		if (_univerjs_core.JSONX.isNoop(actions)) return false;
 		const result = commandService.syncExecuteCommand(_univerjs_docs.RichTextEditingMutation.id, {
 			unitId,
@@ -339,16 +436,22 @@ const UpdateDrawingDocTransformCommand = {
 		const { unitId, drawings } = params;
 		const documentDataModel = univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 		if (!documentDataModel) return false;
-		const oldDrawings = documentDataModel.getSnapshot().drawings ?? {};
+		const snapshot = documentDataModel.getSnapshot();
+		const historyAction = drawings.length > 0 && drawings.every(({ drawingId }) => {
+			var _findDocDrawing;
+			return ((_findDocDrawing = findDocDrawing(snapshot, drawingId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing.drawingType) === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE;
+		}) ? _univerjs_docs.DocHistoryAction.UpdateImage : void 0;
 		const jsonX = _univerjs_core.JSONX.getInstance();
 		const actions = [];
 		for (const { drawingId, key, value } of drawings) {
-			var _oldDrawings$drawingI;
-			const oldValue = (_oldDrawings$drawingI = oldDrawings[drawingId]) === null || _oldDrawings$drawingI === void 0 || (_oldDrawings$drawingI = _oldDrawings$drawingI.docTransform) === null || _oldDrawings$drawingI === void 0 ? void 0 : _oldDrawings$drawingI[key];
+			var _oldDrawing$docTransf;
+			const source = findDocDrawing(snapshot, drawingId);
+			if (!source) return false;
+			const oldDrawing = source.drawing;
+			const oldValue = key === "srcRect" ? oldDrawing === null || oldDrawing === void 0 ? void 0 : oldDrawing.srcRect : oldDrawing === null || oldDrawing === void 0 || (_oldDrawing$docTransf = oldDrawing.docTransform) === null || _oldDrawing$docTransf === void 0 ? void 0 : _oldDrawing$docTransf[key];
 			if (!_univerjs_core.Tools.diffValue(oldValue, value)) {
-				const path = [
-					"drawings",
-					drawingId,
+				const path = key === "srcRect" ? [...source.path, key] : [
+					...source.path,
 					"docTransform",
 					key
 				];
@@ -357,6 +460,7 @@ const UpdateDrawingDocTransformCommand = {
 		}
 		return Boolean(commandService.syncExecuteCommand(_univerjs_docs.RichTextEditingMutation.id, {
 			unitId,
+			historyAction,
 			actions: actions.reduce((acc, action) => _univerjs_core.JSONX.compose(acc, action), null),
 			textRanges: null,
 			debounce: true
@@ -425,33 +529,33 @@ const UpdateDocDrawingWrappingStyleCommand = {
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const documentDataModel = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 		if (!documentDataModel) return false;
-		const oldDrawings = documentDataModel.getDrawings() ?? {};
+		const snapshot = documentDataModel.getSnapshot();
+		if (wrappingStyle !== "inline" && drawings.some(({ drawingId }) => {
+			var _findDocDrawing;
+			return (_findDocDrawing = findDocDrawing(snapshot, drawingId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.segmentId;
+		})) return false;
+		const historyAction = drawings.length > 0 && drawings.every(({ drawingId }) => {
+			var _findDocDrawing2;
+			return ((_findDocDrawing2 = findDocDrawing(snapshot, drawingId)) === null || _findDocDrawing2 === void 0 ? void 0 : _findDocDrawing2.drawing.drawingType) === _univerjs_core.DrawingTypeEnum.DRAWING_IMAGE;
+		}) ? _univerjs_docs.DocHistoryAction.UpdateImage : void 0;
 		const jsonX = _univerjs_core.JSONX.getInstance();
 		const rawActions = [];
 		for (const drawing of drawings) {
-			const oldDrawing = oldDrawings[drawing.drawingId];
-			if (!oldDrawing) continue;
+			const source = findDocDrawing(snapshot, drawing.drawingId);
+			const oldDrawing = source === null || source === void 0 ? void 0 : source.drawing;
+			if (!oldDrawing || !source) continue;
 			const layoutType = WRAPPING_STYLE_TO_LAYOUT_TYPE[wrappingStyle];
-			if (oldDrawing.layoutType !== layoutType) rawActions.push(jsonX.replaceOp([
-				"drawings",
-				drawing.drawingId,
-				"layoutType"
-			], oldDrawing.layoutType, layoutType));
+			if (oldDrawing.layoutType !== layoutType) rawActions.push(jsonX.replaceOp([...source.path, "layoutType"], oldDrawing.layoutType, layoutType));
 			if (wrappingStyle === "behindText" || wrappingStyle === "inFrontOfText") {
 				const behindDoc = wrappingStyle === "behindText" ? _univerjs_core.BooleanNumber.TRUE : _univerjs_core.BooleanNumber.FALSE;
-				if (oldDrawing.behindDoc !== behindDoc) rawActions.push(jsonX.replaceOp([
-					"drawings",
-					drawing.drawingId,
-					"behindDoc"
-				], oldDrawing.behindDoc, behindDoc));
+				if (oldDrawing.behindDoc !== behindDoc) rawActions.push(jsonX.replaceOp([...source.path, "behindDoc"], oldDrawing.behindDoc, behindDoc));
 			}
 			if (wrappingStyle !== "inline") for (const key of ["positionH", "positionV"]) {
 				var _drawing$docTransform;
 				const value = (_drawing$docTransform = drawing.docTransform) === null || _drawing$docTransform === void 0 ? void 0 : _drawing$docTransform[key];
 				const oldValue = oldDrawing.docTransform[key];
 				if (value && !_univerjs_core.Tools.diffValue(oldValue, value)) rawActions.push(jsonX.replaceOp([
-					"drawings",
-					drawing.drawingId,
+					...source.path,
 					"docTransform",
 					key
 				], oldValue, value));
@@ -461,6 +565,7 @@ const UpdateDocDrawingWrappingStyleCommand = {
 			id: _univerjs_docs.RichTextEditingMutation.id,
 			params: {
 				unitId,
+				historyAction,
 				actions: rawActions.reduce((actions, action) => _univerjs_core.JSONX.compose(actions, action), null),
 				textRanges: null
 			}
@@ -541,7 +646,7 @@ let DocDrawingController = class DocDrawingController extends _univerjs_core.Dis
 			};
 			try {
 				return JSON.parse(json);
-			} catch (err) {
+			} catch {
 				return {
 					data: {},
 					order: []
@@ -554,10 +659,7 @@ let DocDrawingController = class DocDrawingController extends _univerjs_core.Dis
 			toJson: (unitId) => toJson(unitId),
 			parseJson: (json) => parseJson(json),
 			onUnLoad: (unitId) => {
-				this._setDrawingDataForUnit(unitId, {
-					data: {},
-					order: []
-				});
+				this._unloadDrawingDataForUnit(unitId);
 			},
 			onLoad: (unitId, value) => {
 				this._setDrawingDataForUnit(unitId, {
@@ -567,6 +669,12 @@ let DocDrawingController = class DocDrawingController extends _univerjs_core.Dis
 			}
 		}));
 	}
+	_unloadDrawingDataForUnit(unitId) {
+		const documentDataModel = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
+		documentDataModel === null || documentDataModel === void 0 || documentDataModel.resetDrawing({}, []);
+		this._docDrawingService.removeDrawingDataForUnit(unitId);
+		this._drawingManagerService.removeDrawingDataForUnit(unitId);
+	}
 	_setDrawingDataForUnit(unitId, drawingMapItem) {
 		const documentDataModel = this._univerInstanceService.getUnit(unitId);
 		if (documentDataModel == null) return;
@@ -577,17 +685,28 @@ let DocDrawingController = class DocDrawingController extends _univerjs_core.Dis
 		const dataModel = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 		if (!dataModel) return false;
 		const subUnitId = unitId;
-		const drawingDataModels = dataModel.getDrawings();
-		const drawingOrderModel = dataModel.getDrawingsOrder();
+		const { drawings: drawingDataModels, drawingsOrder: drawingOrderModel } = collectDocDrawings(dataModel.getSnapshot());
 		if (!drawingDataModels || !drawingOrderModel) return false;
+		const normalizedDrawingData = {};
+		for (const [drawingId, drawing] of Object.entries(drawingDataModels)) normalizedDrawingData[drawingId] = drawing.unitId === unitId && drawing.subUnitId === subUnitId ? drawing : {
+			...drawing,
+			unitId,
+			subUnitId
+		};
 		const subDrawings = { [subUnitId]: {
 			unitId,
 			subUnitId,
-			data: drawingDataModels,
+			data: normalizedDrawingData,
 			order: drawingOrderModel
 		} };
+		const renderDrawingData = {};
+		for (const [drawingId, drawing] of Object.entries(normalizedDrawingData)) renderDrawingData[drawingId] = {
+			...drawing,
+			hidden: true
+		};
 		const renderSubDrawings = { [subUnitId]: {
 			...subDrawings[subUnitId],
+			data: renderDrawingData,
 			order: getDocDrawingRenderOrder(drawingOrderModel, drawingDataModels)
 		} };
 		this._docDrawingService.registerDrawingData(unitId, subDrawings);
@@ -615,7 +734,7 @@ DocDrawingController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/docs-drawing";
-var version = "1.0.0-insiders.20260809-70eefdd";
+var version = "1.0.0-rc.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -695,4 +814,6 @@ Object.defineProperty(exports, 'UniverDocsDrawingPlugin', {
 exports.UpdateDocDrawingWrappingStyleCommand = UpdateDocDrawingWrappingStyleCommand;
 exports.UpdateDrawingDocTransformCommand = UpdateDrawingDocTransformCommand;
 exports.WRAPPING_STYLE_TO_LAYOUT_TYPE = WRAPPING_STYLE_TO_LAYOUT_TYPE;
+exports.collectDocDrawings = collectDocDrawings;
+exports.findDocDrawing = findDocDrawing;
 exports.getDocDrawingRenderOrder = getDocDrawingRenderOrder;