mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35:41 +00:00
feat(songs): unified SongRow + paginated song results in search pages (#303)
Extracts the song-list row into a single shared <SongRow> component used by Tracks Hub Browse, /search and /search/advanced. All three now share the same five-column layout (Play+Enqueue · Title · Artist · Album · Genre · Duration), the same enqueueAndPlay click behaviour, and the same right-click context menu / drag handler. The header row is rendered separately via <SongListHeader> (kept outside the virtualizer scroll container in the Tracks Hub so it doesn't scroll away). Both SearchResults and AdvancedSearch now infinite-scroll their song results via an IntersectionObserver sentinel near the bottom of the list (rootMargin 600 px). Pagination uses search3's songOffset; the free-text branch in AdvancedSearch keeps applying genre/year filters client-side per loaded page. Initial fetches stay at 50 (SearchResults) and 100 (AdvancedSearch) songs; subsequent pages are 50 each. Cleanup: - removed the redundant `(N)` count in the AdvancedSearch songs heading - dropped the unused `useNavigate` + `psyDrag` + per-page contextMenuSongId state in both search pages — SongRow handles those internally - renamed the row-internal CSS classes from `.virtual-song-*` to `.song-list-row-*` so they read as shared, and switched the mobile grid breakpoint accordingly Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
committed by
GitHub
parent
3c0a42e298
commit
3673d826b1
+43
-53
@@ -392,88 +392,77 @@
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
/* ─ Row layout ─ */
|
||||
/* ─ Shared SongRow (used by Tracks Hub, SearchResults, AdvancedSearch) ─ */
|
||||
|
||||
.virtual-song-row {
|
||||
.song-list-row {
|
||||
display: grid;
|
||||
grid-template-columns: 64px minmax(0, 1.6fr) minmax(0, 1.2fr) 56px;
|
||||
grid-template-columns: 64px minmax(0, 1.5fr) minmax(0, 1fr) minmax(0, 1fr) 110px 56px;
|
||||
gap: var(--space-3);
|
||||
align-items: center;
|
||||
height: 52px;
|
||||
padding: 0 var(--space-3);
|
||||
font-size: 13px;
|
||||
cursor: default;
|
||||
transition: background var(--transition-fast);
|
||||
border-bottom: 1px solid var(--border-subtle);
|
||||
}
|
||||
|
||||
.virtual-song-row:hover {
|
||||
.song-list-row:hover {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
|
||||
.virtual-song-row.is-current {
|
||||
.song-list-row.is-current {
|
||||
background: color-mix(in srgb, var(--accent) 14%, transparent);
|
||||
}
|
||||
|
||||
.virtual-song-row.is-current .virtual-song-title {
|
||||
.song-list-row.is-current .song-list-row-title {
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.virtual-song-cell {
|
||||
.song-list-row--header {
|
||||
height: 36px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
color: var(--text-muted);
|
||||
cursor: default;
|
||||
background: transparent;
|
||||
border-bottom: 1px solid var(--border-subtle);
|
||||
}
|
||||
|
||||
.song-list-row--header:hover {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.song-list-row-cell {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.virtual-song-cell-actions-left {
|
||||
.song-list-row-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.virtual-song-cell-title {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-width: 0;
|
||||
gap: 1px;
|
||||
}
|
||||
|
||||
.virtual-song-title {
|
||||
font-size: 13px;
|
||||
.song-list-row-title {
|
||||
font-weight: 500;
|
||||
color: var(--text-primary);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.virtual-song-artist {
|
||||
font-size: 11px;
|
||||
color: var(--text-secondary);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.virtual-song-cell-album {
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.virtual-song-cell-duration {
|
||||
font-size: 12px;
|
||||
.song-list-row-genre {
|
||||
color: var(--text-muted);
|
||||
font-variant-numeric: tabular-nums;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.song-list-row-duration {
|
||||
text-align: right;
|
||||
font-variant-numeric: tabular-nums;
|
||||
color: var(--text-muted);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.virtual-song-cell-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.virtual-song-action-btn {
|
||||
.song-list-row-btn {
|
||||
background: transparent;
|
||||
border: none;
|
||||
color: var(--text-muted);
|
||||
@@ -488,21 +477,21 @@
|
||||
transition: background var(--transition-fast), color var(--transition-fast);
|
||||
}
|
||||
|
||||
.virtual-song-action-btn:hover {
|
||||
.song-list-row-btn:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.virtual-song-action-btn--play {
|
||||
.song-list-row-btn--play {
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
.virtual-song-action-btn--play:hover {
|
||||
.song-list-row-btn--play:hover {
|
||||
background: var(--accent);
|
||||
color: var(--ctp-crust, #11111b);
|
||||
}
|
||||
|
||||
.virtual-song-row.is-current .virtual-song-action-btn--play {
|
||||
.song-list-row.is-current .song-list-row-btn--play {
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
@@ -525,11 +514,12 @@
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.virtual-song-row {
|
||||
grid-template-columns: 64px minmax(0, 1fr) 56px;
|
||||
.song-list-row {
|
||||
grid-template-columns: 64px minmax(0, 1.5fr) minmax(0, 1fr) 56px;
|
||||
}
|
||||
|
||||
.virtual-song-cell-album {
|
||||
.song-list-row-cell:nth-child(4), /* album */
|
||||
.song-list-row-cell:nth-child(5) { /* genre */
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user