diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-22 11:26:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-22 11:26:14 +0100 |
commit | 43dbc6256854a9832c7255fc62a8fa8df7244dd6 (patch) | |
tree | 8a6d3dbb0ab1deaa2caae707baad43ea6cd8f6d3 /app/javascript/flavours/glitch/features/compose/components/options.js | |
parent | bdc61d467d704a0fff358e46d2bf7acba9c9269e (diff) |
Fix privacy dropdown in boost modal on mobile (#1967)
Fixes #1965
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/components/options.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/compose/components/options.js | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/components/options.js b/app/javascript/flavours/glitch/features/compose/components/options.js index c6278f4cb..b5276c371 100644 --- a/app/javascript/flavours/glitch/features/compose/components/options.js +++ b/app/javascript/flavours/glitch/features/compose/components/options.js @@ -10,8 +10,8 @@ import { connect } from 'react-redux'; // Components. import IconButton from 'flavours/glitch/components/icon_button'; import TextIconButton from './text_icon_button'; -import Dropdown from './dropdown'; -import PrivacyDropdown from './privacy_dropdown'; +import DropdownContainer from '../containers/dropdown_container'; +import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'; import LanguageDropdown from '../containers/language_dropdown_container'; import ImmutablePureComponent from 'react-immutable-pure-component'; @@ -126,15 +126,11 @@ class ComposerOptions extends ImmutablePureComponent { hasPoll: PropTypes.bool, intl: PropTypes.object.isRequired, onChangeAdvancedOption: PropTypes.func, - onChangeVisibility: PropTypes.func, onChangeContentType: PropTypes.func, onTogglePoll: PropTypes.func, onDoodleOpen: PropTypes.func, - onModalClose: PropTypes.func, - onModalOpen: PropTypes.func, onToggleSpoiler: PropTypes.func, onUpload: PropTypes.func, - privacy: PropTypes.string, contentType: PropTypes.string, resetFileKey: PropTypes.number, spoiler: PropTypes.bool, @@ -195,12 +191,8 @@ class ComposerOptions extends ImmutablePureComponent { hasPoll, onChangeAdvancedOption, onChangeContentType, - onChangeVisibility, onTogglePoll, - onModalClose, - onModalOpen, onToggleSpoiler, - privacy, resetFileKey, spoiler, showContentTypeChoice, @@ -239,7 +231,7 @@ class ComposerOptions extends ImmutablePureComponent { multiple style={{ display: 'none' }} /> - <Dropdown + <DropdownContainer disabled={disabled || !allowMedia} icon='paperclip' items={[ @@ -255,8 +247,6 @@ class ComposerOptions extends ImmutablePureComponent { }, ]} onChange={this.handleClickAttach} - onModalClose={onModalClose} - onModalOpen={onModalOpen} title={formatMessage(messages.attach)} /> {!!pollLimits && ( @@ -275,15 +265,9 @@ class ComposerOptions extends ImmutablePureComponent { /> )} <hr /> - <PrivacyDropdown - disabled={disabled || isEditing} - onChange={onChangeVisibility} - onModalClose={onModalClose} - onModalOpen={onModalOpen} - value={privacy} - /> + <PrivacyDropdownContainer disabled={disabled || isEditing} /> {showContentTypeChoice && ( - <Dropdown + <DropdownContainer disabled={disabled} icon={(contentTypeItems[contentType.split('/')[1]] || {}).icon} items={[ @@ -292,8 +276,6 @@ class ComposerOptions extends ImmutablePureComponent { contentTypeItems.markdown, ]} onChange={onChangeContentType} - onModalClose={onModalClose} - onModalOpen={onModalOpen} title={formatMessage(messages.content_type)} value={contentType} /> @@ -308,7 +290,7 @@ class ComposerOptions extends ImmutablePureComponent { /> )} <LanguageDropdown /> - <Dropdown + <DropdownContainer disabled={disabled || isEditing} icon='ellipsis-h' items={advancedOptions ? [ @@ -325,8 +307,6 @@ class ComposerOptions extends ImmutablePureComponent { ] : null} onChange={onChangeAdvancedOption} renderItemContents={this.renderToggleItemContents} - onModalClose={onModalClose} - onModalOpen={onModalOpen} title={formatMessage(messages.advanced_options_icon_title)} closeOnChange={false} /> |