fix: execute adjustXY while autoAdjust=true, adjust test specs

alibaba-fusion · Nov 27, 2023 · 90c31cc · 90c31cc
1 parent 2d170aa
commit 90c31cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/placement.ts b/src/placement.ts
@@ -619,13 +619,13 @@ export default function getPlacements(config: PlacementsConfig): PositionResult
       top = adjustResult.top;
       placement = adjustResult.placement;
     }
-  }
 
-  const adjustXYResult = adjustXY(left, top, placement, staticInfo);
-  if (adjustXYResult) {
-    left = adjustXYResult.left;
-    top = adjustXYResult.top;
-    placement = adjustXYResult.placement;
+    const adjustXYResult = adjustXY(left, top, placement, staticInfo);
+    if (adjustXYResult) {
+      left = adjustXYResult.left;
+      top = adjustXYResult.top;
+      placement = adjustXYResult.placement;
+    }
   }
 
   const result: PositionResult = {

diff --git a/test/placement.test.jsx b/test/placement.test.jsx
@@ -842,7 +842,7 @@ describe('placement', () => {
         },
         adjustExpect: {
           placement: 'b',
-          left: tLeft + target.width / 2 - overlay.width / 2,
+          left: Math.max(0, tLeft + target.width / 2 - overlay.width / 2),
           top: tTop + target.height,
         },
       });
@@ -865,7 +865,7 @@ describe('placement', () => {
         adjustExpect: {
           placement: 'l',
           left: tLeft - overlay.width,
-          top: tTop + target.height / 2 - overlay.height / 2,
+          top: Math.max(0, tTop + target.height / 2 - overlay.height / 2),
         },
       });
     });
@@ -886,7 +886,7 @@ describe('placement', () => {
         },
         adjustExpect: {
           placement: 't',
-          left: tLeft + target.width / 2 - overlay.width / 2,
+          left: Math.max(0, tLeft + target.width / 2 - overlay.width / 2),
           top: tTop - overlay.height,
         },
       });
@@ -909,7 +909,7 @@ describe('placement', () => {
         adjustExpect: {
           placement: 'r',
           left: tLeft + target.width,
-          top: tTop + target.height / 2 - overlay.height / 2,
+          top: Math.max(0, tTop + target.height / 2 - overlay.height / 2),
         },
       });
     });