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/components/dropdown_menu.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/components/dropdown_menu.js')
-rw-r--r-- | app/javascript/mastodon/components/dropdown_menu.js | 247 |
1 files changed, 154 insertions, 93 deletions
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js index 28631f463..1cfa7b5a2 100644 --- a/app/javascript/mastodon/components/dropdown_menu.js +++ b/app/javascript/mastodon/components/dropdown_menu.js @@ -1,53 +1,55 @@ import React from 'react'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown'; import PropTypes from 'prop-types'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import IconButton from './icon_button'; +import { Overlay } from 'react-overlays'; +import { Motion, spring } from 'react-motion'; -export default class DropdownMenu extends React.PureComponent { +class DropdownMenu extends React.PureComponent { static contextTypes = { router: PropTypes.object, }; static propTypes = { - isUserTouching: PropTypes.func, - isModalOpen: PropTypes.bool.isRequired, - onModalOpen: PropTypes.func, - onModalClose: PropTypes.func, - icon: PropTypes.string.isRequired, items: PropTypes.array.isRequired, - size: PropTypes.number.isRequired, - direction: PropTypes.string, - status: ImmutablePropTypes.map, - ariaLabel: PropTypes.string, - disabled: PropTypes.bool, + onClose: PropTypes.func.isRequired, + style: PropTypes.object, + placement: PropTypes.string, + arrowOffsetLeft: PropTypes.string, + arrowOffsetTop: PropTypes.string, }; static defaultProps = { - ariaLabel: 'Menu', - isModalOpen: false, - isUserTouching: () => false, + style: {}, + placement: 'bottom', }; - state = { - direction: 'left', - expanded: false, - }; + handleDocumentClick = e => { + if (this.node && !this.node.contains(e.target)) { + this.props.onClose(); + } + } + + componentDidMount () { + document.addEventListener('click', this.handleDocumentClick, false); + document.addEventListener('touchend', this.handleDocumentClick, false); + } + + componentWillUnmount () { + document.removeEventListener('click', this.handleDocumentClick, false); + document.removeEventListener('touchend', this.handleDocumentClick, false); + } - setRef = (c) => { - this.dropdown = c; + setRef = c => { + this.node = c; } - handleClick = (e) => { + handleClick = e => { const i = Number(e.currentTarget.getAttribute('data-index')); const { action, to } = this.props.items[i]; - if (this.props.isModalOpen) { - this.props.onModalClose(); - } - - // Don't call e.preventDefault() when the item uses 'href' property. - // ex. "Edit profile" on the account action bar + this.props.onClose(); if (typeof action === 'function') { e.preventDefault(); @@ -56,90 +58,149 @@ export default class DropdownMenu extends React.PureComponent { e.preventDefault(); this.context.router.history.push(to); } + } + + renderItem (option, i) { + if (option === null) { + return <li key={`sep-${i}`} className='dropdown-menu__separator' />; + } + + const { text, href = '#' } = option; + + return ( + <li className='dropdown-menu__item' key={`${text}-${i}`}> + <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' autoFocus={i === 0} onClick={this.handleClick} data-index={i}> + {text} + </a> + </li> + ); + } + + render () { + const { items, style, placement, arrowOffsetLeft, arrowOffsetTop } = this.props; - this.dropdown.hide(); + return ( + <Motion defaultStyle={{ opacity: 0, scaleX: 0.85, scaleY: 0.75 }} style={{ opacity: spring(1, { damping: 35, stiffness: 400 }), scaleX: spring(1, { damping: 35, stiffness: 400 }), scaleY: spring(1, { damping: 35, stiffness: 400 }) }}> + {({ opacity, scaleX, scaleY }) => ( + <div className='dropdown-menu' style={{ ...style, opacity: opacity, transform: `scale(${scaleX}, ${scaleY})` }} ref={this.setRef}> + <div className={`dropdown-menu__arrow ${placement}`} style={{ left: arrowOffsetLeft, top: arrowOffsetTop }} /> + + <ul> + {items.map((option, i) => this.renderItem(option, i))} + </ul> + </div> + )} + </Motion> + ); } - handleShow = () => { - if (this.props.isUserTouching()) { +} + +export default class Dropdown extends React.PureComponent { + + static contextTypes = { + router: PropTypes.object, + }; + + static propTypes = { + icon: PropTypes.string.isRequired, + items: PropTypes.array.isRequired, + size: PropTypes.number.isRequired, + ariaLabel: PropTypes.string, + disabled: PropTypes.bool, + status: ImmutablePropTypes.map, + isUserTouching: PropTypes.func, + isModalOpen: PropTypes.bool.isRequired, + onModalOpen: PropTypes.func, + onModalClose: PropTypes.func, + }; + + static defaultProps = { + ariaLabel: 'Menu', + }; + + state = { + expanded: false, + }; + + handleClick = () => { + if (!this.state.expanded && this.props.isUserTouching() && this.props.onModalOpen) { + const { status, items } = this.props; + this.props.onModalOpen({ - status: this.props.status, - actions: this.props.items, - onClick: this.handleClick, + status, + actions: items, + onClick: this.handleItemClick, }); - } else { - this.setState({ expanded: true }); + + return; } + + this.setState({ expanded: !this.state.expanded }); } - handleHide = () => this.setState({ expanded: false }) - - handleToggle = (e) => { - if (e.key === 'Enter') { - if (this.props.isUserTouching()) { - this.handleShow(); - } else { - this.setState({ expanded: !this.state.expanded }); - } - } else if (e.key === 'Escape') { - this.setState({ expanded: false }); + handleClose = () => { + if (this.props.onModalClose) { + this.props.onModalClose(); } + + this.setState({ expanded: false }); } - renderItem = (item, i) => { - if (item === null) { - return <li key={`sep-${i}`} className='dropdown__sep' />; + handleKeyDown = e => { + switch(e.key) { + case 'Enter': + this.handleClick(); + break; + case 'Escape': + this.handleClose(); + break; } + } - const { text, href = '#' } = item; + handleItemClick = e => { + const i = Number(e.currentTarget.getAttribute('data-index')); + const { action, to } = this.props.items[i]; - return ( - <li className='dropdown__content-list-item' key={`${text}-${i}`}> - <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' autoFocus={i === 0} onClick={this.handleClick} data-index={i} className='dropdown__content-list-link'> - {text} - </a> - </li> - ); - } + this.handleClose(); - render () { - const { icon, items, size, direction, ariaLabel, disabled } = this.props; - const { expanded } = this.state; - const isUserTouching = this.props.isUserTouching(); - const directionClass = (direction === 'left') ? 'dropdown__left' : 'dropdown__right'; - const iconStyle = { fontSize: `${size}px`, width: `${size}px`, lineHeight: `${size}px` }; - const iconClassname = `fa fa-fw fa-${icon} dropdown__icon`; - - if (disabled) { - return ( - <div className='icon-button disabled' style={iconStyle} aria-label={ariaLabel}> - <i className={iconClassname} aria-hidden /> - </div> - ); + if (typeof action === 'function') { + e.preventDefault(); + action(); + } else if (to) { + e.preventDefault(); + this.context.router.history.push(to); } + } - const dropdownItems = expanded && ( - <ul role='group' className='dropdown__content-list' onClick={this.handleHide}> - {items.map(this.renderItem)} - </ul> - ); + setTargetRef = c => { + this.target = c; + } - // No need to render the actual dropdown if we use the modal. If we - // don't render anything <Dropdow /> breaks, so we just put an empty div. - const dropdownContent = !isUserTouching ? ( - <DropdownContent className={directionClass} > - {dropdownItems} - </DropdownContent> - ) : <div />; + findTarget = () => { + return this.target; + } - return ( - <Dropdown ref={this.setRef} active={isUserTouching ? false : expanded} onShow={this.handleShow} onHide={this.handleHide}> - <DropdownTrigger className='icon-button' style={iconStyle} role='button' aria-expanded={expanded} onKeyDown={this.handleToggle} tabIndex='0' aria-label={ariaLabel}> - <i className={iconClassname} aria-hidden /> - </DropdownTrigger> + render () { + const { icon, items, size, ariaLabel, disabled } = this.props; + const { expanded } = this.state; - {dropdownContent} - </Dropdown> + return ( + <div onKeyDown={this.handleKeyDown}> + <IconButton + icon={icon} + title={ariaLabel} + active={expanded} + disabled={disabled} + size={size} + ref={this.setTargetRef} + onClick={this.handleClick} + /> + + <Overlay show={expanded} placement='bottom' target={this.findTarget}> + <DropdownMenu items={items} onClose={this.handleClose} /> + </Overlay> + </div> ); } |