resolve #6206 A popup appears incorrectly when using the search option

surveyjs · Jul 14, 2023 · 74b863e · 74b863e
1 parent 29f4fd9
commit 74b863e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/src/popup-dropdown-view-model.ts b/src/popup-dropdown-view-model.ts
@@ -81,12 +81,12 @@ export class PopupDropdownViewModel extends PopupBaseViewModel {
     );
 
     if (!!window) {
-      const newVerticalDimensions = PopupUtils.updateVerticalDimensions(
+      const newVerticalDimensions = PopupUtils.getCorrectedVerticalDimensions(
         pos.top,
         height,
         window.innerHeight
       );
-      if (!!newVerticalDimensions) {
+      if (!!newVerticalDimensions.height) {
         this.height = newVerticalDimensions.height + "px";
         pos.top = newVerticalDimensions.top;
       }

diff --git a/src/utils/popup.ts b/src/utils/popup.ts
@@ -56,12 +56,12 @@ export class PopupUtils {
     return { left: Math.round(currentLeft), top: Math.round(currentTop) };
   }
 
-  public static updateVerticalDimensions(
+  public static getCorrectedVerticalDimensions(
     top: number,
     height: number,
     windowHeight: number
   ) {
-    let result;
+    let result = { height: height, top: top };
     if (top < 0) {
       result = { height: height + top, top: 0 };
     } else if (height + top > windowHeight) {

diff --git a/tests/components/popuptests.ts b/tests/components/popuptests.ts
@@ -1006,26 +1006,23 @@ QUnit.test("Check calculatePosition with window size method", (assert) => {
   );
 });
 
-QUnit.test(
-  "Check updateVerticalDimensions if both directions do not fit",
-  (assert) => {
-    let newVerticalDimensions = PopupUtils.updateVerticalDimensions(
-      -20,
-      200,
-      300
-    );
-    assert.equal(newVerticalDimensions.height, 180);
-    assert.equal(newVerticalDimensions.top, 0);
-
-    newVerticalDimensions = PopupUtils.updateVerticalDimensions(150, 200, 300);
-    assert.equal(newVerticalDimensions.height, 150 - PopupUtils.bottomIndent);
-    assert.equal(newVerticalDimensions.top, 150);
-
-    newVerticalDimensions = PopupUtils.updateVerticalDimensions(150, 450, 300);
-    assert.equal(newVerticalDimensions.height, 150 - PopupUtils.bottomIndent);
-    assert.equal(newVerticalDimensions.top, 150);
-  }
-);
+QUnit.test("Check getCorrectedVerticalDimensions if both directions do not fit", (assert) => {
+  let newVerticalDimensions = PopupUtils.getCorrectedVerticalDimensions(-20, 200, 300);
+  assert.equal(newVerticalDimensions.height, 180);
+  assert.equal(newVerticalDimensions.top, 0);
+
+  newVerticalDimensions = PopupUtils.getCorrectedVerticalDimensions(150, 200, 300);
+  assert.equal(newVerticalDimensions.height, 150 - PopupUtils.bottomIndent);
+  assert.equal(newVerticalDimensions.top, 150);
+
+  newVerticalDimensions = PopupUtils.getCorrectedVerticalDimensions(150, 450, 300);
+  assert.equal(newVerticalDimensions.height, 150 - PopupUtils.bottomIndent);
+  assert.equal(newVerticalDimensions.top, 150);
+
+  newVerticalDimensions = PopupUtils.getCorrectedVerticalDimensions(10, 200, 300);
+  assert.equal(newVerticalDimensions.height, 200);
+  assert.equal(newVerticalDimensions.top, 10);
+});
 
 QUnit.test("Check updateHorizontalDimensions", (assert) => {
   let newHorizontalDimensions = PopupUtils.updateHorizontalDimensions(-20, 200, 300, "center");