|
|
|
@ -83,7 +83,6 @@ const mapStateToProps = state => ({
|
|
|
|
|
hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
|
|
|
|
|
canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
|
|
|
|
|
isWide: state.getIn(['local_settings', 'stretch']),
|
|
|
|
|
dropdownMenuIsOpen: state.dropdownMenu.openId !== null,
|
|
|
|
|
unreadNotifications: state.getIn(['notifications', 'unread']),
|
|
|
|
|
showFaviconBadge: state.getIn(['local_settings', 'notifications', 'favicon_badge']),
|
|
|
|
|
hicolorPrivacyIcons: state.getIn(['local_settings', 'hicolor_privacy_icons']),
|
|
|
|
@ -274,7 +273,6 @@ class UI extends PureComponent {
|
|
|
|
|
hasMediaAttachments: PropTypes.bool,
|
|
|
|
|
canUploadMore: PropTypes.bool,
|
|
|
|
|
intl: PropTypes.object.isRequired,
|
|
|
|
|
dropdownMenuIsOpen: PropTypes.bool,
|
|
|
|
|
unreadNotifications: PropTypes.number,
|
|
|
|
|
showFaviconBadge: PropTypes.bool,
|
|
|
|
|
hicolorPrivacyIcons: PropTypes.bool,
|
|
|
|
@ -600,7 +598,7 @@ class UI extends PureComponent {
|
|
|
|
|
|
|
|
|
|
render () {
|
|
|
|
|
const { draggingOver } = this.state;
|
|
|
|
|
const { children, isWide, location, dropdownMenuIsOpen, layout, moved } = this.props;
|
|
|
|
|
const { children, isWide, location, layout, moved } = this.props;
|
|
|
|
|
|
|
|
|
|
const className = classNames('ui', {
|
|
|
|
|
'wide': isWide,
|
|
|
|
@ -632,7 +630,7 @@ class UI extends PureComponent {
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
|
|
|
|
|
<div className={className} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
|
|
|
|
|
<div className={className} ref={this.setRef}>
|
|
|
|
|
{moved && (<div className='flash-message alert'>
|
|
|
|
|
<FormattedMessage
|
|
|
|
|
id='moved_to_warning'
|
|
|
|
|