Compare commits
3
Commits
No files matched your search
@@ -5,6 +5,8 @@ import { PlayerBar } from "@/components/player-bar"
|
||||
import { LazyQueuePanel } from "@/components/lazy-queue-panel"
|
||||
import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"
|
||||
import { AppSidebar } from "@/components/app-sidebar"
|
||||
import { ScrollRestoration } from "@/components/scroll-restoration"
|
||||
import { Suspense } from "react"
|
||||
|
||||
export default function AppLayout({
|
||||
children,
|
||||
@@ -18,7 +20,11 @@ export default function AppLayout({
|
||||
<FavoritesProvider>
|
||||
<AppSidebar />
|
||||
<div className="flex min-h-svh min-w-0 flex-1">
|
||||
<SidebarInset className="min-w-0 flex-1">{children}</SidebarInset>
|
||||
<SidebarInset className="min-w-0 flex-1">
|
||||
<Suspense>
|
||||
<ScrollRestoration>{children}</ScrollRestoration>
|
||||
</Suspense>
|
||||
</SidebarInset>
|
||||
<LazyQueuePanel />
|
||||
</div>
|
||||
<PlayerBar />
|
||||
|
||||
@@ -76,7 +76,7 @@ export function PlayerBar() {
|
||||
queueOpen && !isMobile && "right-72"
|
||||
)}
|
||||
>
|
||||
<div className="pointer-events-auto flex w-full max-w-6xl items-center gap-2 rounded-full border border-white/20 bg-[#303033] px-3 py-2 text-white shadow-lg @min-[640px]:gap-5 @min-[640px]:px-5 @min-[640px]:py-3">
|
||||
<div className="pointer-events-auto flex w-full max-w-6xl items-center gap-2 rounded-full border border-foreground/20 bg-(--player-background) px-3 py-2 text-card-foreground shadow-lg [--player-background:var(--card)] @min-[640px]:gap-5 @min-[640px]:px-5 @min-[640px]:py-3 dark:border-white/20 dark:text-white dark:[--player-background:#303033]">
|
||||
<div className="flex shrink-0 items-center gap-0 @min-[640px]:gap-1 [&_button]:size-7 @min-[640px]:[&_button]:size-10 [&_svg]:size-4 @min-[640px]:[&_svg]:size-6">
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -85,7 +85,9 @@ export function PlayerBar() {
|
||||
aria-pressed={shuffleEnabled}
|
||||
className={cn(
|
||||
"hidden @min-[640px]:inline-flex",
|
||||
shuffleEnabled ? "text-white" : "text-white/40"
|
||||
shuffleEnabled
|
||||
? "text-card-foreground dark:text-white"
|
||||
: "text-muted-foreground dark:text-white/40"
|
||||
)}
|
||||
onClick={() => void toggleShuffle()}
|
||||
>
|
||||
@@ -129,7 +131,9 @@ export function PlayerBar() {
|
||||
aria-pressed={repeatEnabled !== "none"}
|
||||
className={cn(
|
||||
"hidden @min-[640px]:inline-flex",
|
||||
repeatEnabled !== "none" ? "text-white" : "text-white/40"
|
||||
repeatEnabled !== "none"
|
||||
? "text-card-foreground dark:text-white"
|
||||
: "text-muted-foreground dark:text-white/40"
|
||||
)}
|
||||
onClick={() => void cycleRepeat()}
|
||||
>
|
||||
@@ -141,7 +145,7 @@ export function PlayerBar() {
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div className="relative flex min-w-0 flex-1 items-center gap-2 pb-2 @min-[640px]:gap-3">
|
||||
<div className="relative flex h-11 min-w-0 flex-1 items-center gap-2 pb-2 @min-[640px]:h-16 @min-[640px]:gap-3">
|
||||
{currentSong ? (
|
||||
<>
|
||||
<div className="relative size-9 shrink-0 overflow-hidden rounded @min-[640px]:size-14">
|
||||
@@ -180,23 +184,23 @@ export function PlayerBar() {
|
||||
<AudioFormatBadge
|
||||
format={currentFormat}
|
||||
iconOnly
|
||||
backgroundColor="#303033"
|
||||
backgroundColor="var(--player-background)"
|
||||
/>
|
||||
) : null}
|
||||
</>
|
||||
) : (
|
||||
<Image
|
||||
src="/logo-monochrome.svg"
|
||||
src="/logo.png"
|
||||
alt="oTunes"
|
||||
width={14}
|
||||
width={24}
|
||||
height={24}
|
||||
className="mx-auto my-2 h-6 w-auto opacity-85"
|
||||
className="mx-auto size-6 opacity-85"
|
||||
/>
|
||||
)}
|
||||
<div className="absolute inset-x-0 -bottom-1">
|
||||
<Slider
|
||||
className={cn(
|
||||
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-white/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-white/30",
|
||||
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30",
|
||||
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
|
||||
)}
|
||||
min={0}
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
"use client"
|
||||
|
||||
import { useLayoutEffect, useRef } from "react"
|
||||
import { usePathname, useSearchParams } from "next/navigation"
|
||||
|
||||
const historyKey = "otunesScrollKey"
|
||||
const scrollSelector = '[data-slot="scroll-area-viewport"], .overflow-y-auto'
|
||||
type Position = { top: number; left: number }
|
||||
|
||||
// Track page containers independently of the window, including split library views.
|
||||
export function ScrollRestoration({ children }: { children: React.ReactNode }) {
|
||||
const pathname = usePathname()
|
||||
const searchParams = useSearchParams()
|
||||
const route = `${pathname}?${searchParams.toString()}`
|
||||
const rootRef = useRef<HTMLDivElement>(null)
|
||||
const positions = useRef(new Map<string, Map<number, Position>>())
|
||||
useLayoutEffect(() => {
|
||||
const root = rootRef.current
|
||||
if (!root) return
|
||||
|
||||
const key =
|
||||
typeof history.state?.[historyKey] === "string"
|
||||
? (history.state[historyKey] as string)
|
||||
: crypto.randomUUID()
|
||||
history.replaceState({ ...history.state, [historyKey]: key }, "")
|
||||
const saved = positions.current.get(key)
|
||||
const pending = new Map(saved)
|
||||
if (!positions.current.has(key)) positions.current.set(key, new Map())
|
||||
// Bound memory during long listening sessions.
|
||||
if (positions.current.size > 100) {
|
||||
const oldest = positions.current.keys().next().value
|
||||
if (oldest !== undefined) positions.current.delete(oldest)
|
||||
}
|
||||
|
||||
const containers = () =>
|
||||
Array.from(root.querySelectorAll<HTMLElement>(scrollSelector)).filter(
|
||||
(element) => element.getClientRects().length > 0
|
||||
)
|
||||
const restore = () => {
|
||||
for (const [index, element] of containers().entries()) {
|
||||
const position = pending.get(index)
|
||||
if (!position) continue
|
||||
element.scrollTo({
|
||||
top: position.top,
|
||||
left: position.left,
|
||||
behavior: "instant",
|
||||
})
|
||||
// Keep waiting if asynchronous content is still too short.
|
||||
if (
|
||||
Math.abs(element.scrollTop - position.top) < 1 &&
|
||||
Math.abs(element.scrollLeft - position.left) < 1
|
||||
) {
|
||||
pending.delete(index)
|
||||
}
|
||||
}
|
||||
}
|
||||
const record = (event: Event) => {
|
||||
if (!(event.target instanceof HTMLElement)) return
|
||||
const index = containers().indexOf(event.target)
|
||||
if (index < 0 || pending.has(index)) return
|
||||
positions.current.get(key)?.set(index, {
|
||||
top: event.target.scrollTop,
|
||||
left: event.target.scrollLeft,
|
||||
})
|
||||
}
|
||||
const stopRestoring = () => {
|
||||
pending.clear()
|
||||
observer.disconnect()
|
||||
resizeObserver.disconnect()
|
||||
}
|
||||
const observer = new MutationObserver(() => {
|
||||
restore()
|
||||
for (const element of containers()) {
|
||||
resizeObserver.observe(element)
|
||||
for (const child of element.children) resizeObserver.observe(child)
|
||||
}
|
||||
})
|
||||
const resizeObserver = new ResizeObserver(restore)
|
||||
if (pending.size) {
|
||||
observer.observe(root, { childList: true, subtree: true })
|
||||
for (const element of containers()) {
|
||||
resizeObserver.observe(element)
|
||||
for (const child of element.children) resizeObserver.observe(child)
|
||||
}
|
||||
restore()
|
||||
}
|
||||
const timeout = window.setTimeout(stopRestoring, 10_000)
|
||||
root.addEventListener("scroll", record, true)
|
||||
root.addEventListener("wheel", stopRestoring, { passive: true })
|
||||
root.addEventListener("touchstart", stopRestoring, { passive: true })
|
||||
root.addEventListener("keydown", stopRestoring)
|
||||
return () => {
|
||||
window.clearTimeout(timeout)
|
||||
stopRestoring()
|
||||
root.removeEventListener("scroll", record, true)
|
||||
root.removeEventListener("wheel", stopRestoring)
|
||||
root.removeEventListener("touchstart", stopRestoring)
|
||||
root.removeEventListener("keydown", stopRestoring)
|
||||
}
|
||||
}, [route])
|
||||
|
||||
return (
|
||||
<div ref={rootRef} className="contents">
|
||||
{children}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Reference in new issue
Block a user