Compare commits

..
15 changed files with 15 additions and 178 deletions

No files matched your search

@@ -149,7 +149,6 @@ export default function AlbumScreen() {
headerTintColor: palette.foreground,
headerRight: () => (
<MediaActionMenu
stationArtistId={album.artist.id}
selectedCount={album.tracks.length}
favorited={isAlbumFav(album.id)}
share={{ type: "album", albumId: album.id }}
@@ -157,8 +156,7 @@ export default function AlbumScreen() {
void handleAlbumDetailAction(
album.id as Id<"albums">,
songIds,
action,
album.artist.id as Id<"artists">
action
)
}
>
@@ -323,7 +321,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
}) {
return (
<MediaContextMenu
stationArtistId={album.artist.id}
favorited={favorited}
navigation={{
artist: { id: album.artist.id },
-2
View File
@@ -533,7 +533,6 @@ function SongMeta({
/>
</Pressable>
<MediaActionMenu
stationArtistId={song.artist.id}
favorited={favorited}
navigation={{
artist: { id: song.artist.id },
@@ -543,7 +542,6 @@ function SongMeta({
"play-next",
"play-last",
"shuffle",
"create-station",
"favorite",
"go-artist",
"go-album",
-1
View File
@@ -75,7 +75,6 @@ export const AlbumCard = memo(function AlbumCard({
return (
<MediaContextMenu
favorited={isAlbumFavorite(album.id)}
stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id }}
onAction={(action) => void handleAlbumAction(album, action)}
@@ -20,7 +20,6 @@ export type MediaAction =
| "play-next"
| "play-last"
| "shuffle"
| "create-station"
| "favorite"
| "go-artist"
| "go-album"
@@ -36,7 +35,6 @@ export type MediaMenuConfig = {
playlistLabel?: string
favorited?: boolean
showFavorite?: boolean
stationArtistId?: string
navigation?: MediaNavigation
share?: MediaShareContext
includeActions?: MediaAction[]
@@ -80,11 +78,6 @@ const MEDIA_ACTION_ITEMS: {
label: (countSuffix) => `Shuffle${countSuffix}`,
image: "shuffle",
},
{
action: "create-station",
label: () => "Create Station",
image: "shuffle",
},
{
action: "go-artist",
label: () => "Go to Artist",
@@ -112,10 +105,6 @@ function isActionIncluded(
action: MediaAction,
config: Omit<MediaMenuConfig, "onAction">
): boolean {
if (action === "create-station" && !config.stationArtistId) {
return false
}
if (config.includeActions) {
return config.includeActions.includes(action)
}
-1
View File
@@ -136,7 +136,6 @@ export const SongListRow = memo(function SongListRow({
inset={inset}
onPress={handlePress}
contextMenu={{
stationArtistId: song.artist.id,
favorited,
playlistLabel,
navigation: {
+4 -24
View File
@@ -46,8 +46,7 @@ export function useMediaMenuActions() {
toggleSongFavorite,
favoriteSongs,
} = useFavorites()
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions()
const { addToQueueNext, addToQueueLast, playShuffled } = usePlaybackActions()
const runQueueAction = useCallback(
async (action: MediaAction, songIds: Id<"songs">[]) => {
@@ -75,11 +74,6 @@ export function useMediaMenuActions() {
async (song: BrowseSong, action: MediaAction) => {
const songIds = [song.id as Id<"songs">]
switch (action) {
case "create-station":
await runMediaAction(() =>
playArtistShuffled(song.artist.id as Id<"artists">)
)
break
case "playlist":
openAddToPlaylist(songIds)
break
@@ -101,22 +95,13 @@ export function useMediaMenuActions() {
break
}
},
[
openAddToPlaylist,
push,
runQueueAction,
toggleSongFavorite,
playArtistShuffled,
]
[openAddToPlaylist, push, runQueueAction, toggleSongFavorite]
)
const handleAlbumAction = useCallback(
async (album: BrowseAlbum, action: MediaAction) => {
await runMediaAction(async () => {
switch (action) {
case "create-station":
await playArtistShuffled(album.artist.id as Id<"artists">)
break
case "playlist":
await openAddAlbumToPlaylist(album.id as Id<"albums">)
break
@@ -147,7 +132,6 @@ export function useMediaMenuActions() {
convex,
cacheScope,
openAddAlbumToPlaylist,
playArtistShuffled,
push,
runQueueAction,
toggleAlbumFavorite,
@@ -223,13 +207,9 @@ export function useMediaMenuActions() {
async (
albumId: Id<"albums">,
songIds: Id<"songs">[],
action: MediaAction,
artistId: Id<"artists">
action: MediaAction
) => {
switch (action) {
case "create-station":
await runMediaAction(() => playArtistShuffled(artistId))
break
case "favorite":
await toggleAlbumFavorite(albumId)
break
@@ -245,7 +225,7 @@ export function useMediaMenuActions() {
break
}
},
[openAddToPlaylist, runQueueAction, toggleAlbumFavorite, playArtistShuffled]
[openAddToPlaylist, runQueueAction, toggleAlbumFavorite]
)
const handleAlbumTrackAction = useCallback(
+1 -5
View File
@@ -49,7 +49,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
const { openAddAlbumToPlaylist } = useAddToPlaylist()
const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites()
const { playAlbum } = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions()
const { runQueueAction } = useQueueMediaActions()
const [menuOpen, setMenuOpen] = React.useState(false)
const [hovered, setHovered] = React.useState(false)
const showActions = hovered || menuOpen
@@ -71,9 +71,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
async function handleCardAction(action: MediaContextAction) {
switch (action) {
case "create-station":
void createStation(album.artist.id)
break
case "playlist":
void openAddAlbumToPlaylist(album.id as Id<"albums">)
break
@@ -156,7 +153,6 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-48">
<MediaContextMenuItems
stationArtistId={album.artist.id}
selectedCount={1}
onAction={(action) => void handleCardAction(action)}
favorited={isAlbumFavorite(album.id)}
+1 -9
View File
@@ -228,7 +228,6 @@ function TrackRow({
<MediaContextMenu
label={`More options for ${track.title}`}
stationArtistId={artist.id}
selectedCount={selectedCount}
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
@@ -266,7 +265,7 @@ export function AlbumView({
} = useFavorites()
const { currentSong, playFromSong, playAlbum, playAlbumShuffled } =
usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions()
const { runQueueAction } = useQueueMediaActions()
const albumSongIds = React.useMemo(
() => album.tracks.map((track) => track.id as Id<"songs">),
[album.tracks]
@@ -331,9 +330,6 @@ export function AlbumView({
? [activeTrackId]
: []
switch (action) {
case "create-station":
void createStation(album.artist.id)
break
case "favorite":
void favoriteSongs(targetIds as Id<"songs">[])
break
@@ -352,9 +348,6 @@ export function AlbumView({
const targetIds = album.tracks.map((track) => track.id as Id<"songs">)
switch (action) {
case "create-station":
void createStation(album.artist.id)
break
case "favorite":
void toggleAlbumFavorite(album.id as Id<"albums">)
break
@@ -449,7 +442,6 @@ export function AlbumView({
</Button>
<MediaContextMenu
label="More album options"
stationArtistId={album.artist.id}
selectedCount={album.tracks.length}
onOpenMenu={() => {}}
onAction={handleAlbumMediaAction}
@@ -33,7 +33,6 @@ export type MediaContextAction =
| "play-next"
| "play-last"
| "shuffle"
| "create-station"
| "favorite"
export type MediaContextNavigation = {
@@ -66,7 +65,6 @@ export function MediaContextMenuItems({
playlistLabel = "Add to Playlist",
showFavorite = true,
favorited = false,
stationArtistId,
navigation,
share,
}: {
@@ -75,7 +73,6 @@ export function MediaContextMenuItems({
playlistLabel?: string
showFavorite?: boolean
favorited?: boolean
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
}) {
@@ -125,15 +122,6 @@ export function MediaContextMenuItems({
{actionLabel("Shuffle", selectedCount)}
<Shuffle />
</DropdownMenuItem>
{stationArtistId ? (
<DropdownMenuItem
className="justify-between"
onClick={() => onAction("create-station")}
>
Create Station
<Shuffle />
</DropdownMenuItem>
) : null}
{artist || album ? (
<>
<DropdownMenuSeparator />
@@ -205,7 +193,6 @@ export function MediaContextMenu({
playlistLabel,
showFavorite = true,
favorited = false,
stationArtistId,
navigation,
share,
inSelectionRange = false,
@@ -223,7 +210,6 @@ export function MediaContextMenu({
playlistLabel?: string
showFavorite?: boolean
favorited?: boolean
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
inSelectionRange?: boolean
@@ -265,7 +251,6 @@ export function MediaContextMenu({
playlistLabel={playlistLabel}
showFavorite={showFavorite}
favorited={favorited}
stationArtistId={stationArtistId}
navigation={navigation}
share={share}
/>
+1 -20
View File
@@ -1,6 +1,5 @@
"use client"
import { stationArtistId } from "@/lib/station-artist"
import * as React from "react"
import Image from "next/image"
import { useRouter } from "next/navigation"
@@ -125,7 +124,6 @@ function PlaylistSongRow({
selectionPosition,
isFavorite,
selectedCount,
stationArtist,
isDragging,
onSelect,
onPointerDown,
@@ -149,7 +147,6 @@ function PlaylistSongRow({
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
stationArtist?: string
isDragging: boolean
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
@@ -229,7 +226,6 @@ function PlaylistSongRow({
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={stationArtist}
selectedCount={selectedCount}
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
@@ -289,7 +285,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
playPlaylistShuffled,
playFromSong,
} = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions()
const { runQueueAction } = useQueueMediaActions()
const removeSongs = useMutation(api.playlists.removeSongsFromPlaylist)
const reorderSongs = useMutation(api.playlists.reorderPlaylistSongs)
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
@@ -328,11 +324,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
prepareContextMenu,
} = useTrackSelection(songs)
const selectedStationArtistId = React.useMemo(
() => stationArtistId(songs, selectedIds),
[songs, selectedIds]
)
const selectionPositions = React.useMemo(
() => getSelectionRangePositions(songs.map((song) => song.id), selectedIds),
[songs, selectedIds]
@@ -372,11 +363,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const targetIds = resolveTargetIds(fallbackSongId)
switch (action) {
case "create-station": {
const artistId = stationArtistId(songs, new Set(targetIds))
if (artistId) void createStation(artistId)
break
}
case "favorite":
void addFavoriteSongs(targetIds as Id<"songs">[])
break
@@ -651,11 +637,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
? selectedCount
: 1
}
stationArtist={
isSelected(song.id)
? selectedStationArtistId
: song.artist.id
}
isDragging={dragIndex === index}
onPointerDown={handlePointerDown}
onSelect={(event) => {
+1 -5
View File
@@ -16,14 +16,11 @@ import { albumCoverUrl } from "@/lib/cover-urls"
export function SearchSongItem({ song }: { song: BrowseSong }) {
const { openAddToPlaylist } = useAddToPlaylist()
const { isSongFavorite, toggleSongFavorite } = useFavorites()
const { runQueueAction, createStation } = useQueueMediaActions()
const { runQueueAction } = useQueueMediaActions()
const songIds = [song.id as Id<"songs">]
function handleAction(action: MediaContextAction) {
switch (action) {
case "create-station":
void createStation(song.artist.id)
break
case "playlist":
openAddToPlaylist(songIds)
break
@@ -67,7 +64,6 @@ export function SearchSongItem({ song }: { song: BrowseSong }) {
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={song.artist.id}
selectedCount={1}
onOpenMenu={() => {}}
onAction={handleAction}
+1 -20
View File
@@ -1,6 +1,5 @@
"use client"
import { stationArtistId } from "@/lib/station-artist"
import { useEffect, useMemo, useState, useRef, MouseEvent } from "react"
import Image from "next/image"
import Link from "next/link"
@@ -116,7 +115,6 @@ function SongRow({
selectionPosition,
isFavorite,
selectedCount,
stationArtist,
onSelect,
onPointerDown,
onToggleFavorite,
@@ -129,7 +127,6 @@ function SongRow({
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
stationArtist?: string
onSelect: (event: MouseEvent) => void
onPointerDown: (event: MouseEvent) => void
onToggleFavorite: () => void
@@ -241,7 +238,6 @@ function SongRow({
</span>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={stationArtist}
selectedCount={selectedCount}
align="end"
inSelectionRange={inRange}
@@ -269,7 +265,7 @@ export function SongsView() {
const { openAddToPlaylist } = useAddToPlaylist()
const { isSongFavorite, toggleSongFavorite, favoriteSongs } = useFavorites()
const { playFromLibrarySong } = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions()
const { runQueueAction } = useQueueMediaActions()
const [sortKey, setSortKey] = useState<SortKey>("title")
const [sortDirection, setSortDirection] =
useState<SortDirection>("asc")
@@ -317,11 +313,6 @@ export function SongsView() {
clearSelection,
} = useTrackSelection(songs)
const selectedStationArtistId = useMemo(
() => stationArtistId(songs, selectedIds),
[songs, selectedIds]
)
const selectionPositions = useMemo(
() =>
getSelectionRangePositions(
@@ -339,11 +330,6 @@ export function SongsView() {
? [fallbackSongId]
: []
switch (action) {
case "create-station": {
const artistId = stationArtistId(songs, new Set(targetIds))
if (artistId) void createStation(artistId)
break
}
case "favorite":
void favoriteSongs(targetIds as Id<"songs">[])
break
@@ -463,11 +449,6 @@ export function SongsView() {
isSelected={isSelected(song.id)}
selectionPosition={selectionPositions[index]}
isFavorite={isSongFavorite(song.id)}
stationArtist={
isSelected(song.id)
? selectedStationArtistId
: song.artist.id
}
selectedCount={
isSelected(song.id) && selectedCount > 0
? selectedCount
+5 -17
View File
@@ -23,13 +23,14 @@ function queueActionMessage(action: QueueMediaAction, count: number) {
? `Queued ${count} songs to play last`
: "Queued to play last"
case "shuffle":
return count > 1 ? `Playing ${count} songs shuffled` : "Playing shuffled"
return count > 1
? `Playing ${count} songs shuffled`
: "Playing shuffled"
}
}
export function useQueueMediaActions() {
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlayback()
const { addToQueueNext, addToQueueLast, playShuffled } = usePlayback()
const runQueueAction = React.useCallback(
async (action: QueueMediaAction, songIds: Id<"songs">[]) => {
@@ -59,18 +60,5 @@ export function useQueueMediaActions() {
[addToQueueNext, addToQueueLast, playShuffled]
)
const createStation = React.useCallback(
async (artistId: string) => {
try {
await playArtistShuffled(artistId as Id<"artists">)
} catch (error) {
toast.error(
error instanceof Error ? error.message : "Failed to create station"
)
}
},
[playArtistShuffled]
)
return { runQueueAction, createStation }
return { runQueueAction }
}
-30
View File
@@ -1,30 +0,0 @@
import assert from "node:assert/strict"
import test from "node:test"
import { stationArtistId } from "./station-artist.ts"
const songs = [
{ id: "song-a", artist: { id: "artist-a" } },
{ id: "song-b", artist: { id: "artist-a" } },
{ id: "song-c", artist: { id: "artist-b" } },
]
test("a single song or a selection sharing one artist can create a station", () => {
assert.equal(stationArtistId(songs, new Set(["song-c"])), "artist-b")
assert.equal(
stationArtistId(songs, new Set(["song-a", "song-b"])),
"artist-a"
)
})
test("mixed artists cannot create a station", () => {
assert.equal(stationArtistId(songs, new Set(["song-a", "song-c"])), undefined)
})
test("empty or partially missing selections cannot create a station", () => {
assert.equal(stationArtistId(songs, new Set()), undefined)
assert.equal(
stationArtistId(songs, new Set(["song-a", "missing"])),
undefined
)
})
-14
View File
@@ -1,14 +0,0 @@
type ArtistItem = { id: string; artist: { id: string } }
/** Returns an artist only when every target item is present and shares it. */
export function stationArtistId(
items: ArtistItem[],
targetIds: ReadonlySet<string>
) {
const targets = items.filter((item) => targetIds.has(item.id))
const artistId = targets[0]?.artist.id
return targets.length === targetIds.size &&
targets.every((item) => item.artist.id === artistId)
? artistId
: undefined
}