Skip to content

fix: handle remixes/contest page shape in mobile play queue drawer #14270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylanjeffers merged 1 commit into from
May 8, 2026
+15 −4
Merged

fix: handle remixes/contest page shape in mobile play queue drawer #14270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions packages/mobile/src/components/queue-drawer/QueueDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,15 @@ const useNextFromSourceMobile = () => {

return useMemo<{ trackIds: ID[]; sourceKey: string | null }>(() => {
if (!querySource) return { trackIds: [], sourceKey: null }
const data = queryClient.getQueryData<{
pages: Array<Array<{ id: number | string; type?: string }>>
}>(querySource.queryKey as any)
type LineupItem = { id: number | string; type?: string }
// Most lineup pages are `LineupItem[]`. The remixes/contest lineup wraps
// its items in `{ count, tracks: LineupItem[] }` — without this branch,
// `for (const item of page)` would throw on the object and crash the
// drawer when a contest track is playing.
type LineupPage = LineupItem[] | { tracks: LineupItem[] }
const data = queryClient.getQueryData<{ pages: LineupPage[] }>(
querySource.queryKey as any
)
const sourceKey =
Array.isArray(querySource.queryKey) && querySource.queryKey[0]
? String(querySource.queryKey[0])
Expand All @@ -243,7 +249,12 @@ const useNextFromSourceMobile = () => {
const inQueue = new Set(queue.map((t) => t.trackId))
const upcoming: ID[] = []
for (const page of data.pages) {
for (const item of page) {
const items: LineupItem[] = Array.isArray(page)
? page
: Array.isArray(page?.tracks)
? page.tracks
: []
for (const item of items) {
if (!item) continue
if (item.type && item.type !== 'track') continue
const id = typeof item.id === 'number' ? item.id : Number(item.id)
Expand Down
Loading