- {style.showNextLine !== false && nextText ? (
+ {style.showNextLine !== false && nextText && outro !== 'none' ? (
{
@@ -1021,9 +1116,35 @@
setPreviewPlaying(false);
return undefined;
}
+ const style = draft.style || {};
+ const baseEnterMs = Math.max(0, Number(style.enterDurationMs) || 0);
+ const baseShrinkMs = Math.max(0, Number(style.shrinkDurationMs) || 0);
+ const outMs = Math.max(0, Number(style.outDurationMs) || 0);
+ const outro = LRC_OUTRO_OPTIONS.includes(style.outro) ? style.outro : 'fade';
+ const last = cues[cues.length - 1];
+ const outroStart = last.t + (Number(draft.tailMs) || 0);
+ const endAt = outroStart + (outro === 'none' ? 0 : outMs);
+ const loopPause = 700;
+
+ // 和 OBS 端一致:入场 + 回缩必须塞进「到下一句」的间隔里
+ const fitToWindow = (index) => {
+ const cue = cues[index];
+ if (!cue) return { enterMs: baseEnterMs, shrinkMs: baseShrinkMs, windowMs: 0 };
+ const next = cues[index + 1];
+ const windowMs = Math.max(0, (next ? next.t : cue.t + (Number(draft.tailMs) || 0)) - cue.t);
+ const available = Math.max(120, windowMs);
+ if (baseEnterMs + baseShrinkMs <= available) {
+ return { enterMs: baseEnterMs, shrinkMs: baseShrinkMs, windowMs };
+ }
+ const enterMs = Math.round(Math.min(baseEnterMs, available * 0.45));
+ const shrinkMs = Math.round(Math.max(120, Math.min(baseShrinkMs, available - enterMs)));
+ return { enterMs, shrinkMs, windowMs };
+ };
+
const startedAt = performance.now();
setPreviewIndex(-1);
setPreviewElapsed(0);
+ setPreviewPhase(null);
const timer = setInterval(() => {
const elapsed = performance.now() - startedAt;
let index = -1;
@@ -1033,12 +1154,28 @@
}
setPreviewIndex(index);
setPreviewElapsed(elapsed);
- const last = cues[cues.length - 1];
- if (elapsed > last.t + (draft.tailMs || 0) + 600) setPreviewPlaying(false);
+ // 注意:预览用粗粒度 tick 判断阶段,字幕点到点之间可能只差 300ms,
+ // 所以用「距本句开始已过多久」而不是绝对时间,确保每句都会走完入场→回缩。
+ if (index >= 0 && elapsed >= outroStart) {
+ setPreviewPhase(outro === 'none' ? null : 'leaving');
+ } else if (index >= 0) {
+ const fitted = fitToWindow(index);
+ setPreviewPhase(elapsed >= cues[index].t + fitted.enterMs ? 'hold' : 'entering');
+ } else {
+ setPreviewPhase(null);
+ }
+ if (elapsed > endAt + loopPause) {
+ if (previewLoop) {
+ setPreviewRun(v => v + 1);
+ } else {
+ setPreviewPlaying(false);
+ setPreviewPhase(null);
+ }
+ }
}, 50);
return () => clearInterval(timer);
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [previewPlaying, previewRun, parsed]);
+ }, [previewPlaying, previewRun, parsed, previewLoop]);
React.useEffect(() => {
if (!lrcState || !lrcState.playing) return undefined;
@@ -1084,11 +1221,31 @@
const stageCue = previewCue || cues[0] || null;
const stageIndex = previewCue ? previewIndex : 0;
const stageElapsed = previewPlaying ? previewElapsed : Infinity;
+ // 未播放时直接展示「入场结束后的停留状态」,方便看清最终样式
+ const stagePhase = previewPlaying ? previewPhase : 'hold';
const sampleText = stageCue ? stageCue.text : '';
const sampleNext = cues[stageIndex + 1] ? cues[stageIndex + 1].text : '';
const selectedCount = cues.length;
const karaokeCount = cues.filter(cue => Array.isArray(cue.segments) && cue.segments.length >= 2).length;
+ // 当前舞台这句的适配时长(与 OBS 端一致:入场+回缩塞进到下一句的间隔里)
+ const stageFitted = (() => {
+ const cue = stageCue;
+ const style = (draft && draft.style) || {};
+ const base = {
+ enterMs: Math.max(0, Number(style.enterDurationMs) || 0),
+ shrinkMs: Math.max(0, Number(style.shrinkDurationMs) || 0)
+ };
+ if (!cue) return base;
+ const next = cues[stageIndex + 1];
+ const windowMs = Math.max(0, (next ? next.t : cue.t + (Number(draft.tailMs) || 0)) - cue.t);
+ const available = Math.max(120, windowMs);
+ if (base.enterMs + base.shrinkMs <= available) return { ...base, windowMs };
+ const enterMs = Math.round(Math.min(base.enterMs, available * 0.45));
+ const shrinkMs = Math.round(Math.max(120, Math.min(base.shrinkMs, available - enterMs)));
+ return { enterMs, shrinkMs, windowMs };
+ })();
+
const saveDraft = async (options = {}) => {
if (!draft) return null;
setSaving(true);
@@ -1604,8 +1761,11 @@
nextText={sampleNext}
playing={previewPlaying}
elapsed={stageElapsed}
+ phase={stagePhase}
+ configKey={configKey}
+ fittedTiming={stageFitted}
/>
-
+
+
+
+ 循环
+
{previewCue ? formatMs(previewCue.t) : '—'} / {formatMs(parsed ? parsed.totalMs : 0)}
+ {previewPlaying && previewPhase ? ' · ' + (
+ previewPhase === 'entering' ? '入场中'
+ : previewPhase === 'hold' ? '停留 / 回缩' : '出场中'
+ ) : ''}
diff --git a/public/widget.html b/public/widget.html
index 45b9717..8e8c03c 100644
--- a/public/widget.html
+++ b/public/widget.html
@@ -298,8 +298,13 @@
shownIndex: -2,
tickTimer: null,
spans: null,
+ cue: null,
+ phase: null,
+ phaseTimer: null,
};
+ const LRC_OUTROS = ['none', 'fade', 'blur', 'slideDown', 'slideUp', 'zoom', 'custom'];
+
let lrcCustomStyleEl = null;
function applyLrcCustomCss(css) {
@@ -331,12 +336,60 @@
return Date.now() + clockSkewMs;
}
+ function getLrcTiming(style) {
+ const s = style || {};
+ const clamp = (value, min, max, fallback) => {
+ const n = Number(value);
+ return Number.isFinite(n) ? Math.min(max, Math.max(min, n)) : fallback;
+ };
+ return {
+ inMs: clamp(s.enterDurationMs, 0, 10000, 300),
+ holdMs: clamp(s.holdDurationMs, 0, 10000, 0),
+ outMs: clamp(s.outDurationMs, 0, 10000, 260),
+ shrinkMs: clamp(s.shrinkDurationMs, 0, 20000, 0),
+ shrinkTo: clamp(s.holdShrinkTo, 0.3, 1, 1),
+ blurPx: clamp(s.blurPx, 0, 60, 10),
+ outro: LRC_OUTROS.includes(s.outro) ? s.outro : 'fade',
+ };
+ }
+
+ /**
+ * 每句字幕的可用时长 = 到下一句的距离(最后一句用 tailMs)。
+ * 入场和回缩都必须在下一句出现前完成,否则观众看到的永远是「没缩完就跳走」。
+ */
+ function cueWindowMs(index) {
+ const cue = lrc.cues[index];
+ if (!cue) return 0;
+ const next = lrc.cues[index + 1];
+ const end = next ? next.t : cue.t + (Number(lrc.tailMs) || 0);
+ return Math.max(0, end - cue.t);
+ }
+
+ function fitTimingToWindow(timing, windowMs) {
+ // 至少给回缩留 40% 的时间,否则回缩没有观感
+ const available = Math.max(120, windowMs || 0);
+ let inMs = timing.inMs;
+ let shrinkMs = timing.shrinkMs;
+ const total = inMs + shrinkMs;
+ if (total <= available) return { inMs, shrinkMs, fitted: false };
+ const inFloor = Math.min(inMs, available * 0.45);
+ inMs = Math.round(inFloor);
+ shrinkMs = Math.round(Math.max(120, Math.min(shrinkMs, available - inMs)));
+ return { inMs, shrinkMs, fitted: true };
+ }
+
function applyLrcStyle(style) {
const s = style || {};
lrcLayer.className = 'lrc-layer';
lrcLayer.classList.add('pos-' + (s.position || 'bottom'));
lrcLayer.classList.add('lrc-align-' + (s.align || 'center'));
lrcLayer.classList.add('lrc-anim-' + (s.animation || 'fade'));
+ const timing = getLrcTiming(s);
+ lrcLayer.classList.add('lrc-out-' + timing.outro);
+ lrcLayer.style.setProperty('--lrc-in-dur', timing.inMs + 'ms');
+ lrcLayer.style.setProperty('--lrc-out-dur', timing.outMs + 'ms');
+ lrcLayer.style.setProperty('--lrc-shrink-dur', timing.shrinkMs + 'ms');
+ lrcLayer.style.setProperty('--lrc-shrink-to', String(timing.shrinkTo)); lrcLayer.style.setProperty('--lrc-blur-px', timing.blurPx + 'px');
lrcLayer.style.paddingBottom = '0px';
lrcLayer.style.paddingTop = '0px';
@@ -373,6 +426,9 @@
lrcNext.style.textShadow = shadow;
lrcNext.style.display = s.showNextLine === false ? 'none' : '';
+ // 下一句和当前句同属 .lrc-text 的兄弟节点,回缩时一起缩放更自然
+ lrcNext.style.transformOrigin = 'center';
+
applyLrcCustomCss(s.customCss || '');
}
@@ -403,6 +459,90 @@
lrcLayer.classList.add('visible');
}
+ // ── 入场 / 停留回缩 / 出场 状态机 ──────────────────────────
+ function setPhase(phase) {
+ if (lrc.phase === phase) return;
+ lrc.phase = phase;
+ lrcLayer.classList.remove('lrc-state-entering', 'lrc-state-hold', 'lrc-state-leaving');
+ if (phase) lrcLayer.classList.add('lrc-state-' + phase);
+ }
+
+ function clearPhaseTimer() {
+ if (lrc.phaseTimer) {
+ clearTimeout(lrc.phaseTimer);
+ lrc.phaseTimer = null;
+ }
+ }
+
+ function restartEntrance(cue, index) {
+ clearPhaseTimer();
+ // 关键:先把上一句残留的 hold 状态去掉并让浏览器结算掉旧的回缩过渡,
+ // 否则新一句会从上一次的缩小值继续,看起来像「回缩瞬间完成」或「根本不动」。
+ lrcLayer.classList.remove('lrc-state-entering', 'lrc-state-hold', 'lrc-state-leaving');
+ lrc.phase = null;
+ lrcText.style.transition = 'none';
+ lrcText.style.transform = 'scale(1)';
+ void lrcText.offsetWidth; // 强制重排,让上面的重置立即生效
+ lrcText.style.transition = '';
+ lrcText.style.transform = '';
+
+ // 入场 + 回缩必须塞进「到下一句的时间」里,否则回缩永远播不完
+ const timing = getLrcTiming(lrc.style);
+ const fitted = fitTimingToWindow(timing, cueWindowMs(index));
+ lrcLayer.style.setProperty('--lrc-in-dur', fitted.inMs + 'ms');
+ lrcLayer.style.setProperty('--lrc-shrink-dur', fitted.shrinkMs + 'ms');
+
+ setPhase('entering');
+ showLrc();
+
+ const current = cue;
+ lrc.phaseTimer = setTimeout(() => {
+ lrc.phaseTimer = null;
+ if (!lrc.active || lrc.cue !== current) return;
+ // 入场结束 -> 停留阶段(从 1 开始缓慢回缩)
+ setPhase('hold');
+ }, fitted.inMs + timing.holdMs + 20);
+
+ return fitted;
+ }
+
+ function beginOutro(onDone) {
+ clearPhaseTimer();
+ const timing = getLrcTiming(lrc.style);
+ lrc.cue = null;
+ if (timing.outro === 'none' || timing.outMs <= 0) {
+ lrcLayer.classList.remove('lrc-state-entering', 'lrc-state-hold', 'lrc-state-leaving');
+ lrc.phase = null;
+ hideLrc();
+ onDone();
+ return;
+ }
+ // 出场动画要作用在「当前可见的尺寸」上,先把回缩的 transform 固定住再切到 leaving
+ const computed = getComputedStyle(lrcText).transform;
+ lrcLayer.classList.remove('lrc-state-entering', 'lrc-state-hold', 'lrc-state-leaving');
+ lrc.phase = null;
+ lrcText.style.transition = 'none';
+ if (computed && computed !== 'none') lrcText.style.transform = computed;
+ void lrcText.offsetWidth;
+ lrcText.style.transition = '';
+ lrcText.style.transform = '';
+
+ setPhase('leaving');
+ lrc.phaseTimer = setTimeout(() => {
+ lrc.phaseTimer = null;
+ setPhase(null);
+ hideLrc();
+ if (onDone) onDone();
+ }, timing.outMs + 20);
+ }
+
+ function clearLrcContent() {
+ lrc.cue = null;
+ lrc.spans = null;
+ lrcText.textContent = '';
+ lrcNext.textContent = '';
+ }
+
function cueUsesKaraoke(cue) {
return !!(lrc.style && lrc.style.karaoke !== false && cue
&& Array.isArray(cue.segments) && cue.segments.length >= 2);
@@ -439,16 +579,28 @@
function renderCue(index) {
if (index === lrc.shownIndex) return;
- lrc.shownIndex = index;
if (index < 0) {
+ // 还没到第一句:只有本次播放尚未入场过时才清空,避免打断正在进行的出场动画
+ const neverShown = lrc.shownIndex === -2;
+ lrc.shownIndex = -2;
+ if (neverShown) {
+ if (lrc.spans) {
+ lrc.spans = null;
+ lrcText.textContent = '';
+ lrcNext.textContent = '';
+ }
+ } else if (lrc.cue) {
+ lrc.cue = null;
+ lrc.spans = null;
+ lrcText.textContent = '';
+ lrcNext.textContent = '';
+ }
hideLrc();
- lrc.spans = null;
- lrcText.textContent = '';
- lrcNext.textContent = '';
return;
}
+ lrc.shownIndex = index;
const cue = lrc.cues[index];
if (!cue) {
hideLrc();
@@ -466,11 +618,9 @@
// 逐字模式下下一句也可能带增强标签,这里统一只显示纯文本
lrcNext.textContent = next ? next.text : '';
- // 重启入场动画
- lrcText.style.animation = 'none';
- void lrcText.offsetWidth;
- lrcText.style.animation = '';
- showLrc();
+ lrc.cue = cue;
+ lrc.cueIndex = index;
+ restartEntrance(cue, index);
}
function currentElapsed() {
@@ -483,7 +633,8 @@
const elapsed = currentElapsed();
const last = lrc.cues[lrc.cues.length - 1];
if (last && elapsed > last.t + lrc.tailMs) {
- hideLrc();
+ // 整段结束:播放淡出/出场动画
+ if (lrc.cue) beginOutro();
return;
}
renderCue(findCueIndex(elapsed));
@@ -505,19 +656,25 @@
function applyLrcState(state) {
if (!state || !state.playing) {
const reason = state && state.reason;
+ const wasActive = lrc.active;
lrc.active = false;
stopTicker();
- hideLrc();
- lrc.shownIndex = -2;
- if (reason === 'stopped' || reason === 'ended' || reason === 'cleared' || reason === 'preset-deleted') {
- setTimeout(() => {
- if (!lrc.active) {
- lrc.spans = null;
- lrcText.textContent = '';
- lrcNext.textContent = '';
- }
- }, 240);
+ if (!wasActive) {
+ // 其他客户端已经播完并淡出,这里直接收尾
+ clearPhaseTimer();
+ setPhase(null);
+ hideLrc();
+ clearLrcContent();
+ lrc.shownIndex = -2;
+ return;
}
+ if (lrc.cue) {
+ // 播放被停止/清空:走一遍出场动画再清空
+ beginOutro(clearLrcContent);
+ } else {
+ clearLrcContent();
+ }
+ lrc.shownIndex = -2;
return;
}
diff --git a/tests/lrc.test.js b/tests/lrc.test.js
index d61d3b9..07dda4b 100644
--- a/tests/lrc.test.js
+++ b/tests/lrc.test.js
@@ -224,3 +224,45 @@ test('normalizeStyle 支持禁用背景 / 阴影 / 逐字', () => {
assert.equal(defaults.style.textShadowEnabled, true);
assert.equal(defaults.style.karaoke, true);
});
+
+test('normalizeStyle 支持入场时长 / 出场 / 回缩参数', () => {
+ const preset = normalizeLrcPreset({
+ id: 'durations',
+ source: '[00:01.00]A',
+ style: {
+ animation: 'blur',
+ enterDurationMs: 1500,
+ outro: 'blur',
+ outDurationMs: 800,
+ holdShrinkTo: 0.94,
+ shrinkDurationMs: 2500,
+ blurPx: 24,
+ },
+ });
+ assert.equal(preset.style.animation, 'blur');
+ assert.equal(preset.style.enterDurationMs, 1500);
+ assert.equal(preset.style.outro, 'blur');
+ assert.equal(preset.style.outDurationMs, 800);
+ assert.equal(preset.style.holdShrinkTo, 0.94);
+ assert.equal(preset.style.shrinkDurationMs, 2500);
+ assert.equal(preset.style.blurPx, 24);
+
+ // 超界值被收敛
+ const clamped = normalizeLrcPreset({
+ id: 'clamped',
+ source: '',
+ style: { enterDurationMs: -100, outDurationMs: 999999, holdShrinkTo: 5, shrinkDurationMs: -1, blurPx: 900 },
+ });
+ assert.equal(clamped.style.enterDurationMs, 0);
+ assert.equal(clamped.style.outDurationMs, 10000);
+ assert.equal(clamped.style.holdShrinkTo, 1);
+ assert.equal(clamped.style.shrinkDurationMs, 0);
+ assert.equal(clamped.style.blurPx, 60);
+
+ // 非法枚举回退默认
+ const fallback = normalizeLrcPreset({ id: 'fallback', source: '', style: { outro: 'spin' } });
+ assert.equal(fallback.style.outro, 'fade');
+ assert.equal(fallback.style.enterDurationMs, 300);
+ assert.equal(fallback.style.outDurationMs, 260);
+ assert.equal(fallback.style.holdShrinkTo, 1);
+});