Skip to content
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.

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

feat: LEAP-1896: Add scrollbar support to Visualizer #7165

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
25 changes: 25 additions & 0 deletions web/libs/editor/src/lib/AudioUltra/Common/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,28 @@ export const getCursorTime = (e: MouseEvent, visualizer: Visualizer, duration: n
export const isTimeSimilar = (a: number, b: number) => Math.abs(a - b) < TIME_TOLERANCE;
export const isTimeRelativelySimilar = (a: number, b: number, observedDuration: number) =>
isTimeSimilar(a / observedDuration, b / observedDuration);

/**
* A constant representing the thickness of the scrollbar's handle in pixels.
* This value is calculated dynamically by creating a temporary DOM element
* with a scrollable area and comparing its offset width to its client width.
* Useful for making precise layout adjustments that depend on the width of the scrollbar.
*
* Note: The calculation is performed immediately when the variable is defined
* and retains its value for the duration of runtime.
*
* @constant {number}
*/
export const BROWSER_SCROLLBAR_WIDTH = ((): number => {
const scrollDiv = document.createElement("div");
scrollDiv.style.width = "100px";
scrollDiv.style.height = "100px";
scrollDiv.style.overflow = "scroll";
scrollDiv.style.position = "absolute";
scrollDiv.style.top = "-9999px";
scrollDiv.style.scrollbarGutter = "stable";
document.body.appendChild(scrollDiv);
const scrollSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
document.body.removeChild(scrollDiv);
return scrollSize;
})();
60 changes: 54 additions & 6 deletions web/libs/editor/src/lib/AudioUltra/Visual/Visualizer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { WaveformAudio } from "../Media/WaveformAudio";
import { averageMinMax, clamp, debounce, defaults, warn } from "../Common/Utils";
import { averageMinMax, BROWSER_SCROLLBAR_WIDTH, clamp, debounce, defaults, warn } from "../Common/Utils";
import type { Waveform, WaveformOptions } from "../Waveform";
import { type CanvasCompositeOperation, Layer, type RenderingContext } from "./Layer";
import { Events } from "../Common/Events";
Expand Down Expand Up @@ -48,6 +48,7 @@ export type VisualizerOptions = Pick<

export class Visualizer extends Events<VisualizerEvents> {
private wrapper!: HTMLElement;
private scrollFiller!: HTMLElement;
private layers = new Map<string, Layer>();
private observer!: ResizeObserver;
private currentTime = 0;
Expand Down Expand Up @@ -183,6 +184,7 @@ export class Visualizer extends Events<VisualizerEvents> {
}

this.getSamplesPerPx();
this.updateScrollFiller();

this.wf.invoke("zoom", [this.zoom]);
this.draw();
Expand All @@ -193,6 +195,11 @@ export class Visualizer extends Events<VisualizerEvents> {
}

setScrollLeft(value: number, redraw = true, forceDraw = false) {
this.wrapper.scrollLeft = value * this.fullWidth;
this._setScrollLeft(value, redraw, forceDraw);
}

_setScrollLeft(value: number, redraw = true, forceDraw = false) {
this.scrollLeft = value;

if (redraw) {
Expand Down Expand Up @@ -274,13 +281,13 @@ export class Visualizer extends Events<VisualizerEvents> {

centerToCurrentTime() {
if (this.zoom === 1) {
this.scrollLeft = 0;
this.setScrollLeft(0);
return;
}

const offset = this.width / 2 / this.zoomedWidth;

this.scrollLeft = clamp(this.currentTime - offset, 0, 1);
this.setScrollLeft(clamp(this.currentTime - offset, 0, 1));
}

/**
Expand Down Expand Up @@ -639,17 +646,47 @@ export class Visualizer extends Events<VisualizerEvents> {
this.wrapper = document.createElement("div");
this.wrapper.style.height = "100%";

this.createLayer({ name: "main" });
const mainLayer = this.createLayer({ name: "main" });
this.createLayer({ name: "background", offscreen: true, zIndex: 0, isVisible: false });
this.createLayer({ name: "waveform", offscreen: true, zIndex: 100 });
this.createLayerGroup({ name: "regions", offscreen: true, zIndex: 101, compositeOperation: "source-over" });
const controlsLayer = this.createLayer({ name: "controls", offscreen: true, zIndex: 1000 });

this.playhead.setLayer(controlsLayer);
this.layers.get("main")?.appendTo(this.wrapper);
this.initScrollBar();
mainLayer.appendTo(this.wrapper);
container.appendChild(this.wrapper);
}

initScrollBar() {
this.wrapper.style.position = "relative";
this.wrapper.style.overflowX = "scroll";
this.wrapper.style.overflowY = "hidden";
this.wrapper.style.scrollbarGutter = "stable";

const mainLayer = this.getLayer("main") as Layer;
// The parent element scrolls natively, and the canvas is redrawn accordingly.
// To maintain its position during scrolling, the element must use "sticky" positioning.
mainLayer.canvas.style.position = "sticky";
mainLayer.canvas.style.top = "0";
mainLayer.canvas.style.left = "0";
mainLayer.canvas.style.zIndex = "2";
// Adds a scroll filler element to adjust the size of the scrollable area
this.scrollFiller = document.createElement("div");
this.scrollFiller.style.position = "absolute";
this.scrollFiller.style.width = "100%";
this.scrollFiller.style.height = `${BROWSER_SCROLLBAR_WIDTH}px`;
this.scrollFiller.style.top = "100%";
this.scrollFiller.style.minHeight = "1px";
mainLayer.canvas.style.zIndex = "1";
this.wrapper.appendChild(this.scrollFiller);
}

updateScrollFiller() {
const { fullWidth } = this;
this.scrollFiller.style.width = `${fullWidth}px`;
}

reserveSpace({ height }: { height: number }) {
this.reservedSpace = height;
}
Expand Down Expand Up @@ -792,6 +829,12 @@ export class Visualizer extends Events<VisualizerEvents> {
this.wrapper.addEventListener("click", this.handleSeek);
this.wrapper.addEventListener("mousedown", this.handleMouseDown);

this.wrapper.addEventListener("scroll", (e) => {
const scrollLeft = this.wrapper.scrollLeft / this.fullWidth;
this.wf.invoke("scroll", [scrollLeft]);
this._setScrollLeft(scrollLeft);
});

// Cursor events
this.on("mouseMove", this.playHeadMove);

Expand Down Expand Up @@ -850,6 +893,8 @@ export class Visualizer extends Events<VisualizerEvents> {
};

private handleSeek = (e: MouseEvent) => {
if (e.offsetY > this.height) return;

const mainLayer = this.getLayer("main");

if (!this.wf.loaded || this.seekLocked || !(e.target && mainLayer?.canvas?.contains(e.target))) return;
Expand All @@ -864,6 +909,7 @@ export class Visualizer extends Events<VisualizerEvents> {
};

private handleMouseDown = (e: MouseEvent) => {
if (e.offsetY > this.height) return;
if (!this.wf.loaded) return;
this.playhead.invoke("mouseDown", [e]);
};
Expand Down Expand Up @@ -938,7 +984,7 @@ export class Visualizer extends Events<VisualizerEvents> {
};

private setContainerHeight() {
this.container.style.height = `${this.height}px`;
this.container.style.height = `${this.height + BROWSER_SCROLLBAR_WIDTH}px`;
}

private updateSize() {
Expand All @@ -958,6 +1004,8 @@ export class Visualizer extends Events<VisualizerEvents> {
this.wf.renderTimeline();
this.resetWaveformRender();
this.draw(false, true);
this.updateScrollFiller();
this.setScrollLeft(this.scrollLeft);
});
};

Expand Down
8 changes: 8 additions & 0 deletions web/libs/frontend-test/src/helpers/LSF/AudioView.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import TriggerOptions = Cypress.TriggerOptions;
import ObjectLike = Cypress.ObjectLike;
import ClickOptions = Cypress.ClickOptions;
import { LabelStudio } from "@humansignal/frontend-test/helpers/LSF/LabelStudio";

type MouseInteractionOptions = Partial<TriggerOptions & ObjectLike & MouseEvent>;

Expand Down Expand Up @@ -36,7 +37,14 @@ export const AudioView = {
return this.root.get("loading-progress-bar", { timeout: 10000 });
},
isReady() {
LabelStudio.waitForObjectsReady();
this.loadingBar.should("not.exist");
/**
* There is a time gap between setting `isReady` to `true` and getting the last initial draw at the canvas,
* which for now we are going to compensate by waiting approximately 2 frames of render (16 * 2 = 32 milliseconds)
* @todo: remove wait when `isReady` in audio become more precise
*/
cy.wait(32);
},
get playButton() {
return cy.get(`[data-testid="playback-button:play"]`);
Expand Down
Loading