Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 49 additions & 13 deletions packages/web/src/components/menu/CollectionMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useContext } from 'react'
import { useContext, useMemo } from 'react'

import { useCollection, useUserByHandle } from '@audius/common/api'
import {
Expand Down Expand Up @@ -121,7 +121,16 @@ const CollectionMenu = ({

const navigate = useNavigate()

const getMenu = () => {
const collectionTracks = useMemo(
() =>
(collectionTrackIds ?? []).map((trackId) => ({
trackId,
source: QueueSource.COLLECTION_TRACKS
})),
[collectionTrackIds]
)

const menu = useMemo(() => {
const routePage = collectionPage
const shareMenuItem = {
text: 'Share',
Expand Down Expand Up @@ -183,11 +192,6 @@ const CollectionMenu = ({
)
}

const collectionTracks = (collectionTrackIds ?? []).map((trackId) => ({
trackId,
source: QueueSource.COLLECTION_TRACKS
}))

const playCollectionNextMenuItem = {
text: messages.playNext,
onClick: () => {
Expand Down Expand Up @@ -228,9 +232,7 @@ const CollectionMenu = ({
) {
menu.items.push(addCollectionToQueueMenuItem)
}
if (menu) {
if (includeShare) menu.items.push(shareMenuItem)
}
if (includeShare) menu.items.push(shareMenuItem)
if (!isOwner) {
if (includeRepost) menu.items.push(repostMenuItem)
if (includeFavorite) menu.items.push(favoriteMenuItem)
Expand All @@ -252,9 +254,43 @@ const CollectionMenu = ({
}

return menu
}

const menu = getMenu()
}, [
collectionTracks,
ddexApp,
dispatch,
extraMenuItems,
goToRoute,
handle,
includeAddToQueue,
includeEdit,
includeEmbed,
includeFavorite,
includePlayNext,
includeRepost,
includeShare,
includeVisitArtistPage,
includeVisitPage,
isArtist,
isFavorited,
isOwner,
isPublic,
isReposted,
navigate,
onRepost,
onShare,
openEmbedModal,
permalink,
playbackIndex,
playlistId,
playlistName,
repostCollection,
saveCollection,
shareCollection,
toast,
type,
undoRepostCollection,
unsaveCollection
])

return props.children(menu.items)
}
Expand Down
137 changes: 96 additions & 41 deletions packages/web/src/components/menu/TrackMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useContext } from 'react'
import { useCallback, useContext, useMemo } from 'react'

import {
useCurrentUserId,
Expand Down Expand Up @@ -140,62 +140,68 @@ const TrackMenu = ({
isFavorited,
...props
}: TrackMenuProps) => {
const { trackPermalink, goToRoute } = props
const {
genre,
goToRoute,
handle,
includeRepost,
includeShare,
isReposted,
openAddToCollectionModal,
openEmbedModal,
repostTrack: repostTrackAction,
setArtistPick,
shareTrack,
trackId,
trackPermalink,
trackTitle,
undoRepostTrack: undoRepostTrackAction,
unsetArtistPick
} = props
const { toast } = useContext(ToastContext)
const dispatch = useDispatch()
const { data: currentUserId } = useCurrentUserId()
const { onOpen: openDeleteTrackConfirmation } =
useDeleteTrackConfirmationModal()
const { onOpen: openHostRemixContest } = useHostRemixContestModal()
const { data: partialTrack } = useTrack(props.trackId, {
const { data: partialTrack } = useTrack(trackId, {
select: (track) => pick(track, ['album_backlink', 'permalink', 'remix_of'])
})

const toggleSaveTrack = useToggleFavoriteTrack({
trackId: props.trackId,
trackId,
source: FavoriteSource.OVERFLOW
})

const { data: remixContest } = useRemixContest(props.trackId, {
const { data: remixContest } = useRemixContest(trackId, {
enabled: includeRemixContest
})

const onDeleteTrack = (trackId: Nullable<number>) => {
if (!trackId) return
const onDeleteTrack = useCallback(
(trackId: Nullable<number>) => {
if (!trackId) return

openDeleteTrackConfirmation({
trackId
})
}
openDeleteTrackConfirmation({
trackId
})
},
[openDeleteTrackConfirmation]
)

const onEditTrack = (trackId: Nullable<number>) => {
if (!trackId) return
const permalink = trackPermalink || partialTrack?.permalink
permalink && goToRoute(`${permalink}/edit`)
}
const onEditTrack = useCallback(
(trackId: Nullable<number>) => {
if (!trackId) return
const permalink = trackPermalink || partialTrack?.permalink
permalink && goToRoute(`${permalink}/edit`)
},
[goToRoute, partialTrack?.permalink, trackPermalink]
)

const trackPlaybackPositions = useSelector((state: CommonState) =>
getUserTrackPositions(state, { userId: currentUserId })
)

const getMenu = () => {
const {
goToRoute,
handle,
includeRepost,
includeShare,
openAddToCollectionModal,
openEmbedModal,
repostTrack,
shareTrack,
trackId,
trackTitle,
trackPermalink,
genre,
undoRepostTrack,
unsetArtistPick
} = props

const menu = useMemo(() => {
const albumInfo = partialTrack?.album_backlink
const isLongFormContent =
genre === Genre.Podcasts || genre === Genre.Audiobooks
Expand All @@ -206,12 +212,14 @@ const TrackMenu = ({
}

const repostMenuItem = {
text: props.isReposted ? messages.undoRepost : messages.repost,
text: isReposted ? messages.undoRepost : messages.repost,
// Set timeout so the menu has time to close before we propagate the change.
onClick: () =>
setTimeout(() => {
props.isReposted ? undoRepostTrack(trackId) : repostTrack(trackId)
toast(props.isReposted ? messages.unreposted : messages.reposted)
isReposted
? undoRepostTrackAction(trackId)
: repostTrackAction(trackId)
toast(isReposted ? messages.unreposted : messages.reposted)
}, 0)
}

Expand Down Expand Up @@ -297,7 +305,7 @@ const TrackMenu = ({
text: isArtistPick ? messages.unsetArtistPick : messages.setArtistPick,
onClick: isArtistPick
? () => unsetArtistPick()
: () => props.setArtistPick(trackId)
: () => setArtistPick(trackId)
}

const deleteTrackMenuItem = {
Expand Down Expand Up @@ -436,9 +444,56 @@ const TrackMenu = ({
}

return menu
}

const menu = getMenu()
}, [
currentUserId,
ddexApp,
dispatch,
extraMenuItems,
genre,
goToRoute,
handle,
includeAddToAlbum,
includeAddToPlaylist,
includeAddToQueue,
includeAlbumPage,
includeArtistPick,
includeDelete,
includeEdit,
includeEmbed,
includeFavorite,
includePlayNext,
includeRemixContest,
includeRepost,
includeShare,
includeTrackPage,
isArtistPick,
isDeleted,
isFavorited,
isOwner,
isOwnerDeactivated,
isReposted,
isUnlisted,
onDeleteTrack,
onEditTrack,
openAddToCollectionModal,
openEmbedModal,
openHostRemixContest,
partialTrack?.album_backlink,
partialTrack?.permalink,
partialTrack?.remix_of,
remixContest,
repostTrackAction,
setArtistPick,
shareTrack,
toast,
toggleSaveTrack,
trackId,
trackPermalink,
trackPlaybackPositions,
trackTitle,
undoRepostTrackAction,
unsetArtistPick
])

return props.children(menu.items)
}
Expand Down
Loading