Skip to content
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

fix: remove drawer mask not lock scroll #472

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: remove drawer mask not lock scroll #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391437f
fix: remove drawer mask not lock scroll
andybuibui Jun 19, 2024
0041410
fix: add test
andybuibui Jun 19, 2024
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
2 changes: 1 addition & 1 deletion src/Drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const Drawer: React.FC<DrawerProps> = props => {
open={mergedOpen || forceRender || animatedVisible}
autoDestroy={false}
getContainer={getContainer}
autoLock={mask && (mergedOpen || animatedVisible)}
autoLock={mergedOpen || animatedVisible}
>
<DrawerPopup {...drawerPopupProps} />
</Portal>
Expand Down
18 changes: 16 additions & 2 deletions tests/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ describe('rc-drawer-menu', () => {
});

describe('mask', () => {
it('mask false not lock body scroll', () => {
const { unmount } = render(<Drawer open mask={false} />);
it('not lock body scroll when getContainer is not body', () => {
const div = document.createElement('div');
document.body.appendChild(div);
const { unmount } = render(<Drawer open getContainer={() => div} />);
const drawer = document.querySelector('.rc-drawer');
expect(drawer).toBeTruthy();
expect(document.body.contains(drawer)).toBeTruthy();
Expand All @@ -152,6 +154,18 @@ describe('rc-drawer-menu', () => {
});
unmount();
});
it('lock body scroll when getContainer give document.body', () => {
const { unmount } = render(
<Drawer open getContainer={() => document.body} />,
);
const drawer = document.querySelector('.rc-drawer');
expect(drawer).toBeTruthy();
expect(document.body.contains(drawer)).toBeTruthy();
expect(document.body).toHaveStyle({
overflowY: 'hidden',
});
unmount();
});

it('maskClosable', () => {
const onClose = jest.fn();
Expand Down