Skip to content

fix: DH-17454: Combine modal classes instead of replacing #2173

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

Merged
vbabich merged 2 commits into from
Jul 26, 2024
Merged

fix: DH-17454: Combine modal classes instead of replacing #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1459a0
Combine modal classes instead of replacing
vbabich Jul 26, 2024
21e3c8f
Pass className as a separate arg to classNames in Modal and ModalHeader
vbabich Jul 26, 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: 2 additions & 2 deletions packages/components/src/modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ interface ModalProps {
}

function Modal({
className = '',
className,
children,
role = 'role',
keyboard = true,
Expand Down Expand Up @@ -156,7 +156,7 @@ function Modal({
style={{ display: 'block' }}
>
<div
className={classNames(`modal-dialog ${className}`, {
className={classNames('modal-dialog', className, {
'modal-lg': size === 'lg',
'modal-sm': size === 'sm',
'modal-xl': size === 'xl',
Expand Down
9 changes: 7 additions & 2 deletions packages/components/src/modal/ModalBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { CSSProperties, ReactElement, ReactNode } from 'react';
import classNames from 'classnames';

interface ModalBodyProps {
className?: string;
Expand All @@ -8,13 +9,17 @@ interface ModalBodyProps {
}

function ModalBody({
className = 'modal-body',
className,
style,
children,
'data-testid': dataTestId,
}: ModalBodyProps): ReactElement {
return (
<div className={className} data-testid={dataTestId} style={style}>
<div
className={classNames('modal-body', className)}
data-testid={dataTestId}
style={style}
>
{children}
</div>
);
Expand Down
8 changes: 6 additions & 2 deletions packages/components/src/modal/ModalFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { ReactElement, ReactNode } from 'react';
import classNames from 'classnames';

interface ModalFooterProps {
className?: string;
Expand All @@ -7,12 +8,15 @@ interface ModalFooterProps {
}

function ModalFooter({
className = 'modal-footer',
className,
children,
'data-testid': dataTestId,
}: ModalFooterProps): ReactElement {
return (
<div className={className} data-testid={dataTestId}>
<div
className={classNames('modal-footer', className)}
data-testid={dataTestId}
>
{children}
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/modal/ModalHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { CSSProperties, ReactElement, ReactNode } from 'react';
import classNames from 'classnames';

interface ModalHeaderProps {
className?: string;
Expand All @@ -18,7 +19,7 @@ function ModalHeader({
'data-testid': dataTestId,
}: ModalHeaderProps): ReactElement {
return (
<div className={`modal-header ${className}`} style={style}>
<div className={classNames('modal-header', className)} style={style}>
<h5 className="modal-title">{children}</h5>
{closeButton && (
<button
Expand Down
⚡