fix: Ensure menus are always kept on the screen (#1036)

* ensuring dropdowns fit on the screen

* refactoring

* fix flow types

* no longer fixing the elements which should resolve scrolling issues

* fix menus that should be fixed

* styled-components syntax was wrong

* account for fixed dropdowns when handling overflowing menus

* Update app/components/DropdownMenu/DropdownMenu.js

Co-Authored-By: Tom Moor <tom.moor@gmail.com>
This commit is contained in:
Mateusz Sapielak 2019-10-13 04:21:48 +01:00 committed by Tom Moor
parent 00d5b58850
commit 8ea1323a7c
4 changed files with 92 additions and 20 deletions

View File

@ -28,9 +28,15 @@ type Props = {
@observer
class DropdownMenu extends React.Component<Props> {
@observable top: number;
@observable right: number;
@observable left: number;
@observable top: ?number;
@observable bottom: ?number;
@observable right: ?number;
@observable left: ?number;
@observable position: 'left' | 'right' | 'center';
@observable fixed: ?boolean;
@observable bodyRect: ClientRect;
@observable labelRect: ClientRect;
@observable dropdownRef: { current: null | HTMLElement } = React.createRef();
handleOpen = (
openPortal: (SyntheticEvent<>) => void,
@ -42,18 +48,25 @@ class DropdownMenu extends React.Component<Props> {
invariant(document.body, 'why you not here');
if (currentTarget instanceof HTMLDivElement) {
const bodyRect = document.body.getBoundingClientRect();
const targetRect = currentTarget.getBoundingClientRect();
this.top = targetRect.bottom - bodyRect.top;
this.bodyRect = document.body.getBoundingClientRect();
this.labelRect = currentTarget.getBoundingClientRect();
this.top = this.labelRect.bottom - this.bodyRect.top;
this.bottom = undefined;
this.position = this.props.position || 'left';
if (this.props.position === 'left') {
this.left = targetRect.left;
} else if (this.props.position === 'center') {
this.left = targetRect.left + targetRect.width / 2;
} else {
this.right = bodyRect.width - targetRect.left - targetRect.width;
if (currentTarget.parentElement) {
const triggerParentStyle = getComputedStyle(
currentTarget.parentElement
);
if (triggerParentStyle.position === 'static') {
this.fixed = true;
this.top = this.labelRect.bottom;
}
}
this.initPosition();
// attempt to keep only one flyout menu open at once
if (previousClosePortal) {
previousClosePortal();
@ -64,13 +77,65 @@ class DropdownMenu extends React.Component<Props> {
};
};
initPosition() {
if (this.position === 'left') {
this.right =
this.bodyRect.width - this.labelRect.left - this.labelRect.width;
} else if (this.position === 'center') {
this.left = this.labelRect.left + this.labelRect.width / 2;
} else {
this.left = this.labelRect.left;
}
}
onOpen(originalFunction?: () => void) {
if (typeof originalFunction === 'function') {
originalFunction();
}
this.fitOnTheScreen();
}
fitOnTheScreen() {
if (!this.dropdownRef || !this.dropdownRef.current) return;
const el = this.dropdownRef.current;
const sticksOutPastBottomEdge =
el.clientHeight + this.top > window.innerHeight;
if (sticksOutPastBottomEdge) {
this.top = undefined;
this.bottom = this.fixed ? 0 : -1 * window.pageYOffset;
} else {
this.bottom = undefined;
}
if (this.position === 'left' || this.position === 'right') {
const totalWidth =
Math.sign(this.position === 'left' ? -1 : 1) * el.offsetLeft +
el.scrollWidth;
const isVisible = totalWidth < window.innerWidth;
if (!isVisible) {
if (this.position === 'right') {
this.position = 'left';
this.left = undefined;
} else if (this.position === 'left') {
this.position = 'right';
this.right = undefined;
}
}
}
this.initPosition();
this.forceUpdate();
}
render() {
const { className, label, position, children } = this.props;
const { className, label, children } = this.props;
return (
<div className={className}>
<PortalWithState
onOpen={this.props.onOpen}
onOpen={this.onOpen.bind(this, this.props.onOpen)}
onClose={this.props.onClose}
closeOnOutsideClick
closeOnEsc
@ -86,8 +151,11 @@ class DropdownMenu extends React.Component<Props> {
</Label>
{portal(
<Position
position={position}
ref={this.dropdownRef}
position={this.position}
fixed={this.fixed}
top={this.top}
bottom={this.bottom}
left={this.left}
right={this.right}
>
@ -125,10 +193,13 @@ const Label = styled(Flex).attrs({
`;
const Position = styled.div`
position: absolute;
position: ${({ fixed }) => (fixed ? 'fixed' : 'absolute')};
display: flex;
${({ left }) => (left !== undefined ? `left: ${left}px` : '')};
${({ right }) => (right !== undefined ? `right: ${right}px` : '')};
top: ${({ top }) => top}px;
${({ top }) => (top !== undefined ? `top: ${top}px` : '')};
${({ bottom }) => (bottom !== undefined ? `bottom: ${bottom}px` : '')};
max-height: 75%;
z-index: 1000;
transform: ${props =>
props.position === 'center' ? 'translateX(-50%)' : 'initial'};
@ -142,6 +213,7 @@ const Menu = styled.div`
padding: 0.5em 0;
min-width: 180px;
overflow: hidden;
overflow-y: auto;
box-shadow: ${props => props.theme.menuShadow};
@media print {

View File

@ -62,7 +62,7 @@ class CollectionLink extends React.Component<Props> {
exact={false}
menu={
<CollectionMenu
position="left"
position="right"
collection={collection}
onOpen={() => (this.menuOpen = true)}
onClose={() => (this.menuOpen = false)}

View File

@ -81,7 +81,7 @@ class DocumentLink extends React.Component<Props> {
document ? (
<Fade>
<DocumentMenu
position="left"
position="right"
document={document}
onOpen={() => (this.menuOpen = true)}
onClose={() => (this.menuOpen = false)}

View File

@ -83,7 +83,7 @@ const SearchFilter = props => {
{props.label}
</StyledButton>
}
position="left"
position="right"
>
{({ closePortal }) => (
<MaxHeightScrollable>