fix(mobile): line loading skeletons up with loaded screens #110

Merged
joshuafhiggins merged 1 commits from t3/clean-up-loading-skeletons into main 2026-11-16 22:08:00 -05:00
7 changed files with 311 additions and 183 deletions

No files matched your search

@@ -162,7 +162,7 @@ export default function AlbumScreen() {
}}
/>
<CollectionDetailSkeleton
zoomCoverSize={220}
variant="album"
onLayout={onLayout}
style={backgroundStyle}
backgroundColor={
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
headerLargeTitle: false,
}}
/>
<CollectionDetailSkeleton round />
<CollectionDetailSkeleton variant="artist" />
</>
)
}
@@ -121,7 +121,7 @@ export default function PlaylistScreen() {
}}
/>
<CollectionDetailSkeleton
zoomCoverSize={200}
variant="playlist"
onLayout={onLayout}
style={backgroundStyle}
backgroundColor={
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
<CollectionDetailSkeleton />
<CollectionDetailSkeleton variant="favorites" />
</>
)
}
@@ -118,12 +118,7 @@ export default function LibraryScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
return (
<View style={{ flex: 1, backgroundColor: colors.background }}>
{listHeader}
<MediaGridSkeleton contentInset={false} />
</View>
)
return <MediaGridSkeleton contentInset={false} header={listHeader} />
}
return (
+302 -172
View File
@@ -1,15 +1,20 @@
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import {
CollectionHero,
useCollectionHeroLayout,
} from "@/components/collection-hero"
import {
CollectionDivider,
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated"
import { type ReactNode, type ComponentProps } from "react"
import { type ComponentProps, type ReactNode } from "react"
import {
Platform,
ScrollView,
StyleSheet,
View,
type DimensionValue,
@@ -17,34 +22,42 @@ import {
type ViewStyle,
} from "react-native"
import { contentBottomInset } from "@/components/player"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
function SkeletonContent({
/**
* Loading screens never scroll, so they cannot rely on scroll-view inset
* adjustment. iOS headers are transparent and overlap the screen; Android
* headers are opaque and already sit above it.
*/
function SkeletonScreen({
children,
embedded = false,
style,
backgroundColor,
onLayout,
}: {
children: ReactNode
embedded?: boolean
style?: ComponentProps<typeof Reanimated.View>["style"]
backgroundColor?: string
onLayout?: () => void
}) {
const colors = useThemeColors()
const headerHeight = useHeaderHeight()
if (embedded) return <>{children}</>
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
<Reanimated.View
onLayout={onLayout}
accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[
styles.screen,
{
backgroundColor: backgroundColor ?? colors.background,
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
},
style,
]}
>
{children}
</ScrollView>
</Reanimated.View>
)
}
@@ -61,56 +74,103 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
)
}
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
function TextLine({
width,
height = 14,
fontSize,
}: {
width: DimensionValue
height?: number
fontSize: number
}) {
return <Skeleton style={{ width, height, borderRadius: 4 }} />
return (
<View
style={{
width,
height: Math.round(fontSize * 1.2),
justifyContent: "center",
}}
>
<Skeleton
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
/>
</View>
)
}
export function SongRowSkeleton() {
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
const colors = useThemeColors()
const meta = (
<View style={styles.songMeta}>
<TextLine width="60%" fontSize={16} />
<View style={styles.songSubtitle}>
<TextLine width="40%" fontSize={14} />
</View>
</View>
)
if (inset) {
return (
<View style={styles.insetRow}>
<Skeleton style={styles.songArtwork} />
<View
style={[
styles.insetSongContent,
{ borderBottomColor: colors.border },
]}
>
{meta}
</View>
</View>
)
}
return (
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
<Skeleton style={styles.songArtwork} />
<View style={styles.songMeta}>
<TextLine width="60%" height={16} />
<TextLine width="40%" />
{meta}
</View>
)
}
function TrackRowSkeleton() {
const colors = useThemeColors()
return (
<View style={styles.trackRow}>
<View style={styles.trackNumber}>
<TextLine width={12} fontSize={16} />
</View>
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
<TextLine width="55%" fontSize={16} />
</View>
</View>
)
}
export function SongListSkeleton({
rows = 10,
embedded = false,
}: {
rows?: number
embedded?: boolean
}) {
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
return Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} inset={inset} />
))
}
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
return (
<SkeletonContent embedded={embedded}>
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
{Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} />
))}
</View>
</SkeletonContent>
<SkeletonScreen>
<SongRows rows={rows} />
</SkeletonScreen>
)
}
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
function CardSkeleton({
width,
minHeight,
round = false,
}: {
width: number
minHeight?: number
round?: boolean
}) {
return (
<View style={[styles.card, { width }]}>
<View style={[styles.card, { width, minHeight }]}>
<Skeleton
style={{
width,
@@ -118,35 +178,37 @@ function CardSkeleton({
borderRadius: round ? width / 2 : radius.md,
}}
/>
<TextLine width="80%" />
{round ? null : <TextLine width="50%" height={12} />}
<TextLine width="80%" fontSize={14} />
{round ? null : <TextLine width="50%" fontSize={12} />}
</View>
)
}
export function MediaGridSkeleton({
items = 6,
contentInset = true,
embedded = false,
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
function MediaGridContent({
items,
contentInset,
header,
}: {
items?: number
contentInset?: boolean
embedded?: boolean
items: number
contentInset: boolean
header?: ReactNode
}) {
const tabletLayout = useTabletLayout()
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout()
return (
<SkeletonContent embedded={embedded}>
<>
{header}
<View
onLayout={onLayout}
accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[
styles.grid,
contentInset ? styles.gridInset : styles.gridRowInset,
{
paddingHorizontal: horizontalPadding,
paddingTop: contentInset ? horizontalPadding : 0,
// FlatList applies its content gap after the list header as well.
marginTop: header && !tabletLayout ? gap : 0,
gap,
},
]}
@@ -154,20 +216,47 @@ export function MediaGridSkeleton({
{Array.from(
{ length: ready ? Math.max(items, columns * 3) : 0 },
(_, index) => (
<CardSkeleton key={index} width={cardWidth} />
<CardSkeleton
key={index}
width={cardWidth}
minHeight={
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
}
/>
)
)}
</View>
</SkeletonContent>
</>
)
}
export function MediaGridSkeleton({
items = 6,
contentInset = true,
header,
}: {
items?: number
contentInset?: boolean
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
header?: ReactNode
}) {
return (
<SkeletonScreen>
<MediaGridContent
items={items}
contentInset={contentInset}
header={header}
/>
</SkeletonScreen>
)
}
export function CarouselSkeleton() {
return (
<View style={styles.carousel}>
<TextLine width={160} height={22} />
<TextLine width={160} fontSize={22} />
<View style={styles.carouselRow}>
{Array.from({ length: 3 }, (_, index) => (
{Array.from({ length: 8 }, (_, index) => (
<CardSkeleton key={index} width={carouselCardWidth} />
))}
</View>
@@ -176,140 +265,148 @@ export function CarouselSkeleton() {
}
export function HomeSkeleton() {
const headerHeight = useHeaderHeight()
const colors = useThemeColors()
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[
styles.home,
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
]}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
>
<CarouselSkeleton />
<CarouselSkeleton />
</ScrollView>
<SkeletonScreen>
<View style={styles.home}>
<CarouselSkeleton />
<CarouselSkeleton />
</View>
</SkeletonScreen>
)
}
function HeroActions({
favorite = true,
reverse = false,
}: {
favorite?: boolean
reverse?: boolean
}) {
return (
<View style={[styles.actions, reverse && styles.actionsReverse]}>
{favorite ? <Skeleton style={styles.iconAction} /> : null}
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View>
)
}
/** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({
zoomCoverSize,
variant,
style,
round = false,
backgroundColor,
onLayout,
}: {
zoomCoverSize?: number
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
round?: boolean
variant: "album" | "playlist" | "favorites" | "artist"
style?: ComponentProps<typeof Reanimated.View>["style"]
backgroundColor?: string
onLayout?: () => void
}) {
const colors = useThemeColors()
const headerHeight = useHeaderHeight()
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
const coverSize =
!round && landscape
? tabletCoverSize!
: (zoomCoverSize ?? (round ? 180 : 210))
const actions = (
<View style={styles.actions}>
<Skeleton style={styles.iconAction} />
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View>
)
const artwork = (
<Skeleton
style={{
width: coverSize,
height: coverSize,
borderRadius: round ? coverSize / 2 : radius.lg,
}}
/>
)
if (variant === "artist" || variant === "favorites") {
const artist = variant === "artist"
const coverSize = artist ? 180 : 200
const hero = (
<View style={styles.centeredHero}>
<Skeleton
style={{
width: coverSize,
height: coverSize,
borderRadius: artist ? coverSize / 2 : radius.lg,
}}
/>
<TextLine width={200} fontSize={artist ? 28 : 24} />
<HeroActions favorite={artist} />
</View>
)
return (
<SkeletonScreen
style={style}
backgroundColor={backgroundColor}
onLayout={onLayout}
>
{artist ? (
<MediaGridContent items={4} contentInset={false} header={hero} />
) : (
<>
{hero}
<CollectionDivider />
<SongRows rows={8} inset />
</>
)}
</SkeletonScreen>
)
}
const album = variant === "album"
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
return (
<Reanimated.ScrollView
<SkeletonScreen
style={style}
backgroundColor={backgroundColor}
onLayout={onLayout}
style={[
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
style,
]}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
>
{round ? (
<View style={styles.artistHero}>
{zoomCoverSize ? (
<Link.AppleZoomTarget>
<View collapsable={false}>{artwork}</View>
</Link.AppleZoomTarget>
) : (
artwork
)}
<TextLine width={200} height={24} />
<TextLine width={120} height={16} />
{actions}
</View>
<CollectionHero
artwork={
<Link.AppleZoomTarget>
<View collapsable={false}>
<Skeleton
style={{
width: coverSize,
height: coverSize,
borderRadius: radius.lg,
}}
/>
</View>
</Link.AppleZoomTarget>
}
actions={<HeroActions favorite={album} reverse={landscape} />}
>
<TextLine
width={landscape ? "85%" : 200}
fontSize={landscape ? 22 : 24}
/>
<TextLine
width={landscape ? "60%" : 120}
fontSize={landscape ? 22 : 16}
/>
{album ? (
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
) : null}
</CollectionHero>
<CollectionDivider />
{album ? (
Array.from({ length: 10 }, (_, index) => (
<TrackRowSkeleton key={index} />
))
) : (
<CollectionHero
artwork={
zoomCoverSize ? (
<Link.AppleZoomTarget>
<View collapsable={false}>{artwork}</View>
</Link.AppleZoomTarget>
) : (
artwork
)
}
actions={actions}
>
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
<TextLine
width={landscape && !round ? "60%" : 120}
height={landscape && !round ? 22 : 16}
/>
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
</CollectionHero>
<SongRows rows={8} inset />
)}
{round ? (
<MediaGridSkeleton items={4} contentInset={false} embedded />
) : (
<SongListSkeleton rows={8} embedded />
)}
</Reanimated.ScrollView>
</SkeletonScreen>
)
}
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
const colors = useThemeColors()
return (
<SkeletonContent>
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
{Array.from({ length: rows }, (_, index) => (
<View
key={index}
style={[styles.artistRow, { borderBottomColor: colors.border }]}
>
<Skeleton style={styles.artistAvatar} />
<TextLine width="50%" height={16} />
</View>
))}
</View>
</SkeletonContent>
<SkeletonScreen>
{Array.from({ length: rows }, (_, index) => (
<View
key={index}
style={[styles.artistRow, { borderBottomColor: colors.border }]}
>
<Skeleton style={styles.artistAvatar} />
<TextLine width="50%" fontSize={16} />
</View>
))}
</SkeletonScreen>
)
}
const styles = StyleSheet.create({
screen: { flex: 1, overflow: "hidden" },
songRow: {
flexDirection: "row",
alignItems: "center",
@@ -319,22 +416,55 @@ const styles = StyleSheet.create({
paddingHorizontal: spacing.lg,
borderBottomWidth: StyleSheet.hairlineWidth,
},
insetRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingLeft: collectionInset,
},
insetSongContent: {
flex: 1,
flexDirection: "row",
alignItems: "center",
alignSelf: "stretch",
minHeight: 64,
paddingVertical: 10,
marginRight: collectionInset,
borderBottomWidth: StyleSheet.hairlineWidth,
},
songArtwork: { width: 44, height: 44, borderRadius: 6 },
songMeta: { flex: 1, gap: 6 },
card: { gap: spacing.xs },
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
gridInset: { padding: spacing.lg },
gridRowInset: { paddingHorizontal: spacing.lg },
carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl },
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: {
songMeta: { flex: 1 },
songSubtitle: { marginTop: 3 },
trackRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.sm,
paddingLeft: collectionInset,
},
trackNumber: { width: 24, alignItems: "center" },
trackContent: {
flex: 1,
justifyContent: "center",
alignSelf: "stretch",
minHeight: 52,
paddingVertical: 12,
marginRight: collectionInset,
borderBottomWidth: StyleSheet.hairlineWidth,
},
card: { gap: spacing.xs },
grid: { flexDirection: "row", flexWrap: "wrap" },
carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl },
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: {
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
gap: spacing.sm,
marginTop: spacing.sm,
},
actionsReverse: { flexDirection: "row-reverse" },
iconAction: { width: 44, height: 44, borderRadius: 22 },
playButton: { width: 160, height: 44, borderRadius: 999 },
artistRow: {
+4 -1
View File
@@ -19,6 +19,9 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme"
/** Height reserved under each tablet card's artwork for its title and subtitle. */
export const tabletCardTextHeight = 48
type GridProps = {
content: MediaItem[]
paddingBottom: number
@@ -48,7 +51,7 @@ export function TabletMediaGrid({
const [headerHeight, setHeaderHeight] = useState(0)
const [scrollY, setScrollY] = useState(0)
const lastRequestedLength = useRef(-1)
const rowHeight = cardWidth + 48 + gap
const rowHeight = cardWidth + tabletCardTextHeight + gap
const firstRow = Math.max(
0,
Math.floor((scrollY - headerHeight) / rowHeight) - 2