@univerjs/core 1.2.0 → 1.3.0

package/lib/cjs/index.js

@@ -1699,7 +1699,7 @@ let ThemeColors = /* @__PURE__ */ function(ThemeColors) {
 //#endregion
 //#region package.json
 var name = "@univerjs/core";
-var version = "1.2.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/common/array.ts
@@ -15723,10 +15723,10 @@ function getBlockRangeSlice(body, startOffset, endOffset, mode = 0) {
 	const { blockRanges = [] } = body;
 	const newBlockRanges = [];
 	for (const blockRange of blockRanges) {
-		const clonedBlockRange = Tools.deepClone(blockRange);
-		const { startIndex, endIndex } = clonedBlockRange;
-		if (hasStructuralRangeInSlice(startIndex, endIndex, startOffset, endOffset, mode)) newBlockRanges.push({
-			...clonedBlockRange,
+		const { startIndex, endIndex } = blockRange;
+		if (!(mode === 1 ? startIndex >= startOffset && endIndex < endOffset : hasStructuralRangeInSlice(startIndex, endIndex, startOffset, endOffset, mode))) continue;
+		newBlockRanges.push({
+			...blockRange,
 			...getSlicedStructuralRange(startIndex, endIndex, startOffset, endOffset, mode)
 		});
 	}
@@ -20183,6 +20183,7 @@ var RichTextBuilder = class RichTextBuilder extends RichTextValue {
 		_defineProperty(this, "_trackedRanges", /* @__PURE__ */ new Set());
 		_defineProperty(this, "_childHandleRevision", 0);
 		this._doc = new DocumentDataModel(data);
+		this._data.body = this._doc.getBody();
 	}
 	/**
 	* Returns editable paragraph handles backed by this detached rich-text builder.
@@ -22514,6 +22515,96 @@ function convertTextRotation(textRotation) {
 	};
 }
 
+//#endregion
+//#region src/sheets/sheet-dimensions.ts
+function isValidSheetDimension(value, allowZero = true) {
+	return typeof value === "number" && Number.isFinite(value) && (allowZero ? value >= 0 : value > 0);
+}
+function normalizeSheetDimension(value, fallback, allowZero = true) {
+	return isValidSheetDimension(value, allowZero) ? value : fallback;
+}
+function isValidColumnDimensions(data) {
+	return (data === null || data === void 0 ? void 0 : data.w) == null || isValidSheetDimension(data.w);
+}
+function isValidRowDimensions(data) {
+	return ((data === null || data === void 0 ? void 0 : data.h) == null || isValidSheetDimension(data.h)) && ((data === null || data === void 0 ? void 0 : data.ah) == null || isValidSheetDimension(data.ah));
+}
+
+//#endregion
+//#region src/sheets/sheet-snapshot-utils.ts
+const DEFAULT_WORKSHEET_ROW_COUNT_KEY = "DEFAULT_WORKSHEET_ROW_COUNT";
+const DEFAULT_WORKSHEET_ROW_COUNT = 1e3;
+const DEFAULT_WORKSHEET_COLUMN_COUNT_KEY = "DEFAULT_WORKSHEET_COLUMN_COUNT";
+const DEFAULT_WORKSHEET_COLUMN_COUNT = 20;
+const DEFAULT_WORKSHEET_ROW_HEIGHT_KEY = "DEFAULT_WORKSHEET_ROW_HEIGHT";
+const DEFAULT_WORKSHEET_ROW_HEIGHT = 24;
+const DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY = "DEFAULT_WORKSHEET_COLUMN_WIDTH";
+const DEFAULT_WORKSHEET_COLUMN_WIDTH = 88;
+const DEFAULT_WORKSHEET_ROW_TITLE_WIDTH_KEY = "DEFAULT_WORKSHEET_ROW_TITLE_WIDTH";
+const DEFAULT_WORKSHEET_ROW_TITLE_WIDTH = 46;
+const DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT_KEY = "DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT";
+const DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT = 20;
+/**
+* This function is used to merge the user passed in snapshot with the default snapshot
+* without changing the user's snapshot's reference.
+*
+* @param snapshot user passed in snapshot
+* @returns merged snapshot
+*/
+function mergeWorksheetSnapshotWithDefault(snapshot) {
+	const defaultSnapshot = {
+		name: "Sheet1",
+		id: "sheet-01",
+		tabColor: "",
+		hidden: 0,
+		rowCount: DEFAULT_WORKSHEET_ROW_COUNT,
+		columnCount: 20,
+		zoomRatio: 1,
+		freeze: {
+			xSplit: 0,
+			ySplit: 0,
+			startRow: -1,
+			startColumn: -1
+		},
+		scrollTop: 0,
+		scrollLeft: 0,
+		defaultColumnWidth: 88,
+		defaultRowHeight: 24,
+		mergeData: [],
+		cellData: {},
+		rowData: {},
+		columnData: {},
+		showGridlines: 1,
+		rowHeader: {
+			width: 46,
+			hidden: 0
+		},
+		columnHeader: {
+			height: 20,
+			hidden: 0
+		},
+		rightToLeft: 0
+	};
+	Object.keys(defaultSnapshot).forEach((_key) => {
+		const key = _key;
+		if (typeof snapshot[key] === "undefined") snapshot[key] = defaultSnapshot[key];
+	});
+	const freeze = snapshot.freeze;
+	freeze.xSplit = freeze.xSplit ?? defaultSnapshot.freeze.xSplit;
+	freeze.ySplit = freeze.ySplit ?? defaultSnapshot.freeze.ySplit;
+	freeze.startRow = freeze.ySplit === 0 ? defaultSnapshot.freeze.startRow : freeze.startRow ?? defaultSnapshot.freeze.startRow;
+	freeze.startColumn = freeze.xSplit === 0 ? defaultSnapshot.freeze.startColumn : freeze.startColumn ?? defaultSnapshot.freeze.startColumn;
+	snapshot.defaultColumnWidth = normalizeSheetDimension(snapshot.defaultColumnWidth, 88, false);
+	snapshot.defaultRowHeight = normalizeSheetDimension(snapshot.defaultRowHeight, 24, false);
+	for (const column of Object.values(snapshot.columnData)) if (column && column.w !== void 0 && !isValidSheetDimension(column.w)) column.w = 0;
+	for (const row of Object.values(snapshot.rowData)) {
+		if (!row) continue;
+		if (row.h !== void 0 && !isValidSheetDimension(row.h)) row.h = 0;
+		if (row.ah !== void 0 && !isValidSheetDimension(row.ah)) delete row.ah;
+	}
+	return snapshot;
+}
+
 //#endregion
 //#region src/sheets/column-manager.ts
 /**
@@ -22653,7 +22744,9 @@ var ColumnManager = class {
 	*/
 	getColumnWidth(columnPos) {
 		var _this$_columnData$col2;
-		return ((_this$_columnData$col2 = this._columnData[columnPos]) === null || _this$_columnData$col2 === void 0 ? void 0 : _this$_columnData$col2.w) ?? this._config.defaultColumnWidth;
+		const defaultWidth = normalizeSheetDimension(this._config.defaultColumnWidth, 88, false);
+		const width = (_this$_columnData$col2 = this._columnData[columnPos]) === null || _this$_columnData$col2 === void 0 ? void 0 : _this$_columnData$col2.w;
+		return width === void 0 ? defaultWidth : normalizeSheetDimension(width, 0);
 	}
 	/**
 	* Set the width of column
@@ -22661,6 +22754,7 @@ var ColumnManager = class {
 	* @param width width of column
 	*/
 	setColumnWidth(columnPos, width) {
+		if (!isValidSheetDimension(width)) return;
 		const column = this._columnData[columnPos];
 		if (width === this._config.defaultColumnWidth) {
 			if (column) {
@@ -22697,7 +22791,10 @@ var ColumnManager = class {
 		}
 		for (let c = startColumn; c <= endColumn; c++) {
 			const columnData = columnDataInfo === null || columnDataInfo === void 0 ? void 0 : columnDataInfo[c - startColumn];
-			if (columnData !== void 0 && columnData !== null && Object.keys(columnData).length > 0) this._columnData[c] = { ...columnData };
+			if (columnData !== void 0 && columnData !== null && Object.keys(columnData).length > 0) {
+				this._columnData[c] = { ...columnData };
+				if (columnData.w !== void 0 && !isValidSheetDimension(columnData.w)) this._columnData[c].w = 0;
+			}
 		}
 	}
 	/**
@@ -23325,13 +23422,14 @@ var RowManager = class {
 	getRowHeight(rowPos, count = 1) {
 		const { _rowData } = this;
 		const config = this._config;
+		const defaultHeight = normalizeSheetDimension(config.defaultRowHeight, 24, false);
 		let height = 0;
 		for (let i = 0; i < count; i++) {
-			const { ia, ah, h = config.defaultRowHeight } = _rowData[i + rowPos] || {
+			const { ia, ah, h = defaultHeight } = _rowData[i + rowPos] || {
 				hd: 0,
-				h: config.defaultRowHeight
+				h: defaultHeight
 			};
-			height += (ia == null || ia === 1) && typeof ah === "number" ? ah : h;
+			height += (ia == null || ia === 1) && isValidSheetDimension(ah, false) ? ah : normalizeSheetDimension(h, 0);
 		}
 		return height;
 	}
@@ -23341,6 +23439,7 @@ var RowManager = class {
 	* @param height row height
 	*/
 	setRowHeight(rowPos, height) {
+		if (!isValidSheetDimension(height)) return;
 		const row = this._rowData[rowPos];
 		if (height === this._config.defaultRowHeight) {
 			if (row) {
@@ -23381,7 +23480,12 @@ var RowManager = class {
 		}
 		for (let r = startRow; r <= endRow; r++) {
 			const rowData = rowDataInfo === null || rowDataInfo === void 0 ? void 0 : rowDataInfo[r - startRow];
-			if (rowData !== void 0 && rowData !== null && Object.keys(rowData).length > 0) this._rowData[r] = { ...rowData };
+			if (rowData !== void 0 && rowData !== null && Object.keys(rowData).length > 0) {
+				this._rowData[r] = { ...rowData };
+				const row = this._rowData[r];
+				if (row.h !== void 0 && !isValidSheetDimension(row.h)) row.h = 0;
+				if (row.ah !== void 0 && !isValidSheetDimension(row.ah)) delete row.ah;
+			}
 		}
 	}
 	/**
@@ -23498,73 +23602,6 @@ var RowManager = class {
 	}
 };
 
-//#endregion
-//#region src/sheets/sheet-snapshot-utils.ts
-const DEFAULT_WORKSHEET_ROW_COUNT_KEY = "DEFAULT_WORKSHEET_ROW_COUNT";
-const DEFAULT_WORKSHEET_ROW_COUNT = 1e3;
-const DEFAULT_WORKSHEET_COLUMN_COUNT_KEY = "DEFAULT_WORKSHEET_COLUMN_COUNT";
-const DEFAULT_WORKSHEET_COLUMN_COUNT = 20;
-const DEFAULT_WORKSHEET_ROW_HEIGHT_KEY = "DEFAULT_WORKSHEET_ROW_HEIGHT";
-const DEFAULT_WORKSHEET_ROW_HEIGHT = 24;
-const DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY = "DEFAULT_WORKSHEET_COLUMN_WIDTH";
-const DEFAULT_WORKSHEET_COLUMN_WIDTH = 88;
-const DEFAULT_WORKSHEET_ROW_TITLE_WIDTH_KEY = "DEFAULT_WORKSHEET_ROW_TITLE_WIDTH";
-const DEFAULT_WORKSHEET_ROW_TITLE_WIDTH = 46;
-const DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT_KEY = "DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT";
-const DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT = 20;
-/**
-* This function is used to merge the user passed in snapshot with the default snapshot
-* without changing the user's snapshot's reference.
-*
-* @param snapshot user passed in snapshot
-* @returns merged snapshot
-*/
-function mergeWorksheetSnapshotWithDefault(snapshot) {
-	const defaultSnapshot = {
-		name: "Sheet1",
-		id: "sheet-01",
-		tabColor: "",
-		hidden: 0,
-		rowCount: DEFAULT_WORKSHEET_ROW_COUNT,
-		columnCount: 20,
-		zoomRatio: 1,
-		freeze: {
-			xSplit: 0,
-			ySplit: 0,
-			startRow: -1,
-			startColumn: -1
-		},
-		scrollTop: 0,
-		scrollLeft: 0,
-		defaultColumnWidth: 88,
-		defaultRowHeight: 24,
-		mergeData: [],
-		cellData: {},
-		rowData: {},
-		columnData: {},
-		showGridlines: 1,
-		rowHeader: {
-			width: 46,
-			hidden: 0
-		},
-		columnHeader: {
-			height: 20,
-			hidden: 0
-		},
-		rightToLeft: 0
-	};
-	Object.keys(defaultSnapshot).forEach((_key) => {
-		const key = _key;
-		if (typeof snapshot[key] === "undefined") snapshot[key] = defaultSnapshot[key];
-	});
-	const freeze = snapshot.freeze;
-	freeze.xSplit = freeze.xSplit ?? defaultSnapshot.freeze.xSplit;
-	freeze.ySplit = freeze.ySplit ?? defaultSnapshot.freeze.ySplit;
-	freeze.startRow = freeze.ySplit === 0 ? defaultSnapshot.freeze.startRow : freeze.startRow ?? defaultSnapshot.freeze.startRow;
-	freeze.startColumn = freeze.xSplit === 0 ? defaultSnapshot.freeze.startColumn : freeze.startColumn ?? defaultSnapshot.freeze.startColumn;
-	return snapshot;
-}
-
 //#endregion
 //#region src/sheets/span-model.ts
 var SpanModel = class extends Disposable {
@@ -27833,17 +27870,18 @@ let SheetSkeleton = class SheetSkeleton extends Skeleton {
 	_generateRowMatrixCache(rowCount, rowData, defaultRowHeight) {
 		let rowTotalHeight = 0;
 		const rowHeightAccumulation = [];
+		const fallbackHeight = normalizeSheetDimension(defaultRowHeight, 24, false);
 		const data = rowData;
 		for (let r = 0; r < rowCount; r++) {
 			var _this$_gapConfig$rowG2;
-			let rowHeight = defaultRowHeight;
+			let rowHeight = fallbackHeight;
 			if (this.worksheet.getRowFiltered(r)) rowHeight = 0;
 			else if (data[r] != null) {
 				const rowDataItem = data[r];
 				if (!rowDataItem) continue;
-				const { h = defaultRowHeight, ah, ia } = rowDataItem;
-				if ((ia == null || ia === 1) && typeof ah === "number" && ah > 0) rowHeight = ah;
-				else rowHeight = h;
+				const { h = fallbackHeight, ah, ia } = rowDataItem;
+				if ((ia == null || ia === 1) && isValidSheetDimension(ah, false)) rowHeight = ah;
+				else rowHeight = normalizeSheetDimension(h, 0);
 				if (rowDataItem.hd === 1) rowHeight = 0;
 			}
 			const gapSize = ((_this$_gapConfig$rowG2 = this._gapConfig.rowGaps) === null || _this$_gapConfig$rowG2 === void 0 || (_this$_gapConfig$rowG2 = _this$_gapConfig$rowG2[r]) === null || _this$_gapConfig$rowG2 === void 0 ? void 0 : _this$_gapConfig$rowG2.size) ?? 0;
@@ -27862,14 +27900,15 @@ let SheetSkeleton = class SheetSkeleton extends Skeleton {
 	_generateColumnMatrixCache(colCount, columnData, defaultColumnWidth) {
 		let columnTotalWidth = 0;
 		const columnWidthAccumulation = [];
+		const fallbackWidth = normalizeSheetDimension(defaultColumnWidth, 88, false);
 		const data = columnData;
 		for (let c = 0; c < colCount; c++) {
 			var _this$_gapConfig$colG2;
-			let columnWidth = defaultColumnWidth;
+			let columnWidth = fallbackWidth;
 			if (data[c] != null) {
 				const columnDataItem = data[c];
 				if (!columnDataItem) continue;
-				if (columnDataItem.w != null) columnWidth = columnDataItem.w;
+				if (columnDataItem.w !== void 0) columnWidth = normalizeSheetDimension(columnDataItem.w, 0);
 				if (columnDataItem.hd === 1) columnWidth = 0;
 			}
 			const gapSize = ((_this$_gapConfig$colG2 = this._gapConfig.colGaps) === null || _this$_gapConfig$colG2 === void 0 || (_this$_gapConfig$colG2 = _this$_gapConfig$colG2[c]) === null || _this$_gapConfig$colG2 === void 0 ? void 0 : _this$_gapConfig$colG2.size) ?? 0;
@@ -29538,7 +29577,10 @@ exports.isSameStyleTextRun = isSameStyleTextRun;
 exports.isTextFormat = isTextFormat;
 exports.isUnitRangesEqual = isUnitRangesEqual;
 exports.isValidBaseRecordId = isValidBaseRecordId;
+exports.isValidColumnDimensions = isValidColumnDimensions;
 exports.isValidRange = isValidRange;
+exports.isValidRowDimensions = isValidRowDimensions;
+exports.isValidSheetDimension = isValidSheetDimension;
 Object.defineProperty(exports, "isValueDependencyItem", {
   enumerable: true,
   get: function () {