Skip to content
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

[PAY-2786] Clean up skeletons for collection page #8427

Merged
merged 3 commits into from
May 10, 2024
Merged

[PAY-2786] Clean up skeletons for collection page #8427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8faab62
clean up skeletons for collection page
amendelsohn May 9, 2024
e3bbbed
remove fade in style
amendelsohn May 10, 2024
7662209
remove debug code
amendelsohn May 10, 2024
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
191 changes: 97 additions & 94 deletions packages/web/src/components/collection/desktop/CollectionHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export const CollectionHeader = (props: CollectionHeaderProps) => {
type,
title,
coverArtSizes,
artistName,
description,
isOwner,
releaseDate,
Expand Down Expand Up @@ -161,7 +160,7 @@ export const CollectionHeader = (props: CollectionHeaderProps) => {
}, [onOpen, collectionId])

const renderStatsRow = (isLoading: boolean) => {
if (isLoading) return null
if (isLoading) return <Skeleton height='20px' width='120px' />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: harmony unit vars?

return (
<RepostsFavoritesStats
isUnlisted={false}
Expand All @@ -175,45 +174,46 @@ export const CollectionHeader = (props: CollectionHeaderProps) => {

const isLoading = !isSsrEnabled && (loading || artworkLoading)

const fadeIn = {
[styles.show]: !isLoading,
[styles.hide]: isLoading
}

const isPremium =
isStreamGated && isContentUSDCPurchaseGated(streamConditions)

const topSection = (
<Flex gap='xl' p='l' backgroundColor='white'>
{coverArtSizes || gradient || icon ? (
<Artwork
collectionId={collectionId}
coverArtSizes={coverArtSizes}
callback={handleLoadArtwork}
gradient={gradient}
icon={icon}
imageOverride={imageOverride}
isOwner={isOwner}
/>
) : null}
<Flex direction='column' justifyContent='space-between'>
<Artwork
collectionId={collectionId}
coverArtSizes={coverArtSizes}
callback={handleLoadArtwork}
gradient={gradient}
icon={icon}
imageOverride={imageOverride}
isOwner={isOwner}
/>
<Flex
direction='column'
justifyContent='space-between'
css={{ minWidth: 400 }}
>
<Flex direction='column' gap='xl'>
<Flex className={cn(fadeIn)} gap='s' mt='s' alignItems='center'>
{!isPublished ? (
<IconVisibilityHidden color='subdued' aria-label='hidden' />
) : null}
{isPremium ? <IconCart size='s' color='subdued' /> : null}
<Text
variant='label'
color='subdued'
css={{ letterSpacing: '2px' }}
>
{isPremium ? `${messages.premiumLabel} ` : ''}
{type === 'playlist' && !isPublished
? messages.hiddenPlaylistLabel
: type}
</Text>
</Flex>
{isLoading ? (
<Skeleton height='24px' width='200px' />
) : (
<Flex gap='s' mt='s' alignItems='center'>
{!isPublished ? (
<IconVisibilityHidden color='subdued' aria-label='hidden' />
) : null}
{isPremium ? <IconCart size='s' color='subdued' /> : null}
<Text
variant='label'
color='subdued'
css={{ letterSpacing: '2px' }}
>
{isPremium ? `${messages.premiumLabel} ` : ''}
{type === 'playlist' && !isPublished
? messages.hiddenPlaylistLabel
: type}
</Text>
</Flex>
)}
<Flex direction='column' gap='s'>
<Flex
as={isOwner ? 'button' : 'span'}
Expand All @@ -225,57 +225,57 @@ export const CollectionHeader = (props: CollectionHeaderProps) => {
})}
onClick={isOwner ? handleClickEditTitle : undefined}
>
<Text
variant='heading'
size='xl'
className={cn(styles.titleHeader, fadeIn)}
textAlign='left'
>
{title}
</Text>
<ClientOnly>
{isOwner ? (
<IconPencil className={styles.editIcon} color='subdued' />
) : null}
</ClientOnly>
{isLoading ? (
<Skeleton css={{ position: 'absolute', top: 0 }} />
) : null}
<Skeleton height='48px' width='300px' />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like it might be better to just have one whole CollectionSkeleton component in a separate file, and have one big ternary at the top level that switches between that and the real content, rather than interspersing small skeletons throughout the whole file. but if this pattern was pre-existing, then 🤷

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I was wondering the same. This was sort of easier cause it ensures parity with the layout, and I've seen them drift before, but I'm open to either

) : (
<>
<Text
variant='heading'
size='xl'
className={cn(styles.titleHeader)}
textAlign='left'
>
{title}
</Text>
<ClientOnly>
{!isLoading && isOwner ? (
<IconPencil className={styles.editIcon} color='subdued' />
) : null}
</ClientOnly>
</>
)}
</Flex>
{artistName ? (
<Text
variant='title'
strength='weak'
tag='h2'
className={cn(fadeIn)}
textAlign='left'
>
{isLoading ? (
<Skeleton height='24px' width='150px' />
) : (
<Text variant='title' strength='weak' tag='h2' textAlign='left'>
<Text color='subdued'>{messages.by}</Text>
{userId !== null ? (
<UserLink userId={userId} popover variant='visible' />
) : null}
</Text>
) : null}
)}
</Flex>
{isLoading ? (
<Skeleton css={{ position: 'absolute', top: 0 }} width='60%' />
) : null}
<div>{renderStatsRow(isLoading)}</div>
</Flex>
<ClientOnly>
<CollectionActionButtons
variant={variant}
userId={userId}
collectionId={collectionId}
isPlayable={isPlayable}
isPlaying={playing}
isPreviewing={previewing}
isPremium={isPremium}
isOwner={isOwner}
tracksLoading={tracksLoading}
onPlay={onPlay}
onPreview={onPreview}
/>
{isLoading ? (
<Skeleton height='64px' width='100%' />
) : (
<CollectionActionButtons
variant={variant}
userId={userId}
collectionId={collectionId}
isPlayable={isPlayable}
isPlaying={playing}
isPreviewing={previewing}
isPremium={isPremium}
isOwner={isOwner}
tracksLoading={tracksLoading}
onPlay={onPlay}
onPreview={onPreview}
/>
)}
</ClientOnly>
</Flex>
{onFilterChange ? (
Expand Down Expand Up @@ -327,28 +327,31 @@ export const CollectionHeader = (props: CollectionHeaderProps) => {
/>
) : null}

<Flex className={cn(fadeIn)} gap='l' direction='column'>
{description ? (
<UserGeneratedText
size='s'
className={cn(fadeIn)}
linkSource='collection page'
css={{ textAlign: 'left' }}
>
{description}
</UserGeneratedText>
) : null}
<AlbumDetailsText
duration={duration}
lastModifiedDate={lastModifiedDate}
numTracks={numTracks}
releaseDate={releaseDate}
/>
</Flex>
{isLoading ? (
<Skeleton height='40px' width='100%' />
) : (
<Flex gap='l' direction='column'>
{description ? (
<UserGeneratedText
size='s'
linkSource='collection page'
css={{ textAlign: 'left' }}
>
{description}
</UserGeneratedText>
) : null}
<AlbumDetailsText
duration={duration}
lastModifiedDate={lastModifiedDate}
numTracks={numTracks}
releaseDate={releaseDate}
/>
</Flex>
)}
</Flex>
)
return (
<Flex direction='column'>
<Flex direction='column' h='100%'>
{topSection}
{descriptionSection}
</Flex>
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/tracks-table/TracksTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ export const TracksTable = ({
},
[
trackAccessMap,
shouldShowGatedType,
disabledTrackEdit,
isAlbumPage,
onClickRemove,
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ const CollectionPage = ({
const collectionLoading = status === Status.LOADING
const queuedAndPlaying = playing && isQueued()
const queuedAndPreviewing = previewing && isQueued()
const tracksLoading = tracks.status === Status.LOADING
const tracksLoading =
tracks.status === Status.LOADING || tracks.status === Status.IDLE

const coverArtSizes =
metadata && metadata?.variant !== Variant.SMART
Expand Down Expand Up @@ -370,7 +371,7 @@ const CollectionPage = ({
)}
</Tile>
<ClientOnly>
{isOwner && !isAlbum && !isNftPlaylist ? (
{!collectionLoading && isOwner && !isAlbum && !isNftPlaylist ? (
<>
<Divider variant='default' className={styles.tileDivider} />
<SuggestedTracks collectionId={playlistId} />
Expand Down