@univerjs/core 1.0.0-alpha.0 → 1.0.0-alpha.2

package/lib/cjs/facade.js

@@ -69,7 +69,11 @@ var FBaseInitialable = class extends _univerjs_core.Disposable {
 					this.prototype[InitializerSymbol$1] = initializers;
 				}
 				initializers.push(source.prototype._initialize);
-			} else if (name !== "constructor") this.prototype[name] = source.prototype[name];
+			} else if (name !== "constructor") {
+				const descriptor = Object.getOwnPropertyDescriptor(source.prototype, name);
+				if (descriptor) Object.defineProperty(this.prototype, name, descriptor);
+				else this.prototype[name] = source.prototype[name];
+			}
 		});
 		Object.getOwnPropertyNames(source).forEach((name) => {
 			if (name !== "prototype" && name !== "name" && name !== "length") this[name] = source[name];

package/lib/cjs/index.js

@@ -640,10 +640,9 @@ function diffArrays(oneArray, twoArray) {
 }
 function diffObject(oneObject, twoObject) {
 	const oneKeys = Object.keys(oneObject);
-	const twoKeys = Object.keys(twoObject);
-	if (oneKeys.length !== twoKeys.length) return false;
+	if (oneKeys.length !== Object.keys(twoObject).length) return false;
 	for (const key of oneKeys) {
-		if (!twoKeys.includes(key)) return false;
+		if (!Object.prototype.propertyIsEnumerable.call(twoObject, key)) return false;
 		const oneValue = oneObject[key];
 		const twoValue = twoObject[key];
 		if (!isValueEqual(oneValue, twoValue)) return false;
@@ -787,11 +786,9 @@ var Tools = class Tools {
 			return clone;
 		}
 		if (this.isObject(value)) {
+			const source = value;
 			const clone = {};
-			Object.keys(value).forEach((key) => {
-				const item = value[key];
-				clone[key] = Tools.deepClone(item);
-			});
+			for (const key in source) if (Object.prototype.hasOwnProperty.call(source, key)) clone[key] = Tools.deepClone(source[key]);
 			Object.setPrototypeOf(clone, Object.getPrototypeOf(value));
 			return clone;
 		}
@@ -2926,6 +2923,18 @@ function generateRandomId(n = 21, alphabet) {
 
 //#endregion
 //#region src/types/interfaces/i-document-data.ts
+/**
+* The top-level block types in a document body.
+* These block types are used to represent the structure of the document and can be used to identify different sections or elements within the document.
+*/
+let DocumentBlockType = /* @__PURE__ */ function(DocumentBlockType) {
+	DocumentBlockType["PARAGRAPH"] = "paragraph";
+	DocumentBlockType["BLOCK_RANGE"] = "blockRange";
+	DocumentBlockType["TABLE"] = "table";
+	DocumentBlockType["CUSTOM_BLOCK"] = "customBlock";
+	DocumentBlockType["COLUMN_GROUP"] = "columnGroup";
+	return DocumentBlockType;
+}({});
 let DocStyleType = /* @__PURE__ */ function(DocStyleType) {
 	DocStyleType[DocStyleType["character"] = 0] = "character";
 	DocStyleType[DocStyleType["paragraph"] = 1] = "paragraph";
@@ -3204,6 +3213,16 @@ let TableTextWrapType = /* @__PURE__ */ function(TableTextWrapType) {
 	TableTextWrapType[TableTextWrapType["WRAP"] = 1] = "WRAP";
 	return TableTextWrapType;
 }({});
+let ColumnLayoutType = /* @__PURE__ */ function(ColumnLayoutType) {
+	ColumnLayoutType["FIXED"] = "fixed";
+	ColumnLayoutType["AUTO"] = "auto";
+	return ColumnLayoutType;
+}({});
+let ColumnResponsiveType = /* @__PURE__ */ function(ColumnResponsiveType) {
+	ColumnResponsiveType["STACK"] = "stack";
+	ColumnResponsiveType["SHRINK"] = "shrink";
+	return ColumnResponsiveType;
+}({});
 let TableRowHeightRule = /* @__PURE__ */ function(TableRowHeightRule) {
 	TableRowHeightRule[TableRowHeightRule["AUTO"] = 0] = "AUTO";
 	TableRowHeightRule[TableRowHeightRule["AT_LEAST"] = 1] = "AT_LEAST";
@@ -3823,6 +3842,7 @@ function getEmptySnapshot$1(unitID = generateRandomId(6), locale = "enUS", title
 			textRuns: [],
 			customBlocks: [],
 			tables: [],
+			columnGroups: [],
 			blockRanges: [],
 			customRanges: [],
 			customDecorations: [],
@@ -9290,7 +9310,7 @@ var RefAlias = class {
 	setValue(key, attr, value) {
 		const item = this.getValue(key);
 		if (item) {
-			if (Object.keys(item).includes(attr)) item[attr] = value;
+			if (Object.prototype.hasOwnProperty.call(item, attr)) item[attr] = value;
 		}
 	}
 	deleteValue(key, keyGroup) {
@@ -9665,7 +9685,7 @@ function insertTables(body, insertBody, textLength, currentIndex) {
 	for (let i = 0, len = tables.length; i < len; i++) {
 		const table = tables[i];
 		const { startIndex, endIndex } = table;
-		if (startIndex > currentIndex) {
+		if (startIndex >= currentIndex) {
 			table.startIndex += textLength;
 			table.endIndex += textLength;
 		} else if (endIndex > currentIndex) table.endIndex += textLength;
@@ -9681,6 +9701,30 @@ function insertTables(body, insertBody, textLength, currentIndex) {
 		tables.sort(sortRulesFactory("startIndex"));
 	}
 }
+function insertColumnGroups(body, insertBody, textLength, currentIndex) {
+	var _insertBody$columnGro;
+	if (!body.columnGroups && !((_insertBody$columnGro = insertBody.columnGroups) === null || _insertBody$columnGro === void 0 ? void 0 : _insertBody$columnGro.length)) return;
+	if (!body.columnGroups) body.columnGroups = [];
+	const { columnGroups } = body;
+	for (let i = 0, len = columnGroups.length; i < len; i++) {
+		const columnGroup = columnGroups[i];
+		const { startIndex, endIndex } = columnGroup;
+		if (startIndex >= currentIndex) {
+			columnGroup.startIndex += textLength;
+			columnGroup.endIndex += textLength;
+		} else if (endIndex >= currentIndex) columnGroup.endIndex += textLength;
+	}
+	const insertColumnGroups = insertBody.columnGroups;
+	if (insertColumnGroups) {
+		for (let i = 0, len = insertColumnGroups.length; i < len; i++) {
+			const columnGroup = insertColumnGroups[i];
+			columnGroup.startIndex += currentIndex;
+			columnGroup.endIndex += currentIndex;
+		}
+		columnGroups.push(...insertColumnGroups);
+		columnGroups.sort(sortRulesFactory("startIndex"));
+	}
+}
 function insertBlockRanges(body, insertBody, textLength, currentIndex) {
 	var _insertBody$blockRang;
 	if (!body.blockRanges && !((_insertBody$blockRang = insertBody.blockRanges) === null || _insertBody$blockRang === void 0 ? void 0 : _insertBody$blockRang.length)) return;
@@ -10012,6 +10056,39 @@ function deleteTables(body, textLength, currentIndex) {
 	}
 	return removeTables;
 }
+function deleteColumnGroups(body, textLength, currentIndex) {
+	const { columnGroups } = body;
+	const startIndex = currentIndex;
+	const endIndex = currentIndex + textLength - 1;
+	const removeColumnGroups = [];
+	if (columnGroups) {
+		const newColumnGroups = [];
+		for (let i = 0, len = columnGroups.length; i < len; i++) {
+			const columnGroup = columnGroups[i];
+			const { startIndex: st, endIndex: ed } = columnGroup;
+			if (startIndex <= st && endIndex >= ed) {
+				removeColumnGroups.push({
+					...columnGroup,
+					startIndex: st - currentIndex,
+					endIndex: ed - currentIndex
+				});
+				continue;
+			} else if (st <= startIndex && ed >= endIndex) {
+				const segments = horizontalLineSegmentsSubtraction(st, ed, startIndex, endIndex);
+				if (segments.length === 0) continue;
+				columnGroup.startIndex = segments[0];
+				columnGroup.endIndex = segments[1];
+				if (columnGroup.startIndex === columnGroup.endIndex) continue;
+			} else if (endIndex < st) {
+				columnGroup.startIndex -= textLength;
+				columnGroup.endIndex -= textLength;
+			}
+			newColumnGroups.push(columnGroup);
+		}
+		body.columnGroups = newColumnGroups;
+	}
+	return removeColumnGroups;
+}
 function deleteCustomRanges(body, textLength, currentIndex) {
 	const { customRanges } = body;
 	const startIndex = currentIndex;
@@ -10537,6 +10614,7 @@ function updateAttribute(body, updateBody, textLength, currentIndex, coverType)
 		sectionBreaks: updateSectionBreaks(body, updateBody, textLength, currentIndex, coverType),
 		customBlocks: updateCustomBlocks(body, updateBody, textLength, currentIndex, coverType),
 		tables: updateTables(body, updateBody, textLength, currentIndex, coverType),
+		columnGroups: updateColumnGroups(body, updateBody, textLength, currentIndex, coverType),
 		blockRanges: updateBlockRanges(body, updateBody, textLength, currentIndex, coverType),
 		customRanges: updateCustomRanges(body, updateBody, textLength, currentIndex, coverType),
 		customDecorations: updateCustomDecorations(body, updateBody, textLength, currentIndex, coverType)
@@ -10783,6 +10861,38 @@ function updateTables(body, updateBody, textLength, currentIndex, coverType) {
 	insertTables(body, updateBody, textLength, currentIndex);
 	return removeTables;
 }
+function updateColumnGroups(body, updateBody, textLength, currentIndex, coverType) {
+	const { columnGroups } = body;
+	const { columnGroups: updateDataColumnGroups } = updateBody;
+	if (columnGroups == null || updateDataColumnGroups == null) return;
+	const removeColumnGroups = deleteColumnGroups(body, textLength, currentIndex);
+	if (coverType !== 1) {
+		const newUpdateColumnGroups = [];
+		for (const updateColumnGroup of updateDataColumnGroups) {
+			const { startIndex: updateStartIndex, endIndex: updateEndIndex } = updateColumnGroup;
+			let splitUpdateColumnGroups = [];
+			for (const removeColumnGroup of removeColumnGroups) {
+				const { startIndex: removeStartIndex, endIndex: removeEndIndex } = removeColumnGroup;
+				if (removeStartIndex >= updateStartIndex && removeEndIndex <= updateEndIndex) {
+					if (coverType === 0) splitUpdateColumnGroups.push({
+						...removeColumnGroup,
+						...updateColumnGroup
+					});
+					else splitUpdateColumnGroups.push({
+						...updateColumnGroup,
+						...removeColumnGroup
+					});
+					break;
+				}
+			}
+			newUpdateColumnGroups.push(...splitUpdateColumnGroups);
+			splitUpdateColumnGroups = [];
+		}
+		updateBody.columnGroups = newUpdateColumnGroups;
+	}
+	insertColumnGroups(body, updateBody, textLength, currentIndex);
+	return removeColumnGroups;
+}
 function updateBlockRanges(body, updateBody, textLength, currentIndex, coverType) {
 	const { blockRanges } = body;
 	const { blockRanges: updateDataBlockRanges } = updateBody;
@@ -10934,6 +11044,20 @@ function getBlockRangeSlice(body, startOffset, endOffset) {
 	}
 	return newBlockRanges;
 }
+function getColumnGroupSlice(body, startOffset, endOffset) {
+	const { columnGroups = [] } = body;
+	const newColumnGroups = [];
+	for (const columnGroup of columnGroups) {
+		const clonedColumnGroup = Tools.deepClone(columnGroup);
+		const { startIndex, endIndex } = clonedColumnGroup;
+		if (startIndex >= startOffset && endIndex < endOffset) newColumnGroups.push({
+			...clonedColumnGroup,
+			startIndex: startIndex - startOffset,
+			endIndex: endIndex - startOffset
+		});
+	}
+	return newColumnGroups;
+}
 function getParagraphsSlice(body, startOffset, endOffset, type = 1) {
 	const { paragraphs = [] } = body;
 	const newParagraphs = [];
@@ -10996,6 +11120,8 @@ function getBodySlice(body, startOffset, endOffset, returnEmptyArray = true, typ
 	if (newTables.length) docBody.tables = newTables;
 	const newBlockRanges = getBlockRangeSlice(body, startOffset, endOffset);
 	if (newBlockRanges.length) docBody.blockRanges = newBlockRanges;
+	const newColumnGroups = getColumnGroupSlice(body, startOffset, endOffset);
+	if (newColumnGroups.length) docBody.columnGroups = newColumnGroups;
 	docBody.paragraphs = getParagraphsSlice(body, startOffset, endOffset, type);
 	if (type === 1) {
 		const customDecorations = getCustomDecorationSlice(body, startOffset, endOffset);
@@ -11009,7 +11135,7 @@ function getBodySlice(body, startOffset, endOffset, returnEmptyArray = true, typ
 	return docBody;
 }
 function normalizeBody(body) {
-	const { dataStream, textRuns, paragraphs, customRanges, customDecorations, tables, blockRanges } = body;
+	const { dataStream, textRuns, paragraphs, customRanges, customDecorations, tables, columnGroups, blockRanges } = body;
 	let leftOffset = 0;
 	let rightOffset = 0;
 	customRanges === null || customRanges === void 0 || customRanges.forEach((range) => {
@@ -11040,6 +11166,10 @@ function normalizeBody(body) {
 		table.startIndex += leftOffset;
 		table.endIndex += rightOffset;
 	});
+	columnGroups === null || columnGroups === void 0 || columnGroups.forEach((columnGroup) => {
+		columnGroup.startIndex += leftOffset;
+		columnGroup.endIndex += rightOffset;
+	});
 	return {
 		...body,
 		dataStream: newData,
@@ -11048,6 +11178,7 @@ function normalizeBody(body) {
 		customRanges,
 		customDecorations,
 		tables,
+		columnGroups,
 		blockRanges
 	};
 }
@@ -11110,8 +11241,8 @@ function composeCustomDecorations(updateDataCustomDecorations, originCustomDecor
 function composeBody(thisBody, otherBody, coverType = 0) {
 	if (otherBody.dataStream !== "") throw new Error("Cannot compose other body with non-empty dataStream");
 	const retBody = { dataStream: thisBody.dataStream };
-	const { textRuns: thisTextRuns, paragraphs: thisParagraphs = [], customRanges: thisCustomRanges, customDecorations: thisCustomDecorations = [], blockRanges: thisBlockRanges = [] } = thisBody;
-	const { textRuns: otherTextRuns, paragraphs: otherParagraphs = [], customRanges: otherCustomRanges, customDecorations: otherCustomDecorations = [], blockRanges: otherBlockRanges = [] } = otherBody;
+	const { textRuns: thisTextRuns, paragraphs: thisParagraphs = [], customRanges: thisCustomRanges, customDecorations: thisCustomDecorations = [], columnGroups: thisColumnGroups = [], blockRanges: thisBlockRanges = [] } = thisBody;
+	const { textRuns: otherTextRuns, paragraphs: otherParagraphs = [], customRanges: otherCustomRanges, customDecorations: otherCustomDecorations = [], columnGroups: otherColumnGroups = [], blockRanges: otherBlockRanges = [] } = otherBody;
 	retBody.textRuns = composeTextRuns(otherTextRuns, thisTextRuns, coverType);
 	retBody.customRanges = composeCustomRanges(otherCustomRanges, thisCustomRanges, coverType);
 	const customDecorations = composeCustomDecorations(otherCustomDecorations, thisCustomDecorations, coverType);
@@ -11141,6 +11272,8 @@ function composeBody(thisBody, otherBody, coverType = 0) {
 	if (paragraphs.length) retBody.paragraphs = paragraphs;
 	const blockRanges = composeDocumentBlockRanges(thisBlockRanges, otherBlockRanges);
 	if (blockRanges.length) retBody.blockRanges = blockRanges;
+	const columnGroups = composeColumnGroups(thisColumnGroups, otherColumnGroups);
+	if (columnGroups.length) retBody.columnGroups = columnGroups;
 	return retBody;
 }
 function composeDocumentBlockRanges(thisRanges, otherRanges) {
@@ -11150,11 +11283,18 @@ function composeDocumentBlockRanges(thisRanges, otherRanges) {
 	otherRanges.forEach((range) => byId.set(range.blockId, Tools.deepClone(range)));
 	return Array.from(byId.values()).sort((left, right) => left.startIndex - right.startIndex);
 }
+function composeColumnGroups(thisRanges, otherRanges) {
+	if (!thisRanges.length) return otherRanges;
+	if (!otherRanges.length) return thisRanges;
+	const byId = new Map(thisRanges.map((range) => [range.columnGroupId, Tools.deepClone(range)]));
+	otherRanges.forEach((range) => byId.set(range.columnGroupId, Tools.deepClone(range)));
+	return Array.from(byId.values()).sort((left, right) => left.startIndex - right.startIndex);
+}
 function isUselessRetainAction(action) {
 	const { body } = action;
 	if (body == null) return true;
-	const { textRuns, paragraphs, customRanges, customBlocks, customDecorations, tables, blockRanges } = body;
-	if (textRuns == null && paragraphs == null && customRanges == null && customBlocks == null && customDecorations == null && tables == null && blockRanges == null) return true;
+	const { textRuns, paragraphs, customRanges, customBlocks, customDecorations, tables, columnGroups, blockRanges } = body;
+	if (textRuns == null && paragraphs == null && customRanges == null && customBlocks == null && customDecorations == null && tables == null && columnGroups == null && blockRanges == null) return true;
 	return false;
 }
 function getRichTextEditPath(docDataModel, segmentId = "") {
@@ -11257,6 +11397,7 @@ function updateAttributeByDelete(body, textLength, currentIndex) {
 	const removeSectionBreaks = deleteSectionBreaks(body, textLength, currentIndex);
 	const removeCustomBlocks = deleteCustomBlocks(body, textLength, currentIndex);
 	const removeTables = deleteTables(body, textLength, currentIndex);
+	const removeColumnGroups = deleteColumnGroups(body, textLength, currentIndex);
 	const removeBlockRanges = deleteBlockRanges(body, textLength, currentIndex);
 	const removeCustomRanges = deleteCustomRanges(body, textLength, currentIndex);
 	const removeCustomDecorations = deleteCustomDecorations(body, textLength, currentIndex);
@@ -11272,6 +11413,7 @@ function updateAttributeByDelete(body, textLength, currentIndex) {
 		sectionBreaks: removeSectionBreaks,
 		customBlocks: removeCustomBlocks,
 		tables: removeTables,
+		columnGroups: removeColumnGroups,
 		blockRanges: removeBlockRanges,
 		customRanges: removeCustomRanges,
 		customDecorations: removeCustomDecorations
@@ -11287,6 +11429,7 @@ function updateAttributeByInsert(body, insertBody, textLength, currentIndex) {
 	insertSectionBreaks(body, insertBody, textLength, currentIndex);
 	insertCustomBlocks(body, insertBody, textLength, currentIndex);
 	insertTables(body, insertBody, textLength, currentIndex);
+	insertColumnGroups(body, insertBody, textLength, currentIndex);
 	insertBlockRanges(body, insertBody, textLength, currentIndex);
 	insertCustomRanges(body, insertBody, textLength, currentIndex);
 	insertCustomDecorations(body, insertBody, textLength, currentIndex);
@@ -11898,6 +12041,8 @@ let DataStreamTreeNodeType = /* @__PURE__ */ function(DataStreamTreeNodeType) {
 	DataStreamTreeNodeType["TABLE"] = "TABLE";
 	DataStreamTreeNodeType["TABLE_ROW"] = "TABLE_ROW";
 	DataStreamTreeNodeType["TABLE_CELL"] = "TABLE_CELL";
+	DataStreamTreeNodeType["COLUMN_GROUP"] = "COLUMN_GROUP";
+	DataStreamTreeNodeType["COLUMN"] = "COLUMN";
 	DataStreamTreeNodeType["BLOCK"] = "BLOCK";
 	DataStreamTreeNodeType["CUSTOM_BLOCK"] = "CUSTOM_BLOCK";
 	return DataStreamTreeNodeType;
@@ -11911,6 +12056,10 @@ let DataStreamTreeTokenType = /* @__PURE__ */ function(DataStreamTreeTokenType)
 	DataStreamTreeTokenType["TABLE_CELL_END"] = "";
 	DataStreamTreeTokenType["TABLE_ROW_END"] = "";
 	DataStreamTreeTokenType["TABLE_END"] = "";
+	DataStreamTreeTokenType["COLUMN_GROUP_START"] = "";
+	DataStreamTreeTokenType["COLUMN_START"] = "";
+	DataStreamTreeTokenType["COLUMN_END"] = "";
+	DataStreamTreeTokenType["COLUMN_GROUP_END"] = "";
 	DataStreamTreeTokenType["BLOCK_START"] = "";
 	DataStreamTreeTokenType["BLOCK_END"] = "";
 	/**
@@ -12210,11 +12359,10 @@ var DocumentDataModel = class DocumentDataModel extends DocumentDataModelSimple
 		this.change$.next(this.change$.value + 1);
 	}
 	getSelfOrHeaderFooterModel(segmentId) {
-		if (segmentId != null) {
-			if (this.headerModelMap.has(segmentId)) return this.headerModelMap.get(segmentId);
-			if (this.footerModelMap.has(segmentId)) return this.footerModelMap.get(segmentId);
-		}
-		return this;
+		if (segmentId === null || segmentId === void 0 || segmentId === "") return this;
+		if (this.headerModelMap.has(segmentId)) return this.headerModelMap.get(segmentId);
+		if (this.footerModelMap.has(segmentId)) return this.footerModelMap.get(segmentId);
+		return null;
 	}
 	getUnitId() {
 		return this._unitId;
@@ -12384,7 +12532,7 @@ function getSelectionForAddCustomRange(range, body) {
 function deleteCustomRangeTextX(params) {
 	var _documentDataModel$ge, _insert$dataStream$le;
 	const { rangeId, segmentId, documentDataModel, insert } = params;
-	const range = (_documentDataModel$ge = documentDataModel.getSelfOrHeaderFooterModel(segmentId).getBody()) === null || _documentDataModel$ge === void 0 || (_documentDataModel$ge = _documentDataModel$ge.customRanges) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.find((r) => r.rangeId === rangeId);
+	const range = (_documentDataModel$ge = documentDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _documentDataModel$ge === void 0 || (_documentDataModel$ge = _documentDataModel$ge.getBody()) === null || _documentDataModel$ge === void 0 || (_documentDataModel$ge = _documentDataModel$ge.customRanges) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.find((r) => r.rangeId === rangeId);
 	if (!range) return false;
 	const { startIndex, endIndex } = range;
 	const textX = new TextX();
@@ -12672,15 +12820,15 @@ function getCustomBlockIdsInSelections(body, selections) {
 	return customBlockIds;
 }
 const addDrawing = (param) => {
-	var _documentDataModel$ge, _documentDataModel$ge2;
+	var _documentDataModel$ge, _documentDataModel$ge2, _documentDataModel$ge3;
 	const { selection, documentDataModel, drawings } = param;
 	const { collapsed, startOffset, segmentId } = selection;
 	const textX = new TextX();
 	const jsonX = JSONX.getInstance();
 	const rawActions = [];
-	const body = documentDataModel.getSelfOrHeaderFooterModel(segmentId).getBody();
+	const body = (_documentDataModel$ge = documentDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.getBody();
 	if (!body) return false;
-	const drawingOrderLength = (_documentDataModel$ge = (_documentDataModel$ge2 = documentDataModel.getSnapshot().drawingsOrder) === null || _documentDataModel$ge2 === void 0 ? void 0 : _documentDataModel$ge2.length) !== null && _documentDataModel$ge !== void 0 ? _documentDataModel$ge : 0;
+	const drawingOrderLength = (_documentDataModel$ge2 = (_documentDataModel$ge3 = documentDataModel.getSnapshot().drawingsOrder) === null || _documentDataModel$ge3 === void 0 ? void 0 : _documentDataModel$ge3.length) !== null && _documentDataModel$ge2 !== void 0 ? _documentDataModel$ge2 : 0;
 	let removeDrawingLen = 0;
 	const insertOffset = collapsed ? normalizeDrawingInsertOffset(body, startOffset !== null && startOffset !== void 0 ? startOffset : 0) : startOffset !== null && startOffset !== void 0 ? startOffset : 0;
 	if (collapsed) {
@@ -12689,12 +12837,12 @@ const addDrawing = (param) => {
 			len: insertOffset
 		});
 	} else {
-		var _documentDataModel$ge3, _documentDataModel$ge4;
+		var _documentDataModel$ge4, _documentDataModel$ge5;
 		const dos = deleteSelectionTextX([selection], body, 0, null, false);
 		textX.push(...dos);
 		const removedCustomBlockIds = getCustomBlockIdsInSelections(body, [selection]);
-		const drawings = (_documentDataModel$ge3 = documentDataModel.getDrawings()) !== null && _documentDataModel$ge3 !== void 0 ? _documentDataModel$ge3 : {};
-		const drawingOrder = (_documentDataModel$ge4 = documentDataModel.getDrawingsOrder()) !== null && _documentDataModel$ge4 !== void 0 ? _documentDataModel$ge4 : [];
+		const drawings = (_documentDataModel$ge4 = documentDataModel.getDrawings()) !== null && _documentDataModel$ge4 !== void 0 ? _documentDataModel$ge4 : {};
+		const drawingOrder = (_documentDataModel$ge5 = documentDataModel.getDrawingsOrder()) !== null && _documentDataModel$ge5 !== void 0 ? _documentDataModel$ge5 : [];
 		const sortedRemovedCustomBlockIds = removedCustomBlockIds.sort((a, b) => {
 			if (drawingOrder.indexOf(a) > drawingOrder.indexOf(b)) return -1;
 			else if (drawingOrder.indexOf(a) < drawingOrder.indexOf(b)) return 1;
@@ -12830,7 +12978,7 @@ const switchParagraphBullet = (params) => {
 	var _docDataModel$getSelf, _docDataModel$getSelf2;
 	const { paragraphs: currentParagraphs, segmentId, document: docDataModel } = params;
 	let listType = params.listType;
-	const paragraphs = (_docDataModel$getSelf = (_docDataModel$getSelf2 = docDataModel.getSelfOrHeaderFooterModel(segmentId).getBody()) === null || _docDataModel$getSelf2 === void 0 ? void 0 : _docDataModel$getSelf2.paragraphs) !== null && _docDataModel$getSelf !== void 0 ? _docDataModel$getSelf : [];
+	const paragraphs = (_docDataModel$getSelf = (_docDataModel$getSelf2 = docDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _docDataModel$getSelf2 === void 0 || (_docDataModel$getSelf2 = _docDataModel$getSelf2.getBody()) === null || _docDataModel$getSelf2 === void 0 ? void 0 : _docDataModel$getSelf2.paragraphs) !== null && _docDataModel$getSelf !== void 0 ? _docDataModel$getSelf : [];
 	const isAlreadyList = currentParagraphs.every((paragraph) => {
 		var _paragraph$bullet;
 		return ((_paragraph$bullet = paragraph.bullet) === null || _paragraph$bullet === void 0 ? void 0 : _paragraph$bullet.listType.indexOf(listType)) === 0;
@@ -12888,7 +13036,7 @@ const switchParagraphBullet = (params) => {
 const toggleChecklistParagraph = (params) => {
 	var _docDataModel$getSelf3;
 	const { paragraphIndex, segmentId, document: docDataModel } = params;
-	const paragraphs = (_docDataModel$getSelf3 = docDataModel.getSelfOrHeaderFooterModel(segmentId).getBody()) === null || _docDataModel$getSelf3 === void 0 ? void 0 : _docDataModel$getSelf3.paragraphs;
+	const paragraphs = (_docDataModel$getSelf3 = docDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _docDataModel$getSelf3 === void 0 || (_docDataModel$getSelf3 = _docDataModel$getSelf3.getBody()) === null || _docDataModel$getSelf3 === void 0 ? void 0 : _docDataModel$getSelf3.paragraphs;
 	if (paragraphs == null) return false;
 	const currentParagraph = paragraphs.find((p) => p.startIndex === paragraphIndex);
 	if (!(currentParagraph === null || currentParagraph === void 0 ? void 0 : currentParagraph.bullet) || currentParagraph.bullet.listType.indexOf("CHECK_LIST") === -1) return false;
@@ -12923,9 +13071,9 @@ const toggleChecklistParagraph = (params) => {
 };
 const setParagraphBullet = (params) => {
 	var _docDataModel$getSelf4;
-	const { paragraphs: currentParagraphs, listType, segmentId, document: docDataModel } = params;
-	if (((_docDataModel$getSelf4 = docDataModel.getSelfOrHeaderFooterModel(segmentId).getBody()) === null || _docDataModel$getSelf4 === void 0 ? void 0 : _docDataModel$getSelf4.paragraphs) == null) return false;
-	const listId = generateRandomId(6);
+	const { paragraphs: currentParagraphs, listType, listId: explicitListId, segmentId, document: docDataModel } = params;
+	if (((_docDataModel$getSelf4 = docDataModel.getSelfOrHeaderFooterModel(segmentId)) === null || _docDataModel$getSelf4 === void 0 || (_docDataModel$getSelf4 = _docDataModel$getSelf4.getBody()) === null || _docDataModel$getSelf4 === void 0 ? void 0 : _docDataModel$getSelf4.paragraphs) == null) return false;
+	const listId = explicitListId !== null && explicitListId !== void 0 ? explicitListId : generateRandomId(6);
 	const memoryCursor = new MemoryCursor();
 	memoryCursor.reset();
 	const textX = new TextX();
@@ -13013,7 +13161,7 @@ const setParagraphStyle = (params) => {
 	var _segment$getBody$para, _segment$getBody, _segment$getBody$data, _segment$getBody2;
 	const { textRanges, segmentId, document: docDataModel, style, paragraphTextRun, cursor, deleteLen, textX: _textX } = params;
 	const segment = docDataModel.getSelfOrHeaderFooterModel(segmentId);
-	const currentParagraphs = getParagraphsInRanges(textRanges, (_segment$getBody$para = (_segment$getBody = segment.getBody()) === null || _segment$getBody === void 0 ? void 0 : _segment$getBody.paragraphs) !== null && _segment$getBody$para !== void 0 ? _segment$getBody$para : [], (_segment$getBody$data = (_segment$getBody2 = segment.getBody()) === null || _segment$getBody2 === void 0 ? void 0 : _segment$getBody2.dataStream) !== null && _segment$getBody$data !== void 0 ? _segment$getBody$data : "");
+	const currentParagraphs = getParagraphsInRanges(textRanges, (_segment$getBody$para = segment === null || segment === void 0 || (_segment$getBody = segment.getBody()) === null || _segment$getBody === void 0 ? void 0 : _segment$getBody.paragraphs) !== null && _segment$getBody$para !== void 0 ? _segment$getBody$para : [], (_segment$getBody$data = segment === null || segment === void 0 || (_segment$getBody2 = segment.getBody()) === null || _segment$getBody2 === void 0 ? void 0 : _segment$getBody2.dataStream) !== null && _segment$getBody$data !== void 0 ? _segment$getBody$data : "");
 	const memoryCursor = new MemoryCursor();
 	if (cursor) memoryCursor.moveCursorTo(cursor);
 	const textX = _textX !== null && _textX !== void 0 ? _textX : new TextX();
@@ -15601,7 +15749,7 @@ const IURLImageService = (0, _wendellhu_redi.createIdentifier)("core.url-image.s
 //#endregion
 //#region package.json
 var name = "@univerjs/core";
-var version = "1.0.0-alpha.0";
+var version = "1.0.0-alpha.2";
 
 //#endregion
 //#region src/sheets/empty-snapshot.ts
@@ -18228,12 +18376,6 @@ let UniverInstanceService = class UniverInstanceService extends Disposable {
 		if (type && (unit === null || unit === void 0 ? void 0 : unit.type) !== type) return null;
 		return unit;
 	}
-	getCurrentUniverDocInstance() {
-		return this.getCurrentUnitOfType(_univerjs_protocol.UniverType.UNIVER_DOC);
-	}
-	getUniverDocInstance(unitId) {
-		return this.getUnit(unitId, _univerjs_protocol.UniverType.UNIVER_DOC);
-	}
 	getUniverSheetInstance(unitId) {
 		return this.getUnit(unitId, _univerjs_protocol.UniverType.UNIVER_SHEET);
 	}
@@ -20958,6 +21100,8 @@ exports.CellModeEnum = CellModeEnum;
 exports.CellValueType = CellValueType;
 exports.ColorKit = ColorKit;
 exports.ColorType = ColorType;
+exports.ColumnLayoutType = ColumnLayoutType;
+exports.ColumnResponsiveType = ColumnResponsiveType;
 exports.ColumnSeparatorType = ColumnSeparatorType;
 Object.defineProperty(exports, 'CommandService', {
   enumerable: true,
@@ -21023,6 +21167,7 @@ exports.Disposable = Disposable;
 exports.DisposableCollection = DisposableCollection;
 exports.DocStyleType = DocStyleType;
 exports.DocumentBlockRangeType = DocumentBlockRangeType;
+exports.DocumentBlockType = DocumentBlockType;
 exports.DocumentDataModel = DocumentDataModel;
 exports.DocumentFlavor = DocumentFlavor;
 exports.DrawingTypeEnum = DrawingTypeEnum;
@@ -21194,6 +21339,7 @@ exports.RANGE_DIRECTION = RANGE_DIRECTION;
 exports.RANGE_TYPE = RANGE_TYPE;
 exports.RBush = rbush.default;
 exports.RCDisposable = RCDisposable;
+exports.RESTORE_INSERTED_PARAGRAPH_IDS = RESTORE_INSERTED_PARAGRAPH_IDS;
 exports.RGBA_PAREN = RGBA_PAREN;
 exports.RGB_PAREN = RGB_PAREN;
 exports.ROTATE_BUFFER_VALUE = ROTATE_BUFFER_VALUE;

package/lib/es/facade.js

@@ -68,7 +68,11 @@ var FBaseInitialable = class extends Disposable {
 					this.prototype[InitializerSymbol$1] = initializers;
 				}
 				initializers.push(source.prototype._initialize);
-			} else if (name !== "constructor") this.prototype[name] = source.prototype[name];
+			} else if (name !== "constructor") {
+				const descriptor = Object.getOwnPropertyDescriptor(source.prototype, name);
+				if (descriptor) Object.defineProperty(this.prototype, name, descriptor);
+				else this.prototype[name] = source.prototype[name];
+			}
 		});
 		Object.getOwnPropertyNames(source).forEach((name) => {
 			if (name !== "prototype" && name !== "name" && name !== "length") this[name] = source[name];