Skip to content

fix: use Ref instead of querrySelector follow up #1136 #1140

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
bajrangCoder merged 1 commit into from
Jan 9, 2025
Merged

fix: use Ref instead of querrySelector follow up #1136 #1140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
104 changes: 62 additions & 42 deletions src/components/audioPlayer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,80 @@
import "./style.scss";
import Ref from "html-tag-js/ref";

export default class AudioPlayer {
constructor(container) {
this.container = container;
this.audio = new Audio();
this.isPlaying = false;
this.elements = {
playBtn: new Ref(),
playIcon: new Ref(),
timeline: new Ref(),
progress: new Ref(),
progressHandle: new Ref(),
timeDisplay: new Ref(),
duration: new Ref(),
volumeBtn: new Ref(),
};
this.initializeUI();
this.initializeEvents();
this.cleanup = this.cleanup.bind(this);
}

initializeUI() {
const auidoPlayer = (
const audioPlayer = (
<div className="audio-player">
<button className="play-btn" ariaLabel="Play/Pause">
<span className="icon play_arrow"></span>
<button
ref={this.elements.playBtn}
className="play-btn"
ariaLabel="Play/Pause"
>
<span ref={this.elements.playIcon} className="icon play_arrow"></span>
</button>

<div className="timeline">
<div className="progress"></div>
<div className="progress-handle"></div>
<div ref={this.elements.timeline} className="timeline">
<div ref={this.elements.progress} className="progress"></div>
<div
ref={this.elements.progressHandle}
className="progress-handle"
></div>
</div>

<div className="time">0:00</div>
<div ref={this.elements.timeDisplay} className="time">
0:00
</div>

<div className="volume-control">
<button className="volume-btn" ariaLabel="Volume"></button>
<button
ref={this.elements.volumeBtn}
className="volume-btn"
ariaLabel="Volume"
></button>
</div>
</div>
);

this.container.appendChild(auidoPlayer);
this.container.appendChild(audioPlayer);

this.elements = {
playBtn: this.container.querySelector(".play-btn"),
playIcon: this.container.querySelector(".play-btn .icon"),
timeline: this.container.querySelector(".timeline"),
progress: this.container.querySelector(".progress"),
progressHandle: this.container.querySelector(".progress-handle"),
timeDisplay: this.container.querySelector(".time"),
duration: this.container.querySelector(".duration"),
volumeBtn: this.container.querySelector(".volume-btn"),
};
this.elements.volumeBtn.innerHTML = `<svg viewBox="0 0 24 24">
<path d="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02z"/>
</svg>`;
this.elements.volumeBtn.el.innerHTML = `<svg viewBox="0 0 24 24">
<path d="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02z"/>
</svg>`;
}

initializeEvents() {
// Play/Pause
this.elements.playBtn.addEventListener("click", () => this.togglePlay());
this.elements.playBtn.el.addEventListener("click", () => this.togglePlay());

// Timeline
this.elements.timeline.addEventListener("click", (e) => this.seek(e));
this.elements.timeline.addEventListener("touchstart", (e) => this.seek(e));
this.elements.timeline.el.addEventListener("click", (e) => this.seek(e));
this.elements.timeline.el.addEventListener("touchstart", (e) =>
this.seek(e),
);

// Volume
this.elements.volumeBtn.addEventListener("click", () => this.toggleMute());
this.elements.volumeBtn.el.addEventListener("click", () =>
this.toggleMute(),
);

// Audio events
this.audio.addEventListener("timeupdate", () => this.updateProgress());
Expand All @@ -66,18 +84,18 @@ export default class AudioPlayer {
togglePlay() {
if (this.isPlaying) {
this.audio.pause();
this.elements.playIcon.classList.remove("pause");
this.elements.playIcon.classList.add("play_arrow");
this.elements.playIcon.el.classList.remove("pause");
this.elements.playIcon.el.classList.add("play_arrow");
} else {
this.audio.play();
this.elements.playIcon.classList.remove("play_arrow");
this.elements.playIcon.classList.add("pause");
this.elements.playIcon.el.classList.remove("play_arrow");
this.elements.playIcon.el.classList.add("pause");
}
this.isPlaying = !this.isPlaying;
}

seek(e) {
const rect = this.elements.timeline.getBoundingClientRect();
const rect = this.elements.timeline.el.getBoundingClientRect();
const pos =
(e.type.includes("touch") ? e.touches[0].clientX : e.clientX) - rect.left;
const percentage = pos / rect.width;
Expand All @@ -86,9 +104,9 @@ export default class AudioPlayer {

updateProgress() {
const percentage = (this.audio.currentTime / this.audio.duration) * 100;
this.elements.progress.style.width = `${percentage}%`;
this.elements.progressHandle.style.left = `${percentage}%`;
this.elements.timeDisplay.textContent = this.formatTime(
this.elements.progress.el.style.width = `${percentage}%`;
this.elements.progressHandle.el.style.left = `${percentage}%`;
this.elements.timeDisplay.el.textContent = this.formatTime(
this.audio.currentTime,
);
}
Expand All @@ -102,18 +120,18 @@ export default class AudioPlayer {
toggleMute() {
this.audio.muted = !this.audio.muted;
if (this.audio.muted) {
this.elements.volumeBtn.innerHTML =
this.elements.volumeBtn.el.innerHTML =
'<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4.702a.705.705 0 0 0-1.203-.498L6.413 7.587A1.4 1.4 0 0 1 5.416 8H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h2.416a1.4 1.4 0 0 1 .997.413l3.383 3.384A.705.705 0 0 0 11 19.298z"/></svg>';
} else {
this.elements.volumeBtn.innerHTML =
this.elements.volumeBtn.el.innerHTML =
'<svg viewBox="0 0 24 24"><path d="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02z"/></svg>';
}
}

audioEnded() {
this.isPlaying = false;
this.elements.playIcon.classList.remove("pause");
this.elements.playIcon.classList.add("play_arrow");
this.elements.playIcon.el.classList.remove("pause");
this.elements.playIcon.el.classList.add("play_arrow");
}

loadTrack(src) {
Expand All @@ -126,12 +144,14 @@ export default class AudioPlayer {
this.audio.currentTime = 0;
this.isPlaying = false;

this.elements.playBtn.removeEventListener("click", () => this.togglePlay());
this.elements.timeline.removeEventListener("click", (e) => this.seek(e));
this.elements.timeline.removeEventListener("touchstart", (e) =>
this.elements.playBtn.el.removeEventListener("click", () =>
this.togglePlay(),
);
this.elements.timeline.el.removeEventListener("click", (e) => this.seek(e));
this.elements.timeline.el.removeEventListener("touchstart", (e) =>
this.seek(e),
);
this.elements.volumeBtn.removeEventListener("click", () =>
this.elements.volumeBtn.el.removeEventListener("click", () =>
this.toggleMute(),
);
this.audio.removeEventListener("timeupdate", () => this.updateProgress());
Expand Down
Loading