diff --git a/src/renderer/api/personalFM.ts b/src/renderer/api/personalFM.ts index fd9cccc..f4614bf 100644 --- a/src/renderer/api/personalFM.ts +++ b/src/renderer/api/personalFM.ts @@ -1,7 +1,7 @@ import request from '@/renderer/utils/request' export enum PersonalFMApiNames { - FETCH_PERSONAL_FM = 'fetchPersonalFM', + FetchPersonalFm = 'fetchPersonalFM', } export interface PersonalMusic { diff --git a/src/renderer/api/search.ts b/src/renderer/api/search.ts index 10aeb98..dc9cf0a 100644 --- a/src/renderer/api/search.ts +++ b/src/renderer/api/search.ts @@ -14,7 +14,7 @@ export function search(params: SearchParams): Promise { method: 'get', params: { ...params, - type: SearchTypes[params.type ?? SearchTypes.ALL], + type: SearchTypes[params.type ?? SearchTypes.All], }, }) } diff --git a/src/renderer/components/CoverRow.tsx b/src/renderer/components/CoverRow.tsx index 37ecd91..fe8d995 100644 --- a/src/renderer/components/CoverRow.tsx +++ b/src/renderer/components/CoverRow.tsx @@ -6,10 +6,10 @@ import { prefetchPlaylist } from '@/renderer/hooks/usePlaylist' import { formatDate, resizeImage, scrollToTop } from '@/renderer/utils/common' export enum Subtitle { - COPYWRITER = 'copywriter', - CREATOR = 'creator', - TYPE_RELEASE_YEAR = 'type+releaseYear', - ARTIST = 'artist', + Copywriter = 'copywriter', + Creator = 'creator', + TypeReleaseYear = 'type+releaseYear', + Artist = 'artist', } const Title = ({ @@ -62,10 +62,10 @@ const getSubtitleText = ( }[('type' in item && typeof item.type !== 'number' && item.type) || 'unknown'] const table = { - [Subtitle.CREATOR]: `by ${nickname}`, - [Subtitle.TYPE_RELEASE_YEAR]: `${type} · ${releaseYear}`, - [Subtitle.ARTIST]: artist, - [Subtitle.COPYWRITER]: copywriter, + [Subtitle.Creator]: `by ${nickname}`, + [Subtitle.TypeReleaseYear]: `${type} · ${releaseYear}`, + [Subtitle.Artist]: artist, + [Subtitle.Copywriter]: copywriter, } return table[subtitle] @@ -84,7 +84,7 @@ const CoverRow = ({ albums, artists, playlists, - subtitle = Subtitle.COPYWRITER, + subtitle = Subtitle.Copywriter, seeMoreLink, isSkeleton, className, diff --git a/src/renderer/components/FMCard.tsx b/src/renderer/components/FMCard.tsx index bbb1f86..e1ad056 100644 --- a/src/renderer/components/FMCard.tsx +++ b/src/renderer/components/FMCard.tsx @@ -39,7 +39,7 @@ const MediaControls = () => { className='h-6 w-6' name={ playerSnapshot.mode === PlayerMode.FM && - [PlayerState.PLAYING, PlayerState.LOADING].includes(state) + [PlayerState.Playing, PlayerState.Loading].includes(state) ? 'pause' : 'play' } diff --git a/src/renderer/components/Lyric/Player.tsx b/src/renderer/components/Lyric/Player.tsx index dfeb5b6..a2be5fe 100644 --- a/src/renderer/components/Lyric/Player.tsx +++ b/src/renderer/components/Lyric/Player.tsx @@ -123,7 +123,7 @@ const Controls = () => { { { const playerSnapshot = useSnapshot(player) const switchRepeatMode = () => { - if (playerSnapshot.repeatMode === PlayerRepeatMode.OFF) { - player.repeatMode = PlayerRepeatMode.ON - } else if (playerSnapshot.repeatMode === PlayerRepeatMode.ON) { - player.repeatMode = PlayerRepeatMode.ONE + if (playerSnapshot.repeatMode === PlayerRepeatMode.Off) { + player.repeatMode = PlayerRepeatMode.On + } else if (playerSnapshot.repeatMode === PlayerRepeatMode.On) { + player.repeatMode = PlayerRepeatMode.One } else { - player.repeatMode = PlayerRepeatMode.OFF + player.repeatMode = PlayerRepeatMode.Off } } @@ -157,11 +157,11 @@ const Others = () => { { min={0} max={(track.dt ?? 0) / 1000} value={ - state === PlayerState.PLAYING || state === PlayerState.PAUSED + state === PlayerState.Playing || state === PlayerState.Paused ? progress : 0 } diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx index cab86f5..a8a7404 100644 --- a/src/renderer/components/Sidebar.tsx +++ b/src/renderer/components/Sidebar.tsx @@ -82,7 +82,7 @@ const Playlists = () => { } > {playlist.name} - {playlistMode === TrackListSourceType.PLAYLIST && + {playlistMode === TrackListSourceType.Playlist && mode === Mode.TrackList && currentPlaylistID === playlist.id && ( diff --git a/src/renderer/components/Topbar.tsx b/src/renderer/components/Topbar.tsx index f9ab98d..8f5718e 100644 --- a/src/renderer/components/Topbar.tsx +++ b/src/renderer/components/Topbar.tsx @@ -6,16 +6,16 @@ import { resizeImage } from '@/renderer/utils/common' const NavigationButtons = () => { const navigate = useNavigate() enum ACTION { - BACK = 'back', - FORWARD = 'forward', + Back = 'back', + Forward = 'forward', } const handleNavigate = (action: ACTION) => { - if (action === ACTION.BACK) navigate(-1) - if (action === ACTION.FORWARD) navigate(1) + if (action === ACTION.Back) navigate(-1) + if (action === ACTION.Forward) navigate(1) } return (
- {[ACTION.BACK, ACTION.FORWARD].map(action => ( + {[ACTION.Back, ACTION.Forward].map(action => (
handleNavigate(action)} key={action} diff --git a/src/renderer/components/TracksAlbum.tsx b/src/renderer/components/TracksAlbum.tsx index d964f20..af0f912 100644 --- a/src/renderer/components/TracksAlbum.tsx +++ b/src/renderer/components/TracksAlbum.tsx @@ -18,7 +18,7 @@ const PlayOrPauseButtonInTrack = memo( const playerSnapshot = useSnapshot(player) const isPlaying = useMemo( - () => playerSnapshot.state === PlayerState.PLAYING, + () => playerSnapshot.state === PlayerState.Playing, [playerSnapshot.state] ) diff --git a/src/renderer/hooks/useAlbum.ts b/src/renderer/hooks/useAlbum.ts index 9cce5c0..ebce0ec 100644 --- a/src/renderer/hooks/useAlbum.ts +++ b/src/renderer/hooks/useAlbum.ts @@ -18,7 +18,7 @@ const fetch = async (params: FetchAlbumParams, noCache?: boolean) => { export default function useAlbum(params: FetchAlbumParams, noCache?: boolean) { return useQuery( - [AlbumApiNames.FETCH_ALBUM, params.id], + [AlbumApiNames.FetchAlbum, params.id], () => fetch(params, noCache), { enabled: !!params.id, @@ -36,7 +36,7 @@ export default function useAlbum(params: FetchAlbumParams, noCache?: boolean) { export function fetchAlbumWithReactQuery(params: FetchAlbumParams) { return reactQueryClient.fetchQuery( - [AlbumApiNames.FETCH_ALBUM, params.id], + [AlbumApiNames.FetchAlbum, params.id], () => fetch(params), { staleTime: Infinity, @@ -46,7 +46,7 @@ export function fetchAlbumWithReactQuery(params: FetchAlbumParams) { export async function prefetchAlbum(params: FetchAlbumParams) { await reactQueryClient.prefetchQuery( - [AlbumApiNames.FETCH_ALBUM, params.id], + [AlbumApiNames.FetchAlbum, params.id], () => fetch(params), { staleTime: Infinity, diff --git a/src/renderer/hooks/useArtist.ts b/src/renderer/hooks/useArtist.ts index 3a839f2..9e9adb5 100644 --- a/src/renderer/hooks/useArtist.ts +++ b/src/renderer/hooks/useArtist.ts @@ -12,7 +12,7 @@ export default function useArtist( noCache?: boolean ) { return useQuery( - [ArtistApiNames.FETCH_ARTIST, params], + [ArtistApiNames.FetchArtist, params], () => fetchArtist(params, !!noCache), { enabled: !!params.id && params.id > 0 && !isNaN(Number(params.id)), diff --git a/src/renderer/hooks/useArtistAlbums.ts b/src/renderer/hooks/useArtistAlbums.ts index 9a8bb53..b58e5bf 100644 --- a/src/renderer/hooks/useArtistAlbums.ts +++ b/src/renderer/hooks/useArtistAlbums.ts @@ -9,7 +9,7 @@ import { export default function useUserAlbums(params: FetchArtistAlbumsParams) { return useQuery( - [ArtistApiNames.FETCH_ARTIST_ALBUMS, params], + [ArtistApiNames.FetchArtistAlbums, params], async () => { const data = await fetchArtistAlbums(params) return data diff --git a/src/renderer/hooks/useLyric.ts b/src/renderer/hooks/useLyric.ts index 2071770..9e26ae3 100644 --- a/src/renderer/hooks/useLyric.ts +++ b/src/renderer/hooks/useLyric.ts @@ -10,7 +10,7 @@ import { IpcChannels } from '@/shared/IpcChannels' export default function useLyric(params: FetchLyricParams) { return useQuery( - [TrackApiNames.FETCH_LYRIC, params], + [TrackApiNames.FetchLyric, params], () => { return fetchLyric(params) }, @@ -31,7 +31,7 @@ export default function useLyric(params: FetchLyricParams) { export function fetchTracksWithReactQuery(params: FetchLyricParams) { return reactQueryClient.fetchQuery( - [TrackApiNames.FETCH_LYRIC, params], + [TrackApiNames.FetchLyric, params], () => { return fetchLyric(params) }, diff --git a/src/renderer/hooks/usePersonalFM.ts b/src/renderer/hooks/usePersonalFM.ts index b5a826d..4042456 100644 --- a/src/renderer/hooks/usePersonalFM.ts +++ b/src/renderer/hooks/usePersonalFM.ts @@ -3,7 +3,7 @@ import reactQueryClient from '@/renderer/utils/reactQueryClient' export function fetchPersonalFMWithReactQuery() { return reactQueryClient.fetchQuery( - PersonalFMApiNames.FETCH_PERSONAL_FM, + PersonalFMApiNames.FetchPersonalFm, async () => { const data = await fetchPersonalFM() if (!data.data?.length) { diff --git a/src/renderer/hooks/usePlaylist.ts b/src/renderer/hooks/usePlaylist.ts index 15fe7b7..029cf18 100644 --- a/src/renderer/hooks/usePlaylist.ts +++ b/src/renderer/hooks/usePlaylist.ts @@ -17,7 +17,7 @@ export default function usePlaylist( noCache?: boolean ) { return useQuery( - [PlaylistApiNames.FETCH_PLAYLIST, params], + [PlaylistApiNames.FetchPlaylist, params], () => fetch(params, noCache), { enabled: !!(params.id && params.id > 0 && !isNaN(Number(params.id))), @@ -35,7 +35,7 @@ export default function usePlaylist( export function fetchPlaylistWithReactQuery(params: FetchPlaylistParams) { return reactQueryClient.fetchQuery( - [PlaylistApiNames.FETCH_PLAYLIST, params], + [PlaylistApiNames.FetchPlaylist, params], () => fetch(params), { staleTime: 3600000, @@ -45,7 +45,7 @@ export function fetchPlaylistWithReactQuery(params: FetchPlaylistParams) { export async function prefetchPlaylist(params: FetchPlaylistParams) { await reactQueryClient.prefetchQuery( - [PlaylistApiNames.FETCH_PLAYLIST, params], + [PlaylistApiNames.FetchPlaylist, params], () => fetch(params), { staleTime: 3600000, diff --git a/src/renderer/hooks/useTracks.ts b/src/renderer/hooks/useTracks.ts index 5404eca..ee87bce 100644 --- a/src/renderer/hooks/useTracks.ts +++ b/src/renderer/hooks/useTracks.ts @@ -12,7 +12,7 @@ import { APIs } from '@/shared/CacheAPIs' export default function useTracks(params: FetchTracksParams) { return useQuery( - [TrackApiNames.FETCH_TRACKS, params], + [TrackApiNames.FetchTracks, params], () => { return fetchTracks(params) }, @@ -33,7 +33,7 @@ export default function useTracks(params: FetchTracksParams) { export function fetchTracksWithReactQuery(params: FetchTracksParams) { return reactQueryClient.fetchQuery( - [TrackApiNames.FETCH_TRACKS, params], + [TrackApiNames.FetchTracks, params], () => { return fetchTracks(params) }, @@ -49,7 +49,7 @@ export function fetchTracksWithReactQuery(params: FetchTracksParams) { export function fetchAudioSourceWithReactQuery(params: FetchAudioSourceParams) { return reactQueryClient.fetchQuery( - [TrackApiNames.FETCH_AUDIO_SOURCE, params], + [TrackApiNames.FetchAudioSource, params], () => { return fetchAudioSource(params) }, diff --git a/src/renderer/hooks/useTracksInfinite.ts b/src/renderer/hooks/useTracksInfinite.ts index df49c5d..e95a079 100644 --- a/src/renderer/hooks/useTracksInfinite.ts +++ b/src/renderer/hooks/useTracksInfinite.ts @@ -1,12 +1,12 @@ import { FetchTracksParams, TrackApiNames } from '@/shared/api/Track' -import { fetchTracks } from 'api/track' +import { fetchTracks } from '../api/track' // 100 tracks each page const offset = 100 export default function useTracksInfinite(params: FetchTracksParams) { return useInfiniteQuery( - [TrackApiNames.FETCH_TRACKS, params], + [TrackApiNames.FetchTracks, params], ({ pageParam = 0 }) => { const cursorStart = pageParam * offset const cursorEnd = cursorStart + offset diff --git a/src/renderer/hooks/useUser.ts b/src/renderer/hooks/useUser.ts index 2bf31ef..926f354 100644 --- a/src/renderer/hooks/useUser.ts +++ b/src/renderer/hooks/useUser.ts @@ -4,7 +4,7 @@ import { APIs } from '@/shared/CacheAPIs' import { IpcChannels } from '@/shared/IpcChannels' export default function useUser() { - return useQuery(UserApiNames.FETCH_USER_ACCOUNT, fetchUserAccount, { + return useQuery(UserApiNames.FetchUserAccount, fetchUserAccount, { refetchOnWindowFocus: true, placeholderData: (): FetchUserAccountResponse | undefined => window.ipcRenderer?.sendSync(IpcChannels.GetApiCacheSync, { diff --git a/src/renderer/hooks/useUserAlbums.ts b/src/renderer/hooks/useUserAlbums.ts index 5d0af28..5dc6f21 100644 --- a/src/renderer/hooks/useUserAlbums.ts +++ b/src/renderer/hooks/useUserAlbums.ts @@ -8,12 +8,12 @@ import { UserApiNames, FetchUserAlbumsResponse, } from '@/shared/api/User' -import { fetchUserAlbums } from 'api/user' +import { fetchUserAlbums } from '../api/user' export default function useUserAlbums(params: FetchUserAlbumsParams = {}) { const { data: user } = useUser() return useQuery( - [UserApiNames.FETCH_USER_ALBUMS, user?.profile?.userId ?? 0], + [UserApiNames.FetchUserAlbums, user?.profile?.userId ?? 0], () => fetchUserAlbums(params), { refetchOnWindowFocus: true, @@ -31,7 +31,7 @@ export const useMutationLikeAAlbum = () => { const { data: user } = useUser() const { data: userAlbums } = useUserAlbums({ limit: 2000 }) const uid = user?.account?.id ?? 0 - const key = [UserApiNames.FETCH_USER_ALBUMS, uid] + const key = [UserApiNames.FetchUserAlbums, uid] return useMutation( async (album: Album) => { diff --git a/src/renderer/hooks/useUserArtists.ts b/src/renderer/hooks/useUserArtists.ts index a4060b8..ac351d3 100644 --- a/src/renderer/hooks/useUserArtists.ts +++ b/src/renderer/hooks/useUserArtists.ts @@ -4,7 +4,7 @@ import { APIs } from '@/shared/CacheAPIs' import { IpcChannels } from '@/shared/IpcChannels' export default function useUserArtists() { - return useQuery([UserApiNames.FETCH_USER_ARTIST], fetchUserArtists, { + return useQuery([UserApiNames.FetchUserArtist], fetchUserArtists, { refetchOnWindowFocus: true, placeholderData: (): FetchUserArtistsResponse => window.ipcRenderer?.sendSync(IpcChannels.GetApiCacheSync, { diff --git a/src/renderer/hooks/useUserLikedTracksIDs.ts b/src/renderer/hooks/useUserLikedTracksIDs.ts index c3c757d..c87a6ca 100644 --- a/src/renderer/hooks/useUserLikedTracksIDs.ts +++ b/src/renderer/hooks/useUserLikedTracksIDs.ts @@ -3,7 +3,7 @@ import useUser from './useUser' import { useQueryClient } from 'react-query' import { IpcChannels } from '@/shared/IpcChannels' import { APIs } from '@/shared/CacheAPIs' -import { fetchUserLikedTracksIDs } from 'api/user' +import { fetchUserLikedTracksIDs } from '../api/user' import { FetchUserLikedTracksIDsResponse, UserApiNames, @@ -14,7 +14,7 @@ export default function useUserLikedTracksIDs() { const uid = user?.account?.id ?? 0 return useQuery( - [UserApiNames.FETCH_USER_LIKED_TRACKS_IDS, uid], + [UserApiNames.FetchUserLikedTracksIds, uid], () => fetchUserLikedTracksIDs({ uid }), { enabled: !!(uid && uid !== 0), @@ -35,7 +35,7 @@ export const useMutationLikeATrack = () => { const { data: user } = useUser() const { data: userLikedSongs } = useUserLikedTracksIDs() const uid = user?.account?.id ?? 0 - const key = [UserApiNames.FETCH_USER_LIKED_TRACKS_IDS, uid] + const key = [UserApiNames.FetchUserLikedTracksIds, uid] return useMutation( async (trackID: number) => { diff --git a/src/renderer/hooks/useUserPlaylists.ts b/src/renderer/hooks/useUserPlaylists.ts index ff2d8db..95e8f31 100644 --- a/src/renderer/hooks/useUserPlaylists.ts +++ b/src/renderer/hooks/useUserPlaylists.ts @@ -3,7 +3,7 @@ import { useQueryClient } from 'react-query' import useUser from './useUser' import { IpcChannels } from '@/shared/IpcChannels' import { APIs } from '@/shared/CacheAPIs' -import { fetchUserPlaylists } from 'api/user' +import { fetchUserPlaylists } from '@/renderer/api/user' import { FetchUserPlaylistsResponse, UserApiNames } from '@/shared/api/User' export default function useUserPlaylists() { @@ -17,7 +17,7 @@ export default function useUserPlaylists() { } return useQuery( - [UserApiNames.FETCH_USER_PLAYLISTS, uid], + [UserApiNames.FetchUserPlaylists, uid], async () => { if (!params.uid) { throw new Error('请登录后再请求用户收藏的歌单') @@ -48,7 +48,7 @@ export const useMutationLikeAPlaylist = () => { const { data: user } = useUser() const { data: userPlaylists } = useUserPlaylists() const uid = user?.account?.id ?? 0 - const key = [UserApiNames.FETCH_USER_PLAYLISTS, uid] + const key = [UserApiNames.FetchUserPlaylists, uid] return useMutation( async (playlist: Playlist) => { diff --git a/src/renderer/pages/Album.tsx b/src/renderer/pages/Album.tsx index c8fa19a..57299b8 100644 --- a/src/renderer/pages/Album.tsx +++ b/src/renderer/pages/Album.tsx @@ -23,7 +23,6 @@ import useTracks from '@/renderer/hooks/useTracks' import useUserAlbums, { useMutationLikeAAlbum, } from '@/renderer/hooks/useUserAlbums' -import useUser from '@/renderer/hooks/useUser' const PlayButton = ({ album, @@ -38,7 +37,7 @@ const PlayButton = ({ const isThisAlbumPlaying = useMemo( () => playerSnapshot.mode === PlayerMode.TrackList && - playerSnapshot.trackListSource?.type === TrackListSourceType.ALBUM && + playerSnapshot.trackListSource?.type === TrackListSourceType.Album && playerSnapshot.trackListSource?.id === album?.id, [ playerSnapshot.mode, @@ -50,7 +49,7 @@ const PlayButton = ({ const isPlaying = isThisAlbumPlaying && - [PlayerState.PLAYING, PlayerState.LOADING].includes(playerSnapshot.state) + [PlayerState.Playing, PlayerState.Loading].includes(playerSnapshot.state) const wrappedHandlePlay = () => { if (isThisAlbumPlaying) { @@ -301,7 +300,7 @@ const MoreAlbum = ({ album }: { album: Album | undefined }) => { albums={ filteredAlbums.length ? filteredAlbums : albums?.hotAlbums || [] } - subtitle={Subtitle.TYPE_RELEASE_YEAR} + subtitle={Subtitle.TypeReleaseYear} isSkeleton={isLoading} rows={1} navigateCallback={scrollToTop} diff --git a/src/renderer/pages/Artist.tsx b/src/renderer/pages/Artist.tsx index 68f5720..868a574 100644 --- a/src/renderer/pages/Artist.tsx +++ b/src/renderer/pages/Artist.tsx @@ -207,7 +207,7 @@ const Artist = () => {
)} @@ -220,7 +220,7 @@ const Artist = () => { )} diff --git a/src/renderer/pages/Home.tsx b/src/renderer/pages/Home.tsx index 937c012..e92a311 100644 --- a/src/renderer/pages/Home.tsx +++ b/src/renderer/pages/Home.tsx @@ -14,7 +14,7 @@ export default function Home() { data: dailyRecommendPlaylists, isLoading: isLoadingDailyRecommendPlaylists, } = useQuery( - PlaylistApiNames.FETCH_DAILY_RECOMMEND_PLAYLISTS, + PlaylistApiNames.FetchDailyRecommendPlaylists, fetchDailyRecommendPlaylists, { retry: false, @@ -29,7 +29,7 @@ export default function Home() { data: recommendedPlaylists, isLoading: isLoadingRecommendedPlaylists, } = useQuery( - PlaylistApiNames.FETCH_RECOMMENDED_PLAYLISTS, + PlaylistApiNames.FetchRecommendedPlaylists, () => { return fetchRecommendedPlaylists({}) }, diff --git a/src/renderer/pages/Library.tsx b/src/renderer/pages/Library.tsx index 39893a0..06d1be6 100644 --- a/src/renderer/pages/Library.tsx +++ b/src/renderer/pages/Library.tsx @@ -127,7 +127,7 @@ const Playlists = () => {
) @@ -140,7 +140,7 @@ const Albums = () => { return (
- +
) } @@ -150,7 +150,7 @@ const Artists = () => { return (
- +
) } diff --git a/src/renderer/pages/Login.tsx b/src/renderer/pages/Login.tsx index aa66fc2..8764762 100644 --- a/src/renderer/pages/Login.tsx +++ b/src/renderer/pages/Login.tsx @@ -12,9 +12,9 @@ import { setCookies } from '@/renderer/utils/cookie' import { useInterval } from 'react-use' enum Method { - QRCODE = 'qrcode', - EMAIL = 'email', - PHONE = 'phone', + QrCode = 'qrcode', + Email = 'email', + Phone = 'phone', } // Shared components and methods @@ -152,15 +152,15 @@ const OtherLoginMethods = ({ name: string }[] = [ { - id: Method.QRCODE, + id: Method.QrCode, name: '二维码', }, { - id: Method.EMAIL, + id: Method.Email, name: '邮箱', }, { - id: Method.PHONE, + id: Method.Phone, name: '手机', }, ] @@ -393,14 +393,14 @@ const LoginWithQRCode = () => { } export default function Login() { - const [method, setMethod] = useState(Method.PHONE) + const [method, setMethod] = useState(Method.Phone) return (
- {method === Method.EMAIL && } - {method === Method.PHONE && } - {method === Method.QRCODE && } + {method === Method.Email && } + {method === Method.Phone && } + {method === Method.QrCode && }
diff --git a/src/renderer/pages/Playlist.tsx b/src/renderer/pages/Playlist.tsx index 639d4ae..7f1ee2a 100644 --- a/src/renderer/pages/Playlist.tsx +++ b/src/renderer/pages/Playlist.tsx @@ -33,7 +33,7 @@ const PlayButton = ({ const isThisPlaylistPlaying = useMemo( () => playerSnapshot.mode === PlayerMode.TrackList && - playerSnapshot.trackListSource?.type === TrackListSourceType.PLAYLIST && + playerSnapshot.trackListSource?.type === TrackListSourceType.Playlist && playerSnapshot.trackListSource?.id === playlist?.id, [ playerSnapshot.mode, @@ -53,7 +53,7 @@ const PlayButton = ({ const isPlaying = isThisPlaylistPlaying && - [PlayerState.PLAYING, PlayerState.LOADING].includes(playerSnapshot.state) + [PlayerState.Playing, PlayerState.Loading].includes(playerSnapshot.state) return (