@applemusic-like-lyrics/core 0.4.1 → 0.4.2

package/dist/amll-core.mjs

@@ -3126,6 +3126,13 @@ const NORMAL_BREAK_PENALTY_RATIO = .5;
 */
 const SPACE_BREAK_REWARD_RATIO = .4;
 /**
+* 在标点符号处断开的奖励比例
+*
+* 比空格更高以便优先一点在标点处换行
+*/
+const PUNCTUATION_BREAK_REWARD_RATIO = .6;
+const PUNCTUATION_REGEX = /[,.;:!?，。；：！？、）】》」』’”)[\]}>~…]$/;
+/**
 * 计算平均行长度的断点位置
 * @param children 子节点信息
 * @param containerWidth 容器可用内容宽度
@@ -3166,9 +3173,13 @@ function calcBalancedBreaks(children, containerWidth, fullText, segmenter) {
 		else continue;
 		else lineCost = (containerWidth - w) ** 2;
 		let breakPenalty = 0;
-		if (j < n) if (children[j - 1].isSpace) breakPenalty = -((containerWidth * SPACE_BREAK_REWARD_RATIO) ** 2);
-		else if (cjkBoundaries.has(charOffsets[j])) breakPenalty = PENALTY_CJK;
-		else breakPenalty = PENALTY_NORMAL;
+		if (j < n) {
+			const prevChild = children[j - 1];
+			if (PUNCTUATION_REGEX.test(prevChild.text)) breakPenalty = -((containerWidth * PUNCTUATION_BREAK_REWARD_RATIO) ** 2);
+			else if (prevChild.isSpace) breakPenalty = -((containerWidth * SPACE_BREAK_REWARD_RATIO) ** 2);
+			else if (cjkBoundaries.has(charOffsets[j])) breakPenalty = PENALTY_CJK;
+			else breakPenalty = PENALTY_NORMAL;
+		}
 		const totalCost = lineCost + breakPenalty + dp[j];
 		if (totalCost < dp[i]) {
 			dp[i] = totalCost;
@@ -3193,13 +3204,9 @@ function getMeasurementContext() {
 /**
 * 用于平衡歌词行在换行后的各行长度
 */
-var LineBalancer = class LineBalancer {
+var LineBalancer = class {
 	isBalancing = false;
 	lastBalancedContainerWidth = -1;
-	/**
-	* 防止误差导致的意外换行
-	*/
-	static SAFE_WIDTH_PADDING = 25;
 	constructor(mainElement) {
 		this.mainElement = mainElement;
 	}
@@ -3226,32 +3233,49 @@ var LineBalancer = class LineBalancer {
 		adapter.resetDOM();
 		const prevWhiteSpace = this.mainElement.style.whiteSpace;
 		this.mainElement.style.whiteSpace = "nowrap";
+		const parentElement = this.mainElement.parentElement;
+		let prevTransform = "";
+		let transformChanged = false;
+		if (parentElement) {
+			prevTransform = parentElement.style.transform;
+			if (prevTransform && prevTransform !== "none") {
+				parentElement.style.transform = "none";
+				transformChanged = true;
+			}
+		}
+		let lockAcquired = false;
 		try {
-			const range = document.createRange();
-			range.selectNodeContents(this.mainElement);
-			const lineWidth = range.getBoundingClientRect().width;
-			const safeContainerWidth = Math.max(1, containerWidth - LineBalancer.SAFE_WIDTH_PADDING);
-			if (lineWidth <= safeContainerWidth) {
+			const { childInfos, fullText } = adapter.buildChildInfos();
+			let layoutWidth = childInfos.reduce((sum, c) => sum + c.width, 0);
+			if (adapter.needsCalibration) {
+				const range = document.createRange();
+				range.selectNodeContents(this.mainElement);
+				const visualWidth = range.getBoundingClientRect().width;
+				if (layoutWidth > 0 && visualWidth > 0) {
+					const scale = visualWidth / layoutWidth;
+					for (const info of childInfos) info.width *= scale;
+				}
+				layoutWidth = visualWidth;
+			}
+			const safeContainerWidth = Math.max(1, containerWidth);
+			if (layoutWidth <= safeContainerWidth) {
 				this.lastBalancedContainerWidth = containerWidth;
 				return;
 			}
-			const { childInfos, fullText } = adapter.buildChildInfos();
-			const measuredTotal = childInfos.reduce((sum, c) => sum + c.width, 0);
-			if (measuredTotal > 0 && lineWidth > 0) {
-				const scale = lineWidth / measuredTotal;
-				for (const info of childInfos) info.width *= scale;
-			}
 			const breaks = calcBalancedBreaks(childInfos, safeContainerWidth, fullText, wordSegmenter);
 			if (breaks.length === 0) {
 				this.lastBalancedContainerWidth = containerWidth;
 				return;
 			}
 			this.isBalancing = true;
+			lockAcquired = true;
 			adapter.applyBreaks(breaks, childInfos);
 			this.lastBalancedContainerWidth = containerWidth;
 			this.isBalancing = false;
 		} finally {
 			this.mainElement.style.whiteSpace = prevWhiteSpace;
+			if (transformChanged && parentElement) parentElement.style.transform = prevTransform;
+			if (lockAcquired) this.isBalancing = false;
 		}
 	}
 	balanceDynamicLineBreaks(containerWidth, wordSegmenter) {
@@ -3300,7 +3324,8 @@ var LineBalancer = class LineBalancer {
 					const breakIndex = breaks[i];
 					if (breakIndex >= 0 && breakIndex < infoToNode.length) this.mainElement.insertBefore(document.createElement("br"), infoToNode[breakIndex]);
 				}
-			}
+			},
+			needsCalibration: false
 		}, wordSegmenter);
 	}
 	balanceNonDynamicLineBreaks(containerWidth, computedStyle, wordSegmenter) {
@@ -3343,7 +3368,8 @@ var LineBalancer = class LineBalancer {
 					fragment.appendChild(document.createTextNode(childInfos[i].text));
 				}
 				this.mainElement.appendChild(fragment);
-			}
+			},
+			needsCalibration: true
 		}, wordSegmenter);
 	}
 };