feat: add full variant to AudioPlayer with waveform and progress bar #35
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,6 +68,11 @@ | |
| 'rounded-xl border border-border', | ||
| 'bg-card text-card-foreground', | ||
| ], | ||
| full: [ | ||
| 'flex flex-col gap-3 p-4', | ||
| 'rounded-xl border border-border', | ||
| 'bg-card text-card-foreground', | ||
| ], | ||
| }, | ||
| size: { | ||
| sm: '', | ||
|
|
@@ -80,6 +85,8 @@ | |
| { variant: 'compact', size: 'lg', class: 'p-4 gap-4' }, | ||
| { variant: 'waveform', size: 'sm', class: 'p-3 gap-2' }, | ||
| { variant: 'waveform', size: 'lg', class: 'p-5 gap-4' }, | ||
| { variant: 'full', size: 'sm', class: 'p-3 gap-2' }, | ||
| { variant: 'full', size: 'lg', class: 'p-5 gap-4' }, | ||
| ], | ||
| defaultVariants: { | ||
| variant: 'compact', | ||
|
|
@@ -112,6 +119,11 @@ | |
| 'hover:bg-primary-700', | ||
| 'active:bg-primary-800', | ||
| ], | ||
| full: [ | ||
| 'bg-primary-600 text-white', | ||
| 'hover:bg-primary-700', | ||
| 'active:bg-primary-800', | ||
| ], | ||
| }, | ||
| size: { | ||
| sm: 'h-7 w-7', | ||
|
|
@@ -246,11 +258,11 @@ | |
| }} | ||
| > | ||
| <div | ||
| className="bg-primary-600 absolute inset-y-0 left-0 rounded-full" | ||
| style={{ width: `${progress}%` }} | ||
| /> | ||
| <div | ||
| className="bg-primary-600 absolute top-1/2 h-3 w-3 -translate-y-1/2 rounded-full shadow-sm" | ||
| style={{ left: `calc(${progress}% - 6px)` }} | ||
| /> | ||
| </div> | ||
|
|
@@ -261,6 +273,14 @@ | |
| // Waveform Component (lazy-loaded WaveSurfer) | ||
| // ============================================================================ | ||
|
|
||
| /** Handle for imperative control of the Waveform component */ | ||
| export interface WaveformHandle { | ||
| /** Seek to a specific time in seconds */ | ||
| seekTo: (time: number) => void; | ||
| /** Get the current WaveSurfer instance (for advanced usage) */ | ||
| getInstance: () => unknown | null; | ||
| } | ||
|
|
||
| interface WaveformProps { | ||
| src: string; | ||
| isPlaying: boolean; | ||
|
|
@@ -274,22 +294,42 @@ | |
| height?: number; | ||
| } | ||
|
|
||
| const Waveform = React.forwardRef<WaveformHandle, WaveformProps>(function Waveform( | ||
| { | ||
| src, | ||
| isPlaying, | ||
| playbackRate = 1, | ||
| onReady, | ||
| onTimeUpdate, | ||
| onFinish, | ||
| onSeek, | ||
| waveColor, | ||
| progressColor, | ||
| height = 64, | ||
| }, | ||
| ref | ||
| ) { | ||
| const containerRef = React.useRef<HTMLDivElement>(null); | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| const wavesurferRef = React.useRef<any>(null); | ||
| const [isLoaded, setIsLoaded] = React.useState(false); | ||
| const durationRef = React.useRef<number>(0); | ||
|
|
||
| // Expose imperative handle for seeking from parent | ||
| React.useImperativeHandle(ref, () => ({ | ||
| seekTo: (time: number) => { | ||
| if (wavesurferRef.current) { | ||
| // Get current duration from WaveSurfer directly | ||
| const currentDuration = wavesurferRef.current.getDuration() || durationRef.current; | ||
| if (currentDuration > 0) { | ||
| // WaveSurfer seekTo uses a ratio (0-1), not seconds | ||
| const ratio = Math.max(0, Math.min(1, time / currentDuration)); | ||
| wavesurferRef.current.seekTo(ratio); | ||
| } | ||
| } | ||
| }, | ||
| getInstance: () => wavesurferRef.current, | ||
| }), [isLoaded]); // Re-create handle when loaded | ||
|
|
||
| // Initialize WaveSurfer | ||
| React.useEffect(() => { | ||
|
|
@@ -318,19 +358,25 @@ | |
|
|
||
| wavesurferRef.current.on('ready', () => { | ||
| setIsLoaded(true); | ||
| durationRef.current = wavesurferRef.current.getDuration(); | ||
| onReady(durationRef.current); | ||
| }); | ||
|
|
||
| wavesurferRef.current.on('audioprocess', () => { | ||
| onTimeUpdate(wavesurferRef.current.getCurrentTime()); | ||
| }); | ||
|
|
||
| wavesurferRef.current.on('seeking', () => { | ||
| const time = wavesurferRef.current.getCurrentTime(); | ||
| onTimeUpdate(time); | ||
| onSeek(time); | ||
| }); | ||
|
|
||
| // Handle seek events (fired after seeking is complete) | ||
| wavesurferRef.current.on('seek', () => { | ||
| const time = wavesurferRef.current.getCurrentTime(); | ||
| onTimeUpdate(time); | ||
| onSeek(time); | ||
| }); | ||
|
Comment on lines
369
to
380
There was a problem hiding this comment. WaveSurfer event handlers call both |
||
|
|
||
| wavesurferRef.current.on('finish', () => { | ||
|
|
@@ -381,7 +427,9 @@ | |
| style={{ height }} | ||
| /> | ||
| ); | ||
| }); | ||
|
|
||
| Waveform.displayName = 'Waveform'; | ||
|
|
||
| // ============================================================================ | ||
| // Main AudioPlayer Component | ||
|
|
@@ -432,6 +480,7 @@ | |
| const [playbackRate, setPlaybackRate] = React.useState(1); | ||
| const [audioInitialized, setAudioInitialized] = React.useState(false); | ||
| const audioRef = React.useRef<globalThis.HTMLAudioElement | null>(null); | ||
| const waveformRef = React.useRef<WaveformHandle>(null); | ||
|
|
||
| const isPlaying = state === 'playing'; | ||
| const isLoading = state === 'loading'; | ||
|
|
@@ -447,7 +496,7 @@ | |
|
|
||
| // Initialize audio element (for non-waveform variants) | ||
| const initAudio = React.useCallback(() => { | ||
| if (variant === 'waveform' || variant === 'full' || audioInitialized) return null; | ||
|
|
||
| const audio = new globalThis.Audio(src); | ||
| audioRef.current = audio; | ||
|
|
@@ -487,7 +536,7 @@ | |
|
|
||
| // Auto-initialize if preload is true | ||
| React.useEffect(() => { | ||
| if (preload && !audioInitialized && variant !== 'waveform' && variant !== 'full') { | ||
| initAudio(); | ||
| } | ||
| }, [preload, audioInitialized, variant, initAudio]); | ||
|
|
@@ -512,8 +561,8 @@ | |
| const handlePlay = React.useCallback(() => { | ||
| if (disabled) return; | ||
|
|
||
| // Waveform and full variants use WaveSurfer for playback - just toggle state | ||
| if (variant === 'waveform' || variant === 'full') { | ||
| if (isLoading) return; | ||
| updateState(isPlaying ? 'paused' : 'playing'); | ||
| return; | ||
|
|
@@ -597,6 +646,12 @@ | |
| setCurrentTime(time); | ||
| }, []); | ||
|
|
||
| // Handle seek from progress bar (for full variant) - sync with WaveSurfer | ||
| const handleFullVariantSeek = React.useCallback((time: number) => { | ||
| setCurrentTime(time); | ||
| waveformRef.current?.seekTo(time); | ||
| }, []); | ||
|
|
||
| const iconSize = | ||
| size === 'sm' ? 'h-3.5 w-3.5' : size === 'lg' ? 'h-5 w-5' : 'h-4 w-4'; | ||
|
|
||
|
|
@@ -696,6 +751,40 @@ | |
| // ============================================================================ | ||
| // Waveform Variant | ||
| // ============================================================================ | ||
| if (variant === 'waveform') { | ||
| return ( | ||
| <div className={cn(audioPlayerVariants({ variant, size }), className)}> | ||
| {title && ( | ||
| <span className="text-sm font-medium text-neutral-700 dark:text-neutral-300"> | ||
| {title} | ||
| </span> | ||
| )} | ||
| <Waveform | ||
| src={src} | ||
| isPlaying={isPlaying} | ||
| playbackRate={playbackRate} | ||
| onReady={handleWaveformReady} | ||
| onTimeUpdate={handleWaveformTimeUpdate} | ||
| onFinish={handleWaveformFinish} | ||
| onSeek={handleWaveformSeek} | ||
| waveColor={waveColor} | ||
| progressColor={progressColor} | ||
| height={waveformHeight} | ||
| /> | ||
| <div className="flex items-center gap-3"> | ||
| {renderPlayButton()} | ||
| <div className="flex flex-1 items-center justify-between"> | ||
| {renderTime()} | ||
| {renderPlaybackRateControl()} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| // ============================================================================ | ||
| // Full Variant (Waveform + Progress Bar) | ||
| // ============================================================================ | ||
| return ( | ||
| <div className={cn(audioPlayerVariants({ variant, size }), className)}> | ||
| {title && ( | ||
|
|
@@ -704,6 +793,7 @@ | |
| </span> | ||
| )} | ||
| <Waveform | ||
| ref={waveformRef} | ||
| src={src} | ||
| isPlaying={isPlaying} | ||
| playbackRate={playbackRate} | ||
|
|
@@ -717,10 +807,14 @@ | |
| /> | ||
| <div className="flex items-center gap-3"> | ||
| {renderPlayButton()} | ||
| <ProgressBar | ||
| currentTime={currentTime} | ||
| duration={duration} | ||
| onSeek={handleFullVariantSeek} | ||
| disabled={disabled} | ||
| /> | ||
| {renderTime()} | ||
| {renderPlaybackRateControl()} | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
@@ -732,4 +826,4 @@ | |
| // Exports | ||
| // ============================================================================ | ||
|
|
||
| export { AudioPlayer, audioPlayerVariants, playButtonVariants, ProgressBar, Waveform }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
Waveformprop destructuring indentation appears broken (e.g.,onReady,onTimeUpdate, etc. are misaligned). This makes the component harder to read and likely indicates the file wasn't run through the formatter after the refactor. Re-run Prettier/formatting to normalize indentation.