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
24 changes: 24 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,27 @@ 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 width of the browser's scrollbar 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 scrollbar size.
*
* 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_SCROLL_SIZE = ((): 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";
document.body.appendChild(scrollDiv);
const scrollSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
document.body.removeChild(scrollDiv);
return scrollSize;
})();
50 changes: 44 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_SCROLL_SIZE, 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 @@ -638,18 +645,38 @@ export class Visualizer extends Events<VisualizerEvents> {

this.wrapper = document.createElement("div");
this.wrapper.style.height = "100%";
this.wrapper.style.position = "relative";
this.wrapper.style.overflow = "scroll hidden";

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);

mainLayer.canvas.style.position = "sticky";
mainLayer.canvas.style.top = "0";
mainLayer.canvas.style.left = "0";
mainLayer.canvas.style.zIndex = "2";
mainLayer?.appendTo(this.wrapper);

this.scrollFiller = document.createElement("div");
this.scrollFiller.style.position = "absolute";
this.scrollFiller.style.width = "100%";
this.scrollFiller.style.height = `${BROWSER_SCROLL_SIZE}px`;
this.scrollFiller.style.top = "100%";
this.wrapper.appendChild(this.scrollFiller);

container.appendChild(this.wrapper);
}

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

reserveSpace({ height }: { height: number }) {
this.reservedSpace = height;
}
Expand Down Expand Up @@ -792,6 +819,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 +883,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 +899,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 +974,7 @@ export class Visualizer extends Events<VisualizerEvents> {
};

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

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

Expand Down
Loading