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

package/lib/es/facade.js

@@ -1,17 +1,18 @@
 import { ArrangeTypeEnum, BooleanNumber, DrawingTypeEnum, ICommandService, IImageIoService, IURLImageService, ImageSourceType, ObjectRelativeFromH, ObjectRelativeFromV, WrapTextType, generateRandomId } from "@univerjs/core";
 import { buildDocTransform, docDrawingPositionToTransform } from "@univerjs/docs";
-import { InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, WRAPPING_STYLE_TO_LAYOUT_TYPE } from "@univerjs/docs-drawing";
+import { InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, WRAPPING_STYLE_TO_LAYOUT_TYPE, collectDocDrawings, findDocDrawing } from "@univerjs/docs-drawing";
 import { FDocument } from "@univerjs/docs/facade";
 import { DRAWING_IMAGE_HEIGHT_LIMIT, DRAWING_IMAGE_WIDTH_LIMIT, getImageSize } from "@univerjs/drawing";
-import { FEnum } from "@univerjs/core/facade";
+import { FBase, FEnum } from "@univerjs/core/facade";
 
 //#region src/facade/f-document-image.ts
 /**
 * Facade API for an image in a document.
 * @hideconstructor
 */
-var FDocumentImage = class {
+var FDocumentImage = class extends FBase {
 	constructor(_document, _imageId, _injector) {
+		super();
 		this._document = _document;
 		this._imageId = _imageId;
 		this._injector = _injector;
@@ -164,8 +165,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 = findDocDrawing(this._document.getDocumentDataModel().getSnapshot(), this._imageId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing;
 		if (!drawing || drawing.drawingType !== DrawingTypeEnum.DRAWING_IMAGE) return null;
 		return drawing;
 	}
@@ -404,7 +405,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: "",
@@ -417,6 +418,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) {
@@ -479,15 +484,14 @@ var FDocumentImageMixin = class extends 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 = findDocDrawing(this.getDocumentDataModel().getSnapshot(), imageId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing;
 		if (!drawing || drawing.drawingType !== 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 } = 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) === DrawingTypeEnum.DRAWING_IMAGE;
 		}).map((drawingId) => this._injector.createInstance(FDocumentImage, this, drawingId, this._injector));

package/lib/es/index.js

@@ -1,5 +1,5 @@
-import { ArrangeTypeEnum, BooleanNumber, BuildTextUtils, CommandType, DependentOn, Disposable, ICommandService, IConfigService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, JSONX, MemoryCursor, Plugin, PositionedObjectLayoutType, TextX, TextXActionType, Tools, UniverInstanceType, createIdentifier, getRichTextEditPath, merge, toDisposable, touchDependencies } from "@univerjs/core";
-import { DocSelectionManagerService, RichTextEditingMutation, UniverDocsPlugin, getContentInsertRange, normalizeTextRange } from "@univerjs/docs";
+import { ArrangeTypeEnum, BooleanNumber, BuildTextUtils, CommandType, DependentOn, Disposable, DrawingTypeEnum, ICommandService, IConfigService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, JSONX, MemoryCursor, Plugin, PositionedObjectLayoutType, TextX, TextXActionType, Tools, UniverInstanceType, createIdentifier, getRichTextEditPath, merge, normalizeDrawingOrderIndex, toDisposable, touchDependencies } from "@univerjs/core";
+import { DocHistoryAction, DocSelectionManagerService, RichTextEditingMutation, UniverDocsPlugin, getContentInsertRange, normalizeTextRange } from "@univerjs/docs";
 import { IDrawingManagerService, UnitDrawingService, UniverDrawingPlugin } from "@univerjs/drawing";
 
 //#region src/commands/commands/insert-doc-drawing.command.ts
@@ -10,7 +10,7 @@ const InsertDocDrawingCommand = {
 	id: "doc.command.insert-doc-image",
 	type: 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(ICommandService);
 		const univerInstanceService = accessor.get(IUniverInstanceService);
@@ -22,11 +22,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 !== 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: BooleanNumber.TRUE,
 			transforms: drawing.transforms ?? (drawing.transform ? [drawing.transform] : null)
 		})) : drawings;
+		if (isFootnote) targetDrawings = drawings.map((drawing) => ({
+			...drawing,
+			layoutType: PositionedObjectLayoutType.INLINE
+		}));
 		const actions = BuildTextUtils.drawing.add({
 			selection: resolvedTextRange,
 			documentDataModel,
@@ -37,6 +43,7 @@ const InsertDocDrawingCommand = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId,
 				actions: [],
 				textRanges: []
 			}
@@ -139,13 +146,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: CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _documentDataModel$ge;
+		var _snapshot$notes, _documentDataModel$ge;
 		if (!params) return false;
 		const commandService = accessor.get(ICommandService);
 		const undoRedoService = accessor.get(IUndoRedoService);
@@ -157,13 +211,22 @@ const RemoveDocDrawingCommand = {
 		if (!documentDataModel || removeDrawings.length === 0) return false;
 		const activeTextRange = docSelectionManagerService.getActiveTextRange();
 		const contentInsertRange = (!textRange ? null : normalizeTextRange(textRange)) ?? 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 TextX();
 		const jsonX = 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 = [];
@@ -203,12 +266,15 @@ const RemoveDocDrawingCommand = {
 			startOffset: cursorIndex,
 			endOffset: cursorIndex
 		}];
+		const historyActions = getHistoryActions(removeDrawings);
 		const doMutation = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId,
 				actions: [],
-				textRanges
+				textRanges,
+				historyActions
 			}
 		};
 		const rawActions = [];
@@ -225,11 +291,21 @@ const RemoveDocDrawingCommand = {
 			memoryCursor.moveCursorTo(startIndex + 1);
 		}
 		rawActions.push(jsonX.editOp(textX.serialize(), 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) => JSONX.compose(acc, cur), null);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
@@ -242,6 +318,17 @@ const RemoveDocDrawingCommand = {
 		return Boolean(result);
 	}
 };
+function getHistoryActions(drawings) {
+	const historyActions = drawings.flatMap((drawing) => {
+		switch (drawing.drawingType) {
+			case DrawingTypeEnum.DRAWING_IMAGE: return [DocHistoryAction.DeleteImage];
+			case DrawingTypeEnum.DRAWING_SHAPE: return [DocHistoryAction.DeleteShape];
+			case DrawingTypeEnum.DRAWING_CHART: return [DocHistoryAction.DeleteChart];
+			default: return [];
+		}
+	});
+	return [...new Set(historyActions)];
+}
 function executeResourceMutationGroups(mutationGroups, commandService) {
 	const executedUndoGroups = [];
 	for (const mutationGroup of mutationGroups) {
@@ -283,6 +370,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 = 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.
@@ -311,11 +408,11 @@ const SetDocDrawingArrangeCommand = {
 	handler: (accessor, params) => {
 		const commandService = accessor.get(ICommandService);
 		if (params == null) return false;
-		const { unitId, drawingIds, arrangeType } = params;
+		const { unitId, drawingIds } = params;
 		const documentDataModel = accessor.get(IUniverInstanceService).getUnit(unitId, 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 (JSONX.isNoop(actions)) return false;
 		const result = commandService.syncExecuteCommand(RichTextEditingMutation.id, {
 			unitId,
@@ -338,16 +435,22 @@ const UpdateDrawingDocTransformCommand = {
 		const { unitId, drawings } = params;
 		const documentDataModel = univerInstanceService.getUnit(unitId, 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) === DrawingTypeEnum.DRAWING_IMAGE;
+		}) ? DocHistoryAction.UpdateImage : void 0;
 		const jsonX = 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 (!Tools.diffValue(oldValue, value)) {
-				const path = [
-					"drawings",
-					drawingId,
+				const path = key === "srcRect" ? [...source.path, key] : [
+					...source.path,
 					"docTransform",
 					key
 				];
@@ -356,6 +459,7 @@ const UpdateDrawingDocTransformCommand = {
 		}
 		return Boolean(commandService.syncExecuteCommand(RichTextEditingMutation.id, {
 			unitId,
+			historyAction,
 			actions: actions.reduce((acc, action) => JSONX.compose(acc, action), null),
 			textRanges: null,
 			debounce: true
@@ -424,33 +528,33 @@ const UpdateDocDrawingWrappingStyleCommand = {
 		const commandService = accessor.get(ICommandService);
 		const documentDataModel = accessor.get(IUniverInstanceService).getUnit(unitId, 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) === DrawingTypeEnum.DRAWING_IMAGE;
+		}) ? DocHistoryAction.UpdateImage : void 0;
 		const jsonX = 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" ? BooleanNumber.TRUE : 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 && !Tools.diffValue(oldValue, value)) rawActions.push(jsonX.replaceOp([
-					"drawings",
-					drawing.drawingId,
+					...source.path,
 					"docTransform",
 					key
 				], oldValue, value));
@@ -460,6 +564,7 @@ const UpdateDocDrawingWrappingStyleCommand = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				historyAction,
 				actions: rawActions.reduce((actions, action) => JSONX.compose(actions, action), null),
 				textRanges: null
 			}
@@ -540,7 +645,7 @@ let DocDrawingController = class DocDrawingController extends Disposable {
 			};
 			try {
 				return JSON.parse(json);
-			} catch (err) {
+			} catch {
 				return {
 					data: {},
 					order: []
@@ -553,10 +658,7 @@ let DocDrawingController = class DocDrawingController extends Disposable {
 			toJson: (unitId) => toJson(unitId),
 			parseJson: (json) => parseJson(json),
 			onUnLoad: (unitId) => {
-				this._setDrawingDataForUnit(unitId, {
-					data: {},
-					order: []
-				});
+				this._unloadDrawingDataForUnit(unitId);
 			},
 			onLoad: (unitId, value) => {
 				this._setDrawingDataForUnit(unitId, {
@@ -566,6 +668,12 @@ let DocDrawingController = class DocDrawingController extends Disposable {
 			}
 		}));
 	}
+	_unloadDrawingDataForUnit(unitId) {
+		const documentDataModel = this._univerInstanceService.getUnit(unitId, 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;
@@ -576,17 +684,28 @@ let DocDrawingController = class DocDrawingController extends Disposable {
 		const dataModel = this._univerInstanceService.getUnit(unitId, 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);
@@ -614,7 +733,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
@@ -670,4 +789,4 @@ UniverDocsDrawingPlugin = __decorate([
 ], UniverDocsDrawingPlugin);
 
 //#endregion
-export { DOCS_DRAWING_PLUGIN, DocDrawingAdapterService, DocDrawingController, DocDrawingService, IDocDrawingAdapterService, IDocDrawingService, InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UniverDocsDrawingPlugin, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, WRAPPING_STYLE_TO_LAYOUT_TYPE, getDocDrawingRenderOrder };
+export { DOCS_DRAWING_PLUGIN, DocDrawingAdapterService, DocDrawingController, DocDrawingService, IDocDrawingAdapterService, IDocDrawingService, InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UniverDocsDrawingPlugin, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, WRAPPING_STYLE_TO_LAYOUT_TYPE, collectDocDrawings, findDocDrawing, getDocDrawingRenderOrder };

package/lib/facade.js

@@ -1,17 +1,18 @@
 import { ArrangeTypeEnum, BooleanNumber, DrawingTypeEnum, ICommandService, IImageIoService, IURLImageService, ImageSourceType, ObjectRelativeFromH, ObjectRelativeFromV, WrapTextType, generateRandomId } from "@univerjs/core";
 import { buildDocTransform, docDrawingPositionToTransform } from "@univerjs/docs";
-import { InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, WRAPPING_STYLE_TO_LAYOUT_TYPE } from "@univerjs/docs-drawing";
+import { InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, WRAPPING_STYLE_TO_LAYOUT_TYPE, collectDocDrawings, findDocDrawing } from "@univerjs/docs-drawing";
 import { FDocument } from "@univerjs/docs/facade";
 import { DRAWING_IMAGE_HEIGHT_LIMIT, DRAWING_IMAGE_WIDTH_LIMIT, getImageSize } from "@univerjs/drawing";
-import { FEnum } from "@univerjs/core/facade";
+import { FBase, FEnum } from "@univerjs/core/facade";
 
 //#region src/facade/f-document-image.ts
 /**
 * Facade API for an image in a document.
 * @hideconstructor
 */
-var FDocumentImage = class {
+var FDocumentImage = class extends FBase {
 	constructor(_document, _imageId, _injector) {
+		super();
 		this._document = _document;
 		this._imageId = _imageId;
 		this._injector = _injector;
@@ -164,8 +165,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 = findDocDrawing(this._document.getDocumentDataModel().getSnapshot(), this._imageId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing;
 		if (!drawing || drawing.drawingType !== DrawingTypeEnum.DRAWING_IMAGE) return null;
 		return drawing;
 	}
@@ -404,7 +405,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: "",
@@ -417,6 +418,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) {
@@ -479,15 +484,14 @@ var FDocumentImageMixin = class extends 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 = findDocDrawing(this.getDocumentDataModel().getSnapshot(), imageId)) === null || _findDocDrawing === void 0 ? void 0 : _findDocDrawing.drawing;
 		if (!drawing || drawing.drawingType !== 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 } = 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) === DrawingTypeEnum.DRAWING_IMAGE;
 		}).map((drawingId) => this._injector.createInstance(FDocumentImage, this, drawingId, this._injector));