@uimaxbai/am-lyrics 1.2.4 → 1.2.6

package/dist/src/react.js

@@ -322,11 +322,12 @@ class GoogleService {
     }
 }
 
-const VERSION = '1.2.4';
+const VERSION = '1.2.6';
 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;
 const PRE_SCROLL_LEAD_MS = 500;
+const PRE_SCROLL_LEAD_SHORT_MS = 150;
 const SCROLL_ANIMATION_DURATION_MS = 280;
 const SCROLL_DELAY_INCREMENT_MS = 24;
 const GAP_PULSE_DURATION_MS = 4000;
@@ -1897,29 +1898,34 @@ let AmLyrics$1 = class AmLyrics extends i {
                 !this.isUserScrolling &&
                 !this.isClickSeeking &&
                 this.lyrics) {
-                // Condition: ONLY pre-scroll if no other lyric is currently playing.
-                // If a lyric is playing, we must wait for it to finish (handled by updated()).
-                if (this.activeLineIndices.length === 0) {
-                    let preActiveLineIndex = null;
-                    for (let i = 0; i < this.lyrics.length; i += 1) {
-                        const line = this.lyrics[i];
-                        const timeUntilStart = line.timestamp - newTime;
-                        const nextLineEl = this.lyricsContainer.querySelector(`#lyrics-line-${i}`);
-                        if (timeUntilStart > 0 && timeUntilStart <= PRE_SCROLL_LEAD_MS) {
-                            // Time to pre-scroll and pre-activate!
-                            if (nextLineEl) {
-                                // Apply unblur & zoom effect ahead of lyric start
-                                preActiveLineIndex = i;
+                let preActiveLineIndex = null;
+                for (let i = 0; i < this.lyrics.length; i += 1) {
+                    const line = this.lyrics[i];
+                    const timeUntilStart = line.timestamp - newTime;
+                    const nextLineEl = this.lyricsContainer.querySelector(`#lyrics-line-${i}`);
+                    const isBackToBack = this.activeLineIndices.length > 0;
+                    const leadTime = isBackToBack
+                        ? PRE_SCROLL_LEAD_SHORT_MS
+                        : PRE_SCROLL_LEAD_MS;
+                    if (timeUntilStart > leadTime) {
+                        break; // Lines are ordered by timestamp, no need to check further
+                    }
+                    if (timeUntilStart > 0 && timeUntilStart <= leadTime) {
+                        // Time to pre-scroll and pre-activate!
+                        if (nextLineEl) {
+                            preActiveLineIndex = i;
+                            if (!isBackToBack) {
+                                // Apply unblur & zoom effect ahead of lyric start only if no line is currently active
                                 nextLineEl.classList.add('pre-active');
-                                this.clearPreActiveClasses(i);
-                                const slowScrollDuration = Math.max(SCROLL_ANIMATION_DURATION_MS, timeUntilStart);
-                                this.focusLine(nextLineEl, false, slowScrollDuration, !!currentGap);
                             }
-                            break;
+                            this.clearPreActiveClasses(i);
+                            const slowScrollDuration = Math.max(SCROLL_ANIMATION_DURATION_MS, timeUntilStart);
+                            this.focusLine(nextLineEl, false, slowScrollDuration, !!currentGap);
                         }
+                        break;
                     }
-                    this.clearPreActiveClasses(preActiveLineIndex);
                 }
+                this.clearPreActiveClasses(preActiveLineIndex);
             }
         }
     }