refactor(playlists): unify track row appearance and add remove option
- Move local track indicator from quality column to favorite button position for consistent row alignment with Qobuz tracks - Remove explicit delete button from playlist track rows (was easy to accidentally click) - Add "Remove from playlist" option to TrackMenu for all tracks (local and Qobuz) - Qobuz track removal uses playlist_track_id from API response - Clean up unused CSS and imports from PlaylistDetailView cc
This commit is contained in:
1 parent
3915abd3bb
commit
d731805eca
3 files changed
+54
-72
No files matched your search
@@ -11,7 +11,8 @@
|
||||
Share2,
|
||||
Disc3,
|
||||
User,
|
||||
Link
|
||||
Link,
|
||||
Trash2
|
||||
} from 'lucide-svelte';
|
||||
|
||||
interface Props {
|
||||
@@ -20,6 +21,7 @@
|
||||
onPlayLater?: () => void;
|
||||
onAddFavorite?: () => void;
|
||||
onAddToPlaylist?: () => void;
|
||||
onRemoveFromPlaylist?: () => void;
|
||||
onShareQobuz?: () => void;
|
||||
onShareSonglink?: () => void;
|
||||
onGoToAlbum?: () => void;
|
||||
@@ -32,6 +34,7 @@
|
||||
onPlayLater,
|
||||
onAddFavorite,
|
||||
onAddToPlaylist,
|
||||
onRemoveFromPlaylist,
|
||||
onShareQobuz,
|
||||
onShareSonglink,
|
||||
onGoToAlbum,
|
||||
@@ -49,7 +52,7 @@
|
||||
let submenuStyle = $state('');
|
||||
|
||||
const hasPlayback = $derived(!!(onPlayNow || onPlayNext || onPlayLater));
|
||||
const hasLibrary = $derived(!!(onAddFavorite || onAddToPlaylist));
|
||||
const hasLibrary = $derived(!!(onAddFavorite || onAddToPlaylist || onRemoveFromPlaylist));
|
||||
const hasShare = $derived(!!(onShareQobuz || onShareSonglink));
|
||||
const hasNav = $derived(!!(onGoToAlbum || onGoToArtist));
|
||||
const hasMenu = $derived(hasPlayback || hasLibrary || hasShare || hasNav);
|
||||
@@ -205,6 +208,12 @@
|
||||
<span>Add to playlist</span>
|
||||
</button>
|
||||
{/if}
|
||||
{#if onRemoveFromPlaylist}
|
||||
<button class="menu-item danger" onclick={() => handleAction(onRemoveFromPlaylist)}>
|
||||
<Trash2 size={14} />
|
||||
<span>Remove from playlist</span>
|
||||
</button>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
{#if hasLibrary && (hasShare || hasNav)}
|
||||
@@ -333,6 +342,15 @@
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.menu-item.danger {
|
||||
color: #ef4444;
|
||||
}
|
||||
|
||||
.menu-item.danger:hover {
|
||||
background-color: rgba(239, 68, 68, 0.1);
|
||||
color: #ef4444;
|
||||
}
|
||||
|
||||
.separator {
|
||||
height: 1px;
|
||||
background-color: var(--bg-hover);
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
onPlayNext?: () => void;
|
||||
onPlayLater?: () => void;
|
||||
onAddToPlaylist?: () => void;
|
||||
onRemoveFromPlaylist?: () => void;
|
||||
onShareQobuz?: () => void;
|
||||
onShareSonglink?: () => void;
|
||||
onGoToAlbum?: () => void;
|
||||
@@ -176,17 +177,14 @@
|
||||
<div class="track-duration">{duration}</div>
|
||||
|
||||
<!-- Quality (always render to maintain column alignment) -->
|
||||
<div class="track-quality">
|
||||
{#if isLocal}
|
||||
<span class="local-icon" title="Local library track">
|
||||
<HardDrive size={12} />
|
||||
</span>
|
||||
{/if}
|
||||
{quality ?? ''}
|
||||
</div>
|
||||
<div class="track-quality">{quality ?? ''}</div>
|
||||
|
||||
<!-- Favorite Button -->
|
||||
{#if !hideFavorite}
|
||||
<!-- Favorite Button / Local Indicator -->
|
||||
{#if isLocal}
|
||||
<div class="local-indicator" title="Local library track">
|
||||
<HardDrive size={14} />
|
||||
</div>
|
||||
{:else if !hideFavorite}
|
||||
<button
|
||||
class="favorite-btn"
|
||||
class:is-favorite={isFavorite}
|
||||
@@ -221,6 +219,7 @@
|
||||
onPlayLater={menuActions?.onPlayLater}
|
||||
onAddFavorite={trackId !== undefined ? () => toggleTrackFavorite(trackId) : undefined}
|
||||
onAddToPlaylist={menuActions?.onAddToPlaylist}
|
||||
onRemoveFromPlaylist={menuActions?.onRemoveFromPlaylist}
|
||||
onShareQobuz={menuActions?.onShareQobuz}
|
||||
onShareSonglink={menuActions?.onShareSonglink}
|
||||
onGoToAlbum={menuActions?.onGoToAlbum}
|
||||
@@ -391,21 +390,20 @@
|
||||
}
|
||||
|
||||
.track-quality {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
gap: 4px;
|
||||
font-size: 12px;
|
||||
color: #666666;
|
||||
width: 80px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.local-icon {
|
||||
.local-indicator {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
color: var(--text-muted);
|
||||
opacity: 0.7;
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.favorite-btn {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { ArrowLeft, Play, Shuffle, ListMusic, Search, X, ChevronDown, ChevronRight, ImagePlus, HardDrive, Info, Edit3, BarChart2, WifiOff } from 'lucide-svelte';
|
||||
import { ArrowLeft, Play, Shuffle, ListMusic, Search, X, ChevronDown, ChevronRight, ImagePlus, Info, Edit3, BarChart2, WifiOff } from 'lucide-svelte';
|
||||
import AlbumMenu from '../AlbumMenu.svelte';
|
||||
import PlaylistCollage from '../PlaylistCollage.svelte';
|
||||
import PlaylistModal from '../PlaylistModal.svelte';
|
||||
@@ -27,6 +27,7 @@
|
||||
maximum_bit_depth?: number;
|
||||
maximum_sampling_rate?: number;
|
||||
isrc?: string;
|
||||
playlist_track_id?: number; // Qobuz playlist-specific ID for removal
|
||||
}
|
||||
|
||||
interface Playlist {
|
||||
@@ -59,6 +60,7 @@
|
||||
isLocal?: boolean;
|
||||
localTrackId?: number;
|
||||
artworkPath?: string;
|
||||
playlistTrackId?: number; // Qobuz playlist-specific ID for removal
|
||||
}
|
||||
|
||||
// Local library track from backend
|
||||
@@ -262,6 +264,7 @@
|
||||
bitDepth: t.maximum_bit_depth,
|
||||
samplingRate: t.maximum_sampling_rate,
|
||||
isrc: t.isrc,
|
||||
playlistTrackId: t.playlist_track_id,
|
||||
}));
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -471,13 +474,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function removeLocalTrack(track: DisplayTrack) {
|
||||
if (!track.localTrackId) return;
|
||||
async function removeTrackFromPlaylist(track: DisplayTrack) {
|
||||
try {
|
||||
if (track.isLocal && track.localTrackId) {
|
||||
// Remove local track
|
||||
await invoke('playlist_remove_local_track', { playlistId, localTrackId: track.localTrackId });
|
||||
await loadLocalTracks(); // Refresh
|
||||
await loadLocalTracks();
|
||||
} else if (track.playlistTrackId) {
|
||||
// Remove Qobuz track using playlist_track_id
|
||||
await invoke('remove_tracks_from_playlist', {
|
||||
playlistId,
|
||||
playlistTrackIds: [track.playlistTrackId]
|
||||
});
|
||||
await loadPlaylist();
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to remove local track:', err);
|
||||
console.error('Failed to remove track from playlist:', err);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -784,15 +796,10 @@
|
||||
{@const available = isTrackAvailable(track)}
|
||||
<div
|
||||
class="track-row-wrapper"
|
||||
class:is-local={track.isLocal}
|
||||
class:unavailable={!available}
|
||||
title={!available ? $t('offline.trackNotAvailable') : undefined}
|
||||
>
|
||||
{#if track.isLocal}
|
||||
<div class="local-indicator" title="Local track">
|
||||
<HardDrive size={12} />
|
||||
</div>
|
||||
{:else if !available}
|
||||
{#if !available && !track.isLocal}
|
||||
<div class="unavailable-indicator" title={$t('offline.trackNotAvailable')}>
|
||||
<WifiOff size={12} />
|
||||
</div>
|
||||
@@ -810,6 +817,7 @@
|
||||
? 'Hi-Res'
|
||||
: '-'}
|
||||
isPlaying={isActiveTrack}
|
||||
isLocal={track.isLocal}
|
||||
hideFavorite={track.isLocal || !available}
|
||||
hideDownload={track.isLocal || !available}
|
||||
downloadStatus={downloadInfo.status}
|
||||
@@ -822,17 +830,13 @@
|
||||
onPlayNext: track.isLocal ? () => handleTrackPlayNext(track) : (onTrackPlayNext ? () => onTrackPlayNext(track) : undefined),
|
||||
onPlayLater: track.isLocal ? () => handleTrackPlayLater(track) : (onTrackPlayLater ? () => onTrackPlayLater(track) : undefined),
|
||||
onAddToPlaylist: !track.isLocal && onTrackAddToPlaylist ? () => onTrackAddToPlaylist(track.id) : undefined,
|
||||
onRemoveFromPlaylist: () => removeTrackFromPlaylist(track),
|
||||
onShareQobuz: !track.isLocal && onTrackShareQobuz ? () => onTrackShareQobuz(track.id) : undefined,
|
||||
onShareSonglink: !track.isLocal && onTrackShareSonglink ? () => onTrackShareSonglink(track) : undefined,
|
||||
onGoToAlbum: !track.isLocal && track.albumId && onTrackGoToAlbum ? () => onTrackGoToAlbum(track.albumId!) : undefined,
|
||||
onGoToArtist: !track.isLocal && track.artistId && onTrackGoToArtist ? () => onTrackGoToArtist(track.artistId!) : undefined
|
||||
} : {}}
|
||||
/>
|
||||
{#if track.isLocal}
|
||||
<button class="remove-local-btn" onclick={() => removeLocalTrack(track)} title="Remove from playlist">
|
||||
<X size={14} />
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
{/each}
|
||||
|
||||
@@ -1387,24 +1391,10 @@
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.track-row-wrapper.is-local {
|
||||
padding-left: 24px;
|
||||
}
|
||||
|
||||
.track-row-wrapper :global(.track-row) {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.local-indicator {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 20px;
|
||||
color: var(--accent-primary);
|
||||
}
|
||||
|
||||
/* Unavailable track styles (offline mode) */
|
||||
.track-row-wrapper.unavailable {
|
||||
padding-left: 24px;
|
||||
@@ -1427,28 +1417,4 @@
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.remove-local-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--text-muted);
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
opacity: 0;
|
||||
transition: all 150ms ease;
|
||||
}
|
||||
|
||||
.track-row-wrapper:hover .remove-local-btn {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.remove-local-btn:hover {
|
||||
color: #ff6b6b;
|
||||
background-color: rgba(255, 107, 107, 0.1);
|
||||
}
|
||||
|
||||
</style>
|
||||
Reference in new issue
Block a user