-
+
debouncedSetRating(0)}
@@ -123,10 +109,7 @@ export const RemoteContainer = () => {
)}
-
);
}
return (
-
+
{(controls?.cardRows || []).map((row, index) => (
-
diff --git a/src/renderer/components/context-menu/context-menu.tsx b/src/renderer/components/context-menu/context-menu.tsx
index 9658c464..a1d5f69f 100644
--- a/src/renderer/components/context-menu/context-menu.tsx
+++ b/src/renderer/components/context-menu/context-menu.tsx
@@ -35,14 +35,8 @@ export const ContextMenuButton = forwardRef(
onClick={props.onClick}
ref={ref}
>
-
-
+
+
{leftIcon}
{children}
diff --git a/src/renderer/components/feature-carousel/feature-carousel.tsx b/src/renderer/components/feature-carousel/feature-carousel.tsx
index 521ec559..ee6ed5a2 100644
--- a/src/renderer/components/feature-carousel/feature-carousel.tsx
+++ b/src/renderer/components/feature-carousel/feature-carousel.tsx
@@ -77,11 +77,7 @@ export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
className={styles.wrapper}
to={generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, { albumId: currentItem?.id || '' })}
>
-
+
{data && (
{
/>
-
+
{
diff --git a/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx b/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx
index 380ecacc..82c9401a 100644
--- a/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx
+++ b/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx
@@ -86,10 +86,7 @@ export const GridCardControls = ({
onClick={handlePlay}
variant="filled"
>
-
{currentItem?.albumArtists.slice(0, 1).map((artist) => (
-
+
{artist.name}
))}
diff --git a/src/renderer/components/grid-carousel/grid-carousel.tsx b/src/renderer/components/grid-carousel/grid-carousel.tsx
index 0bbf067d..2075003b 100644
--- a/src/renderer/components/grid-carousel/grid-carousel.tsx
+++ b/src/renderer/components/grid-carousel/grid-carousel.tsx
@@ -60,10 +60,7 @@ const Title = ({ handleNext, handlePrev, label, pagination }: TitleProps) => {
{isValidElement(label) ? (
label
) : (
-
+
{label}
)}
@@ -280,11 +277,7 @@ export const SwiperGridCarousel = ({
}, []);
return (
-
+
{title ? (
+
+
-
+
{children}
diff --git a/src/renderer/components/query-builder/index.tsx b/src/renderer/components/query-builder/index.tsx
index 83fcf7db..a87c1cac 100644
--- a/src/renderer/components/query-builder/index.tsx
+++ b/src/renderer/components/query-builder/index.tsx
@@ -99,10 +99,7 @@ export const QueryBuilder = ({
};
return (
-
-
{itemType !== LibraryItem.PLAYLIST && (
diff --git a/src/renderer/components/virtual-grid/grid-card/poster-card.tsx b/src/renderer/components/virtual-grid/grid-card/poster-card.tsx
index 3c168f7c..fb8d5bef 100644
--- a/src/renderer/components/virtual-grid/grid-card/poster-card.tsx
+++ b/src/renderer/components/virtual-grid/grid-card/poster-card.tsx
@@ -73,17 +73,11 @@ export const PosterCard = ({
margin: controls.itemGap,
}}
>
-
);
}
@@ -62,11 +58,7 @@ export const CombinedTitleCell = ({
width: `${(node.rowHeight || 40) - 10}px`,
}}
>
- navigate(path)}
- >
+
-
);
}
return (
-
+
{value?.map((item: AlbumArtist | Artist, index: number) => (
{index > 0 &&
) : (
-
+
{item.name || '—'}
)}
diff --git a/src/renderer/components/virtual-table/cells/artist-cell.tsx b/src/renderer/components/virtual-table/cells/artist-cell.tsx
index fa8cc53f..bbbb66a7 100644
--- a/src/renderer/components/virtual-table/cells/artist-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/artist-cell.tsx
@@ -15,21 +15,14 @@ export const ArtistCell = ({ data, value }: ICellRendererParams) => {
if (value === undefined) {
return (
-
);
}
return (
-
+
{value?.map((item: AlbumArtist | Artist, index: number) => (
{index > 0 &&
) : (
-
+
{item.name || '—'}
)}
diff --git a/src/renderer/components/virtual-table/cells/combined-title-cell.tsx b/src/renderer/components/virtual-table/cells/combined-title-cell.tsx
index bffe9862..ba21d7e3 100644
--- a/src/renderer/components/virtual-table/cells/combined-title-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/combined-title-cell.tsx
@@ -41,11 +41,7 @@ export const CombinedTitleCell = ({
>
- navigate(path)}>
);
diff --git a/src/renderer/components/virtual-table/cells/album-artist-cell.tsx b/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
index 006bd8ad..059de9cd 100644
--- a/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
@@ -15,21 +15,14 @@ export const AlbumArtistCell = ({ data, value }: ICellRendererParams) => {
if (value === undefined) {
return (
-
-
-
+
{value.name}
-
+
{artists?.length ? (
artists.map((artist: AlbumArtist | Artist, index: number) => (
diff --git a/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx b/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx
index 2ce9a923..0a64c03d 100644
--- a/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx
@@ -25,10 +25,7 @@ export const FullWidthDiscCell = ({ api, data, node }: ICellRendererParams) => {
return (
+
{containerQuery.isMd ? (
<>
Showing {currentPageStartIndex} - {currentPageStopIndex} of{' '}
@@ -97,11 +94,7 @@ export const TablePagination = ({
)}
-
+
handlers.close()}
opened={isGoToPageOpen}
@@ -127,10 +120,7 @@ export const TablePagination = ({
min={1}
width={70}
/>
-
diff --git a/src/renderer/features/action-required/components/action-required-container.tsx b/src/renderer/features/action-required/components/action-required-container.tsx
index 6b8fcab3..ac5d78f8 100644
--- a/src/renderer/features/action-required/components/action-required-container.tsx
+++ b/src/renderer/features/action-required/components/action-required-container.tsx
@@ -13,15 +13,8 @@ interface ActionRequiredContainerProps {
export const ActionRequiredContainer = ({ children, title }: ActionRequiredContainerProps) => (
-
+
{title}
diff --git a/src/renderer/features/action-required/components/error-fallback.tsx b/src/renderer/features/action-required/components/error-fallback.tsx
index 02b70dcb..cd30dd4e 100644
--- a/src/renderer/features/action-required/components/error-fallback.tsx
+++ b/src/renderer/features/action-required/components/error-fallback.tsx
@@ -21,18 +21,11 @@ export const ErrorFallback = ({ resetErrorBoundary }: FallbackProps) => {
- {t('error.genericError')}
{error?.message}
-
diff --git a/src/renderer/features/action-required/components/mpv-required.tsx b/src/renderer/features/action-required/components/mpv-required.tsx
index 0eb716c2..2907fe29 100644
--- a/src/renderer/features/action-required/components/mpv-required.tsx
+++ b/src/renderer/features/action-required/components/mpv-required.tsx
@@ -43,18 +43,11 @@ export const MpvRequired = () => {
Set your MPV executable location below and restart the application.
MPV is available at the following:{' '}
-
+
https://mpv.io/
- {t('setting.disable_mpv', { context: 'description' })}
{
px={10}
variant="subtle"
/>
- {t('error.genericError')}
{error?.message}
-
+
}
onClick={handleHome}
@@ -81,11 +74,7 @@ const RouteErrorBoundary = () => {
-
diff --git a/src/renderer/features/action-required/components/server-required.tsx b/src/renderer/features/action-required/components/server-required.tsx
index aa6b9e2a..45335db1 100644
--- a/src/renderer/features/action-required/components/server-required.tsx
+++ b/src/renderer/features/action-required/components/server-required.tsx
@@ -132,10 +132,7 @@ function ServerSelector() {
}}
variant={server.id === currentServer?.id ? 'filled' : 'default'}
>
-
+
-
+
{server.name}
diff --git a/src/renderer/features/action-required/routes/action-required-route.tsx b/src/renderer/features/action-required/routes/action-required-route.tsx
index 436e8c8a..9a04ace4 100644
--- a/src/renderer/features/action-required/routes/action-required-route.tsx
+++ b/src/renderer/features/action-required/routes/action-required-route.tsx
@@ -49,10 +49,7 @@ const ActionRequiredRoute = () => {
-
+
{displayedCheck && (
@@ -64,10 +61,7 @@ const ActionRequiredRoute = () => {
{canReturnHome &&
+
}
diff --git a/src/renderer/features/action-required/routes/invalid-route.tsx b/src/renderer/features/action-required/routes/invalid-route.tsx
index 8ac4ea4b..2bac03d0 100644
--- a/src/renderer/features/action-required/routes/invalid-route.tsx
+++ b/src/renderer/features/action-required/routes/invalid-route.tsx
@@ -18,24 +18,14 @@ const InvalidRoute = () => {
-
-
+
{t('error.apiRouteError', { postProcess: 'sentenceCase' })}
{location.pathname}
- navigate(-1)}
- variant="filled"
- />
+ navigate(-1)} variant="filled" />
diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index 88d4fdd4..2d450683 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -319,17 +319,11 @@ export const AlbumDetailContent = ({ background, tableRef }: AlbumDetailContentP
const mbzId = detailQuery?.data?.mbzId;
return (
-
-
+
:
-
);
}
@@ -45,12 +42,7 @@ export const GenericCell = ({ value, valueFormatted }: ICellRendererParams, opti
{isLink ? displayedValue.value : displayedValue}
) : (
-
+
{displayedValue}
)}
diff --git a/src/renderer/components/virtual-table/cells/genre-cell.tsx b/src/renderer/components/virtual-table/cells/genre-cell.tsx
index 5365948d..e1755dbc 100644
--- a/src/renderer/components/virtual-table/cells/genre-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/genre-cell.tsx
@@ -13,11 +13,7 @@ export const GenreCell = ({ data, value }: ICellRendererParams) => {
const genrePath = useGenreRoute();
return (
-
+
{value?.map((item: AlbumArtist | Artist, index: number) => (
{index > 0 &&
-
);
}
return (
-
+
{formattedValue}
diff --git a/src/renderer/components/virtual-table/cells/rating-cell.tsx b/src/renderer/components/virtual-table/cells/rating-cell.tsx
index 80111941..b5669e25 100644
--- a/src/renderer/components/virtual-table/cells/rating-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/rating-cell.tsx
@@ -26,11 +26,7 @@ export const RatingCell = ({ node, value }: ICellRendererParams) => {
return (
-
);
};
diff --git a/src/renderer/components/virtual-table/cells/row-index-cell.tsx b/src/renderer/components/virtual-table/cells/row-index-cell.tsx
index 43ca9451..6e9080d2 100644
--- a/src/renderer/components/virtual-table/cells/row-index-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/row-index-cell.tsx
@@ -144,15 +144,9 @@ export const RowIndexCell = ({ eGridCell, value }: ICellRendererParams) => {
return (
{isPlaying && isCurrentSong ? (
- {
if (value === undefined) {
return (
-
);
}
return (
-
+
{value}
diff --git a/src/renderer/components/virtual-table/headers/duration-header.tsx b/src/renderer/components/virtual-table/headers/duration-header.tsx
index c9fa81c9..0b72d792 100644
--- a/src/renderer/components/virtual-table/headers/duration-header.tsx
+++ b/src/renderer/components/virtual-table/headers/duration-header.tsx
@@ -7,10 +7,5 @@ export interface ICustomHeaderParams extends IHeaderParams {
}
export const DurationHeader = () => {
- return (
-
-
+
)}
diff --git a/src/renderer/components/virtual-table/table-pagination.tsx b/src/renderer/components/virtual-table/table-pagination.tsx
index 63cc9ea2..b59d22af 100644
--- a/src/renderer/components/virtual-table/table-pagination.tsx
+++ b/src/renderer/components/virtual-table/table-pagination.tsx
@@ -76,10 +76,7 @@ export const TablePagination = ({
ref={containerQuery.ref}
style={{ borderTop: '1px solid var(--theme-generic-border-color)' }}
>
-
+
-
+
handlePlay(playButtonBehavior)} />
@@ -485,11 +479,7 @@ export const AlbumDetailContent = ({ background, tableRef }: AlbumDetailContentP
suppressRowDrag
/>
-
+
{cq.height || cq.width ? (
<>
{carousels
diff --git a/src/renderer/features/albums/components/album-list-content.tsx b/src/renderer/features/albums/components/album-list-content.tsx
index 2fe52c72..d066098a 100644
--- a/src/renderer/features/albums/components/album-list-content.tsx
+++ b/src/renderer/features/albums/components/album-list-content.tsx
@@ -33,15 +33,9 @@ export const AlbumListContent = ({ gridRef, itemCount, tableRef }: AlbumListCont
return (
-
+
@@ -471,10 +467,7 @@ export const AlbumListHeaderFilters = ({
@@ -535,10 +525,7 @@ export const AlbumListHeaderFilters = ({
-
+
+
-
+
handlePlay?.({ playType: playButtonBehavior })}
@@ -85,10 +79,7 @@ export const AlbumListHeader = ({
-
diff --git a/src/renderer/features/albums/components/jellyfin-album-filters.tsx b/src/renderer/features/albums/components/jellyfin-album-filters.tsx
index 5b81964c..9a76b203 100644
--- a/src/renderer/features/albums/components/jellyfin-album-filters.tsx
+++ b/src/renderer/features/albums/components/jellyfin-album-filters.tsx
@@ -227,16 +227,9 @@ export const JellyfinAlbumFilters = ({
return (
{yesNoFilter.map((filter) => (
-
+
{filter.label}
-
))}
{yesNoUndefinedFilters.map((filter) => (
-
+
{filter.label}
-
))}
{toggleFilters.map((filter) => (
-
+
{filter.label}
-
))}
+
{toggleFilters.map((filter) => (
-
+
{filter.label}
-
))}
-
+
handlePlay()} />
{
-
diff --git a/src/renderer/features/artists/components/album-artist-detail-content.tsx b/src/renderer/features/artists/components/album-artist-detail-content.tsx
index d54066e1..aad0e5b5 100644
--- a/src/renderer/features/artists/components/album-artist-detail-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx
@@ -202,10 +202,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
order: itemOrder.recentAlbums,
title: (
-
+
{t('page.albumArtistDetail.recentReleases', {
postProcess: 'sentenceCase',
})}
@@ -232,10 +229,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
loading: compilationAlbumsQuery?.isLoading || compilationAlbumsQuery.isFetching,
order: itemOrder.compilations,
title: (
-
+
{t('page.albumArtistDetail.appearsOn', { postProcess: 'sentenceCase' })}
),
@@ -247,10 +241,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
itemType: LibraryItem.ALBUM_ARTIST,
order: itemOrder.similarArtists,
title: (
-
+
{t('page.albumArtistDetail.relatedArtists', {
postProcess: 'sentenceCase',
})}
@@ -355,19 +346,10 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
detailQuery?.isLoading ||
(server?.type === ServerType.NAVIDROME && enabledItem.topSongs && topSongsQuery?.isLoading);
- if (isLoading)
- return (
-
- );
+ if (isLoading) return ;
return (
-
{t('error.badAlbum', { postProcess: 'sentenceCase' })}
+
@@ -481,15 +463,9 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
) : null}
{biography ? (
-
+
-
+
{t('page.albumArtistDetail.about', {
artist: detailQuery?.data?.name,
})}
@@ -499,23 +475,11 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
) : null}
{showTopSongs ? (
-
+
-
-
-
+
+
+
{t('page.albumArtistDetail.topSongs', {
postProcess: 'sentenceCase',
})}
diff --git a/src/renderer/features/artists/components/album-artist-list-content.tsx b/src/renderer/features/artists/components/album-artist-list-content.tsx
index a8275b8f..028eff97 100644
--- a/src/renderer/features/artists/components/album-artist-list-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-content.tsx
@@ -42,15 +42,9 @@ export const AlbumArtistListContent = ({
return (
-
+
@@ -395,10 +391,7 @@ export const AlbumArtistListHeaderFilters = ({
@@ -437,10 +430,7 @@ export const AlbumArtistListHeaderFilters = ({
-
+
+
-
+
{t('page.albumArtistList.title', { postProcess: 'titleCase' })}
@@ -66,18 +60,12 @@ export const AlbumArtistListHeader = ({
-
-
);
diff --git a/src/renderer/features/artists/components/artist-list-content.tsx b/src/renderer/features/artists/components/artist-list-content.tsx
index e1332f72..90c22404 100644
--- a/src/renderer/features/artists/components/artist-list-content.tsx
+++ b/src/renderer/features/artists/components/artist-list-content.tsx
@@ -34,15 +34,9 @@ export const ArtistListContent = ({ gridRef, itemCount, tableRef }: ArtistListCo
return (
-
+
@@ -411,19 +407,13 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
-
{musicFoldersQuery.data?.items.map((folder) => (
@@ -442,11 +432,7 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
)}
{roles.data?.length && (
<>
-
+
)}
-
+
+
-
+
{t('entity.artist_other', { postProcess: 'titleCase' })}
@@ -62,18 +56,12 @@ export const ArtistListHeader = ({ gridRef, itemCount, tableRef }: ArtistListHea
-
-
);
diff --git a/src/renderer/features/artists/routes/artist-list-route.tsx b/src/renderer/features/artists/routes/artist-list-route.tsx
index e27c4fbe..8113651d 100644
--- a/src/renderer/features/artists/routes/artist-list-route.tsx
+++ b/src/renderer/features/artists/routes/artist-list-route.tsx
@@ -41,16 +41,8 @@ const ArtistListRoute = () => {
return (
-
);
diff --git a/src/renderer/features/context-menu/context-menu-provider.tsx b/src/renderer/features/context-menu/context-menu-provider.tsx
index 3a00d065..5e33a70f 100644
--- a/src/renderer/features/context-menu/context-menu-provider.tsx
+++ b/src/renderer/features/context-menu/context-menu-provider.tsx
@@ -533,10 +533,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
openModal({
children: (
-
+
{t('common.areYouSure', { postProcess: 'sentenceCase' })}
),
@@ -922,26 +919,15 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
{opened && (
-
+
-
+
{ctx.menuItems?.map((item) => {
return (
!contextMenuItems[item.id].disabled && (
{item.children ? (
-
+
{
const discordSettings = useDiscordSetttings();
const generalSettings = useGeneralSettings();
+ const { privateMode } = useAppStore();
const [lastUniqueId, setlastUniqueId] = useState('');
const setActivity = useCallback(
@@ -26,10 +29,8 @@ export const useDiscordRpc = () => {
) => {
if (
!current[0] || // No track
- (current[0] &&
- current[2] === 'paused' && // Track paused
- (discordSettings.showPaused ? current[1] === 0 : true)) || // Beginning of track (only if show paused setting enabled)
- (discordSettings.showPaused ? false : current[1] === 0) // Beginning of track (only if show paused setting disabled)
+ current[1] === 0 || // Start of track
+ (current[2] === 'paused' && !discordSettings.showPaused) // Track paused with show paused setting disabled
)
return discordRpc?.clearActivity();
@@ -38,11 +39,13 @@ export const useDiscordRpc = () => {
const trackChanged = lastUniqueId !== song.uniqueId;
/*
- 1. If we jump more then 1.2 seconds from last state, update status to match
- 2. If the current song id is completely different, update status
- 3. If the player state changed, update status
+ 1. If the song has just started, update status
+ 2. If we jump more then 1.2 seconds from last state, update status to match
+ 3. If the current song id is completely different, update status
+ 4. If the player state changed, update status
*/
if (
+ previous[1] === 0 ||
Math.abs((current[1] as number) - (previous[1] as number)) > 1.2 ||
trackChanged ||
current[2] !== previous[2]
@@ -54,6 +57,12 @@ export const useDiscordRpc = () => {
const artists = song?.artists.map((artist) => artist.name).join(', ');
+ const statusDisplayMap = {
+ [DiscordDisplayType.ARTIST_NAME]: StatusDisplayType.STATE,
+ [DiscordDisplayType.FEISHIN]: StatusDisplayType.NAME,
+ [DiscordDisplayType.SONG_NAME]: StatusDisplayType.DETAILS,
+ };
+
const activity: SetActivity = {
details: song?.name.padEnd(2, ' ') || 'Idle',
instance: false,
@@ -61,7 +70,8 @@ export const useDiscordRpc = () => {
largeImageText: song?.album || 'Unknown album',
smallImageKey: undefined,
smallImageText: current[2] as string,
- state: (artists && `By ${artists}`) || 'Unknown artist',
+ state: artists || 'Unknown artist',
+ statusDisplayType: statusDisplayMap[discordSettings.displayType],
// I would love to use the actual type as opposed to hardcoding to 2,
// but manually installing the discord-types package appears to break things
type: discordSettings.showAsListening ? 2 : 0,
@@ -134,20 +144,21 @@ export const useDiscordRpc = () => {
discordSettings.showPaused,
generalSettings.lastfmApiKey,
discordSettings.clientId,
+ discordSettings.displayType,
lastUniqueId,
],
);
useEffect(() => {
- if (!discordSettings.enabled) return discordRpc?.quit();
+ if (!discordSettings.enabled || privateMode) return discordRpc?.quit();
return () => {
discordRpc?.quit();
};
- }, [discordSettings.clientId, discordSettings.enabled]);
+ }, [discordSettings.clientId, privateMode, discordSettings.enabled]);
useEffect(() => {
- if (!discordSettings.enabled) return;
+ if (!discordSettings.enabled || privateMode) return;
const unsubSongChange = usePlayerStore.subscribe(
(state) => [state.current.song, state.current.time, state.current.status],
setActivity,
@@ -155,5 +166,5 @@ export const useDiscordRpc = () => {
return () => {
unsubSongChange();
};
- }, [discordSettings.enabled, setActivity]);
+ }, [discordSettings.enabled, privateMode, setActivity]);
};
diff --git a/src/renderer/features/genres/components/genre-list-content.tsx b/src/renderer/features/genres/components/genre-list-content.tsx
index 85b3273e..d331479c 100644
--- a/src/renderer/features/genres/components/genre-list-content.tsx
+++ b/src/renderer/features/genres/components/genre-list-content.tsx
@@ -33,15 +33,9 @@ export const GenreListContent = ({ gridRef, itemCount, tableRef }: AlbumListCont
return (
-
+
@@ -277,10 +273,7 @@ export const GenreListHeaderFilters = ({
-
+
+
-
+
{t('page.genreList.title', { postProcess: 'titleCase' })}
@@ -60,10 +54,7 @@ export const GenreListHeader = ({ gridRef, itemCount, tableRef }: GenreListHeade
-
diff --git a/src/renderer/features/genres/routes/genre-list-route.tsx b/src/renderer/features/genres/routes/genre-list-route.tsx
index 80650d87..91ebe571 100644
--- a/src/renderer/features/genres/routes/genre-list-route.tsx
+++ b/src/renderer/features/genres/routes/genre-list-route.tsx
@@ -42,16 +42,8 @@ const GenreListRoute = () => {
return (
-
);
diff --git a/src/renderer/features/item-details/components/item-details-modal.tsx b/src/renderer/features/item-details/components/item-details-modal.tsx
index d7e81971..e6bba6be 100644
--- a/src/renderer/features/item-details/components/item-details-modal.tsx
+++ b/src/renderer/features/item-details/components/item-details-modal.tsx
@@ -81,10 +81,7 @@ const formatArtists = (artists: null | RelatedArtist[] | undefined) =>
{artist.name || '—'}
) : (
-
+
{artist.name || '-'}
)}
@@ -119,17 +116,7 @@ const FormatGenre = (item: Album | AlbumArtist | Playlist | Song) => {
};
const BoolField = (key: boolean) =>
- key ? (
- [] = [
{ key: 'name', label: 'common.title' },
@@ -287,6 +274,8 @@ const SongPropertyMapping: ItemDetailRow[] = [
{ label: 'filter.isCompilation', render: (song) => BoolField(song.compilation || false) },
{ key: 'container', label: 'common.codec' },
{ key: 'bitRate', label: 'common.bitrate', render: (song) => `${song.bitRate} kbps` },
+ { key: 'sampleRate', label: 'common.sampleRate' },
+ { key: 'bitDepth', label: 'common.bitDepth' },
{ key: 'channels', label: 'common.channel_other' },
{ key: 'size', label: 'common.size', render: (song) => formatSizeString(song.size) },
{
@@ -409,12 +398,7 @@ export const ItemDetailsModal = ({ item }: ItemDetailsModalProps) => {
}
return (
-
+
);
diff --git a/src/renderer/features/item-details/components/song-path.tsx b/src/renderer/features/item-details/components/song-path.tsx
index 08bd8eeb..4571f846 100644
--- a/src/renderer/features/item-details/components/song-path.tsx
+++ b/src/renderer/features/item-details/components/song-path.tsx
@@ -22,10 +22,7 @@ export const SongPath = ({ path }: SongPathProps) => {
return (
-
+
{({ copied, copy }) => (
{
)}
withinPortal
>
-
+
{copied ?
diff --git a/src/renderer/features/lyrics/components/lyrics-search-form.tsx b/src/renderer/features/lyrics/components/lyrics-search-form.tsx
index 8cb4db16..55beec9d 100644
--- a/src/renderer/features/lyrics/components/lyrics-search-form.tsx
+++ b/src/renderer/features/lyrics/components/lyrics-search-form.tsx
@@ -38,33 +38,15 @@ const SearchResult = ({ data, onClick }: SearchResultProps) => {
source === LyricSource.GENIUS ? id.replace(/^((http[s]?|ftp):\/)?\/?([^:/\s]+)/g, '') : id;
return (
-