feat: enhance GalleryThumbnail with virtualized rendering and hover card support

- Integrated virtualized rendering using @tanstack/react-virtual for improved performance in the GalleryThumbnail component.
- Added HoverCard functionality for displaying additional photo information on hover.
- Removed unused thumbnail gap and padding size constants to streamline the code.
- Updated scroll behavior to utilize virtual item measurements for accurate thumbnail positioning.

Signed-off-by: Innei <tukon479@gmail.com>
This commit is contained in:
Innei
2025-11-30 01:11:47 +08:00
parent 1b5d782a51
commit 62fd908d35
2 changed files with 170 additions and 98 deletions

View File

@@ -1,5 +1,6 @@
import { Thumbhash } from '@afilmory/ui' import { HoverCard, HoverCardContent, HoverCardTrigger, Thumbhash } from '@afilmory/ui'
import { clsxm, Spring } from '@afilmory/utils' import { clsxm, Spring } from '@afilmory/utils'
import { useVirtualizer } from '@tanstack/react-virtual'
import { m } from 'motion/react' import { m } from 'motion/react'
import type { FC } from 'react' import type { FC } from 'react'
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
@@ -13,16 +14,6 @@ const thumbnailSize = {
desktop: 64, desktop: 64,
} }
const thumbnailGapSize = {
mobile: 8,
desktop: 12,
}
const thumbnailPaddingSize = {
mobile: 12,
desktop: 16,
}
export const GalleryThumbnail: FC<{ export const GalleryThumbnail: FC<{
currentIndex: number currentIndex: number
photos: PhotoManifest[] photos: PhotoManifest[]
@@ -35,6 +26,20 @@ export const GalleryThumbnail: FC<{
const [scrollContainerWidth, setScrollContainerWidth] = useState(0) const [scrollContainerWidth, setScrollContainerWidth] = useState(0)
const thumbnailHeight = isMobile ? thumbnailSize.mobile : thumbnailSize.desktop
// Use tanstack virtual for horizontal scrolling
const virtualizer = useVirtualizer({
count: photos.length,
getScrollElement: () => scrollContainerRef.current,
estimateSize: (index) => {
const photo = photos[index]
return photo ? thumbnailHeight * photo.aspectRatio : thumbnailHeight
},
horizontal: true,
overscan: 5,
})
useEffect(() => { useEffect(() => {
const scrollContainer = scrollContainerRef.current const scrollContainer = scrollContainerRef.current
if (scrollContainer) { if (scrollContainer) {
@@ -52,22 +57,47 @@ export const GalleryThumbnail: FC<{
useEffect(() => { useEffect(() => {
const scrollContainer = scrollContainerRef.current const scrollContainer = scrollContainerRef.current
if (scrollContainer) { if (scrollContainer && photos.length > 0 && currentIndex < photos.length) {
const containerWidth = scrollContainerWidth // Use virtualizer's actual measurements for accurate positioning
const thumbnailLeft = const virtualItem = virtualizer.getVirtualItems().find((item) => item.index === currentIndex)
currentIndex * (isMobile ? thumbnailSize.mobile : thumbnailSize.desktop) +
(isMobile ? thumbnailGapSize.mobile : thumbnailGapSize.desktop) * currentIndex
const thumbnailWidth = isMobile ? thumbnailSize.mobile : thumbnailSize.desktop
const scrollLeft = thumbnailLeft - containerWidth / 2 + thumbnailWidth / 2 if (virtualItem) {
nextFrame(() => { // virtualItem.start is the actual measured start position
scrollContainer.scrollTo({ // virtualItem.size is the actual measured size
left: scrollLeft, const thumbnailCenter = virtualItem.start + virtualItem.size / 2
behavior: 'smooth',
// Center the thumbnail in the viewport
const scrollLeft = thumbnailCenter - scrollContainerWidth / 2
nextFrame(() => {
scrollContainer.scrollTo({
left: Math.max(0, scrollLeft),
behavior: 'smooth',
})
}) })
}) } else {
// Fallback: calculate manually if virtual item not yet rendered
let thumbnailLeft = 0
for (let i = 0; i < currentIndex; i++) {
const photo = photos[i]
const width = thumbnailHeight * photo.aspectRatio
thumbnailLeft += width
}
const currentPhoto = photos[currentIndex]
const currentThumbnailWidth = thumbnailHeight * currentPhoto.aspectRatio
const thumbnailCenter = thumbnailLeft + currentThumbnailWidth / 2
const scrollLeft = thumbnailCenter - scrollContainerWidth / 2
nextFrame(() => {
scrollContainer.scrollTo({
left: Math.max(0, scrollLeft),
behavior: 'smooth',
})
})
}
} }
}, [currentIndex, isMobile, scrollContainerWidth]) }, [currentIndex, isMobile, scrollContainerWidth, photos, thumbnailHeight, virtualizer])
// 处理鼠标滚轮事件,映射为横向滚动 // 处理鼠标滚轮事件,映射为横向滚动
useEffect(() => { useEffect(() => {
@@ -91,23 +121,9 @@ export const GalleryThumbnail: FC<{
} }
}, []) }, [])
// Virtual scrolling optimization: only render thumbnails near the visible area
// Calculate the range of thumbnails to render
const renderRange = 30 // Render 30 items before and after current index, ~60 total
const startIndex = Math.max(0, currentIndex - renderRange)
const endIndex = Math.min(photos.length - 1, currentIndex + renderRange)
// Calculate placeholder widths
const thumbnailWidth = isMobile ? thumbnailSize.mobile : thumbnailSize.desktop
const gapSize = isMobile ? thumbnailGapSize.mobile : thumbnailGapSize.desktop
const itemWidth = thumbnailWidth + gapSize
const leftPlaceholderWidth = startIndex > 0 ? startIndex * itemWidth : 0
const rightPlaceholderWidth = endIndex < photos.length - 1 ? (photos.length - 1 - endIndex) * itemWidth : 0
return ( return (
<m.div <m.div
className="pb-safe border-accent/20 bg-material-medium z-10 shrink-0 border-t backdrop-blur-2xl" className="pb-safe bg-material-medium z-10 shrink-0 backdrop-blur-2xl"
initial={{ y: 100, opacity: 0 }} initial={{ y: 100, opacity: 0 }}
animate={{ animate={{
y: visible ? 0 : 48, y: visible ? 0 : 48,
@@ -128,65 +144,119 @@ export const GalleryThumbnail: FC<{
background: 'linear-gradient(to top, color-mix(in srgb, var(--color-accent) 5%, transparent), transparent)', background: 'linear-gradient(to top, color-mix(in srgb, var(--color-accent) 5%, transparent), transparent)',
}} }}
/> />
<div <div ref={scrollContainerRef} className="scrollbar-none relative z-10 overflow-x-auto">
ref={scrollContainerRef} <div
className="scrollbar-none relative z-10 flex overflow-x-auto" style={{
style={{ height: `${thumbnailHeight}px`,
gap: isMobile ? thumbnailGapSize.mobile : thumbnailGapSize.desktop, width: `${virtualizer.getTotalSize()}px`,
padding: isMobile ? thumbnailPaddingSize.mobile : thumbnailPaddingSize.desktop, position: 'relative',
}} }}
> >
{/* Left placeholder */} {virtualizer.getVirtualItems().map((virtualItem) => {
{leftPlaceholderWidth > 0 && ( const photo = photos[virtualItem.index]
<div const thumbnailWidth = thumbnailHeight * photo.aspectRatio
style={{ const isCurrent = virtualItem.index === currentIndex
width: leftPlaceholderWidth,
flexShrink: 0,
}}
/>
)}
{/* Only render thumbnails within visible range */} return (
{photos.slice(startIndex, endIndex + 1).map((photo, sliceIndex) => { <div
const index = startIndex + sliceIndex key={virtualItem.key}
return ( data-index={virtualItem.index}
<button className="absolute top-0"
type="button" style={{
key={photo.id} height: `${thumbnailHeight}px`,
className={clsxm( width: `${thumbnailWidth}px`,
'contain-intrinsic-size relative shrink-0 overflow-hidden rounded-lg border-2 transition-all', transform: `translateX(${virtualItem.start}px)`,
index === currentIndex }}
? 'scale-110 border-accent shadow-[0_0_20px_color-mix(in_srgb,var(--color-accent)_20%,transparent)]' >
: 'grayscale-50 border-accent/20 hover:border-accent hover:grayscale-0', {!isMobile ? (
)} <HoverCard openDelay={100} closeDelay={0}>
style={ <HoverCardTrigger asChild>
isMobile <button
? { type="button"
width: thumbnailSize.mobile, className={clsxm(
height: thumbnailSize.mobile, 'contain-intrinsic-size h-full w-full overflow-hidden transition-all',
} 'hover:grayscale-0',
: { isCurrent
width: thumbnailSize.desktop, ? 'scale-110 border-accent shadow-[0_0_20px_color-mix(in_srgb,var(--color-accent)_20%,transparent)]'
height: thumbnailSize.desktop, : 'grayscale border-accent/20',
} )}
} onClick={() => onIndexChange(virtualItem.index)}
onClick={() => onIndexChange(index)} >
> {photo.thumbHash && (
{photo.thumbHash && <Thumbhash thumbHash={photo.thumbHash} className="size-fill absolute inset-0" />} <Thumbhash thumbHash={photo.thumbHash} className="size-fill absolute inset-0" />
<img src={photo.thumbnailUrl} alt={photo.title} className="absolute inset-0 h-full w-full object-cover" /> )}
</button> <img
) src={photo.thumbnailUrl}
})} alt={photo.title}
className="absolute inset-0 h-full w-full object-cover"
/>
</button>
</HoverCardTrigger>
{/* Right placeholder */} <HoverCardContent
{rightPlaceholderWidth > 0 && ( side="top"
<div align="center"
style={{ sideOffset={0}
width: rightPlaceholderWidth, alignOffset={0}
flexShrink: 0, className="w-80 overflow-hidden rounded-none border-0 p-0 shadow-[8px_-9px_20px_13px_var(--color-accent)]"
}} >
/> <div className="relative">
)} {/* Preview image */}
<div
className="relative w-full overflow-hidden"
style={{ aspectRatio: photo.aspectRatio, height: 'auto' }}
>
{photo.thumbHash && (
<Thumbhash thumbHash={photo.thumbHash} className="absolute inset-0 size-full" />
)}
<img
src={photo.thumbnailUrl}
alt={photo.title}
className="absolute inset-0 h-full w-full object-cover"
/>
</div>
{/* Photo info overlay */}
{(photo.title || photo.dateTaken) && (
<div className="absolute right-0 bottom-0 left-0 bg-linear-to-t from-black/60 to-transparent p-3">
{photo.title && (
<div className="truncate text-sm font-medium text-white">{photo.title}</div>
)}
{photo.dateTaken && (
<div className="mt-1 text-xs text-white/80">
{new Date(photo.dateTaken).toLocaleDateString()}
</div>
)}
</div>
)}
</div>
</HoverCardContent>
</HoverCard>
) : (
<button
type="button"
className={clsxm(
'contain-intrinsic-size h-full w-full overflow-hidden transition-all',
'hover:grayscale-0',
isCurrent
? 'scale-110 border-accent shadow-[0_0_20px_color-mix(in_srgb,var(--color-accent)_20%,transparent)]'
: 'grayscale border-accent/20',
)}
onClick={() => onIndexChange(virtualItem.index)}
>
{photo.thumbHash && (
<Thumbhash thumbHash={photo.thumbHash} className="size-fill absolute inset-0" />
)}
<img
src={photo.thumbnailUrl}
alt={photo.title}
className="absolute inset-0 h-full w-full object-cover"
/>
</button>
)}
</div>
)
})}
</div>
</div> </div>
</m.div> </m.div>
) )

View File

@@ -3,6 +3,8 @@ import * as HoverCardPrimitive from '@radix-ui/react-hover-card'
import { m } from 'motion/react' import { m } from 'motion/react'
import * as React from 'react' import * as React from 'react'
import { RootPortal } from '../portal'
const HoverCard = HoverCardPrimitive.Root const HoverCard = HoverCardPrimitive.Root
const HoverCardTrigger = HoverCardPrimitive.Trigger const HoverCardTrigger = HoverCardPrimitive.Trigger
@@ -16,7 +18,7 @@ const HoverCardContent = ({
}: React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content> & { }: React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content> & {
ref?: React.RefObject<React.ElementRef<typeof HoverCardPrimitive.Content> | null> ref?: React.RefObject<React.ElementRef<typeof HoverCardPrimitive.Content> | null>
}) => ( }) => (
<HoverCardPrimitive.Portal> <RootPortal>
<HoverCardPrimitive.Content <HoverCardPrimitive.Content
ref={ref} ref={ref}
align={align} align={align}
@@ -59,7 +61,7 @@ const HoverCardContent = ({
<div className="relative">{props.children}</div> <div className="relative">{props.children}</div>
</m.div> </m.div>
</HoverCardPrimitive.Content> </HoverCardPrimitive.Content>
</HoverCardPrimitive.Portal> </RootPortal>
) )
HoverCardContent.displayName = HoverCardPrimitive.Content.displayName HoverCardContent.displayName = HoverCardPrimitive.Content.displayName