add current song styles to rowIndex and title columns

2026-06-20 19:04:23 +02:00 · 2025-11-13 13:31:57 -08:00
parent a24b870faa
commit d2e6658c36
4 changed files with 196 additions and 3 deletions
@@ -10,12 +10,13 @@ import {
    ItemTableListInnerColumn,
    TableColumnContainer,
 } from '/@/renderer/components/item-list/item-table-list/item-table-list-column';
+import { useIsCurrentSong } from '/@/renderer/features/player/hooks/use-is-current-song';
 import { AppRoute } from '/@/renderer/router/routes';
 import { Image } from '/@/shared/components/image/image';
 import { Text } from '/@/shared/components/text/text';
-import { RelatedAlbumArtist } from '/@/shared/types/domain-types';
+import { LibraryItem, QueueSong, RelatedAlbumArtist } from '/@/shared/types/domain-types';

-export const TitleCombinedColumn = (props: ItemTableListInnerColumn) => {
+export const DefaultTitleCombinedColumn = (props: ItemTableListInnerColumn) => {
    const row: object | undefined = (props.data as (any | undefined)[])[props.rowIndex];

    const artists = useMemo(() => {
@@ -74,3 +75,83 @@ export const TitleCombinedColumn = (props: ItemTableListInnerColumn) => {

    return <ColumnSkeletonVariable {...props} />;
 };
+
+export const QueueSongTitleCombinedColumn = (props: ItemTableListInnerColumn) => {
+    const row: object | undefined = (props.data as (any | undefined)[])[props.rowIndex];
+
+    const { isActive } = useIsCurrentSong(props.data[props.rowIndex] as QueueSong);
+
+    const artists = useMemo(() => {
+        if (row && 'artists' in row && Array.isArray(row.artists)) {
+            return (row.artists as RelatedAlbumArtist[]).map((artist) => {
+                const path = generatePath(AppRoute.LIBRARY_ARTISTS_DETAIL, {
+                    artistId: artist.id,
+                });
+                return { ...artist, path };
+            });
+        }
+        return [];
+    }, [row]);
+
+    if (row && 'name' in row && 'imageUrl' in row && 'artists' in row) {
+        const rowHeight = props.getRowHeight(props.rowIndex, props);
+        const path = getTitlePath(props.itemType, (props.data[props.rowIndex] as any).id as string);
+
+        const textStyles = isActive ? { color: 'var(--theme-colors-primary)' } : {};
+
+        const titleLinkProps = path
+            ? {
+                  component: Link,
+                  isLink: true,
+                  to: path,
+              }
+            : {};
+
+        return (
+            <TableColumnContainer
+                className={styles['title-combined']}
+                containerStyle={{ '--row-height': `${rowHeight}px` } as CSSProperties}
+                {...props}
+            >
+                <Image containerClassName={styles.image} src={row.imageUrl as string} />
+                <div className={styles['text-container']}>
+                    <Text
+                        className={styles.title}
+                        isNoSelect
+                        {...titleLinkProps}
+                        style={textStyles}
+                    >
+                        {row.name as string}
+                    </Text>
+                    <div className={styles.artists}>
+                        {artists.map((artist, index) => (
+                            <span key={artist.id}>
+                                <Text component={Link} isLink isMuted isNoSelect to={artist.path}>
+                                    {artist.name}
+                                </Text>
+                                {index < artists.length - 1 && ', '}
+                            </span>
+                        ))}
+                    </div>
+                </div>
+            </TableColumnContainer>
+        );
+    }
+
+    if (row === null) {
+        return <ColumnNullFallback {...props} />;
+    }
+
+    return <ColumnSkeletonVariable {...props} />;
+};
+
+export const TitleCombinedColumn = (props: ItemTableListInnerColumn) => {
+    const { itemType } = props;
+
+    switch (itemType) {
+        case LibraryItem.QUEUE_SONG:
+            return <QueueSongTitleCombinedColumn {...props} />;
+        default:
+            return <DefaultTitleCombinedColumn {...props} />;
+    }
+};