@univerjs/core 1.1.0 → 1.2.0

package/lib/cjs/facade.js

@@ -39,10 +39,9 @@ var FBaseInitialable = class extends _univerjs_core.Disposable {
 		this._injector = _injector;
 		const Ctor = this.constructor;
 		if (Boolean(Ctor[ManualInitSymbol])) return;
-		const self = this;
 		const initializers = Object.getPrototypeOf(this)[InitializerSymbol$1];
-		if (initializers) initializers.forEach(function(fn) {
-			fn.apply(self, [_injector]);
+		if (initializers) initializers.forEach((fn) => {
+			fn.apply(this, [_injector]);
 		});
 	}
 	/**

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.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/common/array.ts
@@ -5804,7 +5804,7 @@ function datePartsToExcel1900Serial(year, month, day) {
 	return unixDays + (unixDays <= -25509 ? 25568 : 25569);
 }
 function excelSerialToDateTimeParts(serial, options) {
-	if (!Number.isFinite(serial) || serial < 0) return null;
+	if (!Number.isFinite(serial) || serial < 0 || serial >= getDateSystemMaxSerial(options.dateSystem) + 1) return null;
 	const wholeDays = Math.floor(serial);
 	const excel1900Serial = options.dateSystem === "date1904" ? wholeDays + EXCEL_1904_OFFSET : wholeDays;
 	const [year, month, day] = toYMD(excel1900Serial, 0, true);
@@ -14963,6 +14963,13 @@ function updateParagraphs(body, updateBody, textLength, currentIndex, coverType)
 				const { startIndex: removeStartIndex, paragraphId: removeParagraphId, paragraphStyle: removeParagraphStyle, bullet: removeBullet } = removeParagraph;
 				let newParagraphStyle;
 				let newBullet;
+				const paragraphAttributes = coverType === 0 ? {
+					...removeParagraph,
+					...updateParagraph
+				} : {
+					...updateParagraph,
+					...removeParagraph
+				};
 				if (coverType === 0) {
 					newParagraphStyle = {
 						...removeParagraphStyle,
@@ -14992,10 +14999,11 @@ function updateParagraphs(body, updateBody, textLength, currentIndex, coverType)
 				}
 				if (updateStartIndex === removeStartIndex) {
 					splitUpdateParagraphs.push({
+						...paragraphAttributes,
 						startIndex: updateStartIndex,
 						paragraphId: updateParagraphId ?? removeParagraphId,
 						paragraphStyle: newParagraphStyle,
-						bullet: newBullet
+						bullet: removeBullet == null && updateBullet == null ? void 0 : newBullet
 					});
 					break;
 				}
@@ -16067,7 +16075,7 @@ var ActionIterator = class {
 		return this.peekLength() < Number.POSITIVE_INFINITY;
 	}
 	next(length) {
-		if (!length) length = Number.POSITIVE_INFINITY;
+		if (length === void 0) length = Number.POSITIVE_INFINITY;
 		const nextAction = this._actions[this._index];
 		if (nextAction) {
 			const offset = this._offset;
@@ -16607,6 +16615,21 @@ function transformParagraph(originParagraph, targetParagraph, originCoverType, t
 	else if (originParagraph.bullet === void 0) paragraph.bullet = Tools.deepClone(targetParagraph.bullet);
 	else if (originCoverType === 1 || targetCoverType === 1) paragraph.bullet = transformType === 0 && targetParagraph.bullet ? Tools.deepClone(targetParagraph.bullet) : Tools.deepClone(originParagraph.bullet);
 	else if (transformType === 0 && targetParagraph.bullet !== void 0) paragraph.bullet = Tools.deepClone(targetParagraph.bullet);
+	for (const key of [
+		"headingCollapsed",
+		"styleId",
+		"sourceBullet",
+		"directBullet"
+	]) {
+		const origin = originParagraph[key];
+		const target = targetParagraph[key];
+		let value;
+		if (originCoverType === 1 && targetCoverType === 1) value = transformType === 1 ? origin : target;
+		else if (origin === void 0) value = target;
+		else if (originCoverType === 1 || targetCoverType === 1) value = transformType === 0 && target !== void 0 ? target : origin;
+		else if (transformType === 0) value = target;
+		if (value !== void 0) Object.assign(paragraph, { [key]: Tools.deepClone(value) });
+	}
 	if (paragraph.bullet === void 0) delete paragraph.bullet;
 	return paragraph;
 }
@@ -16944,11 +16967,7 @@ var TextX = class TextX {
 			}
 			if (action.t === "r" && action.body != null) {
 				const body = getBodySlice(doc, index, index + action.len, true);
-				for (const field of [
-					"tables",
-					"columnGroups",
-					"blockRanges"
-				]) if (action.body[field] == null) delete body[field];
+				for (const field of Object.keys(body)) if (field !== "dataStream" && field !== "paragraphs" && action.body[field] == null) Reflect.deleteProperty(body, field);
 				if (action.body.paragraphs == null) delete body.paragraphs;
 				else {
 					var _body$paragraphs;
@@ -25267,8 +25286,7 @@ let UniverInstanceService = class UniverInstanceService extends Disposable {
 		}
 	}
 	_tryResetFocusOnRemoval(unitId) {
-		var _this$focused3;
-		if (((_this$focused3 = this.focused) === null || _this$focused3 === void 0 ? void 0 : _this$focused3.getUnitId()) === unitId) this._focused$.next(null);
+		if (this._focused$.getValue() === unitId) this.focusUnit(null);
 	}
 	_getUnitById(unitId) {
 		for (const [type, units] of this._unitsByType) {
@@ -27201,6 +27219,69 @@ var RTree = class {
 	}
 };
 
+//#endregion
+//#region src/types/enum/record-filter.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/** Typed record identities shared by compact Table and external report filters. */
+let RecordValueType = /* @__PURE__ */ function(RecordValueType) {
+	RecordValueType["Blank"] = "blank";
+	RecordValueType["String"] = "string";
+	RecordValueType["Number"] = "number";
+	RecordValueType["Date"] = "date";
+	RecordValueType["Boolean"] = "boolean";
+	RecordValueType["Error"] = "error";
+	return RecordValueType;
+}({});
+/** Values are wire identifiers; an absent native Table filter represents All. */
+let FilterSelectionMode = /* @__PURE__ */ function(FilterSelectionMode) {
+	FilterSelectionMode["All"] = "all";
+	FilterSelectionMode["Include"] = "include";
+	FilterSelectionMode["Exclude"] = "exclude";
+	return FilterSelectionMode;
+}({});
+
+//#endregion
+//#region src/shared/record-value.ts
+function getRecordValueKey(_value) {
+	const value = _value;
+	if (!isRecord(value) || typeof value.type !== "string") throw new TypeError("Invalid record value.");
+	switch (value.type) {
+		case "blank":
+			if ("value" in value) throw new TypeError("Blank record values cannot have a value.");
+			return "[\"blank\"]";
+		case "string":
+		case "error":
+			if (typeof value.value !== "string") throw new TypeError("Invalid record value.");
+			return JSON.stringify([value.type, value.value]);
+		case "boolean":
+			if (typeof value.value !== "boolean") throw new TypeError("Invalid record value.");
+			return JSON.stringify([value.type, value.value]);
+		case "number":
+		case "date":
+			if (typeof value.value !== "number") throw new TypeError("Invalid record value.");
+			if (!Number.isFinite(value.value)) throw new RangeError("Record numeric values must be finite.");
+			return JSON.stringify([value.type, value.value === 0 ? 0 : value.value]);
+		default: throw new TypeError("Unknown record value type.");
+	}
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 //#endregion
 //#region src/shared/timer.ts
 /**
@@ -27247,6 +27328,32 @@ function delayAnimationFrame(frames = 1) {
 	});
 }
 
+//#endregion
+//#region src/shared/units.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/** English Metric Units per CSS pixel at 96 DPI. */
+const EMU_PER_CSS_PX = 9525;
+function cssPxToEmu(value) {
+	return Math.round(value * EMU_PER_CSS_PX);
+}
+function emuToCssPx(value) {
+	return value / EMU_PER_CSS_PX;
+}
+
 //#endregion
 //#region src/sheets/clone.ts
 /**
@@ -27473,6 +27580,21 @@ Skeleton = __decorate([__decorateParam(0, (0, _wendellhu_redi.Inject)(LocaleServ
 //#endregion
 //#region src/sheets/sheet-skeleton.ts
 /**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
 * Reusable gap fixture for visual and integration testing.
 */
 function createSheetGapTestConfig(overrides = {}) {
@@ -28070,13 +28192,14 @@ let SheetSkeleton = class SheetSkeleton extends Skeleton {
 		};
 	}
 	/**
-	* Here, offsetX and offsetY are the coordinates in the viewport, including the rowHeaderWidthAndMarginLeft and columnHeaderHeightAndMarginTop.
+	* Coordinates include the row and column headers. Defaults to the current viewport transform;
+	* pass unit scales and zero scroll for Sheet model coordinates.
 	*/
-	getCellIndexAndOffsetByPosition(offsetX, offsetY) {
-		const { actualRow, actualColumn, startX, startY } = this.getCellWithCoordByOffset(offsetX, offsetY, this._scaleX, this._scaleY, {
-			x: this._scrollX,
-			y: this._scrollY
-		});
+	getCellIndexAndOffsetByPosition(offsetX, offsetY, scaleX = this._scaleX, scaleY = this._scaleY, scrollXY = {
+		x: this._scrollX,
+		y: this._scrollY
+	}) {
+		const { actualRow, actualColumn, startX, startY } = this.getCellWithCoordByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);
 		return {
 			row: actualRow,
 			rowOffset: offsetY - startY,
@@ -28462,41 +28585,6 @@ let DataValidationType = /* @__PURE__ */ function(DataValidationType) {
 	return DataValidationType;
 }({});
 
-//#endregion
-//#region src/types/enum/record-filter.ts
-/**
-* Copyright 2023-present DreamNum Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/** Typed record identities shared by compact Table and external report filters. */
-let RecordValueType = /* @__PURE__ */ function(RecordValueType) {
-	RecordValueType["Blank"] = "blank";
-	RecordValueType["String"] = "string";
-	RecordValueType["Number"] = "number";
-	RecordValueType["Date"] = "date";
-	RecordValueType["Boolean"] = "boolean";
-	RecordValueType["Error"] = "error";
-	return RecordValueType;
-}({});
-/** Values are wire identifiers; an absent native Table filter represents All. */
-let FilterSelectionMode = /* @__PURE__ */ function(FilterSelectionMode) {
-	FilterSelectionMode["All"] = "all";
-	FilterSelectionMode["Include"] = "include";
-	FilterSelectionMode["Exclude"] = "exclude";
-	return FilterSelectionMode;
-}({});
-
 //#endregion
 //#region src/services/resource-loader/resource-loader.service.ts
 let ResourceLoaderService = class ResourceLoaderService extends Disposable {
@@ -28915,6 +29003,7 @@ exports.DocumentFlavor = DocumentFlavor;
 exports.DocxBreakType = DocxBreakType;
 exports.DrawingTypeEnum = DrawingTypeEnum;
 exports.EDITOR_ACTIVATED = EDITOR_ACTIVATED;
+exports.EMU_PER_CSS_PX = EMU_PER_CSS_PX;
 exports.EXCEL_1904_OFFSET = EXCEL_1904_OFFSET;
 exports.EXTENSION_NAMES = EXTENSION_NAMES;
 exports.ErrorService = ErrorService;
@@ -29287,6 +29376,7 @@ exports.createRandomId = createRandomId;
 exports.createRowColIter = createRowColIter;
 exports.createSectionId = createSectionId;
 exports.createSheetGapTestConfig = createSheetGapTestConfig;
+exports.cssPxToEmu = cssPxToEmu;
 exports.currencySymbols = currencySymbols;
 exports.customNameCharacterCheck = customNameCharacterCheck;
 exports.dateKit = dateKit;
@@ -29301,6 +29391,7 @@ exports.dedupeBy = dedupeBy;
 exports.deepCompare = deepCompare;
 exports.delayAnimationFrame = delayAnimationFrame;
 exports.deleteContent = deleteContent;
+exports.emuToCssPx = emuToCssPx;
 exports.excelDateSerial = excelDateSerial;
 exports.excelDateTimePartsToSerial = excelDateTimePartsToSerial;
 exports.excelDateTimeSerial = excelDateTimeSerial;
@@ -29360,6 +29451,7 @@ exports.getParagraphContentStartOffsets = getParagraphContentStartOffsets;
 exports.getParagraphFollowingBlockOffset = getParagraphFollowingBlockOffset;
 exports.getParagraphsSlice = getParagraphsSlice;
 exports.getPlainText = getPlainText;
+exports.getRecordValueKey = getRecordValueKey;
 exports.getReverseDirection = getReverseDirection;
 exports.getRichTextEditPath = getRichTextEditPath;
 exports.getSdtBindingKey = getSdtBindingKey;

package/lib/es/facade.js

@@ -38,10 +38,9 @@ var FBaseInitialable = class extends Disposable {
 		this._injector = _injector;
 		const Ctor = this.constructor;
 		if (Boolean(Ctor[ManualInitSymbol])) return;
-		const self = this;
 		const initializers = Object.getPrototypeOf(this)[InitializerSymbol$1];
-		if (initializers) initializers.forEach(function(fn) {
-			fn.apply(self, [_injector]);
+		if (initializers) initializers.forEach((fn) => {
+			fn.apply(this, [_injector]);
 		});
 	}
 	/**