Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ts/components/CompositionRecordingDraft.dom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export function CompositionRecordingDraft({
audioUrl={audioUrl}
activeDuration={active?.duration}
currentTime={active?.currentTime ?? 0}
isPlaying={active?.playing ?? false}
width={state.width}
onClick={onScrub}
onScrub={onScrub}
Expand Down Expand Up @@ -132,6 +133,7 @@ type SizedWaveformScrubberProps = {
// defined if we are playing
activeDuration: number | undefined;
currentTime: number;
isPlaying: boolean;
onScrub: (progressAsRatio: number) => void;
onClick: (progressAsRatio: number) => void;
};
Expand All @@ -140,6 +142,7 @@ function SizedWaveformScrubber({
audioUrl,
activeDuration,
currentTime,
isPlaying,
onClick,
onScrub,
width,
Expand All @@ -165,6 +168,7 @@ function SizedWaveformScrubber({
duration={duration}
onClick={onClick}
onScrub={onScrub}
isPlaying={isPlaying}
/>
);
}
1 change: 1 addition & 0 deletions ts/components/conversation/MessageAudio.dom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ export function MessageAudio(props: Props): JSX.Element {
barMaxHeight={BAR_MAX_HEIGHT}
onClick={handleWaveformClick}
onScrub={handleWaveformScrub}
isPlaying={isPlaying}
/>
);

Expand Down
29 changes: 26 additions & 3 deletions ts/components/conversation/WaveformScrubber.dom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
useCallback,
useRef,
forwardRef,
useState,
useEffect,
type JSX,
type MouseEvent,
type KeyboardEvent,
Expand All @@ -25,6 +27,7 @@ type Props = Readonly<{
barMaxHeight: number;
onClick: (positionAsRatio: number) => void;
onScrub: (positionAsRatio: number) => void;
isPlaying?: boolean;
}>;

const BAR_COUNT = 47;
Expand All @@ -45,13 +48,26 @@ export const WaveformScrubber = forwardRef(function WaveformScrubber(
duration,
onClick,
onScrub,
isPlaying = false,
}: Props,
ref
): JSX.Element {
const refMerger = useRefMerger();

const waveformRef = useRef<HTMLDivElement | null>(null);

const [announcedTime, setAnnouncedTime] = useState<number>(currentTime);

useEffect(() => {
if (!isPlaying) {
setAnnouncedTime(currentTime);
}
}, [currentTime, isPlaying]);

const handleFocus = useCallback(() => {
setAnnouncedTime(currentTime);
}, [currentTime]);

// Clicking waveform moves playback head position and starts playback.
const handleClick = useCallback(
(event: MouseEvent) => {
Expand All @@ -69,9 +85,12 @@ export const WaveformScrubber = forwardRef(function WaveformScrubber(
progress = 0;
}

if (duration) {
setAnnouncedTime(progress * duration);
}
onClick(progress);
},
[waveformRef, onClick]
[waveformRef, onClick, duration]
);

// Keyboard navigation for waveform. Pressing keys moves playback head
Expand Down Expand Up @@ -103,6 +122,9 @@ export const WaveformScrubber = forwardRef(function WaveformScrubber(
const positionIncrement = increment / duration;
const newPosition = currentPosition + positionIncrement;

const targetPosition = Math.min(Math.max(0, newPosition), 1) * duration;
setAnnouncedTime(targetPosition);

onScrub(newPosition);
};

Expand All @@ -112,14 +134,15 @@ export const WaveformScrubber = forwardRef(function WaveformScrubber(
className="WaveformScrubber"
onClick={handleClick}
onKeyDown={handleKeyDown}
onFocus={handleFocus}
tabIndex={0}
role="slider"
aria-label={i18n('icu:MessageAudio--slider')}
aria-orientation="horizontal"
aria-valuenow={currentTime}
aria-valuenow={announcedTime}
aria-valuemin={0}
aria-valuemax={duration}
aria-valuetext={durationToPlaybackText(currentTime)}
aria-valuetext={durationToPlaybackText(announcedTime)}
>
<Waveform
peaks={peaks}
Expand Down