Compare commits

...
114 changed files with 3077 additions and 2702 deletions

No files matched your search

+7 -15
View File
@@ -25,20 +25,16 @@ FROM node:${NODE_VERSION} AS dependencies
WORKDIR /app
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
# Mobile is intentionally omitted so its deps are never installed.
COPY package.json pnpm-lock.yaml .npmrc ./
# Mobile's manifest is never copied, so the workspace globs cannot discover it.
# The workspace file must be the real one: its overrides and patches are
# checked against the lockfile.
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
# pnpm validates patches even when their packages are outside the install filter.
COPY patches ./patches
COPY apps/web/package.json ./apps/web/
COPY packages/convex/package.json ./packages/convex/
# Explicit workspace — do not use apps/* so mobile cannot be discovered.
RUN printf '%s\n' \
'packages:' \
' - "apps/web"' \
' - "packages/convex"' \
>> pnpm-workspace.yaml \
&& printf '\n%s\n' \
RUN printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
@@ -82,15 +78,11 @@ FROM node:${NODE_VERSION} AS convex-functions
WORKDIR /app
COPY package.json pnpm-lock.yaml .npmrc ./
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
COPY patches ./patches
COPY packages/convex/package.json ./packages/convex/
RUN printf '%s\n' \
'packages:' \
' - "packages/convex"' \
> pnpm-workspace.yaml \
&& printf '\n%s\n' \
RUN printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
+9 -4
View File
@@ -73,10 +73,15 @@ select your signing team, then build and run. For a Release build, use Xcode's
Archive action with the Catalyst destination. EAS's existing iOS profiles still
build iPhone/iPad apps.
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
patches. It disables precompiled React Native and Expo modules so dependencies
can compile for Catalyst. The Mac app derives a separate bundle identifier with
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
raises pod deployment targets to the app's, and disables precompiled React
Native and Expo modules so dependencies can compile for Catalyst. System volume
stays under macOS control.
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
same team. Handoff only pairs apps with a matching team and activity type, which
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
+5 -2
View File
@@ -26,6 +26,8 @@ export default ({ config }: ConfigContext): ExpoConfig => {
production: "oTunes",
}[variant]
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
return {
...config,
plugins: [
@@ -40,11 +42,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
icon: `./assets/icon${iconSuffix}.png`,
ios: {
...config.ios,
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
bundleIdentifier,
icon: `./assets/${composer}.icon`,
infoPlist: {
...config.ios?.infoPlist,
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
NSUserActivityTypes: [`${bundleIdentifier}.media`],
},
},
android: {
+1
View File
@@ -54,6 +54,7 @@
"expo-status-bar",
"expo-app-intents",
"./plugins/with-android-colors",
"./plugins/with-android-fast-fade",
[
"expo-navigation-bar",
{
+16 -25
View File
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
import {
ScreenPaletteProvider,
useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidNativeTabColors,
useAndroidTabHasArtworkPalette,
useTabletBackgroundStyle,
} from "@/contexts/android-tab-theme"
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs"
@@ -46,12 +46,13 @@ function useRouterTheme() {
}
function useNativeTabColors() {
// These props initialize native tabs; the worklet owns subsequent colors.
const selectedColor = colors.dark.primary
const themeIsDark = useIsDark()
const androidPalette = colors.dark
const artworkPalette = useAndroidTabPalette()
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
const androidPalette = useAndroidTabPalette()
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
const selectedColor = hasArtworkPalette
? androidPalette.foreground
: androidPalette.accentText
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
const inactive = appleMusic.tabInactive
const iconColor =
@@ -61,14 +62,14 @@ function useNativeTabColors() {
selected: appleMusic.pink,
}
: {
default: androidPalette.mutedForeground,
default: androidPalette.secondaryForeground,
selected: selectedColor,
}
const labelColor =
Platform.OS === "ios"
? DynamicColorIOS({ dark: inactive, light: "#636366" })
: androidPalette.mutedForeground
: androidPalette.secondaryForeground
return {
isDark,
@@ -85,20 +86,17 @@ function useNativeTabColors() {
blurEffect: isDark
? "systemChromeMaterialDark"
: "systemChromeMaterialLight",
// Reveal the shared UI-thread background beneath the native tab bar.
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
backgroundColor:
Platform.OS === "ios" ? undefined : androidPalette.background,
}
}
function TabsContent() {
const tabletLayout = useTabletLayout()
const homeColors = useAndroidNativeTabColors()
const libraryColors = useAndroidNativeTabColors()
const searchColors = useAndroidNativeTabColors()
const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors()
const backgroundStyle = useAndroidTabBackgroundStyle()
const backgroundStyle = useTabletBackgroundStyle()
const { currentSong, queueSongIds } = usePlaybackQueue()
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
@@ -129,7 +127,9 @@ function TabsContent() {
tintColor={tabColors.tintColor}
minimizeBehavior="onScrollDown"
{...(Platform.OS === "android"
? { disableIndicator: true, rippleColor: tabColors.tintColor }
? // A new ripple color rebuilds Material's item backgrounds and
// cuts off the in-flight ripple, so it must not follow the palette.
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
: {})}
>
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
@@ -140,9 +140,6 @@ function TabsContent() {
<NativeTabs.Trigger
name="home"
unstable_nativeProps={
Platform.OS === "android" ? homeColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
@@ -152,9 +149,6 @@ function TabsContent() {
<NativeTabs.Trigger
name="library"
unstable_nativeProps={
Platform.OS === "android" ? libraryColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
@@ -169,9 +163,6 @@ function TabsContent() {
<NativeTabs.Trigger
name="search"
unstable_nativeProps={
Platform.OS === "android" ? searchColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
@@ -1,3 +1,4 @@
import { Ionicons } from "@expo/vector-icons"
import { SongSwipeRow } from "@/components/song-swipe-row"
import {
useSwipeRowGroup,
@@ -7,21 +8,13 @@ import {
CollectionHero,
useCollectionHeroLayout,
} from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated"
import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { useScreenPalette } from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react"
import { Platform, Pressable, StyleSheet, View } from "react-native"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import {
CollectionDivider,
@@ -142,17 +135,14 @@ export default function AlbumScreen() {
headerLargeTitle: false,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerStyle: { backgroundColor: palette.background },
headerTintColor: palette.foreground,
}
: {}),
}}
/>
<CollectionDetailSkeleton
zoomCoverSize={220}
variant="album"
onLayout={onLayout}
style={backgroundStyle}
backgroundColor={
@@ -173,9 +163,9 @@ export default function AlbumScreen() {
}}
/>
<View style={[styles.empty, { backgroundColor: colors.background }]}>
<PaletteText style={{ color: colors.mutedForeground }}>
<Text style={{ color: colors.mutedForeground }}>
Album not found.
</PaletteText>
</Text>
</View>
</>
)
@@ -196,10 +186,7 @@ export default function AlbumScreen() {
headerTintColor: palette.foreground,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerStyle: { backgroundColor: palette.background },
statusBarStyle: palette.isDark
? ("light" as const)
: ("dark" as const),
@@ -221,11 +208,10 @@ export default function AlbumScreen() {
}
>
<Pressable hitSlop={8}>
<PaletteIcon
tone="foreground"
<Ionicons
name="ellipsis-horizontal"
size={22}
color={palette.isDark ? "#fff" : "#000"}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
@@ -283,8 +269,7 @@ export default function AlbumScreen() {
{ backgroundColor: palette.surface },
]}
>
<PaletteIcon
tone={favorited ? "accent" : "foreground"}
<Ionicons
name={favorited ? "star" : "star-outline"}
size={24}
color={favorited ? palette.accent : palette.foreground}
@@ -310,8 +295,7 @@ export default function AlbumScreen() {
{ backgroundColor: palette.surface },
]}
>
<PaletteIcon
tone="foreground"
<Ionicons
name="shuffle"
size={24}
color={palette.foreground}
@@ -320,8 +304,7 @@ export default function AlbumScreen() {
</View>
}
>
<PaletteText
tone="foreground"
<Text
style={[
styles.title,
heroLayout.landscape && styles.titleLandscape,
@@ -329,13 +312,12 @@ export default function AlbumScreen() {
]}
>
{album.title}
</PaletteText>
</Text>
<Pressable
onPress={() => push(`/artist/${album.artist.id}`)}
style={styles.artistPressable}
>
<PaletteText
tone="accentText"
<Text
style={[
styles.artist,
heroLayout.landscape && styles.artistLandscape,
@@ -343,7 +325,7 @@ export default function AlbumScreen() {
]}
>
{album.artist.name}
</PaletteText>
</Text>
</Pressable>
<View
style={{
@@ -357,25 +339,18 @@ export default function AlbumScreen() {
}}
>
{metadata ? (
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
<Text style={{ color: palette.secondaryForeground }}>
{metadata}
</PaletteText>
</Text>
) : null}
{album.hasLossless ? (
<>
{metadata ? (
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
<Text style={{ color: palette.secondaryForeground }}>
·
</PaletteText>
</Text>
) : null}
<AudioFormatBadge
artwork
format="lossless"
color={palette.secondaryForeground}
backgroundColor={palette.background}
@@ -385,15 +360,11 @@ export default function AlbumScreen() {
{album.hasAtmos ? (
<>
{metadata || album.hasLossless ? (
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
<Text style={{ color: palette.secondaryForeground }}>
·
</PaletteText>
</Text>
) : null}
<AudioFormatBadge
artwork
format="atmos"
color={palette.secondaryForeground}
backgroundColor={palette.background}
@@ -517,12 +488,11 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
style={styles.trackRow}
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
>
<PaletteText
tone="secondaryForeground"
<Text
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
>
{number}
</PaletteText>
</Text>
<View
style={[
styles.trackContent,
@@ -530,29 +500,24 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
]}
>
<View style={styles.trackMeta}>
<PaletteText
tone="foreground"
<Text
style={[styles.trackTitle, { color: palette.foreground }]}
numberOfLines={1}
>
{track.title}
</PaletteText>
</Text>
{track.artists ? (
<PaletteText
tone="secondaryForeground"
<Text
style={{ color: palette.secondaryForeground }}
numberOfLines={1}
>
{track.artists.join(", ")}
</PaletteText>
</Text>
) : null}
</View>
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
<Text style={{ color: palette.secondaryForeground }}>
{formatDuration(track.durationSeconds)}
</PaletteText>
</Text>
</View>
</Row>
</MusicEntityView>
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
headerLargeTitle: false,
}}
/>
<CollectionDetailSkeleton round />
<CollectionDetailSkeleton variant="artist" />
</>
)
}
+4 -1
View File
@@ -62,7 +62,10 @@ export default function HomeScreen() {
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
contentContainerStyle={[
styles.content,
{ paddingBottom: tabContentBottomInset },
]}
contentInsetAdjustmentBehavior="automatic"
>
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
@@ -1,21 +1,14 @@
import { Ionicons } from "@expo/vector-icons"
import {
CollectionHero,
useCollectionHeroLayout,
} from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated"
import {
PlaylistSearchBar,
usePlaylistSearch,
} from "@/components/playlist-search-bar"
import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { useScreenPalette } from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react"
import { memo, useCallback, useEffect, useMemo } from "react"
@@ -31,6 +24,7 @@ import {
Platform,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
@@ -111,17 +105,14 @@ export default function PlaylistScreen() {
headerLargeTitle: false,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerStyle: { backgroundColor: palette.background },
headerTintColor: palette.foreground,
}
: {}),
}}
/>
<CollectionDetailSkeleton
zoomCoverSize={200}
variant="playlist"
onLayout={onLayout}
style={backgroundStyle}
backgroundColor={
@@ -142,9 +133,9 @@ export default function PlaylistScreen() {
}}
/>
<View style={[styles.empty, { backgroundColor: colors.background }]}>
<PaletteText style={{ color: colors.mutedForeground }}>
<Text style={{ color: colors.mutedForeground }}>
Playlist not found.
</PaletteText>
</Text>
</View>
</>
)
@@ -179,6 +170,7 @@ function PlaylistContent({
}) {
const router = useRouter()
const isFocused = useIsFocused()
const colors = useThemeColors()
const { playPlaylist, playPlaylistShuffled, playFromSong } =
usePlaybackActions()
const { isSongFavorite } = useFavorites()
@@ -279,10 +271,7 @@ function PlaylistContent({
headerTintColor: palette.foreground,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerStyle: { backgroundColor: palette.background },
statusBarStyle: palette.isDark
? ("light" as const)
: ("dark" as const),
@@ -301,11 +290,10 @@ function PlaylistContent({
onAction={handlePlaylistMenuAction}
>
<Pressable hitSlop={8}>
<PaletteIcon
tone="foreground"
<Ionicons
name="ellipsis-horizontal"
size={22}
color={palette.isDark ? "#fff" : "#000"}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
@@ -313,6 +301,7 @@ function PlaylistContent({
}
}, [
canEdit,
colors.foreground,
deletePlaylist,
handlePlaylistDetailAction,
palette.foreground,
@@ -372,15 +361,14 @@ function PlaylistContent({
contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListEmptyComponent={
<PaletteText
tone="secondaryForeground"
<Text
style={[
styles.emptyResults,
{ color: palette.secondaryForeground },
]}
>
{songs.length ? "No songs found." : "No songs in this playlist."}
</PaletteText>
</Text>
}
ListHeaderComponent={
<PlaylistHero
@@ -473,19 +461,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
}}
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
>
<PaletteIcon
name="trash"
size={22}
color={colors.primaryForeground}
/>
<PaletteText
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
<Text
style={[
styles.removeActionText,
{ color: colors.primaryForeground },
]}
>
Remove
</PaletteText>
</Text>
</Pressable>
)}
>
@@ -565,8 +549,7 @@ const PlaylistHero = memo(function PlaylistHero({
},
]}
>
<PaletteIcon
tone={isSubscribed ? "foreground" : "accentForeground"}
<Ionicons
name={isSubscribed ? "checkmark" : "add"}
size={24}
color={
@@ -592,18 +575,12 @@ const PlaylistHero = memo(function PlaylistHero({
onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]}
>
<PaletteIcon
tone="foreground"
name="shuffle"
size={24}
color={palette.foreground}
/>
<Ionicons name="shuffle" size={24} color={palette.foreground} />
</Pressable>
</View>
}
>
<PaletteText
tone="foreground"
<Text
style={[
styles.title,
heroLayout.landscape && styles.titleLandscape,
@@ -611,16 +588,15 @@ const PlaylistHero = memo(function PlaylistHero({
]}
>
{title}
</PaletteText>
<PaletteText
tone="foreground"
</Text>
<Text
style={{
color: palette.foreground,
fontSize: heroLayout.landscape ? 22 : 16,
}}
>
{ownerName}
</PaletteText>
</Text>
</CollectionHero>
<CollectionDivider color={palette.divider} />
</MusicEntityView>
@@ -36,7 +36,7 @@ export default function FavoritesScreen() {
const colors = useThemeColors()
const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = favorites?.songs ?? []
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -45,8 +45,8 @@ export default function FavoritesScreen() {
usePlaylistSearch(songs)
useEffect(() => {
if (favorites) rememberSongs(favorites.songs)
}, [favorites])
rememberSongs(songs)
}, [songs])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
<CollectionDetailSkeleton />
<CollectionDetailSkeleton variant="favorites" />
</>
)
}
@@ -26,6 +26,7 @@ import {
} from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { changeServer, signOut } from "@/lib/session"
import { radius, spacing, useThemeColors } from "@/lib/theme"
@@ -185,6 +186,7 @@ function AppearanceSection() {
setSaving(true)
try {
await setArtworkColorsEnabled(checked)
clearCoverPaletteCache()
} catch {
showError("Could not save artwork colors preference.")
} finally {
@@ -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 (
@@ -23,19 +23,16 @@ type LibraryKind = (typeof LIBRARY_KINDS)[number]
const PAGE_SIZE = 500
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
type Favorites = {
favoriteSongs: string[]
favoriteAlbums: string[]
favoriteArtists: string[]
}
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
return new Set<string>(
kind === "song"
(kind === "song"
? favorites.favoriteSongs
: kind === "album"
? favorites.favoriteAlbums
: favorites.favoriteArtists
).flat()
)
}
@@ -214,12 +214,13 @@ export function useIntentDispatch() {
)
}
if (kind === "artist") {
return fetchCachedQuery(
const chunks = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> }
)
return chunks.flat()
}
if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) {
@@ -229,7 +230,7 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites,
{}
)
return favorites.favoriteSongs
return favorites.favoriteSongs.flat()
}
return fetchCachedQuery(
convex,
@@ -391,17 +392,18 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites,
{}
)
if (favorites.favoriteSongs.length === 0) {
const favoriteSongs = favorites.favoriteSongs.flat()
if (favoriteSongs.length === 0) {
throw new IntentRejected(
"Nothing is queued, and your favorites are empty."
)
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(favorites.favoriteSongs)
await actions.playShuffled(favoriteSongs)
} else {
ensureActive(invocation)
await actions.playInOrder(favorites.favoriteSongs)
await actions.playInOrder(favoriteSongs)
}
return
}
+2 -10
View File
@@ -1,5 +1,4 @@
import { PaletteText } from "@/components/palette-text"
import { StyleSheet, View } from "react-native"
import { StyleSheet, Text, View } from "react-native"
import Svg, { G, Path } from "react-native-svg"
import {
@@ -69,12 +68,10 @@ function LosslessMark({
/** The Dolby Atmos or Lossless label shown under the progress bar. */
export function AudioFormatBadge({
artwork = false,
format,
color,
backgroundColor,
}: {
artwork?: boolean
format: PlaybackFormat
color: string
backgroundColor: string
@@ -87,12 +84,7 @@ export function AudioFormatBadge({
) : (
<LosslessMark color={color} backgroundColor={backgroundColor} />
)}
<PaletteText
tone={artwork ? "secondaryForeground" : undefined}
style={[styles.label, { color }]}
>
{label}
</PaletteText>
<Text style={[styles.label, { color }]}>{label}</Text>
</View>
)
}
+3 -7
View File
@@ -1,6 +1,5 @@
import { PaletteText } from "@/components/palette-text"
import { memo } from "react"
import { StyleSheet, View } from "react-native"
import { StyleSheet, Text, View } from "react-native"
import { useThemeColors } from "@/lib/theme"
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
}) {
const colors = useThemeColors()
return (
<PaletteText
tone={color ? "foreground" : undefined}
style={[styles.discHeader, { color: color ?? colors.foreground }]}
>
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
{label}
</PaletteText>
</Text>
)
})
@@ -71,7 +71,10 @@ class ConvexAuthErrorBoundary extends Component<
}
}
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
export function ConvexAuthRecovery({
children,
onInvalidate,
}: ConvexAuthRecoveryProps) {
const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth()
const hadServerAuthRef = useRef(false)
@@ -113,9 +116,9 @@ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecover
const sessionEstablished = Boolean(
serverAuth &&
!serverAuth.isLoading &&
!serverAuth.isRefreshing &&
serverAuth.isAuthenticated
!serverAuth.isLoading &&
!serverAuth.isRefreshing &&
serverAuth.isAuthenticated
)
return (
+5 -1
View File
@@ -35,7 +35,11 @@ export function HandoffBridge() {
if (!active || !activity) return
try {
const source = new URL(activity.server)
if (!config || source.origin !== new URL(config.serverUrl).origin) {
if (!config) {
showError("Connect to an oTunes server to continue this activity.")
return
}
if (source.origin !== new URL(config.serverUrl).origin) {
showError("This activity belongs to a different oTunes server.")
return
}
@@ -112,7 +112,10 @@ function SwipeRowBody({
setIsOpen(false)
}, [removing, translateX])
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
const handleSwipeStart = useCallback(
() => group.setOpen(close),
[close, group]
)
const handleSettle = useCallback(
(open: boolean) => {
@@ -251,8 +254,7 @@ function SwipeRowBody({
const pillWidth = Math.max(
0,
resting +
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
commitProgress.value
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
)
const restingHeight = interpolate(
pillWidth,
+14 -32
View File
@@ -1,13 +1,11 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import Animated from "react-native-reanimated"
import {
useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidTabHasArtworkPalette,
} from "@/contexts/android-tab-theme"
import { Ionicons } from "@expo/vector-icons"
import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router"
import { Platform, Pressable, StyleSheet, View } from "react-native"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import { useSafeAreaInsets } from "react-native-safe-area-context"
@@ -67,8 +65,7 @@ function MiniPlayerContent({
<View
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
>
<PaletteText
tone="foreground"
<Text
style={[
isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground },
@@ -76,7 +73,7 @@ function MiniPlayerContent({
numberOfLines={1}
>
{currentSong.title}
</PaletteText>
</Text>
</View>
<Pressable
style={styles.controlButton}
@@ -86,8 +83,7 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<PaletteIcon
tone="foreground"
<Ionicons
name={isPlaying ? "pause" : "play"}
size={20}
color={colors.foreground}
@@ -105,8 +101,7 @@ function MiniPlayerContent({
style={artworkStyle}
/>
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
<PaletteText
tone="foreground"
<Text
style={[
isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground },
@@ -114,9 +109,8 @@ function MiniPlayerContent({
numberOfLines={1}
>
{currentSong.title}
</PaletteText>
<PaletteText
tone="secondaryForeground"
</Text>
<Text
style={[
isAccessory ? styles.accessoryArtist : styles.artist,
{ color: colors.mutedForeground },
@@ -124,7 +118,7 @@ function MiniPlayerContent({
numberOfLines={1}
>
{currentSong.artist.name}
</PaletteText>
</Text>
</View>
<View style={styles.controls}>
{Platform.OS === "android" && !isAccessory ? (
@@ -138,12 +132,7 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<PaletteIcon
tone="foreground"
name="play-back"
size={24}
color={colors.foreground}
/>
<Ionicons name="play-back" size={24} color={colors.foreground} />
</Pressable>
) : null}
<Pressable
@@ -154,8 +143,7 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<PaletteIcon
tone="foreground"
<Ionicons
name={isPlaying ? "pause" : "play"}
size={24}
color={colors.foreground}
@@ -169,12 +157,7 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<PaletteIcon
tone="foreground"
name="play-forward"
size={24}
color={colors.foreground}
/>
<Ionicons name="play-forward" size={24} color={colors.foreground} />
</Pressable>
</View>
</Pressable>
@@ -184,10 +167,9 @@ function MiniPlayerContent({
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const palette = useAndroidTabPalette()
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
const backgroundStyle = useAndroidTabBackgroundStyle()
return (
<Animated.View style={[styles.androidBar, backgroundStyle]}>
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
{children}
{hasArtworkPalette ? (
<View
@@ -205,7 +187,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
{ backgroundColor: palette.secondaryForeground },
]}
/>
</Animated.View>
</View>
)
}
-49
View File
@@ -1,49 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import type { ComponentProps } from "react"
import { Pressable, type TextProps } from "react-native"
import { useRouter } from "expo-router"
import Animated from "react-native-reanimated"
import {
useAnimatedPaletteColor,
type PaletteColor,
} from "@/contexts/android-tab-theme"
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
/** Keep artwork text colors on the same UI-thread animation as the background. */
export function PaletteText({
tone,
style,
...props
}: TextProps & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <Animated.Text {...props} style={[style, colorStyle]} />
}
export function PaletteIcon({
tone,
style,
...props
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <AnimatedIcon {...props} style={[style, colorStyle]} />
}
function ArtworkBackButton() {
const router = useRouter()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel="Navigate up"
hitSlop={8}
onPress={() => router.back()}
>
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
</Pressable>
)
}
export function renderArtworkBackButton() {
return <ArtworkBackButton />
}
+7 -13
View File
@@ -1,6 +1,5 @@
import { SongSwipeRow } from "@/components/song-swipe-row"
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
import { PaletteText } from "@/components/palette-text"
import { MusicEntityView } from "@/components/music-entity-view"
import { collectionInset } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image"
@@ -16,7 +15,7 @@ import {
useThemeColors,
} from "@/lib/theme"
import { memo, useCallback } from "react"
import { Platform, Pressable, StyleSheet, View } from "react-native"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import {
MediaContextMenu,
@@ -64,27 +63,22 @@ export const SongRow = memo(function SongRow({
const content = (
<>
<View style={styles.rowMeta}>
<PaletteText
tone={palette ? "foreground" : undefined}
<Text
style={[styles.rowTitle, { color: foreground }]}
numberOfLines={1}
>
{song.title}
</PaletteText>
<PaletteText
tone={palette ? "secondaryForeground" : undefined}
</Text>
<Text
style={[styles.rowSubtitle, { color: secondaryForeground }]}
numberOfLines={1}
>
{song.artist.name} · {song.album.title}
</PaletteText>
</Text>
</View>
<PaletteText
tone={palette ? "secondaryForeground" : undefined}
style={[styles.duration, { color: secondaryForeground }]}
>
<Text style={[styles.duration, { color: secondaryForeground }]}>
{formatDuration(song.durationSeconds)}
</PaletteText>
</Text>
{trailing}
</>
)
+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: {
@@ -3,13 +3,13 @@ import { SafeAreaView } from "react-native-safe-area-context"
import { Platform } from "react-native"
import type { ReactNode } from "react"
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
import { TabletSidebar } from "@/components/tablet-sidebar"
/** Apply sidebar insets natively, before Yoga measures the content pane. */
export function TabScreenContent({ children }: { children: ReactNode }) {
const backgroundStyle = useAndroidTabBackgroundStyle()
const backgroundStyle = useTabletBackgroundStyle()
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
return (
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
+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
+2 -15
View File
@@ -1,4 +1,3 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import {
ActivityIndicator,
Platform,
@@ -74,20 +73,8 @@ export function Button({
<ActivityIndicator color={textColor} />
) : (
<View style={styles.buttonContent}>
{icon ? (
<PaletteIcon
tone={tint ? "accentForeground" : undefined}
name={icon}
size={18}
color={textColor}
/>
) : null}
<PaletteText
tone={tint ? "accentForeground" : undefined}
style={[styles.buttonText, { color: textColor }]}
>
{title}
</PaletteText>
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
</View>
)}
</Pressable>
+1 -1
View File
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
{ artistId }
)
if (selectionRequestIdRef.current !== requestId) return
setPendingSongIds(songIds)
setPendingSongIds(songIds.flat())
setOpen(true)
} catch (error) {
if (selectionRequestIdRef.current !== requestId) return
+38 -129
View File
@@ -14,14 +14,10 @@ import {
useState,
type PropsWithChildren,
} from "react"
import { Platform, StyleSheet, type HostInstance } from "react-native"
import Reanimated, {
import { Platform } from "react-native"
import {
useSharedValue,
useAnimatedStyle,
useAnimatedReaction,
useAnimatedRef,
setNativeProps,
processColor,
withTiming,
type SharedValue,
} from "react-native-reanimated"
@@ -29,19 +25,17 @@ import Reanimated, {
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
import { useIsDark, useThemeColors } from "@/lib/theme"
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
selectedColor: string
}
type TabTheme = {
palette: CoverPalette
colors: SharedValue<PaletteColors>
hasArtworkPalette: boolean
tabletBackground: SharedValue<string>
setPalette: (palette: CoverPalette | null, owner: string) => void
}
const AndroidTabTheme = createContext<TabTheme | null>(null)
const isTablet = Platform.OS === "ios" && Platform.isPad
const sharesPalette = Platform.OS === "android" || isTablet
function useDefaultPalette() {
const theme = useThemeColors()
const isDark = useIsDark()
@@ -60,52 +54,37 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
palette.foreground !== defaultPalette.foreground ||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
palette.accent !== defaultPalette.accent
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
const animatedColors = useSharedValue<PaletteColors>({
...defaultColors,
selectedColor: defaultPalette.accentText,
})
const tabletBackground = useSharedValue(defaultPalette.background)
useLayoutEffect(() => {
const { isDark: _isDark, ...colors } = palette
animatedColors.value = withTiming(
{
...colors,
selectedColor: hasArtwork
? palette.foreground
: defaultPalette.accentText,
},
{ duration: PALETTE_FADE_MS }
)
}, [animatedColors, palette, defaultPalette, hasArtwork])
if (!isTablet) return
tabletBackground.value = withTiming(palette.background, {
duration: TABLET_FADE_MS,
})
}, [tabletBackground, palette.background])
const paletteOwner = useRef<string | null>(null)
const setPalette = useCallback(
(palette: CoverPalette | null, owner: string) => {
if (!palette && paletteOwner.current !== owner) return
paletteOwner.current = palette ? owner : null
// Start on the UI thread immediately. React may defer commits while
// the native stack is animating, including transitionStart state updates.
const target = palette ?? defaultPalette
const { isDark: _isDark, ...colors } = target
animatedColors.value = withTiming(
{
...colors,
selectedColor: palette ? target.foreground : target.accentText,
},
{ duration: PALETTE_FADE_MS }
)
if (isTablet) {
// React may defer commits while the iPad stack is animating.
tabletBackground.value = withTiming(
(palette ?? defaultPalette).background,
{ duration: TABLET_FADE_MS }
)
}
setScreen(palette ? { palette, owner } : null)
},
[animatedColors, defaultPalette]
[tabletBackground, defaultPalette]
)
const artworkPalette = hasArtwork ? palette : null
const value = useMemo(
() => ({
palette: artworkPalette ?? defaultPalette,
colors: animatedColors,
hasArtworkPalette: artworkPalette !== null,
palette: hasArtwork ? palette : defaultPalette,
hasArtworkPalette: hasArtwork,
tabletBackground,
setPalette,
}),
[defaultPalette, artworkPalette, setPalette, animatedColors]
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
)
return (
<AndroidTabTheme.Provider value={value}>
@@ -114,50 +93,6 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
)
}
/**
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
* directly so appearance updates stay on the UI thread with the page colors.
*/
export function useAndroidNativeTabColors() {
const colors = useContext(AndroidTabTheme)?.colors
const ref = useAnimatedRef<HostInstance>()
const mounted = useSharedValue(false)
const attach = useCallback(
(host: HostInstance | null) => {
if (host) ref(host)
mounted.value = host !== null
},
[ref, mounted]
)
useAnimatedReaction(
() => ({ colors: colors?.value, mounted: mounted.value }),
({ colors: palette, mounted: ready }) => {
if (Platform.OS !== "android" || !ready || !palette) return
const normal = processColor(palette.secondaryForeground)
const selected = processColor(palette.selectedColor)
setNativeProps(ref, {
standardAppearance: {
tabBarBackgroundColor: processColor("transparent"),
tabBarItemRippleColor: selected,
tabBarItemActiveIndicatorEnabled: false,
tabBarItemTitleSmallLabelFontSize: 10,
tabBarItemTitleLargeLabelFontSize: 10,
normal: {
tabBarItemTitleFontColor: normal,
tabBarItemIconColor: normal,
},
selected: {
tabBarItemTitleFontColor: selected,
tabBarItemIconColor: selected,
},
},
})
}
)
return { ref: attach, style: { backgroundColor: "transparent" } }
}
export function useAndroidTabPalette() {
const theme = useContext(AndroidTabTheme)
const defaultPalette = useDefaultPalette()
@@ -168,53 +103,29 @@ export function useAndroidTabHasArtworkPalette() {
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
}
export function useAndroidTabBackgroundStyle() {
const theme = useContext(AndroidTabTheme)
const fallback = useDefaultPalette().background
const colors = theme?.colors
/** iPad fades the sidebar and content pane together; other layouts skip it. */
export function useTabletBackgroundStyle() {
const background = useContext(AndroidTabTheme)?.tabletBackground
return useAnimatedStyle(() =>
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
? { backgroundColor: colors?.value.background ?? fallback }
: {}
isTablet && background ? { backgroundColor: background.value } : {}
)
}
/** Color tokens share the background's UI-thread timing. */
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
const colors = useContext(AndroidTabTheme)?.colors
return useAnimatedStyle(() =>
Platform.OS === "android" && tone && colors
? { color: colors.value[tone] }
: {}
)
}
const TABLET_FADE_MS = 400
/** Native headers draw this same UI-thread background as the page and bars. */
function AndroidArtworkBackground() {
const style = useAndroidTabBackgroundStyle()
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
}
export function renderAndroidArtworkBackground() {
return <AndroidArtworkBackground />
}
const PALETTE_FADE_MS = 400
/** The focused artwork screen selects the shared background for page and bars. */
/**
* Artwork screens always paint their own palette so it slides with the page.
* Shared chrome (tab bar, mini player) switches when the transition starts.
*/
export function useScreenPalette(palette: CoverPalette) {
const isFocused = useIsFocused()
const isTablet = Platform.OS === "ios" && Platform.isPad
const sharesPalette =
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
const owner = useRoute().key
const navigation =
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
const [laidOut, setLaidOut] = useState(false)
const [closing, setClosing] = useState(false)
const onLayout = useCallback(() => setLaidOut(true), [])
const theme = useContext(AndroidTabTheme)
const setPalette = theme?.setPalette
const setPalette = useContext(AndroidTabTheme)?.setPalette
useLayoutEffect(() => {
if (!sharesPalette) return
const start = navigation.addListener("transitionStart", ({ data }) => {
@@ -230,20 +141,18 @@ export function useScreenPalette(palette: CoverPalette) {
start()
cancel()
}
}, [navigation, sharesPalette, setPalette, owner, palette])
const defaultPalette = useDefaultPalette()
}, [navigation, setPalette, owner, palette])
const ready = laidOut || isTablet
const target = isFocused && ready && !closing ? palette : defaultPalette
const backgroundStyle = useAndroidTabBackgroundStyle()
const backgroundStyle = useTabletBackgroundStyle()
useLayoutEffect(() => {
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
setPalette(palette, owner)
return () => setPalette(null, owner)
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
}, [closing, ready, isFocused, owner, palette, setPalette])
return {
palette: Platform.OS === "android" ? target : palette,
palette,
backgroundStyle,
onLayout: sharesPalette ? onLayout : undefined,
}
+3 -3
View File
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
)
const songIds = useMemo(
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
() => new Set<string>(favorites?.favoriteSongs.flat()),
[favorites?.favoriteSongs]
)
const albumIds = useMemo(
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
() => new Set<string>(favorites?.favoriteAlbums.flat()),
[favorites?.favoriteAlbums]
)
const artistIds = useMemo(
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
() => new Set<string>(favorites?.favoriteArtists.flat()),
[favorites?.favoriteArtists]
)
const idsRef = useRef({ songIds, albumIds, artistIds })
+9 -7
View File
@@ -401,7 +401,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId }
),
).then((chunks) => chunks.flat()),
recorded: { entity: { kind: "artist", id: artistId } },
}))
const playlist = collection(
@@ -482,12 +482,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[]
try {
songIds = await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
songIds = (
await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
).flat()
} catch {
return
}
+12 -2
View File
@@ -83,7 +83,11 @@ export function createCoverPaletteSource<Swatches>({
const [waitedKey, setWaitedKey] = useState<string | null>(null)
const swatches =
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
resolved.key === key
? resolved.swatches
: key
? cachedSwatches(key)
: null
useEffect(() => {
if (!key || hasCover === false) return
@@ -134,7 +138,13 @@ export function createCoverPaletteSource<Swatches>({
}
}
return { prefetch, usePalette }
/** Forget in-memory swatches so covers are re-extracted. */
function clear() {
swatchesByKey.clear()
pending.clear()
}
return { prefetch, usePalette, clear }
}
function sameSwatches(a: unknown, b: unknown) {
+12
View File
@@ -3,6 +3,7 @@ import {
type CoverPaletteResult,
} from "@/hooks/cover-palette-source"
import {
clearLegacyCoverPaletteCache,
prefetchLegacyCoverPalette,
useLegacyCoverPalette,
} from "@/hooks/use-legacy-cover-palette"
@@ -12,6 +13,7 @@ import {
} from "@/lib/artwork-color-preference"
import { extractCoverSwatches } from "@/lib/artwork-colors"
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
import { clearCachePrefix } from "@/lib/persistent-cache"
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
@@ -21,6 +23,16 @@ const region = createCoverPaletteSource<CoverSwatches>({
derive: (swatches) => deriveCoverPalette(swatches),
})
/**
* Forget every extracted palette, in memory and on device, so covers are
* re-extracted. Both pipelines share the `palette:` cache prefix.
*/
export function clearCoverPaletteCache() {
region.clear()
clearLegacyCoverPaletteCache()
clearCachePrefix("palette")
}
/** Warm visible artwork colors before a detail page is pushed. */
export function prefetchCoverPalette(uri: string) {
void loadArtworkColorsEnabled().then((enabled) =>
@@ -65,3 +65,5 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
export const useLegacyCoverPalette = legacy.usePalette
export const clearLegacyCoverPaletteCache = legacy.clear
+1 -1
View File
@@ -173,7 +173,7 @@ export function useMediaMenuActions() {
api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> }
)
await runQueueAction(action, songIds)
await runQueueAction(action, songIds.flat())
break
}
default:
+1 -4
View File
@@ -1,9 +1,6 @@
import { ConvexError, type Value } from "convex/values"
const AUTH_ERROR_MESSAGES = new Set([
"Not authenticated",
"User not logged in",
])
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"])
function matchesAuthMessage(message: string): boolean {
if (AUTH_ERROR_MESSAGES.has(message)) {
+3 -1
View File
@@ -37,7 +37,9 @@ export function authStorageKey(key: string, storageNamespace: string): string {
return `${key}_${escapedNamespace}`
}
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
export async function clearStoredAuthTokens(
storageNamespace: string
): Promise<void> {
await Promise.all(
AUTH_STORAGE_KEYS.map((key) =>
secureRemoveItem(authStorageKey(key, storageNamespace))
+4 -1
View File
@@ -5,7 +5,10 @@ export function formatDuration(seconds: number): string {
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
}
export function formatRemainingDuration(current: number, total: number): string {
export function formatRemainingDuration(
current: number,
total: number
): string {
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
return `-${formatDuration(remaining)}`
}
+17 -5
View File
@@ -79,7 +79,9 @@ export function deriveCoverPalette(
secondaryForeground: toHex(secondaryForeground),
accent: toHex(accent),
accentForeground: toHex(accentForeground),
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
accentText: toHex(
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
),
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
isDark: lightText,
@@ -94,7 +96,10 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
? withLightness(color, Math.min(lch.l, 0.86))
: withLightness(color, Math.max(lch.l, 0.2))
const y = luminance(clamped)
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
if (
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
) {
return clamped
}
@@ -125,7 +130,10 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
}
function prefersLightText(background: Rgb) {
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
return (
contrastRatio([255, 255, 255], background) >=
contrastRatio([0, 0, 0], background)
)
}
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
@@ -180,7 +188,10 @@ function withLuminance(color: Rgb, target: number): Rgb {
high = mid
}
}
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
return withLightness(
color,
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
)
}
/** `amount` of `color` over `base`. */
@@ -206,7 +217,8 @@ function toLinear(channel: number) {
}
function fromLinear(value: number) {
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
const c =
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
return c * 255
}
+1 -1
View File
@@ -28,7 +28,7 @@ export function useStackScreenOptions(
headerBackButtonDisplayMode: "minimal",
...(Platform.OS === "android"
? {
animation: "slide_from_right",
animation: "fade",
headerLargeTitle: false,
headerTransparent: false,
headerStyle: { backgroundColor: theme.background },
+4 -1
View File
@@ -13,7 +13,10 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
function normalizeHostnameInput(input: string): string {
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
return input
.trim()
.replace(/^https?:\/\//i, "")
.replace(/\/+$/, "")
}
function buildServerUrl(hostname: string): string {
@@ -7,11 +7,15 @@ private enum HandoffState {
static var pending: [String: String]?
static var notify: (() -> Void)?
static var activityType: String {
"\(Bundle.main.bundleIdentifier!).media"
}
// app.config.ts declares the one `.media` type per build profile; iOS and
// Catalyst must publish the same string for Handoff to pair them. Other
// plugins (expo-router) append their own types, so match by suffix.
static let activityType =
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
.first { $0.hasSuffix(".media") }!
}
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
public func application(
_ application: UIApplication,
@@ -0,0 +1,36 @@
const fs = require("fs")
const path = require("path")
const { withDangerousMod } = require("expo/config-plugins")
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
// App resources win over library resources with the same name, so the stack
// fades through black in 100ms: the old page out, then the new page in.
const anims = {
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="50" />
`,
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:startOffset="50"
android:duration="50" />
`,
}
module.exports = (config) =>
withDangerousMod(config, [
"android",
(config) => {
const dir = path.join(
config.modRequest.platformProjectRoot,
"app/src/main/res/anim"
)
fs.mkdirSync(dir, { recursive: true })
for (const [name, xml] of Object.entries(anims)) {
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
}
return config
},
])
+23 -7
View File
@@ -4,6 +4,20 @@ const {
withXcodeProject,
} = require("expo/config-plugins")
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
// current Xcode accepts for Catalyst, so raise them to the app's own target.
const raisePodDeploymentTargets = `
app_target = installer.aggregate_targets.first.platform.deployment_target
installer.pods_project.targets.each do |target|
target.build_configurations.each do |build|
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
if current.nil? || Pod::Version.new(current) < app_target
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
end
end
end
`
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
module.exports = (config) => {
config = withPodfileProperties(config, (config) => {
@@ -13,14 +27,15 @@ module.exports = (config) => {
})
config = withPodfile(config, (config) => {
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
if (!pattern.test(config.modResults.contents)) {
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/
let contents = config.modResults.contents
if (!flag.test(contents) || !postInstall.test(contents)) {
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
}
config.modResults.contents = config.modResults.contents.replace(
pattern,
":mac_catalyst_enabled => true"
)
contents = contents.replace(flag, ":mac_catalyst_enabled => true")
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`)
config.modResults.contents = contents
return config
})
@@ -32,7 +47,8 @@ module.exports = (config) => {
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
const settings = configurations[value].buildSettings
settings.SUPPORTS_MACCATALYST = "YES"
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
// Share the iOS bundle ID so Handoff and the App ID match across devices.
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
}
return config
+1 -1
View File
@@ -32,7 +32,7 @@ export default function Page() {
<ContentCarousel
title="Recently Added"
href="/recently-added"
content={recentlyAdded}
content={recentlyAdded.flat()}
/>
</div>
</div>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : (
<div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}>
{albums.map((album) => (
{albums.flat().map((album) => (
<AlbumCard key={album.id} album={album} />
))}
</div>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : (
<div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}>
{albums.map((album) => (
{albums.flat().map((album) => (
<AlbumCard key={album.id} album={album} />
))}
</div>
+1 -5
View File
@@ -8,11 +8,7 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
import { api } from "@otunes/convex/_generated/api"
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
function RecentlyPlayedCard({
item,
}: {
item: BrowseAlbum | PlaylistSummary
}) {
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) {
if ("owner" in item) {
return <PlaylistCard playlist={item} />
}
+5 -5
View File
@@ -9,7 +9,10 @@ import { ContentCarousel } from "@/components/content-carousel"
import { SearchResultsSkeleton } from "@/components/library-skeletons"
import { SearchPrompt } from "@/components/search-prompt"
import { SearchSongItem } from "@/components/search-song-item"
import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
import {
SearchTopResultCard,
type TopResult,
} from "@/components/search-top-result-card"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -107,10 +110,7 @@ function SearchResults({ query }: { query: string }) {
)}
{showPlaylists && (
<ContentCarousel
title="Playlists"
content={playlistResults ?? []}
/>
<ContentCarousel title="Playlists" content={playlistResults ?? []} />
)}
</div>
</div>
@@ -42,7 +42,9 @@ function formatAddToPlaylistToast(
}
const addedLabel =
addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}`
addedCount > 1
? `Added ${addedCount} songs to ${title}`
: `Added to ${title}`
if (skippedCount === 0) {
return addedLabel
@@ -64,14 +66,15 @@ type AddToPlaylistContextValue = {
openCreatePlaylist: () => void
}
const AddToPlaylistContext = React.createContext<AddToPlaylistContextValue | null>(
null
)
const AddToPlaylistContext =
React.createContext<AddToPlaylistContextValue | null>(null)
export function useAddToPlaylist() {
const context = React.useContext(AddToPlaylistContext)
if (!context) {
throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider")
throw new Error(
"useAddToPlaylist must be used within AddToPlaylistProvider"
)
}
return context
}
@@ -181,7 +184,7 @@ export function AddToPlaylistProvider({
}
)
if (requestId === selectionRequestRef.current) {
showAddToPlaylist(songIds)
showAddToPlaylist(songIds.flat())
}
} catch (error) {
if (requestId === selectionRequestRef.current) {
@@ -201,7 +204,10 @@ export function AddToPlaylistProvider({
setCreateOpen(true)
}, [])
async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) {
async function handleAddToPlaylist(
playlistId: Id<"playlists">,
title: string
) {
setIsSubmitting(true)
try {
const { addedCount, skippedCount } = await addSongs({
+2 -7
View File
@@ -104,10 +104,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}
>
<Link
className="absolute inset-0"
href={"/album/" + album.id}
>
<Link className="absolute inset-0" href={"/album/" + album.id}>
<Image
src={albumCoverUrl(album.id)}
alt={album.title}
@@ -176,9 +173,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
href={"/artist/" + album.artist.id}
className="text-muted-foreground decoration-muted-foreground hover:underline"
>
<p className="truncate text-xs">
{album.artist.name}
</p>
<p className="truncate text-xs">{album.artist.name}</p>
</Link>
</div>
</div>
+21 -6
View File
@@ -44,7 +44,10 @@ import { albumCoverUrl } from "@/lib/cover-urls"
import { sumDurationSeconds } from "@/lib/media-summary"
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
function formatMetadata(genre: string | null, year: number | null): string | null {
function formatMetadata(
genre: string | null,
year: number | null
): string | null {
const parts: string[] = []
if (genre) {
parts.push(genre)
@@ -60,7 +63,9 @@ type AlbumTrackSection = {
tracks: BrowseAlbumTrack[]
}
function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] {
function groupAlbumTracksByDisk(
tracks: BrowseAlbumTrack[]
): AlbumTrackSection[] {
const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null)
if (!hasDiskNumbers) {
return [{ label: null, tracks }]
@@ -138,7 +143,11 @@ export function AlbumView({
} = useTrackSelection(album.tracks, validHighlightedSongId)
const selectionPositions = React.useMemo(
() => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds),
() =>
getSelectionRangePositions(
album.tracks.map((track) => track.id),
selectedIds
),
[album.tracks, selectedIds]
)
@@ -192,7 +201,11 @@ export function AlbumView({
const handleRowPlay = React.useCallback(
(index: number) => {
void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
void playFromSong(
album.tracks[index].id,
albumSongIds,
`album:${album.id}`
)
},
[album.tracks, album.id, albumSongIds, playFromSong]
)
@@ -215,7 +228,7 @@ export function AlbumView({
<PageHeader openApp />
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
<div className="pb-28">
<div className="mx-auto w-full min-w-0 max-w-9/10">
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
<Image
@@ -345,7 +358,9 @@ export function AlbumView({
song={trackSongs.get(track.id)!}
index={listIndex}
trackNumber={
track.track > 0 ? track.track : sectionTrackIndex + 1
track.track > 0
? track.track
: sectionTrackIndex + 1
}
subtitle={track.artists?.join(", ")}
isActive={track.id === activeTrackId}
+2 -2
View File
@@ -32,8 +32,8 @@ export function ArtistsPage() {
<ArtistsSkeleton />
) : (
<ArtistsView
artists={artists}
albums={albums}
artists={artists.flat()}
albums={albums.flat()}
artistId={artistIdFromPathname(pathname)}
onSelectArtist={selectArtist}
/>
+59 -54
View File
@@ -13,7 +13,12 @@ import {
CardHeader,
CardTitle,
} from "@/components/ui/card"
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
import {
Field,
FieldError,
FieldGroup,
FieldLabel,
} from "@/components/ui/field"
import { Input } from "@/components/ui/input"
import { Spinner } from "@/components/ui/spinner"
@@ -101,64 +106,64 @@ export function AuthForm({
administrator if you need access.
</p>
) : (
<form onSubmit={handleSubmit}>
<FieldGroup>
{flow === "signUp" && (
<form onSubmit={handleSubmit}>
<FieldGroup>
{flow === "signUp" && (
<Field>
<FieldLabel htmlFor="name">Name</FieldLabel>
<Input
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
required
/>
</Field>
)}
<Field>
<FieldLabel htmlFor="name">Name</FieldLabel>
<FieldLabel htmlFor="email">Email</FieldLabel>
<Input
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
id="email"
name="email"
type="email"
autoComplete="email"
placeholder="you@example.com"
required
/>
</Field>
)}
<Field>
<FieldLabel htmlFor="email">Email</FieldLabel>
<Input
id="email"
name="email"
type="email"
autoComplete="email"
placeholder="you@example.com"
required
/>
</Field>
<Field>
<FieldLabel htmlFor="password">Password</FieldLabel>
<Input
id="password"
name="password"
type="password"
autoComplete={
flow === "signIn" ? "current-password" : "new-password"
}
required
/>
</Field>
{error && <FieldError>{error}</FieldError>}
<Field>
<Button type="submit" disabled={submitting}>
{submitting && <Spinner />}
{text.submit}
</Button>
</Field>
{!hideSignUpLink ? (
<p className="text-center text-sm text-muted-foreground">
{text.switchPrompt}{" "}
<Link
href={text.switchHref}
className="text-primary underline-offset-4 hover:underline"
>
{text.switchLabel}
</Link>
</p>
) : null}
</FieldGroup>
</form>
<Field>
<FieldLabel htmlFor="password">Password</FieldLabel>
<Input
id="password"
name="password"
type="password"
autoComplete={
flow === "signIn" ? "current-password" : "new-password"
}
required
/>
</Field>
{error && <FieldError>{error}</FieldError>}
<Field>
<Button type="submit" disabled={submitting}>
{submitting && <Spinner />}
{text.submit}
</Button>
</Field>
{!hideSignUpLink ? (
<p className="text-center text-sm text-muted-foreground">
{text.switchPrompt}{" "}
<Link
href={text.switchHref}
className="text-primary underline-offset-4 hover:underline"
>
{text.switchLabel}
</Link>
</p>
) : null}
</FieldGroup>
</form>
)}
</CardContent>
</Card>
@@ -39,6 +39,7 @@ export function ConvexClientProvider({
}) {
return (
<ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}>
<PersistentCacheProvider>{children}</PersistentCacheProvider> </ConvexAuthNextjsProvider>
<PersistentCacheProvider>{children}</PersistentCacheProvider>{" "}
</ConvexAuthNextjsProvider>
)
}
@@ -29,7 +29,7 @@ export function FavoriteMediaButton({
className={cn(
"rounded-full",
!isFavorite &&
"hover:bg-primary hover:text-primary-foreground hover:border-transparent",
"hover:border-transparent hover:bg-primary hover:text-primary-foreground",
className
)}
aria-label={isFavorite ? favoritedLabel : unfavoritedLabel}
+3 -3
View File
@@ -86,15 +86,15 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
)
const songIds = React.useMemo(
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
() => new Set<string>(favorites?.favoriteSongs.flat()),
[favorites?.favoriteSongs]
)
const albumIds = React.useMemo(
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
() => new Set<string>(favorites?.favoriteAlbums.flat()),
[favorites?.favoriteAlbums]
)
const artistIds = React.useMemo(
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
() => new Set<string>(favorites?.favoriteArtists.flat()),
[favorites?.favoriteArtists]
)
@@ -1,7 +1,4 @@
import {
formatMediaSummary,
formatReleaseDate,
} from "@/lib/media-summary"
import { formatMediaSummary, formatReleaseDate } from "@/lib/media-summary"
import { TRACK_ROW_PADDING } from "@/lib/selection-range-styles"
export function MediaCollectionFooter({
+5 -10
View File
@@ -1,12 +1,7 @@
"use client"
import { useAction, useMutation, useQuery } from "convex/react"
import {
MoreHorizontal,
Trash2,
Upload,
UserPlus,
} from "lucide-react"
import { MoreHorizontal, Trash2, Upload, UserPlus } from "lucide-react"
import { useCallback, useEffect, useRef, useState } from "react"
import { toast } from "sonner"
@@ -153,9 +148,7 @@ function UserAvatar({
key={user.image ?? "fallback"}
size={size === "sm" ? "sm" : "default"}
>
{user.image ? (
<AvatarImage src={user.image} alt={user.name} />
) : null}
{user.image ? <AvatarImage src={user.image} alt={user.name} /> : null}
<AvatarFallback>{initials}</AvatarFallback>
</Avatar>
)
@@ -691,7 +684,9 @@ function UserRowActions({
setAdmin({ userId: user._id, isAdmin: !user.isAdmin })
.then(() =>
toast.success(
user.isAdmin ? "Admin access removed" : "User is now admin"
user.isAdmin
? "Admin access removed"
: "User is now admin"
)
)
.catch((error: Error) => toast.error(error.message))
+36 -34
View File
@@ -341,9 +341,7 @@ export function useIsPlaying() {
export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext)
if (!context) {
throw new Error(
"usePlaybackProgress must be used within PlaybackProvider"
)
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
}
return context
}
@@ -366,11 +364,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
api.playback.getPlaybackState,
isSignedIn ? {} : "skip"
)
const syncPlaybackStateMutation = useMutation(
api.playback.syncPlaybackState
)
const syncPlaybackStateMutation = useMutation(api.playback.syncPlaybackState)
const recordPlayMutation = useMutation(api.playback.recordPlay)
const updateSongProgressMutation = useMutation(api.playback.updateSongProgress)
const updateSongProgressMutation = useMutation(
api.playback.updateSongProgress
)
useEffect(() => {
if (!isSignedIn) {
@@ -478,31 +476,27 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const isPlaybackActive = Boolean(currentSongId && isPlaying)
const repeatEnabled = playback.repeatEnabled
const queueLength = queueSongIds.length
const nextQueueSongId =
queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongId = queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongDoc = useCachedQuery(
api.library.getSongPlaybackInfo,
nextQueueSongId ? { id: nextQueueSongId } : "skip"
)
const seekTo = useCallback(
(seconds: number) => {
const audio = audioRef.current
if (!audio) {
return
}
const seekTo = useCallback((seconds: number) => {
const audio = audioRef.current
if (!audio) {
return
}
const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration
: durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped
currentTimeRef.current = clamped
setCurrentTime(clamped)
},
[]
)
const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration
: durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped
currentTimeRef.current = clamped
setCurrentTime(clamped)
}, [])
const saveProgress = useCallback(
(seconds: number) => {
@@ -955,7 +949,13 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
}
const preloadAudio = preloadAudioRef.current
if (shouldContinuePlaying && preloadAudio && nextQueueSongId && user && nextQueueSongDoc) {
if (
shouldContinuePlaying &&
preloadAudio &&
nextQueueSongId &&
user &&
nextQueueSongDoc
) {
const settings = playbackLoadSettings(
user,
dolbyAtmosSupported,
@@ -1233,12 +1233,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[]
try {
songIds = await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
songIds = (
await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
).flat()
} catch {
return
}
@@ -1268,7 +1270,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId }
),
).then((chunks) => chunks.flat()),
[convex, cacheScope]
)
+3 -1
View File
@@ -34,5 +34,7 @@ export function FavoritesPlaylistPage() {
return <PageMessage>Sign in to view your favorites.</PageMessage>
}
return <PlaylistView playlist={favorites} />
return (
<PlaylistView playlist={{ ...favorites, songs: favorites.songs.flat() }} />
)
}
+10 -3
View File
@@ -66,7 +66,7 @@ function HistorySongRow({ song }: { song: HistorySong }) {
showAlbum={false}
/>
<span className="shrink-0 text-xs tabular-nums text-muted-foreground">
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
{formatDuration(song.durationSeconds)}
</span>
</div>
@@ -218,7 +218,11 @@ export function QueuePanel() {
(index) => selectableQueue[index].queueIndex
)
const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex
const next = moveQueueBlock(queueSongIds, fromQueueIndices, targetQueueIndex)
const next = moveQueueBlock(
queueSongIds,
fromQueueIndices,
targetQueueIndex
)
setDragIndex(null)
@@ -263,7 +267,10 @@ export function QueuePanel() {
{historySongs.length > 0 ? (
<ul className="flex flex-col border-b py-1">
{historySongs.map((song) => (
<HistorySongRow key={`history-${song.id}-${song.historyIndex}`} song={song} />
<HistorySongRow
key={`history-${song.id}-${song.historyIndex}`}
song={song}
/>
))}
</ul>
) : null}
+1 -2
View File
@@ -50,8 +50,7 @@ export function SongsView() {
const { isSongFavorite, toggleSongFavorite } = useFavorites()
const { playFromLibrarySong } = usePlaybackActions()
const [sortKey, setSortKey] = useState<SortKey>("title")
const [sortDirection, setSortDirection] =
useState<SortDirection>("asc")
const [sortDirection, setSortDirection] = useState<SortDirection>("asc")
const loadMoreRef = useRef<HTMLDivElement>(null)
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
+1 -2
View File
@@ -29,8 +29,7 @@ function ThemeFavicon() {
return
}
const href =
resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png"
const href = resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png"
for (const rel of ["icon", "shortcut icon"] as const) {
let link = document.querySelector<HTMLLinkElement>(`link[rel="${rel}"]`)
+31 -9
View File
@@ -155,7 +155,9 @@ function FavoriteStarButton({
: "text-primary hover:text-primary",
className
)}
aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`}
aria-label={
isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`
}
onClick={(event) => {
event.stopPropagation()
onToggle()
@@ -175,7 +177,7 @@ function ExplicitBadge({ inRange }: { inRange: boolean }) {
return (
<span
className={cn(
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] leading-none font-semibold",
inRange
? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground"
@@ -219,7 +221,13 @@ function TrackTitle({
export function LibraryTrackListHeader() {
const labelClass = "text-xs text-muted-foreground"
return (
<div className={cn("flex h-9 items-center", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div
className={cn(
"flex h-9 items-center",
LIBRARY_ROW_LAYOUT,
TRACK_ROW_PADDING
)}
>
<div className={LIBRARY_NAME_COLUMNS}>
<span aria-hidden />
<span aria-hidden />
@@ -346,10 +354,16 @@ function TrackRowComponent({
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline"
content = (
<div className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div
className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}
>
<div className={LIBRARY_NAME_COLUMNS}>
{favoriteStar}
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
<Button
size="icon-sm"
@@ -394,7 +408,9 @@ function TrackRowComponent({
}
case "album":
content = (
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
{favoriteStar}
{trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
@@ -405,8 +421,14 @@ function TrackRowComponent({
break
case "playlist":
content = (
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:bg-black/40 group-hover/cover:opacity-100">
<FavoriteStarButton
title={song.title}
@@ -477,7 +499,7 @@ function TrackRowComponent({
}
},
className: cn(
"group relative w-full cursor-pointer select-none text-left text-sm transition-colors",
"group relative w-full cursor-pointer text-left text-sm transition-colors select-none",
flush ? "py-2" : "py-2.5",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
+8 -2
View File
@@ -48,8 +48,14 @@ function AccordionTrigger({
{...props}
>
{children}
<ChevronDownIcon data-slot="accordion-trigger-icon" className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
<ChevronUpIcon data-slot="accordion-trigger-icon" className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
<ChevronDownIcon
data-slot="accordion-trigger-icon"
className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
/>
<ChevronUpIcon
data-slot="accordion-trigger-icon"
className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
/>
</AccordionPrimitive.Trigger>
</AccordionPrimitive.Header>
)
+2 -5
View File
@@ -82,9 +82,7 @@ function BreadcrumbSeparator({
className={cn("[&>svg]:size-3.5", className)}
{...props}
>
{children ?? (
<ChevronRightIcon />
)}
{children ?? <ChevronRightIcon />}
</li>
)
}
@@ -104,8 +102,7 @@ function BreadcrumbEllipsis({
)}
{...props}
>
<MoreHorizontalIcon
/>
<MoreHorizontalIcon />
<span className="sr-only">More</span>
</span>
)
+9 -2
View File
@@ -10,7 +10,11 @@ import {
import { cn } from "@/lib/utils"
import { Button, buttonVariants } from "@/components/ui/button"
import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from "lucide-react"
import {
ChevronLeftIcon,
ChevronRightIcon,
ChevronDownIcon,
} from "lucide-react"
function Calendar({
className,
@@ -153,7 +157,10 @@ function Calendar({
if (orientation === "right") {
return (
<ChevronRightIcon className={cn("size-4", className)} {...props} />
<ChevronRightIcon
className={cn("size-4", className)}
{...props}
/>
)
}
+1 -2
View File
@@ -23,8 +23,7 @@ function Checkbox({
data-slot="checkbox-indicator"
className="grid place-content-center text-current transition-none [&>svg]:size-3.5"
>
<CheckIcon
/>
<CheckIcon />
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
)
+4 -1
View File
@@ -112,7 +112,10 @@ function ComboboxContent({
<ComboboxPrimitive.Popup
data-slot="combobox-content"
data-chips={!!anchor}
className={cn("group/combobox-content max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[calc(var(--anchor-width)+--spacing(7))] origin-(--transform-origin) overflow-hidden rounded-lg text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 *:data-[slot=input-group]:m-1 *:data-[slot=input-group]:mb-0 *:data-[slot=input-group]:h-8 *:data-[slot=input-group]:border-input/30 *:data-[slot=input-group]:bg-input/30 *:data-[slot=input-group]:shadow-none data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
className={cn(
"group/combobox-content relative max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[calc(var(--anchor-width)+--spacing(7))] origin-(--transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! *:data-[slot=input-group]:m-1 *:data-[slot=input-group]:mb-0 *:data-[slot=input-group]:h-8 *:data-[slot=input-group]:border-input/30 *:data-[slot=input-group]:bg-input/30 *:data-[slot=input-group]:shadow-none **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props}
/>
</ComboboxPrimitive.Positioner>
+1 -4
View File
@@ -11,10 +11,7 @@ import {
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog"
import {
InputGroup,
InputGroupAddon,
} from "@/components/ui/input-group"
import { InputGroup, InputGroupAddon } from "@/components/ui/input-group"
import { SearchIcon, CheckIcon } from "lucide-react"
function Command({
+10 -6
View File
@@ -68,7 +68,10 @@ function ContextMenuContent({
<ContextMenuPrimitive.Portal>
<ContextMenuPrimitive.Content
data-slot="context-menu-content"
className={cn("z-50 max-h-(--radix-context-menu-content-available-height) min-w-36 origin-(--radix-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
className={cn(
"relative z-50 max-h-(--radix-context-menu-content-available-height) min-w-36 origin-(--radix-context-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props}
/>
</ContextMenuPrimitive.Portal>
@@ -129,7 +132,10 @@ function ContextMenuSubContent({
return (
<ContextMenuPrimitive.SubContent
data-slot="context-menu-sub-content"
className={cn("z-50 min-w-32 origin-(--radix-context-menu-content-transform-origin) overflow-hidden rounded-lg border p-1 text-popover-foreground shadow-lg duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
className={cn(
"relative z-50 min-w-32 origin-(--radix-context-menu-content-transform-origin) animate-none! overflow-hidden rounded-lg border bg-popover/70 p-1 text-popover-foreground shadow-lg duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props}
/>
)
@@ -157,8 +163,7 @@ function ContextMenuCheckboxItem({
>
<span className="pointer-events-none absolute right-2">
<ContextMenuPrimitive.ItemIndicator>
<CheckIcon
/>
<CheckIcon />
</ContextMenuPrimitive.ItemIndicator>
</span>
{children}
@@ -186,8 +191,7 @@ function ContextMenuRadioItem({
>
<span className="pointer-events-none absolute right-2">
<ContextMenuPrimitive.ItemIndicator>
<CheckIcon
/>
<CheckIcon />
</ContextMenuPrimitive.ItemIndicator>
</span>
{children}
+1 -2
View File
@@ -74,8 +74,7 @@ function DialogContent({
className="absolute top-2 right-2"
size="icon-sm"
>
<XIcon
/>
<XIcon />
<span className="sr-only">Close</span>
</Button>
</DialogPrimitive.Close>
+10 -6
View File
@@ -43,7 +43,10 @@ function DropdownMenuContent({
data-slot="dropdown-menu-content"
sideOffset={sideOffset}
align={align}
className={cn("z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )}
className={cn(
"relative z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props}
/>
</DropdownMenuPrimitive.Portal>
@@ -106,8 +109,7 @@ function DropdownMenuCheckboxItem({
data-slot="dropdown-menu-checkbox-item-indicator"
>
<DropdownMenuPrimitive.ItemIndicator>
<CheckIcon
/>
<CheckIcon />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
@@ -149,8 +151,7 @@ function DropdownMenuRadioItem({
data-slot="dropdown-menu-radio-item-indicator"
>
<DropdownMenuPrimitive.ItemIndicator>
<CheckIcon
/>
<CheckIcon />
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
@@ -244,7 +245,10 @@ function DropdownMenuSubContent({
return (
<DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content"
className={cn("z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )}
className={cn(
"relative z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props}
/>
)
+1 -2
View File
@@ -78,8 +78,7 @@ function InputOTPSeparator({ ...props }: React.ComponentProps<"div">) {
role="separator"
{...props}
>
<MinusIcon
/>
<MinusIcon />
</div>
)
}
+10 -6
View File
@@ -78,7 +78,10 @@ function MenubarContent({
align={align}
alignOffset={alignOffset}
sideOffset={sideOffset}
className={cn("z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
className={cn(
"relative z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95",
className
)}
{...props}
/>
</MenubarPortal>
@@ -130,8 +133,7 @@ function MenubarCheckboxItem({
>
<span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">
<MenubarPrimitive.ItemIndicator>
<CheckIcon
/>
<CheckIcon />
</MenubarPrimitive.ItemIndicator>
</span>
{children}
@@ -159,8 +161,7 @@ function MenubarRadioItem({
>
<span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">
<MenubarPrimitive.ItemIndicator>
<CheckIcon
/>
<CheckIcon />
</MenubarPrimitive.ItemIndicator>
</span>
{children}
@@ -254,7 +255,10 @@ function MenubarSubContent({
return (
<MenubarPrimitive.SubContent
data-slot="menubar-sub-content"
className={cn("z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
className={cn(
"relative z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props}
/>
)
+5 -1
View File
@@ -27,7 +27,11 @@ function NativeSelect({
className="h-8 w-full min-w-0 appearance-none rounded-lg border border-input bg-transparent py-1 pr-8 pl-2.5 text-sm transition-colors outline-none select-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-not-allowed aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] data-[size=sm]:py-0.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40"
{...props}
/>
<ChevronDownIcon className="pointer-events-none absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-muted-foreground select-none" aria-hidden="true" data-slot="native-select-icon" />
<ChevronDownIcon
className="pointer-events-none absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-muted-foreground select-none"
aria-hidden="true"
data-slot="native-select-icon"
/>
</div>
)
}
+4 -1
View File
@@ -74,7 +74,10 @@ function NavigationMenuTrigger({
{...props}
>
{children}{" "}
<ChevronDownIcon className="relative top-px ml-1 size-3 transition duration-300 group-data-popup-open/navigation-menu-trigger:rotate-180 group-data-open/navigation-menu-trigger:rotate-180" aria-hidden="true" />
<ChevronDownIcon
className="relative top-px ml-1 size-3 transition duration-300 group-data-popup-open/navigation-menu-trigger:rotate-180 group-data-open/navigation-menu-trigger:rotate-180"
aria-hidden="true"
/>
</NavigationMenuPrimitive.Trigger>
)
}
+6 -3
View File
@@ -2,7 +2,11 @@ import * as React from "react"
import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import { ChevronLeftIcon, ChevronRightIcon, MoreHorizontalIcon } from "lucide-react"
import {
ChevronLeftIcon,
ChevronRightIcon,
MoreHorizontalIcon,
} from "lucide-react"
function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
return (
@@ -111,8 +115,7 @@ function PaginationEllipsis({
)}
{...props}
>
<MoreHorizontalIcon
/>
<MoreHorizontalIcon />
<span className="sr-only">More pages</span>
</span>
)
+8 -5
View File
@@ -69,7 +69,12 @@ function SelectContent({
<SelectPrimitive.Content
data-slot="select-content"
data-align-trigger={position === "item-aligned"}
className={cn("z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", position ==="popper"&&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", className )}
className={cn(
"relative z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
position === "popper" &&
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
className
)}
position={position}
align={align}
{...props}
@@ -153,8 +158,7 @@ function SelectScrollUpButton({
)}
{...props}
>
<ChevronUpIcon
/>
<ChevronUpIcon />
</SelectPrimitive.ScrollUpButton>
)
}
@@ -172,8 +176,7 @@ function SelectScrollDownButton({
)}
{...props}
>
<ChevronDownIcon
/>
<ChevronDownIcon />
</SelectPrimitive.ScrollDownButton>
)
}
+1 -2
View File
@@ -75,8 +75,7 @@ function SheetContent({
className="absolute top-3 right-3"
size="icon-sm"
>
<XIcon
/>
<XIcon />
<span className="sr-only">Close</span>
</Button>
</SheetPrimitive.Close>
+12 -16
View File
@@ -2,7 +2,13 @@
import { useTheme } from "next-themes"
import { Toaster as Sonner, type ToasterProps } from "sonner"
import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
import {
CircleCheckIcon,
InfoIcon,
TriangleAlertIcon,
OctagonXIcon,
Loader2Icon,
} from "lucide-react"
const Toaster = ({ ...props }: ToasterProps) => {
const { theme = "system" } = useTheme()
@@ -13,21 +19,11 @@ const Toaster = ({ ...props }: ToasterProps) => {
theme={theme as ToasterProps["theme"]}
className="toaster group"
icons={{
success: (
<CircleCheckIcon className="size-4" />
),
info: (
<InfoIcon className="size-4" />
),
warning: (
<TriangleAlertIcon className="size-4" />
),
error: (
<OctagonXIcon className="size-4" />
),
loading: (
<Loader2Icon className="size-4 animate-spin" />
),
success: <CircleCheckIcon className="size-4" />,
info: <InfoIcon className="size-4" />,
warning: <TriangleAlertIcon className="size-4" />,
error: <OctagonXIcon className="size-4" />,
loading: <Loader2Icon className="size-4 animate-spin" />,
}}
style={
{
+6 -1
View File
@@ -3,7 +3,12 @@ import { Loader2Icon } from "lucide-react"
function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
return (
<Loader2Icon role="status" aria-label="Loading" className={cn("size-4 animate-spin", className)} {...props} />
<Loader2Icon
role="status"
aria-label="Loading"
className={cn("size-4 animate-spin", className)}
{...props}
/>
)
}
+10 -3
View File
@@ -64,12 +64,18 @@ export function useMediaActions() {
api.playlists.getOrderedArtistSongIds,
{ artistId: artistId as Id<"artists"> }
)
void runQueueAction(action, songIds)
void runQueueAction(action, songIds.flat())
break
}
}
},
[convex, cacheScope, toggleArtistFavorite, openAddArtistToPlaylist, runQueueAction]
[
convex,
cacheScope,
toggleArtistFavorite,
openAddArtistToPlaylist,
runQueueAction,
]
)
return { runSongsAction, runArtistAction }
@@ -93,7 +99,8 @@ export function useTrackListMediaAction({
return React.useCallback(
(action: MediaContextAction, songId: string) => {
const targetIds = selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const targetIds =
selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const stationArtist =
artistId ??
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
+4 -14
View File
@@ -3,10 +3,7 @@
import * as React from "react"
import type { BrowseSong } from "@otunes/convex/types"
import {
albumCoverUrl,
type CoverImageSize,
} from "@/lib/cover-urls"
import { albumCoverUrl, type CoverImageSize } from "@/lib/cover-urls"
const MEDIA_SESSION_ACTIONS = [
"play",
@@ -17,12 +14,7 @@ const MEDIA_SESSION_ACTIONS = [
] as const
const MEDIA_SESSION_ARTWORK_SIZES = [
64,
128,
192,
256,
384,
512,
64, 128, 192, 256, 384, 512,
] as const satisfies readonly CoverImageSize[]
function mediaSessionSupported() {
@@ -42,10 +34,8 @@ function setActionHandler(
function artworkForSong(song: BrowseSong): MediaImage[] {
return MEDIA_SESSION_ARTWORK_SIZES.map((size) => ({
src: new URL(
albumCoverUrl(song.album.id, size),
window.location.origin
).href,
src: new URL(albumCoverUrl(song.album.id, size), window.location.origin)
.href,
sizes: `${size}x${size}`,
}))
}
+5 -5
View File
@@ -7,10 +7,7 @@ export function getContiguousSelectedIndices(
.map((item, index) => (selectedIds.has(item.selectionId) ? index : -1))
.filter((index) => index >= 0)
if (
selectedIndices.length > 1 &&
selectedIndices.includes(dragIndex)
) {
if (selectedIndices.length > 1 && selectedIndices.includes(dragIndex)) {
return selectedIndices
}
@@ -37,7 +34,10 @@ export function moveQueueBlock<T>(
}
const removedBefore = sorted.filter((index) => index < targetIndex).length
const insertAt = Math.max(0, Math.min(targetIndex - removedBefore, remaining.length))
const insertAt = Math.max(
0,
Math.min(targetIndex - removedBefore, remaining.length)
)
const next = [...remaining]
next.splice(insertAt, 0, ...block)
+6 -1
View File
@@ -36,7 +36,12 @@ export function resizeProfileImageToDataUrl(file: File): Promise<string> {
file.type === "image/png" || file.type === "image/webp"
? "image/png"
: "image/jpeg"
resolve(canvas.toDataURL(outputType, outputType === "image/jpeg" ? 0.9 : undefined))
resolve(
canvas.toDataURL(
outputType,
outputType === "image/jpeg" ? 0.9 : undefined
)
)
}
image.onerror = () => {
+12 -8
View File
@@ -1,11 +1,7 @@
import { cn } from "@/lib/utils"
export type SelectionRangePosition =
| "none"
| "only"
| "start"
| "middle"
| "end"
"none" | "only" | "start" | "middle" | "end"
export function getSelectionRangePositions(
itemIds: string[],
@@ -100,20 +96,28 @@ export function TrackRowHoverHighlight({ flush = false }: { flush?: boolean }) {
aria-hidden
className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
flush
? FLUSH_ROW_HIGHLIGHT_INSET
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
)}
/>
)
}
/** Background for the active (focused or now playing) row. */
export function TrackRowActiveHighlight({ flush = false }: { flush?: boolean }) {
export function TrackRowActiveHighlight({
flush = false,
}: {
flush?: boolean
}) {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60",
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
flush
? FLUSH_ROW_HIGHLIGHT_INSET
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
)}
/>
)
+1 -2
View File
@@ -8,8 +8,7 @@ export const PLACEHOLDER_PATH = path.join(
)
const COVER_IMAGE_SIZES = new Set([64, 128, 192, 256, 384, 512, 768, 1024])
const COVER_CACHE_CONTROL =
"public, max-age=300, stale-while-revalidate=86400"
const COVER_CACHE_CONTROL = "public, max-age=300, stale-while-revalidate=86400"
const MIME_TYPES: Record<string, string> = {
".jpg": "image/jpeg",
+1 -4
View File
@@ -16,10 +16,7 @@ export type ByteRange = {
*/
function toWebStream(
source: Readable,
{
cancel,
finish,
}: { cancel: () => void; finish?: () => Promise<void> }
{ cancel, finish }: { cancel: () => void; finish?: () => Promise<void> }
): ReadableStream<Uint8Array> {
let done = false
+2 -1
View File
@@ -34,7 +34,8 @@ export function cacheDir(kind: "hls" | "lossless") {
function maxCacheBytes() {
const configured = Number(process.env.OTUNES_CACHE_MAX_MB)
const mb = Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
const mb =
Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
return mb * 1024 * 1024
}
+12 -8
View File
@@ -63,11 +63,7 @@ function hlsLookupKey(
return `${songId}:${quality ?? ""}:${preferAtmos ? "1" : "0"}`
}
async function hlsJobKey(
song: SongSource,
sourcePath: string,
kbps: number
) {
async function hlsJobKey(song: SongSource, sourcePath: string, kbps: number) {
const stat = await fs.stat(sourcePath)
return crypto
.createHash("sha256")
@@ -84,7 +80,10 @@ async function hlsJobKey(
}
export function hlsSegmentPath(job: HlsJob, segmentIndex: number) {
return path.join(job.dir, `segment_${segmentIndex.toString().padStart(5, "0")}.ts`)
return path.join(
job.dir,
`segment_${segmentIndex.toString().padStart(5, "0")}.ts`
)
}
async function touchHlsJob(job: HlsJob) {
@@ -132,7 +131,9 @@ export function getExistingHlsJob(
quality: string | null,
preferAtmos: boolean
) {
return state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
return (
state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
)
}
export async function waitForHlsSegment(
@@ -220,7 +221,10 @@ function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
if (code === 0) {
void pruneCache()
} else {
console.error(`ffmpeg HLS exited with code ${code}`, ffmpeg.stderrTail())
console.error(
`ffmpeg HLS exited with code ${code}`,
ffmpeg.stderrTail()
)
}
},
() => {
+3 -1
View File
@@ -59,7 +59,9 @@ async function convert(source: string, key: string): Promise<string> {
])
const code = await ffmpeg.exited
if (code !== 0) {
throw new Error(`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`)
throw new Error(
`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`
)
}
await fs.rename(temporary, output)
} finally {
+1 -7
View File
@@ -18,11 +18,5 @@
"prettier": "^3.8.3",
"prettier-plugin-tailwindcss": "^0.8.0"
},
"packageManager": "pnpm@10.1.0",
"pnpm": {
"patchedDependencies": {
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch"
}
}
"packageManager": "pnpm@12.21.0"
}
+31 -40
View File
@@ -1,63 +1,54 @@
import type { OptimisticLocalStore, OptimisticUpdate } from "convex/browser"
import type { FunctionArgs, FunctionReference } from "convex/server"
import type {
FunctionArgs,
FunctionReference,
FunctionReturnType,
} from "convex/server"
import { api } from "../convex/_generated/api"
import type { Id } from "../convex/_generated/dataModel"
import { chunk } from "../convex/limits"
type FavoriteIds = {
favoriteSongs: Id<"songs">[]
favoriteAlbums: Id<"albums">[]
favoriteArtists: Id<"artists">[]
}
type UserFavorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
type FavoriteList = keyof UserFavorites
type FavoriteList = keyof FavoriteIds
function patchFavorites<List extends FavoriteList>(
/** Rewrites one list of the cached `getUserFavorites` result, if loaded. */
function patchFavorites(
store: OptimisticLocalStore,
list: List,
update: (ids: FavoriteIds[List]) => FavoriteIds[List]
list: FavoriteList,
update: (ids: string[]) => string[]
) {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
const next = update(current[list])
if (next !== current[list]) {
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
[list]: next,
}
)
const ids: string[] = current[list].flat()
const next = update(ids)
if (next !== ids) {
// `next` only holds ids of this list's kind, which TS cannot follow here.
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
[list]: chunk(next),
} as UserFavorites)
}
}
function addFavorites<List extends FavoriteList>(
function addFavorites(
store: OptimisticLocalStore,
list: List,
ids: FavoriteIds[List]
list: FavoriteList,
ids: string[]
) {
patchFavorites(store, list, (current) => {
const added = ids.filter((id) => !(current as string[]).includes(id))
return added.length === 0
? current
: ([...new Set([...current, ...added])] as FavoriteIds[List])
const added = ids.filter((id) => !current.includes(id))
return added.length === 0 ? current : [...new Set([...current, ...added])]
})
}
function removeFavorites<List extends FavoriteList>(
function removeFavorites(
store: OptimisticLocalStore,
list: List,
ids: FavoriteIds[List]
list: FavoriteList,
ids: string[]
) {
const removed = new Set<string>(ids)
patchFavorites(
store,
list,
(current) =>
(current as string[]).filter(
(id) => !removed.has(id)
) as FavoriteIds[List]
const removed = new Set(ids)
patchFavorites(store, list, (current) =>
current.filter((id) => !removed.has(id))
)
}
@@ -198,6 +198,15 @@ export async function clearPersistentCache() {
}
}
/** Deletes every entry whose key starts with `<prefix>:`. */
export function clearCachePrefix(prefix: string) {
for (const key of [...memory.keys()]) {
if (entryPrefix(key) !== prefix) continue
removeFromMemory(key)
scheduleWrite(key, null)
}
}
export function subscribeCache(key: string, listener: () => void) {
let keyListeners = listeners.get(key)
if (!keyListeners) {
+2
View File
@@ -11,6 +11,7 @@
import type * as actions from "../actions.js";
import type * as auth from "../auth.js";
import type * as crons from "../crons.js";
import type * as favoriteStore from "../favoriteStore.js";
import type * as favorites from "../favorites.js";
import type * as http from "../http.js";
import type * as intentCatalog from "../intentCatalog.js";
@@ -34,6 +35,7 @@ declare const fullApi: ApiFromModules<{
actions: typeof actions;
auth: typeof auth;
crons: typeof crons;
favoriteStore: typeof favoriteStore;
favorites: typeof favorites;
http: typeof http;
intentCatalog: typeof intentCatalog;
@@ -29,7 +29,7 @@ function playlistMutation() {
mutation: (definition) => definition,
query: (definition) => definition,
}
if (name === "./library") return {}
if (name === "./library" || name === "./limits") return {}
throw new Error(`Unexpected import ${name}`)
},
})
+1 -1
View File
@@ -5,4 +5,4 @@ export default {
applicationID: "convex",
},
],
};
}
+274
View File
@@ -0,0 +1,274 @@
import type { WithoutSystemFields } from "convex/server"
import { ConvexError, v } from "convex/values"
import { internal } from "./_generated/api"
import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server"
import { internalMutation } from "./_generated/server"
import { chunk, type Chunked } from "./limits"
export type FavoriteKind = Doc<"favorites">["kind"]
type FavoriteEntityId = {
[Kind in FavoriteKind]: Extract<Doc<"favorites">, { kind: Kind }>["entityId"]
}
/** A user's favorites, each list oldest first. */
export type FavoriteIds = {
favoriteSongs: Id<"songs">[]
favoriteAlbums: Id<"albums">[]
favoriteArtists: Id<"artists">[]
}
/** `FavoriteIds` as `favorites.getUserFavorites` returns it. */
export type FavoriteIdChunks = {
[List in keyof FavoriteIds]: Chunked<FavoriteIds[List][number]>
}
function legacyFavorites(user: Doc<"users"> | null): FavoriteIds {
return {
favoriteSongs: user?.favoriteSongs ?? [],
favoriteAlbums: user?.favoriteAlbums ?? [],
favoriteArtists: user?.favoriteArtists ?? [],
}
}
export function hasLegacyFavorites(user: Doc<"users">) {
return (
user.favoriteSongs !== undefined ||
user.favoriteAlbums !== undefined ||
user.favoriteArtists !== undefined
)
}
/** Favorited ids of one kind, oldest first. */
async function readKind<Kind extends FavoriteKind>(
ctx: QueryCtx,
userId: Id<"users">,
kind: Kind
): Promise<FavoriteEntityId[Kind][]> {
const rows = await ctx.db
.query("favorites")
.withIndex("by_user_kind", (q) => q.eq("userId", userId).eq("kind", kind))
.collect()
return rows.map((row) => row.entityId as FavoriteEntityId[Kind])
}
/**
* Reads every favorite, oldest first. Users without rows fall back to the
* legacy arrays on `users` until `migrations.migrateUsers` moves them, so
* migrated users never read (or rerun on) their user doc here.
*/
export async function readFavorites(
ctx: QueryCtx,
userId: Id<"users">
): Promise<FavoriteIds> {
const [favoriteSongs, favoriteAlbums, favoriteArtists] = await Promise.all([
readKind(ctx, userId, "song"),
readKind(ctx, userId, "album"),
readKind(ctx, userId, "artist"),
])
if (
favoriteSongs.length > 0 ||
favoriteAlbums.length > 0 ||
favoriteArtists.length > 0
) {
return { favoriteSongs, favoriteAlbums, favoriteArtists }
}
return legacyFavorites(await ctx.db.get(userId))
}
/**
* Above this many ids, one scan of the user's list beats a lookup per id, and
* keeps bulk writes under Convex's 4,096 reads per function.
*/
const MAX_POINT_LOOKUPS = 64
/** Maps each of `ids` the user has favorited to its row. */
async function favoriteRows<Kind extends FavoriteKind>(
ctx: QueryCtx,
userId: Id<"users">,
kind: Kind,
ids: ReadonlySet<FavoriteEntityId[Kind]>
): Promise<Map<string, Id<"favorites">>> {
const rows =
ids.size <= MAX_POINT_LOOKUPS
? await Promise.all(
[...ids].map((entityId) =>
ctx.db
.query("favorites")
.withIndex("by_user_entity", (q) =>
q.eq("userId", userId).eq("entityId", entityId)
)
.unique()
)
)
: await ctx.db
.query("favorites")
.withIndex("by_user_kind", (q) =>
q.eq("userId", userId).eq("kind", kind)
)
.collect()
return new Map(
rows.flatMap((row) =>
row && ids.has(row.entityId as FavoriteEntityId[Kind])
? [[row.entityId, row._id] as const]
: []
)
)
}
/** True when `ids` is non-empty and the user has favorited every one. */
export async function allFavorited<Kind extends FavoriteKind>(
ctx: QueryCtx,
userId: Id<"users">,
kind: Kind,
ids: FavoriteEntityId[Kind][]
) {
const unique = new Set(ids)
if (unique.size === 0) {
return false
}
const rows = await favoriteRows(ctx, userId, kind, unique)
return rows.size === unique.size
}
/** Appends ids that are not favorited yet, keeping existing ones in place. */
export async function addFavorites<Kind extends FavoriteKind>(
ctx: MutationCtx,
userId: Id<"users">,
kind: Kind,
ids: FavoriteEntityId[Kind][]
) {
const unique = new Set(ids)
const existing = await favoriteRows(ctx, userId, kind, unique)
for (const entityId of unique) {
if (!existing.has(entityId)) {
// TS cannot tie a generic `kind` to its `entityId` union member.
await ctx.db.insert("favorites", {
userId,
kind,
entityId,
} as WithoutSystemFields<Doc<"favorites">>)
}
}
}
export async function removeFavorites<Kind extends FavoriteKind>(
ctx: MutationCtx,
userId: Id<"users">,
kind: Kind,
ids: FavoriteEntityId[Kind][]
) {
const rows = await favoriteRows(ctx, userId, kind, new Set(ids))
await deleteFavoriteRows(ctx, [...rows.values()])
}
/**
* Rows one call deletes before scheduling the rest. Convex counts each delete
* as a read, so unfavoriting a huge artist cannot happen in one mutation.
*/
const MAX_INLINE_DELETES = 1_000
async function deleteFavoriteRows(ctx: MutationCtx, rowIds: Id<"favorites">[]) {
for (const rowId of rowIds.slice(0, MAX_INLINE_DELETES)) {
await ctx.db.delete(rowId)
}
for (const rest of chunk(rowIds.slice(MAX_INLINE_DELETES))) {
await ctx.scheduler.runAfter(0, internal.favoriteStore.deleteRows, {
rowIds: rest,
})
}
}
/** Finishes deletes `deleteFavoriteRows` could not fit in one mutation. */
export const deleteRows = internalMutation({
args: { rowIds: v.array(v.id("favorites")) },
handler: async (ctx, { rowIds }) => {
// Rows can disappear in between, e.g. when the scanner purges a song.
for (const rowId of rowIds.slice(0, MAX_INLINE_DELETES)) {
if (await ctx.db.get(rowId)) {
await ctx.db.delete(rowId)
}
}
const rest = rowIds.slice(MAX_INLINE_DELETES)
if (rest.length > 0) {
await ctx.scheduler.runAfter(0, internal.favoriteStore.deleteRows, {
rowIds: rest,
})
}
},
})
/**
* Moves a user's legacy favorite arrays into `favorites` rows, keeping their
* order, then clears them. Safe to call repeatedly.
*/
export async function migrateUserFavorites(
ctx: MutationCtx,
user: Doc<"users">
) {
if (!hasLegacyFavorites(user)) {
return
}
const legacy = legacyFavorites(user)
await addFavorites(ctx, user._id, "song", legacy.favoriteSongs)
await addFavorites(ctx, user._id, "album", legacy.favoriteAlbums)
await addFavorites(ctx, user._id, "artist", legacy.favoriteArtists)
await ctx.db.patch(user._id, {
favoriteSongs: undefined,
favoriteAlbums: undefined,
favoriteArtists: undefined,
})
}
/**
* Called before every favorites write, so a user toggling a favorite before
* the boot migration reaches them does not end up with half their favorites
* in rows and half on `users`.
*/
export async function requireMigratedFavorites(
ctx: MutationCtx,
userId: Id<"users">
) {
const user = await ctx.db.get(userId)
if (!user) {
throw new ConvexError("User not found")
}
await migrateUserFavorites(ctx, user)
}
/** Removes deleted songs, albums or artists from every user's favorites. */
export async function purgeFavoriteEntities(
ctx: MutationCtx,
ids: Iterable<FavoriteEntityId[FavoriteKind]>
) {
for (const entityId of ids) {
const rows = await ctx.db
.query("favorites")
.withIndex("by_entity", (q) => q.eq("entityId", entityId))
.collect()
for (const row of rows) {
await ctx.db.delete(row._id)
}
}
}
export async function deleteUserFavorites(
ctx: MutationCtx,
userId: Id<"users">
) {
const rows = await Promise.all(
(["song", "album", "artist"] as const).map((kind) =>
ctx.db
.query("favorites")
.withIndex("by_user_kind", (q) =>
q.eq("userId", userId).eq("kind", kind)
)
.collect()
)
)
await deleteFavoriteRows(
ctx,
rows.flat().map((row) => row._id)
)
}
+111 -243
View File
@@ -3,18 +3,26 @@ import { ConvexError, v } from "convex/values"
import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server"
import { mutation, query } from "./_generated/server"
import type { BrowsePlaylistDetail, BrowsePlaylistSummary } from "./library"
import {
addFavorites,
allFavorited,
readFavorites,
removeFavorites,
requireMigratedFavorites,
type FavoriteIdChunks,
} from "./favoriteStore"
import type { BrowsePlaylistSummary } from "./library"
import { browseSongsFromIds } from "./library"
import { chunk } from "./limits"
import type { BrowseFavoritesDetail } from "./types"
function uniqueIds<T extends string>(ids: T[]): T[] {
return [...new Set(ids)]
}
async function requireAuth(ctx: MutationCtx) {
/** Resolves the signed-in user and moves any legacy favorites into rows. */
async function requireFavoritesUser(ctx: MutationCtx) {
const userId = await getAuthUserId(ctx)
if (userId === null) {
throw new ConvexError("Not authenticated")
}
await requireMigratedFavorites(ctx, userId)
return userId
}
@@ -42,112 +50,46 @@ async function getSongIdsForArtist(ctx: QueryCtx, artistId: Id<"artists">) {
return songs.map((song) => song._id)
}
function allAlbumSongsFavorited(
albumSongIds: Id<"songs">[],
favoriteSongs: Id<"songs">[]
) {
if (albumSongIds.length === 0) {
return false
}
const favorited = new Set(favoriteSongs)
return albumSongIds.every((id) => favorited.has(id))
}
function allArtistAlbumsFavorited(
artistAlbumIds: Id<"albums">[],
favoriteAlbums: Id<"albums">[]
) {
if (artistAlbumIds.length === 0) {
return false
}
const favorited = new Set(favoriteAlbums)
return artistAlbumIds.every((id) => favorited.has(id))
}
async function promoteAlbumIfAllSongsFavorited(
ctx: MutationCtx,
favoriteSongs: Id<"songs">[],
favoriteAlbums: Id<"albums">[],
albumId: Id<"albums">
) {
const albumSongIds = await getSongIdsForAlbum(ctx, albumId)
if (!allAlbumSongsFavorited(albumSongIds, favoriteSongs)) {
return favoriteAlbums
}
return uniqueIds([...favoriteAlbums, albumId])
}
async function promoteArtistIfAllAlbumsFavorited(
ctx: MutationCtx,
favoriteAlbums: Id<"albums">[],
favoriteArtists: Id<"artists">[],
userId: Id<"users">,
artistId: Id<"artists">
) {
const artistAlbumIds = await getAlbumIdsForArtist(ctx, artistId)
if (!allArtistAlbumsFavorited(artistAlbumIds, favoriteAlbums)) {
return favoriteArtists
const albumIds = await getAlbumIdsForArtist(ctx, artistId)
if (await allFavorited(ctx, userId, "album", albumIds)) {
await addFavorites(ctx, userId, "artist", [artistId])
}
return uniqueIds([...favoriteArtists, artistId])
}
/** Favorites albums whose songs are now all favorited, then their artists. */
async function cascadeUpFromSongs(
ctx: MutationCtx,
favoriteSongs: Id<"songs">[],
favoriteAlbums: Id<"albums">[],
favoriteArtists: Id<"artists">[],
userId: Id<"users">,
songs: Doc<"songs">[]
) {
let albums = favoriteAlbums
let artists = favoriteArtists
const albumIds = new Set(songs.map((song) => song.album))
for (const albumId of albumIds) {
albums = await promoteAlbumIfAllSongsFavorited(
ctx,
favoriteSongs,
albums,
albumId
)
for (const albumId of new Set(songs.map((song) => song.album))) {
const songIds = await getSongIdsForAlbum(ctx, albumId)
if (await allFavorited(ctx, userId, "song", songIds)) {
await addFavorites(ctx, userId, "album", [albumId])
}
}
const artistIds = new Set(songs.map((song) => song.albumArtist))
for (const artistId of artistIds) {
artists = await promoteArtistIfAllAlbumsFavorited(
ctx,
albums,
artists,
artistId
)
for (const artistId of new Set(songs.map((song) => song.albumArtist))) {
await promoteArtistIfAllAlbumsFavorited(ctx, userId, artistId)
}
return { favoriteAlbums: albums, favoriteArtists: artists }
}
export const getUserFavorites = query({
args: {},
handler: async (ctx) => {
handler: async (ctx): Promise<FavoriteIdChunks> => {
const userId = await getAuthUserId(ctx)
if (userId === null) {
return {
favoriteSongs: [] as Id<"songs">[],
favoriteAlbums: [] as Id<"albums">[],
favoriteArtists: [] as Id<"artists">[],
}
return { favoriteSongs: [], favoriteAlbums: [], favoriteArtists: [] }
}
const user = await ctx.db.get("users", userId)
if (!user) {
return {
favoriteSongs: [] as Id<"songs">[],
favoriteAlbums: [] as Id<"albums">[],
favoriteArtists: [] as Id<"artists">[],
}
}
const favorites = await readFavorites(ctx, userId)
return {
favoriteSongs: user.favoriteSongs ?? [],
favoriteAlbums: user.favoriteAlbums ?? [],
favoriteArtists: user.favoriteArtists ?? [],
favoriteSongs: chunk(favorites.favoriteSongs),
favoriteAlbums: chunk(favorites.favoriteAlbums),
favoriteArtists: chunk(favorites.favoriteArtists),
}
},
})
@@ -165,6 +107,7 @@ async function browseFavoritesSummaryHandler(
return null
}
const { favoriteSongs } = await readFavorites(ctx, userId)
return {
id: null,
isFavorites: true,
@@ -176,13 +119,13 @@ async function browseFavoritesSummaryHandler(
cover: null,
isOwner: true,
isSubscribed: false,
songIds: user.favoriteSongs ?? [],
songIds: favoriteSongs,
}
}
export const browseFavoritesPlaylistDetail = query({
args: {},
handler: async (ctx): Promise<BrowsePlaylistDetail | null> => {
handler: async (ctx): Promise<BrowseFavoritesDetail | null> => {
const summary = await browseFavoritesSummaryHandler(ctx)
if (!summary) {
return null
@@ -196,7 +139,7 @@ export const browseFavoritesPlaylistDetail = query({
title: summary.title,
owner: summary.owner,
cover: summary.cover,
songs,
songs: chunk(songs),
isOwner: summary.isOwner,
isSubscribed: summary.isSubscribed,
}
@@ -206,69 +149,35 @@ export const browseFavoritesPlaylistDetail = query({
export const favoriteSong = mutation({
args: { songId: v.id("songs") },
handler: async (ctx, { songId }) => {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const userId = await requireFavoritesUser(ctx)
const song = await ctx.db.get("songs", songId)
if (!song) {
throw new ConvexError("Song not found")
}
const favoriteSongs = uniqueIds([...(user.favoriteSongs ?? []), songId])
const cascaded = await cascadeUpFromSongs(
ctx,
favoriteSongs,
user.favoriteAlbums ?? [],
user.favoriteArtists ?? [],
[song]
)
await ctx.db.patch(userId, {
favoriteSongs,
favoriteAlbums: cascaded.favoriteAlbums,
favoriteArtists: cascaded.favoriteArtists,
})
await addFavorites(ctx, userId, "song", [songId])
await cascadeUpFromSongs(ctx, userId, [song])
},
})
export const favoriteSongs = mutation({
args: { songIds: v.array(v.id("songs")) },
handler: async (ctx, { songIds }) => {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const uniqueRequestedIds = uniqueIds(songIds)
const userId = await requireFavoritesUser(ctx)
const loadedSongs = await Promise.all(
uniqueRequestedIds.map((id) => ctx.db.get("songs", id))
[...new Set(songIds)].map((id) => ctx.db.get("songs", id))
)
const songs = loadedSongs.filter(
(song): song is Doc<"songs"> => song !== null
)
const validSongIds = songs.map((song) => song._id)
const favoriteSongs = uniqueIds([
...(user.favoriteSongs ?? []),
...validSongIds,
])
const cascaded = await cascadeUpFromSongs(
await addFavorites(
ctx,
favoriteSongs,
user.favoriteAlbums ?? [],
user.favoriteArtists ?? [],
songs
userId,
"song",
songs.map((song) => song._id)
)
await ctx.db.patch(userId, {
favoriteSongs,
favoriteAlbums: cascaded.favoriteAlbums,
favoriteArtists: cascaded.favoriteArtists,
})
await cascadeUpFromSongs(ctx, userId, songs)
},
})
@@ -286,159 +195,118 @@ export const unfavoriteSongs = mutation({
},
})
/** Unfavorites songs along with their albums and artists. */
async function unfavoriteSongsHandler(
ctx: MutationCtx,
songIds: Id<"songs">[]
) {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const removeSongs = new Set(songIds)
const userId = await requireFavoritesUser(ctx)
const loadedSongs = await Promise.all(
[...removeSongs].map((songId) => ctx.db.get("songs", songId))
[...new Set(songIds)].map((songId) => ctx.db.get("songs", songId))
)
const removeAlbums = new Set(
loadedSongs.flatMap((song) => (song ? [song.album] : []))
)
const removeArtists = new Set(
loadedSongs.flatMap((song) => (song ? [song.albumArtist] : []))
const songs = loadedSongs.filter(
(song): song is Doc<"songs"> => song !== null
)
await ctx.db.patch(userId, {
favoriteSongs: (user.favoriteSongs ?? []).filter(
(id) => !removeSongs.has(id)
),
favoriteAlbums: (user.favoriteAlbums ?? []).filter(
(id) => !removeAlbums.has(id)
),
favoriteArtists: (user.favoriteArtists ?? []).filter(
(id) => !removeArtists.has(id)
),
})
await removeFavorites(ctx, userId, "song", songIds)
await removeFavorites(
ctx,
userId,
"album",
songs.map((song) => song.album)
)
await removeFavorites(
ctx,
userId,
"artist",
songs.map((song) => song.albumArtist)
)
}
export const favoriteAlbum = mutation({
args: { albumId: v.id("albums") },
handler: async (ctx, { albumId }) => {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const userId = await requireFavoritesUser(ctx)
const album = await ctx.db.get("albums", albumId)
if (!album) {
throw new ConvexError("Album not found")
}
const songIds = await getSongIdsForAlbum(ctx, albumId)
const favoriteAlbums = uniqueIds([...(user.favoriteAlbums ?? []), albumId])
const favoriteSongs = uniqueIds([...(user.favoriteSongs ?? []), ...songIds])
const favoriteArtists = await promoteArtistIfAllAlbumsFavorited(
await addFavorites(ctx, userId, "album", [albumId])
await addFavorites(
ctx,
favoriteAlbums,
user.favoriteArtists ?? [],
album.artist
userId,
"song",
await getSongIdsForAlbum(ctx, albumId)
)
await ctx.db.patch(userId, {
favoriteAlbums,
favoriteSongs,
favoriteArtists,
})
await promoteArtistIfAllAlbumsFavorited(ctx, userId, album.artist)
},
})
/** Unfavorites an album along with its songs and artist. */
export const unfavoriteAlbum = mutation({
args: { albumId: v.id("albums") },
handler: async (ctx, { albumId }) => {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const userId = await requireFavoritesUser(ctx)
const album = await ctx.db.get("albums", albumId)
if (!album) {
return
}
const albumSongIds = await getSongIdsForAlbum(ctx, albumId)
const removeSongs = new Set(albumSongIds)
const favoriteAlbums = (user.favoriteAlbums ?? []).filter(
(id) => id !== albumId
await removeFavorites(ctx, userId, "album", [albumId])
await removeFavorites(ctx, userId, "artist", [album.artist])
await removeFavorites(
ctx,
userId,
"song",
await getSongIdsForAlbum(ctx, albumId)
)
const favoriteSongs = (user.favoriteSongs ?? []).filter(
(id) => !removeSongs.has(id)
)
let favoriteArtists = user.favoriteArtists ?? []
if (favoriteArtists.includes(album.artist)) {
favoriteArtists = favoriteArtists.filter((id) => id !== album.artist)
}
await ctx.db.patch(userId, {
favoriteSongs,
favoriteAlbums,
favoriteArtists,
})
},
})
/** Favorites an artist along with all of their albums and songs. */
export const favoriteArtist = mutation({
args: { artistId: v.id("artists") },
handler: async (ctx, { artistId }) => {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const userId = await requireFavoritesUser(ctx)
const artist = await ctx.db.get("artists", artistId)
if (!artist) {
throw new ConvexError("Artist not found")
}
const albumIds = await getAlbumIdsForArtist(ctx, artistId)
const songIds = await getSongIdsForArtist(ctx, artistId)
await ctx.db.patch(userId, {
favoriteArtists: uniqueIds([...(user.favoriteArtists ?? []), artistId]),
favoriteAlbums: uniqueIds([...(user.favoriteAlbums ?? []), ...albumIds]),
favoriteSongs: uniqueIds([...(user.favoriteSongs ?? []), ...songIds]),
})
await addFavorites(ctx, userId, "artist", [artistId])
await addFavorites(
ctx,
userId,
"album",
await getAlbumIdsForArtist(ctx, artistId)
)
await addFavorites(
ctx,
userId,
"song",
await getSongIdsForArtist(ctx, artistId)
)
},
})
/** Unfavorites an artist along with all of their albums and songs. */
export const unfavoriteArtist = mutation({
args: { artistId: v.id("artists") },
handler: async (ctx, { artistId }) => {
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const albumIds = await getAlbumIdsForArtist(ctx, artistId)
const songIds = await getSongIdsForArtist(ctx, artistId)
const removeAlbums = new Set(albumIds)
const removeSongs = new Set(songIds)
await ctx.db.patch(userId, {
favoriteArtists: (user.favoriteArtists ?? []).filter(
(id) => id !== artistId
),
favoriteAlbums: (user.favoriteAlbums ?? []).filter(
(id) => !removeAlbums.has(id)
),
favoriteSongs: (user.favoriteSongs ?? []).filter(
(id) => !removeSongs.has(id)
),
})
const userId = await requireFavoritesUser(ctx)
await removeFavorites(ctx, userId, "artist", [artistId])
await removeFavorites(
ctx,
userId,
"album",
await getAlbumIdsForArtist(ctx, artistId)
)
await removeFavorites(
ctx,
userId,
"song",
await getSongIdsForArtist(ctx, artistId)
)
},
})
Loaded 100 of 114 files, more files were not shown because too many files have changed in this diff. Show more