fix: popupAlign not merge into builtinPlacement (#339)

* fix: align should be auto merged * test: update test case * chore: back of * chore: clean up
react-component · Mar 15, 2023 · 85dd06b · 85dd06b
1 parent 7210d84
commit 85dd06b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/hooks/useAlign.ts b/src/hooks/useAlign.ts
@@ -128,8 +128,10 @@ export default function useAlign(
       const win = getWin(popupElement);
 
       // Placement
-      const placementInfo: AlignType =
-        builtinPlacements[placement] || popupAlign || {};
+      const placementInfo: AlignType = {
+        ...builtinPlacements[placement],
+        ...popupAlign,
+      };
 
       // Reset first
       popupElement.style.left = '0';

diff --git a/tests/align.test.tsx b/tests/align.test.tsx
@@ -176,4 +176,33 @@ describe('Trigger.Align', () => {
     await awaitFakeTimer();
     expect(onPopupAlign).not.toHaveBeenCalled();
   });
+
+  it('align should merge into placement', async () => {
+    render(
+      <Trigger
+        popupVisible
+        popup={<span className="bamboo" />}
+        builtinPlacements={{
+          top: {
+            targetOffset: [0, 0],
+          },
+        }}
+        popupPlacement="top"
+        popupAlign={{
+          targetOffset: [903, 1128],
+        }}
+      >
+        <span />
+      </Trigger>,
+    );
+
+    await awaitFakeTimer();
+
+    expect(
+      document.querySelector('.rc-trigger-popup-placement-top'),
+    ).toHaveStyle({
+      left: `753px`,
+      top: `978px`,
+    });
+  });
 });