Compare commits

..
16 changed files with 188 additions and 406 deletions

No files matched your search

+5 -12
View File
@@ -4,6 +4,7 @@ import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
@@ -22,18 +23,10 @@ export default function HomeLayout() {
...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
})}
/>
)
+10 -2
View File
@@ -5,6 +5,7 @@ import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
import { HomeSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabContentBottomInset } from "@/components/player"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -56,7 +57,9 @@ export default function HomeScreen() {
(result) => result.status === "LoadingFirstPage" && !result.isCached
)
if (isLoading) {
return <HomeSkeleton title="Home" />
return (
<HomeSkeleton title="Home" titleAccessory={<ProfileHeaderButton />} />
)
}
const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT)
@@ -73,7 +76,12 @@ export default function HomeScreen() {
]}
contentInsetAdjustmentBehavior="automatic"
>
<ScreenTitle title="Home" scrollY={scrollY} style={styles.title} />
<ScreenTitle
title="Home"
scrollY={scrollY}
accessory={<ProfileHeaderButton />}
style={styles.title}
/>
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
</Animated.ScrollView>
)
@@ -5,6 +5,7 @@ import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
@@ -26,18 +27,10 @@ export default function LibraryLayout() {
title:
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
})}
/>
)
@@ -8,6 +8,7 @@ import { Ionicons } from "@expo/vector-icons"
import { MediaGridList } from "@/components/media-cards"
import { tabContentBottomInset } from "@/components/player"
import { MediaGridSkeleton } from "@/components/skeletons"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { useAppNavigation } from "@/lib/app-navigation"
import { api } from "@otunes/convex/_generated/api"
@@ -128,6 +129,7 @@ export default function LibraryScreen() {
return (
<MediaGridSkeleton
title={title}
titleAccessory={<ProfileHeaderButton />}
contentInset={false}
header={listHeader}
/>
@@ -137,6 +139,7 @@ export default function LibraryScreen() {
return (
<MediaGridList
title={title}
titleAccessory={<ProfileHeaderButton />}
content={results}
paddingBottom={tabContentBottomInset}
contentInset={false}
@@ -4,6 +4,7 @@ import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import {
inlineTitleOptions,
showHeaderProfile,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
@@ -22,18 +23,10 @@ export default function SearchLayout() {
...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
route.name === "index"
? () => [
{
type: "custom",
element: <ProfileHeaderButton />,
hidesSharedBackground: true,
},
]
: undefined,
// iOS shows the profile button inline with the screen title instead.
headerRight: showHeaderProfile(route.name)
? () => <ProfileHeaderButton />
: undefined,
})}
/>
)
+44 -176
View File
@@ -7,15 +7,6 @@ import {
View,
type ScrollViewInstance,
} from "react-native"
import Animated, {
cancelAnimation,
Easing,
useAnimatedStyle,
useSharedValue,
withSequence,
withTiming,
type SharedValue,
} from "react-native-reanimated"
import {
usePlaybackActions,
@@ -27,7 +18,6 @@ import type { NowPlayingColors } from "@/lib/now-playing-colors"
import {
activeLineIndex,
type LyricLine,
type LyricWord,
type Lyrics,
} from "@otunes/convex/client/lyrics"
@@ -35,8 +25,6 @@ import {
const MANUAL_SCROLL_HOLD_MS = 3000
/** Where the playing line sits, as a share of the view's height from the top. */
const ACTIVE_LINE_POSITION = 0.12
/** Blur radius by distance from the playing line; farther lines share the last. */
const LINE_BLUR = [0, 1, 2, 3]
/**
* Lyrics in the player's own colors. Synced lines follow playback and seek
@@ -82,22 +70,19 @@ function LyricsLines({
const scrollRef = useRef<ScrollViewInstance>(null)
const lineOffsets = useRef<number[]>([])
const [height, setHeight] = useState(0)
// While the listener scrolls, lines stay sharp and the view stays put.
const [browsing, setBrowsing] = useState(false)
const browseTimer = useRef<ReturnType<typeof setTimeout>>(undefined)
useEffect(() => () => clearTimeout(browseTimer.current), [])
const manualScrollAt = useRef(0)
const scrollToLine = useCallback(
(index: number) => {
const y = lineOffsets.current[Math.max(index, 0)]
if (y === undefined || !synced || height === 0 || browsing) return
if (y === undefined || !synced || height === 0) return
if (Date.now() - manualScrollAt.current < MANUAL_SCROLL_HOLD_MS) return
scrollRef.current?.scrollTo({
y: Math.max(0, y - height * ACTIVE_LINE_POSITION),
animated: true,
})
},
[height, synced, browsing]
[height, synced]
)
useEffect(() => {
@@ -121,20 +106,11 @@ function LyricsLines({
(seconds: number) => {
seekTo(seconds)
setIsPlaying(true)
clearTimeout(browseTimer.current)
setBrowsing(false)
manualScrollAt.current = 0
},
[seekTo, setIsPlaying]
)
const releaseScroll = () => {
clearTimeout(browseTimer.current)
browseTimer.current = setTimeout(
() => setBrowsing(false),
MANUAL_SCROLL_HOLD_MS
)
}
const lineStyle = useMemo(
() => ({ fontSize, lineHeight: Math.round(fontSize * 1.18) }),
[fontSize]
@@ -151,12 +127,12 @@ function LyricsLines({
showsVerticalScrollIndicator={false}
onLayout={(event) => setHeight(event.nativeEvent.layout.height)}
onScrollBeginDrag={() => {
clearTimeout(browseTimer.current)
setBrowsing(true)
manualScrollAt.current = Date.now()
}}
onMomentumScrollEnd={() => {
// Hold from when the scroll settles, not when the finger lifted.
if (manualScrollAt.current > 0) manualScrollAt.current = Date.now()
}}
// Hold from when the scroll settles, not when the finger lifted.
onScrollEndDrag={releaseScroll}
onMomentumScrollEnd={releaseScroll}
>
{lyrics.lines.map((line, index) =>
synced ? (
@@ -164,14 +140,10 @@ function LyricsLines({
key={index}
index={index}
line={line}
distance={
browsing
? 0
: Math.min(Math.abs(index - active), LINE_BLUR.length - 1)
state={
index === active ? "active" : index < active ? "past" : "next"
}
active={index === active}
time={index === active ? time : null}
isPlaying={isPlaying}
colors={colors}
textStyle={lineStyle}
onSelect={playFrom}
@@ -199,17 +171,14 @@ function LyricsLines({
}
/**
* One timed line, blurred by its `distance` from the playing line. Only the
* playing line gets the time, so the others skip re-rendering as the song
* plays.
* One timed line. Only the playing line gets the time, so the others skip
* re-rendering as the song plays.
*/
const SyncedLine = memo(function SyncedLine({
index,
line,
distance,
active,
state,
time,
isPlaying,
colors,
textStyle,
onSelect,
@@ -217,159 +186,58 @@ const SyncedLine = memo(function SyncedLine({
}: {
index: number
line: LyricLine
distance: number
active: boolean
state: "past" | "active" | "next"
time: number | null
isPlaying: boolean
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
onSelect: (seconds: number) => void
onLayoutY: (index: number, y: number) => void
}) {
const blur = LINE_BLUR[distance]
const active = state === "active"
return (
<Pressable
onPress={() => onSelect(line.start ?? 0)}
onLayout={(event) => onLayoutY(index, event.nativeEvent.layout.y)}
accessibilityRole="button"
accessibilityHint="Plays from this line"
style={[styles.line, blur > 0 && { filter: [{ blur }] }]}
style={styles.line}
>
{active && line.words && time !== null ? (
<FilledWords
words={line.words}
time={time}
isPlaying={isPlaying}
colors={colors}
textStyle={textStyle}
/>
) : (
<Text
style={[
styles.lineText,
textStyle,
{
color:
active && !line.words
? colors.foreground
: colors.lyricsInactive,
},
]}
>
{line.text}
</Text>
)}
<Text
style={[
styles.lineText,
textStyle,
{
color:
active && !line.words ? colors.foreground : colors.lyricsInactive,
},
]}
>
{active && line.words
? line.words.map((word, wordIndex) => (
<Text
key={wordIndex}
style={{
color:
time !== null && time >= word.start
? colors.foreground
: colors.lyricsUnsung,
}}
>
{word.text}
</Text>
))
: line.text}
</Text>
</Pressable>
)
})
/**
* The playing line's words, each wiping from dim to bright as it is sung.
* Reanimated runs the wipe; playback updates only re-anchor it.
*/
function FilledWords({
words,
time,
isPlaying,
colors,
textStyle,
}: {
words: LyricWord[]
time: number
isPlaying: boolean
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
}) {
const sung = useSharedValue(time)
const end = words.at(-1)?.end ?? time
useEffect(() => {
cancelAnimation(sung)
// Jump to the reported time first, so the wipe never runs from a stale one.
sung.value =
isPlaying && end > time
? withSequence(
withTiming(time, { duration: 0 }),
withTiming(end, {
duration: (end - time) * 1000,
easing: Easing.linear,
})
)
: time
}, [sung, time, isPlaying, end])
return (
<View style={[styles.words, { columnGap: textStyle.fontSize * 0.25 }]}>
{words.map((word, index) => (
<FilledWord
key={index}
word={word}
sung={sung}
colors={colors}
textStyle={textStyle}
/>
))}
</View>
)
}
function FilledWord({
word,
sung,
colors,
textStyle,
}: {
word: LyricWord
sung: SharedValue<number>
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
}) {
const [width, setWidth] = useState(0)
const text = word.text.trim()
const wipe = useAnimatedStyle(() => {
const progress =
(sung.value - word.start) / Math.max(word.end - word.start, 0.05)
return { width: width * Math.min(Math.max(progress, 0), 1) }
})
return (
<View>
<Text
style={[styles.lineText, textStyle, { color: colors.lyricsUnsung }]}
onLayout={(event) => setWidth(event.nativeEvent.layout.width)}
>
{text}
</Text>
<Animated.View style={[styles.wipe, wipe]}>
<Text
numberOfLines={1}
style={[
styles.lineText,
textStyle,
{ color: colors.foreground, width },
]}
>
{text}
</Text>
</Animated.View>
</View>
)
}
const styles = StyleSheet.create({
fill: { flex: 1 },
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
emptyText: { fontSize: 17, fontWeight: "600" },
line: { paddingVertical: 9 },
lineText: { fontWeight: "800" },
words: { flexDirection: "row", flexWrap: "wrap" },
wipe: {
position: "absolute",
top: 0,
bottom: 0,
left: 0,
overflow: "hidden",
},
plainLine: { fontWeight: "700", paddingVertical: 2 },
stanzaGap: { height: 18 },
})
+5 -1
View File
@@ -7,7 +7,7 @@ import { MusicEntityView } from "@/components/music-entity-view"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react"
import { memo, useCallback, type ReactElement, type ReactNode } from "react"
import {
FlatList,
Platform,
@@ -302,6 +302,7 @@ export function MediaGridList({
ListHeaderComponent,
contentInset = true,
title,
titleAccessory,
}: {
content: MediaItem[]
paddingBottom: number
@@ -310,6 +311,7 @@ export function MediaGridList({
contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
titleAccessory?: ReactNode
}) {
const tabletLayout = useTabletLayout()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
@@ -334,6 +336,7 @@ export function MediaGridList({
ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset}
title={title}
titleAccessory={titleAccessory}
renderCard={renderTabletCard}
/>
)
@@ -344,6 +347,7 @@ export function MediaGridList({
<ScreenTitle
title={title}
scrollY={scrollY}
accessory={titleAccessory}
// Inset grids already pad the whole list horizontally.
style={{ paddingHorizontal: contentInset ? 0 : horizontalPadding }}
/>
+29 -16
View File
@@ -1,11 +1,12 @@
import { useHeaderHeight } from "expo-router/react-navigation"
import type { Component } from "react"
import type { Component, ReactNode } from "react"
import {
Platform,
StyleSheet,
Text,
type ScrollViewInstance,
type StyleProp,
type TextStyle,
type ViewStyle,
} from "react-native"
import Animated, {
useAnimatedRef,
@@ -33,17 +34,20 @@ export function useScreenTitleScroll<
* iOS screen title rendered as the first item of a screen's scroll content,
* in place of the native large title (Apple Music style): it scrolls away
* with the content, never collapses into the bar, and stays put on
* pull-down. Android keeps its native header title, so this renders nothing.
* pull-down. `accessory` (e.g. the profile button) sits on the same row and
* scrolls with it. Android keeps its native header, so this renders nothing.
*/
export function ScreenTitle({
title,
scrollY,
accessory,
style,
}: {
title: string
/** From `useScreenTitleScroll`; omit for screens that never scroll. */
scrollY?: SharedValue<number>
style?: StyleProp<TextStyle>
accessory?: ReactNode
style?: StyleProp<ViewStyle>
}) {
const colors = useThemeColors()
// At rest the scroll offset is minus the automatic header inset, so any
@@ -60,25 +64,34 @@ export function ScreenTitle({
if (Platform.OS !== "ios") return null
return (
<Animated.Text
accessibilityRole="header"
numberOfLines={2}
style={[styles.title, { color: colors.foreground }, style, pinStyle]}
>
{title}
</Animated.Text>
<Animated.View style={[styles.row, style, pinStyle]}>
<Text
accessibilityRole="header"
numberOfLines={2}
style={[styles.title, { color: colors.foreground }]}
>
{title}
</Text>
{accessory}
</Animated.View>
)
}
// Matches UIKit's large title metrics: 34pt bold in a 52pt tall area.
const styles = StyleSheet.create({
title: {
fontSize: 34,
lineHeight: 41,
fontWeight: "700",
letterSpacing: 0.37,
row: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingHorizontal: spacing.lg,
paddingTop: 3,
paddingBottom: 8,
},
title: {
flex: 1,
fontSize: 34,
lineHeight: 41,
fontWeight: "700",
letterSpacing: 0.37,
},
})
+12 -2
View File
@@ -9,6 +9,7 @@ import {
import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import type { MediaAction } from "@/components/media-context-menu"
import { tabContentBottomInset, SongListRow } from "@/components/player"
@@ -86,7 +87,12 @@ function SearchResultsBody({
)
if (isSearching) {
return <SongListSkeleton title={title} />
return (
<SongListSkeleton
title={title}
titleAccessory={<ProfileHeaderButton />}
/>
)
}
return (
@@ -101,7 +107,11 @@ function SearchResultsBody({
keyboardShouldPersistTaps="handled"
ListHeaderComponent={
<>
<ScreenTitle title={title} scrollY={scrollY} />
<ScreenTitle
title={title}
scrollY={scrollY}
accessory={<ProfileHeaderButton />}
/>
{hasQuery && !hasResults ? (
<View style={styles.empty}>
<Text
+26 -5
View File
@@ -155,13 +155,15 @@ function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
export function SongListSkeleton({
rows = 10,
title,
titleAccessory,
}: {
rows?: number
title?: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
{title ? <ScreenTitle title={title} /> : null}
{title ? <ScreenTitle title={title} accessory={titleAccessory} /> : null}
<SongRows rows={rows} />
</SkeletonScreen>
)
@@ -243,6 +245,7 @@ export function MediaGridSkeleton({
contentInset = true,
header,
title,
titleAccessory,
}: {
items?: number
contentInset?: boolean
@@ -250,6 +253,7 @@ export function MediaGridSkeleton({
header?: ReactNode
/** The loaded list's `ScreenTitle`, which replaces its top inset. */
title?: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
@@ -259,7 +263,7 @@ export function MediaGridSkeleton({
header={
title ? (
<>
<MediaGridTitle title={title} />
<MediaGridTitle title={title} accessory={titleAccessory} />
{header}
</>
) : (
@@ -271,11 +275,18 @@ export function MediaGridSkeleton({
)
}
function MediaGridTitle({ title }: { title: string }) {
function MediaGridTitle({
title,
accessory,
}: {
title: string
accessory?: ReactNode
}) {
const { horizontalPadding } = useMediaGridLayout()
return (
<ScreenTitle
title={title}
accessory={accessory}
style={{ paddingHorizontal: horizontalPadding }}
/>
)
@@ -294,11 +305,21 @@ export function CarouselSkeleton() {
)
}
export function HomeSkeleton({ title }: { title: string }) {
export function HomeSkeleton({
title,
titleAccessory,
}: {
title: string
titleAccessory?: ReactNode
}) {
return (
<SkeletonScreen>
<View style={styles.home}>
<ScreenTitle title={title} style={styles.homeTitle} />
<ScreenTitle
title={title}
accessory={titleAccessory}
style={styles.homeTitle}
/>
<CarouselSkeleton />
<CarouselSkeleton />
</View>
@@ -4,6 +4,7 @@ import {
useRef,
useState,
type ReactElement,
type ReactNode,
} from "react"
import {
type ScrollViewInstance,
@@ -31,6 +32,7 @@ type GridProps = {
contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
titleAccessory?: ReactNode
renderCard: (item: MediaItem, width: number) => ReactElement
}
@@ -45,6 +47,7 @@ export function TabletMediaGrid({
ListHeaderComponent,
contentInset = true,
title,
titleAccessory,
renderCard,
}: GridProps) {
const colors = useThemeColors()
@@ -126,6 +129,7 @@ export function TabletMediaGrid({
<ScreenTitle
title={title}
scrollY={titleScrollY}
accessory={titleAccessory}
style={{ paddingHorizontal: horizontalPadding }}
/>
) : null}
+5
View File
@@ -24,6 +24,11 @@ export const tabStackScreenTitles: Record<string, string> = {
export const inlineTitleOptions: StackScreenOptions =
Platform.OS === "ios" ? { headerTitleStyle: { color: "transparent" } } : {}
/** Tab roots show the profile button in the header, except on iOS where `ScreenTitle` holds it. */
export function showHeaderProfile(routeName: string) {
return routeName === "index" && Platform.OS !== "ios"
}
export function useStackScreenOptions(
overrides?: StackScreenOptions
): StackScreenOptions {
@@ -1,3 +0,0 @@
{
"platforms": ["apple"]
}
@@ -1,37 +0,0 @@
// React Native draws `filter: [{ blur }]` on iOS only with its SwiftUI
// filters flag, which the stable release leaves off. This keeps the stable
// flags and turns that one on.
#import <UIKit/UIKit.h>
#import <react/featureflags/ReactNativeFeatureFlags.h>
#import <react/featureflags/ReactNativeFeatureFlagsOverridesOSSStable.h>
using namespace facebook::react;
class SwiftUIFilterFlags : public ReactNativeFeatureFlagsOverridesOSSStable {
public:
bool enableSwiftUIBasedFilters() override {
return true;
}
};
@interface SwiftUIFilters : NSObject
@end
@implementation SwiftUIFilters
+ (void)load
{
// React Native sets its flags once while launching and throws if they were
// set first, so this waits for launch to finish. No views exist yet then.
[NSNotificationCenter.defaultCenter
addObserverForName:UIApplicationDidFinishLaunchingNotification
object:nil
queue:nil
usingBlock:^(NSNotification *notification) {
ReactNativeFeatureFlags::dangerouslyForceOverride(
std::make_unique<SwiftUIFilterFlags>());
}];
}
@end
@@ -1,14 +0,0 @@
Pod::Spec.new do |s|
s.name = 'SwiftUIFilters'
s.version = '1.0.0'
s.summary = 'Turns on React Native view filters like blur on iOS'
s.description = s.summary
s.license = { :type => 'MIT' }
s.author = 'oTunes'
s.homepage = 'https://otunes.abunchofknowitalls.com'
s.platforms = { :ios => '16.4' }
s.source = { :git => '' }
s.static_framework = true
install_modules_dependencies(s)
s.source_files = '**/*.{h,mm}'
end
+35 -114
View File
@@ -12,26 +12,11 @@ import { cn } from "@/lib/utils"
import {
activeLineIndex,
type LyricLine,
type LyricWord,
type Lyrics,
} from "@otunes/convex/client/lyrics"
/** How long a manual scroll keeps the panel from following the song. */
const MANUAL_SCROLL_HOLD_MS = 3000
/** Blur by distance from the playing line; farther lines share the last. */
const LINE_BLUR = ["blur-none", "blur-[1px]", "blur-[2px]", "blur-[3px]"]
/** Unsung words wipe from dim to bright, soft edge first, as they are sung. */
const WORD_FILL = {
backgroundImage:
"linear-gradient(90deg, var(--foreground) 40%, color-mix(in oklab, var(--foreground) 45%, transparent) 60%)",
backgroundSize: "250% 100%",
}
const WORD_FILL_FRAMES = [
{ backgroundPosition: "100% 0" },
{ backgroundPosition: "0% 0" },
]
/** How far a word's fill may drift from playback before it is reset. */
const FILL_DRIFT_MS = 80
/** Lyrics beside the page, in the queue's place. Synced lines follow playback. */
export function LyricsPanel() {
@@ -62,42 +47,38 @@ function LyricsLines({ lyrics }: { lyrics: Lyrics }) {
const time = useLyricsTime(lyrics, currentTime, isPlaying)
const active = activeLineIndex(lyrics, time)
const scrollRef = React.useRef<HTMLDivElement>(null)
const manualScrollAt = React.useRef(0)
const synced = lyrics.synced !== "none"
// While the listener scrolls, lines stay sharp and the panel stays put.
const [browsing, setBrowsing] = React.useState(false)
const browseTimer = React.useRef<ReturnType<typeof setTimeout>>(undefined)
React.useEffect(() => () => clearTimeout(browseTimer.current), [])
React.useEffect(() => {
const container = scrollRef.current
const line = container?.querySelector<HTMLElement>(
`[data-line="${Math.max(active, 0)}"]`
)
if (!container || !line || !synced || browsing) return
if (
!container ||
!line ||
!synced ||
Date.now() - manualScrollAt.current < MANUAL_SCROLL_HOLD_MS
) {
return
}
container.scrollTo({
top: line.offsetTop - container.clientHeight * 0.25,
behavior: "smooth",
})
}, [active, synced, browsing])
}, [active, synced])
const playFrom = React.useCallback(
(seconds: number) => {
seekTo(seconds)
setIsPlaying(true)
clearTimeout(browseTimer.current)
setBrowsing(false)
},
[seekTo, setIsPlaying]
)
const holdScroll = () => {
setBrowsing(true)
clearTimeout(browseTimer.current)
browseTimer.current = setTimeout(
() => setBrowsing(false),
MANUAL_SCROLL_HOLD_MS
)
manualScrollAt.current = Date.now()
}
return (
@@ -105,7 +86,7 @@ function LyricsLines({ lyrics }: { lyrics: Lyrics }) {
ref={scrollRef}
onWheel={holdScroll}
onTouchMove={holdScroll}
className="group relative min-h-0 flex-1 overflow-y-auto px-6 pt-[25svh] pb-[60svh]"
className="relative min-h-0 flex-1 overflow-y-auto px-6 pt-[25svh] pb-[60svh]"
>
{lyrics.lines.map((line, index) =>
synced ? (
@@ -113,14 +94,10 @@ function LyricsLines({ lyrics }: { lyrics: Lyrics }) {
key={index}
index={index}
line={line}
distance={
browsing
? 0
: Math.min(Math.abs(index - active), LINE_BLUR.length - 1)
state={
index === active ? "active" : index < active ? "past" : "next"
}
active={index === active}
time={index === active ? time : null}
isPlaying={isPlaying}
onSelect={playFrom}
/>
) : (
@@ -140,104 +117,48 @@ function LyricsLines({ lyrics }: { lyrics: Lyrics }) {
}
/**
* One timed line, blurred by its `distance` from the playing line. Only the
* active line gets the playback time, so memoized lines elsewhere skip
* re-rendering as the song plays.
* One timed line. Only the active line gets the playback time, so memoized
* lines elsewhere skip re-rendering as the song plays.
*/
const SyncedLine = React.memo(function SyncedLine({
index,
line,
distance,
active,
state,
time,
isPlaying,
onSelect,
}: {
index: number
line: LyricLine
distance: number
active: boolean
state: "past" | "active" | "next"
time: number | null
isPlaying: boolean
onSelect: (seconds: number) => void
}) {
const active = state === "active"
return (
<button
type="button"
data-line={index}
onClick={() => onSelect(line.start ?? 0)}
className={cn(
"-mx-2 my-1 block w-[calc(100%+1rem)] rounded-md px-2 py-1.5 text-left text-[22px] leading-tight font-bold transition-[color,filter] duration-300 group-hover:blur-none hover:bg-foreground/5",
LINE_BLUR[distance],
"-mx-2 my-1 block w-[calc(100%+1rem)] rounded-md px-2 py-1.5 text-left text-[22px] leading-tight font-bold transition-colors duration-300 hover:bg-foreground/5",
active && !line.words ? "text-foreground" : "text-foreground/30"
)}
>
{active && line.words && time !== null ? (
<FilledWords words={line.words} time={time} isPlaying={isPlaying} />
) : (
line.text
)}
{active && line.words
? line.words.map((word, wordIndex) => (
<span
key={wordIndex}
className={cn(
"transition-colors duration-200",
time !== null && time >= word.start
? "text-foreground"
: "text-foreground/45"
)}
>
{word.text}
</span>
))
: line.text}
</button>
)
})
/**
* The playing line's words, each filled as far as it has been sung. The
* browser runs the fills on the song's timeline (a word's start is its
* delay); playback updates only correct their drift.
*/
function FilledWords({
words,
time,
isPlaying,
}: {
words: LyricWord[]
time: number
isPlaying: boolean
}) {
const spans = React.useRef<(HTMLSpanElement | null)[]>([])
const fills = React.useRef<(Animation | undefined)[]>([])
React.useEffect(() => {
fills.current = words.map((word, index) =>
spans.current[index]?.animate(WORD_FILL_FRAMES, {
delay: word.start * 1000,
duration: Math.max(word.end - word.start, 0.05) * 1000,
easing: "linear",
fill: "both",
})
)
return () => fills.current.forEach((fill) => fill?.cancel())
}, [words])
React.useEffect(() => {
const at = time * 1000
fills.current.forEach((fill, index) => {
if (!fill) return
if (Math.abs(Number(fill.currentTime ?? 0) - at) > FILL_DRIFT_MS) {
fill.currentTime = at
}
// `play` on a finished fill would rewind it to the start.
if (isPlaying && time < words[index].end) fill.play()
else fill.pause()
})
}, [words, time, isPlaying])
return words.map((word, index) => {
const text = word.text.trimEnd()
return (
<React.Fragment key={index}>
<span
ref={(span) => {
spans.current[index] = span
}}
className="bg-clip-text text-transparent"
style={WORD_FILL}
>
{text}
</span>
{word.text.slice(text.length)}
</React.Fragment>
)
})
}