cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Unobserve status on unmount (#3851)

This commit is contained in:
alpaca-tc 2017-06-19 18:29:57 +09:00 committed by Eugen Rochko
parent 4367443287
commit cf6fe4f8cb
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,16 @@ class Status extends ImmutablePureComponent {
);
}
componentWillUnmount () {
if (!this.props.intersectionObserverWrapper) {
// TODO: enable IntersectionObserver optimization for notification statuses.
// These are managed in notifications/index.js rather than status_list.js
return;
}
this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
}
handleIntersection = (entry) => {
// Edge 15 doesn't support isIntersecting, but we can infer it
// https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12156111/

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

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