@braccato/core 1.16.10 → 1.16.12

package/dist/engine.d.ts

@@ -65,6 +65,11 @@ export interface AnimationEngineInstance extends AnimEngineViewState {
      * from a tick, so it has no options object to read.
      */
     passiveScrollEnabled: boolean;
+    /**
+     * Last options the tick was given, kept before any early return. A click reads its offsets to seek
+     * to where a line plays rather than to its unshifted time.
+     */
+    lastTickOptions: ResolvedTickOptions | null;
     playbackRate: number;
     passiveRAFId: number | null;
     pendingLyricsUpdateFrame: number | null;
@@ -357,6 +362,10 @@ export type AnimationTickStatus = "ok" | "lyrics-missing";
  */
 export declare function resolveTickOptions(options: TickOptions): ResolvedTickOptions;
 export declare function measureStage(engine: AnimationEngineInstance): void;
+/**
+ * The player time at which a lyric time plays, under the offsets of the last tick.
+ */
+export declare function playerTimeForLyricTime(engine: AnimationEngineInstance, lyricTimeS: number): number;
 /**
  * Renders one view against a tick with nothing left out.
  */

package/dist/engine.js

@@ -154,6 +154,7 @@ export function createAnimationEngineInstance(engineDocument, engineWindow, host
         cachedCSSValues: new Map(),
         cachedAnimationSettings: null,
         passiveScrollEnabled: false,
+        lastTickOptions: null,
         playbackRate: 1,
         passiveRAFId: null,
         pendingLyricsUpdateFrame: null,
@@ -2276,11 +2277,33 @@ function applyStage(engine, timeS, instant) {
         engine.host.onStageLayout?.(box);
     }
 }
+/**
+ * Seconds to add to the player time to get the lyric time this view renders: the theme's offset
+ * and the trim for its sync type, less the global and per-song offsets.
+ */
+function lyricClockShiftS(engine, lyricsElement, options) {
+    const syncTypeShiftS = engine.syncType === "richsync"
+        ? getCSSDurationInMs(engine, lyricsElement, "--blyrics-richsync-timing-offset") / 1000 -
+            options.richsyncOffsetTrim
+        : getCSSDurationInMs(engine, lyricsElement, "--blyrics-timing-offset") / 1000 - options.lineOffsetTrim;
+    return syncTypeShiftS - options.globalLyricOffset - options.lyricOffset;
+}
+/**
+ * The player time at which a lyric time plays, under the offsets of the last tick.
+ */
+export function playerTimeForLyricTime(engine, lyricTimeS) {
+    const options = engine.lastTickOptions;
+    const lyricsElement = engine.lyricsContainer;
+    if (!options || !lyricsElement)
+        return lyricTimeS;
+    return Math.max(0, lyricTimeS - lyricClockShiftS(engine, lyricsElement, options));
+}
 /**
  * Renders one view against a tick with nothing left out.
  */
 export function tickView(engine, currentTime, options) {
     const { eventCreationTime, isPlaying, smoothScroll } = options;
+    engine.lastTickOptions = options;
     engine.passiveScrollEnabled = options.passiveScrollEnabled;
     if (engine.playbackRate !== options.playbackRate) {
         engine.playbackRate = options.playbackRate;
@@ -2341,15 +2364,7 @@ export function tickView(engine, currentTime, options) {
             return "lyrics-missing";
         }
         const lines = engine.lines;
-        if (engine.syncType === "richsync") {
-            currentTime += getCSSDurationInMs(engine, lyricsElement, "--blyrics-richsync-timing-offset") / 1000;
-            currentTime -= options.richsyncOffsetTrim;
-        }
-        else {
-            currentTime += getCSSDurationInMs(engine, lyricsElement, "--blyrics-timing-offset") / 1000;
-            currentTime -= options.lineOffsetTrim;
-        }
-        currentTime -= options.globalLyricOffset + options.lyricOffset;
+        currentTime += lyricClockShiftS(engine, lyricsElement, options);
         const lyricScrollTime = correctedScrollTimeS(engine, currentTime) +
             getCSSDurationInMs(engine, lyricsElement, "--blyrics-scroll-timing-offset") / 1000;
         const { config: animationConfig, scrollTiming } = getAnimationSettings(engine, lyricsElement);
@@ -2428,6 +2443,9 @@ export function tickView(engine, currentTime, options) {
                     if (isPlaying)
                         lineData.isAnimating = false; // reset the animation against current media time
                 }
+                // Lead-in animations have no timing sample for the drift check, so a jump while playing must reset them.
+                if (timeJumped && isPlaying && lineData.isAnimating)
+                    resetLineAnimationState(lineData);
                 updateWordStates(lineData, currentTime);
                 const nativeTimingSample = lineNativeTimingSample(lineData, currentTime);
                 let usedNativeTimingSampleForDrift = false;

package/dist/view.js

@@ -10,7 +10,7 @@
 // lines is where those values are first knowable: the container, the records, the sync type, the
 // size they were measured at, and the scrolls to swallow before the view has settled.
 import { CREDITS_CLASS, CREDITS_NAMES_CLASS, CREDITS_TEXT_CLASS, LINE_CLASS, LYRICS_CLASS, RTL_CLASS, } from "./constants.js";
-import { setupLineCullObserver } from "./engine.js";
+import { playerTimeForLyricTime, setupLineCullObserver } from "./engine.js";
 import { addSeekHandler, applyDirection, buildLineSyncedParts, createLyricsLine, deriveSyncType, disableRichsync, findNearestAgent, hideCredits, isNearestLyricRtl, newLineData, } from "./inject.js";
 import { refreshInstrumentalImages } from "./imageHighlights.js";
 import { createInstrumentalElement } from "./instrumental.js";
@@ -78,7 +78,7 @@ export function setLyrics(engine, mount, lyrics, options) {
         container.dataset.browserEngine = "gecko";
     mount.replaceChildren(container);
     const allZero = lyrics.every(item => item.startTimeMs === 0);
-    const seek = (timeS) => engine.host.seek(timeS);
+    const seek = (timeS) => engine.host.seek(playerTimeForLyricTime(engine, timeS));
     const lines = [];
     const syncType = deriveSyncType(lyrics);
     const languages = resolveLyricLanguages(lyrics, options.language);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@braccato/core",
-  "version": "1.16.10",
+  "version": "1.16.12",
   "description": "Synchronized lyrics renderer with word-by-word animations",
   "type": "module",
   "license": "MIT",