Align fullscreen lyrics across line wraps

app/components/Player/Fullscreen.vue

@@ -61,11 +61,16 @@ nuxtApp.hook("page:finish", () => {
 				@click="closeFullscreen()"
 			/>
 
-			<div class="content-container" :class="{ lyrics: song.lyrics?.text }">
+			<div
-				<PlayerFullscreenTrackDisplay :show-buttons="mouseMovedRecently" />
+				class="content-container"
+				:class="{ lyrics: song.lyrics?.text }"
+			>
+				<PlayerFullscreenTrackDisplay
+					:show-buttons="mouseMovedRecently"
+				/>
 				<PlayerFullscreenLyricsDisplay
 					:animation-duration="0.2"
-					:offset="200"
+					:offset="250"
 					:show-scroll-bar="mouseMovedRecently"
 				/>
 			</div>

app/components/Player/Fullscreen/LyricsDisplay.vue

@@ -78,14 +78,13 @@ const transformY = computed(() => {
 	const lines = containerRef.value?.children
 	if (scrollActiveIndex.value < 0 || !lines?.length) return 0
 
-	const firstLyric = lines[0] as HTMLElement
+	let accumulatedHeight = 0
-	const activeLyric = lines[scrollActiveIndex.value] as HTMLElement
+	for (let i = 0; i < scrollActiveIndex.value; i++) {
-	if (!firstLyric || !activeLyric) return 0
+		const line = lines[i] as HTMLElement | undefined
+		if (line) accumulatedHeight += line.getBoundingClientRect().height
+	}
 
-	return (
+	return -accumulatedHeight
-		firstLyric.getBoundingClientRect().top -
-		activeLyric.getBoundingClientRect().bottom
-	)
 })
 
 const manualOffset = ref(0)
@@ -112,8 +111,7 @@ const onWheel = (event: WheelEvent) => {
 		outerRef.value.offsetHeight,
 		window.innerHeight - 300,
 	)
-	const minTranslate =
+	const minTranslate = -containerRef.value.scrollHeight + lowerViewportLimit
-		-containerRef.value.scrollHeight + lowerViewportLimit
 
 	manualOffset.value = Math.min(
 		maxTranslate,
@@ -132,10 +130,7 @@ const onLyricClick = (time: number) => {
 const finalTransform = computed(() => {
 	if (isScrolling.value) return manualOffset.value
 
-	const lyricsTop = top.value - topFadeExtension
+	return transformY.value + offset + topFadeExtension
-	const guideY = import.meta.client ? window.innerHeight * 0.45 : 0
-	const laterLyricOffset = scrollActiveIndex.value > 0 ? 100 : 0
-	return transformY.value + guideY - lyricsTop + laterLyricOffset
 })
 </script>