diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-22 04:59:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-22 04:59:17 +0200 |
commit | 034fab39abe5f98e7a2caec861cf1c68c46747e8 (patch) | |
tree | 310af40174651ca179d5ba5a832035b4062d825f /app/javascript/mastodon/features/ui/components/actions_modal.js | |
parent | 0df6442636622bd41a89bedb313854d2a7d2998f (diff) |
Make dropdowns render into portal, expand animation (#5018)
* Make dropdowns render into portal, expand animation * Improve actions modal style
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/actions_modal.js')
-rw-r--r-- | app/javascript/mastodon/features/ui/components/actions_modal.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/ui/components/actions_modal.js b/app/javascript/mastodon/features/ui/components/actions_modal.js index 3d40033be..79a5a20ef 100644 --- a/app/javascript/mastodon/features/ui/components/actions_modal.js +++ b/app/javascript/mastodon/features/ui/components/actions_modal.js @@ -1,32 +1,35 @@ import React from 'react'; import PropTypes from 'prop-types'; +import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import StatusContent from '../../../components/status_content'; import Avatar from '../../../components/avatar'; import RelativeTimestamp from '../../../components/relative_timestamp'; import DisplayName from '../../../components/display_name'; import IconButton from '../../../components/icon_button'; +import classNames from 'classnames'; export default class ActionsModal extends ImmutablePureComponent { static propTypes = { + status: ImmutablePropTypes.map, actions: PropTypes.array, onClick: PropTypes.func, }; renderAction = (action, i) => { if (action === null) { - return <li key={`sep-${i}`} className='dropdown__sep' />; + return <li key={`sep-${i}`} className='dropdown-menu__separator' />; } const { icon = null, text, meta = null, active = false, href = '#' } = action; return ( <li key={`${text}-${i}`}> - <a href={href} target='_blank' rel='noopener' onClick={this.props.onClick} data-index={i} className={active && 'active'}> + <a href={href} target='_blank' rel='noopener' onClick={this.props.onClick} data-index={i} className={classNames({ active })}> {icon && <IconButton title={text} icon={icon} role='presentation' tabIndex='-1' />} <div> - <div>{text}</div> + <div className={classNames({ 'actions-modal__item-label': !!meta })}>{text}</div> <div>{meta}</div> </div> </a> |