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

Jump to bottom

feat: Nest modal support #14320

Merged
merged 17 commits into from
Feb 22, 2024
Merged

feat: Nest modal support #14320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e7690db
feat: nested modal support
davidmenendez Jul 26, 2023
fbb9d92
Merge branch 'main' into nest-modal-support
davidmenendez Jul 26, 2023
41459a2
chore: merge
davidmenendez Aug 29, 2023
2cc440c
fix: revert portal change
davidmenendez Aug 29, 2023
cefbf94
chore: merge main
davidmenendez Oct 10, 2023
ca9785a
Merge branch 'main' into nest-modal-support
davidmenendez Dec 5, 2023
03dba65
fix: revert modal background change and add escape
davidmenendez Dec 6, 2023
5c5bd31
fix: reorder props
davidmenendez Dec 6, 2023
615f1fe
Merge branch 'main' into nest-modal-support
davidmenendez Dec 19, 2023
bf44081
fix: add prevent default
davidmenendez Jan 31, 2024
892fe39
Merge branch 'main' into nest-modal-support
davidmenendez Jan 31, 2024
247e767
fix: remove nested modal story
davidmenendez Jan 31, 2024
33aea30
fix: revert additional changes to modal story code
davidmenendez Jan 31, 2024
1e277be
Merge branch 'main' into nest-modal-support
davidmenendez Feb 20, 2024
8865313
Merge branch 'main' into nest-modal-support
davidmenendez Feb 20, 2024
91a49f4
fix: stopPropagation not preventDefault
davidmenendez Feb 20, 2024
71a8f64
Merge branch 'main' into nest-modal-support
tay1orjones Feb 21, 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
4 changes: 3 additions & 1 deletion packages/react/src/components/ComposedModal/ComposedModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ const ComposedModal = React.forwardRef<HTMLDivElement, ComposedModalProps>(
const startSentinel = useRef<HTMLButtonElement>(null);
const endSentinel = useRef<HTMLButtonElement>(null);

// Kepp track of modal open/close state
// Keep track of modal open/close state
// and propagate it to the document.body
useEffect(() => {
if (open !== wasOpen) {
Expand All @@ -259,13 +259,15 @@ const ComposedModal = React.forwardRef<HTMLDivElement, ComposedModalProps>(
}, []); // eslint-disable-line react-hooks/exhaustive-deps

function handleKeyDown(evt: KeyboardEvent) {
evt.stopPropagation();
if (match(evt, keys.Escape)) {
closeModal(evt);
}

onKeyDown?.(evt);
}
function handleMousedown(evt: MouseEvent) {
evt.stopPropagation();
const isInside = innerModal.current?.contains(evt.target as Node);
if (!isInside && !preventCloseOnClickOutside) {
closeModal(evt);
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/components/Modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ const Modal = React.forwardRef(function Modal(
}

function handleKeyDown(evt: React.KeyboardEvent<HTMLDivElement>) {
evt.stopPropagation();
if (open) {
if (match(evt, keys.Escape)) {
onRequestClose(evt);
Expand All @@ -295,6 +296,7 @@ const Modal = React.forwardRef(function Modal(

function handleMousedown(evt: React.MouseEvent<HTMLDivElement>) {
const target = evt.target as Node;
evt.stopPropagation();
if (
innerModal.current &&
!innerModal.current.contains(target) &&
Expand Down
Loading