mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Place dropdown menu top if it is closer to the bottom of the viewport (#6641)
This commit is contained in:
parent
4746feaa1c
commit
f6a8d835d3
@ -29,6 +29,10 @@ class DropdownMenu extends React.PureComponent {
|
|||||||
placement: 'bottom',
|
placement: 'bottom',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
state = {
|
||||||
|
mounted: false,
|
||||||
|
};
|
||||||
|
|
||||||
handleDocumentClick = e => {
|
handleDocumentClick = e => {
|
||||||
if (this.node && !this.node.contains(e.target)) {
|
if (this.node && !this.node.contains(e.target)) {
|
||||||
this.props.onClose();
|
this.props.onClose();
|
||||||
@ -38,6 +42,7 @@ class DropdownMenu extends React.PureComponent {
|
|||||||
componentDidMount () {
|
componentDidMount () {
|
||||||
document.addEventListener('click', this.handleDocumentClick, false);
|
document.addEventListener('click', this.handleDocumentClick, false);
|
||||||
document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
|
document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
|
||||||
|
this.setState({ mounted: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount () {
|
componentWillUnmount () {
|
||||||
@ -82,11 +87,15 @@ class DropdownMenu extends React.PureComponent {
|
|||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { items, style, placement, arrowOffsetLeft, arrowOffsetTop } = this.props;
|
const { items, style, placement, arrowOffsetLeft, arrowOffsetTop } = this.props;
|
||||||
|
const { mounted } = this.state;
|
||||||
|
|
||||||
return (
|
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 }) }}>
|
<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 }) => (
|
{({ opacity, scaleX, scaleY }) => (
|
||||||
<div className='dropdown-menu' style={{ ...style, opacity: opacity, transform: `scale(${scaleX}, ${scaleY})` }} ref={this.setRef}>
|
// 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='dropdown-menu' style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} ref={this.setRef}>
|
||||||
<div className={`dropdown-menu__arrow ${placement}`} style={{ left: arrowOffsetLeft, top: arrowOffsetTop }} />
|
<div className={`dropdown-menu__arrow ${placement}`} style={{ left: arrowOffsetLeft, top: arrowOffsetTop }} />
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
@ -124,11 +133,13 @@ export default class Dropdown extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
state = {
|
state = {
|
||||||
expanded: false,
|
placement: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
handleClick = () => {
|
handleClick = ({ target }) => {
|
||||||
if (!this.state.expanded && this.props.isUserTouching() && this.props.onModalOpen) {
|
if (this.state.placement) {
|
||||||
|
this.setState({ placement: null });
|
||||||
|
} else if (this.props.isUserTouching() && this.props.onModalOpen) {
|
||||||
const { status, items } = this.props;
|
const { status, items } = this.props;
|
||||||
|
|
||||||
this.props.onModalOpen({
|
this.props.onModalOpen({
|
||||||
@ -136,11 +147,10 @@ export default class Dropdown extends React.PureComponent {
|
|||||||
actions: items,
|
actions: items,
|
||||||
onClick: this.handleItemClick,
|
onClick: this.handleItemClick,
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
return;
|
const { top } = target.getBoundingClientRect();
|
||||||
|
this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' });
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setState({ expanded: !this.state.expanded });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
handleClose = () => {
|
handleClose = () => {
|
||||||
@ -148,7 +158,7 @@ export default class Dropdown extends React.PureComponent {
|
|||||||
this.props.onModalClose();
|
this.props.onModalClose();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setState({ expanded: false });
|
this.setState({ placement: null });
|
||||||
}
|
}
|
||||||
|
|
||||||
handleKeyDown = e => {
|
handleKeyDown = e => {
|
||||||
@ -187,21 +197,22 @@ export default class Dropdown extends React.PureComponent {
|
|||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { icon, items, size, title, disabled } = this.props;
|
const { icon, items, size, title, disabled } = this.props;
|
||||||
const { expanded } = this.state;
|
const { placement } = this.state;
|
||||||
|
const show = placement !== null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div onKeyDown={this.handleKeyDown}>
|
<div onKeyDown={this.handleKeyDown}>
|
||||||
<IconButton
|
<IconButton
|
||||||
icon={icon}
|
icon={icon}
|
||||||
title={title}
|
title={title}
|
||||||
active={expanded}
|
active={show}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
size={size}
|
size={size}
|
||||||
ref={this.setTargetRef}
|
ref={this.setTargetRef}
|
||||||
onClick={this.handleClick}
|
onClick={this.handleClick}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Overlay show={expanded} placement='bottom' target={this.findTarget}>
|
<Overlay show={show} placement={placement} target={this.findTarget}>
|
||||||
<DropdownMenu items={items} onClose={this.handleClose} />
|
<DropdownMenu items={items} onClose={this.handleClose} />
|
||||||
</Overlay>
|
</Overlay>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user