treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Unobserve status on unmount (#4013) 

This fixes a warning on status unmounting (e.g. deletion).

This also resets IntersectionObserverWrapper on disconnect to avoid `unobserve()` calls
which has bug in Edge.
lolsob-rspec
unarist 2017-07-07 04:26:21 +09:00 committed by Eugen Rochko
parent e35ae80e22
commit 1e71b683bc
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/status.js
View File

@ -90,6 +90,10 @@ export default class Status extends ImmutablePureComponent {
} }
componentWillUnmount () { componentWillUnmount () {
if (this.props.intersectionObserverWrapper) {
this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
}
this.componentMounted = false; this.componentMounted = false;
} }

9
app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
View File

@ -37,9 +37,18 @@ class IntersectionObserverWrapper {
} }
} }
unobserve (id, node) {
if (this.observer) {
delete this.callbacks[id];
this.observer.unobserve(node);
}
}
disconnect () { disconnect () {
if (this.observer) { if (this.observer) {
this.callbacks = {};
this.observer.disconnect(); this.observer.disconnect();
this.observer = null;
} }
} }