diff options
author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-12-29 16:32:13 -0800 |
---|---|---|
committer | kibigo! <marrus-sh@users.noreply.github.com> | 2018-01-04 18:31:00 -0800 |
commit | b4a3792201ccc01713b536e50428e027bd094d2b (patch) | |
tree | c50f35c467d2f4a9bfa3c4bd0265b33f404ce96c /app/javascript/flavours/glitch/features/composer/options/dropdown | |
parent | 083170bec755920b80c64f9cca2cc419831f66c8 (diff) |
WIP <Compose> Refactor; <ActionsModal>; dropdowns
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer/options/dropdown')
-rw-r--r-- | app/javascript/flavours/glitch/features/composer/options/dropdown/index.js | 7 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/composer/options/dropdown/item/index.js | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/options/dropdown/index.js b/app/javascript/flavours/glitch/features/composer/options/dropdown/index.js index ee52008a7..daed4ec8a 100644 --- a/app/javascript/flavours/glitch/features/composer/options/dropdown/index.js +++ b/app/javascript/flavours/glitch/features/composer/options/dropdown/index.js @@ -80,11 +80,16 @@ const handlers = { }) => ({ ...rest, active: value && name === value, + name, onClick (e) { e.preventDefault(); // Prevents focus from changing onModalClose(); onChange(name); }, + onPassiveClick (e) { + e.preventDefault(); // Prevents focus from changing + onChange(name); + }, }) ), }); @@ -191,7 +196,7 @@ export default class ComposerOptionsDropdown extends React.PureComponent { > {({ opacity, scaleX, scaleY }) => ( <div - className='dropdown' + className='composer--options--dropdown__dropdown' ref={this.setRef} style={{ opacity: opacity, diff --git a/app/javascript/flavours/glitch/features/composer/options/dropdown/item/index.js b/app/javascript/flavours/glitch/features/composer/options/dropdown/item/index.js index ca4ee393e..e9047dc50 100644 --- a/app/javascript/flavours/glitch/features/composer/options/dropdown/item/index.js +++ b/app/javascript/flavours/glitch/features/composer/options/dropdown/item/index.js @@ -91,6 +91,7 @@ export default class ComposerOptionsDropdownItem extends React.PureComponent { case !!icon: return ( <Icon + className='icon' fullwidth icon={icon} /> @@ -100,11 +101,11 @@ export default class ComposerOptionsDropdownItem extends React.PureComponent { } }()} {meta ? ( - <div> + <div className='content'> <strong>{text}</strong> {meta} </div> - ) : <div>{text}</div>} + ) : <div className='content'>{text}</div>} </div> ); } |