Skip to content

Commit fa8c6d1

Browse files
Merge pull request #806 from glints-dev/feature/fix-modal-border-radius
Fix: Modal border radius and locked scrollable
2 parents a2aae50 + 2fd413d commit fa8c6d1

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/@next/Modal/ModalStyle.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export const StyledModalContainer = styled.div`
3131
max-width: calc(100vw - 32px);
3232
height: fit-content;
3333
max-height: calc(100vh - 96px);
34+
overflow: hidden;
3435
`;
3536

3637
export const StyledModalHeader = styled.div`
@@ -39,7 +40,7 @@ export const StyledModalHeader = styled.div`
3940
align-items: center;
4041
padding: ${space16} 20px;
4142
box-shadow: inset 0px -1px 0px ${Neutral.B95};
42-
border-radius: ${borderRadius8} 0;
43+
border-radius: ${borderRadius8} ${borderRadius8} 0 0;
4344
align-self: stretch;
4445
4546
div {
@@ -76,7 +77,7 @@ export const StyledModalActions = styled.div`
7677
padding: ${space16} 20px;
7778
gap: 10px;
7879
box-shadow: inset 0px 1px 0px ${Neutral.B95};
79-
border-radius: 0 ${borderRadius8};
80+
border-radius: 0 0 ${borderRadius8} ${borderRadius8};
8081
8182
@media (max-width: ${Breakpoints.large}) {
8283
padding: ${space16};

src/@next/Modal/ModalWithProvider.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ export const ModalWithProvider = () => {
66
const { close, onClose, ...rest } = useModal();
77
const { isOpen, ...modalProps } = rest;
88

9-
if (!isOpen) {
10-
return null;
11-
}
12-
139
return (
1410
<Modal
1511
{...modalProps}

0 commit comments

Comments
 (0)