diff --git a/components/common/DialogContent/index.scss b/components/common/DialogContent/index.scss index 77308914..648441a0 100644 --- a/components/common/DialogContent/index.scss +++ b/components/common/DialogContent/index.scss @@ -59,8 +59,12 @@ width: 100%; } - .Scrollable { - overflow-y: auto; + .Container { + overflow-y: hidden; + + &.Scrollable { + overflow-y: auto; + } } .DialogHeader { diff --git a/components/common/DialogContent/index.tsx b/components/common/DialogContent/index.tsx index 26e06339..6bf22156 100644 --- a/components/common/DialogContent/index.tsx +++ b/components/common/DialogContent/index.tsx @@ -13,12 +13,13 @@ interface Props > { headerref?: React.RefObject footerref?: React.RefObject + scrollable?: boolean onEscapeKeyDown: (event: KeyboardEvent) => void onOpenAutoFocus: (event: Event) => void } const DialogContent = React.forwardRef(function Dialog( - { children, ...props }, + { scrollable, children, ...props }, forwardedRef ) { // Classes @@ -131,7 +132,13 @@ const DialogContent = React.forwardRef(function Dialog( onEscapeKeyDown={props.onEscapeKeyDown} ref={forwardedRef} > -
+
{children}
@@ -141,4 +148,8 @@ const DialogContent = React.forwardRef(function Dialog( ) }) +DialogContent.defaultProps = { + scrollable: true, +} + export default DialogContent