hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CW unfolding not triggering re-layout in public hashtag page

signup-info-prompt
Thibaut Girka 2019-02-06 15:11:46 +01:00 committed by ThibG
parent 3ce34ce7a2
commit 1a70fca168
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/status_content.js
View File

@ -17,6 +17,7 @@ export default class StatusContent extends React.PureComponent {
mediaIcon: PropTypes.string, mediaIcon: PropTypes.string,
parseClick: PropTypes.func, parseClick: PropTypes.func,
disabled: PropTypes.bool, disabled: PropTypes.bool,
onUpdate: PropTypes.func,
}; };
state = { state = {
@ -62,6 +63,7 @@ export default class StatusContent extends React.PureComponent {
componentDidUpdate () { componentDidUpdate () {
this._updateStatusLinks(); this._updateStatusLinks();
if (this.props.onUpdate) this.props.onUpdate();
} }
onLinkClick = (e) => { onLinkClick = (e) => {

5
app/javascript/flavours/glitch/features/status/components/detailed_status.js
View File

@ -79,6 +79,10 @@ export default class DetailedStatus extends ImmutablePureComponent {
this._measureHeight(prevState.height !== this.state.height); this._measureHeight(prevState.height !== this.state.height);
} }
handleChildUpdate = () => {
this._measureHeight();
}
handleModalLink = e => { handleModalLink = e => {
e.preventDefault(); e.preventDefault();
@ -218,6 +222,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
collapsed={false} collapsed={false}
onExpandedToggle={onToggleHidden} onExpandedToggle={onToggleHidden}
parseClick={this.parseClick} parseClick={this.parseClick}
onUpdate={this.handleChildUpdate}
/> />
<div className='detailed-status__meta'> <div className='detailed-status__meta'>