fix(lyric): fix spicetify lyric bug

resolve #678
organization · Feb 26, 2024 · beecd44 · beecd44
1 parent 5f76040
commit beecd44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/common/provider/types.ts b/common/provider/types.ts
@@ -16,7 +16,7 @@ export type LyricMetadata = {
 };
 
 export type LyricData = LyricMetadata & {
-  lyric: Record<number, string[]>;
+  lyric?: Record<number, string[]>;
   lyricRaw?: string;
   register?: LyricRegister;
 };

diff --git a/renderer/components/PlayingInfoProvider.tsx b/renderer/components/PlayingInfoProvider.tsx
@@ -183,13 +183,11 @@ const PlayingInfoProvider = (props: { children: JSX.Element }) => {
       }
       case 'player': {
         const lyricsFromPlayer = playerLyrics();
-        if (lyricsFromPlayer) {
-          lyricData = {
-            id: 'player',
-            title: data.title ?? '',
-            lyric: lyricsFromPlayer,
-          } satisfies LyricData;
-        }
+        lyricData = {
+          id: 'player',
+          title: data.title ?? '',
+          lyric: lyricsFromPlayer ?? undefined,
+        } satisfies LyricData;
         break;
       }
       default: { // AUTO
@@ -212,7 +210,7 @@ const PlayingInfoProvider = (props: { children: JSX.Element }) => {
 
     setIsMapped(!!mapperData);
     setOriginalLyric(lyricData);
-    if (lyricData) {
+    if (lyricData?.lyric) {
       const treeMap = new FlatMap<number, string[]>();
 
       for (const key in lyricData.lyric) {

diff --git a/renderer/hooks/useLyric.ts b/renderer/hooks/useLyric.ts
@@ -38,8 +38,8 @@ const useLyric = () => {
     return last;
   };
 
-  const lyric = createMemo(() => lastIter()?.second);
-  const index = createMemo(() => lastIter()?.first);
+  const lyric = createMemo(() => lastIter()?.value ? lastIter()?.second : null);
+  const index = createMemo(() => lastIter()?.value ? lastIter()?.first : null);
 
   const nextLyricsIter = createMemo(() => {
     let nextLyricLength = style().lyric.nextLyric;
@@ -94,7 +94,7 @@ const useLyric = () => {
   });
   const lyricRange = createMemo(() => {
     const now = lastIter();
-    if (!now) return null;
+    if (!now || now.value === undefined) return null;
 
     const prevIter = previousLyricsIter() ?? now;
     const nextIter = nextLyricsIter() ?? now;