Skip to content

Commit a2d5d5f

Browse files
authored
fix: DH-17454: Combine modal classes instead of replacing (#2173)
1 parent 0058b18 commit a2d5d5f

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

packages/components/src/modal/Modal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface ModalProps {
2626
}
2727

2828
function Modal({
29-
className = '',
29+
className,
3030
children,
3131
role = 'role',
3232
keyboard = true,
@@ -156,7 +156,7 @@ function Modal({
156156
style={{ display: 'block' }}
157157
>
158158
<div
159-
className={classNames(`modal-dialog ${className}`, {
159+
className={classNames('modal-dialog', className, {
160160
'modal-lg': size === 'lg',
161161
'modal-sm': size === 'sm',
162162
'modal-xl': size === 'xl',

packages/components/src/modal/ModalBody.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { CSSProperties, ReactElement, ReactNode } from 'react';
2+
import classNames from 'classnames';
23

34
interface ModalBodyProps {
45
className?: string;
@@ -8,13 +9,17 @@ interface ModalBodyProps {
89
}
910

1011
function ModalBody({
11-
className = 'modal-body',
12+
className,
1213
style,
1314
children,
1415
'data-testid': dataTestId,
1516
}: ModalBodyProps): ReactElement {
1617
return (
17-
<div className={className} data-testid={dataTestId} style={style}>
18+
<div
19+
className={classNames('modal-body', className)}
20+
data-testid={dataTestId}
21+
style={style}
22+
>
1823
{children}
1924
</div>
2025
);

packages/components/src/modal/ModalFooter.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { ReactElement, ReactNode } from 'react';
2+
import classNames from 'classnames';
23

34
interface ModalFooterProps {
45
className?: string;
@@ -7,12 +8,15 @@ interface ModalFooterProps {
78
}
89

910
function ModalFooter({
10-
className = 'modal-footer',
11+
className,
1112
children,
1213
'data-testid': dataTestId,
1314
}: ModalFooterProps): ReactElement {
1415
return (
15-
<div className={className} data-testid={dataTestId}>
16+
<div
17+
className={classNames('modal-footer', className)}
18+
data-testid={dataTestId}
19+
>
1620
{children}
1721
</div>
1822
);

packages/components/src/modal/ModalHeader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { CSSProperties, ReactElement, ReactNode } from 'react';
2+
import classNames from 'classnames';
23

34
interface ModalHeaderProps {
45
className?: string;
@@ -18,7 +19,7 @@ function ModalHeader({
1819
'data-testid': dataTestId,
1920
}: ModalHeaderProps): ReactElement {
2021
return (
21-
<div className={`modal-header ${className}`} style={style}>
22+
<div className={classNames('modal-header', className)} style={style}>
2223
<h5 className="modal-title">{children}</h5>
2324
{closeButton && (
2425
<button

0 commit comments

Comments
 (0)