@univerjs/docs 1.0.0-beta.1 → 1.0.0-beta.2

package/lib/cjs/facade.js

@@ -33,31 +33,24 @@ function buildPlainTextInsertBody(dataStream, options = {}) {
 	if (paragraphs.length > 0) body.paragraphs = paragraphs;
 	return body;
 }
-function replaceBodyRange(range, insertBody, docDataModel, injector) {
+function replaceBodyRange(range, insertBody, docDataModel, commandService) {
 	const { startOffset, endOffset, segmentId } = range;
-	const textX = new _univerjs_core.TextX();
-	if (startOffset > 0) textX.push({
-		t: _univerjs_core.TextXActionType.RETAIN,
-		len: startOffset
-	});
-	if (endOffset > startOffset) textX.push({
-		t: _univerjs_core.TextXActionType.DELETE,
-		len: endOffset - startOffset
-	});
-	if (insertBody.dataStream.length > 0) textX.push({
-		t: _univerjs_core.TextXActionType.INSERT,
-		body: insertBody,
-		len: insertBody.dataStream.length
-	});
-	const actions = _univerjs_core.JSONX.getInstance().editOp(textX.serialize(), (0, _univerjs_core.getRichTextEditPath)(docDataModel, segmentId));
-	const result = injector.get(_univerjs_core.ICommandService).syncExecuteCommand(_univerjs_docs.RichTextEditingMutation.id, {
+	const result = commandService.syncExecuteCommand(_univerjs_docs.InsertTextCommand.id, {
 		unitId: docDataModel.getUnitId(),
+		body: insertBody,
+		range: {
+			startOffset,
+			endOffset,
+			collapsed: startOffset === endOffset,
+			segmentId
+		},
 		segmentId,
-		actions,
+		debounce: false,
 		textRanges: [],
+		noNeedSetTextRange: true,
 		isEditing: false
 	});
-	return Boolean((result === null || result === void 0 ? void 0 : result.actions) && result.actions.length > 0);
+	return Boolean(result);
 }
 function retainBodyRange(range, updateBody, coverType, docDataModel, injector) {
 	var _updateBody$textRuns, _docDataModel$getSelf;
@@ -98,23 +91,34 @@ function stripBlockTokens(text) {
 	return Array.from(text).map((char) => char === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH ? "\n" : char).filter((char) => char !== _univerjs_core.DataStreamTreeTokenType.BLOCK_START && char !== _univerjs_core.DataStreamTreeTokenType.BLOCK_END && char !== _univerjs_core.DataStreamTreeTokenType.SECTION_BREAK).join("").replace(/\n$/, "");
 }
 
+//#endregion
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+function __decorateParam(paramIndex, decorator) {
+	return function(target, key) {
+		decorator(target, key, paramIndex);
+	};
+}
+
+//#endregion
+//#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);
+	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+	return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
 //#endregion
 //#region src/facade/f-document-text-range.ts
-/**
-* Facade wrapper for reading and styling a fixed document text range.
-*
-* Offsets are fixed when the wrapper is created. Create a new range after edits
-* that insert or remove content before it.
-* @hideconstructor
-*/
-var FDocumentTextRange = class extends _univerjs_core_facade.FBaseInitialable {
-	constructor(_document, _startOffset, _endOffset, _segmentId, _injector) {
+let FDocumentTextRange = class FDocumentTextRange extends _univerjs_core_facade.FBaseInitialable {
+	constructor(_document, _startOffset, _endOffset, _segmentId, _injector, _commandService) {
 		super(_injector);
 		this._document = _document;
 		this._startOffset = _startOffset;
 		this._endOffset = _endOffset;
 		this._segmentId = _segmentId;
 		this._injector = _injector;
+		this._commandService = _commandService;
 		this._validateRange();
 	}
 	/**
@@ -233,7 +237,7 @@ var FDocumentTextRange = class extends _univerjs_core_facade.FBaseInitialable {
 	* ```
 	*/
 	setText(text) {
-		return replaceBodyRange(this.getRange(), buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._injector);
+		return replaceBodyRange(this.getRange(), buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._commandService);
 	}
 	_validateRange() {
 		const bodyLength = this._document.getBody(this._segmentId).dataStream.length;
@@ -260,27 +264,11 @@ var FDocumentTextRange = class extends _univerjs_core_facade.FBaseInitialable {
 		return segments;
 	}
 };
+FDocumentTextRange = __decorate([__decorateParam(5, _univerjs_core.ICommandService)], FDocumentTextRange);
 function isDeepEqual(left, right) {
 	return JSON.stringify(left) === JSON.stringify(right);
 }
 
-//#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
-function __decorateParam(paramIndex, decorator) {
-	return function(target, key) {
-		decorator(target, key, paramIndex);
-	};
-}
-
-//#endregion
-//#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);
-	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-	return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
 //#endregion
 //#region src/facade/f-document-paragraph.ts
 let FDocumentParagraph = class FDocumentParagraph extends _univerjs_core_facade.FBaseInitialable {
@@ -478,7 +466,7 @@ let FDocumentParagraph = class FDocumentParagraph extends _univerjs_core_facade.
 			startOffset,
 			endOffset,
 			segmentId: this._segmentId
-		}, buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._injector);
+		}, buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._commandService);
 	}
 	/**
 	* Append plain text before this paragraph's trailing paragraph break.
@@ -1510,7 +1498,7 @@ let FDocument = class FDocument extends _univerjs_core_facade.FBaseInitialable {
 			startOffset: index,
 			endOffset: index,
 			segmentId
-		}, buildPlainTextInsertBody(text), this._documentDataModel, this._injector);
+		}, buildPlainTextInsertBody(text), this._documentDataModel, this._commandService);
 	}
 	/**
 	* Returns document-level header/footer switches and margins. Margin values use 96-DPI layout pixels.
@@ -1731,7 +1719,7 @@ let FDocument = class FDocument extends _univerjs_core_facade.FBaseInitialable {
 		}, {
 			dataStream: _univerjs_core.DataStreamTreeTokenType.PARAGRAPH,
 			paragraphs
-		}, this._documentDataModel, this._injector) ? this.getParagraph(paragraphId, segmentId) : null;
+		}, this._documentDataModel, this._commandService) ? this.getParagraph(paragraphId, segmentId) : null;
 	}
 	/**
 	* Get all paragraphs in the document body or header/footer body by the segment id.
@@ -1844,7 +1832,7 @@ let FDocument = class FDocument extends _univerjs_core_facade.FBaseInitialable {
 			startOffset: offset,
 			endOffset: offset,
 			segmentId
-		}, buildPlainTextInsertBody(`${text}\r`), this._documentDataModel, this._injector)) throw new Error("Failed to insert paragraph.");
+		}, buildPlainTextInsertBody(`${text}\r`), this._documentDataModel, this._commandService)) throw new Error("Failed to insert paragraph.");
 		const { paragraphs = [] } = this.getBody(segmentId);
 		const paragraph = paragraphs[index];
 		if (!paragraph) throw new Error("Failed to insert paragraph.");
@@ -1886,7 +1874,7 @@ let FDocument = class FDocument extends _univerjs_core_facade.FBaseInitialable {
 	deleteRange(range) {
 		const normalizedRange = this._normalizeDeleteRange(range);
 		if (normalizedRange.startOffset >= normalizedRange.endOffset) return false;
-		return replaceBodyRange(normalizedRange, { dataStream: "" }, this._documentDataModel, this._injector);
+		return replaceBodyRange(normalizedRange, { dataStream: "" }, this._documentDataModel, this._commandService);
 	}
 	_createFDocumentParagraph(paragraphId, segmentId = "") {
 		return this._injector.createInstance(FDocumentParagraph, this, paragraphId, segmentId, this._injector);
@@ -2026,6 +2014,11 @@ Object.defineProperty(exports, 'FDocumentSection', {
     return FDocumentSection;
   }
 });
-exports.FDocumentTextRange = FDocumentTextRange;
+Object.defineProperty(exports, 'FDocumentTextRange', {
+  enumerable: true,
+  get: function () {
+    return FDocumentTextRange;
+  }
+});
 exports.isParagraphFacade = isParagraphFacade;
 exports.stripBlockTokens = stripBlockTokens;

package/lib/cjs/index.js

@@ -414,59 +414,63 @@ const InsertTextCommand = {
 	handler: (accessor, params) => {
 		var _docDataModel$getSelf;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
-		const { range, segmentId, body, unitId, cursorOffset } = params;
+		const { range, segmentId, body, unitId, cursorOffset, debounce = true, textRanges, noNeedSetTextRange, isEditing } = params;
 		const docSelectionManagerService = accessor.get(DocSelectionManagerService);
 		const docDataModel = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 		if (docDataModel == null) return false;
 		const activeRange = docSelectionManagerService.getActiveTextRange();
-		const rangeSegmentId = "segmentId" in range ? range.segmentId : void 0;
+		const rangeSegmentId = "segmentId" in range && typeof range.segmentId === "string" ? range.segmentId : void 0;
 		const targetSegmentId = segmentId ?? rangeSegmentId ?? (activeRange === null || activeRange === void 0 ? void 0 : activeRange.segmentId) ?? "";
 		const originBody = (_docDataModel$getSelf = docDataModel.getSelfOrHeaderFooterModel(targetSegmentId)) === null || _docDataModel$getSelf === void 0 ? void 0 : _docDataModel$getSelf.getBody();
 		if (originBody == null) return false;
 		const { startOffset, collapsed } = range;
 		const cursorMove = cursorOffset ?? body.dataStream.length;
-		const textRanges = [{
+		const mutationTextRanges = textRanges ?? [{
 			startOffset: startOffset + cursorMove,
 			endOffset: startOffset + cursorMove,
-			style: activeRange === null || activeRange === void 0 ? void 0 : activeRange.style,
 			collapsed
 		}];
 		const doMutation = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId: targetSegmentId,
 				actions: [],
-				textRanges,
-				debounce: true
+				textRanges: mutationTextRanges,
+				debounce,
+				noNeedSetTextRange,
+				isEditing
 			}
 		};
-		const textX = new _univerjs_core.TextX();
-		const jsonX = _univerjs_core.JSONX.getInstance();
-		if (collapsed) {
-			if (startOffset > 0) textX.push({
-				t: _univerjs_core.TextXActionType.RETAIN,
-				len: startOffset
-			});
-			textX.push({
-				t: _univerjs_core.TextXActionType.INSERT,
-				body,
-				len: body.dataStream.length
-			});
-		} else {
-			const dos = _univerjs_core.BuildTextUtils.selection.delete([range], originBody, 0, body);
-			textX.push(...dos);
-		}
-		doMutation.params.textRanges = [{
-			startOffset: startOffset + cursorMove,
-			endOffset: startOffset + cursorMove,
-			collapsed
-		}];
-		const path = (0, _univerjs_core.getRichTextEditPath)(docDataModel, segmentId);
-		doMutation.params.actions = jsonX.editOp(textX.serialize(), path);
+		doMutation.params.actions = buildInsertTextActions(docDataModel, originBody, range, body, targetSegmentId);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
 		return Boolean(result);
 	}
 };
+function buildInsertTextActions(documentDataModel, originBody, range, insertBody, segmentId) {
+	const { startOffset, endOffset, collapsed } = range;
+	const textX = new _univerjs_core.TextX();
+	if (collapsed) {
+		if (startOffset > 0) textX.push({
+			t: _univerjs_core.TextXActionType.RETAIN,
+			len: startOffset
+		});
+		textX.push({
+			t: _univerjs_core.TextXActionType.INSERT,
+			body: insertBody,
+			len: insertBody.dataStream.length
+		});
+	} else textX.push(..._univerjs_core.BuildTextUtils.selection.delete([range], originBody, 0, insertBody));
+	const textActions = _univerjs_core.JSONX.getInstance().editOp(textX.serialize(), (0, _univerjs_core.getRichTextEditPath)(documentDataModel, segmentId));
+	return collapsed ? textActions : appendRemovedDrawingActions(textActions, documentDataModel, originBody, startOffset, endOffset);
+}
+function appendRemovedDrawingActions(textActions, documentDataModel, body, startOffset, endOffset) {
+	return [textActions, ..._univerjs_core.BuildTextUtils.drawing.remove(documentDataModel.getSnapshot(), [{
+		startOffset,
+		endOffset,
+		collapsed: false
+	}], body)].reduce((accumulator, action) => _univerjs_core.JSONX.compose(accumulator, action));
+}
 /**
 * The command to delete text, mainly used in BACKSPACE and DELETE when collapsed is true. ONLY handle collapsed range!!!
 */
@@ -493,6 +497,7 @@ const DeleteTextCommand = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId,
 				actions: [],
 				textRanges: [{
 					startOffset: start,
@@ -511,7 +516,7 @@ const DeleteTextCommand = {
 			collapsed: false
 		}], body));
 		const path = (0, _univerjs_core.getRichTextEditPath)(docDataModel, segmentId);
-		doMutation.params.actions = jsonX.editOp(textX.serialize(), path);
+		doMutation.params.actions = appendRemovedDrawingActions(jsonX.editOp(textX.serialize(), path), docDataModel, body, start, end + 1);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
 		return Boolean(result);
 	}
@@ -1439,7 +1444,7 @@ function composeActions(actions) {
 //#endregion
 //#region package.json
 var name = "@univerjs/docs";
-var version = "1.0.0-beta.1";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/config/config.ts
@@ -1610,6 +1615,9 @@ let DocStateChangeManagerService = class DocStateChangeManagerService extends _u
 		this._historyStateCache.set(unitId, cache.history);
 		this._changeStateCache.set(unitId, cache.collaboration);
 	}
+	clearHistory(unitId) {
+		this._historyStateCache.delete(unitId);
+	}
 	_setChangeState(changeState) {
 		this._cacheChangeState(changeState, "history");
 		this._cacheChangeState(changeState, "collaboration");

package/lib/es/facade.js

@@ -1,6 +1,6 @@
 import { BooleanNumber, ColumnSeparatorType, DashStyleType, DataStreamTreeTokenType, DocumentFlavor, ICommandService, IResourceLoaderService, IUniverInstanceService, Inject, Injector, JSONX, PageOrientType, PresetListType, RESTORE_INSERTED_PARAGRAPH_IDS, RedoCommand, SectionType, TextX, TextXActionType, Tools, UndoCommand, UniverInstanceType, UpdateDocsAttributeType, createParagraphId, createSectionId, generateRandomId, getParagraphContentStartOffset, getRichTextEditPath, getSectionHeaderFooterReferenceKey, regexp, resolveSectionHeaderFooterReference } from "@univerjs/core";
 import { FBaseInitialable, FEnum, FUniver } from "@univerjs/core/facade";
-import { CreateHeaderFooterCommand, DeleteDocumentSectionBreakCommand, HeaderFooterType, InsertDocumentColumnBreakCommand, InsertDocumentSectionBreakCommand, RichTextEditingMutation, SetDocumentNameCommand, SetSectionHeaderFooterLinkCommand, UpdateDocumentParagraphStyleCommand, UpdateDocumentSectionCommand, createSectionColumnProperties, generateParagraphs, getEffectiveSectionPageSetup, getSectionContentWidth, getTopLevelSectionBreaks } from "@univerjs/docs";
+import { CreateHeaderFooterCommand, DeleteDocumentSectionBreakCommand, HeaderFooterType, InsertDocumentColumnBreakCommand, InsertDocumentSectionBreakCommand, InsertTextCommand, RichTextEditingMutation, SetDocumentNameCommand, SetSectionHeaderFooterLinkCommand, UpdateDocumentParagraphStyleCommand, UpdateDocumentSectionCommand, createSectionColumnProperties, generateParagraphs, getEffectiveSectionPageSetup, getSectionContentWidth, getTopLevelSectionBreaks } from "@univerjs/docs";
 
 //#region src/facade/utils.ts
 function cloneParagraphStyle(paragraphStyle) {
@@ -32,31 +32,24 @@ function buildPlainTextInsertBody(dataStream, options = {}) {
 	if (paragraphs.length > 0) body.paragraphs = paragraphs;
 	return body;
 }
-function replaceBodyRange(range, insertBody, docDataModel, injector) {
+function replaceBodyRange(range, insertBody, docDataModel, commandService) {
 	const { startOffset, endOffset, segmentId } = range;
-	const textX = new TextX();
-	if (startOffset > 0) textX.push({
-		t: TextXActionType.RETAIN,
-		len: startOffset
-	});
-	if (endOffset > startOffset) textX.push({
-		t: TextXActionType.DELETE,
-		len: endOffset - startOffset
-	});
-	if (insertBody.dataStream.length > 0) textX.push({
-		t: TextXActionType.INSERT,
-		body: insertBody,
-		len: insertBody.dataStream.length
-	});
-	const actions = JSONX.getInstance().editOp(textX.serialize(), getRichTextEditPath(docDataModel, segmentId));
-	const result = injector.get(ICommandService).syncExecuteCommand(RichTextEditingMutation.id, {
+	const result = commandService.syncExecuteCommand(InsertTextCommand.id, {
 		unitId: docDataModel.getUnitId(),
+		body: insertBody,
+		range: {
+			startOffset,
+			endOffset,
+			collapsed: startOffset === endOffset,
+			segmentId
+		},
 		segmentId,
-		actions,
+		debounce: false,
 		textRanges: [],
+		noNeedSetTextRange: true,
 		isEditing: false
 	});
-	return Boolean((result === null || result === void 0 ? void 0 : result.actions) && result.actions.length > 0);
+	return Boolean(result);
 }
 function retainBodyRange(range, updateBody, coverType, docDataModel, injector) {
 	var _updateBody$textRuns, _docDataModel$getSelf;
@@ -97,23 +90,34 @@ function stripBlockTokens(text) {
 	return Array.from(text).map((char) => char === DataStreamTreeTokenType.PARAGRAPH ? "\n" : char).filter((char) => char !== DataStreamTreeTokenType.BLOCK_START && char !== DataStreamTreeTokenType.BLOCK_END && char !== DataStreamTreeTokenType.SECTION_BREAK).join("").replace(/\n$/, "");
 }
 
+//#endregion
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+function __decorateParam(paramIndex, decorator) {
+	return function(target, key) {
+		decorator(target, key, paramIndex);
+	};
+}
+
+//#endregion
+//#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);
+	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+	return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
 //#endregion
 //#region src/facade/f-document-text-range.ts
-/**
-* Facade wrapper for reading and styling a fixed document text range.
-*
-* Offsets are fixed when the wrapper is created. Create a new range after edits
-* that insert or remove content before it.
-* @hideconstructor
-*/
-var FDocumentTextRange = class extends FBaseInitialable {
-	constructor(_document, _startOffset, _endOffset, _segmentId, _injector) {
+let FDocumentTextRange = class FDocumentTextRange extends FBaseInitialable {
+	constructor(_document, _startOffset, _endOffset, _segmentId, _injector, _commandService) {
 		super(_injector);
 		this._document = _document;
 		this._startOffset = _startOffset;
 		this._endOffset = _endOffset;
 		this._segmentId = _segmentId;
 		this._injector = _injector;
+		this._commandService = _commandService;
 		this._validateRange();
 	}
 	/**
@@ -232,7 +236,7 @@ var FDocumentTextRange = class extends FBaseInitialable {
 	* ```
 	*/
 	setText(text) {
-		return replaceBodyRange(this.getRange(), buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._injector);
+		return replaceBodyRange(this.getRange(), buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._commandService);
 	}
 	_validateRange() {
 		const bodyLength = this._document.getBody(this._segmentId).dataStream.length;
@@ -259,27 +263,11 @@ var FDocumentTextRange = class extends FBaseInitialable {
 		return segments;
 	}
 };
+FDocumentTextRange = __decorate([__decorateParam(5, ICommandService)], FDocumentTextRange);
 function isDeepEqual(left, right) {
 	return JSON.stringify(left) === JSON.stringify(right);
 }
 
-//#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
-function __decorateParam(paramIndex, decorator) {
-	return function(target, key) {
-		decorator(target, key, paramIndex);
-	};
-}
-
-//#endregion
-//#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);
-	else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-	return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
 //#endregion
 //#region src/facade/f-document-paragraph.ts
 let FDocumentParagraph = class FDocumentParagraph extends FBaseInitialable {
@@ -477,7 +465,7 @@ let FDocumentParagraph = class FDocumentParagraph extends FBaseInitialable {
 			startOffset,
 			endOffset,
 			segmentId: this._segmentId
-		}, buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._injector);
+		}, buildPlainTextInsertBody(text), this._document.getDocumentDataModel(), this._commandService);
 	}
 	/**
 	* Append plain text before this paragraph's trailing paragraph break.
@@ -1509,7 +1497,7 @@ let FDocument = class FDocument extends FBaseInitialable {
 			startOffset: index,
 			endOffset: index,
 			segmentId
-		}, buildPlainTextInsertBody(text), this._documentDataModel, this._injector);
+		}, buildPlainTextInsertBody(text), this._documentDataModel, this._commandService);
 	}
 	/**
 	* Returns document-level header/footer switches and margins. Margin values use 96-DPI layout pixels.
@@ -1730,7 +1718,7 @@ let FDocument = class FDocument extends FBaseInitialable {
 		}, {
 			dataStream: DataStreamTreeTokenType.PARAGRAPH,
 			paragraphs
-		}, this._documentDataModel, this._injector) ? this.getParagraph(paragraphId, segmentId) : null;
+		}, this._documentDataModel, this._commandService) ? this.getParagraph(paragraphId, segmentId) : null;
 	}
 	/**
 	* Get all paragraphs in the document body or header/footer body by the segment id.
@@ -1843,7 +1831,7 @@ let FDocument = class FDocument extends FBaseInitialable {
 			startOffset: offset,
 			endOffset: offset,
 			segmentId
-		}, buildPlainTextInsertBody(`${text}\r`), this._documentDataModel, this._injector)) throw new Error("Failed to insert paragraph.");
+		}, buildPlainTextInsertBody(`${text}\r`), this._documentDataModel, this._commandService)) throw new Error("Failed to insert paragraph.");
 		const { paragraphs = [] } = this.getBody(segmentId);
 		const paragraph = paragraphs[index];
 		if (!paragraph) throw new Error("Failed to insert paragraph.");
@@ -1885,7 +1873,7 @@ let FDocument = class FDocument extends FBaseInitialable {
 	deleteRange(range) {
 		const normalizedRange = this._normalizeDeleteRange(range);
 		if (normalizedRange.startOffset >= normalizedRange.endOffset) return false;
-		return replaceBodyRange(normalizedRange, { dataStream: "" }, this._documentDataModel, this._injector);
+		return replaceBodyRange(normalizedRange, { dataStream: "" }, this._documentDataModel, this._commandService);
 	}
 	_createFDocumentParagraph(paragraphId, segmentId = "") {
 		return this._injector.createInstance(FDocumentParagraph, this, paragraphId, segmentId, this._injector);

package/lib/es/index.js

@@ -413,59 +413,63 @@ const InsertTextCommand = {
 	handler: (accessor, params) => {
 		var _docDataModel$getSelf;
 		const commandService = accessor.get(ICommandService);
-		const { range, segmentId, body, unitId, cursorOffset } = params;
+		const { range, segmentId, body, unitId, cursorOffset, debounce = true, textRanges, noNeedSetTextRange, isEditing } = params;
 		const docSelectionManagerService = accessor.get(DocSelectionManagerService);
 		const docDataModel = accessor.get(IUniverInstanceService).getUnit(unitId, UniverInstanceType.UNIVER_DOC);
 		if (docDataModel == null) return false;
 		const activeRange = docSelectionManagerService.getActiveTextRange();
-		const rangeSegmentId = "segmentId" in range ? range.segmentId : void 0;
+		const rangeSegmentId = "segmentId" in range && typeof range.segmentId === "string" ? range.segmentId : void 0;
 		const targetSegmentId = segmentId ?? rangeSegmentId ?? (activeRange === null || activeRange === void 0 ? void 0 : activeRange.segmentId) ?? "";
 		const originBody = (_docDataModel$getSelf = docDataModel.getSelfOrHeaderFooterModel(targetSegmentId)) === null || _docDataModel$getSelf === void 0 ? void 0 : _docDataModel$getSelf.getBody();
 		if (originBody == null) return false;
 		const { startOffset, collapsed } = range;
 		const cursorMove = cursorOffset ?? body.dataStream.length;
-		const textRanges = [{
+		const mutationTextRanges = textRanges ?? [{
 			startOffset: startOffset + cursorMove,
 			endOffset: startOffset + cursorMove,
-			style: activeRange === null || activeRange === void 0 ? void 0 : activeRange.style,
 			collapsed
 		}];
 		const doMutation = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId: targetSegmentId,
 				actions: [],
-				textRanges,
-				debounce: true
+				textRanges: mutationTextRanges,
+				debounce,
+				noNeedSetTextRange,
+				isEditing
 			}
 		};
-		const textX = new TextX();
-		const jsonX = JSONX.getInstance();
-		if (collapsed) {
-			if (startOffset > 0) textX.push({
-				t: TextXActionType.RETAIN,
-				len: startOffset
-			});
-			textX.push({
-				t: TextXActionType.INSERT,
-				body,
-				len: body.dataStream.length
-			});
-		} else {
-			const dos = BuildTextUtils.selection.delete([range], originBody, 0, body);
-			textX.push(...dos);
-		}
-		doMutation.params.textRanges = [{
-			startOffset: startOffset + cursorMove,
-			endOffset: startOffset + cursorMove,
-			collapsed
-		}];
-		const path = getRichTextEditPath(docDataModel, segmentId);
-		doMutation.params.actions = jsonX.editOp(textX.serialize(), path);
+		doMutation.params.actions = buildInsertTextActions(docDataModel, originBody, range, body, targetSegmentId);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
 		return Boolean(result);
 	}
 };
+function buildInsertTextActions(documentDataModel, originBody, range, insertBody, segmentId) {
+	const { startOffset, endOffset, collapsed } = range;
+	const textX = new TextX();
+	if (collapsed) {
+		if (startOffset > 0) textX.push({
+			t: TextXActionType.RETAIN,
+			len: startOffset
+		});
+		textX.push({
+			t: TextXActionType.INSERT,
+			body: insertBody,
+			len: insertBody.dataStream.length
+		});
+	} else textX.push(...BuildTextUtils.selection.delete([range], originBody, 0, insertBody));
+	const textActions = JSONX.getInstance().editOp(textX.serialize(), getRichTextEditPath(documentDataModel, segmentId));
+	return collapsed ? textActions : appendRemovedDrawingActions(textActions, documentDataModel, originBody, startOffset, endOffset);
+}
+function appendRemovedDrawingActions(textActions, documentDataModel, body, startOffset, endOffset) {
+	return [textActions, ...BuildTextUtils.drawing.remove(documentDataModel.getSnapshot(), [{
+		startOffset,
+		endOffset,
+		collapsed: false
+	}], body)].reduce((accumulator, action) => JSONX.compose(accumulator, action));
+}
 /**
 * The command to delete text, mainly used in BACKSPACE and DELETE when collapsed is true. ONLY handle collapsed range!!!
 */
@@ -492,6 +496,7 @@ const DeleteTextCommand = {
 			id: RichTextEditingMutation.id,
 			params: {
 				unitId,
+				segmentId,
 				actions: [],
 				textRanges: [{
 					startOffset: start,
@@ -510,7 +515,7 @@ const DeleteTextCommand = {
 			collapsed: false
 		}], body));
 		const path = getRichTextEditPath(docDataModel, segmentId);
-		doMutation.params.actions = jsonX.editOp(textX.serialize(), path);
+		doMutation.params.actions = appendRemovedDrawingActions(jsonX.editOp(textX.serialize(), path), docDataModel, body, start, end + 1);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
 		return Boolean(result);
 	}
@@ -1438,7 +1443,7 @@ function composeActions(actions) {
 //#endregion
 //#region package.json
 var name = "@univerjs/docs";
-var version = "1.0.0-beta.1";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/config/config.ts
@@ -1609,6 +1614,9 @@ let DocStateChangeManagerService = class DocStateChangeManagerService extends Rx
 		this._historyStateCache.set(unitId, cache.history);
 		this._changeStateCache.set(unitId, cache.collaboration);
 	}
+	clearHistory(unitId) {
+		this._historyStateCache.delete(unitId);
+	}
 	_setChangeState(changeState) {
 		this._cacheChangeState(changeState, "history");
 		this._cacheChangeState(changeState, "collaboration");