From 5bfd802c571a2793bb59ba4540407a6147e82f88 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 6 Jun 2019 13:04:49 +0200 Subject: [PATCH] Fix not being able to directly switch between list timelines in web UI (#10973) --- .../mastodon/features/list_timeline/index.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js index b6722e91a76..ad7d16f95ce 100644 --- a/app/javascript/mastodon/features/list_timeline/index.js +++ b/app/javascript/mastodon/features/list_timeline/index.js @@ -75,6 +75,23 @@ class ListTimeline extends React.PureComponent { this.disconnect = dispatch(connectListStream(id)); } + componentWillReceiveProps (nextProps) { + const { dispatch } = this.props; + const { id } = nextProps.params; + + if (id !== this.props.params.id) { + if (this.disconnect) { + this.disconnect(); + this.disconnect = null; + } + + dispatch(fetchList(id)); + dispatch(expandListTimeline(id)); + + this.disconnect = dispatch(connectListStream(id)); + } + } + componentWillUnmount () { if (this.disconnect) { this.disconnect();