mirror of
https://github.com/funamitech/mastodon
synced 2024-11-30 07:49:04 +09:00
[Glitch] Deep compare tags for hashtag column reload
Port 4fdefffb99
to glitch-soc
This commit is contained in:
parent
4be7313298
commit
3611ea02e2
@ -9,6 +9,7 @@ import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/ti
|
||||
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import { connectHashtagStream } from 'flavours/glitch/actions/streaming';
|
||||
import { isEqual } from 'lodash';
|
||||
|
||||
const mapStateToProps = (state, props) => ({
|
||||
hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0,
|
||||
@ -99,7 +100,7 @@ export default class HashtagTimeline extends React.PureComponent {
|
||||
componentWillReceiveProps (nextProps) {
|
||||
const { dispatch, params } = this.props;
|
||||
const { id, tags } = nextProps.params;
|
||||
if (id !== params.id || tags !== params.tags) {
|
||||
if (id !== params.id || !isEqual(tags, params.tags)) {
|
||||
this._unsubscribe();
|
||||
this._subscribe(dispatch, id, tags);
|
||||
this.props.dispatch(clearTimeline(`hashtag:${id}`));
|
||||
|
Loading…
Reference in New Issue
Block a user