diff --git a/apps/web/components/queue-panel.tsx b/apps/web/components/queue-panel.tsx
index 996c994..b318ffa 100644
--- a/apps/web/components/queue-panel.tsx
+++ b/apps/web/components/queue-panel.tsx
@@ -2,11 +2,14 @@
import * as React from "react"
+import { useFavorites } from "@/components/favorites-provider"
+import type { MediaContextAction } from "@/components/media-context-menu"
import { PlaybackSongMeta } from "@/components/playback-song-meta"
import { usePlayback } from "@/components/playback-provider"
import { TrackCover, TrackRow } from "@/components/track-row"
import { Skeleton } from "@/components/ui/skeleton"
import { Spinner } from "@/components/ui/spinner"
+import { useMediaActions } from "@/hooks/use-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong, QueueSong } from "@otunes/convex/types"
@@ -15,6 +18,7 @@ import {
moveQueueBlock,
} from "@/lib/move-queue-block"
import { getSelectionRangePositions } from "@/lib/selection-range-styles"
+import { stationArtistId } from "@/lib/station-artist"
import { useSongs } from "@/lib/song-cache"
import { cn } from "@/lib/utils"
@@ -181,8 +185,66 @@ export function QueuePanel() {
() => selectableQueue.map((item) => ({ id: item.selectionId })),
[selectableQueue]
)
- const { selectedIds, handleSelect, handlePointerDown } =
- useTrackSelection(selectionItems)
+ const {
+ selectedIds,
+ selectedCount,
+ handleSelect,
+ handlePointerDown,
+ prepareContextMenu,
+ clearSelection,
+ } = useTrackSelection(selectionItems)
+ const { isSongFavorite } = useFavorites()
+ const { runSongsAction } = useMediaActions()
+
+ /** The rows a menu acts on: the selection, else just the clicked row. */
+ const menuTargets = React.useCallback(
+ (selectionId: string) => {
+ const ids = selectedIds.has(selectionId)
+ ? selectedIds
+ : new Set([selectionId])
+ return selectableQueue.filter((item) => ids.has(item.selectionId))
+ },
+ [selectableQueue, selectedIds]
+ )
+
+ const selectedStationArtistId = React.useMemo(
+ () =>
+ stationArtistId(
+ selectableQueue.flatMap((item) =>
+ item.song ? [{ id: item.selectionId, artist: item.song.artist }] : []
+ ),
+ selectedIds
+ ),
+ [selectableQueue, selectedIds]
+ )
+
+ const handleMediaAction = React.useCallback(
+ (action: MediaContextAction, selectionId: string) => {
+ const songs = menuTargets(selectionId).flatMap((item) =>
+ item.song ? [item.song] : []
+ )
+ const artistId = songs[0]?.artist.id
+ runSongsAction(
+ action,
+ songs.map((song) => song.id),
+ songs.every((song) => song.artist.id === artistId)
+ ? artistId
+ : undefined
+ )
+ },
+ [menuTargets, runSongsAction]
+ )
+
+ const handleRemove = React.useCallback(
+ (selectionId: string) => {
+ const removed = new Set(
+ menuTargets(selectionId).map((item) => item.queueIndex)
+ )
+ clearSelection()
+ void reorderQueue(queueSongIds.filter((_, index) => !removed.has(index)))
+ },
+ [clearSelection, menuTargets, queueSongIds, reorderQueue]
+ )
const handleRowSelect = React.useCallback(
(index: number, event: React.MouseEvent) => {
@@ -336,6 +398,11 @@ export function QueuePanel() {
variant="queue"
song={item.song}
index={index}
+ selectionId={item.selectionId}
+ isFavorite={isSongFavorite(item.song.id)}
+ selectedCount={selectedCount}
+ selectionStationArtistId={selectedStationArtistId}
+ removeLabel="Remove from Queue"
selectionPosition={selectionPositions[index]}
isDragging={draggingIndices.has(index)}
onPointerDown={handlePointerDown}
@@ -343,6 +410,9 @@ export function QueuePanel() {
onPlay={handleRowPlay}
onDragStart={setDragIndex}
onDrop={handleDrop}
+ onPrepareContextMenu={prepareContextMenu}
+ onMediaAction={handleMediaAction}
+ onRemove={handleRemove}
/>
) : (