]> cat aescling's git repositories - mastodon.git/commitdiff
Fix emoji-button appearing above privacy-dropdown (#11027)
authormayaeh <mayaeh@marimo-net.org>
Mon, 10 Jun 2019 10:27:17 +0000 (19:27 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 10 Jun 2019 10:27:17 +0000 (12:27 +0200)
app/javascript/mastodon/features/compose/components/privacy_dropdown.js

index 3288f81f8268193ad863c97bbfe7ea101c08a9c9..d02a55be00e4cd80de028b249fc86fd3a4920acb 100644 (file)
@@ -129,7 +129,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
           // It should not be transformed when mounting because the resulting
           // size will be used to determine the coordinate of the menu by
           // react-overlays
-          <div className={`privacy-dropdown__dropdown ${placement}`} style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} role='listbox' ref={this.setRef}>
+          <div className={`privacy-dropdown__dropdown ${placement}`} style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null, zIndex: 2 }} role='listbox' ref={this.setRef}>
             {items.map(item => (
               <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
                 <div className='privacy-dropdown__option__icon'>