Skip to content

Commit 1c590a5

Browse files
committed
Fix “read more” button behing hidden (regression from mastodon#11404)
This has the side-effect of putting the “Read more” button below possibly trunctated polls instead of putting the poll below the “Read more”
1 parent f51c7c1 commit 1c590a5

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

app/javascript/mastodon/components/status_content.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,19 @@ export default class StatusContent extends React.PureComponent {
234234
</div>
235235
);
236236
} else if (this.props.onClick) {
237-
return (
237+
const output = [
238238
<div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
239239
<div className='status__content__text status__content__text--visible' style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />
240240

241-
{!!this.state.collapsed && readMoreButton}
242-
243241
{!!status.get('poll') && <PollContainer pollId={status.get('poll')} />}
244-
</div>
245-
);
242+
</div>,
243+
];
244+
245+
if (this.state.collapsed) {
246+
output.push(readMoreButton);
247+
}
248+
249+
return output;
246250
} else {
247251
return (
248252
<div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle}>

0 commit comments

Comments
 (0)