Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-24 02:27:37 +00:00
Code Issues Projects Releases Wiki Activity

Add the notion of disposable

Browse source
This commit is contained in:
Jordan Eldredge 2018-12-01 13:11:48 -08:00
parent b637e32c5d
commit 301d1eb8a8
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/WebampComponent.js
View file

@ -2,9 +2,22 @@ import React from "react";
import { connect } from "react-redux";
import * as ActionCreators from "./redux/actionCreators";
class Disposable {
_subscriptions = [];
add(subscription) {
this._subscriptions.push(subscription);
}
dispose() {
this._subscriptions.forEach(subscription => {
subscription();
});
}
}
class WebampComponent extends React.Component {
constructor(props) {
super(props);
this._disposable = new Disposable();
}
componentDidMount() {
this._loadWebamp();
@ -12,9 +25,8 @@ class WebampComponent extends React.Component {
componentWillUnmount() {
this._unmounted = true;
if (this._renderTimeout) {
clearTimeout(this._renderTimeout);
}
this._disposable.dispose();
if (this._webamp) {
// TODO: Repace this with this._webamp.destroy() once we upgrade.
const close = document.querySelector("#webamp #close");
@ -47,15 +59,17 @@ class WebampComponent extends React.Component {
zIndex: 1001
});
// TODO: Technically we should unsubscribe this on unmount
this._webamp.onClose(this.props.closeModal);
this._disposable.add(this._webamp.onClose(this.props.closeModal));
this._renderTimeout = setTimeout(async () => {
const renderTimeout = setTimeout(async () => {
await this._webamp.renderWhenReady(this._ref);
if (!this._unmounted) {
this.props.loaded();
}
}, 500);
this._disposable.add(() => {
clearTimeout(renderTimeout);
});
}
render() {