vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-06-10 14:22:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect imageId assignments (#1456)

Browse Source
This commit is contained in:
jeffvli
2025-12-30 15:18:03 -08:00
parent 6ddaf0366c
commit 4a025f82e4
13 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/drag-preview/drag-preview.tsx
+1 -1
View File
@@ -32,7 +32,7 @@ export const DragPreview = memo(({ data }: DragPreviewProps) => {
const itemName = firstItem ? getItemName(firstItem) : 'Item';
const itemImage = useItemImageUrl({
id: (firstItem as { id: string })?.id,
id: (firstItem as { imageId: string })?.imageId,
itemType: data.itemType || LibraryItem.SONG,
type: 'table',
});
src/renderer/components/feature-carousel/feature-carousel.tsx
+1 -1
View File
@@ -119,7 +119,7 @@ const CarouselItem = ({ album }: CarouselItemProps) => {
<ItemImage
className={styles.albumImage}
containerClassName={styles.albumImageContainer}
id={album.id}
id={album.imageId}
itemType={LibraryItem.ALBUM}
src={imageUrl}
/>
src/renderer/components/item-card/item-card.tsx
+2 -2
View File
@@ -314,7 +314,7 @@ const CompactItemCard = ({
className={clsx(styles.image, {
[styles.isRound]: isRound,
})}
id={data?.id}
id={data?.imageId}
itemType={itemType}
src={(data as Album | AlbumArtist | Playlist | Song)?.imageUrl}
/>
@@ -532,7 +532,7 @@ const DefaultItemCard = ({
<>
<ItemImage
className={clsx(styles.image, { [styles.isRound]: isRound })}
id={data?.id}
id={data?.imageId}
itemType={itemType}
src={(data as Album | AlbumArtist | Playlist | Song)?.imageUrl}
/>
src/renderer/components/item-image/item-image.tsx
+10 -3
View File
@@ -31,7 +31,7 @@ const getUnloaderIcon = (itemType: LibraryItem) => {
};
const BaseItemImage = (
props: Omit<ImageProps, 'src'> & {
props: Omit<ImageProps, 'id' | 'src'> & {
id?: null | string;
itemType: LibraryItem;
src?: null | string;
@@ -46,13 +46,20 @@ const BaseItemImage = (
size: 300,
});
return <BaseImage src={imageUrl} unloaderIcon={getUnloaderIcon(props.itemType)} {...rest} />;
return (
<BaseImage
src={imageUrl}
unloaderIcon={getUnloaderIcon(props.itemType)}
{...rest}
id={props.id || undefined}
/>
);
};
export const ItemImage = memo(BaseItemImage);
interface UseItemImageUrlProps {
id?: string;
id?: null | string;
imageUrl?: null | string;
itemType: LibraryItem;
serverId?: string;
src/renderer/components/item-list/item-table-list/columns/image-column.tsx
+1 -1
View File
@@ -83,7 +83,7 @@ export const ImageColumn = (props: ItemTableListInnerColumn) => {
[styles.imageContainerWithAspectRatio]:
props.size === 'default' || props.size === 'large',
})}
id={item?.id}
id={item?.imageId}
itemType={item?._itemType}
src={item?.imageUrl}
/>
src/renderer/components/item-list/item-table-list/columns/title-combined-column.tsx
+2 -2
View File
@@ -100,7 +100,7 @@ export const DefaultTitleCombinedColumn = (props: ItemTableListInnerColumn) => {
>
<ItemImage
containerClassName={styles.image}
id={item?.id}
id={item?.imageId}
itemType={item?._itemType}
src={item?.imageUrl}
/>
@@ -236,7 +236,7 @@ export const QueueSongTitleCombinedColumn = (props: ItemTableListInnerColumn) =>
>
<ItemImage
containerClassName={styles.image}
id={item?.id}
id={item?.imageId}
itemType={item?._itemType}
src={item?.imageUrl}
/>