Merge pull request #5644 from weeman1337/fix-contextmenu-padding

jryans · web-flow · commit 72ff919512a9 · 2021-02-22T17:42:09.000Z
Fix context menu leaving visible area
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
@@ -299,7 +299,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
             // 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);
+                adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);
             }
 
             position.top = adjusted;

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {`
`299`	`299`	`// such that it does not leave the (padded) window.`
`300`	`300`	`if (contextMenuRect) {`
`301`	`301`	`const padding = 10;`
`302`		`- adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height + padding);`
	`302`	`+ adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`position.top = adjusted;`