diff --git a/packages/react-core/src/components/Modal/ModalBoxDescription.tsx b/packages/react-core/src/components/Modal/ModalBoxDescription.tsx new file mode 100644 index 00000000000..4265a1a6c61 --- /dev/null +++ b/packages/react-core/src/components/Modal/ModalBoxDescription.tsx @@ -0,0 +1,23 @@ +import * as React from 'react'; +import { css } from '@patternfly/react-styles'; +import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box'; + +export interface ModalBoxDescriptionProps { + /** Content rendered inside the description */ + children?: React.ReactNode; + /** Additional classes added to the description */ + className?: string; + /** ID of the description */ + id?: string; +} + +export const ModalBoxDescription: React.FunctionComponent = ({ + children = null, + className = '', + id = '', + ...props +}: ModalBoxDescriptionProps) => ( +
+ {children} +
+); diff --git a/packages/react-core/src/components/Modal/ModalContent.tsx b/packages/react-core/src/components/Modal/ModalContent.tsx index e7e3e0fa319..321c5fa82d6 100644 --- a/packages/react-core/src/components/Modal/ModalContent.tsx +++ b/packages/react-core/src/components/Modal/ModalContent.tsx @@ -7,7 +7,6 @@ const FocusTrap: any = require('focus-trap-react'); import styles from '@patternfly/react-styles/css/layouts/Bullseye/bullseye'; import titleStyles from '@patternfly/react-styles/css/components/Title/title'; -import modalStyles from '@patternfly/react-styles/css/components/ModalBox/modal-box'; import { css } from '@patternfly/react-styles'; import { Backdrop } from '../Backdrop/Backdrop'; @@ -16,6 +15,7 @@ import { ModalBoxHeader } from './ModalBoxHeader'; import { ModalBoxCloseButton } from './ModalBoxCloseButton'; import { ModalBox } from './ModalBox'; import { ModalBoxFooter } from './ModalBoxFooter'; +import { ModalBoxDescription } from './ModalBoxDescription'; export interface ModalContentProps { /** Content rendered inside the Modal. */ @@ -104,11 +104,7 @@ export const ModalContent: React.FunctionComponent = ({ > {showClose && } {modalBoxHeader} - {description && ( -
- {description} -
- )} + {description && {description}} {children} diff --git a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap index a20dadff1bf..53bd2c2ae25 100644 --- a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap +++ b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap @@ -32,12 +32,11 @@ exports[`Modal Content Test description 1`] = ` Test Modal Content title -
This is a test description. -
+ This is a ModalBox header