@univerjs/engine-render 1.0.0-alpha.8 → 1.0.0-beta.0

package/lib/cjs/index.js

@@ -64,6 +64,143 @@ function _defineProperty(e, r, t) {
 	}) : e[r] = t, e;
 }
 
+//#endregion
+//#region src/alignment-snap.ts
+const DEFAULT_ENTER_THRESHOLD = 6;
+const DEFAULT_EXIT_THRESHOLD = 11;
+const DEFAULT_COOLDOWN_MS = 250;
+function normalizeAlignmentRect(rect) {
+	return {
+		left: rect.width >= 0 ? rect.left : rect.left + rect.width,
+		top: rect.height >= 0 ? rect.top : rect.top + rect.height,
+		width: Math.abs(rect.width),
+		height: Math.abs(rect.height)
+	};
+}
+function getAlignmentRectXAnchors(rect) {
+	const normalized = normalizeAlignmentRect(rect);
+	return [
+		normalized.left,
+		normalized.left + normalized.width / 2,
+		normalized.left + normalized.width
+	];
+}
+function getAlignmentRectYAnchors(rect) {
+	const normalized = normalizeAlignmentRect(rect);
+	return [
+		normalized.top,
+		normalized.top + normalized.height / 2,
+		normalized.top + normalized.height
+	];
+}
+function getClosestAlignmentOffset(activeAnchors, targetAnchors, threshold) {
+	let closestOffset = 0;
+	let closestDistance = Number.POSITIVE_INFINITY;
+	targetAnchors.forEach((target) => {
+		activeAnchors.forEach((active) => {
+			const offset = target - active;
+			const distance = Math.abs(offset);
+			if (distance <= threshold && distance < closestDistance) {
+				closestDistance = distance;
+				closestOffset = offset;
+			}
+		});
+	});
+	return closestDistance === Number.POSITIVE_INFINITY ? 0 : closestOffset;
+}
+var AlignmentSnapSession = class {
+	constructor(config = {}) {
+		_defineProperty(this, "_enterThreshold", void 0);
+		_defineProperty(this, "_exitThreshold", void 0);
+		_defineProperty(this, "_breakawayThreshold", void 0);
+		_defineProperty(this, "_softThreshold", void 0);
+		_defineProperty(this, "_hardThreshold", void 0);
+		_defineProperty(this, "_softMaxStrength", void 0);
+		_defineProperty(this, "_cooldownMs", void 0);
+		_defineProperty(this, "_activeGuideId", null);
+		_defineProperty(this, "_activeGuideStartValue", null);
+		_defineProperty(this, "_releasedUntil", 0);
+		this._enterThreshold = config.enterThreshold ?? DEFAULT_ENTER_THRESHOLD;
+		this._exitThreshold = config.exitThreshold ?? DEFAULT_EXIT_THRESHOLD;
+		this._breakawayThreshold = config.breakawayThreshold;
+		this._softThreshold = config.softThreshold;
+		this._hardThreshold = config.hardThreshold ?? this._enterThreshold;
+		this._softMaxStrength = clamp$2(config.softMaxStrength ?? .65, 0, 1);
+		this._cooldownMs = config.cooldownMs ?? DEFAULT_COOLDOWN_MS;
+	}
+	reset() {
+		this._activeGuideId = null;
+		this._activeGuideStartValue = null;
+		this._releasedUntil = 0;
+	}
+	resolveAxisSnap(options) {
+		const { value, guide } = options;
+		const now = options.now ?? Date.now();
+		if (!guide) {
+			this._activeGuideId = null;
+			this._activeGuideStartValue = null;
+			return {
+				snapped: false,
+				value,
+				guide: null
+			};
+		}
+		const distance = Math.abs(value - guide.position);
+		if (this._activeGuideId === guide.id) {
+			const rawDragDistance = this._activeGuideStartValue === null ? 0 : Math.abs(value - this._activeGuideStartValue);
+			const isPastBreakaway = this._breakawayThreshold !== void 0 && rawDragDistance > this._breakawayThreshold;
+			const exitThreshold = this._softThreshold ?? this._exitThreshold;
+			if (isPastBreakaway || distance > exitThreshold) {
+				this._activeGuideId = null;
+				this._activeGuideStartValue = null;
+				this._releasedUntil = now + this._cooldownMs;
+				return {
+					snapped: false,
+					value,
+					guide: null
+				};
+			}
+			return {
+				snapped: true,
+				value: this._resolveSnappedValue(value, guide.position),
+				guide
+			};
+		}
+		if (this._releasedUntil > now) return {
+			snapped: false,
+			value,
+			guide: null
+		};
+		if (distance <= (this._softThreshold ?? this._enterThreshold)) {
+			this._activeGuideId = guide.id;
+			this._activeGuideStartValue = value;
+			return {
+				snapped: true,
+				value: this._resolveSnappedValue(value, guide.position),
+				guide
+			};
+		}
+		return {
+			snapped: false,
+			value,
+			guide: null
+		};
+	}
+	_resolveSnappedValue(value, guidePosition) {
+		if (this._softThreshold === void 0) return guidePosition;
+		const distance = Math.abs(value - guidePosition);
+		if (distance <= this._hardThreshold) return guidePosition;
+		if (distance >= this._softThreshold) return value;
+		const span = Math.max(this._softThreshold - this._hardThreshold, .001);
+		const progress = clamp$2((this._softThreshold - distance) / span, 0, 1);
+		const strength = progress * progress * (3 - 2 * progress) * this._softMaxStrength;
+		return value + (guidePosition - value) * strength;
+	}
+};
+function clamp$2(value, min, max) {
+	return Math.min(Math.max(value, min), max);
+}
+
 //#endregion
 //#region src/components/docs/layout/shaping-engine/font-cache.ts
 const DEFAULT_MEASURE_TEXT = "0";
@@ -744,14 +881,11 @@ function getParagraphByGlyph(glyph, body) {
 	for (let i = 0; i < paragraphs.length; i++) {
 		const paragraph = paragraphs[i];
 		const prevParagraph = paragraphs[i - 1];
-		if (paragraph.startIndex === line.paragraphIndex) {
-			var _prevParagraph$startI;
-			return {
-				...paragraph,
-				paragraphStart: ((_prevParagraph$startI = prevParagraph === null || prevParagraph === void 0 ? void 0 : prevParagraph.startIndex) !== null && _prevParagraph$startI !== void 0 ? _prevParagraph$startI : -1) + 1,
-				paragraphEnd: paragraph.startIndex
-			};
-		}
+		if (paragraph.startIndex === line.paragraphIndex) return {
+			...paragraph,
+			paragraphStart: ((prevParagraph === null || prevParagraph === void 0 ? void 0 : prevParagraph.startIndex) ?? -1) + 1,
+			paragraphEnd: paragraph.startIndex
+		};
 	}
 }
 function isPlaceholderOrSpace(glyph) {
@@ -778,6 +912,10 @@ const PI_OVER_DEG180 = Math.PI / DEG180;
 const DEG180_OVER_PI = DEG180 / Math.PI;
 const RGB_PAREN = "rgb(";
 const RGBA_PAREN = "rgba(";
+const SCROLLABLE_OVERFLOW_EPSILON = .5;
+function hasScrollableOverflow(contentSize, viewportSize) {
+	return contentSize - viewportSize > SCROLLABLE_OVERFLOW_EPSILON;
+}
 const getColor = (RgbArray, opacity) => {
 	if (!RgbArray) return `${RGB_PAREN}0,0,0)`;
 	if (opacity != null) return `${RGBA_PAREN + RgbArray.join(",")},${opacity})`;
@@ -929,10 +1067,7 @@ function getFontStyleString(textStyle) {
 }
 function normalizeFontFamily(fontFamily, defaultFont) {
 	if (!(fontFamily === null || fontFamily === void 0 ? void 0 : fontFamily.trim())) return defaultFont;
-	return fontFamily.split(",").map((item) => {
-		const family = item.trim().replace(/^['"]|['"]$/g, "");
-		return family.includes(" ") ? `"${family}"` : family;
-	}).filter(Boolean).join(", ");
+	return fontFamily.split(",").map((item) => item.trim().replace(/^['"]|['"]$/g, "")).filter(Boolean).map((family) => /^[\p{L}_-][\p{L}\p{N}_-]*$/u.test(family) ? family : `"${family.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"")}"`).join(", ");
 }
 function hasAllLatin(text) {
 	if (!/[\u0000-\u024F]/gi.exec(text)) return false;
@@ -956,8 +1091,8 @@ function hasLatinExtendedB(text) {
 }
 const segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function getFirstGrapheme(text) {
-	var _it$next$value$segmen, _it$next$value;
-	return (_it$next$value$segmen = (_it$next$value = segmenter.segment(text)[Symbol.iterator]().next().value) === null || _it$next$value === void 0 ? void 0 : _it$next$value.segment) !== null && _it$next$value$segmen !== void 0 ? _it$next$value$segmen : null;
+	var _it$next$value;
+	return ((_it$next$value = segmenter.segment(text)[Symbol.iterator]().next().value) === null || _it$next$value === void 0 ? void 0 : _it$next$value.segment) ?? null;
 }
 function isEmojiGrapheme(grapheme) {
 	if (/\p{Extended_Pictographic}/u.test(grapheme)) return true;
@@ -2606,10 +2741,13 @@ var RollingAverage = class {
 			delta = bottomValue - this.averageFrameTime;
 			this._m2 -= delta * (bottomValue - this.averageFrameTime);
 		} else this._sampleCount++;
-		const min = Math.min(...this._samples);
-		const max = Math.min(...this._samples);
-		const filteredData = this._samples.filter((v) => v !== max && v !== min);
-		this.averageFrameTime = filteredData.reduce((sum, value) => sum + value, 0) / filteredData.length;
+		const shouldTrimExtremes = this.isSaturated() && this._sampleCount > 2;
+		const sampleSum = this._samples.reduce((sum, value) => sum + value, 0);
+		if (shouldTrimExtremes) {
+			const min = Math.min(...this._samples);
+			const max = Math.max(...this._samples);
+			this.averageFrameTime = (sampleSum - min - max) / (this._sampleCount - 2);
+		} else this.averageFrameTime = sampleSum / this._sampleCount;
 		delta = frameDuration - this.averageFrameTime;
 		this._m2 += delta * (frameDuration - this.averageFrameTime);
 		this.variance = this._m2 / (this._sampleCount - 1);
@@ -3022,9 +3160,8 @@ var Transform = class Transform {
 	* @return {number[]} transform matrix
 	*/
 	_calcDimensionsMatrix(options) {
-		var _options$scaleX, _options$scaleY;
-		const scaleX = (_options$scaleX = options.scaleX) !== null && _options$scaleX !== void 0 ? _options$scaleX : 1;
-		const scaleY = (_options$scaleY = options.scaleY) !== null && _options$scaleY !== void 0 ? _options$scaleY : 1;
+		const scaleX = options.scaleX ?? 1;
+		const scaleY = options.scaleY ?? 1;
 		const scaleMatrix = new Transform([
 			options.flipX ? -scaleX : scaleX,
 			0,
@@ -3548,6 +3685,26 @@ var BaseObject = class extends _univerjs_core.Disposable {
 			flipY: this.flipY
 		};
 	}
+	/**
+	* Returns the flip state after composing this object with every ancestor
+	* drawing group whose transform participates in rendering.
+	*/
+	getEffectiveFlipState() {
+		let flipX = this.flipX;
+		let flipY = this.flipY;
+		let isInGroup = this.isInGroup;
+		let parent = this.getParent();
+		while (isInGroup && (parent === null || parent === void 0 ? void 0 : parent.classType) === "Group") {
+			flipX = flipX !== Boolean(parent.flipX);
+			flipY = flipY !== Boolean(parent.flipY);
+			isInGroup = Boolean(parent.isInGroup);
+			parent = parent.getParent();
+		}
+		return {
+			flipX,
+			flipY
+		};
+	}
 	getRealBound() {
 		var _this$parent, _this$parent2;
 		let { width: realWidth, height: realHeight, left: realLeft, top: realTop } = this;
@@ -3562,16 +3719,21 @@ var BaseObject = class extends _univerjs_core.Disposable {
 				width: parentRealBound.width || 0,
 				height: parentRealBound.height || 0
 			};
-			const realBound = getRenderTransformBaseOnParentBound(baseBound, parentBound, {
+			const rotatedBound = getRotatedBoundInGroup({
 				width: realWidth,
 				height: realHeight,
 				left: realLeft,
 				top: realTop
-			});
-			realWidth = realBound.width;
-			realHeight = realBound.height;
-			realLeft = realBound.left - parentBound.left - parentBound.width / 2;
-			realTop = realBound.top - parentBound.top - parentBound.height / 2;
+			}, this.angle);
+			const mappedRotatedBound = getRenderTransformBaseOnParentBound(baseBound, parentBound, rotatedBound);
+			const normalizedAngle = (this.angle % 360 + 360) % 360;
+			const swapsAxes = normalizedAngle >= 45 && normalizedAngle < 135 || normalizedAngle >= 225 && normalizedAngle < 315;
+			const mappedCenterX = mappedRotatedBound.left + mappedRotatedBound.width / 2;
+			const mappedCenterY = mappedRotatedBound.top + mappedRotatedBound.height / 2;
+			realWidth = swapsAxes ? mappedRotatedBound.height : mappedRotatedBound.width;
+			realHeight = swapsAxes ? mappedRotatedBound.width : mappedRotatedBound.height;
+			realLeft = mappedCenterX - realWidth / 2 - parentBound.left - parentBound.width / 2;
+			realTop = mappedCenterY - realHeight / 2 - parentBound.top - parentBound.height / 2;
 		}
 		return {
 			left: realLeft,
@@ -3859,6 +4021,10 @@ function colorWithOpacity(color, opacity) {
 	if (!parsedColor.isValid) return color;
 	return parsedColor.setAlpha(parsedColor.getAlpha() * clamp(opacity, 0, 1)).toRgbString();
 }
+function isTransparentColor(color) {
+	const parsedColor = new _univerjs_core.ColorKit(color);
+	return parsedColor.isValid && parsedColor.getAlpha() <= 0;
+}
 function cssPixels(value) {
 	return `${Math.abs(value) < Number.EPSILON ? 0 : value}px`;
 }
@@ -3866,24 +4032,24 @@ function toDropShadowFilter(effect) {
 	return `drop-shadow(${cssPixels(effect.offsetX)} ${cssPixels(effect.offsetY)} ${cssPixels(effect.blurRadius)} ${effect.color})`;
 }
 function resolveOuterShadowEffect(effect) {
-	var _effect$distance, _effect$direction, _effect$sx, _effect$sy, _effect$blurRadius;
-	if (!(effect === null || effect === void 0 ? void 0 : effect.color)) return;
-	const distance = (_effect$distance = effect.distance) !== null && _effect$distance !== void 0 ? _effect$distance : 0;
-	const direction = ((_effect$direction = effect.direction) !== null && _effect$direction !== void 0 ? _effect$direction : 0) * Math.PI / 180;
-	const sizeScale = (((_effect$sx = effect.sx) !== null && _effect$sx !== void 0 ? _effect$sx : 1) + ((_effect$sy = effect.sy) !== null && _effect$sy !== void 0 ? _effect$sy : 1)) / 2;
+	if (!(effect === null || effect === void 0 ? void 0 : effect.color) || effect.opacity !== void 0 && effect.opacity <= 0) return;
+	const distance = effect.distance ?? 0;
+	const direction = (effect.direction ?? 0) * Math.PI / 180;
+	const sizeScale = ((effect.sx ?? 1) + (effect.sy ?? 1)) / 2;
+	const color = colorWithOpacity(effect.color, effect.opacity);
+	if (isTransparentColor(color)) return;
 	return {
-		color: colorWithOpacity(effect.color, effect.opacity),
-		blurRadius: Math.max(0, (_effect$blurRadius = effect.blurRadius) !== null && _effect$blurRadius !== void 0 ? _effect$blurRadius : 0) * sizeScale,
+		color,
+		blurRadius: Math.max(0, effect.blurRadius ?? 0) * sizeScale,
 		offsetX: Math.cos(direction) * distance * sizeScale,
 		offsetY: Math.sin(direction) * distance * sizeScale
 	};
 }
 function resolveGlowEffect(effect) {
-	var _effect$radius;
-	if (!(effect === null || effect === void 0 ? void 0 : effect.color)) return;
+	if (!(effect === null || effect === void 0 ? void 0 : effect.color) || (effect.radius ?? 0) <= 0 || isTransparentColor(effect.color)) return;
 	return {
 		color: effect.color,
-		blurRadius: Math.max(0, (_effect$radius = effect.radius) !== null && _effect$radius !== void 0 ? _effect$radius : 0) * DRAWINGML_GLOW_BLUR_SCALE,
+		blurRadius: Math.max(0, effect.radius ?? 0) * DRAWINGML_GLOW_BLUR_SCALE,
 		offsetX: 0,
 		offsetY: 0
 	};
@@ -4166,7 +4332,27 @@ var UniverRenderingContext2D = class {
 		return this._context.createConicGradient(startAngle, x, y);
 	}
 	roundRect(x, y, w, h, radii) {
-		this._context.roundRect(x, y, w, h, radii);
+		if (typeof this._context.roundRect === "function") {
+			this._context.roundRect(x, y, w, h, radii);
+			return;
+		}
+		const radius = typeof radii === "number" ? Math.min(radii, w / 2, h / 2) : 0;
+		if (!(radius > 0) || !Number.isFinite(radius)) {
+			this._context.rect(x, y, w, h);
+			return;
+		}
+		const right = x + w;
+		const bottom = y + h;
+		this._context.moveTo(x + radius, y);
+		this._context.lineTo(right - radius, y);
+		this._context.quadraticCurveTo(right, y, right, y + radius);
+		this._context.lineTo(right, bottom - radius);
+		this._context.quadraticCurveTo(right, bottom, right - radius, bottom);
+		this._context.lineTo(x + radius, bottom);
+		this._context.quadraticCurveTo(x, bottom, x, bottom - radius);
+		this._context.lineTo(x, y + radius);
+		this._context.quadraticCurveTo(x, y, x + radius, y);
+		this._context.closePath();
 	}
 	roundRectByPrecision(x, y, w, h, radii) {
 		const { scaleX, scaleY } = this._getScale();
@@ -5172,11 +5358,10 @@ var Background = class extends SheetExtension {
 			const bgColorMatrix = bgMatrixCacheByColor[rgb];
 			const renderRanges = diffRanges && diffRanges.length > 0 ? diffRanges : viewRanges;
 			const rangeForEachFn = (row, col, bgConfigParam) => {
-				var _backgroundPositions$;
 				if (hasMergeData) {
 					if (spreadsheetSkeleton.worksheet.getSpanModel().getMergeDataIndex(row, col) !== -1) return;
 				}
-				const cellInfo = (_backgroundPositions$ = backgroundPositions === null || backgroundPositions === void 0 ? void 0 : backgroundPositions.getValue(row, col)) !== null && _backgroundPositions$ !== void 0 ? _backgroundPositions$ : spreadsheetSkeleton.getCellWithCoordByIndex(row, col, false);
+				const cellInfo = (backgroundPositions === null || backgroundPositions === void 0 ? void 0 : backgroundPositions.getValue(row, col)) ?? spreadsheetSkeleton.getCellWithCoordByIndex(row, col, false);
 				if (!cellInfo) return;
 				if (bgConfigParam || bgColorMatrix.getValue(row, col)) {
 					renderBGContext.cellInfo = cellInfo;
@@ -5555,26 +5740,22 @@ var ColumnHeaderLayout = class extends SheetExtension {
 	}
 	configHeaderColumn(cfg, sheetId) {
 		if (sheetId) {
-			var _cfg$columnsCfg, _cfg$headerStyle;
-			this.columnsCfgOfWorksheet.set(sheetId, (_cfg$columnsCfg = cfg.columnsCfg) !== null && _cfg$columnsCfg !== void 0 ? _cfg$columnsCfg : {});
-			this.headerStyleOfWorksheet.set(sheetId, (_cfg$headerStyle = cfg.headerStyle) !== null && _cfg$headerStyle !== void 0 ? _cfg$headerStyle : {});
+			this.columnsCfgOfWorksheet.set(sheetId, cfg.columnsCfg ?? {});
+			this.headerStyleOfWorksheet.set(sheetId, cfg.headerStyle ?? {});
 		} else {
-			var _cfg$columnsCfg2, _cfg$headerStyle2;
-			this.columnsCfg = (_cfg$columnsCfg2 = cfg.columnsCfg) !== null && _cfg$columnsCfg2 !== void 0 ? _cfg$columnsCfg2 : {};
-			this.headerStyle = (_cfg$headerStyle2 = cfg.headerStyle) !== null && _cfg$headerStyle2 !== void 0 ? _cfg$headerStyle2 : {};
+			this.columnsCfg = cfg.columnsCfg ?? {};
+			this.headerStyle = cfg.headerStyle ?? {};
 		}
 	}
 	getColumnsCfg(sheetId) {
-		var _this$columnsCfgOfWor;
-		const columnsCfg = (_this$columnsCfgOfWor = this.columnsCfgOfWorksheet.get(sheetId)) !== null && _this$columnsCfgOfWor !== void 0 ? _this$columnsCfgOfWor : {};
+		const columnsCfg = this.columnsCfgOfWorksheet.get(sheetId) ?? {};
 		return {
 			...this.columnsCfg,
 			...columnsCfg
 		};
 	}
 	getHeaderStyle(sheetId) {
-		var _this$headerStyleOfWo;
-		const headerStyle = (_this$headerStyleOfWo = this.headerStyleOfWorksheet.get(sheetId)) !== null && _this$headerStyleOfWo !== void 0 ? _this$headerStyleOfWo : {};
+		const headerStyle = this.headerStyleOfWorksheet.get(sheetId) ?? {};
 		return {
 			...DEFAULT_COLUMN_STYLE,
 			...this.headerStyle,
@@ -5625,13 +5806,12 @@ var ColumnHeaderLayout = class extends SheetExtension {
 		let preColumnPosition = 0;
 		const colGaps = (_spreadsheetSkeleton$ = spreadsheetSkeleton.gapConfig) === null || _spreadsheetSkeleton$ === void 0 ? void 0 : _spreadsheetSkeleton$.colGaps;
 		for (let c = startColumn - 1; c <= endColumn; c++) {
-			var _colGaps$c$size, _colGaps$c;
+			var _colGaps$c;
 			if (c < 0 || c > columnWidthAccumulation.length - 1) continue;
 			const columnEndPosition = columnWidthAccumulation[c];
 			if (preColumnPosition === columnEndPosition) continue;
-			const gapSize = (_colGaps$c$size = colGaps === null || colGaps === void 0 || (_colGaps$c = colGaps[c]) === null || _colGaps$c === void 0 ? void 0 : _colGaps$c.size) !== null && _colGaps$c$size !== void 0 ? _colGaps$c$size : 0;
+			const gapSize = (colGaps === null || colGaps === void 0 || (_colGaps$c = colGaps[c]) === null || _colGaps$c === void 0 ? void 0 : _colGaps$c.size) ?? 0;
 			if (gapSize > 0) {
-				var _gapItem$color, _gapItem$stripeColor;
 				const gapItem = colGaps[c];
 				const gapLeft = preColumnPosition;
 				const gapRight = preColumnPosition + gapSize;
@@ -5639,14 +5819,14 @@ var ColumnHeaderLayout = class extends SheetExtension {
 				const defaultBg = defaultBackgroundColor;
 				const defaultStripe = defaultStripeColor;
 				ctx.save();
-				ctx.fillStyle = (_gapItem$color = gapItem.color) !== null && _gapItem$color !== void 0 ? _gapItem$color : defaultBg;
+				ctx.fillStyle = gapItem.color ?? defaultBg;
 				ctx.fillRectByPrecision(gapLeft, 0, gapSize, columnHeaderHeight);
 				ctx.restore();
 				ctx.save();
 				ctx.beginPath();
 				ctx.rectByPrecision(gapLeft, 0, gapSize, columnHeaderHeight);
 				ctx.clip();
-				ctx.strokeStyle = (_gapItem$stripeColor = gapItem.stripeColor) !== null && _gapItem$stripeColor !== void 0 ? _gapItem$stripeColor : defaultStripe;
+				ctx.strokeStyle = gapItem.stripeColor ?? defaultStripe;
 				ctx.lineWidth = 1;
 				ctx.beginPath();
 				const spacing = 6;
@@ -11887,7 +12067,7 @@ var Shape = class extends BaseObject {
 	*/
 	static _renderStroke(ctx, props) {
 		const { stroke, strokeWidth, strokeScaleEnabled } = props;
-		if (!stroke || strokeWidth === 0) return;
+		if (!stroke || strokeWidth === void 0 || !Number.isFinite(strokeWidth) || strokeWidth <= 0) return;
 		ctx.save();
 		this._setStrokeStyles(ctx, props);
 		ctx.stroke();
@@ -12040,7 +12220,6 @@ const TEXT_OBJECT_ARRAY = [
 ];
 var Text = class Text extends Shape {
 	constructor(key, props) {
-		var _props$warp, _props$hAlign, _props$vAlign;
 		super(key, props);
 		_defineProperty(this, "text", void 0);
 		_defineProperty(this, "fontStyle", void 0);
@@ -12052,22 +12231,21 @@ var Text = class Text extends Shape {
 		this.height = props.height;
 		this.text = props.text;
 		this.fontStyle = props.fontStyle;
-		this.warp = (_props$warp = props.warp) !== null && _props$warp !== void 0 ? _props$warp : false;
-		this.hAlign = (_props$hAlign = props.hAlign) !== null && _props$hAlign !== void 0 ? _props$hAlign : _univerjs_core.HorizontalAlign.LEFT;
-		this.vAlign = (_props$vAlign = props.vAlign) !== null && _props$vAlign !== void 0 ? _props$vAlign : _univerjs_core.VerticalAlign.TOP;
+		this.warp = props.warp ?? false;
+		this.hAlign = props.hAlign ?? _univerjs_core.HorizontalAlign.LEFT;
+		this.vAlign = props.vAlign ?? _univerjs_core.VerticalAlign.TOP;
 		this.skeleton = new DocSimpleSkeleton(props.text, props.fontStyle, Boolean(props.warp), props.width, props.height);
 	}
 	static drawWith(ctx, props, _skeleton) {
-		var _cachedLayout$lines, _cachedLayout$totalHe, _props$color;
 		const { text, fontStyle, warp, hAlign, vAlign, width, height, left = 0, top = 0, cellValueType } = props;
 		const cachedLayout = !_skeleton && !warp ? Text._getCachedLayout(text, fontStyle) : null;
-		const skeleton = cachedLayout ? null : _skeleton !== null && _skeleton !== void 0 ? _skeleton : new DocSimpleSkeleton(text, fontStyle, Boolean(warp), width, vAlign === _univerjs_core.VerticalAlign.TOP ? height : Infinity);
-		const lines = (_cachedLayout$lines = cachedLayout === null || cachedLayout === void 0 ? void 0 : cachedLayout.lines) !== null && _cachedLayout$lines !== void 0 ? _cachedLayout$lines : skeleton.calculate();
-		const totalHeight = (_cachedLayout$totalHe = cachedLayout === null || cachedLayout === void 0 ? void 0 : cachedLayout.totalHeight) !== null && _cachedLayout$totalHe !== void 0 ? _cachedLayout$totalHe : skeleton.getTotalHeight();
+		const skeleton = cachedLayout ? null : _skeleton ?? new DocSimpleSkeleton(text, fontStyle, Boolean(warp), width, vAlign === _univerjs_core.VerticalAlign.TOP ? height : Infinity);
+		const lines = (cachedLayout === null || cachedLayout === void 0 ? void 0 : cachedLayout.lines) ?? skeleton.calculate();
+		const totalHeight = (cachedLayout === null || cachedLayout === void 0 ? void 0 : cachedLayout.totalHeight) ?? skeleton.getTotalHeight();
 		let lineTop = top + (vAlign === _univerjs_core.VerticalAlign.TOP ? 0 : vAlign === _univerjs_core.VerticalAlign.MIDDLE ? (height - totalHeight) / 2 : height - totalHeight);
 		ctx.save();
 		ctx.font = fontStyle;
-		ctx.fillStyle = (_props$color = props.color) !== null && _props$color !== void 0 ? _props$color : COLOR_BLACK_RGB;
+		ctx.fillStyle = props.color ?? "rgb(0,0,0)";
 		for (const line of lines) {
 			const lineHeight = line.height;
 			const lineWidth = line.width;
@@ -12090,17 +12268,14 @@ var Text = class Text extends Shape {
 			}
 			const baselineY = lineTop + line.baseline;
 			ctx.fillText(line.text, left + lineX, baselineY);
-			if (props.underline) {
-				var _props$underlineType;
-				this._drawTextDecoration(ctx, {
-					x: left + lineX,
-					y: lineTop + lineHeight - 1,
-					width: lineWidth,
-					color: props.color || "#000000",
-					lineWidth: 1,
-					lineType: (_props$underlineType = props.underlineType) !== null && _props$underlineType !== void 0 ? _props$underlineType : _univerjs_core.TextDecoration.SINGLE
-				});
-			}
+			if (props.underline) this._drawTextDecoration(ctx, {
+				x: left + lineX,
+				y: lineTop + lineHeight - 1,
+				width: lineWidth,
+				color: props.color || "#000000",
+				lineWidth: 1,
+				lineType: props.underlineType ?? _univerjs_core.TextDecoration.SINGLE
+			});
 			if (props.strokeLine) this._drawTextDecoration(ctx, {
 				x: left + lineX,
 				y: lineTop + line.baseline - lineHeight * .3,
@@ -12115,12 +12290,11 @@ var Text = class Text extends Shape {
 		return totalHeight;
 	}
 	static drawPlainWith(ctx, props) {
-		var _props$color2;
 		const { text, fontStyle, hAlign, vAlign, width, height, left = 0, top = 0, cellValueType } = props;
 		const { lines, totalHeight } = Text._getCachedLayout(text, fontStyle);
 		let lineTop = top + (vAlign === _univerjs_core.VerticalAlign.TOP ? 0 : vAlign === _univerjs_core.VerticalAlign.MIDDLE ? (height - totalHeight) / 2 : height - totalHeight);
 		ctx.font = fontStyle;
-		ctx.fillStyle = (_props$color2 = props.color) !== null && _props$color2 !== void 0 ? _props$color2 : COLOR_BLACK_RGB;
+		ctx.fillStyle = props.color ?? "rgb(0,0,0)";
 		for (const line of lines) {
 			const lineWidth = line.width;
 			let lineX = 0;
@@ -12465,12 +12639,10 @@ function setDocsTableRenderViewportProvider(provider) {
 	docsTableRenderViewportProvider = provider;
 }
 function getDocsTableRenderViewport(unitId, tableId) {
-	var _docsTableRenderViewp;
-	return (_docsTableRenderViewp = docsTableRenderViewportProvider === null || docsTableRenderViewportProvider === void 0 ? void 0 : docsTableRenderViewportProvider(unitId, tableId)) !== null && _docsTableRenderViewp !== void 0 ? _docsTableRenderViewp : null;
+	return (docsTableRenderViewportProvider === null || docsTableRenderViewportProvider === void 0 ? void 0 : docsTableRenderViewportProvider(unitId, tableId)) ?? null;
 }
 function getDocsTableVirtualContentWidth(viewport) {
-	var _viewport$leadingInse, _viewport$trailingIns;
-	return ((_viewport$leadingInse = viewport.leadingInsetLeft) !== null && _viewport$leadingInse !== void 0 ? _viewport$leadingInse : 0) + viewport.contentWidth + ((_viewport$trailingIns = viewport.trailingInsetRight) !== null && _viewport$trailingIns !== void 0 ? _viewport$trailingIns : 0);
+	return (viewport.leadingInsetLeft ?? 0) + viewport.contentWidth + (viewport.trailingInsetRight ?? 0);
 }
 function getDocsTableViewportLeft(viewport, fallbackLeft, docsLeft = 0) {
 	return (viewport === null || viewport === void 0 ? void 0 : viewport.viewportLeft) != null ? viewport.viewportLeft - docsLeft : fallbackLeft;
@@ -12660,8 +12832,7 @@ function parseDataStreamToTree(dataStream, tables) {
 		const tempParagraphList = getParagraphList();
 		const lastParagraph = tempParagraphList[tempParagraphList.length - 1];
 		if (lastParagraph) {
-			var _lastParagraph$conten;
-			lastParagraph.content = `${(_lastParagraph$conten = lastParagraph.content) !== null && _lastParagraph$conten !== void 0 ? _lastParagraph$conten : ""}${char}`;
+			lastParagraph.content = `${lastParagraph.content ?? ""}${char}`;
 			return true;
 		}
 		return false;
@@ -12690,6 +12861,14 @@ function parseDataStreamToTree(dataStream, tables) {
 		} else if (char === _univerjs_core.DataStreamTreeTokenType.SECTION_BREAK) {
 			const sectionNode = DataStreamTreeNode.create(_univerjs_core.DataStreamTreeNodeType.SECTION_BREAK);
 			const tempParagraphList = tableCellList.length > 0 ? cellParagraphList : columnGroupList.length > 0 ? columnParagraphList : paragraphList;
+			if (tempParagraphList.length > 0 && currentBlocks.length > 0 && content === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK.repeat(currentBlocks.length)) {
+				const blockParagraph = DataStreamTreeNode.create(_univerjs_core.DataStreamTreeNodeType.PARAGRAPH, content);
+				blockParagraph.setIndexRange(i - content.length, i - 1);
+				blockParagraph.addBlocks(currentBlocks);
+				tempParagraphList.push(blockParagraph);
+				currentBlocks.length = 0;
+				content = "";
+			}
 			if (tempParagraphList.length === 0) {
 				const emptyParagraph = DataStreamTreeNode.create(_univerjs_core.DataStreamTreeNodeType.PARAGRAPH, "");
 				emptyParagraph.setIndexRange(i, i - 1);
@@ -12921,37 +13100,37 @@ var DocumentViewModel = class DocumentViewModel {
 		this._buildColumnGroupCache();
 	}
 	_buildParagraphCache() {
-		var _this$getBody$paragra, _this$getBody;
+		var _this$getBody;
 		this._paragraphCache.clear();
-		const paragraphs = (_this$getBody$paragra = (_this$getBody = this.getBody()) === null || _this$getBody === void 0 ? void 0 : _this$getBody.paragraphs) !== null && _this$getBody$paragra !== void 0 ? _this$getBody$paragra : [];
+		const paragraphs = ((_this$getBody = this.getBody()) === null || _this$getBody === void 0 ? void 0 : _this$getBody.paragraphs) ?? [];
 		for (const paragraph of paragraphs) {
 			const { startIndex } = paragraph;
 			this._paragraphCache.set(startIndex, paragraph);
 		}
 	}
 	_buildSectionBreakCache() {
-		var _this$getBody$section, _this$getBody2;
+		var _this$getBody2;
 		this._sectionBreakCache.clear();
-		const sectionBreaks = (_this$getBody$section = (_this$getBody2 = this.getBody()) === null || _this$getBody2 === void 0 ? void 0 : _this$getBody2.sectionBreaks) !== null && _this$getBody$section !== void 0 ? _this$getBody$section : [];
+		const sectionBreaks = ((_this$getBody2 = this.getBody()) === null || _this$getBody2 === void 0 ? void 0 : _this$getBody2.sectionBreaks) ?? [];
 		for (const sectionBreak of sectionBreaks) {
 			const { startIndex } = sectionBreak;
 			this._sectionBreakCache.set(startIndex, sectionBreak);
 		}
 	}
 	_buildCustomBlockCache() {
-		var _this$getBody$customB, _this$getBody3;
+		var _this$getBody3;
 		this._customBlockCache.clear();
-		const customBlocks = (_this$getBody$customB = (_this$getBody3 = this.getBody()) === null || _this$getBody3 === void 0 ? void 0 : _this$getBody3.customBlocks) !== null && _this$getBody$customB !== void 0 ? _this$getBody$customB : [];
+		const customBlocks = ((_this$getBody3 = this.getBody()) === null || _this$getBody3 === void 0 ? void 0 : _this$getBody3.customBlocks) ?? [];
 		for (const customBlock of customBlocks) {
 			const { startIndex } = customBlock;
 			this._customBlockCache.set(startIndex, customBlock);
 		}
 	}
 	_buildTableCache() {
-		var _this$getBody4, _this$_tableSource;
+		var _this$getBody4;
 		this._tableCache.clear();
 		const tables = (_this$getBody4 = this.getBody()) === null || _this$getBody4 === void 0 ? void 0 : _this$getBody4.tables;
-		const tableConfig = (_this$_tableSource = this._tableSource) !== null && _this$_tableSource !== void 0 ? _this$_tableSource : this.getSnapshot().tableSource;
+		const tableConfig = this._tableSource ?? this.getSnapshot().tableSource;
 		if (tables == null || tableConfig == null) return;
 		for (const table of tables) {
 			const { startIndex, tableId } = table;
@@ -12978,8 +13157,8 @@ var DocumentViewModel = class DocumentViewModel {
 		}
 	}
 	_buildTextRunsCache() {
-		var _this$getBody$textRun, _this$getBody6;
-		const textRuns = (_this$getBody$textRun = (_this$getBody6 = this.getBody()) === null || _this$getBody6 === void 0 ? void 0 : _this$getBody6.textRuns) !== null && _this$getBody$textRun !== void 0 ? _this$getBody$textRun : [];
+		var _this$getBody6;
+		const textRuns = ((_this$getBody6 = this.getBody()) === null || _this$getBody6 === void 0 ? void 0 : _this$getBody6.textRuns) ?? [];
 		this._textRunsCache.clear();
 		for (const textRun of textRuns) {
 			const { st, ed } = textRun;
@@ -13025,10 +13204,9 @@ function setDocsCustomBlockRenderViewportProvider(provider) {
 	docsCustomBlockRenderViewportProvider = provider;
 	docsCustomBlockRenderViewportProviders.add(provider);
 	return () => {
-		var _providers;
 		docsCustomBlockRenderViewportProviders.delete(provider);
 		const providers = Array.from(docsCustomBlockRenderViewportProviders);
-		docsCustomBlockRenderViewportProvider = (_providers = providers[providers.length - 1]) !== null && _providers !== void 0 ? _providers : null;
+		docsCustomBlockRenderViewportProvider = providers[providers.length - 1] ?? null;
 	};
 }
 function getDocsCustomBlockRenderViewport(unitId, blockId, input) {
@@ -13147,7 +13325,6 @@ function createSkeletonCustomBlockGlyph(config, glyphWidth = 0, glyphHeight = 0,
 	};
 }
 function _createSkeletonWordOrLetter(glyphType, content, config, glyphWidth) {
-	var _config$documentCompa;
 	const { fontStyle, textStyle, charSpace = 1, gridType = _univerjs_core.GridType.LINES, snapToGrid = _univerjs_core.BooleanNumber.FALSE } = config;
 	const skipWidthList = [
 		_univerjs_core.DataStreamTreeTokenType.SECTION_BREAK,
@@ -13201,9 +13378,9 @@ function _createSkeletonWordOrLetter(glyphType, content, config, glyphWidth) {
 	let bBox = null;
 	let xOffset = 0;
 	bBox = FontCache.getTextSize(content, fontStyle);
-	bBox = applyFontMetricCompatibility(content, fontStyle, bBox, (_config$documentCompa = config.documentCompatibilityPolicy) !== null && _config$documentCompa !== void 0 ? _config$documentCompa : getDocumentCompatibilityPolicy());
+	bBox = applyFontMetricCompatibility(content, fontStyle, bBox, config.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy());
 	const { width: contentWidth = 0 } = bBox;
-	let width = glyphWidth !== null && glyphWidth !== void 0 ? glyphWidth : contentWidth;
+	let width = glyphWidth ?? contentWidth;
 	if (validationGrid(gridType, snapToGrid)) {
 		width = contentWidth + (cjk.hasCJK(content) ? charSpace : charSpace / 2);
 		if (gridType === _univerjs_core.GridType.SNAP_TO_CHARS) xOffset = (width - contentWidth) / 2;
@@ -13294,11 +13471,10 @@ function glyphShrinkLeft(glyph, amount) {
 //#endregion
 //#region src/components/docs/layout/model/line.ts
 function createSkeletonLine(paragraphIndex, lineType, lineBoundingBox, columnWidth, lineIndex = 0, isParagraphStart = false, paragraphConfig, page, headerPage, footerPage, columnLeft = 0, sectionTop = 0) {
-	var _page$skeDrawings, _page$skeTables;
 	const { lineHeight = 15.6, lineTop = 0, contentHeight = 0, paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0, marginTop = 0, spaceBelowApply = 0 } = lineBoundingBox;
 	const { skeTablesInParagraph } = paragraphConfig;
-	const pageSkeDrawings = (_page$skeDrawings = page.skeDrawings) !== null && _page$skeDrawings !== void 0 ? _page$skeDrawings : /* @__PURE__ */ new Map();
-	const pageSkeTables = (_page$skeTables = page.skeTables) !== null && _page$skeTables !== void 0 ? _page$skeTables : /* @__PURE__ */ new Map();
+	const pageSkeDrawings = page.skeDrawings ?? /* @__PURE__ */ new Map();
+	const pageSkeTables = page.skeTables ?? /* @__PURE__ */ new Map();
 	const headersDrawings = headerPage === null || headerPage === void 0 ? void 0 : headerPage.skeDrawings;
 	const footersDrawings = footerPage === null || footerPage === void 0 ? void 0 : footerPage.skeDrawings;
 	const lineSke = _getLineSke(lineType, paragraphIndex);
@@ -13359,12 +13535,11 @@ function _getLineTopWithFullColumnWrap(drawing, lineHeight, lineTop, columnLeft,
 	let left = aLeft - columnLeft;
 	let drawingWidth = width;
 	if (angle !== 0) {
-		var _boundingBox$top, _boundingBox$height, _boundingBox$left, _boundingBox$width;
 		const boundingBox = getBoundingBox(angle, left, width, top, height);
-		top = (_boundingBox$top = boundingBox.top) !== null && _boundingBox$top !== void 0 ? _boundingBox$top : top;
-		drawingHeight = (_boundingBox$height = boundingBox.height) !== null && _boundingBox$height !== void 0 ? _boundingBox$height : drawingHeight;
-		left = (_boundingBox$left = boundingBox.left) !== null && _boundingBox$left !== void 0 ? _boundingBox$left : left;
-		drawingWidth = (_boundingBox$width = boundingBox.width) !== null && _boundingBox$width !== void 0 ? _boundingBox$width : drawingWidth;
+		top = boundingBox.top ?? top;
+		drawingHeight = boundingBox.height ?? drawingHeight;
+		left = boundingBox.left ?? left;
+		drawingWidth = boundingBox.width ?? drawingWidth;
 	}
 	const newTop = top - (layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_SQUARE ? distT : 0);
 	const newHeight = drawingHeight + (layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_SQUARE ? distB + distT : 0);
@@ -13391,13 +13566,12 @@ function _getLineTopWidthWrapTopBottom(drawing, lineHeight, lineTop, columnLeft,
 	const { layoutType, distT = 0, distB = 0 } = drawingOrigin;
 	if (layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) return;
 	if (columnWidth > 0) {
-		var _bounds$left, _bounds$width;
 		const bounds = angle === 0 ? {
 			left: aLeft,
 			width
 		} : getBoundingBox(angle, aLeft, width, aTop, height);
-		const drawingLeft = (_bounds$left = bounds.left) !== null && _bounds$left !== void 0 ? _bounds$left : aLeft;
-		if (drawingLeft + ((_bounds$width = bounds.width) !== null && _bounds$width !== void 0 ? _bounds$width : width) <= columnLeft || drawingLeft >= columnLeft + columnWidth) return;
+		const drawingLeft = bounds.left ?? aLeft;
+		if (drawingLeft + (bounds.width ?? width) <= columnLeft || drawingLeft >= columnLeft + columnWidth) return;
 	}
 	if (angle === 0) {
 		const newAtop = aTop - distT;
@@ -13812,7 +13986,7 @@ function rollbackListCache(listLevel, table) {
 	}
 }
 function createTableSkeletons(ctx, curPage, viewModel, tableNode, sectionBreakConfig, availableHeight) {
-	var _viewModel$getTableBy2, _sectionBreakConfig$d;
+	var _viewModel$getTableBy2;
 	const skeTables = [];
 	const { startIndex, endIndex, children: rowNodes } = tableNode;
 	const table = (_viewModel$getTableBy2 = viewModel.getTableByStartIndex(startIndex)) === null || _viewModel$getTableBy2 === void 0 ? void 0 : _viewModel$getTableBy2.tableSource;
@@ -13835,7 +14009,7 @@ function createTableSkeletons(ctx, curPage, viewModel, tableNode, sectionBreakCo
 	skeTables.push(curTableSkeleton);
 	for (const rowNode of rowNodes) dealWithTableRow(ctx, curPage, skeTables, viewModel, sectionBreakConfig, rowNode, rowNodes.indexOf(rowNode), table, createCache);
 	updateTableSkeletonsPosition(createCache, curPage, skeTables, table);
-	const documentCompatibilityPolicy = (_sectionBreakConfig$d = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d !== void 0 ? _sectionBreakConfig$d : getDocumentCompatibilityPolicy();
+	const documentCompatibilityPolicy = sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy();
 	return {
 		skeTables,
 		fromCurrentPage: skeTables[0].height <= availableHeight + documentCompatibilityPolicy.table.currentPageOverflowTolerance
@@ -13868,10 +14042,9 @@ function getAvailableHeight(curPage, cache, hasRepeatHeader) {
 	return pageContentHeight;
 }
 function dealWithTableRow(ctx, curPage, skeTables, viewModel, sectionBreakConfig, rowNode, row, table, cache, isRepeatRow = false) {
-	var _sectionBreakConfig$d2;
 	const pageContentHeight = getAvailableHeight(curPage, cache, false);
 	const availableHeight = getAvailableHeight(curPage, cache, true);
-	const documentCompatibilityPolicy = (_sectionBreakConfig$d2 = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d2 !== void 0 ? _sectionBreakConfig$d2 : getDocumentCompatibilityPolicy();
+	const documentCompatibilityPolicy = sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy();
 	const { children: cellNodes, startIndex, endIndex } = rowNode;
 	const rowSource = table.tableRows[row];
 	const { trHeight, cantSplit } = rowSource;
@@ -13990,23 +14163,22 @@ function createMergedCoveredCellPage(ctx, sectionBreakConfig, table, row, col, r
 	return createMergedAwareNullCellPage(ctx, sectionBreakConfig, table, row, col, rowSkeleton);
 }
 function applyMergedCellSpanHeights(tableSkeleton) {
-	var _tableSkeleton$tableS, _tableSkeleton$tableS2;
-	const tableRows = (_tableSkeleton$tableS = (_tableSkeleton$tableS2 = tableSkeleton.tableSource) === null || _tableSkeleton$tableS2 === void 0 ? void 0 : _tableSkeleton$tableS2.tableRows) !== null && _tableSkeleton$tableS !== void 0 ? _tableSkeleton$tableS : [];
+	var _tableSkeleton$tableS;
+	const tableRows = ((_tableSkeleton$tableS = tableSkeleton.tableSource) === null || _tableSkeleton$tableS === void 0 ? void 0 : _tableSkeleton$tableS.tableRows) ?? [];
 	if (tableRows.length === 0) return;
 	const skeletonRowsByIndex = new Map(tableSkeleton.rows.map((row) => [row.index, row]));
 	tableRows.forEach((rowSource, rowIndex) => {
 		rowSource.tableCells.forEach((cellConfig, columnIndex) => {
-			var _cellConfig$rowSpan, _cellConfig$columnSpa;
-			const rowSpan = (_cellConfig$rowSpan = cellConfig.rowSpan) !== null && _cellConfig$rowSpan !== void 0 ? _cellConfig$rowSpan : 1;
-			const columnSpan = (_cellConfig$columnSpa = cellConfig.columnSpan) !== null && _cellConfig$columnSpa !== void 0 ? _cellConfig$columnSpa : 1;
+			const rowSpan = cellConfig.rowSpan ?? 1;
+			const columnSpan = cellConfig.columnSpan ?? 1;
 			if (rowSpan <= 1 && columnSpan <= 1) return;
 			const masterRow = skeletonRowsByIndex.get(rowIndex);
 			const masterCell = masterRow === null || masterRow === void 0 ? void 0 : masterRow.cells[columnIndex];
 			if (!masterCell || masterCell.isMergedCellCovered) return;
 			let pageHeight = 0;
 			for (let row = rowIndex; row < rowIndex + rowSpan; row++) {
-				var _skeletonRowsByIndex$, _skeletonRowsByIndex$2;
-				pageHeight += (_skeletonRowsByIndex$ = (_skeletonRowsByIndex$2 = skeletonRowsByIndex.get(row)) === null || _skeletonRowsByIndex$2 === void 0 ? void 0 : _skeletonRowsByIndex$2.height) !== null && _skeletonRowsByIndex$ !== void 0 ? _skeletonRowsByIndex$ : 0;
+				var _skeletonRowsByIndex$;
+				pageHeight += ((_skeletonRowsByIndex$ = skeletonRowsByIndex.get(row)) === null || _skeletonRowsByIndex$ === void 0 ? void 0 : _skeletonRowsByIndex$.height) ?? 0;
 			}
 			if (pageHeight > 0) masterCell.pageHeight = pageHeight;
 		});
@@ -14030,11 +14202,10 @@ function findMergedMasterCell(table, row, col) {
 		const rowSource = table.tableRows[rowIndex];
 		if (rowSource == null) continue;
 		for (let columnIndex = 0; columnIndex < rowSource.tableCells.length; columnIndex++) {
-			var _cellConfig$rowSpan2, _cellConfig$columnSpa2;
 			const cellConfig = rowSource.tableCells[columnIndex];
 			if (isCoveredTableCell(cellConfig)) continue;
-			const rowSpan = Math.max(1, (_cellConfig$rowSpan2 = cellConfig.rowSpan) !== null && _cellConfig$rowSpan2 !== void 0 ? _cellConfig$rowSpan2 : 1);
-			const columnSpan = Math.max(1, (_cellConfig$columnSpa2 = cellConfig.columnSpan) !== null && _cellConfig$columnSpa2 !== void 0 ? _cellConfig$columnSpa2 : 1);
+			const rowSpan = Math.max(1, cellConfig.rowSpan ?? 1);
+			const columnSpan = Math.max(1, cellConfig.columnSpan ?? 1);
 			if (rowSpan <= 1 && columnSpan <= 1) continue;
 			const containsRow = row >= rowIndex && row < rowIndex + rowSpan;
 			const containsColumn = col >= columnIndex && col < columnIndex + columnSpan;
@@ -14109,15 +14280,16 @@ function isBeyondDivideWidth(width, divideWidth) {
 	const tolerance = Math.min(MAX_LINE_WIDTH_TOLERANCE, Math.max(MIN_LINE_WIDTH_TOLERANCE, divideWidth * RELATIVE_LINE_WIDTH_TOLERANCE));
 	return width - divideWidth > tolerance;
 }
-function isGlyphGroupBeyondDivideWidth(glyphGroup, offsetLeft, divideWidth) {
-	var _glyphGroup$adjustabi, _glyphGroup;
+function isGlyphGroupBeyondDivideWidth(glyphGroup, offsetLeft, divideWidth, hangingPunctuation = false) {
+	var _trailingGlyph$adjust;
 	const width = __getGlyphGroupWidth(glyphGroup);
-	const trailingShrinkability = (_glyphGroup$adjustabi = (_glyphGroup = glyphGroup[glyphGroup.length - 1]) === null || _glyphGroup === void 0 || (_glyphGroup = _glyphGroup.adjustability) === null || _glyphGroup === void 0 || (_glyphGroup = _glyphGroup.shrinkability) === null || _glyphGroup === void 0 ? void 0 : _glyphGroup[1]) !== null && _glyphGroup$adjustabi !== void 0 ? _glyphGroup$adjustabi : 0;
-	return isBeyondDivideWidth(offsetLeft + width - trailingShrinkability, divideWidth);
+	const trailingGlyph = glyphGroup[glyphGroup.length - 1];
+	const trailingShrinkability = (trailingGlyph === null || trailingGlyph === void 0 || (_trailingGlyph$adjust = trailingGlyph.adjustability) === null || _trailingGlyph$adjust === void 0 || (_trailingGlyph$adjust = _trailingGlyph$adjust.shrinkability) === null || _trailingGlyph$adjust === void 0 ? void 0 : _trailingGlyph$adjust[1]) ?? 0;
+	const trailingHangingWidth = hangingPunctuation && trailingGlyph && isCjkLeftAlignedPunctuation(trailingGlyph.content) ? trailingGlyph.width : 0;
+	return isBeyondDivideWidth(offsetLeft + width - Math.max(trailingShrinkability, trailingHangingWidth), divideWidth);
 }
 function layoutParagraph(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal") {
 	if (isParagraphFirstShapedText) if (paragraphConfig.bulletSkeleton) {
-		var _paragraphProperties$;
 		const { bulletSkeleton, paragraphStyle = {} } = paragraphConfig;
 		const { gridType = _univerjs_core.GridType.LINES, charSpace = 0, defaultTabStop = 10.5 } = sectionBreakConfig;
 		const { snapToGrid = _univerjs_core.BooleanNumber.TRUE } = paragraphStyle;
@@ -14126,9 +14298,11 @@ function layoutParagraph(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 		const paragraphProperties = bulletSkeleton.paragraphProperties || {};
 		paragraphConfig.paragraphStyle = {
 			...paragraphProperties,
-			hanging: (_paragraphProperties$ = paragraphProperties.hanging) !== null && _paragraphProperties$ !== void 0 ? _paragraphProperties$ : { v: bulletGlyph.width },
+			hanging: paragraphProperties.hanging ?? { v: bulletGlyph.width },
 			...paragraphConfig.paragraphStyle
 		};
+		const hangingWidth = getNumberUnitValue(paragraphConfig.paragraphStyle.hanging, charSpaceApply);
+		if (hangingWidth > 0) bulletGlyph.width = hangingWidth;
 		_lineOperator(ctx, [bulletGlyph, ...glyphGroup], pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
 	} else _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
 	else _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
@@ -14190,12 +14364,13 @@ function _popHyphenSlice(divide) {
 function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanMetrics) {
 	const divideInfo = getLastNotFullDivideInfo(getLastPage(pages));
 	if (divideInfo) {
-		var _divide$glyphGroup;
+		var _divide$glyphGroup, _paragraphConfig$para;
 		const { divide, isLast } = divideInfo;
 		const lastGlyph = divide === null || divide === void 0 || (_divide$glyphGroup = divide.glyphGroup) === null || _divide$glyphGroup === void 0 ? void 0 : _divide$glyphGroup[divide.glyphGroup.length - 1];
 		const preOffsetLeft = ((lastGlyph === null || lastGlyph === void 0 ? void 0 : lastGlyph.width) || 0) + ((lastGlyph === null || lastGlyph === void 0 ? void 0 : lastGlyph.left) || 0);
 		const { hyphenationZone } = sectionBreakConfig;
-		if (isGlyphGroupBeyondDivideWidth(glyphGroup, preOffsetLeft, divide.width)) {
+		const hangingPunctuation = ((_paragraphConfig$para = paragraphConfig.paragraphStyle) === null || _paragraphConfig$para === void 0 ? void 0 : _paragraphConfig$para.hangingPunctuation) === _univerjs_core.BooleanNumber.TRUE;
+		if (isGlyphGroupBeyondDivideWidth(glyphGroup, preOffsetLeft, divide.width, hangingPunctuation)) {
 			if ((divide === null || divide === void 0 ? void 0 : divide.glyphGroup.length) === 0 && glyphGroup.length > 0 && glyphGroup[0].streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK) {
 				addGlyphToDivide(divide, glyphGroup, preOffsetLeft);
 				updateDivideInfo(divide, { breakType: breakPointType });
@@ -14219,7 +14394,7 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 				const sliceGlyphGroup = [];
 				while (glyphGroup.length) {
 					sliceGlyphGroup.push(glyphGroup.shift());
-					if (isGlyphGroupBeyondDivideWidth(sliceGlyphGroup, 0, divide.width)) {
+					if (isGlyphGroupBeyondDivideWidth(sliceGlyphGroup, 0, divide.width, hangingPunctuation)) {
 						if (sliceGlyphGroup.length > 1) glyphGroup.unshift(sliceGlyphGroup.pop());
 						break;
 					}
@@ -14271,8 +14446,8 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 			if (currentLine === null || currentLine === void 0 ? void 0 : currentLine.parent) {
 				const anchorDrawings = __getZeroWidthNonFlowFloatingAnchorDrawings(glyphGroup, paragraphConfig.paragraphNonInlineSkeDrawings);
 				if (anchorDrawings.length > 0) {
-					var _paragraphConfig$para, _paragraphConfig$pDra;
-					const paragraphAnchorLeft = __getParagraphAnchorLeft(sectionBreakConfig, paragraphConfig, (_paragraphConfig$para = paragraphConfig.paragraphStyle) === null || _paragraphConfig$para === void 0 ? void 0 : _paragraphConfig$para.indentStart);
+					var _paragraphConfig$para2, _paragraphConfig$pDra;
+					const paragraphAnchorLeft = __getParagraphAnchorLeft(sectionBreakConfig, paragraphConfig, (_paragraphConfig$para2 = paragraphConfig.paragraphStyle) === null || _paragraphConfig$para2 === void 0 ? void 0 : _paragraphConfig$para2.indentStart);
 					const drawings = __getDrawingPosition(ctx, currentLine.top, currentLine.lineHeight, currentLine.parent, true, (_paragraphConfig$pDra = paragraphConfig.pDrawingAnchor) === null || _paragraphConfig$pDra === void 0 || (_paragraphConfig$pDra = _paragraphConfig$pDra.get(paragraphConfig.paragraphIndex)) === null || _paragraphConfig$pDra === void 0 ? void 0 : _paragraphConfig$pDra.top, anchorDrawings, paragraphAnchorLeft, false);
 					__updateDrawingPosition(currentLine.parent, drawings);
 					addGlyphToDivide(divide, glyphGroup, preOffsetLeft);
@@ -14287,7 +14462,7 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 	} else _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 }
 function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanMetrics) {
-	var _originParagraphStyle, _originParagraphStyle2, _skeHeaders$get, _skeFooters$get;
+	var _skeHeaders$get, _skeFooters$get;
 	let lastPage = getLastPage(pages);
 	let columnInfo = getLastNotFullColumnInfo(lastPage);
 	if (!columnInfo || !columnInfo.column) {
@@ -14324,8 +14499,8 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 	const namedStyle = namedStyleType !== void 0 ? _univerjs_core.NAMED_STYLE_SPACE_MAP[namedStyleType] : null;
 	const { spaceAbove, spaceBelow, indentFirstLine, hanging, indentStart, indentEnd } = {
 		...originParagraphStyle,
-		spaceAbove: (_originParagraphStyle = originParagraphStyle.spaceAbove) !== null && _originParagraphStyle !== void 0 ? _originParagraphStyle : namedStyle === null || namedStyle === void 0 ? void 0 : namedStyle.spaceAbove,
-		spaceBelow: (_originParagraphStyle2 = originParagraphStyle.spaceBelow) !== null && _originParagraphStyle2 !== void 0 ? _originParagraphStyle2 : namedStyle === null || namedStyle === void 0 ? void 0 : namedStyle.spaceBelow
+		spaceAbove: originParagraphStyle.spaceAbove ?? (namedStyle === null || namedStyle === void 0 ? void 0 : namedStyle.spaceAbove),
+		spaceBelow: originParagraphStyle.spaceBelow ?? (namedStyle === null || namedStyle === void 0 ? void 0 : namedStyle.spaceBelow)
 	};
 	const { paragraphLineGapDefault, linePitch, lineSpacing, spacingRule, snapToGrid, gridType } = getLineHeightConfig(sectionBreakConfig, paragraphConfig);
 	const hasInlineCustomBlock = (defaultSpanMetrics === null || defaultSpanMetrics === void 0 ? void 0 : defaultSpanMetrics.hasInlineCustomBlock) || glyphGroup.some((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyph.width !== 0);
@@ -14366,9 +14541,9 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 	if (preLine) {
 		const drawingsInLine = _getCustomBlockIdsInLine(preLine);
 		if (drawingsInLine.length > 0) {
-			var _ctx$paragraphConfigC, _affectDrawings$value;
+			var _ctx$paragraphConfigC;
 			const affectDrawings = (_ctx$paragraphConfigC = ctx.paragraphConfigCache.get(segmentId)) === null || _ctx$paragraphConfigC === void 0 || (_ctx$paragraphConfigC = _ctx$paragraphConfigC.get(preLine.paragraphIndex)) === null || _ctx$paragraphConfigC === void 0 ? void 0 : _ctx$paragraphConfigC.paragraphNonInlineSkeDrawings;
-			const relativeLineDrawings = [...(_affectDrawings$value = affectDrawings === null || affectDrawings === void 0 ? void 0 : affectDrawings.values()) !== null && _affectDrawings$value !== void 0 ? _affectDrawings$value : []].filter((drawing) => drawing.drawingOrigin.docTransform.positionV.relativeFrom === _univerjs_core.ObjectRelativeFromV.LINE).filter((drawing) => drawingsInLine.includes(drawing.drawingId));
+			const relativeLineDrawings = [...(affectDrawings === null || affectDrawings === void 0 ? void 0 : affectDrawings.values()) ?? []].filter((drawing) => drawing.drawingOrigin.docTransform.positionV.relativeFrom === _univerjs_core.ObjectRelativeFromV.LINE).filter((drawing) => drawingsInLine.includes(drawing.drawingId));
 			if (relativeLineDrawings.length > 0) __updateAndPositionDrawings(ctx, preLine.top, preLine.lineHeight, column, relativeLineDrawings, preLine.paragraphIndex, isParagraphFirstShapedText);
 		}
 	}
@@ -14482,32 +14657,30 @@ function __updateWrapTablePosition(ctx, table, lineTop, lineHeight, column, para
 	table.left = left;
 }
 function __getWrapTablePosition(table, column, lineTop, lineHeight, drawingAnchorTop) {
-	var _column$parent, _column$parent$top, _column$parent2, _getPositionHorizon, _getPositionVertical;
+	var _column$parent, _column$parent2;
 	const page = (_column$parent = column.parent) === null || _column$parent === void 0 ? void 0 : _column$parent.parent;
-	const sectionTop = (_column$parent$top = (_column$parent2 = column.parent) === null || _column$parent2 === void 0 ? void 0 : _column$parent2.top) !== null && _column$parent$top !== void 0 ? _column$parent$top : 0;
+	const sectionTop = ((_column$parent2 = column.parent) === null || _column$parent2 === void 0 ? void 0 : _column$parent2.top) ?? 0;
 	if (page == null) return;
 	const isPageBreak = __checkPageBreak(column);
 	const { tableSource, width, height } = table;
 	const { positionH, positionV } = tableSource.position;
 	return {
-		left: (_getPositionHorizon = getPositionHorizon(positionH, column, page, width, isPageBreak)) !== null && _getPositionHorizon !== void 0 ? _getPositionHorizon : 0,
-		top: (_getPositionVertical = getPositionVertical(positionV, page, sectionTop + lineTop, lineHeight, height, drawingAnchorTop == null ? void 0 : sectionTop + drawingAnchorTop, isPageBreak)) !== null && _getPositionVertical !== void 0 ? _getPositionVertical : 0
+		left: getPositionHorizon(positionH, column, page, width, isPageBreak) ?? 0,
+		top: getPositionVertical(positionV, page, sectionTop + lineTop, lineHeight, height, drawingAnchorTop == null ? void 0 : sectionTop + drawingAnchorTop, isPageBreak) ?? 0
 	};
 }
 function __avoidFlowAffectingDrawingsForTable(table, page, column) {
-	var _column$left;
-	const columnLeft = (_column$left = column.left) !== null && _column$left !== void 0 ? _column$left : 0;
+	const columnLeft = column.left ?? 0;
 	const tableTop = table.top;
 	const tableBottom = table.top + table.height;
 	const tableRight = table.left + table.width;
 	for (const drawing of page.skeDrawings.values()) {
-		var _drawingOrigin$distR;
 		const drawingOrigin = drawing.drawingOrigin;
 		if (drawingOrigin == null || drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.INLINE || drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_NONE || drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) continue;
 		const drawingTop = drawing.aTop;
 		const drawingBottom = drawing.aTop + drawing.height;
 		if (drawingTop >= tableBottom || drawingBottom <= tableTop) continue;
-		const drawingRight = drawing.aLeft + drawing.width + ((_drawingOrigin$distR = drawingOrigin.distR) !== null && _drawingOrigin$distR !== void 0 ? _drawingOrigin$distR : 0);
+		const drawingRight = drawing.aLeft + drawing.width + (drawingOrigin.distR ?? 0);
 		if (drawing.aLeft >= tableRight || drawingRight <= table.left) continue;
 		if (drawingRight + table.width <= columnLeft + column.width) table.left = Math.max(table.left, drawingRight);
 	}
@@ -14579,11 +14752,10 @@ function _getCustomBlockIdsInLine(line) {
 }
 function __updateTopBottomCustomBlockFlowBottom(paragraphConfig, drawings, sectionTop) {
 	for (const drawing of drawings) {
-		var _drawingOrigin$distB, _paragraphConfig$topB;
 		const { drawingOrigin } = drawing;
 		if (drawingOrigin.layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM || drawingOrigin.behindDoc === _univerjs_core.BooleanNumber.TRUE) continue;
-		const bottom = drawing.aTop + drawing.height + ((_drawingOrigin$distB = drawingOrigin.distB) !== null && _drawingOrigin$distB !== void 0 ? _drawingOrigin$distB : 0) - sectionTop;
-		paragraphConfig.topBottomCustomBlockFlowBottom = Math.max((_paragraphConfig$topB = paragraphConfig.topBottomCustomBlockFlowBottom) !== null && _paragraphConfig$topB !== void 0 ? _paragraphConfig$topB : Number.NEGATIVE_INFINITY, bottom);
+		const bottom = drawing.aTop + drawing.height + (drawingOrigin.distB ?? 0) - sectionTop;
+		paragraphConfig.topBottomCustomBlockFlowBottom = Math.max(paragraphConfig.topBottomCustomBlockFlowBottom ?? Number.NEGATIVE_INFINITY, bottom);
 	}
 }
 function __isZeroWidthNonFlowFloatingAnchorLine(glyphGroup, paragraphNonInlineSkeDrawings) {
@@ -14642,17 +14814,16 @@ function _reLayoutCheck(ctx, floatObjects, column, paragraphIndex) {
 			floatObjectCache.page.skeDrawings.delete(floatObject.id);
 			ctx.floatObjectsCache.delete(floatObject.id);
 			lineIterator([floatObjectCache.page], (line) => {
-				var _column$parent$top2, _column$parent4;
+				var _column$parent4;
 				const { lineHeight } = line;
 				const column = line.parent;
 				if (needBreakLineIterator || column == null) return;
 				const { width: columnWidth, left: columnLeft } = column;
-				const top = ((_column$parent$top2 = (_column$parent4 = column.parent) === null || _column$parent4 === void 0 ? void 0 : _column$parent4.top) !== null && _column$parent$top2 !== void 0 ? _column$parent$top2 : 0) + line.top;
+				const top = (((_column$parent4 = column.parent) === null || _column$parent4 === void 0 ? void 0 : _column$parent4.top) ?? 0) + line.top;
 				if (collisionDetection(floatObjectCache.floatObject, lineHeight, top, columnLeft, columnWidth)) {
-					var _ctx$layoutStartPoint;
 					needBreakLineIterator = true;
 					ctx.isDirty = true;
-					ctx.layoutStartPointer[floatObjectCache.page.segmentId] = Math.min(line.paragraphIndex, (_ctx$layoutStartPoint = ctx.layoutStartPointer[floatObjectCache.page.segmentId]) !== null && _ctx$layoutStartPoint !== void 0 ? _ctx$layoutStartPoint : Number.POSITIVE_INFINITY);
+					ctx.layoutStartPointer[floatObjectCache.page.segmentId] = Math.min(line.paragraphIndex, ctx.layoutStartPointer[floatObjectCache.page.segmentId] ?? Number.POSITIVE_INFINITY);
 					ctx.paragraphsOpenNewPage.add(paragraphIndex);
 				}
 			});
@@ -14660,28 +14831,25 @@ function _reLayoutCheck(ctx, floatObjects, column, paragraphIndex) {
 	}
 	needBreakLineIterator = false;
 	lineIterator([page], (line) => {
-		var _lineColumn$parent$to, _lineColumn$parent;
+		var _lineColumn$parent;
 		const { lineHeight } = line;
 		const lineColumn = line.parent;
 		if (needBreakLineIterator || lineColumn == null) return;
 		const { width: columnWidth, left: columnLeft } = lineColumn;
-		const top = ((_lineColumn$parent$to = (_lineColumn$parent = lineColumn.parent) === null || _lineColumn$parent === void 0 ? void 0 : _lineColumn$parent.top) !== null && _lineColumn$parent$to !== void 0 ? _lineColumn$parent$to : 0) + line.top;
+		const top = (((_lineColumn$parent = lineColumn.parent) === null || _lineColumn$parent === void 0 ? void 0 : _lineColumn$parent.top) ?? 0) + line.top;
 		for (const floatObject of flowAffectingFloatObjects.values()) {
 			let targetObject = floatObject;
 			if (ctx.floatObjectsCache.has(floatObject.id)) {
 				const drawingCache = ctx.floatObjectsCache.get(floatObject.id);
 				const needRePosition = checkRelativeDrawingNeedRePosition(ctx, floatObject);
 				if ((drawingCache === null || drawingCache === void 0 ? void 0 : drawingCache.page.segmentId) !== page.segmentId) continue;
-				if (needRePosition) {
-					var _drawingCache$floatOb;
-					targetObject = (_drawingCache$floatOb = drawingCache === null || drawingCache === void 0 ? void 0 : drawingCache.floatObject) !== null && _drawingCache$floatOb !== void 0 ? _drawingCache$floatOb : floatObject;
-				} else continue;
+				if (needRePosition) targetObject = (drawingCache === null || drawingCache === void 0 ? void 0 : drawingCache.floatObject) ?? floatObject;
+				else continue;
 			}
 			if (collisionDetection(targetObject, lineHeight, top, columnLeft, columnWidth)) {
-				var _ctx$layoutStartPoint2;
 				needBreakLineIterator = true;
 				ctx.isDirty = true;
-				ctx.layoutStartPointer[page.segmentId] = Math.min(line.paragraphIndex, (_ctx$layoutStartPoint2 = ctx.layoutStartPointer[page.segmentId]) !== null && _ctx$layoutStartPoint2 !== void 0 ? _ctx$layoutStartPoint2 : Number.POSITIVE_INFINITY);
+				ctx.layoutStartPointer[page.segmentId] = Math.min(line.paragraphIndex, ctx.layoutStartPointer[page.segmentId] ?? Number.POSITIVE_INFINITY);
 				let drawingCache = ctx.floatObjectsCache.get(floatObject.id);
 				if (drawingCache == null) {
 					drawingCache = {
@@ -14833,7 +15001,7 @@ function getLineHeightMetrics(glyphLineHeight, paragraphLineGapDefault, linePitc
 	};
 }
 function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId = "", blockAnchorTop, paragraphNonInlineSkeDrawings) {
-	var _line$parent, _section$top;
+	var _line$parent;
 	const column = line.parent;
 	const section = column === null || column === void 0 ? void 0 : column.parent;
 	const page = line === null || line === void 0 || (_line$parent = line.parent) === null || _line$parent === void 0 || (_line$parent = _line$parent.parent) === null || _line$parent === void 0 ? void 0 : _line$parent.parent;
@@ -14841,10 +15009,9 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId =
 	const isPageBreak = __checkPageBreak(column);
 	const drawings = /* @__PURE__ */ new Map();
 	const { top, lineHeight, marginBottom = 0 } = line;
-	const sectionTop = (_section$top = section === null || section === void 0 ? void 0 : section.top) !== null && _section$top !== void 0 ? _section$top : 0;
+	const sectionTop = (section === null || section === void 0 ? void 0 : section.top) ?? 0;
 	const lineTop = sectionTop + top;
 	for (const divide of line.divides) for (const glyph of divide.glyphGroup) if (glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyph.width !== 0) {
-		var _viewport$width, _viewport$height, _viewport$offsetLeft;
 		const { drawingId } = glyph;
 		if (drawingId == null) continue;
 		const drawing = paragraphInlineSkeDrawings === null || paragraphInlineSkeDrawings === void 0 ? void 0 : paragraphInlineSkeDrawings.get(drawingId);
@@ -14864,24 +15031,18 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId =
 			pageMarginRight: page.marginRight,
 			pageWidth: page.pageWidth
 		});
-		const drawingWidth = (_viewport$width = viewport === null || viewport === void 0 ? void 0 : viewport.width) !== null && _viewport$width !== void 0 ? _viewport$width : width;
-		const drawingHeight = (_viewport$height = viewport === null || viewport === void 0 ? void 0 : viewport.height) !== null && _viewport$height !== void 0 ? _viewport$height : height;
-		drawing.aLeft = viewport ? blockLeft + ((_viewport$offsetLeft = viewport.offsetLeft) !== null && _viewport$offsetLeft !== void 0 ? _viewport$offsetLeft : 0) : blockLeft + .5 * glyph.width - .5 * drawingWidth || 0;
-		if (glyph.width > divide.width) {
-			var _paragraphNonInlineSk2;
-			for (const positionedDrawing of (_paragraphNonInlineSk2 = paragraphNonInlineSkeDrawings === null || paragraphNonInlineSkeDrawings === void 0 ? void 0 : paragraphNonInlineSkeDrawings.values()) !== null && _paragraphNonInlineSk2 !== void 0 ? _paragraphNonInlineSk2 : []) {
-				const positionedOrigin = positionedDrawing.drawingOrigin;
-				if (positionedOrigin == null || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.INLINE || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_NONE || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) continue;
-				const positionedBottom = positionedDrawing.aTop + positionedDrawing.height;
-				const lineBottom = lineTop + lineHeight;
-				if (positionedDrawing.aTop >= lineBottom || positionedBottom <= lineTop) continue;
-				const positionedRight = positionedDrawing.aLeft + positionedDrawing.width;
-				const drawingRight = drawing.aLeft + drawingWidth;
-				if (positionedDrawing.aLeft < drawingRight && positionedRight > drawing.aLeft) {
-					var _positionedOrigin$dis;
-					drawing.aLeft = Math.max(drawing.aLeft, positionedDrawing.aLeft + positionedDrawing.width + ((_positionedOrigin$dis = positionedOrigin.distR) !== null && _positionedOrigin$dis !== void 0 ? _positionedOrigin$dis : 0));
-				}
-			}
+		const drawingWidth = (viewport === null || viewport === void 0 ? void 0 : viewport.width) ?? width;
+		const drawingHeight = (viewport === null || viewport === void 0 ? void 0 : viewport.height) ?? height;
+		drawing.aLeft = viewport ? blockLeft + (viewport.offsetLeft ?? 0) : blockLeft + .5 * glyph.width - .5 * drawingWidth || 0;
+		if (glyph.width > divide.width) for (const positionedDrawing of (paragraphNonInlineSkeDrawings === null || paragraphNonInlineSkeDrawings === void 0 ? void 0 : paragraphNonInlineSkeDrawings.values()) ?? []) {
+			const positionedOrigin = positionedDrawing.drawingOrigin;
+			if (positionedOrigin == null || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.INLINE || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_NONE || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) continue;
+			const positionedBottom = positionedDrawing.aTop + positionedDrawing.height;
+			const lineBottom = lineTop + lineHeight;
+			if (positionedDrawing.aTop >= lineBottom || positionedBottom <= lineTop) continue;
+			const positionedRight = positionedDrawing.aLeft + positionedDrawing.width;
+			const drawingRight = drawing.aLeft + drawingWidth;
+			if (positionedDrawing.aLeft < drawingRight && positionedRight > drawing.aLeft) drawing.aLeft = Math.max(drawing.aLeft, positionedDrawing.aLeft + positionedDrawing.width + (positionedOrigin.distR ?? 0));
 		}
 		drawing.width = drawingWidth;
 		drawing.height = drawingHeight;
@@ -14893,6 +15054,8 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId =
 			contentHeight: viewport.contentHeight,
 			contentWidth: viewport.contentWidth,
 			height: viewport.height,
+			pageContentWidth: viewport.pageContentWidth,
+			viewScale: viewport.viewScale,
 			viewportHeight: viewport.viewportHeight
 		} : void 0;
 		drawing.isPageBreak = isPageBreak;
@@ -14905,41 +15068,41 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId =
 	page.skeDrawings = new Map([...page.skeDrawings, ...drawings]);
 }
 function __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirstShapedText, blockAnchorTop, needPositionDrawings = [], blockAnchorLeft = 0, normalizeTraditionalColumnAnchor = true) {
-	var _column$parent5, _column$parent$top3, _column$parent6;
+	var _column$parent5, _column$parent6;
 	const page = (_column$parent5 = column.parent) === null || _column$parent5 === void 0 ? void 0 : _column$parent5.parent;
 	if (page == null || needPositionDrawings.length === 0) return;
 	const drawings = /* @__PURE__ */ new Map();
 	const isPageBreak = __checkPageBreak(column);
-	const sectionTop = (_column$parent$top3 = (_column$parent6 = column.parent) === null || _column$parent6 === void 0 ? void 0 : _column$parent6.top) !== null && _column$parent$top3 !== void 0 ? _column$parent$top3 : 0;
+	const sectionTop = ((_column$parent6 = column.parent) === null || _column$parent6 === void 0 ? void 0 : _column$parent6.top) ?? 0;
 	const absoluteLineTop = sectionTop + lineTop;
 	const absoluteBlockAnchorTop = blockAnchorTop == null ? void 0 : sectionTop + blockAnchorTop;
 	if (isPageBreak && !isParagraphFirstShapedText) return;
 	for (const drawing of needPositionDrawings) {
-		var _ctx$dataModel$getUni, _ctx$dataModel$getUni2, _ctx$dataModel, _viewport$width2, _viewport$height2, _getPositionHorizon2, _getPositionVertical2;
+		var _ctx$dataModel$getUni, _ctx$dataModel;
 		const { drawingOrigin } = drawing;
 		if (!drawingOrigin) continue;
 		const { docTransform } = drawingOrigin;
 		const { positionH, positionV, size, angle } = docTransform;
 		const { width, height } = size;
-		const fallbackWidth = width !== null && width !== void 0 ? width : 0;
-		const fallbackHeight = height !== null && height !== void 0 ? height : 0;
-		const viewport = drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM ? getDocsCustomBlockRenderViewport((_ctx$dataModel$getUni = (_ctx$dataModel$getUni2 = (_ctx$dataModel = ctx.dataModel).getUnitId) === null || _ctx$dataModel$getUni2 === void 0 ? void 0 : _ctx$dataModel$getUni2.call(_ctx$dataModel)) !== null && _ctx$dataModel$getUni !== void 0 ? _ctx$dataModel$getUni : "", drawing.drawingId, {
+		const fallbackWidth = width ?? 0;
+		const fallbackHeight = height ?? 0;
+		const viewport = drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM ? getDocsCustomBlockRenderViewport(((_ctx$dataModel$getUni = (_ctx$dataModel = ctx.dataModel).getUnitId) === null || _ctx$dataModel$getUni === void 0 ? void 0 : _ctx$dataModel$getUni.call(_ctx$dataModel)) ?? "", drawing.drawingId, {
 			fallbackHeight,
 			fallbackWidth,
 			pageMarginLeft: page.marginLeft,
 			pageMarginRight: page.marginRight,
 			pageWidth: page.pageWidth
 		}) : null;
-		const drawingWidth = (_viewport$width2 = viewport === null || viewport === void 0 ? void 0 : viewport.width) !== null && _viewport$width2 !== void 0 ? _viewport$width2 : fallbackWidth;
-		const drawingHeight = (_viewport$height2 = viewport === null || viewport === void 0 ? void 0 : viewport.height) !== null && _viewport$height2 !== void 0 ? _viewport$height2 : fallbackHeight;
-		let aLeft = (_getPositionHorizon2 = getPositionHorizon(positionH, column, page, drawingWidth, isPageBreak)) !== null && _getPositionHorizon2 !== void 0 ? _getPositionHorizon2 : 0;
+		const drawingWidth = (viewport === null || viewport === void 0 ? void 0 : viewport.width) ?? fallbackWidth;
+		const drawingHeight = (viewport === null || viewport === void 0 ? void 0 : viewport.height) ?? fallbackHeight;
+		let aLeft = getPositionHorizon(positionH, column, page, drawingWidth, isPageBreak) ?? 0;
 		if (positionH.relativeFrom === _univerjs_core.ObjectRelativeFromH.COLUMN && blockAnchorLeft > 0) {
 			const renderedColumnOrigin = isPageBreak ? 0 : column.left || page.marginLeft;
 			aLeft += blockAnchorLeft - renderedColumnOrigin;
 			if (normalizeTraditionalColumnAnchor && ctx.dataModel.documentStyle.documentFlavor === _univerjs_core.DocumentFlavor.TRADITIONAL && positionV.relativeFrom === _univerjs_core.ObjectRelativeFromV.PARAGRAPH) aLeft -= page.marginLeft;
 		}
 		drawing.aLeft = aLeft;
-		drawing.aTop = (_getPositionVertical2 = getPositionVertical(positionV, page, absoluteLineTop, lineHeight, drawingHeight, absoluteBlockAnchorTop, isPageBreak)) !== null && _getPositionVertical2 !== void 0 ? _getPositionVertical2 : 0;
+		drawing.aTop = getPositionVertical(positionV, page, absoluteLineTop, lineHeight, drawingHeight, absoluteBlockAnchorTop, isPageBreak) ?? 0;
 		drawing.width = drawingWidth;
 		drawing.height = drawingHeight;
 		drawing.angle = angle;
@@ -14949,6 +15112,8 @@ function __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirst
 			contentHeight: viewport.contentHeight,
 			contentWidth: viewport.contentWidth,
 			height: viewport.height,
+			pageContentWidth: viewport.pageContentWidth,
+			viewScale: viewport.viewScale,
 			viewportHeight: viewport.viewportHeight
 		} : void 0;
 		drawing.initialState = true;
@@ -14956,7 +15121,7 @@ function __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirst
 		drawing.lineTop = absoluteLineTop;
 		drawing.lineHeight = lineHeight;
 		drawing.isPageBreak = isPageBreak;
-		drawing.blockAnchorTop = absoluteBlockAnchorTop !== null && absoluteBlockAnchorTop !== void 0 ? absoluteBlockAnchorTop : absoluteLineTop;
+		drawing.blockAnchorTop = absoluteBlockAnchorTop ?? absoluteLineTop;
 		drawings.set(drawing.drawingId, drawing);
 	}
 	return drawings;
@@ -15041,10 +15206,11 @@ function getCustomDecorationStyle(customDecoration) {
 //#region src/components/docs/layout/style/custom-range.ts
 function getCustomRangeStyle(customRange) {
 	if (customRange.rangeType === _univerjs_core.CustomRangeType.HYPERLINK || customRange.rangeType === _univerjs_core.CustomRangeType.MENTION || customRange.rangeType === _univerjs_core.CustomRangeType.CUSTOM) {
-		var _customRange$active;
+		var _customRange$properti;
+		const preserveTextColor = ((_customRange$properti = customRange.properties) === null || _customRange$properti === void 0 ? void 0 : _customRange$properti.textColorMode) === "text";
 		return {
-			...((_customRange$active = customRange.active) !== null && _customRange$active !== void 0 ? _customRange$active : true) ? { ul: { s: _univerjs_core.BooleanNumber.TRUE } } : null,
-			cl: { rgb: "#274fee" }
+			...customRange.active ?? true ? { ul: { s: _univerjs_core.BooleanNumber.TRUE } } : null,
+			...preserveTextColor ? null : { cl: { rgb: "#274fee" } }
 		};
 	}
 	return null;
@@ -15159,11 +15325,11 @@ function getCharSpaceConfig(sectionBreakConfig, paragraphConfig) {
 	const { paragraphStyle = {} } = paragraphConfig;
 	const { charSpace = 0, gridType = _univerjs_core.GridType.LINES, defaultTabStop = 36, documentTextStyle = {} } = sectionBreakConfig;
 	const { fs: documentFontSize = 14 } = documentTextStyle;
-	const { snapToGrid = _univerjs_core.BooleanNumber.TRUE } = paragraphStyle;
+	const { snapToGrid = _univerjs_core.BooleanNumber.TRUE, defaultTabStop: paragraphDefaultTabStop } = paragraphStyle;
 	return {
 		charSpace,
 		documentFontSize,
-		defaultTabStop,
+		defaultTabStop: paragraphDefaultTabStop ?? defaultTabStop,
 		gridType,
 		snapToGrid
 	};
@@ -15275,24 +15441,20 @@ function updateBlockIndex(pages, start = -1, documentCompatibilityPolicy) {
 	}
 }
 function collapseRedundantColumnBreakOverflow(section) {
-	var _targetColumn$height;
 	const expectedColumnCount = section.colCount || section.columns.length;
 	if (expectedColumnCount <= 0 || section.columns.length <= expectedColumnCount) return;
 	const targetColumn = section.columns[expectedColumnCount - 1];
 	if (!targetColumn) return;
 	const overflowColumns = section.columns.slice(expectedColumnCount);
 	if (!overflowColumns.some((column) => column.lines.length > 0)) return;
-	const targetHeight = (_targetColumn$height = targetColumn.height) !== null && _targetColumn$height !== void 0 ? _targetColumn$height : 0;
+	const targetHeight = targetColumn.height ?? 0;
 	const overflowLines = overflowColumns.flatMap((column) => column.lines);
 	overflowLines.forEach((line) => {
 		line.top += targetHeight;
 		line.parent = targetColumn;
 	});
 	targetColumn.lines.push(...overflowLines);
-	targetColumn.height = Math.max(...overflowColumns.map((column) => {
-		var _column$height;
-		return targetHeight + ((_column$height = column.height) !== null && _column$height !== void 0 ? _column$height : 0);
-	}), targetHeight);
+	targetColumn.height = Math.max(...overflowColumns.map((column) => targetHeight + (column.height ?? 0)), targetHeight);
 	targetColumn.isFull = overflowColumns.some((column) => column.isFull);
 	section.columns.splice(expectedColumnCount);
 }
@@ -15305,8 +15467,8 @@ function updateInlineDrawingCoordsAndBorder(ctx, pages) {
 		const affectNonInlineDrawings = paragraphConfig === null || paragraphConfig === void 0 ? void 0 : paragraphConfig.paragraphNonInlineSkeDrawings;
 		const drawingAnchor = (_ctx$skeletonResource = ctx.skeletonResourceReference) === null || _ctx$skeletonResource === void 0 || (_ctx$skeletonResource = _ctx$skeletonResource.drawingAnchor) === null || _ctx$skeletonResource === void 0 || (_ctx$skeletonResource = _ctx$skeletonResource.get(segmentId)) === null || _ctx$skeletonResource === void 0 ? void 0 : _ctx$skeletonResource.get(line.paragraphIndex);
 		if (affectInlineDrawings && affectInlineDrawings.size > 0) {
-			var _ctx$dataModel$getUni, _ctx$dataModel$getUni2, _ctx$dataModel;
-			updateInlineDrawingPosition(line, affectInlineDrawings, (_ctx$dataModel$getUni = (_ctx$dataModel$getUni2 = (_ctx$dataModel = ctx.dataModel).getUnitId) === null || _ctx$dataModel$getUni2 === void 0 ? void 0 : _ctx$dataModel$getUni2.call(_ctx$dataModel)) !== null && _ctx$dataModel$getUni !== void 0 ? _ctx$dataModel$getUni : "", drawingAnchor === null || drawingAnchor === void 0 ? void 0 : drawingAnchor.top, affectNonInlineDrawings);
+			var _ctx$dataModel$getUni, _ctx$dataModel;
+			updateInlineDrawingPosition(line, affectInlineDrawings, ((_ctx$dataModel$getUni = (_ctx$dataModel = ctx.dataModel).getUnitId) === null || _ctx$dataModel$getUni === void 0 ? void 0 : _ctx$dataModel$getUni.call(_ctx$dataModel)) ?? "", drawingAnchor === null || drawingAnchor === void 0 ? void 0 : drawingAnchor.top, affectNonInlineDrawings);
 		}
 		const paragraphStyle = paragraphConfig === null || paragraphConfig === void 0 ? void 0 : paragraphConfig.paragraphStyle;
 		const paragraphBackgroundColor = paragraphStyle === null || paragraphStyle === void 0 || (_paragraphStyle$shadi = paragraphStyle.shading) === null || _paragraphStyle$shadi === void 0 ? void 0 : _paragraphStyle$shadi.backgroundColor;
@@ -15495,20 +15657,16 @@ function documentSkeletonLineIterator(pages, options, cb) {
 function getDocumentSkeletonNestedPageOffset(page) {
 	var _parent$parent, _parent$parent$column;
 	const parent = page.parent;
-	if ((parent === null || parent === void 0 ? void 0 : parent.page) === page && ((_parent$parent = parent.parent) === null || _parent$parent === void 0 ? void 0 : _parent$parent.columnGroupId) && ((_parent$parent$column = parent.parent.columns) === null || _parent$parent$column === void 0 ? void 0 : _parent$parent$column.includes(parent))) {
-		var _parent$parent$left, _parent$left, _parent$parent$top, _parent$top;
-		return {
-			left: ((_parent$parent$left = parent.parent.left) !== null && _parent$parent$left !== void 0 ? _parent$parent$left : 0) + ((_parent$left = parent.left) !== null && _parent$left !== void 0 ? _parent$left : 0),
-			top: ((_parent$parent$top = parent.parent.top) !== null && _parent$parent$top !== void 0 ? _parent$parent$top : 0) + ((_parent$top = parent.top) !== null && _parent$top !== void 0 ? _parent$top : 0)
-		};
-	}
+	if ((parent === null || parent === void 0 ? void 0 : parent.page) === page && ((_parent$parent = parent.parent) === null || _parent$parent === void 0 ? void 0 : _parent$parent.columnGroupId) && ((_parent$parent$column = parent.parent.columns) === null || _parent$parent$column === void 0 ? void 0 : _parent$parent$column.includes(parent))) return {
+		left: (parent.parent.left ?? 0) + (parent.left ?? 0),
+		top: (parent.parent.top ?? 0) + (parent.top ?? 0)
+	};
 }
 function getDocumentSkeletonColumnPagePathInfo(position) {
-	var _path$indexOf, _path$indexOf2, _path$indexOf3;
 	const { path } = position;
-	const pagesIndex = (_path$indexOf = path === null || path === void 0 ? void 0 : path.indexOf("pages")) !== null && _path$indexOf !== void 0 ? _path$indexOf : -1;
-	const columnGroupIndex = (_path$indexOf2 = path === null || path === void 0 ? void 0 : path.indexOf("skeColumnGroups")) !== null && _path$indexOf2 !== void 0 ? _path$indexOf2 : -1;
-	const columnsIndex = (_path$indexOf3 = path === null || path === void 0 ? void 0 : path.indexOf("columns")) !== null && _path$indexOf3 !== void 0 ? _path$indexOf3 : -1;
+	const pagesIndex = (path === null || path === void 0 ? void 0 : path.indexOf("pages")) ?? -1;
+	const columnGroupIndex = (path === null || path === void 0 ? void 0 : path.indexOf("skeColumnGroups")) ?? -1;
+	const columnsIndex = (path === null || path === void 0 ? void 0 : path.indexOf("columns")) ?? -1;
 	if (pagesIndex === -1 || columnGroupIndex === -1 || columnsIndex === -1 || (path === null || path === void 0 ? void 0 : path[columnsIndex + 2]) !== "page") return;
 	const pageIndex = path === null || path === void 0 ? void 0 : path[pagesIndex + 1];
 	const columnGroupId = path === null || path === void 0 ? void 0 : path[columnGroupIndex + 1];
@@ -15529,22 +15687,22 @@ function visitPageLines(page, options, cb) {
 	page.sections.forEach((section) => {
 		section.columns.forEach((column) => {
 			column.lines.forEach((line) => {
-				var _options$getBounds, _ref, _bounds$lineWidth, _bounds$visualLeft, _bounds$visualWidth;
+				var _options$getBounds;
 				const bounds = (_options$getBounds = options.getBounds) === null || _options$getBounds === void 0 ? void 0 : _options$getBounds.call(options, page, column, section);
 				cb({
 					clipLeft: options.clipLeft,
 					clipRight: options.clipRight,
 					column,
 					line,
-					lineWidth: (_ref = (_bounds$lineWidth = bounds === null || bounds === void 0 ? void 0 : bounds.lineWidth) !== null && _bounds$lineWidth !== void 0 ? _bounds$lineWidth : bounds === null || bounds === void 0 ? void 0 : bounds.visualWidth) !== null && _ref !== void 0 ? _ref : getFiniteWidth(column.width),
+					lineWidth: (bounds === null || bounds === void 0 ? void 0 : bounds.lineWidth) ?? (bounds === null || bounds === void 0 ? void 0 : bounds.visualWidth) ?? getFiniteWidth(column.width),
 					page,
 					pageIndex: options.pageIndex,
 					pageLeft: options.pageLeft,
 					section,
 					sectionTop: options.pageTop + section.top,
 					source: options.source,
-					visualLeft: (_bounds$visualLeft = bounds === null || bounds === void 0 ? void 0 : bounds.visualLeft) !== null && _bounds$visualLeft !== void 0 ? _bounds$visualLeft : options.visualLeft,
-					visualWidth: (_bounds$visualWidth = bounds === null || bounds === void 0 ? void 0 : bounds.visualWidth) !== null && _bounds$visualWidth !== void 0 ? _bounds$visualWidth : options.visualWidth
+					visualLeft: (bounds === null || bounds === void 0 ? void 0 : bounds.visualLeft) ?? options.visualLeft,
+					visualWidth: (bounds === null || bounds === void 0 ? void 0 : bounds.visualWidth) ?? options.visualWidth
 				});
 			});
 		});
@@ -15566,8 +15724,7 @@ function collectPageTables(options) {
 	var _page$skeTables2;
 	const { contexts, docsLeft, includeCells, page, pageIndex, pageLeft, pageTop, resolveViewport, rootPage, source, tableCellInsetX, unitId } = options;
 	(_page$skeTables2 = page.skeTables) === null || _page$skeTables2 === void 0 || _page$skeTables2.forEach((table, tableId) => {
-		var _table$tableId;
-		const effectiveTableId = (_table$tableId = table.tableId) !== null && _table$tableId !== void 0 ? _table$tableId : tableId;
+		const effectiveTableId = table.tableId ?? tableId;
 		const tableLeft = pageLeft + table.left;
 		const tableTop = pageTop + table.top;
 		const sourceTableId = getSourceTableId(effectiveTableId);
@@ -15579,16 +15736,15 @@ function collectPageTables(options) {
 		const cells = [];
 		if (includeCells) table.rows.forEach((row, rowIndex) => {
 			row.cells.forEach((cell, columnIndex) => {
-				var _cell$marginLeft, _cell$marginRight, _cell$marginTop, _cell$marginBottom, _cell$pageWidth, _cell$pageHeight, _row$top, _cell$left;
 				if (cell.isMergedCellCovered) return;
-				const cellMarginLeft = (_cell$marginLeft = cell.marginLeft) !== null && _cell$marginLeft !== void 0 ? _cell$marginLeft : 0;
-				const cellMarginRight = (_cell$marginRight = cell.marginRight) !== null && _cell$marginRight !== void 0 ? _cell$marginRight : 0;
-				const cellMarginTop = (_cell$marginTop = cell.marginTop) !== null && _cell$marginTop !== void 0 ? _cell$marginTop : 0;
-				const cellMarginBottom = (_cell$marginBottom = cell.marginBottom) !== null && _cell$marginBottom !== void 0 ? _cell$marginBottom : 0;
-				const cellPageWidth = (_cell$pageWidth = cell.pageWidth) !== null && _cell$pageWidth !== void 0 ? _cell$pageWidth : 0;
-				const cellPageHeight = (_cell$pageHeight = cell.pageHeight) !== null && _cell$pageHeight !== void 0 ? _cell$pageHeight : 0;
-				const cellTop = tableTop + ((_row$top = row.top) !== null && _row$top !== void 0 ? _row$top : 0) + cellMarginTop;
-				const cellLeft = tableLeft + ((_cell$left = cell.left) !== null && _cell$left !== void 0 ? _cell$left : 0) - tableScrollLeft + cellMarginLeft;
+				const cellMarginLeft = cell.marginLeft ?? 0;
+				const cellMarginRight = cell.marginRight ?? 0;
+				const cellMarginTop = cell.marginTop ?? 0;
+				const cellMarginBottom = cell.marginBottom ?? 0;
+				const cellPageWidth = cell.pageWidth ?? 0;
+				const cellPageHeight = cell.pageHeight ?? 0;
+				const cellTop = tableTop + (row.top ?? 0) + cellMarginTop;
+				const cellLeft = tableLeft + (cell.left ?? 0) - tableScrollLeft + cellMarginLeft;
 				const cellContentRight = cellLeft + cellPageWidth - cellMarginLeft - cellMarginRight;
 				const visualLeft = cellLeft + tableCellInsetX;
 				const visualRight = cellContentRight - tableCellInsetX;
@@ -15755,7 +15911,6 @@ const DEFAULT_TEXT_RUN = {
 	ed: 0
 };
 function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig, paragraph) {
-	var _sectionBreakConfig$d;
 	const { gridType = _univerjs_core.GridType.LINES, charSpace = 0, documentTextStyle = {}, pageSize = {
 		width: Number.POSITIVE_INFINITY,
 		height: Number.POSITIVE_INFINITY
@@ -15764,7 +15919,7 @@ function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig
 	const { isRenderStyle } = renderConfig;
 	const { startIndex } = paragraphNode;
 	const originTextRun = viewModel.getTextRun(index + startIndex);
-	const textRun = isRenderStyle === _univerjs_core.BooleanNumber.FALSE ? DEFAULT_TEXT_RUN : originTextRun !== null && originTextRun !== void 0 ? originTextRun : DEFAULT_TEXT_RUN;
+	const textRun = isRenderStyle === _univerjs_core.BooleanNumber.FALSE ? DEFAULT_TEXT_RUN : originTextRun ?? DEFAULT_TEXT_RUN;
 	const customDecoration = viewModel.getCustomDecoration(index + startIndex);
 	const showCustomDecoration = customDecoration && customDecoration.show !== false;
 	const customDecorationStyle = showCustomDecoration ? getCustomDecorationStyle(customDecoration) : null;
@@ -15799,7 +15954,7 @@ function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig
 		charSpace,
 		gridType,
 		snapToGrid,
-		documentCompatibilityPolicy: (_sectionBreakConfig$d = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d !== void 0 ? _sectionBreakConfig$d : getDocumentCompatibilityPolicy(),
+		documentCompatibilityPolicy: sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy(),
 		pageWidth
 	};
 	if (!hasAddonStyle && originTextRun) fontCreateConfigCache.setValue(st, ed, result);
@@ -15906,8 +16061,8 @@ function prepareSectionBreakConfig(ctx, nodeIndex) {
 		...(0, _univerjs_core.resolveSectionHeaderFooterReferences)(documentStyle, sectionBreaks, nodeIndex)
 	};
 	if (documentFlavor === _univerjs_core.DocumentFlavor.MODERN) {
-		var _documentStyle$pageSi, _documentStyle$pageSi2;
-		const modernPageWidth = (_documentStyle$pageSi = (_documentStyle$pageSi2 = documentStyle.pageSize) === null || _documentStyle$pageSi2 === void 0 ? void 0 : _documentStyle$pageSi2.width) !== null && _documentStyle$pageSi !== void 0 ? _documentStyle$pageSi : DEFAULT_MODERN_DOCUMENT_STYLE.pageSize.width;
+		var _documentStyle$pageSi;
+		const modernPageWidth = ((_documentStyle$pageSi = documentStyle.pageSize) === null || _documentStyle$pageSi === void 0 ? void 0 : _documentStyle$pageSi.width) ?? DEFAULT_MODERN_DOCUMENT_STYLE.pageSize.width;
 		sectionBreak = Object.assign({}, sectionBreak, DEFAULT_MODERN_SECTION_BREAK);
 		documentStyle = Object.assign({}, documentStyle, DEFAULT_MODERN_DOCUMENT_STYLE, { pageSize: {
 			...DEFAULT_MODERN_DOCUMENT_STYLE.pageSize,
@@ -16030,14 +16185,14 @@ function createSkeletonPage(ctx, sectionBreakConfig, skeletonResourceReference,
 	page.pageOrient = pageOrient;
 	const { defaultHeaderId, evenPageHeaderId, firstPageHeaderId } = headerIds;
 	const { defaultFooterId, evenPageFooterId, firstPageFooterId } = footerIds;
-	let headerId = defaultHeaderId !== null && defaultHeaderId !== void 0 ? defaultHeaderId : "";
-	let footerId = defaultFooterId !== null && defaultFooterId !== void 0 ? defaultFooterId : "";
+	let headerId = defaultHeaderId ?? "";
+	let footerId = defaultFooterId ?? "";
 	if (pageNumber === pageNumberStart && useFirstPageHeaderFooter === _univerjs_core.BooleanNumber.TRUE) {
-		headerId = firstPageHeaderId !== null && firstPageHeaderId !== void 0 ? firstPageHeaderId : "";
-		footerId = firstPageFooterId !== null && firstPageFooterId !== void 0 ? firstPageFooterId : "";
+		headerId = firstPageHeaderId ?? "";
+		footerId = firstPageFooterId ?? "";
 	} else if (pageNumber % 2 === 0 && evenAndOddHeaders === _univerjs_core.BooleanNumber.TRUE) {
-		headerId = evenPageHeaderId !== null && evenPageHeaderId !== void 0 ? evenPageHeaderId : "";
-		footerId = evenPageFooterId !== null && evenPageFooterId !== void 0 ? evenPageFooterId : "";
+		headerId = evenPageHeaderId ?? "";
+		footerId = evenPageFooterId ?? "";
 	}
 	let header;
 	let footer;
@@ -16111,7 +16266,6 @@ function _getNullPage(type = 0, segmentId = "") {
 	};
 }
 function _createSkeletonHeaderFooter(ctx, headerOrFooterViewModel, sectionBreakConfig, skeletonResourceReference, segmentId, isHeader = true, areaPage, count = 0) {
-	var _sectionBreakConfig$d;
 	const { sectionId, lists, footerTreeMap, headerTreeMap, localeService, pageSize, drawings, marginLeft = 0, marginRight = 0, marginHeader = 0, marginFooter = 0 } = sectionBreakConfig;
 	const pageWidth = (pageSize === null || pageSize === void 0 ? void 0 : pageSize.width) || Number.POSITIVE_INFINITY;
 	const pageHeight = (pageSize === null || pageSize === void 0 ? void 0 : pageSize.height) || Number.POSITIVE_INFINITY;
@@ -16140,7 +16294,7 @@ function _createSkeletonHeaderFooter(ctx, headerOrFooterViewModel, sectionBreakC
 		resetContext(ctx);
 		return _createSkeletonHeaderFooter(ctx, headerOrFooterViewModel, sectionBreakConfig, skeletonResourceReference, segmentId, isHeader, areaPage, count);
 	}
-	updateBlockIndex([page], -1, (_sectionBreakConfig$d = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d !== void 0 ? _sectionBreakConfig$d : getDocumentCompatibilityPolicy());
+	updateBlockIndex([page], -1, sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy());
 	if (isHeader) Object.assign(page, {
 		marginTop: marginHeader,
 		marginBottom: 5
@@ -16152,13 +16306,12 @@ function _createSkeletonHeaderFooter(ctx, headerOrFooterViewModel, sectionBreakC
 	return page;
 }
 function createNullCellPage(ctx, sectionBreakConfig, tableConfig, row, col, availableHeight = Number.POSITIVE_INFINITY, maxCellPageHeight = Number.POSITIVE_INFINITY) {
-	var _ref, _cellConfig$margin, _cellConfig$columnSpa;
 	const { sectionId, lists, footerTreeMap, headerTreeMap, localeService, drawings } = sectionBreakConfig;
 	const { skeletonResourceReference } = ctx;
 	const { cellMargin, tableRows, tableColumns, tableId } = tableConfig;
 	const cellConfig = tableRows[row].tableCells[col];
-	let { start = { v: 10 }, end = { v: 10 }, top = { v: 5 }, bottom = { v: 5 } } = (_ref = (_cellConfig$margin = cellConfig.margin) !== null && _cellConfig$margin !== void 0 ? _cellConfig$margin : cellMargin) !== null && _ref !== void 0 ? _ref : {};
-	const columnSpan = Math.max(1, (_cellConfig$columnSpa = cellConfig.columnSpan) !== null && _cellConfig$columnSpa !== void 0 ? _cellConfig$columnSpa : 1);
+	let { start = { v: 10 }, end = { v: 10 }, top = { v: 5 }, bottom = { v: 5 } } = cellConfig.margin ?? cellMargin ?? {};
+	const columnSpan = Math.max(1, cellConfig.columnSpan ?? 1);
 	const pageWidth = tableColumns.slice(col, col + columnSpan).reduce((sum, column) => sum + column.size.width.v, 0);
 	if (start.v + end.v >= pageWidth) {
 		const marginWidth = start.v + end.v;
@@ -16202,7 +16355,7 @@ function createNullCellPage(ctx, sectionBreakConfig, tableConfig, row, col, avai
 	};
 }
 function createSkeletonCellPages(ctx, viewModel, cellNode, sectionBreakConfig, tableConfig, row, col, availableHeight = Number.POSITIVE_INFINITY, maxCellPageHeight = Number.POSITIVE_INFINITY) {
-	var _sectionBreakConfig$d2, _ctx$dataModel, _ctx$dataModel$getBod;
+	var _ctx$dataModel, _ctx$dataModel$getBod;
 	const sectionNode = cellNode.children[0];
 	const { page: areaPage, sectionBreakConfig: cellSectionBreakConfig } = createNullCellPage(ctx, sectionBreakConfig, tableConfig, row, col, availableHeight, maxCellPageHeight);
 	const segmentId = tableConfig.tableId;
@@ -16215,7 +16368,7 @@ function createSkeletonCellPages(ctx, viewModel, cellNode, sectionBreakConfig, t
 		const result = dealWithSection(ctx, viewModel, sectionNode, currentPage, cellSectionBreakConfig, layoutAnchor);
 		pages = [...retainedPages, ...result.pages];
 		if (!ctx.isDirty || ctx.layoutStartPointer[segmentId] == null || count === 10) break;
-		const retryPage = pages.at(-1);
+		const retryPage = pages[pages.length - 1];
 		if (retryPage == null) break;
 		retainedPages.splice(0, retainedPages.length, ...pages.slice(0, -1));
 		currentPage = retryPage;
@@ -16225,7 +16378,7 @@ function createSkeletonCellPages(ctx, viewModel, cellNode, sectionBreakConfig, t
 		p.type = 3;
 		p.segmentId = segmentId;
 	}
-	updateBlockIndex(pages, cellNode.startIndex, (_sectionBreakConfig$d2 = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d2 !== void 0 ? _sectionBreakConfig$d2 : getDocumentCompatibilityPolicy());
+	updateBlockIndex(pages, cellNode.startIndex, sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy());
 	applyTrailingBlockRangeSpaceBelow(pages, (_ctx$dataModel = ctx.dataModel) === null || _ctx$dataModel === void 0 || (_ctx$dataModel$getBod = _ctx$dataModel.getBody) === null || _ctx$dataModel$getBod === void 0 ? void 0 : _ctx$dataModel$getBod.call(_ctx$dataModel), cellNode.endIndex);
 	updateInlineDrawingCoordsAndBorder(ctx, pages);
 	expandCellPageHeightForInlineDrawings(pages);
@@ -16235,9 +16388,9 @@ function expandCellPageHeightForInlineDrawings(pages) {
 	for (const page of pages) {
 		var _page$skeDrawings;
 		(_page$skeDrawings = page.skeDrawings) === null || _page$skeDrawings === void 0 || _page$skeDrawings.forEach((drawing) => {
-			var _drawing$drawingOrigi, _drawing$aTop, _drawing$height;
+			var _drawing$drawingOrigi;
 			if (((_drawing$drawingOrigi = drawing.drawingOrigin) === null || _drawing$drawingOrigi === void 0 ? void 0 : _drawing$drawingOrigi.layoutType) !== _univerjs_core.PositionedObjectLayoutType.INLINE) return;
-			const drawingBottom = ((_drawing$aTop = drawing.aTop) !== null && _drawing$aTop !== void 0 ? _drawing$aTop : 0) + ((_drawing$height = drawing.height) !== null && _drawing$height !== void 0 ? _drawing$height : 0);
+			const drawingBottom = (drawing.aTop ?? 0) + (drawing.height ?? 0);
 			if (drawingBottom > page.height) page.height = drawingBottom;
 		});
 	}
@@ -16247,8 +16400,10 @@ function applyTrailingBlockRangeSpaceBelow(pages, body, containerEndIndex) {
 	const trailingBlockRangeSpace = 28;
 	if (!(blockRanges === null || blockRanges === void 0 ? void 0 : blockRanges.length)) return;
 	for (const page of pages) {
-		var _page$sections$at, _body$paragraphs;
-		const lastLine = (_page$sections$at = page.sections.at(-1)) === null || _page$sections$at === void 0 || (_page$sections$at = _page$sections$at.columns.at(-1)) === null || _page$sections$at === void 0 ? void 0 : _page$sections$at.lines.at(-1);
+		var _body$paragraphs;
+		const lastSection = page.sections[page.sections.length - 1];
+		const lastColumn = lastSection === null || lastSection === void 0 ? void 0 : lastSection.columns[lastSection.columns.length - 1];
+		const lastLine = lastColumn === null || lastColumn === void 0 ? void 0 : lastColumn.lines[lastColumn.lines.length - 1];
 		if (!lastLine) continue;
 		const paragraphIndex = lastLine.paragraphIndex;
 		if (!blockRanges.some((range) => range.startIndex < paragraphIndex && paragraphIndex < range.endIndex)) continue;
@@ -16542,6 +16697,7 @@ function generateOrderedSymbol(startIndex, startNumber, glyphType) {
 	if (glyphType === _univerjs_core.ListGlyphType.LOWER_LETTER) return alpha(startIndex, startNumber);
 	if (glyphType === _univerjs_core.ListGlyphType.UPPER_ROMAN) return upperRoman(startIndex, startNumber);
 	if (glyphType === _univerjs_core.ListGlyphType.LOWER_ROMAN) return roman(startIndex, startNumber);
+	if (glyphType === _univerjs_core.ListGlyphType.CHINESE_COUNTING) return chineseCounting(startIndex, startNumber);
 	return decimal(startIndex, startNumber);
 }
 function decimal(startIndex, startNumber) {
@@ -16564,6 +16720,34 @@ function upperRoman(startIndex, startNumber) {
 function roman(startIndex, startNumber) {
 	return _convertRoman(startIndex + startNumber, false);
 }
+function chineseCounting(startIndex, startNumber) {
+	const value = startIndex + startNumber;
+	if (value <= 0 || value >= 1e4) return value.toString();
+	const digits = "零一二三四五六七八九";
+	const units = [
+		"",
+		"十",
+		"百",
+		"千"
+	];
+	let result = "";
+	let pendingZero = false;
+	for (let place = 3; place >= 0; place--) {
+		const divisor = 10 ** place;
+		const digit = Math.floor(value / divisor) % 10;
+		if (digit === 0) {
+			pendingZero ||= result.length > 0 && value % divisor > 0;
+			continue;
+		}
+		if (pendingZero) {
+			result += digits[0];
+			pendingZero = false;
+		}
+		if (!(digit === 1 && place === 1 && result.length === 0)) result += digits[digit];
+		result += units[place];
+	}
+	return result;
+}
 function _convertRoman(num, uppercase = false) {
 	const upperLookup = {
 		M: 1e3,
@@ -16606,9 +16790,10 @@ function _convertRoman(num, uppercase = false) {
 
 //#endregion
 //#region src/components/docs/layout/block/paragraph/bullet.ts
-function dealWithBullet(bullet, lists, listLevelAncestors, localeService) {
+function dealWithBullet(bullet, lists, listLevelAncestors, localeService, compactSpacing = false, paragraphTextStyle) {
 	if (!bullet || !lists) return;
-	const { listId, listType, nestingLevel = 0, textStyle } = bullet;
+	const { listId, listType, nestingLevel = 0, startNumber, image, textStyle } = bullet;
+	const preserveTextLineHeight = compactSpacing;
 	const list = lists[listType];
 	if (!list || !list.nestingLevel) {
 		var _listLevelAncestors$n;
@@ -16618,7 +16803,10 @@ function dealWithBullet(bullet, lists, listLevelAncestors, localeService) {
 		var _listLevelAncestors$n2;
 		return getDefaultBulletSke(listId, listLevelAncestors === null || listLevelAncestors === void 0 || (_listLevelAncestors$n2 = listLevelAncestors[nestingLevel]) === null || _listLevelAncestors$n2 === void 0 ? void 0 : _listLevelAncestors$n2.startIndexItem);
 	}
-	return _getBulletSke(listId, nestingLevel, list.nestingLevel, listLevelAncestors, textStyle, localeService);
+	return _getBulletSke(listId, nestingLevel, list.nestingLevel, listLevelAncestors, startNumber, {
+		...paragraphTextStyle,
+		...textStyle
+	}, localeService, compactSpacing, preserveTextLineHeight, image === null || image === void 0 ? void 0 : image.source);
 }
 function getDefaultBulletSke(listId, startIndex = 1) {
 	return {
@@ -16636,8 +16824,7 @@ function getDefaultBulletSke(listId, startIndex = 1) {
 		}
 	};
 }
-function _getBulletSke(listId, nestingLevel, nestings, listLevelAncestors, textStyleConfig, _localeService) {
-	var _listLevelAncestors$n3, _listLevelAncestors$n4;
+function _getBulletSke(listId, nestingLevel, nestings, listLevelAncestors, paragraphStartNumber, textStyleConfig, _localeService, compactSpacing = false, preserveTextLineHeight = false, imageSource) {
 	const nesting = nestings[nestingLevel];
 	const { bulletAlignment, glyphFormat, textStyle: textStyleFirst = {}, glyphType, glyphSymbol } = nesting;
 	const textStyle = {
@@ -16645,38 +16832,59 @@ function _getBulletSke(listId, nestingLevel, nestings, listLevelAncestors, textS
 		...textStyleFirst
 	};
 	const fontStyle = getFontStyleString(textStyle);
+	const previousAtLevel = listLevelAncestors === null || listLevelAncestors === void 0 ? void 0 : listLevelAncestors[nestingLevel];
+	const startIndex = paragraphStartNumber === void 0 ? (previousAtLevel === null || previousAtLevel === void 0 ? void 0 : previousAtLevel.startIndexItem) ?? 1 : 1;
+	const effectiveStartNumber = paragraphStartNumber ?? (previousAtLevel === null || previousAtLevel === void 0 ? void 0 : previousAtLevel.startNumber) ?? nesting.startNumber;
 	let symbolContent;
-	if (glyphSymbol) symbolContent = glyphSymbol;
-	else symbolContent = __generateOrderedListSymbol(glyphFormat, nestingLevel, nestings, listLevelAncestors);
-	const startIndex = (_listLevelAncestors$n3 = listLevelAncestors === null || listLevelAncestors === void 0 || (_listLevelAncestors$n4 = listLevelAncestors[nestingLevel]) === null || _listLevelAncestors$n4 === void 0 ? void 0 : _listLevelAncestors$n4.startIndexItem) !== null && _listLevelAncestors$n3 !== void 0 ? _listLevelAncestors$n3 : 1;
+	if (glyphSymbol) symbolContent = normalizeLegacySymbolFontGlyph(glyphSymbol, textStyle.ff);
+	else symbolContent = __generateOrderedListSymbol(glyphFormat, nestingLevel, nestings, listLevelAncestors, startIndex, effectiveStartNumber);
 	return {
 		listId,
 		symbol: symbolContent,
 		ts: textStyle,
 		fontStyle,
 		startIndexItem: startIndex + 1,
+		startNumber: effectiveStartNumber,
 		nestingLevel: nesting,
 		bulletAlign: bulletAlignment,
 		bulletType: glyphSymbol ? false : !!glyphType,
+		compactSpacing,
+		preserveTextLineHeight,
+		imageSource,
 		paragraphProperties: nesting.paragraphProperties
 	};
 }
-function __generateOrderedListSymbol(glyphFormat, nestingLevel, nestings, listLevelAncestors) {
+const LEGACY_SYMBOL_GLYPH_EQUIVALENTS = { wingdings: {
+	167: "▪",
+	216: "➢"
+} };
+function normalizeLegacySymbolFontGlyph(symbol, fontFamily) {
+	var _fontFamily$split$;
+	const primaryFontFamily = fontFamily === null || fontFamily === void 0 || (_fontFamily$split$ = fontFamily.split(",")[0]) === null || _fontFamily$split$ === void 0 ? void 0 : _fontFamily$split$.trim().replace(/^['"]|['"]$/g, "").toLowerCase();
+	const equivalents = primaryFontFamily ? LEGACY_SYMBOL_GLYPH_EQUIVALENTS[primaryFontFamily] : void 0;
+	if (!equivalents) return symbol;
+	return Array.from(symbol, (character) => {
+		const codePoint = character.codePointAt(0);
+		return codePoint === void 0 ? character : equivalents[codePoint] ?? character;
+	}).join("");
+}
+function __generateOrderedListSymbol(glyphFormat, nestingLevel, nestings, listLevelAncestors, currentStartIndex, currentStartNumber) {
 	const glyphFormatSplit = glyphFormat.split("%");
 	const resultSymbol = [glyphFormatSplit[0]];
 	for (let i = 1; i < glyphFormatSplit.length; i++) {
-		var _listLevelAncestors$l;
 		const levelAndSuffixPre = glyphFormatSplit[i];
 		const { level, suffix } = ___getLevelAndSuffix(levelAndSuffixPre);
-		let startIndexItem = (listLevelAncestors === null || listLevelAncestors === void 0 || (_listLevelAncestors$l = listLevelAncestors[level]) === null || _listLevelAncestors$l === void 0 ? void 0 : _listLevelAncestors$l.startIndexItem) || 1;
-		if (level !== nestingLevel && (listLevelAncestors === null || listLevelAncestors === void 0 ? void 0 : listLevelAncestors[level]) !== null) startIndexItem -= 1;
-		const singleSymbol = ___getSymbolByBesting(startIndexItem, nestings[level]);
+		const ancestor = listLevelAncestors === null || listLevelAncestors === void 0 ? void 0 : listLevelAncestors[level];
+		let startIndexItem = level === nestingLevel ? currentStartIndex : (ancestor === null || ancestor === void 0 ? void 0 : ancestor.startIndexItem) || 1;
+		if (level !== nestingLevel && ancestor !== null) startIndexItem -= 1;
+		const startNumber = level === nestingLevel ? currentStartNumber : (ancestor === null || ancestor === void 0 ? void 0 : ancestor.startNumber) ?? nestings[level].startNumber;
+		const singleSymbol = ___getSymbolByBesting(startIndexItem, nestings[level], startNumber);
 		resultSymbol.push(singleSymbol, suffix);
 	}
 	return resultSymbol.join("");
 }
-function ___getSymbolByBesting(startIndex = 1, nesting) {
-	const { startNumber, glyphType, glyphSymbol } = nesting;
+function ___getSymbolByBesting(startIndex = 1, nesting, startNumber = nesting.startNumber) {
+	const { glyphType, glyphSymbol } = nesting;
 	if (glyphSymbol) return glyphSymbol;
 	if (!glyphType) return "●";
 	return getBulletOrderedSymbol(startIndex, startNumber, glyphType);
@@ -16804,9 +17012,9 @@ function _getListLevelAncestors(bullet, listLevel) {
 	if (level < 0) level = 0;
 	const listLevelAncestors = [];
 	for (let i = level; i >= 0; i--) if (Array.isArray(sameList === null || sameList === void 0 ? void 0 : sameList[i])) {
-		var _sameList$i$bullet, _sameList$i;
+		var _sameList$i;
 		const len = sameList[i].length;
-		listLevelAncestors[i] = (_sameList$i$bullet = (_sameList$i = sameList[i][len - 1]) === null || _sameList$i === void 0 ? void 0 : _sameList$i.bullet) !== null && _sameList$i$bullet !== void 0 ? _sameList$i$bullet : null;
+		listLevelAncestors[i] = ((_sameList$i = sameList[i][len - 1]) === null || _sameList$i === void 0 ? void 0 : _sameList$i.bullet) ?? null;
 	} else listLevelAncestors[i] = null;
 	return listLevelAncestors;
 }
@@ -16823,9 +17031,8 @@ function _updateListLevelAncestors(paragraph, bullet, bulletSkeleton, listLevel)
 	listLevel === null || listLevel === void 0 || listLevel.set(listId, cacheItem);
 }
 function _withMinSpacing(style, key, value) {
-	var _current$v;
 	const current = style[key];
-	const nextValue = Math.max((_current$v = current === null || current === void 0 ? void 0 : current.v) !== null && _current$v !== void 0 ? _current$v : 0, value);
+	const nextValue = Math.max((current === null || current === void 0 ? void 0 : current.v) ?? 0, value);
 	style[key] = {
 		...current,
 		v: nextValue
@@ -16833,7 +17040,7 @@ function _withMinSpacing(style, key, value) {
 }
 function _getNextAdjacentBlockRange(blockRanges, blockRange) {
 	let nextBlockRange;
-	for (const range of blockRanges !== null && blockRanges !== void 0 ? blockRanges : []) if (range.startIndex > blockRange.endIndex && (!nextBlockRange || range.startIndex < nextBlockRange.startIndex)) nextBlockRange = range;
+	for (const range of blockRanges ?? []) if (range.startIndex > blockRange.endIndex && (!nextBlockRange || range.startIndex < nextBlockRange.startIndex)) nextBlockRange = range;
 	return nextBlockRange;
 }
 function _hasNextAdjacentLayoutBlockRange(blockRanges, blockRange) {
@@ -16841,7 +17048,6 @@ function _hasNextAdjacentLayoutBlockRange(blockRanges, blockRange) {
 	return nextBlockRange != null && BLOCK_LAYOUT_OUTER_SPACING_MAP.has(nextBlockRange.blockType) && nextBlockRange.startIndex === blockRange.endIndex + 1;
 }
 function _applyBlockRangeLayoutParagraphStyle(body, paragraph, paragraphStyle, documentStyle, useLegacyModernDefaults, styles, paragraphStyleId) {
-	var _body$paragraphs, _BLOCK_LAYOUT_OUTER_S;
 	const blockRanges = body === null || body === void 0 ? void 0 : body.blockRanges;
 	const resolveOptions = {
 		useLegacyModernDefaults,
@@ -16856,18 +17062,18 @@ function _applyBlockRangeLayoutParagraphStyle(body, paragraph, paragraphStyle, d
 		excludeDocumentOuterSpacing: true
 	});
 	if (style.lineSpacing == null) style.lineSpacing = _univerjs_core.DEFAULT_DOCUMENT_PARAGRAPH_LINE_SPACING;
-	const blockParagraphs = ((_body$paragraphs = body === null || body === void 0 ? void 0 : body.paragraphs) !== null && _body$paragraphs !== void 0 ? _body$paragraphs : []).filter((item) => item.startIndex > blockRange.startIndex && item.startIndex < blockRange.endIndex).sort((left, right) => left.startIndex - right.startIndex);
+	const blockParagraphs = ((body === null || body === void 0 ? void 0 : body.paragraphs) ?? []).filter((item) => item.startIndex > blockRange.startIndex && item.startIndex < blockRange.endIndex).sort((left, right) => left.startIndex - right.startIndex);
 	const firstParagraph = blockParagraphs[0];
 	const lastParagraph = blockParagraphs[blockParagraphs.length - 1];
-	const outerSpacing = (_BLOCK_LAYOUT_OUTER_S = BLOCK_LAYOUT_OUTER_SPACING_MAP.get(blockRange.blockType)) !== null && _BLOCK_LAYOUT_OUTER_S !== void 0 ? _BLOCK_LAYOUT_OUTER_S : 0;
+	const outerSpacing = BLOCK_LAYOUT_OUTER_SPACING_MAP.get(blockRange.blockType) ?? 0;
 	if ((firstParagraph === null || firstParagraph === void 0 ? void 0 : firstParagraph.startIndex) === paragraph.startIndex) _withMinSpacing(style, "spaceAbove", outerSpacing);
 	if ((lastParagraph === null || lastParagraph === void 0 ? void 0 : lastParagraph.startIndex) === paragraph.startIndex && !_hasNextAdjacentLayoutBlockRange(blockRanges, blockRange)) _withMinSpacing(style, "spaceBelow", outerSpacing);
 	return style;
 }
 function _isOnlyFloatingCustomBlockParagraph(viewModel, paragraphNode, drawings) {
-	var _paragraphNode$blocks, _paragraphNode$conten;
+	var _paragraphNode$blocks;
 	if (!((_paragraphNode$blocks = paragraphNode.blocks) === null || _paragraphNode$blocks === void 0 ? void 0 : _paragraphNode$blocks.length)) return false;
-	if (!((_paragraphNode$conten = paragraphNode.content) !== null && _paragraphNode$conten !== void 0 ? _paragraphNode$conten : "").split("").every((char) => char === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK || char === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH || char === _univerjs_core.DataStreamTreeTokenType.SECTION_BREAK)) return false;
+	if (!(paragraphNode.content ?? "").split("").every((char) => char === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK || char === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH || char === _univerjs_core.DataStreamTreeTokenType.SECTION_BREAK)) return false;
 	return paragraphNode.blocks.every((charIndex) => {
 		const customBlock = viewModel.getCustomBlock(charIndex);
 		const drawing = customBlock == null ? null : drawings[customBlock.blockId];
@@ -16875,12 +17081,12 @@ function _isOnlyFloatingCustomBlockParagraph(viewModel, paragraphNode, drawings)
 	});
 }
 function _getFollowingIndentedParagraphAnchorLeft(viewModel, paragraph, paragraphNode, drawings, isTraditionalDocument) {
-	var _paragraph$paragraphS, _paragraph$paragraphS2, _viewModel$getBody$pa, _viewModel$getBody, _paragraphs$0$paragra, _paragraphs$, _paragraphs$0$paragra2;
+	var _paragraph$paragraphS, _viewModel$getBody, _paragraphs$, _paragraphs$0$paragra;
 	if (!isTraditionalDocument) return;
-	if (((_paragraph$paragraphS = (_paragraph$paragraphS2 = paragraph.paragraphStyle) === null || _paragraph$paragraphS2 === void 0 || (_paragraph$paragraphS2 = _paragraph$paragraphS2.indentStart) === null || _paragraph$paragraphS2 === void 0 ? void 0 : _paragraph$paragraphS2.v) !== null && _paragraph$paragraphS !== void 0 ? _paragraph$paragraphS : 0) > 0) return;
+	if ((((_paragraph$paragraphS = paragraph.paragraphStyle) === null || _paragraph$paragraphS === void 0 || (_paragraph$paragraphS = _paragraph$paragraphS.indentStart) === null || _paragraph$paragraphS === void 0 ? void 0 : _paragraph$paragraphS.v) ?? 0) > 0) return;
 	if (!_isOnlyFloatingCustomBlockParagraph(viewModel, paragraphNode, drawings)) return;
-	const paragraphs = [...(_viewModel$getBody$pa = (_viewModel$getBody = viewModel.getBody) === null || _viewModel$getBody === void 0 || (_viewModel$getBody = _viewModel$getBody.call(viewModel)) === null || _viewModel$getBody === void 0 ? void 0 : _viewModel$getBody.paragraphs) !== null && _viewModel$getBody$pa !== void 0 ? _viewModel$getBody$pa : []].filter((item) => item.startIndex > paragraph.startIndex).sort((left, right) => left.startIndex - right.startIndex);
-	return ((_paragraphs$0$paragra = (_paragraphs$ = paragraphs[0]) === null || _paragraphs$ === void 0 || (_paragraphs$ = _paragraphs$.paragraphStyle) === null || _paragraphs$ === void 0 || (_paragraphs$ = _paragraphs$.indentStart) === null || _paragraphs$ === void 0 ? void 0 : _paragraphs$.v) !== null && _paragraphs$0$paragra !== void 0 ? _paragraphs$0$paragra : 0) > 0 ? (_paragraphs$0$paragra2 = paragraphs[0].paragraphStyle) === null || _paragraphs$0$paragra2 === void 0 ? void 0 : _paragraphs$0$paragra2.indentStart : void 0;
+	const paragraphs = [...((_viewModel$getBody = viewModel.getBody) === null || _viewModel$getBody === void 0 || (_viewModel$getBody = _viewModel$getBody.call(viewModel)) === null || _viewModel$getBody === void 0 ? void 0 : _viewModel$getBody.paragraphs) ?? []].filter((item) => item.startIndex > paragraph.startIndex).sort((left, right) => left.startIndex - right.startIndex);
+	return (((_paragraphs$ = paragraphs[0]) === null || _paragraphs$ === void 0 || (_paragraphs$ = _paragraphs$.paragraphStyle) === null || _paragraphs$ === void 0 || (_paragraphs$ = _paragraphs$.indentStart) === null || _paragraphs$ === void 0 ? void 0 : _paragraphs$.v) ?? 0) > 0 ? (_paragraphs$0$paragra = paragraphs[0].paragraphStyle) === null || _paragraphs$0$paragra === void 0 ? void 0 : _paragraphs$0$paragra.indentStart : void 0;
 }
 function _getDrawingSkeletonFormat(drawingOrigin) {
 	const { drawingId } = drawingOrigin;
@@ -16905,32 +17111,26 @@ function _getNextPageNumber(lastPage) {
 }
 function _getParagraphLineRefs(pages, paragraphIndex) {
 	const refs = [];
-	for (const page of pages) {
-		var _page$sections;
-		for (const section of (_page$sections = page.sections) !== null && _page$sections !== void 0 ? _page$sections : []) for (const column of section.columns) for (const line of column.lines) if (line.paragraphIndex === paragraphIndex) refs.push({
-			page,
-			column,
-			line
-		});
-	}
+	for (const page of pages) for (const section of page.sections ?? []) for (const column of section.columns) for (const line of column.lines) if (line.paragraphIndex === paragraphIndex) refs.push({
+		page,
+		column,
+		line
+	});
 	return refs;
 }
 function _hasPageContent(page) {
-	var _page$sections2, _page$skeTables$size, _page$skeTables;
-	return ((_page$sections2 = page.sections) !== null && _page$sections2 !== void 0 ? _page$sections2 : []).some((section) => section.columns.some((column) => !isBlankColumn(column))) || ((_page$skeTables$size = (_page$skeTables = page.skeTables) === null || _page$skeTables === void 0 ? void 0 : _page$skeTables.size) !== null && _page$skeTables$size !== void 0 ? _page$skeTables$size : 0) > 0;
+	var _page$skeTables;
+	return (page.sections ?? []).some((section) => section.columns.some((column) => !isBlankColumn(column))) || (((_page$skeTables = page.skeTables) === null || _page$skeTables === void 0 ? void 0 : _page$skeTables.size) ?? 0) > 0;
 }
 function _hasOnlyExplicitPageBoundaryMarkers(page) {
-	var _page$skeTables$size2, _page$skeTables2, _page$sections3;
-	if (((_page$skeTables$size2 = (_page$skeTables2 = page.skeTables) === null || _page$skeTables2 === void 0 ? void 0 : _page$skeTables2.size) !== null && _page$skeTables$size2 !== void 0 ? _page$skeTables$size2 : 0) > 0) return false;
-	return ((_page$sections3 = page.sections) !== null && _page$sections3 !== void 0 ? _page$sections3 : []).every((section) => section.columns.every((column) => column.lines.every((line) => line.divides.every((divide) => divide.glyphGroup.every(({ raw, streamType }) => raw === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH || streamType === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH || raw === _univerjs_core.DataStreamTreeTokenType.PAGE_BREAK || streamType === _univerjs_core.DataStreamTreeTokenType.PAGE_BREAK)))));
+	var _page$skeTables2;
+	if ((((_page$skeTables2 = page.skeTables) === null || _page$skeTables2 === void 0 ? void 0 : _page$skeTables2.size) ?? 0) > 0) return false;
+	return (page.sections ?? []).every((section) => section.columns.every((column) => column.lines.every((line) => line.divides.every((divide) => divide.glyphGroup.every(({ raw, streamType }) => raw === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH || streamType === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH || raw === _univerjs_core.DataStreamTreeTokenType.PAGE_BREAK || streamType === _univerjs_core.DataStreamTreeTokenType.PAGE_BREAK)))));
 }
 function _lineSpanHeight(lines) {
 	if (lines.length === 0) return 0;
 	const firstTop = Math.min(...lines.map((line) => line.top));
-	return Math.max(...lines.map((line) => {
-		var _line$spaceBelowApply;
-		return line.top + line.lineHeight + Math.max(0, (_line$spaceBelowApply = line.spaceBelowApply) !== null && _line$spaceBelowApply !== void 0 ? _line$spaceBelowApply : 0);
-	})) - firstTop;
+	return Math.max(...lines.map((line) => line.top + line.lineHeight + Math.max(0, line.spaceBelowApply ?? 0))) - firstTop;
 }
 function _columnUsedHeight(column) {
 	return _lineSpanHeight(column.lines);
@@ -16942,10 +17142,10 @@ function _reindexColumnLines(column) {
 	});
 }
 function _prependLines(sourceColumn, targetColumn, lines) {
-	var _targetColumn$parent$, _targetColumn$parent;
+	var _targetColumn$parent;
 	if (lines.length === 0 || lines.some((line) => !sourceColumn.lines.includes(line))) return 0;
 	const movedHeight = _lineSpanHeight(lines);
-	const targetHeight = (_targetColumn$parent$ = (_targetColumn$parent = targetColumn.parent) === null || _targetColumn$parent === void 0 ? void 0 : _targetColumn$parent.height) !== null && _targetColumn$parent$ !== void 0 ? _targetColumn$parent$ : Number.POSITIVE_INFINITY;
+	const targetHeight = ((_targetColumn$parent = targetColumn.parent) === null || _targetColumn$parent === void 0 ? void 0 : _targetColumn$parent.height) ?? Number.POSITIVE_INFINITY;
 	if (movedHeight + _columnUsedHeight(targetColumn) > targetHeight) return 0;
 	const firstTop = Math.min(...lines.map((line) => line.top));
 	const moved = lines.map((line) => {
@@ -17056,7 +17256,7 @@ function _applyWidowControl(pages, paragraphIndex, metrics) {
 	return 0;
 }
 function lineBreaking(ctx, viewModel, shapedTextList, curPage, paragraphNode, sectionBreakConfig, tableSkeleton) {
-	var _viewModel$getSnapsho, _sectionBreakConfig$d, _viewModel$getBody2, _viewModel$getBody3;
+	var _viewModel$getSnapsho, _viewModel$getBody2;
 	const { skeletonResourceReference } = ctx;
 	const { lists, drawings = {}, localeService } = sectionBreakConfig;
 	const { endIndex, blocks = [], children } = paragraphNode;
@@ -17068,7 +17268,7 @@ function lineBreaking(ctx, viewModel, shapedTextList, curPage, paragraphNode, se
 	const { paragraphStyle = {}, bullet } = paragraph;
 	const documentSnapshot = (_viewModel$getSnapsho = viewModel.getSnapshot) === null || _viewModel$getSnapsho === void 0 ? void 0 : _viewModel$getSnapsho.call(viewModel);
 	const documentStyle = documentSnapshot === null || documentSnapshot === void 0 ? void 0 : documentSnapshot.documentStyle;
-	const documentCompatibilityPolicy = (_sectionBreakConfig$d = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d !== void 0 ? _sectionBreakConfig$d : getDocumentCompatibilityPolicy(documentStyle === null || documentStyle === void 0 ? void 0 : documentStyle.documentFlavor);
+	const documentCompatibilityPolicy = sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy(documentStyle === null || documentStyle === void 0 ? void 0 : documentStyle.documentFlavor);
 	const shouldApplyDocumentDefaults = documentCompatibilityPolicy.applyDocumentDefaultParagraphStyle;
 	const useWordStyleLineHeight = documentCompatibilityPolicy.useWordStyleLineHeight;
 	const { skeHeaders, skeFooters, skeListLevel, drawingAnchor } = skeletonResourceReference;
@@ -17081,12 +17281,9 @@ function lineBreaking(ctx, viewModel, shapedTextList, curPage, paragraphNode, se
 		segmentDrawingAnchorCache = /* @__PURE__ */ new Map();
 		drawingAnchor === null || drawingAnchor === void 0 || drawingAnchor.set(segmentId, segmentDrawingAnchorCache);
 	}
-	const resolvedParagraphStyle = _applyBlockRangeLayoutParagraphStyle((_viewModel$getBody2 = (_viewModel$getBody3 = viewModel.getBody) === null || _viewModel$getBody3 === void 0 ? void 0 : _viewModel$getBody3.call(viewModel)) !== null && _viewModel$getBody2 !== void 0 ? _viewModel$getBody2 : null, paragraph, paragraphStyle, documentStyle, shouldApplyDocumentDefaults, documentSnapshot === null || documentSnapshot === void 0 ? void 0 : documentSnapshot.styles, paragraph.styleId);
+	const resolvedParagraphStyle = _applyBlockRangeLayoutParagraphStyle(((_viewModel$getBody2 = viewModel.getBody) === null || _viewModel$getBody2 === void 0 ? void 0 : _viewModel$getBody2.call(viewModel)) ?? null, paragraph, paragraphStyle, documentStyle, shouldApplyDocumentDefaults, documentSnapshot === null || documentSnapshot === void 0 ? void 0 : documentSnapshot.styles, paragraph.styleId);
 	const borderBottom = resolvedParagraphStyle.borderBottom;
-	if (borderBottom) {
-		var _borderBottom$padding, _borderBottom$width;
-		_withMinSpacing(resolvedParagraphStyle, "spaceBelow", Math.max(0, (_borderBottom$padding = borderBottom.padding) !== null && _borderBottom$padding !== void 0 ? _borderBottom$padding : 0) + Math.max(0, (_borderBottom$width = borderBottom.width) !== null && _borderBottom$width !== void 0 ? _borderBottom$width : 1) / 2);
-	}
+	if (borderBottom) _withMinSpacing(resolvedParagraphStyle, "spaceBelow", Math.max(0, borderBottom.padding ?? 0) + Math.max(0, borderBottom.width ?? 1) / 2);
 	const paragraphConfig = {
 		paragraphIndex: endIndex,
 		documentCompatibilityPolicy,
@@ -17164,7 +17361,7 @@ function lineBreaking(ctx, viewModel, shapedTextList, curPage, paragraphNode, se
 			if (columnInfo && !columnInfo.isLast) setColumnFullState(columnInfo.column, true);
 			else if (columnInfo && columnInfo.isLast && isTraditionalDocumentCompatibility(documentCompatibilityPolicy) && (isBlankColumn(columnInfo.column) || _isDocxColumnBreakVisuallyBlankColumn(columnInfo.column))) {} else if (isTraditionalDocumentCompatibility(documentCompatibilityPolicy)) {
 				var _getLastSection;
-				const lastColumn = (_getLastSection = getLastSection(lastPage)) === null || _getLastSection === void 0 ? void 0 : _getLastSection.columns.at(-1);
+				const lastColumn = (_getLastSection = getLastSection(lastPage)) === null || _getLastSection === void 0 ? void 0 : _getLastSection.columns.slice(-1)[0];
 				if (lastColumn && (isBlankColumn(lastColumn) || _isDocxColumnBreakVisuallyBlankColumn(lastColumn))) setColumnFullState(lastColumn, false);
 				else allPages.push(createSkeletonPage(ctx, sectionBreakConfig, skeletonResourceReference, _getNextPageNumber(lastPage), 2));
 			} else allPages.push(createSkeletonPage(ctx, sectionBreakConfig, skeletonResourceReference, _getNextPageNumber(lastPage), 2));
@@ -17369,6 +17566,15 @@ function customBlockLineBreakExtension(breaker) {
 	});
 }
 
+//#endregion
+//#region src/components/docs/layout/line-breaker/extensions/east-asian-quote-linebreak-extension.ts
+const EAST_ASIAN_OPENING_QUOTES = /* @__PURE__ */ new Set([8216, 8220]);
+function eastAsianQuoteLineBreakExtension(breaker) {
+	breaker.addRule("break_before_east_asian_opening_quote", (codePoint) => {
+		return EAST_ASIAN_OPENING_QUOTES.has(codePoint);
+	});
+}
+
 //#endregion
 //#region src/components/docs/layout/line-breaker/extensions/tab-linebreak-extension.ts
 const TAB_CODE_POINT = 9;
@@ -17500,11 +17706,11 @@ function hyphenConfig(paragraphStyle, sectionBreakConfig) {
 	return suppressHyphenation === _univerjs_core.BooleanNumber.FALSE && autoHyphenation === _univerjs_core.BooleanNumber.TRUE;
 }
 function collectMeasuredWholeEntityRanges(content, viewModel, paragraphNode) {
-	var _viewModel$getBody$cu, _viewModel$getBody;
+	var _viewModel$getBody;
 	const ranges = [];
 	const contentStartIndex = paragraphNode.startIndex;
 	const contentEndIndex = contentStartIndex + content.length - 1;
-	const customRanges = (_viewModel$getBody$cu = (_viewModel$getBody = viewModel.getBody()) === null || _viewModel$getBody === void 0 ? void 0 : _viewModel$getBody.customRanges) !== null && _viewModel$getBody$cu !== void 0 ? _viewModel$getBody$cu : [];
+	const customRanges = ((_viewModel$getBody = viewModel.getBody()) === null || _viewModel$getBody === void 0 ? void 0 : _viewModel$getBody.customRanges) ?? [];
 	for (const customRange of customRanges) {
 		if (!customRange.wholeEntity || customRange.startIndex < contentStartIndex || customRange.endIndex < customRange.startIndex || customRange.endIndex > contentEndIndex) continue;
 		const interceptedRange = viewModel.getCustomRange(customRange.startIndex);
@@ -17545,6 +17751,7 @@ function shaping(ctx, content, viewModel, paragraphNode, sectionBreakConfig) {
 	const { hyphen, languageDetector } = ctx;
 	tabLineBreakExtension(lineBreaker);
 	customBlockLineBreakExtension(lineBreaker);
+	if (cjk.hasCJKText(content)) eastAsianQuoteLineBreakExtension(lineBreaker);
 	let breaker = new LineBreakerLinkEnhancer(lineBreaker);
 	const lang = languageDetector.detect(content);
 	const needHyphen = hyphenConfig(paragraphStyle, sectionBreakConfig);
@@ -17583,15 +17790,15 @@ function shaping(ctx, content, viewModel, paragraphNode, sectionBreakConfig) {
 					const { blockId } = customBlock;
 					const drawingOrigin = drawings[blockId];
 					if ((drawingOrigin === null || drawingOrigin === void 0 ? void 0 : drawingOrigin.layoutType) === _univerjs_core.PositionedObjectLayoutType.INLINE) {
-						var _viewModel$getDataMod, _viewModel$getDataMod2, _viewModel$getDataMod3, _boundingBox$height, _boundingBox$width, _ref, _viewport$layoutWidth, _viewport$height;
+						var _viewModel$getDataMod, _viewModel$getDataMod2;
 						const { angle } = drawingOrigin.docTransform;
 						const { width = 0, height = 0 } = drawingOrigin.docTransform.size;
 						const boundingBox = getBoundingBox(angle, 0, width, 0, height);
-						const viewport = getDocsCustomBlockRenderViewport((_viewModel$getDataMod = (_viewModel$getDataMod2 = (_viewModel$getDataMod3 = viewModel.getDataModel()).getUnitId) === null || _viewModel$getDataMod2 === void 0 ? void 0 : _viewModel$getDataMod2.call(_viewModel$getDataMod3)) !== null && _viewModel$getDataMod !== void 0 ? _viewModel$getDataMod : "", drawingOrigin.drawingId, {
-							fallbackHeight: (_boundingBox$height = boundingBox.height) !== null && _boundingBox$height !== void 0 ? _boundingBox$height : 0,
-							fallbackWidth: (_boundingBox$width = boundingBox.width) !== null && _boundingBox$width !== void 0 ? _boundingBox$width : 0
+						const viewport = getDocsCustomBlockRenderViewport(((_viewModel$getDataMod = (_viewModel$getDataMod2 = viewModel.getDataModel()).getUnitId) === null || _viewModel$getDataMod === void 0 ? void 0 : _viewModel$getDataMod.call(_viewModel$getDataMod2)) ?? "", drawingOrigin.drawingId, {
+							fallbackHeight: boundingBox.height ?? 0,
+							fallbackWidth: boundingBox.width ?? 0
 						});
-						newGlyph = createSkeletonCustomBlockGlyph(config, (_ref = (_viewport$layoutWidth = viewport === null || viewport === void 0 ? void 0 : viewport.layoutWidth) !== null && _viewport$layoutWidth !== void 0 ? _viewport$layoutWidth : viewport === null || viewport === void 0 ? void 0 : viewport.width) !== null && _ref !== void 0 ? _ref : boundingBox.width, (_viewport$height = viewport === null || viewport === void 0 ? void 0 : viewport.height) !== null && _viewport$height !== void 0 ? _viewport$height : boundingBox.height, drawingOrigin.drawingId);
+						newGlyph = createSkeletonCustomBlockGlyph(config, (viewport === null || viewport === void 0 ? void 0 : viewport.layoutWidth) ?? (viewport === null || viewport === void 0 ? void 0 : viewport.width) ?? boundingBox.width, (viewport === null || viewport === void 0 ? void 0 : viewport.height) ?? boundingBox.height, drawingOrigin.drawingId);
 					} else if (drawingOrigin != null) newGlyph = createSkeletonCustomBlockGlyph(config, 0, 0, drawingOrigin.drawingId);
 				}
 				if (newGlyph == null) newGlyph = createSkeletonLetterGlyph(char, config);
@@ -17737,7 +17944,7 @@ function appendColumnGroupBlockLine(page, columnGroup) {
 	return true;
 }
 function createColumnContentPage(ctx, viewModel, columnNode, sectionBreakConfig, width) {
-	var _sectionBreakConfig$d, _ctx$dataModel, _ctx$dataModel$getBod;
+	var _ctx$dataModel, _ctx$dataModel$getBod;
 	const columnSectionBreakConfig = {
 		...sectionBreakConfig,
 		pageSize: {
@@ -17754,7 +17961,7 @@ function createColumnContentPage(ctx, viewModel, columnNode, sectionBreakConfig,
 	page.type = 3;
 	for (const paragraphNode of getColumnParagraphNodes(columnNode)) dealWidthParagraph(ctx, viewModel, paragraphNode, page, columnSectionBreakConfig);
 	updateInlineDrawingCoordsAndBorder(ctx, [page]);
-	updateBlockIndex([page], columnNode.startIndex, (_sectionBreakConfig$d = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d !== void 0 ? _sectionBreakConfig$d : getDocumentCompatibilityPolicy());
+	updateBlockIndex([page], columnNode.startIndex, sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy());
 	applyTrailingBlockRangeSpaceBelow([page], (_ctx$dataModel = ctx.dataModel) === null || _ctx$dataModel === void 0 || (_ctx$dataModel$getBod = _ctx$dataModel.getBody) === null || _ctx$dataModel$getBod === void 0 ? void 0 : _ctx$dataModel$getBod.call(_ctx$dataModel), columnNode.endIndex);
 	return page;
 }
@@ -17794,9 +18001,9 @@ function getNextBlockTop(lines) {
 	return lastLine.top + lastLine.lineHeight;
 }
 function calculateColumnGroupLayout(source, availableWidth, columnHeights) {
-	var _source$gap$v, _source$gap;
+	var _source$gap;
 	const width = Math.max(0, availableWidth);
-	const gap = Math.max(0, (_source$gap$v = (_source$gap = source.gap) === null || _source$gap === void 0 ? void 0 : _source$gap.v) !== null && _source$gap$v !== void 0 ? _source$gap$v : 0);
+	const gap = Math.max(0, ((_source$gap = source.gap) === null || _source$gap === void 0 ? void 0 : _source$gap.v) ?? 0);
 	const columns = source.columns;
 	if (columns.length === 0) return {
 		mode: "horizontal",
@@ -17811,14 +18018,13 @@ function calculateColumnGroupLayout(source, availableWidth, columnHeights) {
 			width,
 			height: sumHeights(columnHeights),
 			columns: columns.map((column, index) => {
-				var _columnHeights$index;
 				const layoutColumn = {
 					columnId: column.columnId,
 					left: 0,
 					top,
 					width
 				};
-				top += Math.max(0, (_columnHeights$index = columnHeights[index]) !== null && _columnHeights$index !== void 0 ? _columnHeights$index : 0);
+				top += Math.max(0, columnHeights[index] ?? 0);
 				return layoutColumn;
 			})
 		};
@@ -17846,9 +18052,9 @@ function shouldStack(columns, availableWidth, gap, responsive) {
 	return columns.reduce((sum, column) => sum + getMinWidth(column), 0) + gap * Math.max(0, columns.length - 1) > availableWidth;
 }
 function getInitialColumnWidth(source, column, availableWidth) {
-	var _source$gap$v2, _source$gap2;
+	var _source$gap2;
 	if (column == null) return availableWidth;
-	const contentWidth = Math.max(0, availableWidth - Math.max(0, (_source$gap$v2 = (_source$gap2 = source.gap) === null || _source$gap2 === void 0 ? void 0 : _source$gap2.v) !== null && _source$gap$v2 !== void 0 ? _source$gap$v2 : 0) * Math.max(0, source.columns.length - 1));
+	const contentWidth = Math.max(0, availableWidth - Math.max(0, ((_source$gap2 = source.gap) === null || _source$gap2 === void 0 ? void 0 : _source$gap2.v) ?? 0) * Math.max(0, source.columns.length - 1));
 	const ratioSum = source.columns.reduce((sum, item) => sum + Math.max(0, item.widthRatio || 0), 0) || source.columns.length;
 	return Math.max(getMinWidth(column), contentWidth * (Math.max(0, column.widthRatio || 0) || 1) / ratioSum);
 }
@@ -17883,8 +18089,8 @@ function getFlexibleIndexes(widths, minWidths) {
 	})).filter((item) => item.shrink > 0);
 }
 function getMinWidth(column) {
-	var _column$minWidth$v, _column$minWidth;
-	return Math.max(0, (_column$minWidth$v = (_column$minWidth = column.minWidth) === null || _column$minWidth === void 0 ? void 0 : _column$minWidth.v) !== null && _column$minWidth$v !== void 0 ? _column$minWidth$v : 0);
+	var _column$minWidth;
+	return Math.max(0, ((_column$minWidth = column.minWidth) === null || _column$minWidth === void 0 ? void 0 : _column$minWidth.v) ?? 0);
 }
 function sumHeights(heights) {
 	return heights.reduce((sum, height) => sum + Math.max(0, height), 0);
@@ -18277,11 +18483,10 @@ var LanguageDetector = class LanguageDetector {
 		return this._instance;
 	}
 	detect(text) {
-		var _LANG_MAP_TO_HYPHEN_L;
 		let lang = this._detectCache.get(text);
 		if (lang) return lang;
 		const francLang = (0, franc_min.franc)(text);
-		lang = (_LANG_MAP_TO_HYPHEN_L = LANG_MAP_TO_HYPHEN_LANG[francLang]) !== null && _LANG_MAP_TO_HYPHEN_L !== void 0 ? _LANG_MAP_TO_HYPHEN_L : "unknown";
+		lang = LANG_MAP_TO_HYPHEN_LANG[francLang] ?? "unknown";
 		this._detectCache.set(text, lang);
 		return lang;
 	}
@@ -18400,12 +18605,12 @@ function isHitTestAddressableGlyph(glyph) {
 	return Boolean((_glyph$content = glyph.content) === null || _glyph$content === void 0 ? void 0 : _glyph$content.length) || glyph.streamType === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH && glyph.count > 0;
 }
 function resolveMostSpecificPageByCharIndex(page, charIndex) {
-	var _page$skeTables$value, _page$skeTables2, _page$skeColumnGroups, _page$skeColumnGroups2;
-	for (const table of (_page$skeTables$value = (_page$skeTables2 = page.skeTables) === null || _page$skeTables2 === void 0 ? void 0 : _page$skeTables2.values()) !== null && _page$skeTables$value !== void 0 ? _page$skeTables$value : []) for (const row of table.rows) for (const cell of row.cells) {
+	var _page$skeTables2, _page$skeColumnGroups;
+	for (const table of ((_page$skeTables2 = page.skeTables) === null || _page$skeTables2 === void 0 ? void 0 : _page$skeTables2.values()) ?? []) for (const row of table.rows) for (const cell of row.cells) {
 		const { st, ed } = cell;
 		if (charIndex >= st && charIndex <= ed) return resolveMostSpecificPageByCharIndex(cell, charIndex);
 	}
-	for (const columnGroup of (_page$skeColumnGroups = (_page$skeColumnGroups2 = page.skeColumnGroups) === null || _page$skeColumnGroups2 === void 0 ? void 0 : _page$skeColumnGroups2.values()) !== null && _page$skeColumnGroups !== void 0 ? _page$skeColumnGroups : []) for (const column of columnGroup.columns) {
+	for (const columnGroup of ((_page$skeColumnGroups = page.skeColumnGroups) === null || _page$skeColumnGroups === void 0 ? void 0 : _page$skeColumnGroups.values()) ?? []) for (const column of columnGroup.columns) {
 		const { st, ed } = column;
 		if (charIndex >= st && charIndex <= ed) return resolveMostSpecificPageByCharIndex(column.page, charIndex);
 	}
@@ -18463,11 +18668,10 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 	* PS: This method has significant impact on performance.
 	*/
 	calculate(bounds) {
-		var _ctx$paginationMetric;
 		if (!this.dirty) return;
 		const ctx = this._prepareLayoutContext();
 		this._skeletonData = this._createSkeleton(ctx, bounds);
-		this._paginationMetrics = (_ctx$paginationMetric = ctx.paginationMetrics) !== null && _ctx$paginationMetric !== void 0 ? _ctx$paginationMetric : null;
+		this._paginationMetrics = ctx.paginationMetrics ?? null;
 		this._dirty$.next(true);
 	}
 	getSkeletonData() {
@@ -18695,10 +18899,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 				const headerSke = (_skeHeaders$get2 = skeHeaders.get(headerId)) === null || _skeHeaders$get2 === void 0 ? void 0 : _skeHeaders$get2.get(pageWidth);
 				if (headerSke) exactMatch = this._collectNearestNode(headerSke, 1, page, headerId, pi, cache, x, y, pageLength);
 				const footerSke = (_skeFooters$get2 = skeFooters.get(footerId)) === null || _skeFooters$get2 === void 0 ? void 0 : _skeFooters$get2.get(pageWidth);
-				if (footerSke) {
-					var _exactMatch;
-					exactMatch = (_exactMatch = exactMatch) !== null && _exactMatch !== void 0 ? _exactMatch : this._collectNearestNode(footerSke, 2, page, footerId, pi, cache, x, y, pageLength);
-				}
+				if (footerSke) exactMatch = exactMatch ?? this._collectNearestNode(footerSke, 2, page, footerId, pi, cache, x, y, pageLength);
 			} else exactMatch = this._collectNearestNode(page, 0, page, "", pi, cache, x, y, pageLength);
 			if (exactMatch) return exactMatch;
 			this._translatePage(page, pageLayoutType, pageMarginLeft, pageMarginTop);
@@ -18714,10 +18915,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 					const headerSke = (_skeHeaders$get3 = skeHeaders.get(headerId)) === null || _skeHeaders$get3 === void 0 ? void 0 : _skeHeaders$get3.get(pageWidth);
 					if (headerSke) exactMatch = this._collectNearestNode(headerSke, 1, page, headerId, pi, cache, x, y, pageLength);
 					const footerSke = (_skeFooters$get3 = skeFooters.get(footerId)) === null || _skeFooters$get3 === void 0 ? void 0 : _skeFooters$get3.get(pageWidth);
-					if (footerSke) {
-						var _exactMatch2;
-						exactMatch = (_exactMatch2 = exactMatch) !== null && _exactMatch2 !== void 0 ? _exactMatch2 : this._collectNearestNode(footerSke, 2, page, footerId, pi, cache, x, y, pageLength);
-					}
+					if (footerSke) exactMatch = exactMatch ?? this._collectNearestNode(footerSke, 2, page, footerId, pi, cache, x, y, pageLength);
 				} else exactMatch = this._collectNearestNode(page, 0, page, "", pi, cache, x, y, pageLength);
 				if (exactMatch) return exactMatch;
 				this._translatePage(page, pageLayoutType, pageMarginLeft, pageMarginTop);
@@ -18866,8 +19064,8 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 		}
 		let exactMatch = null;
 		if (skeTables.size > 0) {
-			var _this$_docViewModel$g, _this$_docViewModel$g2, _this$_docViewModel$g3;
-			const unitId = (_this$_docViewModel$g = (_this$_docViewModel$g2 = (_this$_docViewModel$g3 = this._docViewModel.getDataModel()).getUnitId) === null || _this$_docViewModel$g2 === void 0 ? void 0 : _this$_docViewModel$g2.call(_this$_docViewModel$g3)) !== null && _this$_docViewModel$g !== void 0 ? _this$_docViewModel$g : "";
+			var _this$_docViewModel$g, _this$_docViewModel$g2;
+			const unitId = ((_this$_docViewModel$g = (_this$_docViewModel$g2 = this._docViewModel.getDataModel()).getUnitId) === null || _this$_docViewModel$g === void 0 ? void 0 : _this$_docViewModel$g.call(_this$_docViewModel$g2)) ?? "";
 			for (const table of skeTables.values()) {
 				var _this$_findLiquid, _this$_findLiquid2, _this$_findLiquid11;
 				const { top: tableTop, left: tableLeft, rows } = table;
@@ -18876,8 +19074,8 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 				(_this$_findLiquid = this._findLiquid) === null || _this$_findLiquid === void 0 || _this$_findLiquid.translateSave();
 				(_this$_findLiquid2 = this._findLiquid) === null || _this$_findLiquid2 === void 0 || _this$_findLiquid2.translate(tableLeft, tableTop);
 				if (hasDocsTableHorizontalViewport(viewport)) {
-					var _viewport$leadingInse, _this$_findLiquid4;
-					const visibleLeft = this._findLiquid.x + page.marginLeft - ((_viewport$leadingInse = viewport.leadingInsetLeft) !== null && _viewport$leadingInse !== void 0 ? _viewport$leadingInse : 0);
+					var _this$_findLiquid4;
+					const visibleLeft = this._findLiquid.x + page.marginLeft - (viewport.leadingInsetLeft ?? 0);
 					const visibleRight = visibleLeft + viewport.viewportWidth;
 					if (x < visibleLeft || x > visibleRight) {
 						var _this$_findLiquid3;
@@ -18893,11 +19091,11 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 					(_this$_findLiquid5 = this._findLiquid) === null || _this$_findLiquid5 === void 0 || _this$_findLiquid5.translateSave();
 					(_this$_findLiquid6 = this._findLiquid) === null || _this$_findLiquid6 === void 0 || _this$_findLiquid6.translate(0, rowTop);
 					for (const cell of cells) {
-						var _this$_findLiquid7, _this$_findLiquid8, _exactMatch3, _this$_findLiquid9;
+						var _this$_findLiquid7, _this$_findLiquid8, _this$_findLiquid9;
 						const { left: cellLeft } = cell;
 						(_this$_findLiquid7 = this._findLiquid) === null || _this$_findLiquid7 === void 0 || _this$_findLiquid7.translateSave();
 						(_this$_findLiquid8 = this._findLiquid) === null || _this$_findLiquid8 === void 0 || _this$_findLiquid8.translate(cellLeft, 0);
-						exactMatch = (_exactMatch3 = exactMatch) !== null && _exactMatch3 !== void 0 ? _exactMatch3 : this._collectNearestNode(cell, 3, cell, segmentId, pi, cache, x, y, pageLength, nestLevel + 1);
+						exactMatch = exactMatch ?? this._collectNearestNode(cell, 3, cell, segmentId, pi, cache, x, y, pageLength, nestLevel + 1);
 						(_this$_findLiquid9 = this._findLiquid) === null || _this$_findLiquid9 === void 0 || _this$_findLiquid9.translateRestore();
 					}
 					(_this$_findLiquid10 = this._findLiquid) === null || _this$_findLiquid10 === void 0 || _this$_findLiquid10.translateRestore();
@@ -18914,7 +19112,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 			(_this$_findLiquid12 = this._findLiquid) === null || _this$_findLiquid12 === void 0 || _this$_findLiquid12.translateSave();
 			(_this$_findLiquid13 = this._findLiquid) === null || _this$_findLiquid13 === void 0 || _this$_findLiquid13.translate(columnGroupLeft, columnGroupTop);
 			for (const column of columns) {
-				var _this$_findLiquid14, _this$_findLiquid15, _ref, _exactMatch4, _this$_findLiquid16;
+				var _this$_findLiquid14, _this$_findLiquid15, _this$_findLiquid16;
 				const absoluteColumnLeft = absoluteColumnGroupLeft + column.left;
 				const absoluteColumnTop = absoluteColumnGroupTop + column.top;
 				if (x < absoluteColumnLeft || x > absoluteColumnLeft + column.width || y < absoluteColumnTop || y > absoluteColumnTop + column.height) continue;
@@ -18924,7 +19122,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 				};
 				(_this$_findLiquid14 = this._findLiquid) === null || _this$_findLiquid14 === void 0 || _this$_findLiquid14.translateSave();
 				(_this$_findLiquid15 = this._findLiquid) === null || _this$_findLiquid15 === void 0 || _this$_findLiquid15.translate(column.left, column.top);
-				exactMatch = (_ref = (_exactMatch4 = exactMatch) !== null && _exactMatch4 !== void 0 ? _exactMatch4 : this._collectNearestNode(column.page, 3, column.page, segmentId, pi, nestedCache, x, y, pageLength, nestLevel + 1)) !== null && _ref !== void 0 ? _ref : this._getNearestNode(nestedCache.nearestNodeList, nestedCache.nearestNodeDistanceList);
+				exactMatch = exactMatch ?? this._collectNearestNode(column.page, 3, column.page, segmentId, pi, nestedCache, x, y, pageLength, nestLevel + 1) ?? this._getNearestNode(nestedCache.nearestNodeList, nestedCache.nearestNodeDistanceList);
 				(_this$_findLiquid16 = this._findLiquid) === null || _this$_findLiquid16 === void 0 || _this$_findLiquid16.translateRestore();
 			}
 			(_this$_findLiquid17 = this._findLiquid) === null || _this$_findLiquid17 === void 0 || _this$_findLiquid17.translateRestore();
@@ -19096,7 +19294,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 				reuseCurrentPage = true;
 			} else if (reuseNextColumn) reuseCurrentPage = true;
 			else if (layoutAnchor == null || curSkeletonPage == null) {
-				let nextPageNumber = curSkeletonPage == null ? pageNumberStart : explicitPageNumberStart !== null && explicitPageNumberStart !== void 0 ? explicitPageNumberStart : curSkeletonPage.pageNumber + 1;
+				let nextPageNumber = curSkeletonPage == null ? pageNumberStart : explicitPageNumberStart ?? curSkeletonPage.pageNumber + 1;
 				if (curSkeletonPage != null && (effectiveSectionType === _univerjs_core.SectionType.EVEN_PAGE || effectiveSectionType === _univerjs_core.SectionType.ODD_PAGE) && !isTargetPageParity(nextPageNumber, effectiveSectionType)) {
 					const fillerPage = createSkeletonPage(ctx, sectionBreakConfig, skeletonResourceReference, nextPageNumber);
 					allSkeletonPages.push(fillerPage);
@@ -19141,12 +19339,12 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 		sections.push(newSection);
 	}
 	_addNewSectionByNextColumn(curSkeletonPage, columnProperties, columnSeparatorType) {
-		var _curSkeletonPage$sect, _curSkeletonPage$sect2;
+		var _curSkeletonPage$sect;
 		const currentColumn = getLastNotFullColumnInfo(curSkeletonPage);
 		const nextColumnIndex = currentColumn == null ? 0 : currentColumn.index + 1;
 		if (nextColumnIndex >= (columnProperties.length || 1)) return false;
 		const { pageWidth, pageHeight, marginTop, marginBottom, marginLeft, marginRight } = curSkeletonPage;
-		const sectionTop = (_curSkeletonPage$sect = (_curSkeletonPage$sect2 = curSkeletonPage.sections.at(-1)) === null || _curSkeletonPage$sect2 === void 0 ? void 0 : _curSkeletonPage$sect2.top) !== null && _curSkeletonPage$sect !== void 0 ? _curSkeletonPage$sect : 0;
+		const sectionTop = ((_curSkeletonPage$sect = curSkeletonPage.sections[curSkeletonPage.sections.length - 1]) === null || _curSkeletonPage$sect === void 0 ? void 0 : _curSkeletonPage$sect.top) ?? 0;
 		const newSection = createSkeletonSection(columnProperties, columnSeparatorType, sectionTop, 0, pageWidth - marginLeft - marginRight, pageHeight - marginTop - marginBottom - sectionTop);
 		newSection.columns.slice(0, nextColumnIndex).forEach((column) => {
 			column.isFull = true;
@@ -19273,25 +19471,43 @@ const DEFAULT_PADDING_DATA = {
 	r: 2
 };
 const RENDER_RAW_FORMULA_KEY = "RENDER_RAW_FORMULA";
+const GENERAL_NUMBER_MAX_SIGNIFICANT_DIGITS = 15;
+const GENERAL_NUMBER_RESERVE_GLYPH = "0";
 function getShrinkToFitScale(contentWidth, availableWidth, fontSize) {
 	if (contentWidth <= availableWidth || contentWidth <= 0 || availableWidth <= 0 || fontSize <= 0) return 1;
 	return Math.max(1 / fontSize, availableWidth / contentWidth);
 }
+function getGeneralNumberDisplayText(value, displayText, fontString, availableWidth) {
+	if (availableWidth <= 0) return displayText;
+	const roundingReserveWidth = FontCache.getMeasureText(GENERAL_NUMBER_RESERVE_GLYPH, fontString).width;
+	if (FontCache.getMeasureText(displayText, fontString).width + roundingReserveWidth <= availableWidth) return displayText;
+	let bestFit = "";
+	for (let decimalPlaces = 0; decimalPlaces < GENERAL_NUMBER_MAX_SIGNIFICANT_DIGITS; decimalPlaces++) {
+		const pattern = decimalPlaces === 0 ? "0E+00" : `0.${"#".repeat(decimalPlaces)}E+00`;
+		const candidate = _univerjs_core.numfmt.format(pattern, value);
+		if (FontCache.getMeasureText(candidate, fontString).width + roundingReserveWidth > availableWidth) break;
+		bestFit = candidate;
+	}
+	if (bestFit) return bestFit;
+	if (Math.abs(value) < 1 && FontCache.getMeasureText("0", fontString).width < availableWidth) return "0";
+	const hashWidth = FontCache.getMeasureText("#", fontString).width;
+	if (hashWidth <= 0) return "#";
+	return "#".repeat(Math.max(1, Math.floor(availableWidth / hashWidth)));
+}
 function scaleDocumentDataForShrinkToFit(documentData, scale, fallbackFontSize) {
-	var _scaled$documentStyle, _defaultTextStyle$fs, _scaled$body;
+	var _scaled$body;
 	const scaled = _univerjs_core.Tools.deepClone(documentData);
-	const defaultTextStyle = (_scaled$documentStyle = scaled.documentStyle.textStyle) !== null && _scaled$documentStyle !== void 0 ? _scaled$documentStyle : {};
-	const defaultFontSize = (_defaultTextStyle$fs = defaultTextStyle.fs) !== null && _defaultTextStyle$fs !== void 0 ? _defaultTextStyle$fs : fallbackFontSize;
+	const defaultTextStyle = scaled.documentStyle.textStyle ?? {};
+	const defaultFontSize = defaultTextStyle.fs ?? fallbackFontSize;
 	scaled.documentStyle.textStyle = {
 		...defaultTextStyle,
 		fs: defaultFontSize * scale
 	};
 	(_scaled$body = scaled.body) === null || _scaled$body === void 0 || (_scaled$body = _scaled$body.textRuns) === null || _scaled$body === void 0 || _scaled$body.forEach((textRun) => {
-		var _textRun$ts, _textStyle$fs;
-		const textStyle = (_textRun$ts = textRun.ts) !== null && _textRun$ts !== void 0 ? _textRun$ts : {};
+		const textStyle = textRun.ts ?? {};
 		textRun.ts = {
 			...textStyle,
-			fs: ((_textStyle$fs = textStyle.fs) !== null && _textStyle$fs !== void 0 ? _textStyle$fs : defaultFontSize) * scale
+			fs: (textStyle.fs ?? defaultFontSize) * scale
 		};
 	});
 	return scaled;
@@ -19303,14 +19519,13 @@ function getResolvedRenderHorizontalAlign$1(horizontalAlign, cellData) {
 	return horizontalAlign;
 }
 function setRenderTextCache(cacheItem, cellData) {
-	var _cacheItem$horizontal;
 	if (cacheItem.documentSkeleton) {
 		cacheItem.displayText = void 0;
 		cacheItem.resolvedHorizontalAlign = void 0;
 		return;
 	}
 	cacheItem.displayText = (0, _univerjs_core.getDisplayValueFromCell)(cellData);
-	cacheItem.resolvedHorizontalAlign = getResolvedRenderHorizontalAlign$1((_cacheItem$horizontal = cacheItem.horizontalAlign) !== null && _cacheItem$horizontal !== void 0 ? _cacheItem$horizontal : _univerjs_core.HorizontalAlign.UNSPECIFIED, cellData);
+	cacheItem.resolvedHorizontalAlign = getResolvedRenderHorizontalAlign$1(cacheItem.horizontalAlign ?? _univerjs_core.HorizontalAlign.UNSPECIFIED, cellData);
 }
 function pushRowRange(ranges, row, startColumn, endColumn) {
 	if (endColumn < startColumn) return;
@@ -19361,8 +19576,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 	}
 	registerGetCellHeight() {
 		this.disposeWithMe(this.worksheet.__registerGetCellHeight((row, col) => {
-			var _this$calculateAutoHe;
-			return (_this$calculateAutoHe = this.calculateAutoHeightForCell(row, col)) !== null && _this$calculateAutoHe !== void 0 ? _this$calculateAutoHe : 0;
+			return this.calculateAutoHeightForCell(row, col) ?? 0;
 		}));
 	}
 	setScene(scene) {
@@ -19473,7 +19687,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 	* @param vpInfo viewBounds
 	*/
 	setStylesCache(vpInfo) {
-		var _vpInfo$diffBounds, _vpInfo$diffCacheBoun, _vpInfo$diffCacheBoun2, _vpInfo$diffCacheBoun3;
+		var _vpInfo$diffBounds, _vpInfo$diffCacheBoun, _vpInfo$diffCacheBoun2;
 		if (!this._worksheetData) return;
 		if (!this.rowHeightAccumulation || !this.columnWidthAccumulation) return;
 		this.updateVisibleRange(vpInfo);
@@ -19481,25 +19695,24 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		const columnWidthAccumulation = this.columnWidthAccumulation;
 		const isIncrementalScroll = !!vpInfo && !vpInfo.isDirty && !vpInfo.isForceDirty && (!!((_vpInfo$diffBounds = vpInfo.diffBounds) === null || _vpInfo$diffBounds === void 0 ? void 0 : _vpInfo$diffBounds.length) || !!((_vpInfo$diffCacheBoun = vpInfo.diffCacheBounds) === null || _vpInfo$diffCacheBoun === void 0 ? void 0 : _vpInfo$diffCacheBoun.length) || !!vpInfo.diffX || !!vpInfo.diffY);
 		const hasMergeData = this.worksheet.getMergeData().length > 0;
-		const isScrolling = !!vpInfo && (!!vpInfo.diffX || !!vpInfo.diffY);
-		const shouldRefreshCacheForScroll = isIncrementalScroll && (hasMergeData && isScrolling || !!vpInfo.shouldCacheUpdate && !!vpInfo.diffX);
+		const shouldRefreshCacheForScroll = isIncrementalScroll && !!vpInfo.shouldCacheUpdate && !!vpInfo.diffX;
 		const shouldUseIncrementalStyleRange = isIncrementalScroll && !shouldRefreshCacheForScroll;
-		const styleRanges = shouldUseIncrementalStyleRange ? vpInfo.shouldCacheUpdate ? (_vpInfo$diffCacheBoun2 = (_vpInfo$diffCacheBoun3 = vpInfo.diffCacheBounds) === null || _vpInfo$diffCacheBoun3 === void 0 ? void 0 : _vpInfo$diffCacheBoun3.map((bound) => this.getRangeByViewBound(bound))) !== null && _vpInfo$diffCacheBoun2 !== void 0 ? _vpInfo$diffCacheBoun2 : [] : [] : [rowColumnSegment];
-		const visibleCellOptions = hasMergeData ? null : {
+		const styleRanges = shouldUseIncrementalStyleRange ? vpInfo.shouldCacheUpdate ? ((_vpInfo$diffCacheBoun2 = vpInfo.diffCacheBounds) === null || _vpInfo$diffCacheBoun2 === void 0 ? void 0 : _vpInfo$diffCacheBoun2.map((bound) => this.getRangeByViewBound(bound))) ?? [] : [] : [rowColumnSegment];
+		const visibleCellOptions = {
 			cacheItem: {
 				bg: true,
 				border: true
 			},
-			reuseExisting: shouldUseIncrementalStyleRange,
+			reuseExisting: isIncrementalScroll,
 			hasMergeData,
 			rowVisible: true
 		};
-		const overflowCellOptions = hasMergeData ? null : {
+		const overflowCellOptions = {
 			cacheItem: {
 				bg: false,
 				border: false
 			},
-			reuseExisting: shouldUseIncrementalStyleRange,
+			reuseExisting: isIncrementalScroll,
 			hasMergeData,
 			rowVisible: true
 		};
@@ -19528,40 +19741,16 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 					startColumn: visibleStartColumn,
 					endColumn: visibleEndColumn
 				});
-				for (let c = visibleStartColumn; c <= visibleEndColumn; c++) this._setStylesCacheForOneCell(r, c, visibleCellOptions !== null && visibleCellOptions !== void 0 ? visibleCellOptions : {
-					cacheItem: {
-						bg: true,
-						border: true
-					},
-					reuseExisting: shouldUseIncrementalStyleRange,
-					hasMergeData,
-					rowVisible: true
-				});
+				for (let c = visibleStartColumn; c <= visibleEndColumn; c++) this._setStylesCacheForOneCell(r, c, visibleCellOptions);
 				if (shouldUseIncrementalStyleRange) pushRowRange(this._incrementalFontRenderRanges, r, visibleStartColumn, visibleEndColumn);
 				for (let c = visibleStartColumn - 1; c >= expandStartCol; c--) {
-					this._setStylesCacheForOneCell(r, c, overflowCellOptions !== null && overflowCellOptions !== void 0 ? overflowCellOptions : {
-						cacheItem: {
-							bg: false,
-							border: false
-						},
-						reuseExisting: shouldUseIncrementalStyleRange,
-						hasMergeData,
-						rowVisible: true
-					});
+					this._setStylesCacheForOneCell(r, c, overflowCellOptions);
 					if (shouldUseIncrementalStyleRange) pushRowRange(this._incrementalFontRenderRanges, r, c, c);
 					if (!(0, _univerjs_core.isCellCoverable)(this.worksheet.getCell(r, c)) || hasMergeData && this.intersectMergeRange(r, c)) break;
 				}
 				if (visibleEndColumn === 0) continue;
 				for (let c = visibleEndColumn + 1; c <= expandEndCol; c++) {
-					this._setStylesCacheForOneCell(r, c, overflowCellOptions !== null && overflowCellOptions !== void 0 ? overflowCellOptions : {
-						cacheItem: {
-							bg: false,
-							border: false
-						},
-						reuseExisting: shouldUseIncrementalStyleRange,
-						hasMergeData,
-						rowVisible: true
-					});
+					this._setStylesCacheForOneCell(r, c, overflowCellOptions);
 					if (shouldUseIncrementalStyleRange) pushRowRange(this._incrementalFontRenderRanges, r, c, c);
 					if (!(0, _univerjs_core.isCellCoverable)(this.worksheet.getCell(r, c)) || hasMergeData && this.intersectMergeRange(r, c)) break;
 				}
@@ -19574,7 +19763,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			for (const mergeRange of mergeRanges) {
 				this._setStylesCacheForOneCell(mergeRange.startRow, mergeRange.startColumn, {
 					mergeRange,
-					reuseExisting: shouldUseIncrementalStyleRange,
+					reuseExisting: isIncrementalScroll,
 					hasMergeData
 				});
 				if (shouldUseIncrementalStyleRange) pushRowRange(this._incrementalFontRenderRanges, mergeRange.startRow, mergeRange.startColumn, mergeRange.startColumn);
@@ -19606,10 +19795,9 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 					let maxPrev = 0;
 					let maxCurrent = 0;
 					for (let colIndex = startColumn; colIndex <= endColumn; colIndex++) {
-						var _currentCellHeights$g, _this$calculateAutoHe2;
-						const autoHeight = (_currentCellHeights$g = currentCellHeights.getValue(rowIndex, colIndex)) !== null && _currentCellHeights$g !== void 0 ? _currentCellHeights$g : 0;
+						const autoHeight = currentCellHeights.getValue(rowIndex, colIndex) ?? 0;
 						maxPrev = Math.max(maxPrev, autoHeight);
-						const currentHeight = (_this$calculateAutoHe2 = this.calculateAutoHeightForCell(rowIndex, colIndex)) !== null && _this$calculateAutoHe2 !== void 0 ? _this$calculateAutoHe2 : this._worksheetData.defaultRowHeight;
+						const currentHeight = this.calculateAutoHeightForCell(rowIndex, colIndex) ?? this._worksheetData.defaultRowHeight;
 						maxCurrent = Math.max(maxCurrent, currentHeight);
 					}
 					if (maxPrev < currentAutoHeight) {
@@ -19645,7 +19833,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		return results;
 	}
 	calculateAutoHeightForCell(row, col) {
-		var _cell$fontRenderExten, _cell$fontRenderExten2, _cell$fontRenderExten3, _cell$fontRenderExten4, _style$tr, _columnData$col$w, _columnData$col;
+		var _cell$fontRenderExten, _cell$fontRenderExten2, _columnData$col;
 		const { columnData, defaultColumnWidth } = this._worksheetData;
 		const cellMergeInfo = this.worksheet.getCellInfoInMergeData(row, col);
 		if (this._skipAutoHeightForMergedCells) {
@@ -19657,21 +19845,20 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			const cellHeight = cell.interceptorAutoHeight();
 			if (cellHeight) return cellHeight;
 		}
-		const sideGap = ((_cell$fontRenderExten = cell === null || cell === void 0 || (_cell$fontRenderExten2 = cell.fontRenderExtension) === null || _cell$fontRenderExten2 === void 0 ? void 0 : _cell$fontRenderExten2.leftOffset) !== null && _cell$fontRenderExten !== void 0 ? _cell$fontRenderExten : 0) + ((_cell$fontRenderExten3 = cell === null || cell === void 0 || (_cell$fontRenderExten4 = cell.fontRenderExtension) === null || _cell$fontRenderExten4 === void 0 ? void 0 : _cell$fontRenderExten4.rightOffset) !== null && _cell$fontRenderExten3 !== void 0 ? _cell$fontRenderExten3 : 0);
-		const { vertexAngle, centerAngle } = convertTextRotation((_style$tr = style === null || style === void 0 ? void 0 : style.tr) !== null && _style$tr !== void 0 ? _style$tr : { a: 0 });
+		const sideGap = ((cell === null || cell === void 0 || (_cell$fontRenderExten = cell.fontRenderExtension) === null || _cell$fontRenderExten === void 0 ? void 0 : _cell$fontRenderExten.leftOffset) ?? 0) + ((cell === null || cell === void 0 || (_cell$fontRenderExten2 = cell.fontRenderExtension) === null || _cell$fontRenderExten2 === void 0 ? void 0 : _cell$fontRenderExten2.rightOffset) ?? 0);
+		const { vertexAngle, centerAngle } = convertTextRotation((style === null || style === void 0 ? void 0 : style.tr) ?? { a: 0 });
 		const isRichText = (cell === null || cell === void 0 ? void 0 : cell.p) || vertexAngle || centerAngle;
-		let colWidth = (_columnData$col$w = (_columnData$col = columnData[col]) === null || _columnData$col === void 0 ? void 0 : _columnData$col.w) !== null && _columnData$col$w !== void 0 ? _columnData$col$w : defaultColumnWidth;
+		let colWidth = ((_columnData$col = columnData[col]) === null || _columnData$col === void 0 ? void 0 : _columnData$col.w) ?? defaultColumnWidth;
 		if (cellMergeInfo.isMergedMainCell) {
 			const mergeCellStartCol = cellMergeInfo.startColumn;
 			const mergeCellEndCol = cellMergeInfo.endColumn;
 			colWidth = Array.from({ length: mergeCellEndCol - mergeCellStartCol + 1 }, (_, index) => mergeCellStartCol + index).reduce((sum, colIndex) => {
-				var _columnData$colIndex$, _columnData$colIndex;
-				return sum + ((_columnData$colIndex$ = (_columnData$colIndex = columnData[colIndex]) === null || _columnData$colIndex === void 0 ? void 0 : _columnData$colIndex.w) !== null && _columnData$colIndex$ !== void 0 ? _columnData$colIndex$ : defaultColumnWidth);
+				var _columnData$colIndex;
+				return sum + (((_columnData$colIndex = columnData[colIndex]) === null || _columnData$colIndex === void 0 ? void 0 : _columnData$colIndex.w) ?? defaultColumnWidth);
 			}, 0);
 		}
 		colWidth -= sideGap;
 		if (isRichText) {
-			var _getDocsSkeletonPageS;
 			const modelObject = cell && this.worksheet.getCellDocumentModel(cell, style);
 			if (modelObject == null) return;
 			const { documentModel, textRotation, wrapStrategy } = modelObject;
@@ -19681,7 +19868,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			if (typeof colWidth === "number" && wrapStrategy === _univerjs_core.WrapStrategy.WRAP) documentModel.updateDocumentDataPageSize(colWidth);
 			const documentSkeleton = DocumentSkeleton.create(documentViewModel, this._localeService);
 			documentSkeleton.calculate();
-			let { height: h = 0 } = (_getDocsSkeletonPageS = getDocsSkeletonPageSize(documentSkeleton, angle)) !== null && _getDocsSkeletonPageS !== void 0 ? _getDocsSkeletonPageS : {};
+			let { height: h = 0 } = getDocsSkeletonPageSize(documentSkeleton, angle) ?? {};
 			if (documentSkeleton) {
 				const skeletonData = documentSkeleton.getSkeletonData();
 				const { marginTop: t, marginBottom: b, marginLeft: l, marginRight: r } = skeletonData.pages[skeletonData.pages.length - 1];
@@ -19690,12 +19877,12 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			}
 			return h;
 		} else {
-			var _style$pd$l, _style$pd, _style$pd$r, _style$pd2, _style$pd$t, _style$pd3, _style$pd$b, _style$pd4;
+			var _style$pd, _style$pd2, _style$pd3, _style$pd4;
 			if ((cell === null || cell === void 0 ? void 0 : cell.v) === void 0 || (cell === null || cell === void 0 ? void 0 : cell.v) === null) return;
-			const paddingLeft = (_style$pd$l = (_style$pd = style.pd) === null || _style$pd === void 0 ? void 0 : _style$pd.l) !== null && _style$pd$l !== void 0 ? _style$pd$l : DEFAULT_PADDING_DATA.l;
-			const paddingRight = (_style$pd$r = (_style$pd2 = style.pd) === null || _style$pd2 === void 0 ? void 0 : _style$pd2.r) !== null && _style$pd$r !== void 0 ? _style$pd$r : DEFAULT_PADDING_DATA.r;
-			const paddingTop = (_style$pd$t = (_style$pd3 = style.pd) === null || _style$pd3 === void 0 ? void 0 : _style$pd3.t) !== null && _style$pd$t !== void 0 ? _style$pd$t : DEFAULT_PADDING_DATA.t;
-			const paddingBottom = (_style$pd$b = (_style$pd4 = style.pd) === null || _style$pd4 === void 0 ? void 0 : _style$pd4.b) !== null && _style$pd$b !== void 0 ? _style$pd$b : DEFAULT_PADDING_DATA.b;
+			const paddingLeft = ((_style$pd = style.pd) === null || _style$pd === void 0 ? void 0 : _style$pd.l) ?? DEFAULT_PADDING_DATA.l;
+			const paddingRight = ((_style$pd2 = style.pd) === null || _style$pd2 === void 0 ? void 0 : _style$pd2.r) ?? DEFAULT_PADDING_DATA.r;
+			const paddingTop = ((_style$pd3 = style.pd) === null || _style$pd3 === void 0 ? void 0 : _style$pd3.t) ?? DEFAULT_PADDING_DATA.t;
+			const paddingBottom = ((_style$pd4 = style.pd) === null || _style$pd4 === void 0 ? void 0 : _style$pd4.b) ?? DEFAULT_PADDING_DATA.b;
 			if ((style === null || style === void 0 ? void 0 : style.tb) === _univerjs_core.WrapStrategy.WRAP) {
 				const skeleton = new DocSimpleSkeleton((0, _univerjs_core.getDisplayValueFromCell)(cell), getFontStyleString(style).fontCache, (style === null || style === void 0 ? void 0 : style.tb) === _univerjs_core.WrapStrategy.WRAP, colWidth - paddingLeft - paddingRight, Infinity);
 				skeleton.calculate();
@@ -19774,8 +19961,8 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			}
 			let measuredWidth = this._getMeasuredWidthByCell(cell, row, colIndex, currColWidth);
 			if (cell.fontRenderExtension) {
-				var _cell$fontRenderExten5, _cell$fontRenderExten6;
-				measuredWidth += (((_cell$fontRenderExten5 = cell.fontRenderExtension) === null || _cell$fontRenderExten5 === void 0 ? void 0 : _cell$fontRenderExten5.leftOffset) || 0) + (((_cell$fontRenderExten6 = cell.fontRenderExtension) === null || _cell$fontRenderExten6 === void 0 ? void 0 : _cell$fontRenderExten6.rightOffset) || 0);
+				var _cell$fontRenderExten3, _cell$fontRenderExten4;
+				measuredWidth += (((_cell$fontRenderExten3 = cell.fontRenderExtension) === null || _cell$fontRenderExten3 === void 0 ? void 0 : _cell$fontRenderExten3.leftOffset) || 0) + (((_cell$fontRenderExten4 = cell.fontRenderExtension) === null || _cell$fontRenderExten4 === void 0 ? void 0 : _cell$fontRenderExten4.rightOffset) || 0);
 			}
 			colWidth = Math.max(colWidth, measuredWidth);
 			if (colWidth >= 2e3) return MAXIMUM_COL_WIDTH;
@@ -19797,9 +19984,9 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 	* @returns {number} currColWidth
 	*/
 	_getMeasuredWidthByCell(cell, row, column, currColWidth) {
-		var _cell$fontRenderExten7, _getDocsSkeletonPageS2;
+		var _cell$fontRenderExten5;
 		let measuredWidth = 0;
-		if (((_cell$fontRenderExten7 = cell.fontRenderExtension) === null || _cell$fontRenderExten7 === void 0 ? void 0 : _cell$fontRenderExten7.isSkip) && (cell === null || cell === void 0 ? void 0 : cell.interceptorAutoWidth)) {
+		if (((_cell$fontRenderExten5 = cell.fontRenderExtension) === null || _cell$fontRenderExten5 === void 0 ? void 0 : _cell$fontRenderExten5.isSkip) && (cell === null || cell === void 0 ? void 0 : cell.interceptorAutoWidth)) {
 			var _cell$interceptorAuto;
 			const cellWidth = (_cell$interceptorAuto = cell.interceptorAutoWidth) === null || _cell$interceptorAuto === void 0 ? void 0 : _cell$interceptorAuto.call(cell);
 			if (cellWidth) return cellWidth;
@@ -19815,7 +20002,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		else documentModel.updateDocumentDataPageSize(Infinity, Infinity);
 		const documentSkeleton = DocumentSkeleton.create(documentViewModel, this._localeService);
 		documentSkeleton.calculate();
-		measuredWidth = ((_getDocsSkeletonPageS2 = getDocsSkeletonPageSize(documentSkeleton, angle)) !== null && _getDocsSkeletonPageS2 !== void 0 ? _getDocsSkeletonPageS2 : { width: 0 }).width;
+		measuredWidth = (getDocsSkeletonPageSize(documentSkeleton, angle) ?? { width: 0 }).width;
 		if (documentSkeleton) {
 			const skeletonData = documentSkeleton.getSkeletonData();
 			const { marginTop: t, marginBottom: b, marginLeft: l, marginRight: r } = skeletonData.pages[skeletonData.pages.length - 1];
@@ -19842,8 +20029,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		});
 	}
 	getOverflowPosition(contentSize, horizontalAlign, row, column, columnCount) {
-		var _contentSize$width;
-		const contentWidth = (_contentSize$width = contentSize === null || contentSize === void 0 ? void 0 : contentSize.width) !== null && _contentSize$width !== void 0 ? _contentSize$width : 0;
+		const contentWidth = (contentSize === null || contentSize === void 0 ? void 0 : contentSize.width) ?? 0;
 		let startColumn = column;
 		let endColumn = column;
 		if (horizontalAlign === _univerjs_core.HorizontalAlign.CENTER) {
@@ -19869,8 +20055,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		if (adjacentColumn < 0 || adjacentColumn >= this.getColumnCount()) return true;
 		const rawAdjacentCell = this._cellData.getValue(row, adjacentColumn);
 		if (rawAdjacentCell && !(0, _univerjs_core.isCellCoverable)(rawAdjacentCell)) return true;
-		const cachedAdjacentCell = (_this$_stylesCache$fo = this._stylesCache.fontMatrix.getValue(row, adjacentColumn)) === null || _this$_stylesCache$fo === void 0 ? void 0 : _this$_stylesCache$fo.cellData;
-		return !(0, _univerjs_core.isCellCoverable)(cachedAdjacentCell !== null && cachedAdjacentCell !== void 0 ? cachedAdjacentCell : this.worksheet.getCell(row, adjacentColumn)) || hasMergeData && this.intersectMergeRange(row, adjacentColumn);
+		return !(0, _univerjs_core.isCellCoverable)(((_this$_stylesCache$fo = this._stylesCache.fontMatrix.getValue(row, adjacentColumn)) === null || _this$_stylesCache$fo === void 0 ? void 0 : _this$_stylesCache$fo.cellData) ?? this.worksheet.getCell(row, adjacentColumn)) || hasMergeData && this.intersectMergeRange(row, adjacentColumn);
 	}
 	getCellWithMergeInfoByIndex(row, column) {
 		return this.worksheet.getCellInfoInMergeData(row, column);
@@ -19896,13 +20081,13 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		* Numerical and Boolean values are not displayed with overflow.
 		*/
 		if ((wrapStrategy === _univerjs_core.WrapStrategy.OVERFLOW || wrapStrategy === _univerjs_core.WrapStrategy.UNSPECIFIED) && cellValueType !== _univerjs_core.CellValueType.NUMBER && cellValueType !== _univerjs_core.CellValueType.BOOLEAN && horizontalAlign !== _univerjs_core.HorizontalAlign.JUSTIFIED) {
-			var _docsConfig$cellData$, _docsConfig$cellData, _docsConfig$cellData2;
+			var _docsConfig$cellData, _docsConfig$cellData2;
 			docsConfig.textFitsCurrentCell = false;
 			if (hasMergeData && this.intersectMergeRange(row, column)) return true;
 			const columnStart = this.columnWidthAccumulation[column - 1] || 0;
 			const currentColumnWidth = (this.columnWidthAccumulation[column] || columnStart) - columnStart;
-			const rawText = (_docsConfig$cellData$ = (_docsConfig$cellData = docsConfig.cellData) === null || _docsConfig$cellData === void 0 || (_docsConfig$cellData = _docsConfig$cellData.p) === null || _docsConfig$cellData === void 0 || (_docsConfig$cellData = _docsConfig$cellData.body) === null || _docsConfig$cellData === void 0 ? void 0 : _docsConfig$cellData.dataStream) !== null && _docsConfig$cellData$ !== void 0 ? _docsConfig$cellData$ : (_docsConfig$cellData2 = docsConfig.cellData) === null || _docsConfig$cellData2 === void 0 ? void 0 : _docsConfig$cellData2.v;
-			if ((Boolean(documentSkeleton) || `${rawText !== null && rawText !== void 0 ? rawText : ""}`.length * 4 > currentColumnWidth) && this._isOverflowBlockedByAdjacentCell(row, column, horizontalAlignPos, hasMergeData)) return true;
+			const rawText = ((_docsConfig$cellData = docsConfig.cellData) === null || _docsConfig$cellData === void 0 || (_docsConfig$cellData = _docsConfig$cellData.p) === null || _docsConfig$cellData === void 0 || (_docsConfig$cellData = _docsConfig$cellData.body) === null || _docsConfig$cellData === void 0 ? void 0 : _docsConfig$cellData.dataStream) ?? ((_docsConfig$cellData2 = docsConfig.cellData) === null || _docsConfig$cellData2 === void 0 ? void 0 : _docsConfig$cellData2.v);
+			if ((Boolean(documentSkeleton) || `${rawText ?? ""}`.length * 4 > currentColumnWidth) && this._isOverflowBlockedByAdjacentCell(row, column, horizontalAlignPos, hasMergeData)) return true;
 			let contentSize;
 			if (documentSkeleton) contentSize = getDocsSkeletonPageSize(documentSkeleton, vertexAngle);
 			else {
@@ -20024,13 +20209,13 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		for (let i = 0; i < ranges.length; i++) {
 			const range = ranges[i];
 			_univerjs_core.Range.foreach(range, (row, col) => {
-				var _this$_stylesCache$bo, _this$_stylesCache$ba, _this$_stylesCache$ba2;
+				var _this$_stylesCache$bo, _this$_stylesCache$ba;
 				this._stylesCache.fontMatrix.realDeleteValue(row, col);
 				(_this$_stylesCache$bo = this._stylesCache.border) === null || _this$_stylesCache$bo === void 0 || _this$_stylesCache$bo.realDeleteValue(row, col);
 				(_this$_stylesCache$ba = this._stylesCache.backgroundPositions) === null || _this$_stylesCache$ba === void 0 || _this$_stylesCache$ba.realDeleteValue(row, col);
 				this._handleBgMatrix.realDeleteValue(row, col);
 				this._handleBorderMatrix.realDeleteValue(row, col);
-				Object.values((_this$_stylesCache$ba2 = this._stylesCache.background) !== null && _this$_stylesCache$ba2 !== void 0 ? _this$_stylesCache$ba2 : {}).forEach((backgroundMatrix) => {
+				Object.values(this._stylesCache.background ?? {}).forEach((backgroundMatrix) => {
 					backgroundMatrix.realDeleteValue(row, col);
 				});
 			});
@@ -20073,25 +20258,25 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		}).bg) return;
 		this._handleBgMatrix.setValue(row, col, true);
 		if (style && style.bg && style.bg.rgb) {
-			var _this$_stylesCache$ba3;
+			var _this$_stylesCache$ba2;
 			const rgb = style.bg.rgb;
 			if (!this._stylesCache.background[rgb]) this._stylesCache.background[rgb] = new _univerjs_core.ObjectMatrix();
 			this._stylesCache.background[rgb].setValue(row, col, rgb);
 			const cellInfo = this.getCellWithCoordByIndex(row, col, false);
-			(_this$_stylesCache$ba3 = this._stylesCache.backgroundPositions) === null || _this$_stylesCache$ba3 === void 0 || _this$_stylesCache$ba3.setValue(row, col, cellInfo);
+			(_this$_stylesCache$ba2 = this._stylesCache.backgroundPositions) === null || _this$_stylesCache$ba2 === void 0 || _this$_stylesCache$ba2.setValue(row, col, cellInfo);
 		}
 	}
 	_applyShrinkToFit(row, col, fontCache, style) {
-		var _style$pd5, _fontCache$cellData, _padding$l, _padding$r, _extension$leftOffset, _extension$rightOffse, _style$fs, _getDocsSkeletonPageS3, _fontCache$displayTex;
+		var _fontCache$cellData;
 		if (style.stf !== _univerjs_core.BooleanNumber.TRUE) return;
 		const cellInfo = this.getCellWithCoordByIndex(row, col, false);
 		const startX = cellInfo.isMergedMainCell ? cellInfo.mergeInfo.startX : cellInfo.startX;
 		const endX = cellInfo.isMergedMainCell ? cellInfo.mergeInfo.endX : cellInfo.endX;
-		const padding = (_style$pd5 = style.pd) !== null && _style$pd5 !== void 0 ? _style$pd5 : DEFAULT_PADDING_DATA;
+		const padding = style.pd ?? DEFAULT_PADDING_DATA;
 		const extension = (_fontCache$cellData = fontCache.cellData) === null || _fontCache$cellData === void 0 ? void 0 : _fontCache$cellData.fontRenderExtension;
-		const availableWidth = endX - startX - ((_padding$l = padding.l) !== null && _padding$l !== void 0 ? _padding$l : DEFAULT_PADDING_DATA.l) - ((_padding$r = padding.r) !== null && _padding$r !== void 0 ? _padding$r : DEFAULT_PADDING_DATA.r) - ((_extension$leftOffset = extension === null || extension === void 0 ? void 0 : extension.leftOffset) !== null && _extension$leftOffset !== void 0 ? _extension$leftOffset : 0) - ((_extension$rightOffse = extension === null || extension === void 0 ? void 0 : extension.rightOffset) !== null && _extension$rightOffse !== void 0 ? _extension$rightOffse : 0);
-		const fallbackFontSize = (_style$fs = style.fs) !== null && _style$fs !== void 0 ? _style$fs : _univerjs_core.DEFAULT_STYLES.fs;
-		const scale = getShrinkToFitScale(fontCache.documentSkeleton ? ((_getDocsSkeletonPageS3 = getDocsSkeletonPageSize(fontCache.documentSkeleton, fontCache.vertexAngle)) !== null && _getDocsSkeletonPageS3 !== void 0 ? _getDocsSkeletonPageS3 : { width: 0 }).width : FontCache.getMeasureText((_fontCache$displayTex = fontCache.displayText) !== null && _fontCache$displayTex !== void 0 ? _fontCache$displayTex : (0, _univerjs_core.getDisplayValueFromCell)(fontCache.cellData), fontCache.fontString).width, availableWidth, fallbackFontSize);
+		const availableWidth = endX - startX - (padding.l ?? DEFAULT_PADDING_DATA.l) - (padding.r ?? DEFAULT_PADDING_DATA.r) - ((extension === null || extension === void 0 ? void 0 : extension.leftOffset) ?? 0) - ((extension === null || extension === void 0 ? void 0 : extension.rightOffset) ?? 0);
+		const fallbackFontSize = style.fs ?? _univerjs_core.DEFAULT_STYLES.fs;
+		const scale = getShrinkToFitScale(fontCache.documentSkeleton ? (getDocsSkeletonPageSize(fontCache.documentSkeleton, fontCache.vertexAngle) ?? { width: 0 }).width : FontCache.getMeasureText(fontCache.displayText ?? (0, _univerjs_core.getDisplayValueFromCell)(fontCache.cellData), fontCache.fontString).width, availableWidth, fallbackFontSize);
 		if (scale >= 1) return;
 		fontCache.shrinkScale = scale;
 		if (fontCache.documentSkeleton) {
@@ -20104,8 +20289,23 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			fs: fallbackFontSize * scale
 		}).fontCache;
 	}
+	_applyGeneralNumberDisplay(row, col, fontCache, style) {
+		var _style$n;
+		const cellData = fontCache.cellData;
+		if (!cellData || style.stf === _univerjs_core.BooleanNumber.TRUE || fontCache.documentSkeleton) return;
+		if (!(0, _univerjs_core.isDefaultFormat)((_style$n = style.n) === null || _style$n === void 0 ? void 0 : _style$n.pattern)) return;
+		if (cellData.t !== _univerjs_core.CellValueType.NUMBER && (_univerjs_core.Tools.isDefine(cellData.t) || typeof cellData.v !== "number")) return;
+		const value = Number(cellData.v);
+		if (!Number.isFinite(value)) return;
+		const cellInfo = this.getCellWithCoordByIndex(row, col, false);
+		const startX = cellInfo.isMergedMainCell ? cellInfo.mergeInfo.startX : cellInfo.startX;
+		const endX = cellInfo.isMergedMainCell ? cellInfo.mergeInfo.endX : cellInfo.endX;
+		const padding = style.pd ?? DEFAULT_PADDING_DATA;
+		const extension = cellData.fontRenderExtension;
+		const availableWidth = endX - startX - (padding.l ?? DEFAULT_PADDING_DATA.l) - (padding.r ?? DEFAULT_PADDING_DATA.r) - ((extension === null || extension === void 0 ? void 0 : extension.leftOffset) ?? 0) - ((extension === null || extension === void 0 ? void 0 : extension.rightOffset) ?? 0);
+		fontCache.displayText = getGeneralNumberDisplayText(value, fontCache.displayText ?? (0, _univerjs_core.getDisplayValueFromCell)(cellData), fontCache.fontString, availableWidth);
+	}
 	_setFontStylesCache(row, col, cellData, style, hasMergeData = true) {
-		var _style$tr2;
 		if ((0, _univerjs_core.isNullCell)(cellData)) return;
 		let config = {
 			cellData,
@@ -20117,10 +20317,11 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			const cacheItem = cacheValue;
 			cacheItem.cellData = cellData;
 			setRenderTextCache(cacheItem, cellData);
+			this._applyGeneralNumberDisplay(row, col, cacheItem, style);
 			this._stylesCache.fontMatrix.setValue(row, col, cacheValue);
 			return;
 		}
-		const { vertexAngle, centerAngle } = convertTextRotation((_style$tr2 = style === null || style === void 0 ? void 0 : style.tr) !== null && _style$tr2 !== void 0 ? _style$tr2 : { a: 0 });
+		const { vertexAngle, centerAngle } = convertTextRotation((style === null || style === void 0 ? void 0 : style.tr) ?? { a: 0 });
 		const modelObject = (cellData === null || cellData === void 0 ? void 0 : cellData.p) || vertexAngle || centerAngle ? this.worksheet.getCellDocumentModel(cellData, style, { displayRawFormula: this._renderRawFormula }) : null;
 		if (modelObject) {
 			const { documentModel } = modelObject;
@@ -20145,15 +20346,15 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 				}
 			}
 		} else {
-			const fontString = getFontStyleString(style !== null && style !== void 0 ? style : void 0).fontCache;
-			const { vt: verticalAlign, ht: horizontalAlign, tb: wrapStrategy } = style !== null && style !== void 0 ? style : {};
+			const fontString = getFontStyleString(style ?? void 0).fontCache;
+			const { vt: verticalAlign, ht: horizontalAlign, tb: wrapStrategy } = style ?? {};
 			config = {
 				documentSkeleton: void 0,
 				vertexAngle,
 				centerAngle,
-				verticalAlign: verticalAlign !== null && verticalAlign !== void 0 ? verticalAlign : _univerjs_core.VerticalAlign.UNSPECIFIED,
-				horizontalAlign: horizontalAlign !== null && horizontalAlign !== void 0 ? horizontalAlign : _univerjs_core.HorizontalAlign.UNSPECIFIED,
-				wrapStrategy: wrapStrategy !== null && wrapStrategy !== void 0 ? wrapStrategy : _univerjs_core.WrapStrategy.OVERFLOW,
+				verticalAlign: verticalAlign ?? _univerjs_core.VerticalAlign.UNSPECIFIED,
+				horizontalAlign: horizontalAlign ?? _univerjs_core.HorizontalAlign.UNSPECIFIED,
+				wrapStrategy: wrapStrategy ?? _univerjs_core.WrapStrategy.OVERFLOW,
 				imageCacheMap: this._imageCacheMap,
 				cellData,
 				fontString,
@@ -20162,6 +20363,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		}
 		const fontCacheItem = config;
 		setRenderTextCache(fontCacheItem, cellData);
+		this._applyGeneralNumberDisplay(row, col, fontCacheItem, style);
 		this._applyShrinkToFit(row, col, fontCacheItem, style);
 		this._calculateOverflowCell(row, col, fontCacheItem, hasMergeData);
 		this._stylesCache.fontMatrix.setValue(row, col, fontCacheItem);
@@ -20173,7 +20375,6 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 	* @param options {{ mergeRange: IRange; cacheItem: ICacheItem } | undefined}
 	*/
 	_setStylesCacheForOneCell(row, col, options) {
-		var _options$hasMergeData, _options$rowVisible, _options$hasMergeData2;
 		if (row === -1 || col === -1) return;
 		if (!options) options = { cacheItem: {
 			bg: true,
@@ -20185,24 +20386,15 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			const borderHandled = !cacheItem.border || _univerjs_core.Tools.isDefine(this._handleBorderMatrix.getValue(row, col));
 			if (bgHandled && borderHandled && this._stylesCache.fontMatrix.getValue(row, col)) return;
 		}
-		const hasMergeData = (_options$hasMergeData = options.hasMergeData) !== null && _options$hasMergeData !== void 0 ? _options$hasMergeData : true;
+		const hasMergeData = options.hasMergeData ?? true;
 		let isMerged = false;
 		let isMergedMainCell = false;
 		if (hasMergeData) {
 			const mergeInfo = this.worksheet.getCellInfoInMergeData(row, col);
 			isMerged = mergeInfo.isMerged;
 			isMergedMainCell = mergeInfo.isMergedMainCell;
-			if (isMerged) {
-				const { startRow, startColumn, endRow, endColumn } = mergeInfo;
-				options.mergeRange = {
-					startRow,
-					startColumn,
-					endRow,
-					endColumn
-				};
-			}
 		}
-		const rowVisible = (_options$rowVisible = options.rowVisible) !== null && _options$rowVisible !== void 0 ? _options$rowVisible : this.worksheet.getRowVisible(row);
+		const rowVisible = options.rowVisible ?? this.worksheet.getRowVisible(row);
 		if (this.worksheet.getColVisible(col) === false || rowVisible === false) {
 			if (isMerged && !isMergedMainCell) return;
 			else if (!isMergedMainCell) return;
@@ -20215,7 +20407,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 		this._setFontStylesCache(row, col, {
 			...cell,
 			s: style
-		}, style, (_options$hasMergeData2 = options.hasMergeData) !== null && _options$hasMergeData2 !== void 0 ? _options$hasMergeData2 : true);
+		}, style, options.hasMergeData ?? true);
 	}
 	/**
 	* pro/issues/344
@@ -20246,7 +20438,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			forEnd = mergeRange.endRow;
 		}
 		for (let i = forStart; i <= forEnd; i++) {
-			var _cell$themeStyle, _style$bd$type, _style$bd;
+			var _cell$themeStyle, _style$bd;
 			if (type === "t") column = i;
 			else if (type === "b") column = i;
 			else if (type === "l") row = i;
@@ -20256,7 +20448,7 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
 			const themeStyleBackground = (_cell$themeStyle = cell.themeStyle) === null || _cell$themeStyle === void 0 ? void 0 : _cell$themeStyle.bd;
 			const style = this.worksheet.getComposedCellStyleByCellData(row, column, cell);
 			if (!style && !themeStyleBackground) break;
-			const props = (_style$bd$type = style === null || style === void 0 || (_style$bd = style.bd) === null || _style$bd === void 0 ? void 0 : _style$bd[type]) !== null && _style$bd$type !== void 0 ? _style$bd$type : themeStyleBackground === null || themeStyleBackground === void 0 ? void 0 : themeStyleBackground[type];
+			const props = (style === null || style === void 0 || (_style$bd = style.bd) === null || _style$bd === void 0 ? void 0 : _style$bd[type]) ?? (themeStyleBackground === null || themeStyleBackground === void 0 ? void 0 : themeStyleBackground[type]);
 			if (props) {
 				const rgb = (0, _univerjs_core.getColorStyle)(props.cl) || "rgb(0,0,0)";
 				borders.push({
@@ -20403,6 +20595,29 @@ function getDocsSkeletonPageSize(documentSkeleton, angleInDegree = 0) {
 	};
 }
 
+//#endregion
+//#region src/components/sheets/util.ts
+const DEFAULT_CELL_IMAGE_PADDING = 2;
+function calculateCellImageRect(config) {
+	const { cellRect, imageWidth, imageHeight, horizontalAlign, verticalAlign, padding } = config;
+	const contentLeft = cellRect.left + ((padding === null || padding === void 0 ? void 0 : padding.l) ?? DEFAULT_CELL_IMAGE_PADDING);
+	const contentRight = cellRect.right - ((padding === null || padding === void 0 ? void 0 : padding.r) ?? DEFAULT_CELL_IMAGE_PADDING);
+	const contentTop = cellRect.top + ((padding === null || padding === void 0 ? void 0 : padding.t) ?? DEFAULT_CELL_IMAGE_PADDING);
+	const contentBottom = cellRect.bottom - ((padding === null || padding === void 0 ? void 0 : padding.b) ?? DEFAULT_CELL_IMAGE_PADDING);
+	let left = contentLeft;
+	if (horizontalAlign === _univerjs_core.HorizontalAlign.RIGHT) left = contentRight - imageWidth;
+	else if (horizontalAlign === _univerjs_core.HorizontalAlign.CENTER) left = (contentLeft + contentRight - imageWidth) / 2;
+	let top = contentBottom - imageHeight;
+	if (verticalAlign === _univerjs_core.VerticalAlign.TOP) top = contentTop;
+	else if (verticalAlign === _univerjs_core.VerticalAlign.MIDDLE) top = (contentTop + contentBottom - imageHeight) / 2;
+	return {
+		left,
+		top,
+		right: left + imageWidth,
+		bottom: top + imageHeight
+	};
+}
+
 //#endregion
 //#region src/components/sheets/extensions/font.ts
 const UNIQUE_KEY$6 = "DefaultFontExtension";
@@ -20525,7 +20740,7 @@ var Font = class extends SheetExtension {
 			renderFontCtx.endX = mergeInfo.endX;
 			renderFontCtx.endY = mergeInfo.endY;
 		}
-		const fontCache = cacheValue !== null && cacheValue !== void 0 ? cacheValue : fontMatrix.getValue(row, col);
+		const fontCache = cacheValue ?? fontMatrix.getValue(row, col);
 		if (!fontCache) return true;
 		renderFontCtx.fontCache = fontCache;
 		const overflowRange = spreadsheetSkeleton.overflowCache.getValue(row, col);
@@ -20591,7 +20806,7 @@ var Font = class extends SheetExtension {
 		return false;
 	}
 	_renderPlainTextWithoutClip(ctx, renderFontCtx, fontCache) {
-		var _fontCache$style, _fontCache$style2, _fontCache$style$pd, _fontCache$style3, _padding$l, _padding$r, _padding$t, _padding$b, _fontCache$displayTex, _fontCache$style4;
+		var _fontCache$style, _fontCache$style2, _fontCache$style3, _fontCache$style4;
 		const { cellData, documentSkeleton, textFitsCurrentCell, vertexAngle = 0, centerAngle = 0, wrapStrategy } = fontCache;
 		if (!textFitsCurrentCell) return false;
 		if (documentSkeleton) return false;
@@ -20600,12 +20815,12 @@ var Font = class extends SheetExtension {
 		if (needsFontRenderExtensionBounds(fontCache)) return false;
 		if (((_fontCache$style = fontCache.style) === null || _fontCache$style === void 0 || (_fontCache$style = _fontCache$style.st) === null || _fontCache$style === void 0 ? void 0 : _fontCache$style.s) || ((_fontCache$style2 = fontCache.style) === null || _fontCache$style2 === void 0 || (_fontCache$style2 = _fontCache$style2.ul) === null || _fontCache$style2 === void 0 ? void 0 : _fontCache$style2.s)) return false;
 		if ((cellData === null || cellData === void 0 ? void 0 : cellData.v) === void 0 || (cellData === null || cellData === void 0 ? void 0 : cellData.v) === null) return false;
-		const padding = (_fontCache$style$pd = (_fontCache$style3 = fontCache.style) === null || _fontCache$style3 === void 0 ? void 0 : _fontCache$style3.pd) !== null && _fontCache$style$pd !== void 0 ? _fontCache$style$pd : DEFAULT_PADDING_DATA;
-		const paddingLeft = (_padding$l = padding.l) !== null && _padding$l !== void 0 ? _padding$l : DEFAULT_PADDING_DATA.l;
-		const paddingRight = (_padding$r = padding.r) !== null && _padding$r !== void 0 ? _padding$r : DEFAULT_PADDING_DATA.r;
-		const paddingTop = (_padding$t = padding.t) !== null && _padding$t !== void 0 ? _padding$t : DEFAULT_PADDING_DATA.t;
-		const paddingBottom = (_padding$b = padding.b) !== null && _padding$b !== void 0 ? _padding$b : DEFAULT_PADDING_DATA.b;
-		const text = (_fontCache$displayTex = fontCache.displayText) !== null && _fontCache$displayTex !== void 0 ? _fontCache$displayTex : (0, _univerjs_core.getDisplayValueFromCell)(cellData);
+		const padding = ((_fontCache$style3 = fontCache.style) === null || _fontCache$style3 === void 0 ? void 0 : _fontCache$style3.pd) ?? DEFAULT_PADDING_DATA;
+		const paddingLeft = padding.l ?? DEFAULT_PADDING_DATA.l;
+		const paddingRight = padding.r ?? DEFAULT_PADDING_DATA.r;
+		const paddingTop = padding.t ?? DEFAULT_PADDING_DATA.t;
+		const paddingBottom = padding.b ?? DEFAULT_PADDING_DATA.b;
+		const text = fontCache.displayText ?? (0, _univerjs_core.getDisplayValueFromCell)(cellData);
 		const { startX, startY, endX, endY } = renderFontCtx;
 		const cellWidth = endX - startX - paddingLeft - paddingRight;
 		const cellHeight = endY - startY - paddingTop - paddingBottom;
@@ -20625,24 +20840,14 @@ var Font = class extends SheetExtension {
 		return true;
 	}
 	_renderImages(ctx, fontsConfig, startX, startY, endX, endY) {
-		var _fontsConfig$style, _padding$l2, _padding$r2, _padding$t2, _padding$b2, _getSkeletonData;
+		var _getSkeletonData;
 		const { documentSkeleton, verticalAlign, horizontalAlign } = fontsConfig;
-		const PADDING = 2;
-		const padding = (_fontsConfig$style = fontsConfig.style) === null || _fontsConfig$style === void 0 ? void 0 : _fontsConfig$style.pd;
-		const paddingLeft = (_padding$l2 = padding === null || padding === void 0 ? void 0 : padding.l) !== null && _padding$l2 !== void 0 ? _padding$l2 : PADDING;
-		const paddingRight = (_padding$r2 = padding === null || padding === void 0 ? void 0 : padding.r) !== null && _padding$r2 !== void 0 ? _padding$r2 : PADDING;
-		const paddingTop = (_padding$t2 = padding === null || padding === void 0 ? void 0 : padding.t) !== null && _padding$t2 !== void 0 ? _padding$t2 : PADDING;
-		const paddingBottom = (_padding$b2 = padding === null || padding === void 0 ? void 0 : padding.b) !== null && _padding$b2 !== void 0 ? _padding$b2 : PADDING;
-		const contentStartX = startX + paddingLeft;
-		const contentEndX = endX - paddingRight;
-		const contentStartY = startY + paddingTop;
-		const contentEndY = endY - paddingBottom;
 		const drawingDatas = documentSkeleton.getViewModel().getDataModel().getDrawings();
 		const drawings = (_getSkeletonData = documentSkeleton.getSkeletonData()) === null || _getSkeletonData === void 0 ? void 0 : _getSkeletonData.pages[0].skeDrawings;
 		drawings === null || drawings === void 0 || drawings.forEach((drawing) => {
 			const drawingData = drawingDatas === null || drawingDatas === void 0 ? void 0 : drawingDatas[drawing.drawingId];
 			if (drawingData) {
-				var _drawingData$docTrans, _drawingData$docTrans2, _drawingData$docTrans3, _drawingData$docTrans4, _drawingData$docTrans5, _drawingData$docTrans6;
+				var _drawingData$docTrans, _drawingData$docTrans2, _drawingData$docTrans3, _fontsConfig$style;
 				const image = fontsConfig.imageCacheMap.getImage(drawingData.imageSourceType, drawingData.source, () => {
 					var _this$parent;
 					(_this$parent = this.parent) === null || _this$parent === void 0 || _this$parent.makeDirty();
@@ -20650,33 +20855,22 @@ var Font = class extends SheetExtension {
 					var _this$parent2;
 					(_this$parent2 = this.parent) === null || _this$parent2 === void 0 || _this$parent2.makeDirty();
 				});
-				const width = (_drawingData$docTrans = (_drawingData$docTrans2 = drawingData.docTransform) === null || _drawingData$docTrans2 === void 0 ? void 0 : _drawingData$docTrans2.size.width) !== null && _drawingData$docTrans !== void 0 ? _drawingData$docTrans : drawing.width;
-				const height = (_drawingData$docTrans3 = (_drawingData$docTrans4 = drawingData.docTransform) === null || _drawingData$docTrans4 === void 0 ? void 0 : _drawingData$docTrans4.size.height) !== null && _drawingData$docTrans3 !== void 0 ? _drawingData$docTrans3 : drawing.height;
-				const angle = (_drawingData$docTrans5 = (_drawingData$docTrans6 = drawingData.docTransform) === null || _drawingData$docTrans6 === void 0 ? void 0 : _drawingData$docTrans6.angle) !== null && _drawingData$docTrans5 !== void 0 ? _drawingData$docTrans5 : drawing.angle;
-				let x = startX;
-				let y = startY;
-				switch (verticalAlign) {
-					case _univerjs_core.VerticalAlign.TOP:
-						y = contentStartY;
-						break;
-					case _univerjs_core.VerticalAlign.MIDDLE:
-						y = (contentStartY + contentEndY) / 2 - height / 2;
-						break;
-					default:
-						y = contentEndY - height;
-						break;
-				}
-				switch (horizontalAlign) {
-					case _univerjs_core.HorizontalAlign.RIGHT:
-						x = contentEndX - width;
-						break;
-					case _univerjs_core.HorizontalAlign.CENTER:
-						x = (contentStartX + contentEndX) / 2 - width / 2;
-						break;
-					default:
-						x = contentStartX;
-						break;
-				}
+				const width = ((_drawingData$docTrans = drawingData.docTransform) === null || _drawingData$docTrans === void 0 ? void 0 : _drawingData$docTrans.size.width) ?? drawing.width;
+				const height = ((_drawingData$docTrans2 = drawingData.docTransform) === null || _drawingData$docTrans2 === void 0 ? void 0 : _drawingData$docTrans2.size.height) ?? drawing.height;
+				const angle = ((_drawingData$docTrans3 = drawingData.docTransform) === null || _drawingData$docTrans3 === void 0 ? void 0 : _drawingData$docTrans3.angle) ?? drawing.angle;
+				const { left: x, top: y } = calculateCellImageRect({
+					cellRect: {
+						left: startX,
+						top: startY,
+						right: endX,
+						bottom: endY
+					},
+					imageWidth: width,
+					imageHeight: height,
+					horizontalAlign,
+					verticalAlign,
+					padding: (_fontsConfig$style = fontsConfig.style) === null || _fontsConfig$style === void 0 ? void 0 : _fontsConfig$style.pd
+				});
 				const { rotatedHeight, rotatedWidth } = rotatedBoundingBox(width, height, angle);
 				if (image && image.complete) {
 					const angleRadians = angle * Math.PI / 180;
@@ -20702,7 +20896,7 @@ var Font = class extends SheetExtension {
 	* @param fontCache
 	*/
 	_clipByRenderBounds(renderFontContext, row, col, padding = 0) {
-		var _fontCache$cellData$f, _fontCache$cellData3, _fontCache$cellData$f2, _fontCache$cellData4;
+		var _fontCache$cellData3, _fontCache$cellData4;
 		const { ctx, scale, overflowRectangle, fontCache } = renderFontContext;
 		let { startX, endX, startY, endY } = renderFontContext;
 		const { horizontalAlign = 0, vertexAngle = 0, centerAngle = 0 } = fontCache;
@@ -20711,8 +20905,8 @@ var Font = class extends SheetExtension {
 			if (centerAngle === 90 && vertexAngle === 90) horizontalAlignOverFlow = _univerjs_core.HorizontalAlign.CENTER;
 			else if (vertexAngle > 0 && vertexAngle !== 90 || vertexAngle === -90) horizontalAlignOverFlow = _univerjs_core.HorizontalAlign.RIGHT;
 		}
-		const rightOffset = (_fontCache$cellData$f = fontCache === null || fontCache === void 0 || (_fontCache$cellData3 = fontCache.cellData) === null || _fontCache$cellData3 === void 0 || (_fontCache$cellData3 = _fontCache$cellData3.fontRenderExtension) === null || _fontCache$cellData3 === void 0 ? void 0 : _fontCache$cellData3.rightOffset) !== null && _fontCache$cellData$f !== void 0 ? _fontCache$cellData$f : 0;
-		const leftOffset = (_fontCache$cellData$f2 = fontCache === null || fontCache === void 0 || (_fontCache$cellData4 = fontCache.cellData) === null || _fontCache$cellData4 === void 0 || (_fontCache$cellData4 = _fontCache$cellData4.fontRenderExtension) === null || _fontCache$cellData4 === void 0 ? void 0 : _fontCache$cellData4.leftOffset) !== null && _fontCache$cellData$f2 !== void 0 ? _fontCache$cellData$f2 : 0;
+		const rightOffset = (fontCache === null || fontCache === void 0 || (_fontCache$cellData3 = fontCache.cellData) === null || _fontCache$cellData3 === void 0 || (_fontCache$cellData3 = _fontCache$cellData3.fontRenderExtension) === null || _fontCache$cellData3 === void 0 ? void 0 : _fontCache$cellData3.rightOffset) ?? 0;
+		const leftOffset = (fontCache === null || fontCache === void 0 || (_fontCache$cellData4 = fontCache.cellData) === null || _fontCache$cellData4 === void 0 || (_fontCache$cellData4 = _fontCache$cellData4.fontRenderExtension) === null || _fontCache$cellData4 === void 0 ? void 0 : _fontCache$cellData4.leftOffset) ?? 0;
 		let isOverflow = true;
 		if (vertexAngle === 0) {
 			startX = startX + leftOffset;
@@ -20744,17 +20938,17 @@ var Font = class extends SheetExtension {
 		renderFontContext.endY = endY;
 	}
 	_renderText(ctx, row, col, renderFontCtx, overflowCache) {
-		var _fontCache$style$pd2, _fontCache$style5, _padding$l3, _padding$r3, _padding$t3, _padding$b3, _fontCache$displayTex2, _fontCache$style6, _fontCache$style7, _fontCache$style8, _fontCache$style9;
+		var _fontCache$style5, _fontCache$style6, _fontCache$style7, _fontCache$style8, _fontCache$style9;
 		const { fontCache } = renderFontCtx;
 		if (!fontCache) return;
-		const padding = (_fontCache$style$pd2 = (_fontCache$style5 = fontCache.style) === null || _fontCache$style5 === void 0 ? void 0 : _fontCache$style5.pd) !== null && _fontCache$style$pd2 !== void 0 ? _fontCache$style$pd2 : DEFAULT_PADDING_DATA;
-		const paddingLeft = (_padding$l3 = padding.l) !== null && _padding$l3 !== void 0 ? _padding$l3 : DEFAULT_PADDING_DATA.l;
-		const paddingRight = (_padding$r3 = padding.r) !== null && _padding$r3 !== void 0 ? _padding$r3 : DEFAULT_PADDING_DATA.r;
-		const paddingTop = (_padding$t3 = padding.t) !== null && _padding$t3 !== void 0 ? _padding$t3 : DEFAULT_PADDING_DATA.t;
-		const paddingBottom = (_padding$b3 = padding.b) !== null && _padding$b3 !== void 0 ? _padding$b3 : DEFAULT_PADDING_DATA.b;
+		const padding = ((_fontCache$style5 = fontCache.style) === null || _fontCache$style5 === void 0 ? void 0 : _fontCache$style5.pd) ?? DEFAULT_PADDING_DATA;
+		const paddingLeft = padding.l ?? DEFAULT_PADDING_DATA.l;
+		const paddingRight = padding.r ?? DEFAULT_PADDING_DATA.r;
+		const paddingTop = padding.t ?? DEFAULT_PADDING_DATA.t;
+		const paddingBottom = padding.b ?? DEFAULT_PADDING_DATA.b;
 		const { vertexAngle = 0, wrapStrategy, cellData } = fontCache;
 		if ((cellData === null || cellData === void 0 ? void 0 : cellData.v) === void 0 || (cellData === null || cellData === void 0 ? void 0 : cellData.v) === null) return;
-		const text = (_fontCache$displayTex2 = fontCache.displayText) !== null && _fontCache$displayTex2 !== void 0 ? _fontCache$displayTex2 : (0, _univerjs_core.getDisplayValueFromCell)(cellData);
+		const text = fontCache.displayText ?? (0, _univerjs_core.getDisplayValueFromCell)(cellData);
 		const { startX, startY, endX, endY } = renderFontCtx;
 		const cellWidth = endX - startX - paddingLeft - paddingRight;
 		const cellHeight = endY - startY - paddingTop - paddingBottom;
@@ -20964,26 +21158,22 @@ var RowHeaderLayout = class extends SheetExtension {
 	}
 	configHeaderRow(cfg, sheetId) {
 		if (sheetId) {
-			var _cfg$rowsCfg, _cfg$headerStyle;
-			this.rowsCfgOfWorksheet.set(sheetId, (_cfg$rowsCfg = cfg.rowsCfg) !== null && _cfg$rowsCfg !== void 0 ? _cfg$rowsCfg : {});
-			this.headerStyleOfWorksheet.set(sheetId, (_cfg$headerStyle = cfg.headerStyle) !== null && _cfg$headerStyle !== void 0 ? _cfg$headerStyle : {});
+			this.rowsCfgOfWorksheet.set(sheetId, cfg.rowsCfg ?? {});
+			this.headerStyleOfWorksheet.set(sheetId, cfg.headerStyle ?? {});
 		} else {
-			var _cfg$rowsCfg2, _cfg$headerStyle2;
-			this.rowsCfg = (_cfg$rowsCfg2 = cfg.rowsCfg) !== null && _cfg$rowsCfg2 !== void 0 ? _cfg$rowsCfg2 : {};
-			this.headerStyle = (_cfg$headerStyle2 = cfg.headerStyle) !== null && _cfg$headerStyle2 !== void 0 ? _cfg$headerStyle2 : {};
+			this.rowsCfg = cfg.rowsCfg ?? {};
+			this.headerStyle = cfg.headerStyle ?? {};
 		}
 	}
 	getRowsCfg(sheetId) {
-		var _this$rowsCfgOfWorksh;
-		const rowsCfg = (_this$rowsCfgOfWorksh = this.rowsCfgOfWorksheet.get(sheetId)) !== null && _this$rowsCfgOfWorksh !== void 0 ? _this$rowsCfgOfWorksh : {};
+		const rowsCfg = this.rowsCfgOfWorksheet.get(sheetId) ?? {};
 		return {
 			...this.rowsCfg,
 			...rowsCfg
 		};
 	}
 	getHeaderStyle(sheetId) {
-		var _this$headerStyleOfWo;
-		const headerStyle = (_this$headerStyleOfWo = this.headerStyleOfWorksheet.get(sheetId)) !== null && _this$headerStyleOfWo !== void 0 ? _this$headerStyleOfWo : {};
+		const headerStyle = this.headerStyleOfWorksheet.get(sheetId) ?? {};
 		return {
 			...DEFAULT_ROW_STYLE,
 			...this.headerStyle,
@@ -21035,13 +21225,12 @@ var RowHeaderLayout = class extends SheetExtension {
 		const rowHeightAccumulationLength = rowHeightAccumulation.length;
 		const rowGaps = (_spreadsheetSkeleton$ = spreadsheetSkeleton.gapConfig) === null || _spreadsheetSkeleton$ === void 0 ? void 0 : _spreadsheetSkeleton$.rowGaps;
 		for (let r = startRow - 1; r <= endRow; r++) {
-			var _rowGaps$r$size, _rowGaps$r;
+			var _rowGaps$r;
 			if (r < 0 || r > rowHeightAccumulationLength - 1) continue;
 			const rowEndPosition = rowHeightAccumulation[r];
 			if (preRowPosition === rowEndPosition) continue;
-			const gapSize = (_rowGaps$r$size = rowGaps === null || rowGaps === void 0 || (_rowGaps$r = rowGaps[r]) === null || _rowGaps$r === void 0 ? void 0 : _rowGaps$r.size) !== null && _rowGaps$r$size !== void 0 ? _rowGaps$r$size : 0;
+			const gapSize = (rowGaps === null || rowGaps === void 0 || (_rowGaps$r = rowGaps[r]) === null || _rowGaps$r === void 0 ? void 0 : _rowGaps$r.size) ?? 0;
 			if (gapSize > 0) {
-				var _gapItem$color, _gapItem$stripeColor;
 				const gapItem = rowGaps[r];
 				const gapTop = preRowPosition;
 				const gapBottom = preRowPosition + gapSize;
@@ -21049,14 +21238,14 @@ var RowHeaderLayout = class extends SheetExtension {
 				const defaultBg = defaultBackgroundColor;
 				const defaultStripe = defaultStripeColor;
 				ctx.save();
-				ctx.fillStyle = (_gapItem$color = gapItem.color) !== null && _gapItem$color !== void 0 ? _gapItem$color : defaultBg;
+				ctx.fillStyle = gapItem.color ?? defaultBg;
 				ctx.fillRectByPrecision(0, gapTop, rowHeaderWidth, gapSize);
 				ctx.restore();
 				ctx.save();
 				ctx.beginPath();
 				ctx.rectByPrecision(0, gapTop, rowHeaderWidth, gapSize);
 				ctx.clip();
-				ctx.strokeStyle = (_gapItem$stripeColor = gapItem.stripeColor) !== null && _gapItem$stripeColor !== void 0 ? _gapItem$stripeColor : defaultStripe;
+				ctx.strokeStyle = gapItem.stripeColor ?? defaultStripe;
 				ctx.lineWidth = 1;
 				ctx.beginPath();
 				const spacing = 6;
@@ -21470,9 +21659,8 @@ var Circle = class Circle extends Shape {
 		return this._radius;
 	}
 	static drawWith(ctx, props) {
-		var _radius;
 		let { radius } = props;
-		radius = (_radius = radius) !== null && _radius !== void 0 ? _radius : 10;
+		radius = radius ?? 10;
 		ctx.beginPath();
 		if (props.strokeDashArray) ctx.setLineDash(props.strokeDashArray);
 		ctx.beginPath();
@@ -21554,11 +21742,10 @@ var Rect = class Rect extends Shape {
 		this._opacity = opacity;
 	}
 	static drawWith(ctx, props) {
-		var _radius, _width, _height;
 		let { radius, width, height } = props;
-		radius = (_radius = radius) !== null && _radius !== void 0 ? _radius : 0;
-		width = (_width = width) !== null && _width !== void 0 ? _width : 0;
-		height = (_height = height) !== null && _height !== void 0 ? _height : 0;
+		radius = radius ?? 0;
+		width = width ?? 0;
+		height = height ?? 0;
 		ctx.save();
 		ctx.beginPath();
 		if (props.strokeDashArray) ctx.setLineDash(props.strokeDashArray);
@@ -21610,13 +21797,12 @@ var Rect = class Rect extends Shape {
 //#region src/shape/dashedrect.ts
 var DashedRect = class DashedRect extends Rect {
 	static drawWith(ctx, props) {
-		var _radius, _width, _height, _left, _top;
 		let { radius, left, top, width, height } = props;
-		radius = (_radius = radius) !== null && _radius !== void 0 ? _radius : 0;
-		width = (_width = width) !== null && _width !== void 0 ? _width : 0;
-		height = (_height = height) !== null && _height !== void 0 ? _height : 0;
-		left = (_left = left) !== null && _left !== void 0 ? _left : 0;
-		top = (_top = top) !== null && _top !== void 0 ? _top : 0;
+		radius = radius ?? 0;
+		width = width ?? 0;
+		height = height ?? 0;
+		left = left ?? 0;
+		top = top ?? 0;
 		ctx.beginPath();
 		ctx.setLineDash(props.strokeDashArray);
 		if (!radius) ctx.rect(left, top, width, height);
@@ -21747,8 +21933,7 @@ var Image$1 = class extends Shape {
 		return this._props.prstGeom;
 	}
 	get opacity() {
-		var _this$_props$opacity;
-		return (_this$_props$opacity = this._props.opacity) !== null && _this$_props$opacity !== void 0 ? _this$_props$opacity : 1;
+		return this._props.opacity ?? 1;
 	}
 	get clipBounds() {
 		return this._props.clipBounds;
@@ -21903,8 +22088,8 @@ var Image$1 = class extends Shape {
 	}
 	_draw(ctx, _bounds, renderWidth, renderHeight) {
 		if (this._native == null) return;
-		const w = renderWidth !== null && renderWidth !== void 0 ? renderWidth : this.width;
-		const h = renderHeight !== null && renderHeight !== void 0 ? renderHeight : this.height;
+		const w = renderWidth ?? this.width;
+		const h = renderHeight ?? this.height;
 		if (this.prstGeom && this._clipService) {
 			ctx.save();
 			ctx.translate(-w / 2, -h / 2);
@@ -21917,8 +22102,8 @@ var Image$1 = class extends Shape {
 				const drawHeight = clipBounds.height;
 				if (!this._renderByCropper && this.srcRect) {
 					const { left = 0, top = 0, right = 0, bottom = 0 } = this.srcRect;
-					const scaleW = drawWidth / w;
-					const scaleH = drawHeight / h;
+					const scaleW = this.width > 0 ? drawWidth / this.width : 1;
+					const scaleH = this.height > 0 ? drawHeight / this.height : 1;
 					ctx.drawImage(this._native, drawLeft - left * scaleW, drawTop - top * scaleH, drawWidth + (right + left) * scaleW, drawHeight + (bottom + top) * scaleH);
 				} else ctx.drawImage(this._native, drawLeft, drawTop, drawWidth, drawHeight);
 				ctx.restore();
@@ -21928,10 +22113,12 @@ var Image$1 = class extends Shape {
 		}
 		if (!this._renderByCropper && this.srcRect) {
 			const { left = 0, top = 0, right = 0, bottom = 0 } = this.srcRect;
+			const scaleW = this.width > 0 ? w / this.width : 1;
+			const scaleH = this.height > 0 ? h / this.height : 1;
 			ctx.beginPath();
 			ctx.rect(-w / 2, -h / 2, w, h);
 			ctx.clip();
-			ctx.drawImage(this._native, -left - w / 2, -top - h / 2, w + right + left, h + bottom + top);
+			ctx.drawImage(this._native, -left * scaleW - w / 2, -top * scaleH - h / 2, w + (right + left) * scaleW, h + (bottom + top) * scaleH);
 		} else ctx.drawImage(this._native, -w / 2, -h / 2, w, h);
 	}
 	_init() {
@@ -22023,16 +22210,15 @@ function normalizeLinePosition(position) {
 */
 var Line = class Line extends Shape {
 	constructor(key, props) {
-		var _props$startX, _props$startY, _props$endX, _props$endY;
 		const position = {
-			startX: (_props$startX = props === null || props === void 0 ? void 0 : props.startX) !== null && _props$startX !== void 0 ? _props$startX : 0,
-			startY: (_props$startY = props === null || props === void 0 ? void 0 : props.startY) !== null && _props$startY !== void 0 ? _props$startY : 0,
-			endX: (_props$endX = props === null || props === void 0 ? void 0 : props.endX) !== null && _props$endX !== void 0 ? _props$endX : 0,
-			endY: (_props$endY = props === null || props === void 0 ? void 0 : props.endY) !== null && _props$endY !== void 0 ? _props$endY : 0
+			startX: (props === null || props === void 0 ? void 0 : props.startX) ?? 0,
+			startY: (props === null || props === void 0 ? void 0 : props.startY) ?? 0,
+			endX: (props === null || props === void 0 ? void 0 : props.endX) ?? 0,
+			endY: (props === null || props === void 0 ? void 0 : props.endY) ?? 0
 		};
 		const geometry = normalizeLinePosition(position);
 		const normalizedProps = {
-			...props !== null && props !== void 0 ? props : position,
+			...props ?? position,
 			left: geometry.left,
 			top: geometry.top,
 			width: geometry.width,
@@ -22078,13 +22264,12 @@ var Line = class Line extends Shape {
 		return this;
 	}
 	setProps(props) {
-		var _props$startX2, _props$startY2, _props$endX2, _props$endY2;
 		if (!props) return this;
 		const position = {
-			startX: (_props$startX2 = props.startX) !== null && _props$startX2 !== void 0 ? _props$startX2 : this.startX,
-			startY: (_props$startY2 = props.startY) !== null && _props$startY2 !== void 0 ? _props$startY2 : this.startY,
-			endX: (_props$endX2 = props.endX) !== null && _props$endX2 !== void 0 ? _props$endX2 : this.endX,
-			endY: (_props$endY2 = props.endY) !== null && _props$endY2 !== void 0 ? _props$endY2 : this.endY
+			startX: props.startX ?? this.startX,
+			startY: props.startY ?? this.startY,
+			endX: props.endX ?? this.endX,
+			endY: props.endY ?? this.endY
 		};
 		const lineProps = {
 			...props,
@@ -22835,9 +23020,8 @@ var RegularPolygon = class RegularPolygon extends Shape {
 		return this._pointsGroup;
 	}
 	static drawWith(ctx, props) {
-		var _pointsGroup;
 		let { pointsGroup } = props;
-		pointsGroup = (_pointsGroup = pointsGroup) !== null && _pointsGroup !== void 0 ? _pointsGroup : [[]];
+		pointsGroup = pointsGroup ?? [[]];
 		if (props.strokeDashArray) ctx.setLineDash(props.strokeDashArray);
 		ctx.beginPath();
 		for (const points of pointsGroup) {
@@ -23176,6 +23360,7 @@ var RichText = class extends BaseObject {
 //#region src/shape/scroll-bar.ts
 const MIN_THUMB_SIZE = 17;
 const DEFAULT_TRACK_SIZE = 10;
+const DEFAULT_TRACK_BORDER_SIZE = 1;
 const DEFAULT_THUMB_MARGIN = 2;
 const HOVER_THUMB_MARGIN = 1;
 const BAR_DRAG_SCROLL_THROTTLE_MS = 32;
@@ -23184,6 +23369,7 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		super();
 		_defineProperty(this, "_enableHorizontal", true);
 		_defineProperty(this, "_enableVertical", true);
+		_defineProperty(this, "_hideTrackWhenUnscrollable", false);
 		_defineProperty(this, "horizontalThumbSize", 0);
 		_defineProperty(this, "horizontalMinusMiniThumb", 0);
 		_defineProperty(this, "horizontalTrackWidth", 0);
@@ -23217,7 +23403,7 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		_defineProperty(this, "_trackThickness", DEFAULT_TRACK_SIZE);
 		_defineProperty(this, "_vThumbMargin", DEFAULT_THUMB_MARGIN);
 		_defineProperty(this, "_hThumbMargin", DEFAULT_THUMB_MARGIN);
-		_defineProperty(this, "_trackBorderThickness", 1);
+		_defineProperty(this, "_trackBorderThickness", DEFAULT_TRACK_BORDER_SIZE);
 		_defineProperty(this, "_thumbLengthRatio", 1);
 		_defineProperty(this, "_minThumbSizeH", MIN_THUMB_SIZE);
 		_defineProperty(this, "_minThumbSizeV", MIN_THUMB_SIZE);
@@ -23261,6 +23447,17 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 	set enableVertical(val) {
 		this._enableVertical = val;
 	}
+	get hideTrackWhenUnscrollable() {
+		return this._hideTrackWhenUnscrollable;
+	}
+	set hideTrackWhenUnscrollable(val) {
+		if (this._hideTrackWhenUnscrollable === val) return;
+		this._hideTrackWhenUnscrollable = val;
+		this._resizeHorizontal();
+		this._resizeVertical();
+		this._resizeRightBottomCorner();
+		this.makeDirty(true);
+	}
 	get limitX() {
 		var _this$horizonThumbRec;
 		if (!((_this$horizonThumbRec = this.horizonThumbRect) === null || _this$horizonThumbRec === void 0 ? void 0 : _this$horizonThumbRec.visible)) return 0;
@@ -23362,9 +23559,8 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		this._viewport.removeScrollBar();
 	}
 	_scheduleBarScrollDelta(delta) {
-		var _delta$x, _delta$y;
-		this._pendingBarDeltaX += (_delta$x = delta.x) !== null && _delta$x !== void 0 ? _delta$x : 0;
-		this._pendingBarDeltaY += (_delta$y = delta.y) !== null && _delta$y !== void 0 ? _delta$y : 0;
+		this._pendingBarDeltaX += delta.x ?? 0;
+		this._pendingBarDeltaY += delta.y ?? 0;
 		if (this._pendingBarScrollFrameId !== null || this._pendingBarScrollThrottleId !== null) return;
 		this._requestPendingBarScrollFrame();
 	}
@@ -23426,7 +23622,7 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		ctx.restore();
 	}
 	_resizeHorizontal() {
-		var _this$horizonScrollTr2;
+		var _this$horizonScrollTr2, _this$horizonScrollTr3;
 		const viewportH = this._viewportH;
 		const viewportW = this._viewportW;
 		const contentWidth = this._contentW;
@@ -23444,7 +23640,9 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 			width: this.horizontalTrackWidth,
 			height: Math.max(0, this._trackThickness - this._trackBorderThickness)
 		});
-		if (this.horizontalThumbSize >= viewportW - (this._trackThickness + 2)) {
+		const scrollable = hasScrollableOverflow(contentWidth, viewportW);
+		(_this$horizonScrollTr3 = this.horizonScrollTrack) === null || _this$horizonScrollTr3 === void 0 || _this$horizonScrollTr3.setProps({ visible: !this._hideTrackWhenUnscrollable || scrollable });
+		if (!scrollable) {
 			var _this$horizonThumbRec4;
 			(_this$horizonThumbRec4 = this.horizonThumbRect) === null || _this$horizonThumbRec4 === void 0 || _this$horizonThumbRec4.setProps({ visible: false });
 		} else {
@@ -23462,7 +23660,7 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		}
 	}
 	_resizeVertical() {
-		var _this$verticalScrollT2;
+		var _this$verticalScrollT2, _this$verticalScrollT3;
 		const viewportH = this._viewportH;
 		const viewportW = this._viewportW;
 		const contentHeight = this._contentH;
@@ -23480,7 +23678,9 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 			width: Math.max(0, this._trackThickness - this._trackBorderThickness),
 			height: this.verticalTrackHeight
 		});
-		if (this.verticalThumbSize >= viewportH - this._trackThickness) {
+		const scrollable = hasScrollableOverflow(contentHeight, viewportH);
+		(_this$verticalScrollT3 = this.verticalScrollTrack) === null || _this$verticalScrollT3 === void 0 || _this$verticalScrollT3.setProps({ visible: !this._hideTrackWhenUnscrollable || scrollable });
+		if (!scrollable) {
 			var _this$verticalThumbRe4;
 			(_this$verticalThumbRe4 = this.verticalThumbRect) === null || _this$verticalThumbRe4 === void 0 || _this$verticalThumbRe4.setProps({ visible: false });
 		} else {
@@ -23501,8 +23701,9 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		const viewportH = this._viewportH;
 		const viewportW = this._viewportW;
 		if (this._enableHorizontal && this._enableVertical) {
-			var _this$placeholderBarR2;
-			(_this$placeholderBarR2 = this.placeholderBarRect) === null || _this$placeholderBarR2 === void 0 || _this$placeholderBarR2.transformByState({
+			var _this$placeholderBarR2, _this$horizonScrollTr4, _this$verticalScrollT4, _this$placeholderBarR3;
+			(_this$placeholderBarR2 = this.placeholderBarRect) === null || _this$placeholderBarR2 === void 0 || _this$placeholderBarR2.setProps({ visible: !this._hideTrackWhenUnscrollable || Boolean(((_this$horizonScrollTr4 = this.horizonScrollTrack) === null || _this$horizonScrollTr4 === void 0 ? void 0 : _this$horizonScrollTr4.visible) && ((_this$verticalScrollT4 = this.verticalScrollTrack) === null || _this$verticalScrollT4 === void 0 ? void 0 : _this$verticalScrollT4.visible)) });
+			(_this$placeholderBarR3 = this.placeholderBarRect) === null || _this$placeholderBarR3 === void 0 || _this$placeholderBarR3.transformByState({
 				left: viewportW - this._trackThickness,
 				top: viewportH - this._trackThickness,
 				width: Math.max(0, this._trackThickness - this._trackBorderThickness),
@@ -23528,23 +23729,23 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		this._resizeRightBottomCorner();
 	}
 	makeDirty(state) {
-		var _this$horizonScrollTr3, _this$horizonThumbRec8, _this$verticalScrollT3, _this$verticalThumbRe8, _this$placeholderBarR3;
-		(_this$horizonScrollTr3 = this.horizonScrollTrack) === null || _this$horizonScrollTr3 === void 0 || _this$horizonScrollTr3.makeDirty(state);
+		var _this$horizonScrollTr5, _this$horizonThumbRec8, _this$verticalScrollT5, _this$verticalThumbRe8, _this$placeholderBarR4;
+		(_this$horizonScrollTr5 = this.horizonScrollTrack) === null || _this$horizonScrollTr5 === void 0 || _this$horizonScrollTr5.makeDirty(state);
 		(_this$horizonThumbRec8 = this.horizonThumbRect) === null || _this$horizonThumbRec8 === void 0 || _this$horizonThumbRec8.makeDirty(state);
-		(_this$verticalScrollT3 = this.verticalScrollTrack) === null || _this$verticalScrollT3 === void 0 || _this$verticalScrollT3.makeDirty(state);
+		(_this$verticalScrollT5 = this.verticalScrollTrack) === null || _this$verticalScrollT5 === void 0 || _this$verticalScrollT5.makeDirty(state);
 		(_this$verticalThumbRe8 = this.verticalThumbRect) === null || _this$verticalThumbRe8 === void 0 || _this$verticalThumbRe8.makeDirty(state);
-		(_this$placeholderBarR3 = this.placeholderBarRect) === null || _this$placeholderBarR3 === void 0 || _this$placeholderBarR3.makeDirty(state);
+		(_this$placeholderBarR4 = this.placeholderBarRect) === null || _this$placeholderBarR4 === void 0 || _this$placeholderBarR4.makeDirty(state);
 		this.makeViewDirty(state);
 	}
 	makeViewDirty(state) {
 		(this._mainScene || this._viewport.scene).makeDirty(state);
 	}
 	pick(coord) {
-		var _this$horizonThumbRec9, _this$verticalThumbRe9, _this$horizonScrollTr4, _this$verticalScrollT4;
+		var _this$horizonThumbRec9, _this$verticalThumbRe9, _this$horizonScrollTr6, _this$verticalScrollT6;
 		if ((_this$horizonThumbRec9 = this.horizonThumbRect) === null || _this$horizonThumbRec9 === void 0 ? void 0 : _this$horizonThumbRec9.isHit(coord)) return this.horizonThumbRect;
 		if ((_this$verticalThumbRe9 = this.verticalThumbRect) === null || _this$verticalThumbRe9 === void 0 ? void 0 : _this$verticalThumbRe9.isHit(coord)) return this.verticalThumbRect;
-		if ((_this$horizonScrollTr4 = this.horizonScrollTrack) === null || _this$horizonScrollTr4 === void 0 ? void 0 : _this$horizonScrollTr4.isHit(coord)) return this.horizonScrollTrack;
-		if ((_this$verticalScrollT4 = this.verticalScrollTrack) === null || _this$verticalScrollT4 === void 0 ? void 0 : _this$verticalScrollT4.isHit(coord)) return this.verticalScrollTrack;
+		if ((_this$horizonScrollTr6 = this.horizonScrollTrack) === null || _this$horizonScrollTr6 === void 0 ? void 0 : _this$horizonScrollTr6.isHit(coord)) return this.horizonScrollTrack;
+		if ((_this$verticalScrollT6 = this.verticalScrollTrack) === null || _this$verticalScrollT6 === void 0 ? void 0 : _this$verticalScrollT6.isHit(coord)) return this.verticalScrollTrack;
 		return null;
 	}
 	_initialScrollRect() {
@@ -23698,6 +23899,7 @@ var ScrollBar = class ScrollBar extends _univerjs_core.Disposable {
 		});
 	}
 };
+_defineProperty(ScrollBar, "DEFAULT_TOTAL_SIZE", 11);
 
 //#endregion
 //#region src/components/docs/extensions/font-and-base-line.ts
@@ -23755,14 +23957,19 @@ var FontAndBaseLine = class extends docExtension {
 			drawText();
 			return;
 		}
-		const effectFilter = createDrawingEffectFilter(glow, outerShadow);
-		if (!effectFilter) {
+		const effects = [resolveGlowEffect(glow), resolveOuterShadowEffect(outerShadow)].filter((effect) => effect != null);
+		if (effects.length === 0) {
 			drawText();
 			return;
 		}
 		ctx.save();
-		ctx.filter = combineDrawingEffectFilter(ctx.filter, effectFilter);
-		drawText();
+		for (const effect of effects) {
+			ctx.shadowColor = effect.color;
+			ctx.shadowBlur = effect.blurRadius;
+			ctx.shadowOffsetX = effect.offsetX;
+			ctx.shadowOffsetY = effect.offsetY;
+			drawText();
+		}
 		ctx.restore();
 	}
 	_fillTextWithTextFill(ctx, glyph, spanPointWithFont, textFill, fallbackColor) {
@@ -23770,7 +23977,7 @@ var FontAndBaseLine = class extends docExtension {
 		const { content, glyphType } = glyph;
 		if (content == null || glyphType === 2) return false;
 		const { renderConfig } = this.extensionOffset;
-		const { vertexAngle, centerAngle } = renderConfig !== null && renderConfig !== void 0 ? renderConfig : {};
+		const { vertexAngle, centerAngle } = renderConfig ?? {};
 		const VERTICAL_DEG = 90;
 		if (vertexAngle === VERTICAL_DEG && centerAngle === VERTICAL_DEG) return false;
 		const bounds = this._getGlyphPaintBounds(glyph, spanPointWithFont);
@@ -23809,10 +24016,9 @@ var FontAndBaseLine = class extends docExtension {
 		};
 	}
 	_createTextGradient(ctx, bounds, textFill, fallbackColor) {
-		var _gradient$type, _gradient$angle, _context;
 		const gradient = textFill.gradient;
-		const type = (_gradient$type = gradient === null || gradient === void 0 ? void 0 : gradient.type) !== null && _gradient$type !== void 0 ? _gradient$type : "linear";
-		const angle = (_gradient$angle = gradient === null || gradient === void 0 ? void 0 : gradient.angle) !== null && _gradient$angle !== void 0 ? _gradient$angle : 0;
+		const type = (gradient === null || gradient === void 0 ? void 0 : gradient.type) ?? "linear";
+		const angle = (gradient === null || gradient === void 0 ? void 0 : gradient.angle) ?? 0;
 		const stops = this._normalizeGradientStops(gradient === null || gradient === void 0 ? void 0 : gradient.stops, textFill.color || fallbackColor);
 		const centerX = bounds.left + bounds.width / 2;
 		const centerY = bounds.top + bounds.height / 2;
@@ -23820,10 +24026,8 @@ var FontAndBaseLine = class extends docExtension {
 		if (type === "radial") {
 			const radius = Math.max(bounds.width, bounds.height) / 2;
 			canvasGradient = ctx.createRadialGradient(centerX, centerY, 0, centerX, centerY, radius);
-		} else if (type === "angular" && "createConicGradient" in ((_context = ctx._context) !== null && _context !== void 0 ? _context : ctx)) {
-			var _context2;
-			canvasGradient = ((_context2 = ctx._context) !== null && _context2 !== void 0 ? _context2 : ctx).createConicGradient((angle - 90) * Math.PI / 180, centerX, centerY);
-		} else if (type === "diamond") {
+		} else if (type === "angular" && "createConicGradient" in (ctx._context ?? ctx)) canvasGradient = (ctx._context ?? ctx).createConicGradient((angle - 90) * Math.PI / 180, centerX, centerY);
+		else if (type === "diamond") {
 			const radius = Math.max(bounds.width, bounds.height) / 2;
 			canvasGradient = ctx.createRadialGradient(centerX, centerY, 0, centerX, centerY, radius);
 		} else {
@@ -23831,14 +24035,13 @@ var FontAndBaseLine = class extends docExtension {
 			canvasGradient = ctx.createLinearGradient(line.x0, line.y0, line.x1, line.y1);
 		}
 		for (const stop of stops) {
-			var _textFill$opacity, _stop$opacity;
-			const opacity = ((_textFill$opacity = textFill.opacity) !== null && _textFill$opacity !== void 0 ? _textFill$opacity : 1) * ((_stop$opacity = stop.opacity) !== null && _stop$opacity !== void 0 ? _stop$opacity : 1);
+			const opacity = (textFill.opacity ?? 1) * (stop.opacity ?? 1);
 			canvasGradient.addColorStop(stop.offset, this._colorWithOpacity(stop.color, opacity));
 		}
 		return canvasGradient;
 	}
 	_createTextPicturePattern(ctx, bounds, textFill) {
-		var _textFill$picture, _ref, _textFill$picture$opa, _textFill$picture2, _textFill$picture3, _pattern$setTransform;
+		var _textFill$picture, _textFill$picture2, _textFill$picture3, _pattern$setTransform;
 		const source = (_textFill$picture = textFill.picture) === null || _textFill$picture === void 0 ? void 0 : _textFill$picture.source;
 		if (!source) return null;
 		const image = this._getTextFillImage(source);
@@ -23848,15 +24051,14 @@ var FontAndBaseLine = class extends docExtension {
 		canvas.height = Math.max(1, Math.ceil(bounds.height));
 		const canvasContext = canvas.getContext("2d");
 		if (!canvasContext) return null;
-		canvasContext.globalAlpha = this._clamp((_ref = (_textFill$picture$opa = (_textFill$picture2 = textFill.picture) === null || _textFill$picture2 === void 0 ? void 0 : _textFill$picture2.opacity) !== null && _textFill$picture$opa !== void 0 ? _textFill$picture$opa : textFill.opacity) !== null && _ref !== void 0 ? _ref : 1, 0, 1);
+		canvasContext.globalAlpha = this._clamp(((_textFill$picture2 = textFill.picture) === null || _textFill$picture2 === void 0 ? void 0 : _textFill$picture2.opacity) ?? textFill.opacity ?? 1, 0, 1);
 		if (((_textFill$picture3 = textFill.picture) === null || _textFill$picture3 === void 0 ? void 0 : _textFill$picture3.mode) === "tile") {
-			var _textFill$picture$sca, _textFill$picture$sca2, _textFill$picture$off, _textFill$picture$off2;
-			const scaleX = (_textFill$picture$sca = textFill.picture.scaleX) !== null && _textFill$picture$sca !== void 0 ? _textFill$picture$sca : 1;
-			const scaleY = (_textFill$picture$sca2 = textFill.picture.scaleY) !== null && _textFill$picture$sca2 !== void 0 ? _textFill$picture$sca2 : 1;
+			const scaleX = textFill.picture.scaleX ?? 1;
+			const scaleY = textFill.picture.scaleY ?? 1;
 			const cellWidth = Math.max(1, (image.naturalWidth || image.width) * scaleX);
 			const cellHeight = Math.max(1, (image.naturalHeight || image.height) * scaleY);
-			const offsetX = (_textFill$picture$off = textFill.picture.offsetX) !== null && _textFill$picture$off !== void 0 ? _textFill$picture$off : 0;
-			const offsetY = (_textFill$picture$off2 = textFill.picture.offsetY) !== null && _textFill$picture$off2 !== void 0 ? _textFill$picture$off2 : 0;
+			const offsetX = textFill.picture.offsetX ?? 0;
+			const offsetY = textFill.picture.offsetY ?? 0;
 			for (let x = (offsetX % cellWidth + cellWidth) % cellWidth - cellWidth; x < canvas.width; x += cellWidth) for (let y = (offsetY % cellHeight + cellHeight) % cellHeight - cellHeight; y < canvas.height; y += cellHeight) canvasContext.drawImage(image, x, y, cellWidth, cellHeight);
 		} else canvasContext.drawImage(image, 0, 0, canvas.width, canvas.height);
 		const pattern = ctx.createPattern(canvas, "no-repeat");
@@ -23940,7 +24142,7 @@ var FontAndBaseLine = class extends docExtension {
 		const { content, width, bBox } = glyph;
 		const { aba, abd } = bBox;
 		if (content == null || spanStartPoint == null || centerPoint == null) return;
-		const { vertexAngle, centerAngle } = renderConfig !== null && renderConfig !== void 0 ? renderConfig : {};
+		const { vertexAngle, centerAngle } = renderConfig ?? {};
 		const VERTICAL_DEG = 90;
 		const isVertical = vertexAngle === VERTICAL_DEG && centerAngle === VERTICAL_DEG;
 		if (isVertical && !cjk.hasCJK(content)) {
@@ -23953,8 +24155,8 @@ var FontAndBaseLine = class extends docExtension {
 		} else {
 			const CHECKED_GLYPH = "☑";
 			if ((content === "☐" || content === CHECKED_GLYPH) && glyph.glyphType === 2) {
-				var _glyph$ts$fs, _glyph$ts;
-				const size = Math.ceil(((_glyph$ts$fs = (_glyph$ts = glyph.ts) === null || _glyph$ts === void 0 ? void 0 : _glyph$ts.fs) !== null && _glyph$ts$fs !== void 0 ? _glyph$ts$fs : 12) * 1.2);
+				var _glyph$ts;
+				const size = Math.ceil((((_glyph$ts = glyph.ts) === null || _glyph$ts === void 0 ? void 0 : _glyph$ts.fs) ?? 12) * 1.2);
 				ctx.save();
 				const fontHeight = glyph.bBox.aba - glyph.bBox.abd;
 				const bottom = spanPointWithFont.y;
@@ -23999,7 +24201,7 @@ var Line$1 = class extends docExtension {
 		_defineProperty(this, "Z_INDEX", DOC_EXTENSION_Z_INDEX);
 		_defineProperty(this, "_preBackgroundColor", "");
 	}
-	draw(ctx, parentScale, glyph) {
+	draw(ctx, parentScale, glyph, _diff, more) {
 		var _glyph$parent;
 		const line = (_glyph$parent = glyph.parent) === null || _glyph$parent === void 0 ? void 0 : _glyph$parent.parent;
 		const { ts: textStyle, bBox, content } = glyph;
@@ -24011,7 +24213,7 @@ var Line$1 = class extends docExtension {
 		const { ul: underline, st: strikethrough, ol: overline, va: baselineOffset, bbl: bottomBorderLine } = textStyle;
 		if (underline) {
 			const startY = asc + dsc;
-			this._drawLine(ctx, glyph, underline, startY, scale);
+			this._drawLine(ctx, glyph, underline, startY, scale, 1, more === null || more === void 0 ? void 0 : more.viewBound);
 		}
 		if (bottomBorderLine) {
 			const startY = asc + dsc + 3;
@@ -24038,22 +24240,27 @@ var Line$1 = class extends docExtension {
 	clearCache() {
 		this._preBackgroundColor = "";
 	}
-	_drawLine(ctx, glyph, line, startY, _scale, lineWidth = 1) {
+	_drawLine(ctx, glyph, line, startY, _scale, lineWidth = 1, viewBound) {
 		var _glyph$ts;
 		let { s: show, cl: colorStyle, t: lineType, c = _univerjs_core.BooleanNumber.TRUE } = line;
 		if (show !== _univerjs_core.BooleanNumber.TRUE) return;
 		if (c == null) c = _univerjs_core.BooleanNumber.TRUE;
 		const { originTranslate = Vector2.create(0, 0), alignOffset = Vector2.create(0, 0), renderConfig = {} } = this.extensionOffset;
 		const { left, width } = glyph;
+		const isAccounting = this._isAccounting(lineType);
+		if (isAccounting && !this._isFirstAccountingGlyph(glyph)) return;
+		const lineLeft = isAccounting ? (viewBound === null || viewBound === void 0 ? void 0 : viewBound.left) ?? left : left;
+		const lineRight = isAccounting ? (viewBound === null || viewBound === void 0 ? void 0 : viewBound.right) ?? left + width : left + width;
+		const lineAlignOffset = isAccounting ? Vector2.create(0, alignOffset.y) : alignOffset;
 		const { centerAngle: centerAngleDeg = 0, vertexAngle: vertexAngleDeg = 0 } = renderConfig;
 		ctx.save();
 		ctx.strokeStyle = (c === _univerjs_core.BooleanNumber.TRUE ? (0, _univerjs_core.getColorStyle)((_glyph$ts = glyph.ts) === null || _glyph$ts === void 0 ? void 0 : _glyph$ts.cl) : (0, _univerjs_core.getColorStyle)(colorStyle)) || "rgb(0,0,0)";
-		this._setLineType(ctx, lineType !== null && lineType !== void 0 ? lineType : _univerjs_core.TextDecoration.SINGLE, lineWidth);
+		this._setLineType(ctx, lineType ?? _univerjs_core.TextDecoration.SINGLE, lineWidth);
 		startY += this._isDouble(lineType) ? -.8 : 0;
 		const centerAngle = degToRad(centerAngleDeg);
 		const vertexAngle = degToRad(vertexAngleDeg);
-		const start = calculateRectRotate(originTranslate.addByPoint(left, startY), Vector2.create(0, 0), centerAngle, vertexAngle, alignOffset);
-		const end = calculateRectRotate(originTranslate.addByPoint(left + width, startY), Vector2.create(0, 0), centerAngle, vertexAngle, alignOffset);
+		const start = calculateRectRotate(originTranslate.addByPoint(lineLeft, startY), Vector2.create(0, 0), centerAngle, vertexAngle, lineAlignOffset);
+		const end = calculateRectRotate(originTranslate.addByPoint(lineRight, startY), Vector2.create(0, 0), centerAngle, vertexAngle, lineAlignOffset);
 		ctx.beginPath();
 		ctx.moveTo(start.x, start.y);
 		this._drawLineTo(ctx, start.x, end.x, end.y, lineType);
@@ -24072,6 +24279,8 @@ var Line$1 = class extends docExtension {
 		switch (style) {
 			case _univerjs_core.TextDecoration.SINGLE:
 			case _univerjs_core.TextDecoration.DOUBLE:
+			case _univerjs_core.TextDecoration.SINGLE_ACCOUNTING:
+			case _univerjs_core.TextDecoration.DOUBLE_ACCOUNTING:
 				ctx.lineWidth = 1;
 				ctx.setLineDash([0]);
 				return;
@@ -24155,7 +24364,19 @@ var Line$1 = class extends docExtension {
 		return lineType === _univerjs_core.TextDecoration.WAVE || lineType === _univerjs_core.TextDecoration.WAVY_HEAVY || lineType === _univerjs_core.TextDecoration.WAVY_DOUBLE;
 	}
 	_isDouble(lineType) {
-		return lineType === _univerjs_core.TextDecoration.DOUBLE || lineType === _univerjs_core.TextDecoration.WAVY_DOUBLE;
+		return lineType === _univerjs_core.TextDecoration.DOUBLE || lineType === _univerjs_core.TextDecoration.WAVY_DOUBLE || lineType === _univerjs_core.TextDecoration.DOUBLE_ACCOUNTING;
+	}
+	_isAccounting(lineType) {
+		return lineType === _univerjs_core.TextDecoration.SINGLE_ACCOUNTING || lineType === _univerjs_core.TextDecoration.DOUBLE_ACCOUNTING;
+	}
+	_isFirstAccountingGlyph(glyph) {
+		var _glyph$parent2;
+		const line = (_glyph$parent2 = glyph.parent) === null || _glyph$parent2 === void 0 ? void 0 : _glyph$parent2.parent;
+		for (const divide of (line === null || line === void 0 ? void 0 : line.divides) ?? []) for (const candidate of divide.glyphGroup) {
+			var _candidate$ts;
+			if (this._isAccounting((_candidate$ts = candidate.ts) === null || _candidate$ts === void 0 || (_candidate$ts = _candidate$ts.ul) === null || _candidate$ts === void 0 ? void 0 : _candidate$ts.t)) return candidate === glyph;
+		}
+		return true;
 	}
 };
 DocumentsSpanAndLineExtensionRegistry.add(new Line$1());
@@ -24229,10 +24450,9 @@ var Documents = class Documents extends DocComponent {
 			skeHeaders,
 			unitId
 		}).some(({ tableId, tableRect }) => {
-			var _viewport$leadingInse;
 			const sourceTableId = getTableIdAndSliceIndex(tableId).tableId;
 			const viewport = getDocsTableRenderViewport(unitId, sourceTableId);
-			const projectedLeft = hasDocsTableHorizontalViewport(viewport) ? getDocsTableViewportLeft(viewport, tableRect.left - ((_viewport$leadingInse = viewport.leadingInsetLeft) !== null && _viewport$leadingInse !== void 0 ? _viewport$leadingInse : 0), docsLeft) : tableRect.left;
+			const projectedLeft = hasDocsTableHorizontalViewport(viewport) ? getDocsTableViewportLeft(viewport, tableRect.left - (viewport.leadingInsetLeft ?? 0), docsLeft) : tableRect.left;
 			const projectedRight = hasDocsTableHorizontalViewport(viewport) ? projectedLeft + viewport.viewportWidth : tableRect.right;
 			return localCoord.x >= projectedLeft - TABLE_OVERFLOW_INTERACTION_PADDING && localCoord.x <= projectedRight + TABLE_OVERFLOW_INTERACTION_PADDING && localCoord.y >= tableRect.top - TABLE_OVERFLOW_INTERACTION_PADDING && localCoord.y <= tableRect.bottom + TABLE_OVERFLOW_INTERACTION_PADDING;
 		});
@@ -24258,7 +24478,7 @@ var Documents = class Documents extends DocComponent {
 		let pageTop = 0;
 		let pageLeft = 0;
 		for (let i = 0, len = pages.length; i < len; i++) {
-			var _skeHeaders$get, _headerSkeletonPage$m, _skeFooters$get;
+			var _skeHeaders$get, _skeFooters$get;
 			const page = pages[i];
 			const { sections, marginTop: pagePaddingTop = 0, marginBottom: pagePaddingBottom = 0, marginLeft: pagePaddingLeft = 0, marginRight: pagePaddingRight = 0, width: actualWidth, height: actualHeight, pageWidth, headerId, footerId, renderConfig = {}, skeTables, skeColumnGroups = /* @__PURE__ */ new Map() } = page;
 			const { verticalAlign = _univerjs_core.VerticalAlign.TOP, horizontalAlign = _univerjs_core.HorizontalAlign.LEFT, centerAngle: centerAngleDeg = 0, vertexAngle: vertexAngleDeg = 0, wrapStrategy = _univerjs_core.WrapStrategy.UNSPECIFIED, cellValueType } = renderConfig;
@@ -24277,14 +24497,14 @@ var Documents = class Documents extends DocComponent {
 			}
 			if (skeTables.size > 0) this._drawTable(ctx, page, skeTables, extensions, backgroundExtension, glyphExtensionsExcludeBackground, alignOffsetNoAngle, centerAngle, vertexAngle, renderConfig, parentScale);
 			const headerSkeletonPage = (_skeHeaders$get = skeHeaders.get(headerId)) === null || _skeHeaders$get === void 0 ? void 0 : _skeHeaders$get.get(pageWidth);
-			const headerAlignOffsetNoAngle = Vector2.create(horizontalOffsetNoAngle, (_headerSkeletonPage$m = headerSkeletonPage === null || headerSkeletonPage === void 0 ? void 0 : headerSkeletonPage.marginTop) !== null && _headerSkeletonPage$m !== void 0 ? _headerSkeletonPage$m : 0);
+			const headerAlignOffsetNoAngle = Vector2.create(horizontalOffsetNoAngle, (headerSkeletonPage === null || headerSkeletonPage === void 0 ? void 0 : headerSkeletonPage.marginTop) ?? 0);
 			if (headerSkeletonPage) this._drawHeaderFooter(headerSkeletonPage, ctx, extensions, backgroundExtension, glyphExtensionsExcludeBackground, headerAlignOffsetNoAngle, centerAngle, vertexAngle, renderConfig, parentScale, page, true);
 			this._startRotation(ctx, finalAngle);
 			for (const [sectionIndex, section] of sections.entries()) {
 				var _sections$slice$find;
 				const { columns } = section;
 				const nextSectionTop = (_sections$slice$find = sections.slice(sectionIndex + 1).find((candidate) => candidate.top > section.top)) === null || _sections$slice$find === void 0 ? void 0 : _sections$slice$find.top;
-				const separatorHeight = Math.max(0, (nextSectionTop !== null && nextSectionTop !== void 0 ? nextSectionTop : page.pageHeight - pagePaddingTop - pagePaddingBottom) - section.top);
+				const separatorHeight = Math.max(0, (nextSectionTop ?? page.pageHeight - pagePaddingTop - pagePaddingBottom) - section.top);
 				this._drawLiquid.translateSave();
 				this._drawLiquid.translateSection(section);
 				drawSectionColumnSeparators(ctx, section, separatorHeight, alignOffsetNoAngle.x, alignOffsetNoAngle.y);
@@ -24395,9 +24615,8 @@ var Documents = class Documents extends DocComponent {
 			drawLiquid.translateSave();
 			drawLiquid.translate(tableLeft, tableTop);
 			if (hasDocsTableHorizontalViewport(viewport)) {
-				var _viewport$leadingInse2;
 				const { x, y } = drawLiquid;
-				const clipLeft = x + page.marginLeft - ((_viewport$leadingInse2 = viewport.leadingInsetLeft) !== null && _viewport$leadingInse2 !== void 0 ? _viewport$leadingInse2 : 0);
+				const clipLeft = x + page.marginLeft - (viewport.leadingInsetLeft ?? 0);
 				ctx.save();
 				ctx.beginPath();
 				ctx.rectByPrecision(clipLeft - TABLE_VIEWPORT_BORDER_CLIP_PADDING, y + page.marginTop - TABLE_VIEWPORT_BORDER_CLIP_PADDING, viewport.viewportWidth + TABLE_VIEWPORT_BORDER_CLIP_PADDING * 2, tableSkeleton.height + TABLE_VIEWPORT_BORDER_CLIP_PADDING * 2);
@@ -24445,13 +24664,13 @@ var Documents = class Documents extends DocComponent {
 		const tableX = this._drawLiquid.x + page.marginLeft;
 		const tableY = this._drawLiquid.y + page.marginTop;
 		for (const row of tableSkeleton.rows) row.cells.forEach((cell, index) => {
-			var _cellSource$backgroun, _backgrounds$get;
+			var _cellSource$backgroun;
 			if (cell.isMergedCellCovered) return;
 			const cellSource = row.rowSource.tableCells[index];
 			if (!cellSource || cellSource.rowSpan === 0 || cellSource.columnSpan === 0) return;
 			const color = (_cellSource$backgroun = cellSource.backgroundColor) === null || _cellSource$backgroun === void 0 ? void 0 : _cellSource$backgroun.rgb;
 			if (!color) return;
-			const rects = (_backgrounds$get = backgrounds.get(color)) !== null && _backgrounds$get !== void 0 ? _backgrounds$get : [];
+			const rects = backgrounds.get(color) ?? [];
 			rects.push({
 				x: tableX + cell.left,
 				y: tableY + row.top,
@@ -24486,11 +24705,11 @@ var Documents = class Documents extends DocComponent {
 		};
 	}
 	_getRenderUnitId() {
-		var _skeleton$getViewMode, _viewModel$getDataMod, _dataModel$getUnitId, _dataModel$getUnitId2;
+		var _skeleton$getViewMode, _viewModel$getDataMod, _dataModel$getUnitId;
 		const skeleton = this.getSkeleton();
 		const viewModel = skeleton === null || skeleton === void 0 || (_skeleton$getViewMode = skeleton.getViewModel) === null || _skeleton$getViewMode === void 0 ? void 0 : _skeleton$getViewMode.call(skeleton);
 		const dataModel = viewModel === null || viewModel === void 0 || (_viewModel$getDataMod = viewModel.getDataModel) === null || _viewModel$getDataMod === void 0 ? void 0 : _viewModel$getDataMod.call(viewModel);
-		return (_dataModel$getUnitId = dataModel === null || dataModel === void 0 || (_dataModel$getUnitId2 = dataModel.getUnitId) === null || _dataModel$getUnitId2 === void 0 ? void 0 : _dataModel$getUnitId2.call(dataModel)) !== null && _dataModel$getUnitId !== void 0 ? _dataModel$getUnitId : this.oKey;
+		return (dataModel === null || dataModel === void 0 || (_dataModel$getUnitId = dataModel.getUnitId) === null || _dataModel$getUnitId === void 0 ? void 0 : _dataModel$getUnitId.call(dataModel)) ?? this.oKey;
 	}
 	_getDocumentCompatibilityPolicy() {
 		var _skeleton$getViewMode2, _skeleton$getViewMode3;
@@ -24503,7 +24722,7 @@ var Documents = class Documents extends DocComponent {
 		if (!color || this._drawLiquid == null) return;
 		let { x, y } = this._drawLiquid;
 		const { marginLeft, marginTop } = page;
-		x += marginLeft + (left !== null && left !== void 0 ? left : 0);
+		x += marginLeft + (left ?? 0);
 		y -= line.marginTop;
 		y -= line.paddingTop;
 		y += marginTop + top;
@@ -24513,18 +24732,18 @@ var Documents = class Documents extends DocComponent {
 		ctx.restore();
 	}
 	_drawBorderBottom(ctx, page, line, width = page.pageWidth - page.marginLeft - page.marginRight, left = 0, top = 0) {
-		var _line$borderBottom$pa, _line$borderBottom, _border$width, _border$color$rgb;
+		var _line$borderBottom;
 		if (this._drawLiquid == null) return;
 		let { x, y } = this._drawLiquid;
 		const { marginLeft, marginTop } = page;
-		x += marginLeft + (left !== null && left !== void 0 ? left : 0);
+		x += marginLeft + (left ?? 0);
 		y -= line.marginTop;
 		y -= line.paddingTop;
-		y += marginTop + top + line.lineHeight - line.marginBottom + ((_line$borderBottom$pa = (_line$borderBottom = line.borderBottom) === null || _line$borderBottom === void 0 ? void 0 : _line$borderBottom.padding) !== null && _line$borderBottom$pa !== void 0 ? _line$borderBottom$pa : 0);
+		y += marginTop + top + line.lineHeight - line.marginBottom + (((_line$borderBottom = line.borderBottom) === null || _line$borderBottom === void 0 ? void 0 : _line$borderBottom.padding) ?? 0);
 		ctx.save();
 		const border = line.borderBottom;
-		ctx.setLineWidthByPrecision(Math.max(0, (_border$width = border === null || border === void 0 ? void 0 : border.width) !== null && _border$width !== void 0 ? _border$width : 1));
-		ctx.strokeStyle = (_border$color$rgb = border === null || border === void 0 ? void 0 : border.color.rgb) !== null && _border$color$rgb !== void 0 ? _border$color$rgb : "#CDD0D8";
+		ctx.setLineWidthByPrecision(Math.max(0, (border === null || border === void 0 ? void 0 : border.width) ?? 1));
+		ctx.strokeStyle = (border === null || border === void 0 ? void 0 : border.color.rgb) ?? "#CDD0D8";
 		setDocsBorderDash(ctx, border === null || border === void 0 ? void 0 : border.dashStyle);
 		drawLineByBorderType(ctx, "b", 0, {
 			startX: x,
@@ -24642,7 +24861,7 @@ var Documents = class Documents extends DocComponent {
 		ctx.restore();
 	}
 	_drawTableCellBordersAndBg(ctx, page, cell, drawBackground = true) {
-		var _rowSke$index, _cellSource$backgroun2;
+		var _cellSource$backgroun2;
 		const { marginLeft, marginTop } = page;
 		const { pageWidth, pageHeight } = cell;
 		const rowSke = cell.parent;
@@ -24651,7 +24870,7 @@ var Documents = class Documents extends DocComponent {
 		const cellSource = rowSke.rowSource.tableCells[index];
 		const tableSke = rowSke.parent;
 		const rowIndexInTable = tableSke === null || tableSke === void 0 ? void 0 : tableSke.rows.indexOf(rowSke);
-		const rowIndex = rowIndexInTable == null || rowIndexInTable < 0 ? (_rowSke$index = rowSke.index) !== null && _rowSke$index !== void 0 ? _rowSke$index : 0 : rowIndexInTable;
+		const rowIndex = rowIndexInTable == null || rowIndexInTable < 0 ? rowSke.index ?? 0 : rowIndexInTable;
 		if (!cellSource || cellSource.rowSpan === 0 || cellSource.columnSpan === 0) return;
 		if (this._drawLiquid == null) return;
 		let { x, y } = this._drawLiquid;
@@ -24677,8 +24896,7 @@ var Documents = class Documents extends DocComponent {
 		if (index <= 0) this._drawTableCellBorder(ctx, this._resolveTableCellBorder(cellSource.borderLeft), "l", position);
 	}
 	_getTableCellSource(row, column) {
-		var _row$rowSource$tableC;
-		return (_row$rowSource$tableC = row === null || row === void 0 ? void 0 : row.rowSource.tableCells[column]) !== null && _row$rowSource$tableC !== void 0 ? _row$rowSource$tableC : null;
+		return (row === null || row === void 0 ? void 0 : row.rowSource.tableCells[column]) ?? null;
 	}
 	_resolveTableCellBorder(primary, secondary) {
 		if (this._isDrawableTableCellBorder(primary)) return primary;
@@ -24687,17 +24905,17 @@ var Documents = class Documents extends DocComponent {
 		return DEFAULT_BORDER_COLOR;
 	}
 	_isDrawableTableCellBorder(border) {
-		var _border$width$v, _border$width2, _border$color$rgb2, _border$color;
+		var _border$width, _border$color;
 		if (!border) return false;
-		const lineWidth = (_border$width$v = (_border$width2 = border.width) === null || _border$width2 === void 0 ? void 0 : _border$width2.v) !== null && _border$width$v !== void 0 ? _border$width$v : 1;
-		const color = (_border$color$rgb2 = (_border$color = border.color) === null || _border$color === void 0 ? void 0 : _border$color.rgb) !== null && _border$color$rgb2 !== void 0 ? _border$color$rgb2 : DEFAULT_BORDER_COLOR.color.rgb;
+		const lineWidth = ((_border$width = border.width) === null || _border$width === void 0 ? void 0 : _border$width.v) ?? 1;
+		const color = ((_border$color = border.color) === null || _border$color === void 0 ? void 0 : _border$color.rgb) ?? DEFAULT_BORDER_COLOR.color.rgb;
 		return lineWidth > 0 && color !== "transparent";
 	}
 	_drawTableCellBorder(ctx, border, type, position) {
-		var _border$width$v2, _border$width3, _border$color$rgb3, _border$color2;
+		var _border$width2, _border$color2;
 		if (!border) return;
-		const lineWidth = (_border$width$v2 = (_border$width3 = border.width) === null || _border$width3 === void 0 ? void 0 : _border$width3.v) !== null && _border$width$v2 !== void 0 ? _border$width$v2 : 1;
-		const color = (_border$color$rgb3 = (_border$color2 = border.color) === null || _border$color2 === void 0 ? void 0 : _border$color2.rgb) !== null && _border$color$rgb3 !== void 0 ? _border$color$rgb3 : DEFAULT_BORDER_COLOR.color.rgb;
+		const lineWidth = ((_border$width2 = border.width) === null || _border$width2 === void 0 ? void 0 : _border$width2.v) ?? 1;
+		const color = ((_border$color2 = border.color) === null || _border$color2 === void 0 ? void 0 : _border$color2.rgb) ?? DEFAULT_BORDER_COLOR.color.rgb;
 		if (lineWidth <= 0 || color === "transparent") return;
 		ctx.save();
 		ctx.setLineWidthByPrecision(lineWidth);
@@ -24877,6 +25095,11 @@ function rectByPrecisionBounds(ctx, x, y, width, height) {
 //#endregion
 //#region src/components/sheets/spreadsheet.ts
 const OBJECT_KEY = "__SHEET_EXTENSION_FONT_DOCUMENT_INSTANCE__";
+const MERGE_REPAIR_CACHE_REFRESH_RATIO = .6;
+const CUSTOM_EXTENSION_KEY = "DefaultCustomExtension";
+const MARKER_EXTENSION_KEY = "DefaultMarkerExtension";
+const RANGE_PROTECTION_VIEW_EXTENSION_KEY = "RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY";
+const RANGE_PROTECTION_HIDDEN_EXTENSION_KEY = "RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY";
 function pushSparseCellRange(ranges, row, col) {
 	const last = ranges[ranges.length - 1];
 	if (last && last.startRow === row && last.endRow === row && last.endColumn + 1 === col) {
@@ -24892,7 +25115,7 @@ function pushSparseCellRange(ranges, row, col) {
 }
 function scanSparseExtensionFeatures(spreadsheetSkeleton, ranges) {
 	const { worksheet } = spreadsheetSkeleton;
-	if (!worksheet || !ranges.length || worksheet.getMergeData().length > 0) return null;
+	if (!worksheet || !ranges.length) return null;
 	const flags = {
 		hasCustomRender: false,
 		hasMarkers: false,
@@ -24906,8 +25129,7 @@ function scanSparseExtensionFeatures(spreadsheetSkeleton, ranges) {
 		for (let col = range.startColumn; col <= range.endColumn; col++) {
 			var _spreadsheetSkeleton$, _cell$customRender, _cell$selectionProtec;
 			if (!worksheet.getColVisible(col)) continue;
-			const cachedCell = (_spreadsheetSkeleton$ = spreadsheetSkeleton.stylesCache.fontMatrix.getValue(row, col)) === null || _spreadsheetSkeleton$ === void 0 ? void 0 : _spreadsheetSkeleton$.cellData;
-			const cell = cachedCell !== null && cachedCell !== void 0 ? cachedCell : worksheet.getCell(row, col);
+			const cell = ((_spreadsheetSkeleton$ = spreadsheetSkeleton.stylesCache.fontMatrix.getValue(row, col)) === null || _spreadsheetSkeleton$ === void 0 ? void 0 : _spreadsheetSkeleton$.cellData) ?? worksheet.getCell(row, col);
 			if (!cell) continue;
 			if ((_cell$customRender = cell.customRender) === null || _cell$customRender === void 0 ? void 0 : _cell$customRender.length) {
 				flags.hasCustomRender = true;
@@ -24928,20 +25150,20 @@ function scanSparseExtensionFeatures(spreadsheetSkeleton, ranges) {
 function shouldSkipSparseExtension(uKey, flags) {
 	if (!flags) return false;
 	switch (uKey) {
-		case "DefaultCustomExtension": return !flags.hasCustomRender;
-		case "DefaultMarkerExtension": return !flags.hasMarkers;
-		case "RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY":
-		case "RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY": return !flags.hasSelectionProtection;
+		case CUSTOM_EXTENSION_KEY: return !flags.hasCustomRender;
+		case MARKER_EXTENSION_KEY: return !flags.hasMarkers;
+		case RANGE_PROTECTION_VIEW_EXTENSION_KEY:
+		case RANGE_PROTECTION_HIDDEN_EXTENSION_KEY: return !flags.hasSelectionProtection;
 		default: return false;
 	}
 }
 function hasSparseExtension(extensions) {
 	return extensions.some((extension) => {
 		switch (extension.uKey) {
-			case "DefaultCustomExtension":
-			case "DefaultMarkerExtension":
-			case "RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY":
-			case "RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY": return true;
+			case CUSTOM_EXTENSION_KEY:
+			case MARKER_EXTENSION_KEY:
+			case RANGE_PROTECTION_VIEW_EXTENSION_KEY:
+			case RANGE_PROTECTION_HIDDEN_EXTENSION_KEY: return true;
 			default: return false;
 		}
 	});
@@ -24949,13 +25171,24 @@ function hasSparseExtension(extensions) {
 function getSparseExtensionDiffRanges(uKey, flags, diffRanges) {
 	if (!flags) return diffRanges;
 	switch (uKey) {
-		case "DefaultCustomExtension": return flags.customRenderRanges;
-		case "DefaultMarkerExtension": return flags.markerRanges;
-		case "RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY":
-		case "RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY": return flags.selectionProtectionRanges;
+		case CUSTOM_EXTENSION_KEY: return flags.customRenderRanges;
+		case MARKER_EXTENSION_KEY: return flags.markerRanges;
+		case RANGE_PROTECTION_VIEW_EXTENSION_KEY:
+		case RANGE_PROTECTION_HIDDEN_EXTENSION_KEY: return flags.selectionProtectionRanges;
 		default: return diffRanges;
 	}
 }
+function boundsOverlap(a, b) {
+	return a.left <= b.right && a.right >= b.left && a.top <= b.bottom && a.bottom >= b.top;
+}
+function getClippedBoundArea(bound, clipBound) {
+	return Math.max(0, Math.min(bound.right, clipBound.right) - Math.max(bound.left, clipBound.left)) * Math.max(0, Math.min(bound.bottom, clipBound.bottom) - Math.max(bound.top, clipBound.top));
+}
+function exceedsMergeRepairThreshold(cacheBound, repaintBounds, hasMergeRepair) {
+	if (!hasMergeRepair) return false;
+	const cacheArea = getClippedBoundArea(cacheBound, cacheBound);
+	return repaintBounds.reduce((area, repaintBound) => area + getClippedBoundArea(repaintBound.bound, cacheBound), 0) >= cacheArea * MERGE_REPAIR_CACHE_REFRESH_RATIO;
+}
 /**
 * Clip a blit source rectangle to the source canvas bounds and shrink the destination
 * rectangle proportionally, as required by the HTML spec:
@@ -25063,7 +25296,7 @@ var Spreadsheet = class extends SheetComponent {
 	* @param ctx
 	* @param viewportInfo
 	*/
-	draw(ctx, viewportInfo) {
+	draw(ctx, viewportInfo, isMergeRepair = false) {
 		var _viewportInfo$diffBou;
 		const spreadsheetSkeleton = this.getSkeleton();
 		if (!spreadsheetSkeleton) return;
@@ -25079,7 +25312,7 @@ var Spreadsheet = class extends SheetComponent {
 			endColumn: cacheRange.endColumn
 		})) : viewRanges;
 		const extensions = this.getExtensionsByOrder();
-		const sparseExtensionFeatures = !hasMergeData && hasSparseExtension(extensions) ? scanSparseExtensionFeatures(spreadsheetSkeleton, viewRanges) : null;
+		const sparseExtensionFeatures = !isMergeRepair && hasSparseExtension(extensions) ? scanSparseExtensionFeatures(spreadsheetSkeleton, viewRanges) : null;
 		const scene = this.getScene();
 		for (const extension of extensions) {
 			if (shouldSkipSparseExtension(extension.uKey, sparseExtensionFeatures)) continue;
@@ -25090,7 +25323,7 @@ var Spreadsheet = class extends SheetComponent {
 			extension.draw(ctx, parentScale, spreadsheetSkeleton, extensionDiffRanges, {
 				viewRanges: extensionViewRanges,
 				checkOutOfViewBound: true,
-				fontRenderRanges: extension === this._fontExtension ? spreadsheetSkeleton.incrementalFontRenderRanges : void 0,
+				fontRenderRanges: extension === this._fontExtension && !isMergeRepair ? spreadsheetSkeleton.incrementalFontRenderRanges : void 0,
 				hasMergeData,
 				viewportKey: viewportInfo.viewportKey,
 				viewBound: viewportInfo.cacheBound,
@@ -25101,13 +25334,11 @@ var Spreadsheet = class extends SheetComponent {
 		}
 	}
 	addRenderFrameTimeMetricToScene(timeKey, val, scene) {
-		var _scene;
-		scene = (_scene = scene) !== null && _scene !== void 0 ? _scene : this.getScene();
+		scene = scene ?? this.getScene();
 		scene.getEngine().renderFrameTimeMetric$.next([timeKey, val]);
 	}
 	addRenderTagToScene(renderKey, val, scene) {
-		var _scene2;
-		scene = (_scene2 = scene) !== null && _scene2 !== void 0 ? _scene2 : this.getScene();
+		scene = scene ?? this.getScene();
 		scene.getEngine().renderFrameTags$.next([renderKey, val]);
 	}
 	/**
@@ -25201,7 +25432,11 @@ var Spreadsheet = class extends SheetComponent {
 		const cachePixelRatio = cacheCanvas.getPixelRatio();
 		const isScrollJumpOutsideCache = Math.abs(diffX) * scaleX >= cacheCanvas.getWidth() * cachePixelRatio || Math.abs(diffY) * scaleY >= cacheCanvas.getHeight() * cachePixelRatio;
 		const hasMergeData = spreadsheetSkeleton.worksheet.getMergeData().length > 0;
-		const shouldRefreshCache = isDirty || isForceDirty || isScrollJumpOutsideCache || hasMergeData && (diffX !== 0 || diffY !== 0) || shouldCacheUpdate && diffX !== 0;
+		const isScrolling = diffX !== 0 || diffY !== 0;
+		const mergeRepairBounds = this._getMergeRepairBounds(spreadsheetSkeleton, viewportInfo, hasMergeData, isScrolling);
+		const repaintBounds = this._getRepaintBounds(viewportInfo, mergeRepairBounds);
+		const shouldRefreshForMergeRepairArea = exceedsMergeRepairThreshold(viewportInfo.cacheBound, repaintBounds, mergeRepairBounds.length > 0);
+		const shouldRefreshCache = isDirty || isForceDirty || isScrollJumpOutsideCache || shouldRefreshForMergeRepairArea || shouldCacheUpdate && diffX !== 0;
 		if (diffBounds.length === 0 || diffX === 0 && diffY === 0 || shouldRefreshCache) {
 			if (shouldRefreshCache) {
 				this.addRenderTagToScene("scrolling", false);
@@ -25229,7 +25464,7 @@ var Spreadsheet = class extends SheetComponent {
 				scaleY,
 				columnHeaderHeightAndMarginTop,
 				rowHeaderWidthAndMarginLeft
-			});
+			}, mergeRepairBounds);
 		}
 		const sourceLeft = bufferEdgeSizeX * Math.min(1, window.devicePixelRatio);
 		const sourceTop = bufferEdgeSizeY * Math.min(1, window.devicePixelRatio);
@@ -25239,9 +25474,52 @@ var Spreadsheet = class extends SheetComponent {
 		this._applyCache(cacheCanvas, mainCtx, sourceLeft, sourceTop, dw, dh, left, top, dw, dh);
 		cacheCtx.restore();
 	}
-	paintNewAreaForScrolling(viewportInfo, param) {
+	_getMergeRepairBounds(spreadsheetSkeleton, viewportInfo, hasMergeData, isScrolling) {
+		if (!hasMergeData || !isScrolling) return [];
+		const { columnWidthAccumulation, rowHeightAccumulation, rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = spreadsheetSkeleton;
+		const dirtyBounds = viewportInfo.shouldCacheUpdate ? viewportInfo.diffCacheBounds : viewportInfo.diffBounds;
+		const mergeBounds = [];
+		const visited = /* @__PURE__ */ new Set();
+		for (const dirtyBound of dirtyBounds) {
+			const range = spreadsheetSkeleton.getRangeByViewBound(dirtyBound);
+			const mergeRanges = spreadsheetSkeleton.worksheet.getMergedCellRange(range.startRow, range.startColumn, range.endRow, range.endColumn);
+			for (const mergeRange of mergeRanges) {
+				const key = `${mergeRange.startRow}:${mergeRange.startColumn}`;
+				if (visited.has(key)) continue;
+				visited.add(key);
+				mergeBounds.push({
+					left: (columnWidthAccumulation[mergeRange.startColumn - 1] ?? 0) + rowHeaderWidthAndMarginLeft,
+					top: (rowHeightAccumulation[mergeRange.startRow - 1] ?? 0) + columnHeaderHeightAndMarginTop,
+					right: columnWidthAccumulation[mergeRange.endColumn] + rowHeaderWidthAndMarginLeft,
+					bottom: rowHeightAccumulation[mergeRange.endRow] + columnHeaderHeightAndMarginTop
+				});
+			}
+		}
+		return mergeBounds;
+	}
+	_getRepaintBounds(viewportInfo, mergeRepairBounds) {
+		const repaintBounds = viewportInfo.shouldCacheUpdate ? viewportInfo.diffCacheBounds.map((bound) => ({
+			bound: { ...bound },
+			repairsMerge: false
+		})) : [];
+		for (const mergeRepairBound of mergeRepairBounds) {
+			const overlappingBound = repaintBounds.find(({ bound }) => boundsOverlap(bound, mergeRepairBound));
+			if (overlappingBound) {
+				overlappingBound.bound.left = Math.min(overlappingBound.bound.left, mergeRepairBound.left);
+				overlappingBound.bound.top = Math.min(overlappingBound.bound.top, mergeRepairBound.top);
+				overlappingBound.bound.right = Math.max(overlappingBound.bound.right, mergeRepairBound.right);
+				overlappingBound.bound.bottom = Math.max(overlappingBound.bound.bottom, mergeRepairBound.bottom);
+				overlappingBound.repairsMerge = true;
+			} else repaintBounds.push({
+				bound: { ...mergeRepairBound },
+				repairsMerge: true
+			});
+		}
+		return repaintBounds;
+	}
+	paintNewAreaForScrolling(viewportInfo, param, mergeRepairBounds = []) {
 		const { cacheCanvas, cacheCtx, mainCtx, topOrigin, leftOrigin, bufferEdgeX, bufferEdgeY, scaleX, scaleY, columnHeaderHeightAndMarginTop, rowHeaderWidthAndMarginLeft } = param;
-		const { shouldCacheUpdate, diffCacheBounds, diffX, diffY } = viewportInfo;
+		const { diffX, diffY } = viewportInfo;
 		cacheCtx.save();
 		cacheCtx.setTransform(1, 0, 0, 1, 0, 0);
 		cacheCtx.globalCompositeOperation = "copy";
@@ -25251,7 +25529,8 @@ var Spreadsheet = class extends SheetComponent {
 		const m = mainCtx.getTransform();
 		cacheCtx.setTransform(m.a, m.b, m.c, m.d, 0, 0);
 		cacheCtx.translateWithPrecision(m.e / m.a - leftOrigin + bufferEdgeX, m.f / m.d - topOrigin + bufferEdgeY);
-		if (shouldCacheUpdate) for (const diffBound of diffCacheBounds) {
+		const repaintBounds = this._getRepaintBounds(viewportInfo, mergeRepairBounds);
+		if (repaintBounds.length) for (const { bound: diffBound, repairsMerge } of repaintBounds) {
 			const { left: diffLeft, right: diffRight, bottom: diffBottom, top: diffTop } = diffBound;
 			const x = diffLeft - rowHeaderWidthAndMarginLeft;
 			const y = diffTop - columnHeaderHeightAndMarginTop;
@@ -25266,7 +25545,7 @@ var Spreadsheet = class extends SheetComponent {
 			this.draw(cacheCtx, {
 				...viewportInfo,
 				diffBounds: [diffBound]
-			});
+			}, repairsMerge);
 			cacheCtx.restore();
 		}
 		this._refreshIncrementalState = false;
@@ -25391,7 +25670,6 @@ var Spreadsheet = class extends SheetComponent {
 	* @param ctx
 	*/
 	_drawAuxiliary(ctx, hasMergeData = true) {
-		var _ref;
 		const spreadsheetSkeleton = this.getSkeleton();
 		if (spreadsheetSkeleton == null) return;
 		const { rowColumnSegment, overflowCache, showGridlines, gridlinesColor, worksheet } = spreadsheetSkeleton;
@@ -25401,7 +25679,7 @@ var Spreadsheet = class extends SheetComponent {
 		if (!rowHeightAccumulation || !columnWidthAccumulation || columnTotalWidth === void 0 || rowTotalHeight === void 0) return;
 		ctx.save();
 		ctx.setLineWidthByPrecision(1);
-		ctx.strokeStyle = (_ref = gridlinesColor !== null && gridlinesColor !== void 0 ? gridlinesColor : ctx.renderConfig.gridlinesColor) !== null && _ref !== void 0 ? _ref : getColor([
+		ctx.strokeStyle = gridlinesColor ?? ctx.renderConfig.gridlinesColor ?? getColor([
 			214,
 			216,
 			219
@@ -25483,12 +25761,11 @@ var Spreadsheet = class extends SheetComponent {
 	_clearRectangle(ctx, rowHeightAccumulation, columnWidthAccumulation, cellRanges) {
 		if (cellRanges == null) return;
 		for (const range of cellRanges) {
-			var _rowHeightAccumulatio, _rowHeightAccumulatio2, _columnWidthAccumulat, _columnWidthAccumulat2;
 			const { startRow, endRow, startColumn, endColumn } = range;
-			const startY = (_rowHeightAccumulatio = rowHeightAccumulation[startRow - 1]) !== null && _rowHeightAccumulatio !== void 0 ? _rowHeightAccumulatio : 0;
-			const endY = (_rowHeightAccumulatio2 = rowHeightAccumulation[endRow]) !== null && _rowHeightAccumulatio2 !== void 0 ? _rowHeightAccumulatio2 : rowHeightAccumulation[rowHeightAccumulation.length - 1];
-			const startX = (_columnWidthAccumulat = columnWidthAccumulation[startColumn - 1]) !== null && _columnWidthAccumulat !== void 0 ? _columnWidthAccumulat : 0;
-			const endX = (_columnWidthAccumulat2 = columnWidthAccumulation[endColumn]) !== null && _columnWidthAccumulat2 !== void 0 ? _columnWidthAccumulat2 : columnWidthAccumulation[columnWidthAccumulation.length - 1];
+			const startY = rowHeightAccumulation[startRow - 1] ?? 0;
+			const endY = rowHeightAccumulation[endRow] ?? rowHeightAccumulation[rowHeightAccumulation.length - 1];
+			const startX = columnWidthAccumulation[startColumn - 1] ?? 0;
+			const endX = columnWidthAccumulation[endColumn] ?? columnWidthAccumulation[columnWidthAccumulation.length - 1];
 			ctx.clearRectByPrecision(startX, startY, endX - startX, endY - startY);
 			ctx.beginPath();
 			ctx.moveToByPrecision(startX, startY);
@@ -25512,17 +25789,17 @@ var Spreadsheet = class extends SheetComponent {
 		const defaultBg = defaultBackgroundColor;
 		const defaultStripe = defaultStripeColor;
 		if (rowGaps) for (let r = rowStart; r <= rowEnd; r++) {
-			var _rowGaps$r$size, _rowGaps$r, _rowHeightAccumulatio3;
-			const gapSize = (_rowGaps$r$size = (_rowGaps$r = rowGaps[r]) === null || _rowGaps$r === void 0 ? void 0 : _rowGaps$r.size) !== null && _rowGaps$r$size !== void 0 ? _rowGaps$r$size : 0;
+			var _rowGaps$r;
+			const gapSize = ((_rowGaps$r = rowGaps[r]) === null || _rowGaps$r === void 0 ? void 0 : _rowGaps$r.size) ?? 0;
 			if (gapSize <= 0) continue;
-			const gapTop = (_rowHeightAccumulatio3 = rowHeightAccumulation[r - 1]) !== null && _rowHeightAccumulatio3 !== void 0 ? _rowHeightAccumulatio3 : 0;
+			const gapTop = rowHeightAccumulation[r - 1] ?? 0;
 			this._drawSingleGapRect(ctx, rowGaps[r], viewStartX, gapTop, viewEndX - viewStartX, gapSize, defaultBg, defaultStripe);
 		}
 		if (colGaps) for (let c = columnStart; c <= columnEnd; c++) {
-			var _colGaps$c$size, _colGaps$c, _columnWidthAccumulat3;
-			const gapSize = (_colGaps$c$size = (_colGaps$c = colGaps[c]) === null || _colGaps$c === void 0 ? void 0 : _colGaps$c.size) !== null && _colGaps$c$size !== void 0 ? _colGaps$c$size : 0;
+			var _colGaps$c;
+			const gapSize = ((_colGaps$c = colGaps[c]) === null || _colGaps$c === void 0 ? void 0 : _colGaps$c.size) ?? 0;
 			if (gapSize <= 0) continue;
-			const gapLeft = (_columnWidthAccumulat3 = columnWidthAccumulation[c - 1]) !== null && _columnWidthAccumulat3 !== void 0 ? _columnWidthAccumulat3 : 0;
+			const gapLeft = columnWidthAccumulation[c - 1] ?? 0;
 			this._drawSingleGapRect(ctx, colGaps[c], gapLeft, viewStartY, gapSize, viewEndY - viewStartY, defaultBg, defaultStripe);
 		}
 	}
@@ -25530,13 +25807,12 @@ var Spreadsheet = class extends SheetComponent {
 	* Render a single gap rectangle: clear gridlines, fill background, draw diagonal stripes.
 	*/
 	_drawSingleGapRect(ctx, gapItem, x, y, w, h, defaultBg, defaultStripe) {
-		var _gapItem$color, _gapItem$stripeColor;
 		ctx.clearRectByPrecision(x, y, w, h);
 		ctx.save();
-		ctx.fillStyle = (_gapItem$color = gapItem.color) !== null && _gapItem$color !== void 0 ? _gapItem$color : defaultBg;
+		ctx.fillStyle = gapItem.color ?? defaultBg;
 		ctx.fillRectByPrecision(x, y, w, h);
 		ctx.restore();
-		const stripeColor = (_gapItem$stripeColor = gapItem.stripeColor) !== null && _gapItem$stripeColor !== void 0 ? _gapItem$stripeColor : defaultStripe;
+		const stripeColor = gapItem.stripeColor ?? defaultStripe;
 		ctx.save();
 		ctx.beginPath();
 		ctx.rectByPrecision(x, y, w, h);
@@ -26268,12 +26544,12 @@ var DocBackground = class DocBackground extends DocComponent {
 		this.makeDirty(true);
 	}
 	draw(ctx, bounds) {
-		var _this$getSkeleton, _this$getSkeleton2, _this$_backgroundFill;
+		var _this$getSkeleton, _this$getSkeleton2;
 		const skeletonData = (_this$getSkeleton = this.getSkeleton()) === null || _this$getSkeleton === void 0 ? void 0 : _this$getSkeleton.getSkeletonData();
 		const docDataModel = (_this$getSkeleton2 = this.getSkeleton()) === null || _this$getSkeleton2 === void 0 ? void 0 : _this$getSkeleton2.getViewModel().getDataModel();
 		if (skeletonData == null || docDataModel == null) return;
 		const { documentFlavor, background } = docDataModel.getSnapshot().documentStyle;
-		const workspaceFill = (_this$_backgroundFill = this._backgroundFillColor) !== null && _this$_backgroundFill !== void 0 ? _this$_backgroundFill : documentFlavor === _univerjs_core.DocumentFlavor.MODERN ? PAGE_FILL_COLOR : DOCS_WORKSPACE_FILL_COLOR;
+		const workspaceFill = this._backgroundFillColor ?? (documentFlavor === _univerjs_core.DocumentFlavor.MODERN ? PAGE_FILL_COLOR : DOCS_WORKSPACE_FILL_COLOR);
 		this._drawWorkspaceBackground(ctx, workspaceFill, bounds);
 		if (documentFlavor === _univerjs_core.DocumentFlavor.MODERN) return;
 		this._drawLiquid.reset();
@@ -26281,7 +26557,6 @@ var DocBackground = class DocBackground extends DocComponent {
 		let pageTop = 0;
 		let pageLeft = 0;
 		for (let i = 0, len = pages.length; i < len; i++) {
-			var _this$_pageStrokeColo, _this$_pageFillColor, _this$_marginStrokeCo;
 			const page = pages[i];
 			if (this.isSkipByDiffBounds(page, pageTop, pageLeft, bounds)) {
 				const { x, y } = this._drawLiquid.translatePage(page, this.pageLayoutType, this.pageMarginLeft, this.pageMarginTop);
@@ -26293,15 +26568,15 @@ var DocBackground = class DocBackground extends DocComponent {
 			ctx.save();
 			ctx.translate(pageLeft - .5, pageTop - .5);
 			const backgroundOptions = {
-				width: pageWidth !== null && pageWidth !== void 0 ? pageWidth : width,
-				height: pageHeight !== null && pageHeight !== void 0 ? pageHeight : height,
+				width: pageWidth ?? width,
+				height: pageHeight ?? height,
 				strokeWidth: 1,
-				stroke: (_this$_pageStrokeColo = this._pageStrokeColor) !== null && _this$_pageStrokeColo !== void 0 ? _this$_pageStrokeColo : PAGE_STROKE_COLOR,
-				fill: (_this$_pageFillColor = this._pageFillColor) !== null && _this$_pageFillColor !== void 0 ? _this$_pageFillColor : PAGE_FILL_COLOR,
+				stroke: this._pageStrokeColor ?? PAGE_STROKE_COLOR,
+				fill: this._pageFillColor ?? PAGE_FILL_COLOR,
 				zIndex: 3
 			};
 			Rect.drawWith(ctx, backgroundOptions);
-			this._drawPageBackgroundImage(ctx, background === null || background === void 0 ? void 0 : background.source, pageWidth !== null && pageWidth !== void 0 ? pageWidth : width, pageHeight !== null && pageHeight !== void 0 ? pageHeight : height);
+			this._drawPageBackgroundImage(ctx, background === null || background === void 0 ? void 0 : background.source, pageWidth ?? width, pageHeight ?? height);
 			const IDENTIFIER_WIDTH = 15;
 			const marginIdentification = {
 				dataArray: [
@@ -26355,7 +26630,7 @@ var DocBackground = class DocBackground extends DocComponent {
 					}
 				],
 				strokeWidth: 1.5,
-				stroke: (_this$_marginStrokeCo = this._marginStrokeColor) !== null && _this$_marginStrokeCo !== void 0 ? _this$_marginStrokeCo : MARGIN_STROKE_COLOR
+				stroke: this._marginStrokeColor ?? MARGIN_STROKE_COLOR
 			};
 			Path.drawWith(ctx, marginIdentification);
 			ctx.restore();
@@ -26365,10 +26640,9 @@ var DocBackground = class DocBackground extends DocComponent {
 		}
 	}
 	_drawWorkspaceBackground(ctx, fill, bounds) {
-		var _bounds$cacheBound, _visibleBound$left, _visibleBound$top;
-		const visibleBound = (_bounds$cacheBound = bounds === null || bounds === void 0 ? void 0 : bounds.cacheBound) !== null && _bounds$cacheBound !== void 0 ? _bounds$cacheBound : bounds === null || bounds === void 0 ? void 0 : bounds.viewBound;
-		const left = (_visibleBound$left = visibleBound === null || visibleBound === void 0 ? void 0 : visibleBound.left) !== null && _visibleBound$left !== void 0 ? _visibleBound$left : 0;
-		const top = (_visibleBound$top = visibleBound === null || visibleBound === void 0 ? void 0 : visibleBound.top) !== null && _visibleBound$top !== void 0 ? _visibleBound$top : 0;
+		const visibleBound = (bounds === null || bounds === void 0 ? void 0 : bounds.cacheBound) ?? (bounds === null || bounds === void 0 ? void 0 : bounds.viewBound);
+		const left = (visibleBound === null || visibleBound === void 0 ? void 0 : visibleBound.left) ?? 0;
+		const top = (visibleBound === null || visibleBound === void 0 ? void 0 : visibleBound.top) ?? 0;
 		const width = visibleBound == null ? this.width : visibleBound.right - visibleBound.left;
 		const height = visibleBound == null ? this.height : visibleBound.bottom - visibleBound.top;
 		if (width <= 0 || height <= 0) return;
@@ -26499,13 +26773,13 @@ function measureDocumentNoWrapRunsWidth(dataStream, textRuns, fallbackTextStyle)
 	return Math.max(maxLineWidth, currentLineWidth);
 }
 function measureDocumentNoWrapTextRangeWidth(documentData, start, end) {
-	var _body$dataStream, _body$textRuns, _documentData$documen2;
+	var _documentData$documen2;
 	const body = documentData.body;
-	const dataStream = (_body$dataStream = body === null || body === void 0 ? void 0 : body.dataStream) !== null && _body$dataStream !== void 0 ? _body$dataStream : "";
+	const dataStream = (body === null || body === void 0 ? void 0 : body.dataStream) ?? "";
 	const rangeStart = Math.max(0, Math.min(dataStream.length, start));
 	const rangeEnd = Math.max(rangeStart, Math.min(dataStream.length, end));
 	const rangeText = dataStream.slice(rangeStart, rangeEnd);
-	const textRuns = ((_body$textRuns = body === null || body === void 0 ? void 0 : body.textRuns) !== null && _body$textRuns !== void 0 ? _body$textRuns : []).map((run) => {
+	const textRuns = ((body === null || body === void 0 ? void 0 : body.textRuns) ?? []).map((run) => {
 		const runStart = Math.max(rangeStart, run.st);
 		const runEnd = Math.min(rangeEnd, run.ed);
 		if (runEnd <= runStart) return null;
@@ -26533,9 +26807,9 @@ function measureDocumentNoWrapTextRangeWidth(documentData, start, end) {
 * details such as CJK-Latin spacing.
 */
 function measureDocumentNoWrapTextWidth(documentData) {
-	var _body$dataStream2, _documentData$documen4;
+	var _documentData$documen4;
 	const body = documentData === null || documentData === void 0 ? void 0 : documentData.body;
-	const dataStream = (_body$dataStream2 = body === null || body === void 0 ? void 0 : body.dataStream) !== null && _body$dataStream2 !== void 0 ? _body$dataStream2 : "";
+	const dataStream = (body === null || body === void 0 ? void 0 : body.dataStream) ?? "";
 	const textRuns = body === null || body === void 0 ? void 0 : body.textRuns;
 	if (textRuns === null || textRuns === void 0 ? void 0 : textRuns.length) {
 		var _documentData$documen3;
@@ -26545,13 +26819,52 @@ function measureDocumentNoWrapTextWidth(documentData) {
 	return Math.max(0, ...splitDocumentNoWrapMeasureLines(dataStream).map((line) => measureDocumentNoWrapLineByStyle(line, fallbackTextStyle)));
 }
 /**
+* Measures the widest line after applying the docs Unicode break policy
+* within a fixed-width host.
+*/
+function measureDocumentWrappedTextWidth(documentData, maxLineWidth) {
+	var _documentData$body;
+	const dataStream = (documentData === null || documentData === void 0 || (_documentData$body = documentData.body) === null || _documentData$body === void 0 ? void 0 : _documentData$body.dataStream) ?? "";
+	if (!documentData || !dataStream || !Number.isFinite(maxLineWidth) || maxLineWidth <= 0) return 0;
+	const breaker = new LineBreaker(dataStream);
+	let lineStart = 0;
+	let lastFittingEnd = 0;
+	let widestLine = 0;
+	let breakPoint = breaker.nextBreakPoint();
+	while (breakPoint) {
+		const candidateEnd = breakPoint.position;
+		const candidateWidth = measureDocumentNoWrapTextRangeWidth(documentData, lineStart, candidateEnd);
+		if (candidateWidth <= maxLineWidth) {
+			lastFittingEnd = candidateEnd;
+			if (breakPoint.type === "Mandatory") {
+				widestLine = Math.max(widestLine, candidateWidth);
+				lineStart = candidateEnd;
+				lastFittingEnd = candidateEnd;
+			}
+			breakPoint = breaker.nextBreakPoint();
+			continue;
+		}
+		if (lastFittingEnd > lineStart) {
+			widestLine = Math.max(widestLine, measureDocumentNoWrapTextRangeWidth(documentData, lineStart, lastFittingEnd));
+			lineStart = lastFittingEnd;
+			continue;
+		}
+		widestLine = Math.max(widestLine, maxLineWidth);
+		lineStart = candidateEnd;
+		lastFittingEnd = candidateEnd;
+		breakPoint = breaker.nextBreakPoint();
+	}
+	if (lineStart < dataStream.length) widestLine = Math.max(widestLine, Math.min(maxLineWidth, measureDocumentNoWrapTextRangeWidth(documentData, lineStart, dataStream.length)));
+	return widestLine;
+}
+/**
 * Measures the widest segment that docs line breaking keeps together. This is
 * useful when a host may wrap normally but still needs enough width to avoid
 * clipping an individual word, CJK glyph, or punctuation segment.
 */
 function measureDocumentUnbreakableTextWidth(documentData) {
-	var _documentData$body$da, _documentData$body;
-	const dataStream = (_documentData$body$da = documentData === null || documentData === void 0 || (_documentData$body = documentData.body) === null || _documentData$body === void 0 ? void 0 : _documentData$body.dataStream) !== null && _documentData$body$da !== void 0 ? _documentData$body$da : "";
+	var _documentData$body2;
+	const dataStream = (documentData === null || documentData === void 0 || (_documentData$body2 = documentData.body) === null || _documentData$body2 === void 0 ? void 0 : _documentData$body2.dataStream) ?? "";
 	if (!documentData || !dataStream) return 0;
 	const breaker = new LineBreaker(dataStream);
 	let start = 0;
@@ -27096,9 +27409,8 @@ let CanvasColorService = class CanvasColorService extends _univerjs_core.Disposa
 };
 CanvasColorService = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_core.ThemeService))], CanvasColorService);
 function getDarkRenderColorOverride(color) {
-	var _DARK_RENDER_COLOR_OV;
 	const normalized = normalizeRenderColor(color);
-	return (_DARK_RENDER_COLOR_OV = DARK_RENDER_COLOR_OVERRIDES[normalized]) !== null && _DARK_RENDER_COLOR_OV !== void 0 ? _DARK_RENDER_COLOR_OV : null;
+	return DARK_RENDER_COLOR_OVERRIDES[normalized] ?? null;
 }
 function normalizeRenderColor(color) {
 	const trimmed = color.trim().toLowerCase();
@@ -27227,7 +27539,7 @@ let Engine = class Engine extends _univerjs_core.Disposable {
 			if (this._renderFrameTasks.length > 0) this._requestNewFrameHandler = requestNewFrame(this._renderFunction);
 			else this._renderingQueueLaunched = false;
 		});
-		this._unitId = unitId !== null && unitId !== void 0 ? unitId : "";
+		this._unitId = unitId ?? "";
 		const options = Object.assign({}, {
 			elementHeight: 1,
 			elementWidth: 1,
@@ -27769,7 +28081,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "1.0.0-alpha.8";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -27945,13 +28257,12 @@ var InputManager = class InputManager extends _univerjs_core.Disposable {
 		if (!(currentObject === null || currentObject === void 0 ? void 0 : currentObject.triggerDrop(evt)) && this._shouldDispatchEventToScene(currentObject)) this._scene.onDrop$.emitEvent(evt);
 	}
 	attachControl(options) {
-		var _options$enableDown, _options$enableUp, _options$enableMove, _options$enableWheel, _options$enableEnter, _options$enableLeave;
-		const enableDown = (_options$enableDown = options === null || options === void 0 ? void 0 : options.enableDown) !== null && _options$enableDown !== void 0 ? _options$enableDown : true;
-		const enableUp = (_options$enableUp = options === null || options === void 0 ? void 0 : options.enableUp) !== null && _options$enableUp !== void 0 ? _options$enableUp : true;
-		const enableMove = (_options$enableMove = options === null || options === void 0 ? void 0 : options.enableMove) !== null && _options$enableMove !== void 0 ? _options$enableMove : true;
-		const enableWheel = (_options$enableWheel = options === null || options === void 0 ? void 0 : options.enableWheel) !== null && _options$enableWheel !== void 0 ? _options$enableWheel : true;
-		const enableEnter = (_options$enableEnter = options === null || options === void 0 ? void 0 : options.enableEnter) !== null && _options$enableEnter !== void 0 ? _options$enableEnter : true;
-		const enableLeave = (_options$enableLeave = options === null || options === void 0 ? void 0 : options.enableLeave) !== null && _options$enableLeave !== void 0 ? _options$enableLeave : true;
+		const enableDown = (options === null || options === void 0 ? void 0 : options.enableDown) ?? true;
+		const enableUp = (options === null || options === void 0 ? void 0 : options.enableUp) ?? true;
+		const enableMove = (options === null || options === void 0 ? void 0 : options.enableMove) ?? true;
+		const enableWheel = (options === null || options === void 0 ? void 0 : options.enableWheel) ?? true;
+		const enableEnter = (options === null || options === void 0 ? void 0 : options.enableEnter) ?? true;
+		const enableLeave = (options === null || options === void 0 ? void 0 : options.enableLeave) ?? true;
 		const engine = this._scene.getEngine();
 		if (!engine) return;
 		this._onInput$ = engine.onInputChanged$.subscribeEvent((eventData) => {
@@ -28432,53 +28743,52 @@ var Transformer = class extends _univerjs_core.Disposable {
 		const objectTransformerConfig = applyObject.transformerConfig;
 		let { isCropper, hoverEnabled, hoverEnterFunc, hoverLeaveFunc, resizeEnabled, rotateEnabled, rotationSnaps, rotationSnapTolerance, rotateAnchorOffset, rotateAnchorPosition, rotateLineEnabled, rotateSize, rotateCornerRadius, rotateFill, rotateStroke, rotateStrokeWidth, rotateIconEnabled, rotateIconStroke, rotateIconStrokeWidth, borderEnabled, borderStroke, borderStrokeWidth, borderDash, borderSpacing, anchorFill, anchorStroke, anchorStrokeWidth, anchorSize, anchorCornerRadius, anchorStyle, anchorSideLongSize, anchorSideShortSize, anchorSideCornerRadius, anchorShadowColor, anchorShadowBlur, anchorShadowOffsetX, anchorShadowOffsetY, keepRatio, centeredScaling, enabledAnchors, flipEnabled, ignoreStroke, boundBoxFunc, useSingleNodeRotation, shouldOverdrawWholeArea, moveBoundaryEnabled } = this;
 		if (objectTransformerConfig != null) {
-			var _objectTransformerCon, _objectTransformerCon2, _objectTransformerCon3, _objectTransformerCon4, _objectTransformerCon5, _objectTransformerCon6, _objectTransformerCon7, _objectTransformerCon8, _objectTransformerCon9, _objectTransformerCon10, _objectTransformerCon11, _objectTransformerCon12, _objectTransformerCon13, _objectTransformerCon14, _objectTransformerCon15, _objectTransformerCon16, _objectTransformerCon17, _objectTransformerCon18, _objectTransformerCon19, _objectTransformerCon20, _objectTransformerCon21, _objectTransformerCon22, _objectTransformerCon23, _objectTransformerCon24, _objectTransformerCon25, _objectTransformerCon26, _objectTransformerCon27, _objectTransformerCon28, _objectTransformerCon29, _objectTransformerCon30, _objectTransformerCon31, _objectTransformerCon32, _objectTransformerCon33, _objectTransformerCon34, _objectTransformerCon35, _objectTransformerCon36, _objectTransformerCon37, _objectTransformerCon38, _objectTransformerCon39, _objectTransformerCon40, _objectTransformerCon41, _objectTransformerCon42, _objectTransformerCon43, _objectTransformerCon44, _objectTransformerCon45, _objectTransformerCon46;
-			isCropper = (_objectTransformerCon = objectTransformerConfig.isCropper) !== null && _objectTransformerCon !== void 0 ? _objectTransformerCon : isCropper;
-			hoverEnabled = (_objectTransformerCon2 = objectTransformerConfig.hoverEnabled) !== null && _objectTransformerCon2 !== void 0 ? _objectTransformerCon2 : hoverEnabled;
-			hoverEnterFunc = (_objectTransformerCon3 = objectTransformerConfig.hoverEnterFunc) !== null && _objectTransformerCon3 !== void 0 ? _objectTransformerCon3 : hoverEnterFunc;
-			hoverLeaveFunc = (_objectTransformerCon4 = objectTransformerConfig.hoverLeaveFunc) !== null && _objectTransformerCon4 !== void 0 ? _objectTransformerCon4 : hoverLeaveFunc;
-			resizeEnabled = (_objectTransformerCon5 = objectTransformerConfig.resizeEnabled) !== null && _objectTransformerCon5 !== void 0 ? _objectTransformerCon5 : resizeEnabled;
-			rotateEnabled = (_objectTransformerCon6 = objectTransformerConfig.rotateEnabled) !== null && _objectTransformerCon6 !== void 0 ? _objectTransformerCon6 : rotateEnabled;
-			rotationSnaps = (_objectTransformerCon7 = objectTransformerConfig.rotationSnaps) !== null && _objectTransformerCon7 !== void 0 ? _objectTransformerCon7 : rotationSnaps;
-			rotationSnapTolerance = (_objectTransformerCon8 = objectTransformerConfig.rotationSnapTolerance) !== null && _objectTransformerCon8 !== void 0 ? _objectTransformerCon8 : rotationSnapTolerance;
-			rotateAnchorOffset = (_objectTransformerCon9 = objectTransformerConfig.rotateAnchorOffset) !== null && _objectTransformerCon9 !== void 0 ? _objectTransformerCon9 : rotateAnchorOffset;
-			rotateAnchorPosition = (_objectTransformerCon10 = objectTransformerConfig.rotateAnchorPosition) !== null && _objectTransformerCon10 !== void 0 ? _objectTransformerCon10 : rotateAnchorPosition;
-			rotateLineEnabled = (_objectTransformerCon11 = objectTransformerConfig.rotateLineEnabled) !== null && _objectTransformerCon11 !== void 0 ? _objectTransformerCon11 : rotateLineEnabled;
-			rotateSize = (_objectTransformerCon12 = objectTransformerConfig.rotateSize) !== null && _objectTransformerCon12 !== void 0 ? _objectTransformerCon12 : rotateSize;
-			rotateCornerRadius = (_objectTransformerCon13 = objectTransformerConfig.rotateCornerRadius) !== null && _objectTransformerCon13 !== void 0 ? _objectTransformerCon13 : rotateCornerRadius;
-			rotateFill = (_objectTransformerCon14 = objectTransformerConfig.rotateFill) !== null && _objectTransformerCon14 !== void 0 ? _objectTransformerCon14 : rotateFill;
-			rotateStroke = (_objectTransformerCon15 = objectTransformerConfig.rotateStroke) !== null && _objectTransformerCon15 !== void 0 ? _objectTransformerCon15 : rotateStroke;
-			rotateStrokeWidth = (_objectTransformerCon16 = objectTransformerConfig.rotateStrokeWidth) !== null && _objectTransformerCon16 !== void 0 ? _objectTransformerCon16 : rotateStrokeWidth;
-			rotateIconEnabled = (_objectTransformerCon17 = objectTransformerConfig.rotateIconEnabled) !== null && _objectTransformerCon17 !== void 0 ? _objectTransformerCon17 : rotateIconEnabled;
-			rotateIconStroke = (_objectTransformerCon18 = objectTransformerConfig.rotateIconStroke) !== null && _objectTransformerCon18 !== void 0 ? _objectTransformerCon18 : rotateIconStroke;
-			rotateIconStrokeWidth = (_objectTransformerCon19 = objectTransformerConfig.rotateIconStrokeWidth) !== null && _objectTransformerCon19 !== void 0 ? _objectTransformerCon19 : rotateIconStrokeWidth;
-			borderEnabled = (_objectTransformerCon20 = objectTransformerConfig.borderEnabled) !== null && _objectTransformerCon20 !== void 0 ? _objectTransformerCon20 : borderEnabled;
-			borderStroke = (_objectTransformerCon21 = objectTransformerConfig.borderStroke) !== null && _objectTransformerCon21 !== void 0 ? _objectTransformerCon21 : borderStroke;
-			borderStrokeWidth = (_objectTransformerCon22 = objectTransformerConfig.borderStrokeWidth) !== null && _objectTransformerCon22 !== void 0 ? _objectTransformerCon22 : borderStrokeWidth;
-			borderDash = (_objectTransformerCon23 = objectTransformerConfig.borderDash) !== null && _objectTransformerCon23 !== void 0 ? _objectTransformerCon23 : borderDash;
-			borderSpacing = (_objectTransformerCon24 = objectTransformerConfig.borderSpacing) !== null && _objectTransformerCon24 !== void 0 ? _objectTransformerCon24 : borderSpacing;
-			anchorFill = (_objectTransformerCon25 = objectTransformerConfig.anchorFill) !== null && _objectTransformerCon25 !== void 0 ? _objectTransformerCon25 : anchorFill;
-			anchorStroke = (_objectTransformerCon26 = objectTransformerConfig.anchorStroke) !== null && _objectTransformerCon26 !== void 0 ? _objectTransformerCon26 : anchorStroke;
-			anchorStrokeWidth = (_objectTransformerCon27 = objectTransformerConfig.anchorStrokeWidth) !== null && _objectTransformerCon27 !== void 0 ? _objectTransformerCon27 : anchorStrokeWidth;
-			anchorSize = (_objectTransformerCon28 = objectTransformerConfig.anchorSize) !== null && _objectTransformerCon28 !== void 0 ? _objectTransformerCon28 : anchorSize;
-			anchorCornerRadius = (_objectTransformerCon29 = objectTransformerConfig.anchorCornerRadius) !== null && _objectTransformerCon29 !== void 0 ? _objectTransformerCon29 : anchorCornerRadius;
-			anchorStyle = (_objectTransformerCon30 = objectTransformerConfig.anchorStyle) !== null && _objectTransformerCon30 !== void 0 ? _objectTransformerCon30 : anchorStyle;
-			anchorSideLongSize = (_objectTransformerCon31 = objectTransformerConfig.anchorSideLongSize) !== null && _objectTransformerCon31 !== void 0 ? _objectTransformerCon31 : anchorSideLongSize;
-			anchorSideShortSize = (_objectTransformerCon32 = objectTransformerConfig.anchorSideShortSize) !== null && _objectTransformerCon32 !== void 0 ? _objectTransformerCon32 : anchorSideShortSize;
-			anchorSideCornerRadius = (_objectTransformerCon33 = objectTransformerConfig.anchorSideCornerRadius) !== null && _objectTransformerCon33 !== void 0 ? _objectTransformerCon33 : anchorSideCornerRadius;
-			anchorShadowColor = (_objectTransformerCon34 = objectTransformerConfig.anchorShadowColor) !== null && _objectTransformerCon34 !== void 0 ? _objectTransformerCon34 : anchorShadowColor;
-			anchorShadowBlur = (_objectTransformerCon35 = objectTransformerConfig.anchorShadowBlur) !== null && _objectTransformerCon35 !== void 0 ? _objectTransformerCon35 : anchorShadowBlur;
-			anchorShadowOffsetX = (_objectTransformerCon36 = objectTransformerConfig.anchorShadowOffsetX) !== null && _objectTransformerCon36 !== void 0 ? _objectTransformerCon36 : anchorShadowOffsetX;
-			anchorShadowOffsetY = (_objectTransformerCon37 = objectTransformerConfig.anchorShadowOffsetY) !== null && _objectTransformerCon37 !== void 0 ? _objectTransformerCon37 : anchorShadowOffsetY;
-			keepRatio = (_objectTransformerCon38 = objectTransformerConfig.keepRatio) !== null && _objectTransformerCon38 !== void 0 ? _objectTransformerCon38 : keepRatio;
-			centeredScaling = (_objectTransformerCon39 = objectTransformerConfig.centeredScaling) !== null && _objectTransformerCon39 !== void 0 ? _objectTransformerCon39 : centeredScaling;
-			enabledAnchors = (_objectTransformerCon40 = objectTransformerConfig.enabledAnchors) !== null && _objectTransformerCon40 !== void 0 ? _objectTransformerCon40 : enabledAnchors;
-			flipEnabled = (_objectTransformerCon41 = objectTransformerConfig.flipEnabled) !== null && _objectTransformerCon41 !== void 0 ? _objectTransformerCon41 : flipEnabled;
-			ignoreStroke = (_objectTransformerCon42 = objectTransformerConfig.ignoreStroke) !== null && _objectTransformerCon42 !== void 0 ? _objectTransformerCon42 : ignoreStroke;
-			boundBoxFunc = (_objectTransformerCon43 = objectTransformerConfig.boundBoxFunc) !== null && _objectTransformerCon43 !== void 0 ? _objectTransformerCon43 : boundBoxFunc;
-			useSingleNodeRotation = (_objectTransformerCon44 = objectTransformerConfig.useSingleNodeRotation) !== null && _objectTransformerCon44 !== void 0 ? _objectTransformerCon44 : useSingleNodeRotation;
-			shouldOverdrawWholeArea = (_objectTransformerCon45 = objectTransformerConfig.shouldOverdrawWholeArea) !== null && _objectTransformerCon45 !== void 0 ? _objectTransformerCon45 : shouldOverdrawWholeArea;
-			moveBoundaryEnabled = (_objectTransformerCon46 = objectTransformerConfig.moveBoundaryEnabled) !== null && _objectTransformerCon46 !== void 0 ? _objectTransformerCon46 : moveBoundaryEnabled;
+			isCropper = objectTransformerConfig.isCropper ?? isCropper;
+			hoverEnabled = objectTransformerConfig.hoverEnabled ?? hoverEnabled;
+			hoverEnterFunc = objectTransformerConfig.hoverEnterFunc ?? hoverEnterFunc;
+			hoverLeaveFunc = objectTransformerConfig.hoverLeaveFunc ?? hoverLeaveFunc;
+			resizeEnabled = objectTransformerConfig.resizeEnabled ?? resizeEnabled;
+			rotateEnabled = objectTransformerConfig.rotateEnabled ?? rotateEnabled;
+			rotationSnaps = objectTransformerConfig.rotationSnaps ?? rotationSnaps;
+			rotationSnapTolerance = objectTransformerConfig.rotationSnapTolerance ?? rotationSnapTolerance;
+			rotateAnchorOffset = objectTransformerConfig.rotateAnchorOffset ?? rotateAnchorOffset;
+			rotateAnchorPosition = objectTransformerConfig.rotateAnchorPosition ?? rotateAnchorPosition;
+			rotateLineEnabled = objectTransformerConfig.rotateLineEnabled ?? rotateLineEnabled;
+			rotateSize = objectTransformerConfig.rotateSize ?? rotateSize;
+			rotateCornerRadius = objectTransformerConfig.rotateCornerRadius ?? rotateCornerRadius;
+			rotateFill = objectTransformerConfig.rotateFill ?? rotateFill;
+			rotateStroke = objectTransformerConfig.rotateStroke ?? rotateStroke;
+			rotateStrokeWidth = objectTransformerConfig.rotateStrokeWidth ?? rotateStrokeWidth;
+			rotateIconEnabled = objectTransformerConfig.rotateIconEnabled ?? rotateIconEnabled;
+			rotateIconStroke = objectTransformerConfig.rotateIconStroke ?? rotateIconStroke;
+			rotateIconStrokeWidth = objectTransformerConfig.rotateIconStrokeWidth ?? rotateIconStrokeWidth;
+			borderEnabled = objectTransformerConfig.borderEnabled ?? borderEnabled;
+			borderStroke = objectTransformerConfig.borderStroke ?? borderStroke;
+			borderStrokeWidth = objectTransformerConfig.borderStrokeWidth ?? borderStrokeWidth;
+			borderDash = objectTransformerConfig.borderDash ?? borderDash;
+			borderSpacing = objectTransformerConfig.borderSpacing ?? borderSpacing;
+			anchorFill = objectTransformerConfig.anchorFill ?? anchorFill;
+			anchorStroke = objectTransformerConfig.anchorStroke ?? anchorStroke;
+			anchorStrokeWidth = objectTransformerConfig.anchorStrokeWidth ?? anchorStrokeWidth;
+			anchorSize = objectTransformerConfig.anchorSize ?? anchorSize;
+			anchorCornerRadius = objectTransformerConfig.anchorCornerRadius ?? anchorCornerRadius;
+			anchorStyle = objectTransformerConfig.anchorStyle ?? anchorStyle;
+			anchorSideLongSize = objectTransformerConfig.anchorSideLongSize ?? anchorSideLongSize;
+			anchorSideShortSize = objectTransformerConfig.anchorSideShortSize ?? anchorSideShortSize;
+			anchorSideCornerRadius = objectTransformerConfig.anchorSideCornerRadius ?? anchorSideCornerRadius;
+			anchorShadowColor = objectTransformerConfig.anchorShadowColor ?? anchorShadowColor;
+			anchorShadowBlur = objectTransformerConfig.anchorShadowBlur ?? anchorShadowBlur;
+			anchorShadowOffsetX = objectTransformerConfig.anchorShadowOffsetX ?? anchorShadowOffsetX;
+			anchorShadowOffsetY = objectTransformerConfig.anchorShadowOffsetY ?? anchorShadowOffsetY;
+			keepRatio = objectTransformerConfig.keepRatio ?? keepRatio;
+			centeredScaling = objectTransformerConfig.centeredScaling ?? centeredScaling;
+			enabledAnchors = objectTransformerConfig.enabledAnchors ?? enabledAnchors;
+			flipEnabled = objectTransformerConfig.flipEnabled ?? flipEnabled;
+			ignoreStroke = objectTransformerConfig.ignoreStroke ?? ignoreStroke;
+			boundBoxFunc = objectTransformerConfig.boundBoxFunc ?? boundBoxFunc;
+			useSingleNodeRotation = objectTransformerConfig.useSingleNodeRotation ?? useSingleNodeRotation;
+			shouldOverdrawWholeArea = objectTransformerConfig.shouldOverdrawWholeArea ?? shouldOverdrawWholeArea;
+			moveBoundaryEnabled = objectTransformerConfig.moveBoundaryEnabled ?? moveBoundaryEnabled;
 		}
 		return {
 			isCropper,
@@ -29163,7 +29473,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 			width: iconSize,
 			height: iconSize,
 			fill: null,
-			stroke: rotateIconStroke !== null && rotateIconStroke !== void 0 ? rotateIconStroke : borderStroke,
+			stroke: rotateIconStroke ?? borderStroke,
 			strokeWidth: rotateIconStrokeWidth,
 			strokeLineCap: "round",
 			strokeLineJoin: "round"
@@ -29578,7 +29888,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 					endY: lineTop + rotateAnchorOffset,
 					strokeWidth: borderStrokeWidth,
 					strokeLineCap: "butt",
-					stroke: rotateStroke !== null && rotateStroke !== void 0 ? rotateStroke : borderStroke
+					stroke: rotateStroke ?? borderStroke
 				});
 				const { left: rotateLeft, top: rotateTop } = this._getRotateAnchorPosition("__SpreadsheetTransformerRotate__", height, width, applyObject);
 				const cursor = this._getRotateAnchorCursor("__SpreadsheetTransformerRotate__");
@@ -29590,8 +29900,8 @@ var Transformer = class extends _univerjs_core.Disposable {
 					width: rotateSize,
 					radius: rotateCornerRadius,
 					fill: rotateFill,
-					strokeWidth: rotateStrokeWidth !== null && rotateStrokeWidth !== void 0 ? rotateStrokeWidth : borderStrokeWidth * 2,
-					stroke: rotateStroke !== null && rotateStroke !== void 0 ? rotateStroke : borderStroke,
+					strokeWidth: rotateStrokeWidth ?? borderStrokeWidth * 2,
+					stroke: rotateStroke ?? borderStroke,
 					shadowColor: anchorShadowColor,
 					shadowBlur: anchorShadowBlur,
 					shadowOffsetX: anchorShadowOffsetX,
@@ -30555,7 +30865,7 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 		return this._renderContext.components;
 	}
 	constructor(init, parentInjector) {
-		var _init$createUnitOptio, _init$createUnitOptio2, _init$createUnitOptio3;
+		var _init$createUnitOptio, _init$createUnitOptio2;
 		super();
 		_defineProperty(this, "isRenderUnit", true);
 		_defineProperty(this, "_activated$", new rxjs.BehaviorSubject(true));
@@ -30563,7 +30873,7 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 		_defineProperty(this, "_injector", void 0);
 		_defineProperty(this, "_renderContext", void 0);
 		_defineProperty(this, "_dependencyService", void 0);
-		const renderParentInjector = (_init$createUnitOptio = (_init$createUnitOptio2 = init.createUnitOptions) === null || _init$createUnitOptio2 === void 0 ? void 0 : _init$createUnitOptio2.renderParentInjector) !== null && _init$createUnitOptio !== void 0 ? _init$createUnitOptio : parentInjector;
+		const renderParentInjector = ((_init$createUnitOptio = init.createUnitOptions) === null || _init$createUnitOptio === void 0 ? void 0 : _init$createUnitOptio.renderParentInjector) ?? parentInjector;
 		this._injector = renderParentInjector.createChild();
 		this._dependencyService = new RenderUnitDependencyService(this._injector, () => this._renderContext);
 		this._renderContext = {
@@ -30579,7 +30889,7 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 			activate: () => this._activated$.next(true),
 			deactivate: () => this._activated$.next(false)
 		};
-		if (((_init$createUnitOptio3 = init.createUnitOptions) === null || _init$createUnitOptio3 === void 0 ? void 0 : _init$createUnitOptio3.makeCurrent) === false) this.deactivate();
+		if (((_init$createUnitOptio2 = init.createUnitOptions) === null || _init$createUnitOptio2 === void 0 ? void 0 : _init$createUnitOptio2.makeCurrent) === false) this.deactivate();
 	}
 	dispose() {
 		if (this._disposed) return;
@@ -30639,8 +30949,7 @@ var RenderUnitDependencyService = class {
 		dependencies.forEach((dependency) => {
 			const parsed = this._parseDependency(dependency);
 			const key = getRenderDependencyIdentifierKey$1(parsed.identifier);
-			const existing = this._records.get(key);
-			const record = existing !== null && existing !== void 0 ? existing : this._addRecord(key, parsed.identifier, parsed.create);
+			const record = this._records.get(key) ?? this._addRecord(key, parsed.identifier, parsed.create);
 			if (seen.has(record.key)) return;
 			seen.add(record.key);
 			records.push(record);
@@ -30769,8 +31078,7 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 	* @returns Dependency[]
 	*/
 	_getRenderDepsByType(type) {
-		var _this$_renderDependen;
-		return Array.from((_this$_renderDependen = this._renderDependencies.get(type)) !== null && _this$_renderDependen !== void 0 ? _this$_renderDependen : []);
+		return Array.from(this._renderDependencies.get(type) ?? []);
 	}
 	_initDarkModeListener() {
 		this.disposeWithMe(this._themeService.darkMode$.subscribe(() => {
@@ -30788,8 +31096,7 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 	* @returns renderUnit:IRender
 	*/
 	createRender(unitId, createUnitOptions) {
-		var _createUnitOptions$re;
-		const parentInjector = (_createUnitOptions$re = createUnitOptions === null || createUnitOptions === void 0 ? void 0 : createUnitOptions.renderParentInjector) !== null && _createUnitOptions$re !== void 0 ? _createUnitOptions$re : this._injector;
+		const parentInjector = (createUnitOptions === null || createUnitOptions === void 0 ? void 0 : createUnitOptions.renderParentInjector) ?? this._injector;
 		const renderer = this._createRender(unitId, parentInjector.createInstance(Engine, unitId, void 0), (createUnitOptions === null || createUnitOptions === void 0 ? void 0 : createUnitOptions.embeddedRender) !== true, createUnitOptions, parentInjector);
 		this._renderCreated$.next(renderer);
 		return renderer;
@@ -31687,18 +31994,18 @@ var Viewport = class {
 		this._scene.removeViewport(this._viewportKey);
 	}
 	limitedScroll(scrollX, scrollY) {
-		var _scrollX, _scrollY, _this$_scrollBar2, _this$_scrollBar3;
+		var _this$_scrollBar2, _this$_scrollBar3;
 		if (!this._scrollBar) return {
 			scrollX: 0,
 			scrollY: 0,
 			isLimitedX: false,
 			isLimitedY: false
 		};
-		scrollX = (_scrollX = scrollX) !== null && _scrollX !== void 0 ? _scrollX : this.scrollX;
-		scrollY = (_scrollY = scrollY) !== null && _scrollY !== void 0 ? _scrollY : this.scrollY;
+		scrollX = scrollX ?? this.scrollX;
+		scrollY = scrollY ?? this.scrollY;
 		const { height, width } = this._calcViewPortSize();
-		if (this._sceneWCurrVpAfterScale <= width) scrollX = 0;
-		if (this._sceneHCurrVpAfterScale <= height) scrollY = 0;
+		if (!hasScrollableOverflow(this._sceneWCurrVpAfterScale, width)) scrollX = 0;
+		if (!hasScrollableOverflow(this._sceneHCurrVpAfterScale, height)) scrollY = 0;
 		const limitX = (_this$_scrollBar2 = this._scrollBar) === null || _this$_scrollBar2 === void 0 ? void 0 : _this$_scrollBar2.limitX;
 		const limitY = (_this$_scrollBar3 = this._scrollBar) === null || _this$_scrollBar3 === void 0 ? void 0 : _this$_scrollBar3.limitY;
 		let isLimitedX = false;
@@ -31720,13 +32027,13 @@ var Viewport = class {
 	* @param viewportScrollY
 	*/
 	_limitViewportScroll(viewportScrollX, viewportScrollY) {
-		var _this$getScrollBar$to, _this$getScrollBar;
+		var _this$getScrollBar;
 		const { width, height } = this._calcViewPortSize();
 		const freezeHeight = this._paddingEndY - this._paddingStartY;
 		const freezeWidth = this._paddingEndX - this._paddingStartX;
 		const scaleY = this.scene.scaleY;
 		const scaleX = this.scene.scaleX;
-		const scrollBarThicknessTotalSize = (_this$getScrollBar$to = (_this$getScrollBar = this.getScrollBar()) === null || _this$getScrollBar === void 0 ? void 0 : _this$getScrollBar.totalSize) !== null && _this$getScrollBar$to !== void 0 ? _this$getScrollBar$to : 0;
+		const scrollBarThicknessTotalSize = ((_this$getScrollBar = this.getScrollBar()) === null || _this$getScrollBar === void 0 ? void 0 : _this$getScrollBar.totalSize) ?? 0;
 		const maxViewportScrollX = this._sceneWidthAfterScale - this._marginLeft * scaleX - freezeWidth * scaleX - width + scrollBarThicknessTotalSize;
 		const maxViewportScrollY = this._sceneHeightAfterScale - this._marginTop * scaleY - freezeHeight * scaleY - height + scrollBarThicknessTotalSize;
 		return {
@@ -31893,10 +32200,10 @@ var Viewport = class {
 	* @param isTrigger
 	*/
 	_scrollToViewportPosCore(scrollVpPos, isTrigger = true) {
-		var _scrollVpPos$viewport, _scrollVpPos$viewport2, _this$_scrollBar11, _this$_scrollBar12, _this$_scrollBar13;
+		var _this$_scrollBar11, _this$_scrollBar12, _this$_scrollBar13;
 		if (this._scrollBar == null) return;
-		let viewportScrollX = (_scrollVpPos$viewport = scrollVpPos.viewportScrollX) !== null && _scrollVpPos$viewport !== void 0 ? _scrollVpPos$viewport : this.viewportScrollX;
-		let viewportScrollY = (_scrollVpPos$viewport2 = scrollVpPos.viewportScrollY) !== null && _scrollVpPos$viewport2 !== void 0 ? _scrollVpPos$viewport2 : this.viewportScrollY;
+		let viewportScrollX = scrollVpPos.viewportScrollX ?? this.viewportScrollX;
+		let viewportScrollY = scrollVpPos.viewportScrollY ?? this.viewportScrollY;
 		const rawScrollXY = this.transViewportScroll2ScrollValue(viewportScrollX, viewportScrollY);
 		const afterLimitViewportXY = this._limitViewportScroll(viewportScrollX, viewportScrollY);
 		viewportScrollX = afterLimitViewportXY.viewportScrollX;
@@ -32030,6 +32337,7 @@ var Viewport = class {
 };
 
 //#endregion
+exports.AlignmentSnapSession = AlignmentSnapSession;
 exports.BASE_OBJECT_ARRAY = BASE_OBJECT_ARRAY;
 exports.BG_Z_INDEX = BG_Z_INDEX;
 exports.BORDER_TYPE = BORDER_TYPE;
@@ -32203,6 +32511,7 @@ exports.VERTICAL_ROTATE_ANGLE = VERTICAL_ROTATE_ANGLE;
 exports.Vector2 = Vector2;
 exports.Viewport = Viewport;
 exports.WatermarkLayer = WatermarkLayer;
+exports.calculateCellImageRect = calculateCellImageRect;
 exports.calculateRectRotate = calculateRectRotate;
 exports.cancelRequestFrame = cancelRequestFrame;
 exports.checkStyle = checkStyle;
@@ -32226,8 +32535,11 @@ exports.expandDrawingEffectBounds = expandDrawingEffectBounds;
 exports.expandRangeIfIntersects = expandRangeIfIntersects;
 exports.fixLineWidthByScale = fixLineWidthByScale;
 exports.generateRandomKey = generateRandomKey;
+exports.getAlignmentRectXAnchors = getAlignmentRectXAnchors;
+exports.getAlignmentRectYAnchors = getAlignmentRectYAnchors;
 exports.getCellPositionByIndex = getCellPositionByIndex;
 exports.getCharSpaceApply = getCharSpaceApply;
+exports.getClosestAlignmentOffset = getClosestAlignmentOffset;
 exports.getColor = getColor;
 exports.getCurrentScrollXY = getCurrentScrollXY;
 exports.getCurrentTypeOfRenderer = getCurrentTypeOfRenderer;
@@ -32242,6 +32554,7 @@ exports.getDocumentSkeletonNestedPageOffset = getDocumentSkeletonNestedPageOffse
 exports.getDrawingGroupState = getDrawingGroupState;
 exports.getFirstGrapheme = getFirstGrapheme;
 exports.getFontStyleString = getFontStyleString;
+exports.getGeneralNumberDisplayText = getGeneralNumberDisplayText;
 exports.getGroupState = getGroupState;
 exports.getLastColumn = getLastColumn;
 exports.getLastLine = getLastLine;
@@ -32273,6 +32586,7 @@ exports.hasLatinExtendedA = hasLatinExtendedA;
 exports.hasLatinExtendedB = hasLatinExtendedB;
 exports.hasLatinOneSupplement = hasLatinOneSupplement;
 exports.hasListGlyph = hasListGlyph;
+exports.hasScrollableOverflow = hasScrollableOverflow;
 exports.hasSpace = hasSpace;
 exports.hasThai = hasThai;
 exports.hasTibetan = hasTibetan;
@@ -32299,7 +32613,9 @@ exports.lineIterator = lineIterator;
 exports.measureDocumentNoWrapTextRangeWidth = measureDocumentNoWrapTextRangeWidth;
 exports.measureDocumentNoWrapTextWidth = measureDocumentNoWrapTextWidth;
 exports.measureDocumentUnbreakableTextWidth = measureDocumentUnbreakableTextWidth;
+exports.measureDocumentWrappedTextWidth = measureDocumentWrappedTextWidth;
 exports.mergeInfoOffset = mergeInfoOffset;
+exports.normalizeAlignmentRect = normalizeAlignmentRect;
 exports.parseDataStreamToTree = parseDataStreamToTree;
 exports.pixelToPt = pixelToPt;
 exports.precisionTo = precisionTo;