Skip to content

TT-7145 Enhance useWaveSurfer to improve playhead behavior #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarahentzel merged 2 commits into from
May 6, 2026
Merged

TT-7145 Enhance useWaveSurfer to improve playhead behavior #295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4db036
TT-7145 Enhance useWaveSurfer to improve playhead behavior
May 5, 2026
3bb0e2d
clamp seek [0, duration] and nudge play back so it is visible.
May 5, 2026
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
33 changes: 27 additions & 6 deletions src/renderer/src/crud/useWaveSurfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ import { NamedRegions, useMobile } from '../utils';

const noop = () => {};

/** Nudge playhead slightly before true duration so the custom cursor (CSS) stays visible at end. */
const FINISH_END_EPSILON_SEC = 0.005;

export interface IMarker {
time: number;
label?: string;
Expand Down Expand Up @@ -161,6 +164,8 @@ export function useWaveSurfer(
};

const roundTime = (n: number) => Math.round(n * 100000) / 100000;
const clamp = (n: number, min: number, max: number) =>
Math.min(Math.max(n, min), max);

useEffect(() => {
// Ignore updates while loading (previous clip). Prefer getCurrentTime() over
Expand All @@ -169,9 +174,12 @@ export function useWaveSurfer(
if (loadingRef.current) return;

const ws = wavesurferRef.current;
const t =
let t =
ws != null ? roundTime(ws.getCurrentTime()) : roundTime(currentTime);

const duration = durationRef.current || 0;
if (duration > 0) t = clamp(t, 0, duration);

setProgress(t);

// eslint-disable-next-line react-hooks/exhaustive-deps
Expand All @@ -185,10 +193,9 @@ export function useWaveSurfer(

const wsGoto = async (position: number, keepPlayRegion: boolean = false) => {
if (!keepPlayRegion) resetPlayingRegion();
let pos = position;
const duration = wsDuration();
if (pos > duration) pos = duration;
if (pos < 0) pos = 0;
const pos =
duration > 0 ? clamp(position, 0, duration) : Math.max(position, 0);
onRegionGoTo(pos);
if (pos === duration && isPlayingRef.current) {
//if playing, position messages come in after this one that set it back to previously playing position. Turn this off first in hopes that all messages are done before we set the position...
Expand Down Expand Up @@ -338,8 +345,22 @@ export function useWaveSurfer(
wavesurferRef.current = null;
});

wavesurfer.on('finish', function () {
if (playingRef.current && !loopingRef.current) setPlaying(false);
wavesurfer.on('finish', async function () {
if (playingRef.current && !loopingRef.current) {
const duration = durationRef.current || 0;
if (duration > 0) {
const safeEnd = Math.max(
0,
roundTime(duration - FINISH_END_EPSILON_SEC)
);
try {
await wsGoto(safeEnd);
} catch (error: any) {
logError(Severity.error, errorReporter, error);
}
}
setPlaying(false);
}
});
wavesurfer.on('interaction', function (/*newTime: number*/) {
onInteraction();
Expand Down
Loading