From e6b1b91c0129a64a115d82156d4b4b85d7bbc9e2 Mon Sep 17 00:00:00 2001
From: memorydream <34763046+memorydream@users.noreply.github.com>
Date: Tue, 12 Apr 2022 22:20:56 +0800
Subject: [PATCH] fix: bugs (#1525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(component/Lyric): 点击歌手名字跳转后不会关闭歌词面板

* fix: 移除build.sqlite3.js中的dll复制

当前使用的better-sqlite3版本已经支持仅单个node文件，不需要也不再构建dll文件

* fix: 对歌词使用更精确的key，避免多个歌词时间相同时的key相同错误

* update
---
 scripts/build.sqlite3.js                  | 6 ------
 src/renderer/components/ArtistsInline.tsx | 9 ++++++++-
 src/renderer/components/Lyric/Lyric.tsx   | 2 +-
 src/renderer/components/Lyric/Lyric2.tsx  | 2 +-
 src/renderer/components/Lyric/Player.tsx  | 7 ++++++-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/build.sqlite3.js b/scripts/build.sqlite3.js
index a0de3e5..8a61694 100644
--- a/scripts/build.sqlite3.js
+++ b/scripts/build.sqlite3.js
@@ -100,12 +100,6 @@ const build = async arch => {
         './node_modules/better-sqlite3/build/Release/better_sqlite3.node',
         `./dist/main/better_sqlite3_${arch}.node`
       )
-      if (isWin) {
-        fs.copyFileSync(
-          './node_modules/better-sqlite3/build/Release/sqlite3.dll',
-          './dist/main/sqlite3.dll'
-        )
-      }
     })
     .catch(e => {
       console.error(pc.red('Build failed!'))
diff --git a/src/renderer/components/ArtistsInline.tsx b/src/renderer/components/ArtistsInline.tsx
index 0210d44..a415e30 100644
--- a/src/renderer/components/ArtistsInline.tsx
+++ b/src/renderer/components/ArtistsInline.tsx
@@ -2,16 +2,23 @@ const ArtistInline = ({
   artists,
   className,
   disableLink,
+  onClick,
 }: {
   artists: Artist[]
   className?: string
   disableLink?: boolean
+  onClick?: (artistId: number) => void
 }) => {
   if (!artists) return <div></div>
 
   const navigate = useNavigate()
   const handleClick = (id: number) => {
-    id !== 0 && !disableLink && navigate(`/artist/${id}`)
+    if (id === 0 || disableLink) return
+    if (!onClick) {
+      navigate(`/artist/${id}`)
+    } else {
+      onClick(id)
+    }
   }
 
   return (
diff --git a/src/renderer/components/Lyric/Lyric.tsx b/src/renderer/components/Lyric/Lyric.tsx
index 7527e50..cdd2ef4 100644
--- a/src/renderer/components/Lyric/Lyric.tsx
+++ b/src/renderer/components/Lyric/Lyric.tsx
@@ -95,7 +95,7 @@ const Lyric = ({ className }: { className?: string }) => {
       {displayLines.map(({ content, time }, index) => {
         return (
           <motion.div
-            key={time}
+            key={`${String(index)}-${String(time)}`}
             custom={index}
             variants={variants}
             initial={'initial'}
diff --git a/src/renderer/components/Lyric/Lyric2.tsx b/src/renderer/components/Lyric/Lyric2.tsx
index c1f0147..0219c09 100644
--- a/src/renderer/components/Lyric/Lyric2.tsx
+++ b/src/renderer/components/Lyric/Lyric2.tsx
@@ -61,7 +61,7 @@ const Lyric = ({ className }: { className?: string }) => {
         return (
           <motion.div
             id={String(time)}
-            key={time}
+            key={`${String(index)}-${String(time)}`}
             className={classNames(
               'max-w-[78%] py-[calc(100vw_*_0.0111)] text-white duration-700'
             )}
diff --git a/src/renderer/components/Lyric/Player.tsx b/src/renderer/components/Lyric/Player.tsx
index 2f60544..05d13ee 100644
--- a/src/renderer/components/Lyric/Player.tsx
+++ b/src/renderer/components/Lyric/Player.tsx
@@ -40,6 +40,11 @@ const PlayingTrack = () => {
     state.uiStates.showLyricPanel = false
   }
 
+  const toArtist = (id: number) => {
+    navigate(`/artist/${id}`)
+    state.uiStates.showLyricPanel = false
+  }
+
   return (
     <div>
       <div
@@ -52,7 +57,7 @@ const PlayingTrack = () => {
         {track?.name}
       </div>
       <div className='line-clamp-1 -mt-0.5 inline-flex max-h-7 text-white opacity-60'>
-        <ArtistInline artists={track?.ar ?? []} />
+        <ArtistInline artists={track?.ar ?? []} onClick={toArtist} />
         {!!track?.al?.id && (
           <span>
             {' '}