]> cat aescling's git repositories - mastodon.git/commitdiff
Fix CW unfolding not triggering re-layout in public hashtag page
authorThibaut Girka <thib@sitedethib.com>
Wed, 6 Feb 2019 14:11:46 +0000 (15:11 +0100)
committerThibG <thib@sitedethib.com>
Wed, 6 Feb 2019 14:32:48 +0000 (15:32 +0100)
app/javascript/flavours/glitch/components/status_content.js
app/javascript/flavours/glitch/features/status/components/detailed_status.js

index 6542df65b27c963c17421836cff5ee4147e498b8..c60d63f9a125f26eff2a6bef9e888ac83480c12a 100644 (file)
@@ -17,6 +17,7 @@ export default class StatusContent extends React.PureComponent {
     mediaIcon: PropTypes.string,
     parseClick: PropTypes.func,
     disabled: PropTypes.bool,
+    onUpdate: PropTypes.func,
   };
 
   state = {
@@ -62,6 +63,7 @@ export default class StatusContent extends React.PureComponent {
 
   componentDidUpdate () {
     this._updateStatusLinks();
+    if (this.props.onUpdate) this.props.onUpdate();
   }
 
   onLinkClick = (e) => {
index a114e2158bfd2e13a0f0219fdfba6af9cfadf7f6..8f49a9a3017b8933ea33d736f36ff3c9c47a0980 100644 (file)
@@ -79,6 +79,10 @@ export default class DetailedStatus extends ImmutablePureComponent {
     this._measureHeight(prevState.height !== this.state.height);
   }
 
+  handleChildUpdate = () => {
+    this._measureHeight();
+  }
+
   handleModalLink = e => {
     e.preventDefault();
 
@@ -218,6 +222,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
             collapsed={false}
             onExpandedToggle={onToggleHidden}
             parseClick={this.parseClick}
+            onUpdate={this.handleChildUpdate}
           />
 
           <div className='detailed-status__meta'>