Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try harder to keep context menus inside the window #7863

Merged
merged 4 commits into from
Feb 24, 2022
Merged

Try harder to keep context menus inside the window #7863

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
615f697
Try harder to keep context menus inside the window
robintown Feb 21, 2022
a7ccad3
Merge branch 'develop' into keep-menus-in-window
robintown Feb 23, 2022
3dfd883
Use UIStore for window dimensions
robintown Feb 23, 2022
c2b552b
Test ContextMenu positioning
robintown Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 41 additions & 13 deletions src/components/structures/ContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { checkInputableElement, RovingTabIndexProvider } from "../../accessibili
// of doing reusable widgets like dialog boxes & menus where we go and
// pass in a custom control as the actual body.

const WINDOW_PADDING = 10;
const ContextualMenuContainerId = "mx_ContextualMenu_Container";

function getOrCreateContainer(): HTMLDivElement {
Expand Down Expand Up @@ -247,21 +248,48 @@ export default class ContextMenu extends React.PureComponent<IProps, IState> {

if (chevronFace === ChevronFace.Top || chevronFace === ChevronFace.Bottom) {
chevronOffset.left = props.chevronOffset;
} else if (position.top !== undefined) {
const target = position.top;

// By default, no adjustment is made
let adjusted = target;
} else {
chevronOffset.top = props.chevronOffset;
}

// If we know the dimensions of the context menu, adjust its position
// such that it does not leave the (padded) window.
if (contextMenuRect) {
const padding = 10;
adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);
// If we know the dimensions of the context menu, adjust its position to
// keep it within the bounds of the (padded) window
if (contextMenuRect) {
if (position.top !== undefined) {
position.top = Math.min(
position.top,
document.body.clientHeight - contextMenuRect.height - WINDOW_PADDING,
robintown marked this conversation as resolved.
Show resolved Hide resolved
);
// Adjust the chevron if necessary
if (chevronOffset.top !== undefined) {
chevronOffset.top = props.chevronOffset + props.top - position.top;
}
} else if (position.bottom !== undefined) {
position.bottom = Math.min(
position.bottom,
document.body.clientHeight - contextMenuRect.height - WINDOW_PADDING,
);
if (chevronOffset.top !== undefined) {
chevronOffset.top = props.chevronOffset + props.bottom - position.bottom;
}
}
if (position.left !== undefined) {
position.left = Math.min(
position.left,
document.body.clientWidth - contextMenuRect.width - WINDOW_PADDING,
);
if (chevronOffset.left !== undefined) {
chevronOffset.left = props.chevronOffset + props.left - position.left;
}
} else if (position.right !== undefined) {
position.right = Math.min(
position.right,
document.body.clientWidth - contextMenuRect.width - WINDOW_PADDING,
);
if (chevronOffset.left !== undefined) {
chevronOffset.left = props.chevronOffset + props.right - position.right;
}
}

position.top = adjusted;
chevronOffset.top = Math.max(props.chevronOffset, props.chevronOffset + target - adjusted);
}

let chevron;
Expand Down