diff options
Diffstat (limited to 'app/javascript/flavours/glitch/components')
3 files changed, 28 insertions, 15 deletions
diff --git a/app/javascript/flavours/glitch/components/column_header.js b/app/javascript/flavours/glitch/components/column_header.js index cd977c4ca..bfad6467d 100644 --- a/app/javascript/flavours/glitch/components/column_header.js +++ b/app/javascript/flavours/glitch/components/column_header.js @@ -23,11 +23,12 @@ export default class ColumnHeader extends React.PureComponent { static propTypes = { intl: PropTypes.object.isRequired, - title: PropTypes.node.isRequired, - icon: PropTypes.string.isRequired, + title: PropTypes.node, + icon: PropTypes.string, active: PropTypes.bool, localSettings : ImmutablePropTypes.map, multiColumn: PropTypes.bool, + extraButton: PropTypes.node, showBackButton: PropTypes.bool, notifCleaning: PropTypes.bool, // true only for the notification column notifCleaningActive: PropTypes.bool, @@ -86,7 +87,7 @@ export default class ColumnHeader extends React.PureComponent { } render () { - const { intl, icon, active, children, pinned, onPin, multiColumn, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props; + const { intl, icon, active, children, pinned, onPin, multiColumn, extraButton, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props; const { collapsed, animating, animatingNCD } = this.state; let title = this.props.title; @@ -162,18 +163,26 @@ export default class ColumnHeader extends React.PureComponent { } if (children || multiColumn) { - collapseButton = <button className={collapsibleButtonClassName} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>; + collapseButton = <button className={collapsibleButtonClassName} title={formatMessage(collapsed ? messages.show : messages.hide)} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>; } + const hasTitle = icon && title; + return ( <div className={wrapperClassName}> <h1 className={buttonClassName}> - <button onClick={this.handleTitleClick}> - <i className={`fa fa-fw fa-${icon} column-header__icon`} /> - {title} - </button> + {hasTitle && ( + <button onClick={this.handleTitleClick}> + <i className={`fa fa-fw fa-${icon} column-header__icon`} /> + {title} + </button> + )} + + {!hasTitle && backButton} + <div className='column-header__buttons'> - {backButton} + {hasTitle && backButton} + {extraButton} { notifCleaning ? ( <button aria-label={msgEnterNotifCleaning} diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index 2c011bb2a..0ea959895 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -47,10 +47,11 @@ export default class Status extends ImmutablePureComponent { onMoveDown: PropTypes.func, getScrollPosition: PropTypes.func, updateScrollBottom: PropTypes.func, + expanded: PropTypes.bool, }; state = { - isExpanded: false, + isExpanded: this.props.expanded, isCollapsed: false, autoCollapsed: false, } @@ -92,6 +93,9 @@ export default class Status extends ImmutablePureComponent { nextProps.collapse !== this.props.collapse && nextProps.collapse !== undefined ) this.setCollapsed(nextProps.collapse); + if (nextProps.expanded !== this.props.expanded && + nextProps.expanded !== undefined + ) this.setExpansion(nextProps.expanded); } // When mounting, we just check to see if our status should be collapsed, @@ -465,7 +469,7 @@ export default class Status extends ImmutablePureComponent { media={media} mediaIcon={mediaIcon} expanded={isExpanded} - setExpansion={setExpansion} + onExpandedToggle={this.handleExpandedToggle} parseClick={parseClick} disabled={!router} /> diff --git a/app/javascript/flavours/glitch/components/status_content.js b/app/javascript/flavours/glitch/components/status_content.js index 26d5b7c0f..32b0770cb 100644 --- a/app/javascript/flavours/glitch/components/status_content.js +++ b/app/javascript/flavours/glitch/components/status_content.js @@ -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') }; |