@uimaxbai/am-lyrics 1.5.0 → 1.5.2

package/dist/src/react.js

@@ -322,7 +322,7 @@ class GoogleService {
     }
 }
 
-const VERSION = '1.5.0';
+const VERSION = '1.5.2';
 const INSTRUMENTAL_THRESHOLD_MS = 7000; // Show dots for gaps >= 7s
 const FETCH_TIMEOUT_MS = 8000; // Timeout for all lyrics fetch requests
 const SEEK_THRESHOLD_MS = 500;
@@ -600,20 +600,23 @@ let AmLyrics$1 = class AmLyrics extends i {
                 if (biniResult && biniResult.lines.length > 0) {
                     collectedSources.push(biniResult);
                 }
-                if (collectedSources.length === 0) {
+                const hasWordSync = (sources) => sources.some(s => s.lines.some(l => l.isWordSynced || (l.text && l.text.length > 1)));
+                if (collectedSources.length === 0 || !hasWordSync(collectedSources)) {
                     const unisonResult = await AmLyrics.fetchLyricsFromUnison(resolvedMetadata.metadata);
                     if (unisonResult && unisonResult.lines.length > 0) {
                         collectedSources.push(unisonResult);
                     }
                 }
-                if (collectedSources.length === 0) {
+                if (collectedSources.length === 0 || !hasWordSync(collectedSources)) {
                     const youLyResults = await AmLyrics.fetchLyricsFromYouLyPlus(title, artist, resolvedMetadata.catalogIsrc, resolvedMetadata.metadata, true);
                     if (youLyResults && youLyResults.length > 0) {
                         collectedSources.push(...youLyResults);
                     }
                 }
             }
-            if (collectedSources.length === 0 && resolvedMetadata?.metadata) {
+            const hasLineSync = (sources) => sources.some(s => s.lines.some(l => l.timestamp > 0 || l.endtime > 0));
+            if ((collectedSources.length === 0 || !hasLineSync(collectedSources)) &&
+                resolvedMetadata?.metadata) {
                 // Fallback: LRCLIB
                 const lrclibResult = await AmLyrics.fetchLyricsFromLrclib(resolvedMetadata.metadata);
                 if (lrclibResult && lrclibResult.lines.length > 0) {
@@ -764,6 +767,23 @@ let AmLyrics$1 = class AmLyrics extends i {
                 const resolvedMetadata = await this.resolveSongMetadata();
                 if (resolvedMetadata?.metadata) {
                     const newSources = [];
+                    // Try Unison if not fetched
+                    if (!this.availableSources.some(s => s.source.toLowerCase().includes('unison'))) {
+                        const unisonResult = await AmLyrics.fetchLyricsFromUnison(resolvedMetadata.metadata);
+                        if (unisonResult && unisonResult.lines.length > 0) {
+                            newSources.push(unisonResult);
+                        }
+                    }
+                    // Try YouLyPlus (KPoe) if we don't have Apple or QQ
+                    if (!this.availableSources.some(s => s.source.toLowerCase().includes('apple') ||
+                        s.source.toLowerCase().includes('qq'))) {
+                        const title = resolvedMetadata.metadata.title?.trim() || '';
+                        const artist = resolvedMetadata.metadata.artist?.trim() || '';
+                        const youLyResults = await AmLyrics.fetchLyricsFromYouLyPlus(title, artist, resolvedMetadata.catalogIsrc, resolvedMetadata.metadata, true);
+                        if (youLyResults && youLyResults.length > 0) {
+                            newSources.push(...youLyResults);
+                        }
+                    }
                     // Try LRCLIB if not fetched
                     if (!this.availableSources.some(s => s.source.toLowerCase().includes('lrclib'))) {
                         const lrclibResult = await AmLyrics.fetchLyricsFromLrclib(resolvedMetadata.metadata);
@@ -2039,6 +2059,15 @@ let AmLyrics$1 = class AmLyrics extends i {
             const currentGap = this.findInstrumentalGapAt(newTime);
             if (currentGap) {
                 this.lastInstrumentalIndex = currentGap.insertBeforeIndex;
+                // Un-highlight the previous line immediately when gap dots are playing
+                if (currentGap.insertBeforeIndex > 0) {
+                    const prevLine = this._getLineElement(currentGap.insertBeforeIndex - 1);
+                    if (prevLine &&
+                        prevLine.classList.contains('persist-highlight') &&
+                        !prevLine.classList.contains('active')) {
+                        AmLyrics.unfinishSyllables(prevLine);
+                    }
+                }
             }
             else if (this.lastInstrumentalIndex !== null) {
                 this.lastInstrumentalIndex = null;
@@ -2185,7 +2214,18 @@ let AmLyrics$1 = class AmLyrics extends i {
         }
         // 1. Compute scroll lookahead based on gap to next line (YouLyPlus style)
         let scrollLookAheadMs = 350;
-        const currentAudioIndex = this.getLineIndexAtTime(this.currentTime, this.lastActiveIndex);
+        let currentAudioIndex = -1;
+        for (let i = 0; i < this.lyrics.length; i += 1) {
+            if (this.lyrics[i].timestamp > this.currentTime) {
+                currentAudioIndex = i - 1;
+                break;
+            }
+        }
+        if (currentAudioIndex === -1 && this.lyrics.length > 0) {
+            if (this.currentTime >= this.lyrics[this.lyrics.length - 1].timestamp) {
+                currentAudioIndex = this.lyrics.length - 1;
+            }
+        }
         if (currentAudioIndex !== -1 &&
             currentAudioIndex + 1 < this.lyrics.length) {
             const currentLine = this.lyrics[currentAudioIndex];
@@ -2196,29 +2236,32 @@ let AmLyrics$1 = class AmLyrics extends i {
         // 2. Find scroll target at predictive time
         const predictiveTime = this.currentTime + scrollLookAheadMs;
         const predictiveActiveIndices = this.findActiveLineIndices(predictiveTime);
-        let targetLineIndex;
+        let targetElement = null;
         if (predictiveActiveIndices.length > 0) {
-            targetLineIndex = this.getPrimaryScrollLineIndex(predictiveActiveIndices, predictiveTime);
+            const targetLineIdx = this.getPrimaryScrollLineIndex(predictiveActiveIndices, predictiveTime);
+            if (targetLineIdx !== null && targetLineIdx !== -1) {
+                targetElement = this._getLineElement(targetLineIdx);
+            }
         }
-        else {
+        if (!targetElement) {
             // Fallback: closest line before predictiveTime
-            targetLineIndex = this.getLineIndexAtTime(predictiveTime, 0);
+            const targetLineIdx = this.getLineIndexAtTime(predictiveTime, 0);
+            if (targetLineIdx !== null && targetLineIdx !== -1) {
+                targetElement = this._getLineElement(targetLineIdx);
+            }
         }
-        if (targetLineIndex === null || targetLineIndex === -1)
-            return;
-        const targetLine = this._getLineElement(targetLineIndex);
-        if (!targetLine)
+        if (!targetElement)
             return;
         // Unblur the upcoming target line early (pre-active) so background
         // vocals start their max-height/opacity transition in sync with scroll.
-        if (!targetLine.classList.contains('active')) {
-            targetLine.classList.add('pre-active');
-            if (!this.preActiveLineElements.includes(targetLine)) {
-                this.preActiveLineElements.push(targetLine);
+        if (!targetElement.classList.contains('active')) {
+            targetElement.classList.add('pre-active');
+            if (!this.preActiveLineElements.includes(targetElement)) {
+                this.preActiveLineElements.push(targetElement);
             }
         }
         const scrollDuration = scrollLookAheadMs;
-        this.focusLine(targetLine, forceScroll, scrollDuration);
+        this.focusLine(targetElement, forceScroll, scrollDuration);
     }
     _getTextWidth(text, font) {
         if (!this._textWidthCanvas) {
@@ -3523,7 +3566,17 @@ let AmLyrics$1 = class AmLyrics extends i {
                 syllable.style.removeProperty('--pre-wipe-delay');
                 const chars = syllable.querySelectorAll('span.char');
                 for (let ci = 0; ci < chars.length; ci += 1) {
-                    chars[ci].style.animation = '';
+                    const charEl = chars[ci];
+                    const currentAnim = charEl.style.animation || '';
+                    if (currentAnim.includes('grow-dynamic') ||
+                        currentAnim.includes('rise-char')) {
+                        const parts = currentAnim.split(',').map(p => p.trim());
+                        const transformAnim = parts.find(p => p.includes('grow-dynamic') || p.includes('rise-char'));
+                        charEl.style.animation = transformAnim || '';
+                    }
+                    else {
+                        charEl.style.animation = '';
+                    }
                 }
             }
         }
@@ -4872,21 +4925,21 @@ AmLyrics$1.styles = i$3 `
     .lyrics-line.active:not(.lyrics-gap)
       .lyrics-word:not(.growable)
       .lyrics-syllable.highlight {
-      transform: translateY(-3.5%);
+      transform: translate3d(0, var(--char-rise-y, -1.12px), 0);
     }
 
     .lyrics-line.persist-highlight:not(.lyrics-gap)
       .lyrics-word:not(.growable)
       .lyrics-syllable.finished {
-      transform: translateY(-3.5%);
+      transform: translate3d(0, var(--char-rise-y, -1.12px), 0);
     }
 
     .lyrics-word.growable .lyrics-syllable.cleanup .char {
-      transform: translateY(-3.5%);
+      transform: translate3d(0, var(--char-rise-y, -1.12px), 0);
     }
 
     .lyrics-word.char-rise .lyrics-syllable.cleanup .char {
-      transform: translateY(-3.5%);
+      transform: translate3d(0, var(--char-rise-y, -1.12px), 0);
     }
 
     .lyrics-line.persist-highlight
@@ -4897,7 +4950,7 @@ AmLyrics$1.styles = i$3 `
       .lyrics-word.char-rise
       .lyrics-syllable.finished
       .char {
-      transform: translateY(-3.5%);
+      transform: translate3d(0, var(--char-rise-y, -1.12px), 0);
     }
 
     /* Background vocal overrides — placed AFTER main rules so they win
@@ -4991,6 +5044,7 @@ AmLyrics$1.styles = i$3 `
       background-clip: text;
       -webkit-background-clip: text;
       backface-visibility: hidden;
+      transform-origin: 50% 80%;
       transition:
         color 0.7s,
         background-color 0.7s,
@@ -5028,7 +5082,6 @@ AmLyrics$1.styles = i$3 `
       background-position:
         -0.5em 0%,
         -0.25em 0%;
-      transform-origin: 50% 80%;
       transition:
         transform 0.7s ease,
         color 0.18s;