diff --git a/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts b/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts index b6558227..fba985f0 100644 --- a/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts +++ b/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts @@ -40,6 +40,7 @@ export const useCurrentSongRowStyles = ({ tableRef }: UseCurrentSongRowStylesPro return { 'current-song': (params) => { return ( + currentSong?.id !== undefined && params?.data?.id === currentSong?.id && params?.data?.albumId === currentSong?.albumId ); diff --git a/src/renderer/components/virtual-table/index.tsx b/src/renderer/components/virtual-table/index.tsx index 42c7ab92..890de587 100644 --- a/src/renderer/components/virtual-table/index.tsx +++ b/src/renderer/components/virtual-table/index.tsx @@ -280,10 +280,14 @@ const tableColumns: { [key: string]: ColDef } = { cellClass: 'row-index', cellClassRules: { 'current-playlist-song-cell': (params) => { - return params.data?.uniqueId === params.context?.currentSong?.uniqueId; + return ( + params.context?.currentSong?.uniqueId !== undefined && + params.data?.uniqueId === params.context?.currentSong?.uniqueId + ); }, 'current-song-cell': (params) => { return ( + params.context?.currentSong?.id !== undefined && params.data?.id === params.context?.currentSong?.id && params.data?.albumId === params.context?.currentSong?.albumId ); @@ -363,6 +367,7 @@ const tableColumns: { [key: string]: ColDef } = { cellClassRules: { 'current-song-cell': (params) => { return ( + params.context?.currentSong?.id !== undefined && params.data?.id === params.context?.currentSong?.id && params.data?.albumId === params.context?.currentSong?.albumId );