mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 07:05:11 +01:00
[Glitch] Fix occasional crash in detailed toot view
Port f9a338b473
to glitch-soc
This commit is contained in:
parent
435a367c10
commit
2769b54466
@ -217,7 +217,7 @@ export default class Status extends ImmutablePureComponent {
|
|||||||
this.setState({ autoCollapsed: true });
|
this.setState({ autoCollapsed: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
this.didShowCard = !this.props.muted && !this.props.hidden && this.props.status.get('card') && this.props.settings.get('inline_preview_cards');
|
this.didShowCard = !this.props.muted && !this.props.hidden && this.props.status && this.props.status.get('card') && this.props.settings.get('inline_preview_cards');
|
||||||
}
|
}
|
||||||
|
|
||||||
getSnapshotBeforeUpdate (prevProps, prevState) {
|
getSnapshotBeforeUpdate (prevProps, prevState) {
|
||||||
@ -230,7 +230,7 @@ export default class Status extends ImmutablePureComponent {
|
|||||||
|
|
||||||
// Hack to fix timeline jumps on second rendering when auto-collapsing
|
// Hack to fix timeline jumps on second rendering when auto-collapsing
|
||||||
componentDidUpdate (prevProps, prevState, snapshot) {
|
componentDidUpdate (prevProps, prevState, snapshot) {
|
||||||
const doShowCard = !this.props.muted && !this.props.hidden && this.props.status.get('card') && this.props.settings.get('inline_preview_cards');
|
const doShowCard = !this.props.muted && !this.props.hidden && this.props.status && this.props.status.get('card') && this.props.settings.get('inline_preview_cards');
|
||||||
if (this.state.autoCollapsed || (doShowCard && !this.didShowCard)) {
|
if (this.state.autoCollapsed || (doShowCard && !this.didShowCard)) {
|
||||||
if (doShowCard) this.didShowCard = true;
|
if (doShowCard) this.didShowCard = true;
|
||||||
if (this.state.autoCollapsed) this.setState({ autoCollapsed: false });
|
if (this.state.autoCollapsed) this.setState({ autoCollapsed: false });
|
||||||
|
Loading…
Reference in New Issue
Block a user