Skip to content

fix(align): restore overflowX and overflowY after force align #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ffgenius wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(align): restore overflowX and overflowY after force align #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/hooks/useAlign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ export default function useAlign(
const originRight = popupElement.style.right;
const originBottom = popupElement.style.bottom;
const originOverflow = popupElement.style.overflow;
const originOverflowX = popupElement.style.overflowX;
const originOverflowY = popupElement.style.overflowY;

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Apr 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This extra empty line is redundant and deviates from the existing code style in this file. It's recommended to remove it to keep the code clean and maintain consistent spacing.


// Placement
const placementInfo: AlignType = {
Expand Down Expand Up @@ -295,6 +298,8 @@ export default function useAlign(
popupElement.style.right = originRight;
popupElement.style.bottom = originBottom;
popupElement.style.overflow = originOverflow;
popupElement.style.overflowX = originOverflowX;
popupElement.style.overflowY = originOverflowY;

popupElement.parentElement?.removeChild(placeholderElement);

Expand Down
34 changes: 34 additions & 0 deletions tests/align.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,40 @@ describe('Trigger.Align', () => {
});
});

it('should restore overflowX and overflowY after align', async () => {
const triggerRef = React.createRef<TriggerRef>();

render(
<Trigger
popupVisible
popup={<span className="bamboo" />}
popupStyle={{
overflowX: 'auto',
overflowY: 'scroll',
}}
ref={triggerRef}
>
<div />
</Trigger>,
);

await awaitFakeTimer();

const popupElement = document.querySelector(
'.rc-trigger-popup',
) as HTMLElement;
expect(popupElement.style.overflowX).toBe('auto');
expect(popupElement.style.overflowY).toBe('scroll');

act(() => {
triggerRef.current!.forceAlign();
});
await awaitFakeTimer();

expect(popupElement.style.overflowX).toBe('auto');
expect(popupElement.style.overflowY).toBe('scroll');
});

it('targetOffset support ptg', async () => {
render(
<Trigger
Expand Down