yesididntneedthatfix

MarcoMadera · Sep 4, 2023 · bdade79 · bdade79
1 parent 78b4897
commit bdade79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/utils/applyLyricLinePositionAndColor.ts b/utils/applyLyricLinePositionAndColor.ts
@@ -1,3 +1,4 @@
+import { findIndexOrLast } from "./findIndexOrLast";
 import {
   LINE_HEIGHT,
   LYRICS_PADDING_LEFT,
@@ -14,9 +15,9 @@ export function applyLyricLinePositionAndColor(
   containerHeight: number
 ): void {
   const containerMiddle = containerHeight / 2;
-  const currentLineIndex = Math.max(
-    allLines.findIndex((line) => line.type === "current"),
-    allLines.length - 1
+  const currentLineIndex = findIndexOrLast(
+    allLines,
+    (line) => line.type === "current"
   );
 
   allLines.forEach((line, index) => {

diff --git a/utils/findIndexOrLast.ts b/utils/findIndexOrLast.ts
@@ -0,0 +1,7 @@
+export function findIndexOrLast<T>(
+  arr: T[],
+  predicate: (element: T) => boolean
+): number {
+  const index = arr.findIndex(predicate);
+  return index !== -1 ? index : arr.length - 1;
+}