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

[docs][base] Fix Nested modal demo positioning #37506

Merged
merged 11 commits into from
Jul 8, 2023
+9 −9
Merged

[docs][base] Fix Nested modal demo positioning #37506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2830db7
fix: correct nested modal and focus trap behavior
gitstart Jun 7, 2023
5adb603
Merge commit 'ff1124ebcaa3347d99f83501e379f97edcb5405b' of https://gi…
gitstart Jun 9, 2023
0e94af6
fix typo in variable name
gitstart Jun 9, 2023
2ea279a
Merge commit '5e2d83c9d4c25fb6d4aa326fcc95ae2c00de52c8' of https://gi…
gitstart Jun 12, 2023
531dbde
fix: use correct z-index plus update backdrop component
gitstart Jun 12, 2023
f38854b
Merge commit '1aa32058beeee1950a4fa4df71bdb8060227eea8' of https://gi…
gitstart Jun 27, 2023
c36137c
Merge commit '2fa8d6c6b0bf3eb0f918fdbfd2f9505d7c08d146' of https://gi…
gitstart Jun 29, 2023
cf8e5fa
Merge commit 'ab2cb8cf9614ccab02b62a22de5129a1c2774d96' of https://gi…
gitstart Jul 6, 2023
4c8f374
remove focus trap changes
gitstart Jul 6, 2023
543fee3
Merge commit '4b7c7eb8d967213a93503b6df8291a9438ffd86c' of https://gi…
gitstart Jul 7, 2023
465155a
fix failing ci
gitstart Jul 7, 2023
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
6 changes: 3 additions & 3 deletions docs/data/base/components/modal/NestedModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ export default function NestedModal() {
return (
<div>
<TriggerButton onClick={handleOpen}>Open modal</TriggerButton>
<Modal
<StyledModal
open={open}
onClose={handleClose}
aria-labelledby="parent-modal-title"
aria-describedby="parent-modal-description"
slots={{ backdrop: Backdrop }}
slots={{ backdrop: StyledBackdrop }}
>
<Box sx={style}>
<h2 id="parent-modal-title">Text in a modal</h2>
Expand All @@ -31,7 +31,7 @@ export default function NestedModal() {
</p>
<ChildModal />
</Box>
</Modal>
</StyledModal>
</div>
);
}
Expand Down
6 changes: 3 additions & 3 deletions docs/data/base/components/modal/NestedModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ export default function NestedModal() {
return (
<div>
<TriggerButton onClick={handleOpen}>Open modal</TriggerButton>
<Modal
<StyledModal
open={open}
onClose={handleClose}
aria-labelledby="parent-modal-title"
aria-describedby="parent-modal-description"
slots={{ backdrop: Backdrop }}
slots={{ backdrop: StyledBackdrop }}
>
<Box sx={style}>
<h2 id="parent-modal-title">Text in a modal</h2>
Expand All @@ -30,7 +30,7 @@ export default function NestedModal() {
</p>
<ChildModal />
</Box>
</Modal>
</StyledModal>
</div>
);
}
Expand Down
6 changes: 3 additions & 3 deletions docs/data/base/components/modal/NestedModal.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<TriggerButton onClick={handleOpen}>Open modal</TriggerButton>
<Modal
<StyledModal
open={open}
onClose={handleClose}
aria-labelledby="parent-modal-title"
aria-describedby="parent-modal-description"
slots={{ backdrop: Backdrop }}
slots={{ backdrop: StyledBackdrop }}
>
<Box sx={style}>
<h2 id="parent-modal-title">Text in a modal</h2>
Expand All @@ -13,4 +13,4 @@
</p>
<ChildModal />
</Box>
</Modal>
</StyledModal>