tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add show more/less toggle for entire threads in web UI

Browse Source 
Inspired from b6003afcdb but using component
properties instead of redux store for hidden/revealed state.
This commit is contained in:
Thibaut Girka
2018-03-28 19:56:46 +02:00
parent 2888f74c12
commit 64d8d0464d
6 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ export default class StatusContent extends React.PureComponent {
status: ImmutablePropTypes.map.isRequired,
expanded: PropTypes.bool,
collapsed: PropTypes.bool,
setExpansion: PropTypes.func,
onExpandedToggle: PropTypes.func,
media: PropTypes.element,
mediaIcon: PropTypes.string,
parseClick: PropTypes.func,
@@ -112,8 +112,8 @@ export default class StatusContent extends React.PureComponent {
handleSpoilerClick = (e) => {
e.preventDefault();
if (this.props.setExpansion) {
this.props.setExpansion(!this.props.expanded);
if (this.props.onExpandedToggle) {
this.props.onExpandedToggle();
} else {
this.setState({ hidden: !this.state.hidden });
}
@@ -132,7 +132,7 @@ export default class StatusContent extends React.PureComponent {
disabled,
} = this.props;
const hidden = this.props.setExpansion ? !this.props.expanded : this.state.hidden;
const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
const content = { __html: status.get('contentHtml') };
const spoilerContent = { __html: status.get('spoilerHtml') };