Merge pull request #3205 from answerrocket/menu-flip-constraint

Menu: constrain to a maximum of maxHeight
JedWatson · Jan 3, 2019 · 97be94d · 97be94d
2 parents 5094666 + 47939cf
commit 97be94d
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/components/Menu.js b/src/components/Menu.js
@@ -130,14 +130,13 @@ export function getMenuPlacement({
       if (placement === 'auto' || isFixedPosition) {
         // may need to be constrained after flipping
         let constrainedHeight = maxHeight;
+        const spaceAbove = isFixedPosition ? viewSpaceAbove : scrollSpaceAbove;
 
-        if (
-          (!isFixedPosition && scrollSpaceAbove >= minHeight) ||
-          (isFixedPosition && viewSpaceAbove >= minHeight)
-        ) {
-          constrainedHeight = isFixedPosition
-            ? viewSpaceAbove - marginBottom - spacing.controlHeight
-            : scrollSpaceAbove - marginBottom - spacing.controlHeight;
+        if (spaceAbove >= minHeight) {
+          constrainedHeight = Math.min(
+            spaceAbove - marginBottom - spacing.controlHeight,
+            maxHeight
+          );
         }
 
         return { placement: 'top', maxHeight: constrainedHeight };