cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872)

This commit is contained in:
ThibG 2019-05-29 16:33:15 +02:00 committed by Eugen Rochko
parent 32fc0777b1
commit 3333250ede
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ import classNames from 'classnames';
import Icon from 'mastodon/components/icon'; import Icon from 'mastodon/components/icon';
import PollContainer from 'mastodon/containers/poll_container'; import PollContainer from 'mastodon/containers/poll_container';
import { displayMedia } from '../initial_state'; import { displayMedia } from '../initial_state';
import { is } from 'immutable';
// We use the component (and not the container) since we do not want // We use the component (and not the container) since we do not want
// to use the progress bar to show download progress // to use the progress bar to show download progress
@ -101,6 +100,7 @@ class Status extends ImmutablePureComponent {
state = { state = {
showMedia: defaultMediaVisibility(this.props.status), showMedia: defaultMediaVisibility(this.props.status),
statusId: undefined,
}; };
// Track height changes we know about to compensate scrolling // Track height changes we know about to compensate scrolling
@ -116,9 +116,14 @@ class Status extends ImmutablePureComponent {
} }
} }
componentWillReceiveProps (nextProps) { static getDerivedStateFromProps(nextProps, prevState) {
if (!is(nextProps.status, this.props.status) && nextProps.status) { if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
this.setState({ showMedia: defaultMediaVisibility(nextProps.status) }); return {
showMedia: defaultMediaVisibility(nextProps.status),
statusId: nextProps.status.get('id'),
};
} else {
return null;
} }
} }

5
app/javascript/mastodon/features/status/index.js
View File

@ -132,6 +132,7 @@ class Status extends ImmutablePureComponent {
state = { state = {
fullscreen: false, fullscreen: false,
showMedia: defaultMediaVisibility(this.props.status), showMedia: defaultMediaVisibility(this.props.status),
loadedStatusId: undefined,
}; };
componentWillMount () { componentWillMount () {
@ -148,8 +149,8 @@ class Status extends ImmutablePureComponent {
this.props.dispatch(fetchStatus(nextProps.params.statusId)); this.props.dispatch(fetchStatus(nextProps.params.statusId));
} }
if (!Immutable.is(nextProps.status, this.props.status) && nextProps.status) { if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
this.setState({ showMedia: defaultMediaVisibility(nextProps.status) }); this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
} }
} }