fix: playlist search placement on web and iOS #115

Merged
joshuafhiggins merged 2 commits from t3/playlist-search-top-right into main 2026-11-19 18:33:02 -05:00
7 changed files with 67 additions and 26 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton />
return <CollectionDetailSkeleton search />
}
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton />
return <CollectionDetailSkeleton search />
}
+14 -2
View File
@@ -148,11 +148,23 @@ export function SongListSkeleton() {
)
}
/** Matches the header + track list layout of album and playlist pages. */
export function CollectionDetailSkeleton() {
/**
* Matches the header + track list layout of album and playlist pages.
* Pass `search` on playlist pages to reserve the "Find in Playlist" toolbar row.
*/
export function CollectionDetailSkeleton({
search = false,
}: {
search?: boolean
}) {
return (
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
<PageHeader />
{search ? (
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
<Skeleton className="h-9 w-full rounded-full md:w-64" />
</div>
) : null}
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<Skeleton className="mx-auto aspect-square w-full max-w-60 shrink-0 rounded-lg sm:mx-0" />
+18 -18
View File
@@ -342,6 +342,24 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
return (
<div className="flex h-svh flex-col">
<PageHeader openApp />
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
<div className="relative w-full md:w-64">
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
<input
type="search"
aria-label="Find in playlist"
placeholder="Find in Playlist"
value={searchQuery}
onChange={(event) => {
setSearchQuery(event.target.value)
clearSelection()
setActiveTrackId("")
setDragIndex(null)
}}
className="h-9 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
/>
</div>
</div>
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0">
@@ -478,24 +496,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div>
</div>
<div className="px-6 pb-4">
<div className="relative max-w-sm">
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
<input
type="search"
aria-label="Search playlist"
placeholder="Search playlist"
value={searchQuery}
onChange={(event) => {
setSearchQuery(event.target.value)
clearSelection()
setActiveTrackId("")
setDragIndex(null)
}}
className="h-10 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
/>
</div>
</div>
{filteredSongs.length > 0 ? (
<VirtualList
count={filteredSongs.length}
+27
View File
@@ -0,0 +1,27 @@
diff --git a/build/useScreens.js b/build/useScreens.js
index fec20121290650f18f39bc18cbb9e4a2a1626133..31c32ff23b36c43f1e98c58fdd7c1727c8a839df 100644
--- a/build/useScreens.js
+++ b/build/useScreens.js
@@ -364,9 +364,6 @@ function getQualifiedRouteComponent(value) {
/*#__PURE__*/ (0, _jsxruntime().jsxs)(_zoomtransitioncontextproviders.ZoomTransitionTargetContextProvider, {
route: route,
children: [
- /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, {
- route: route
- }),
/*#__PURE__*/ (0, _jsxruntime().jsx)(_react().default.Suspense, {
name: route ? `Route(${route.name})` : undefined,
fallback: // `ResolvedSuspenseFallback` only selects between statically defined
@@ -380,6 +377,12 @@ function getQualifiedRouteComponent(value) {
hideWhenNestedAtLevel: activityThreshold,
children: screenContent
}) : screenContent
+ }),
+ // Render the enabler after the screen content so the screen's scroll
+ // view stays its first descendant. react-native-screens only wires the
+ // header search bar and content insets to the first descendant chain.
+ /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, {
+ route: route
})
]
})
+5 -4
View File
@@ -238,6 +238,7 @@ patchedDependencies:
expo-audio@58.0.10: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
expo-file-system@58.0.10: 8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c
expo-modules-core@58.0.24: c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed
expo-router@58.0.25: 9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c
react-native-reanimated@4.7.1: badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3
react-native-screens@4.30.0: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
@@ -331,7 +332,7 @@ importers:
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)(supports-color@8.1.1)
expo-router:
specifier: ~58.0.25
version: 58.0.25(1020a30be8093793eba026e7c3f3ca8b)
version: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b)
expo-secure-store:
specifier: ~58.0.2
version: 58.0.2(expo@58.0.17)
@@ -7638,7 +7639,7 @@ snapshots:
ws: 8.21.0
zod: 4.6.7
optionalDependencies:
expo-router: 58.0.25(1020a30be8093793eba026e7c3f3ca8b)
expo-router: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b)
react-native: 0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1)
transitivePeerDependencies:
- '@expo/dom-webview'
@@ -7939,7 +7940,7 @@ snapshots:
react: 19.3.0
optionalDependencies:
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
expo-router: 58.0.25(1020a30be8093793eba026e7c3f3ca8b)
expo-router: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b)
react-dom: 19.3.0(react@19.3.0)
transitivePeerDependencies:
- supports-color
@@ -11255,7 +11256,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
expo-router@58.0.25(1020a30be8093793eba026e7c3f3ca8b):
expo-router@58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(1020a30be8093793eba026e7c3f3ca8b):
dependencies:
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1))(react@19.3.0)
+1
View File
@@ -8,6 +8,7 @@ patchedDependencies:
'expo-modules-core@58.0.24': patches/expo-modules-core@58.0.24.patch
'expo-file-system@58.0.10': patches/expo-file-system@58.0.10.patch
'@react-native-community/slider@5.2.1': patches/@react-native-community__slider@5.2.1.patch
'expo-router@58.0.25': patches/expo-router@58.0.25.patch
allowBuilds:
esbuild: true
unrs-resolver: true