fix: Update dropdown position logic

kufu · Oct 30, 2019 · df50ca9 · df50ca9
1 parent 9adfa23
commit df50ca9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/components/Dropdown/dropdownHelper.ts b/src/components/Dropdown/dropdownHelper.ts
@@ -29,17 +29,22 @@ export function getContentPositionStyle(
     top: 'auto',
     left: 'auto',
   }
+  const triggerAlignCenter = triggerRect.left + (triggerRect.right - triggerRect.left) / 2
 
   if (triggerRect.bottom + contentSize.height <= windowSize.height) {
     position.top = `${scroll.top + triggerRect.bottom}px`
-  } else {
+  } else if (triggerRect.top - contentSize.height >= 0) {
     position.top = `${scroll.top + triggerRect.top - contentSize.height}px`
+  } else {
+    position.top = `${scroll.top + triggerRect.bottom}px`
   }
 
-  if (triggerRect.left + (triggerRect.right - triggerRect.left) / 2 <= windowSize.width / 2) {
+  if (triggerAlignCenter <= windowSize.width / 2) {
     position.left = `${scroll.left + triggerRect.left}px`
-  } else {
+  } else if (triggerAlignCenter >= windowSize.width / 2) {
     position.left = `${scroll.left + triggerRect.right - contentSize.width}px`
+  } else {
+    position.left = `${scroll.left + triggerRect.left}px`
   }
 
   return position