From ab49735268a8280dd9dcc6a40d941279ffa11194 Mon Sep 17 00:00:00 2001 From: jeffvli Date: Sat, 22 Nov 2025 04:21:22 -0800 Subject: [PATCH] adjust sidebar styles --- .../components/sidebar-item.module.css | 4 +++ .../sidebar/components/sidebar-item.tsx | 1 + .../components/sidebar-playlist-list.tsx | 26 ++++++++----------- .../features/sidebar/components/sidebar.tsx | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/renderer/features/sidebar/components/sidebar-item.module.css b/src/renderer/features/sidebar/components/sidebar-item.module.css index b051c2503..d7d20cefd 100644 --- a/src/renderer/features/sidebar/components/sidebar-item.module.css +++ b/src/renderer/features/sidebar/components/sidebar-item.module.css @@ -9,6 +9,10 @@ } } +.root { + cursor: default; +} + .inner { display: flex; justify-content: flex-start; diff --git a/src/renderer/features/sidebar/components/sidebar-item.tsx b/src/renderer/features/sidebar/components/sidebar-item.tsx index 9881cefa5..3d236ba58 100644 --- a/src/renderer/features/sidebar/components/sidebar-item.tsx +++ b/src/renderer/features/sidebar/components/sidebar-item.tsx @@ -17,6 +17,7 @@ export const SidebarItem = ({ children, className, to, ...props }: SidebarItemPr { [styles.disabled]: props.disabled, [styles.link]: true, + [styles.root]: true, }, className, )} diff --git a/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx b/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx index adbf8a9d3..a02c2c713 100644 --- a/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx +++ b/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx @@ -241,25 +241,23 @@ export const SidebarPlaylistList = () => { [player, server.id], ); - const data = playlistsQuery.data; - const memoizedItemData = useMemo(() => { const base = { handlePlay: handlePlayPlaylist }; - if (!server?.type || !server?.username || !data?.items) { - return { ...base, items: data?.items }; + if (!server?.type || !server?.username || !playlistsQuery.data?.items) { + return { ...base, items: playlistsQuery.data?.items }; } const owned: Array<[boolean, () => void] | Playlist> = []; - for (const playlist of data.items) { + for (const playlist of playlistsQuery.data?.items ?? []) { if (!playlist.owner || playlist.owner === server.username) { owned.push(playlist); } } return { ...base, items: owned }; - }, [data?.items, handlePlayPlaylist, server?.type, server?.username]); + }, [playlistsQuery.data?.items, handlePlayPlaylist, server?.type, server.username]); const handleCreatePlaylistModal = (e: MouseEvent) => { e.stopPropagation(); @@ -275,7 +273,7 @@ export const SidebarPlaylistList = () => { - + {t('page.sidebar.playlists', { postProcess: 'titleCase', })} @@ -351,28 +349,26 @@ export const SidebarSharedPlaylistList = () => { if (!server?.id) return; player.addToQueueByFetch(server.id, [id], LibraryItem.PLAYLIST, playType); }, - [player, server?.id], + [player, server.id], ); - const data = playlistsQuery.data; - const memoizedItemData = useMemo(() => { const base = { handlePlay: handlePlayPlaylist }; - if (!server?.type || !server?.username || !data?.items) { - return { ...base, items: data?.items }; + if (!server?.type || !server?.username || !playlistsQuery.data?.items) { + return { ...base, items: playlistsQuery.data?.items }; } const shared: Playlist[] = []; - for (const playlist of data.items) { + for (const playlist of playlistsQuery.data?.items ?? []) { if (playlist.owner && playlist.owner !== server.username) { shared.push(playlist); } } return { ...base, items: shared }; - }, [data?.items, handlePlayPlaylist, server?.type, server?.username]); + }, [handlePlayPlaylist, playlistsQuery.data?.items, server?.type, server.username]); if (memoizedItemData?.items?.length === 0) { return null; @@ -381,7 +377,7 @@ export const SidebarSharedPlaylistList = () => { return ( - + {t('page.sidebar.shared', { postProcess: 'titleCase', })} diff --git a/src/renderer/features/sidebar/components/sidebar.tsx b/src/renderer/features/sidebar/components/sidebar.tsx index 847534a25..9ab4ba63c 100644 --- a/src/renderer/features/sidebar/components/sidebar.tsx +++ b/src/renderer/features/sidebar/components/sidebar.tsx @@ -133,7 +133,7 @@ export const Sidebar = () => { > - + {t('page.sidebar.myLibrary', { postProcess: 'titleCase', })}