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.

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: modal-open class remains on body after modal closed #437

Merged
merged 1 commit into from Jun 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/core/OpenCloseModal/OpenCloseModal.tsx
Expand Up @@ -3,6 +3,7 @@ import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
import Button from '../Button/Button';
import { t } from '../../utilities/translation/translation';
import { BootstrapSize } from '../types';
import { useBodyFixOnModalClose } from '../useBodyFixOnModalClose/useBodyFixOnModalClose';

type Text = {
cancel?: string;
Expand Down Expand Up @@ -73,6 +74,8 @@ export function OpenCloseModal(props: Props) {
className
} = props;

useBodyFixOnModalClose(isOpen);

return (
<Modal
isOpen={isOpen}
Expand Down
10 changes: 10 additions & 0 deletions src/core/useBodyFixOnModalClose/useBodyFixOnModalClose.ts
@@ -0,0 +1,10 @@
/* istanbul ignore file */
import { useEffect } from 'react';

export function useBodyFixOnModalClose(isOpen: boolean) {
useEffect(() => {
if (!isOpen) {
document.querySelector('body')?.classList.remove('modal-open');
}
}, [isOpen]);
}
3 changes: 3 additions & 0 deletions src/form/ModalPicker/ModalPicker.tsx
Expand Up @@ -13,6 +13,7 @@ import {
import Pagination from '../../core/Pagination/Pagination';
import { t } from '../../utilities/translation/translation';
import SearchInput from '../../core/SearchInput/SearchInput';
import { useBodyFixOnModalClose } from '../../core/useBodyFixOnModalClose/useBodyFixOnModalClose';

interface Text {
placeholder?: string;
Expand Down Expand Up @@ -116,6 +117,8 @@ export default function ModalPicker(props: Props) {
text = {}
} = props;

useBodyFixOnModalClose(isOpen);

const shouldRenderPagination = !(page.first && page.last);

return (
Expand Down