🐛(fix) fix body scroll when a modal is opened
It was possible to scroll the body when a modal is opened, it was cutting the visibility of the modal, and was simply weird. Fixes #263
This commit is contained in:
105
packages/react/src/components/Modal/EdgeCases.stories.tsx
Normal file
105
packages/react/src/components/Modal/EdgeCases.stories.tsx
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
import React, { useEffect } from "react";
|
||||||
|
import { faker } from "@faker-js/faker";
|
||||||
|
import { Meta } from "@storybook/react";
|
||||||
|
import { Button } from ":/components/Button";
|
||||||
|
import { CunninghamProvider } from ":/components/Provider";
|
||||||
|
import { Modal, ModalSize, useModal } from ":/components/Modal/index";
|
||||||
|
|
||||||
|
const meta: Meta = {
|
||||||
|
title: "Components/Modal/Edge Cases",
|
||||||
|
parameters: {
|
||||||
|
docs: {
|
||||||
|
story: {
|
||||||
|
height: "350px",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default meta;
|
||||||
|
|
||||||
|
export const StackedModals = {
|
||||||
|
render: () => {
|
||||||
|
const modal1 = useModal();
|
||||||
|
const modal2 = useModal();
|
||||||
|
const modal3 = useModal();
|
||||||
|
|
||||||
|
const openModals = () => {
|
||||||
|
modal1.open();
|
||||||
|
setTimeout(() => {
|
||||||
|
modal2.open();
|
||||||
|
setTimeout(() => {
|
||||||
|
modal3.open();
|
||||||
|
}, 100);
|
||||||
|
}, 100);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
openModals();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const array = Array.from({ length: 1000 }, (_, i) => i);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<CunninghamProvider>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
minHeight: "3000px",
|
||||||
|
backgroundColor: "pink",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
onClick={openModals}
|
||||||
|
style={{
|
||||||
|
position: "fixed",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Open Modals
|
||||||
|
</Button>
|
||||||
|
<Modal
|
||||||
|
leftActions={<Button color="tertiary">Tertiary</Button>}
|
||||||
|
rightActions={
|
||||||
|
<>
|
||||||
|
<Button color="secondary">Secondary</Button>
|
||||||
|
<Button color="primary">Primary</Button>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
size={ModalSize.LARGE}
|
||||||
|
{...modal1}
|
||||||
|
>
|
||||||
|
{faker.lorem.lines(400)}
|
||||||
|
</Modal>
|
||||||
|
<Modal
|
||||||
|
leftActions={<Button color="tertiary">Tertiary</Button>}
|
||||||
|
rightActions={
|
||||||
|
<>
|
||||||
|
<Button color="secondary">Secondary</Button>
|
||||||
|
<Button color="primary">Primary</Button>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
size={ModalSize.MEDIUM}
|
||||||
|
{...modal2}
|
||||||
|
>
|
||||||
|
{faker.lorem.lines(400)}
|
||||||
|
</Modal>
|
||||||
|
<Modal
|
||||||
|
leftActions={<Button color="tertiary">Tertiary</Button>}
|
||||||
|
rightActions={
|
||||||
|
<>
|
||||||
|
<Button color="secondary">Secondary</Button>
|
||||||
|
<Button color="primary">Primary</Button>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
size={ModalSize.SMALL}
|
||||||
|
{...modal3}
|
||||||
|
>
|
||||||
|
{faker.lorem.lines(400)}
|
||||||
|
</Modal>
|
||||||
|
{array.map((i) => (
|
||||||
|
<div key={i}>{i}</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</CunninghamProvider>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -6,6 +6,7 @@ import React, {
|
|||||||
PropsWithChildren,
|
PropsWithChildren,
|
||||||
ReactNode,
|
ReactNode,
|
||||||
useContext,
|
useContext,
|
||||||
|
useEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
useState,
|
useState,
|
||||||
} from "react";
|
} from "react";
|
||||||
@@ -25,6 +26,8 @@ import {
|
|||||||
MessageModalProps,
|
MessageModalProps,
|
||||||
} from ":/components/Modal/MessageModal";
|
} from ":/components/Modal/MessageModal";
|
||||||
|
|
||||||
|
export const NOSCROLL_CLASS = "c__noscroll";
|
||||||
|
|
||||||
export type Decision = string | null | undefined;
|
export type Decision = string | null | undefined;
|
||||||
export type DecisionModalProps = WithOptional<ModalProps, "size"> & {
|
export type DecisionModalProps = WithOptional<ModalProps, "size"> & {
|
||||||
onDecide: (decision?: Decision) => void;
|
onDecide: (decision?: Decision) => void;
|
||||||
@@ -147,6 +150,28 @@ export const ModalProvider = ({ children }: PropsWithChildren) => {
|
|||||||
[],
|
[],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const portalElement = document.getElementById("c__modals-portal")!;
|
||||||
|
// Create an observer instance linked to the callback function
|
||||||
|
const observer = new MutationObserver(() => {
|
||||||
|
const dialogs = portalElement.querySelectorAll("dialog");
|
||||||
|
if (dialogs.length > 0) {
|
||||||
|
document.querySelector("body")!.classList.add(NOSCROLL_CLASS);
|
||||||
|
} else {
|
||||||
|
document.querySelector("body")!.classList.remove(NOSCROLL_CLASS);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Start observing the target node for configured mutations
|
||||||
|
observer.observe(portalElement, {
|
||||||
|
childList: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
observer.disconnect();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalContext.Provider value={context}>
|
<ModalContext.Provider value={context}>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -153,3 +153,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.c__noscroll {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { render, screen } from "@testing-library/react";
|
|||||||
import userEvent from "@testing-library/user-event";
|
import userEvent from "@testing-library/user-event";
|
||||||
import { Modal, ModalSize, useModal } from ":/components/Modal/index";
|
import { Modal, ModalSize, useModal } from ":/components/Modal/index";
|
||||||
import { CunninghamProvider } from ":/components/Provider";
|
import { CunninghamProvider } from ":/components/Provider";
|
||||||
import { useModals } from ":/components/Modal/ModalProvider";
|
import { NOSCROLL_CLASS, useModals } from ":/components/Modal/ModalProvider";
|
||||||
import { VariantType } from ":/utils/VariantUtils";
|
import { VariantType } from ":/utils/VariantUtils";
|
||||||
|
|
||||||
describe("<Modal/>", () => {
|
describe("<Modal/>", () => {
|
||||||
@@ -432,4 +432,104 @@ describe("<Modal/>", () => {
|
|||||||
// Decision is undefined.
|
// Decision is undefined.
|
||||||
expect(decision).toBeUndefined();
|
expect(decision).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("sets a noscroll class to body when a modal is open and remove it on close", async () => {
|
||||||
|
const Wrapper = () => {
|
||||||
|
const modal = useModal();
|
||||||
|
return (
|
||||||
|
<CunninghamProvider>
|
||||||
|
<button onClick={modal.open}>Open Modal</button>
|
||||||
|
<Modal size={ModalSize.SMALL} {...modal}>
|
||||||
|
<div>Modal Content</div>
|
||||||
|
</Modal>
|
||||||
|
</CunninghamProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
render(<Wrapper />);
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const button = screen.getByText("Open Modal");
|
||||||
|
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeFalsy();
|
||||||
|
await user.click(button);
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeTruthy();
|
||||||
|
|
||||||
|
const closeButton = screen.getByRole("button", {
|
||||||
|
name: "close",
|
||||||
|
});
|
||||||
|
await user.click(closeButton);
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("removes noscroll body class only when last modal is closed when multiple are opened", async () => {
|
||||||
|
const Wrapper = () => {
|
||||||
|
const modal1 = useModal();
|
||||||
|
const modal2 = useModal();
|
||||||
|
const modal3 = useModal();
|
||||||
|
const openModals = () => {
|
||||||
|
modal1.open();
|
||||||
|
modal2.open();
|
||||||
|
modal3.open();
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<CunninghamProvider>
|
||||||
|
<button onClick={openModals}>Open Modals</button>
|
||||||
|
<Modal size={ModalSize.LARGE} {...modal1}>
|
||||||
|
Modal 1
|
||||||
|
</Modal>
|
||||||
|
<Modal size={ModalSize.MEDIUM} {...modal2}>
|
||||||
|
Modal 2
|
||||||
|
</Modal>
|
||||||
|
<Modal size={ModalSize.SMALL} {...modal3}>
|
||||||
|
Modal 3
|
||||||
|
</Modal>
|
||||||
|
</CunninghamProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
render(<Wrapper />);
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const button = screen.getByText("Open Modals");
|
||||||
|
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeFalsy();
|
||||||
|
await user.click(button);
|
||||||
|
|
||||||
|
expect(screen.getByText("Modal 1")).toBeInTheDocument();
|
||||||
|
expect(screen.getByText("Modal 2")).toBeInTheDocument();
|
||||||
|
expect(screen.getByText("Modal 3")).toBeInTheDocument();
|
||||||
|
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeTruthy();
|
||||||
|
|
||||||
|
const closeButtons = screen.getAllByRole("button", {
|
||||||
|
name: "close",
|
||||||
|
});
|
||||||
|
expect(closeButtons).toHaveLength(3);
|
||||||
|
|
||||||
|
// Close modal 1.
|
||||||
|
await user.click(closeButtons[0]);
|
||||||
|
expect(screen.queryByText("Modal 1")).not.toBeInTheDocument();
|
||||||
|
expect(screen.getByText("Modal 2")).toBeInTheDocument();
|
||||||
|
expect(screen.getByText("Modal 3")).toBeInTheDocument();
|
||||||
|
|
||||||
|
// class is still on body.
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeTruthy();
|
||||||
|
|
||||||
|
// Close modal 2.
|
||||||
|
await user.click(closeButtons[1]);
|
||||||
|
expect(screen.queryByText("Modal 1")).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByText("Modal 2")).not.toBeInTheDocument();
|
||||||
|
expect(screen.getByText("Modal 3")).toBeInTheDocument();
|
||||||
|
|
||||||
|
// class is still on body.
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeTruthy();
|
||||||
|
|
||||||
|
// Close modal 3.
|
||||||
|
await user.click(closeButtons[2]);
|
||||||
|
expect(screen.queryByText("Modal 1")).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByText("Modal 2")).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByText("Modal 3")).not.toBeInTheDocument();
|
||||||
|
|
||||||
|
// class is removed from body.
|
||||||
|
expect(document.body.classList.contains(NOSCROLL_CLASS)).toBeFalsy();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
19
packages/react/src/hooks/usePrevious.ts
Normal file
19
packages/react/src/hooks/usePrevious.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { useEffect, useRef } from "react";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hook which stores the previous value of a component prop or state.
|
||||||
|
* https://usehooks.com/usePrevious/
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
*/
|
||||||
|
const usePrevious = <T>(value: T): T => {
|
||||||
|
const previous = useRef<T>(value);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
previous.current = value;
|
||||||
|
}, [value]);
|
||||||
|
|
||||||
|
return previous.current;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default usePrevious;
|
||||||
Reference in New Issue
Block a user