fix: show album formats with older servers and fit narrow headers

This commit is contained in:
joshuafhiggins committed 2026-11-03 14:39:59 -05:00
1 parent ebefd1ddbd
commit 23de1dd120
2 files changed
+37 -7

No files matched your search

@@ -76,6 +76,20 @@ export default function AlbumScreen() {
[album]
)
// Older servers do not include album format availability yet.
const formatTracks = useCachedQuery(
api.library.getSongsForPlayback,
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
? { ids: songIds }
: "skip"
)
const hasLossless =
album?.hasLossless ??
formatTracks?.some((track) => track && "lossless" in track.files)
const hasAtmos =
album?.hasAtmos ??
formatTracks?.some((track) => track && "atmos" in track.files)
useEffect(() => {
if (album) {
rememberSongs(albumDetailSongs(album))
@@ -233,7 +247,7 @@ export default function AlbumScreen() {
{metadata}
</Text>
) : null}
{album.hasLossless ? (
{hasLossless ? (
<>
{metadata ? (
<Text style={{ color: palette.secondaryForeground }}>
@@ -247,9 +261,9 @@ export default function AlbumScreen() {
/>
</>
) : null}
{album.hasAtmos ? (
{hasAtmos ? (
<>
{metadata || album.hasLossless ? (
{metadata || hasLossless ? (
<Text style={{ color: palette.secondaryForeground }}>
·
</Text>
+20 -4
View File
@@ -22,6 +22,8 @@ import {
} from "@/components/media-context-menu"
import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection"
import { cn } from "@/lib/utils"
@@ -274,6 +276,20 @@ export function AlbumView({
[album.tracks]
)
// Older servers do not include album format availability yet.
const formatTracks = useCachedQuery(
api.library.getSongsForPlayback,
album.hasLossless === undefined || album.hasAtmos === undefined
? { ids: albumSongIds }
: "skip"
)
const hasLossless =
album.hasLossless ??
formatTracks?.some((track) => track && "lossless" in track.files)
const hasAtmos =
album.hasAtmos ??
formatTracks?.some((track) => track && "atmos" in track.files)
React.useEffect(() => {
rememberSongs(albumDetailSongs(album))
}, [album])
@@ -373,7 +389,7 @@ export function AlbumView({
return (
<div className="flex h-svh flex-col">
<ScrollArea className="min-h-0 flex-1">
<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="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
@@ -407,15 +423,15 @@ export function AlbumView({
</Link>
<div className="flex flex-wrap items-center justify-center gap-2 text-sm text-muted-foreground sm:justify-start">
{metadata ? <span>{metadata}</span> : null}
{album.hasLossless ? (
{hasLossless ? (
<>
{metadata ? <span aria-hidden>·</span> : null}
<AudioFormatBadge format="lossless" />
</>
) : null}
{album.hasAtmos ? (
{hasAtmos ? (
<>
{metadata || album.hasLossless ? (
{metadata || hasLossless ? (
<span aria-hidden>·</span>
) : null}
<AudioFormatBadge format="atmos" />