Unfloyded/Legamunt
0
0
Fork 0
Code Activity

fix(status): Content jump due to height changes (#3734)

Browse source
This commit is contained in:
Sorin Davidoi 2017-06-13 20:46:21 +02:00 • committed by Eugen Rochko
parent 85af2405cf
commit 0f52e42c2d
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/javascript/mastodon/components/status_content.js
View file

@ -15,6 +15,9 @@ class StatusContent extends React.PureComponent {
static propTypes = {
status: ImmutablePropTypes.map.isRequired,
expanded: PropTypes.bool,
onExpandedToggle: PropTypes.func,
onHeightUpdate: PropTypes.func,
onClick: PropTypes.func,
};
@ -44,6 +47,12 @@ class StatusContent extends React.PureComponent {
}
}
componentDidUpdate () {
if (this.props.onHeightUpdate) {
this.props.onHeightUpdate();
}
}
onMentionClick = (mention, e) => {
if (e.button === 0) {
e.preventDefault();
@ -85,7 +94,13 @@ class StatusContent extends React.PureComponent {
handleSpoilerClick = (e) => {
e.preventDefault();
this.setState({ hidden: !this.state.hidden });
if (this.props.onExpandedToggle) {
// The parent manages the state
this.props.onExpandedToggle();
} else {
this.setState({ hidden: !this.state.hidden });
}
}
setRef = (c) => {
@ -94,7 +109,8 @@ class StatusContent extends React.PureComponent {
render () {
const { status } = this.props;
const { hidden } = this.state;
const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
const content = { __html: emojify(status.get('content')) };
const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) };