diff --git a/packages/react-core/src/components/AboutModal/AboutModal.tsx b/packages/react-core/src/components/AboutModal/AboutModal.tsx index 537a5220c58..f9ff229bd2a 100644 --- a/packages/react-core/src/components/AboutModal/AboutModal.tsx +++ b/packages/react-core/src/components/AboutModal/AboutModal.tsx @@ -7,8 +7,6 @@ import { AboutModalBoxCloseButton } from './AboutModalBoxCloseButton'; import { AboutModalBox } from './AboutModalBox'; import { Modal, ModalVariant } from '../Modal'; import { GenerateId } from '../../helpers/GenerateId/GenerateId'; -// eslint-disable-next-line camelcase -// import c_about_modal_box_BackgroundImage from '@patternfly/react-tokens/dist/esm/c_about_modal_box_BackgroundImage'; export interface AboutModalProps extends React.HTMLProps { /** Content rendered inside the about modal */ @@ -48,7 +46,7 @@ export const AboutModal: React.FunctionComponent = ({ onClose = (_e): any => undefined, productName, trademark, - // backgroundImageSrc, + backgroundImageSrc, brandImageSrc, brandImageAlt, hasNoContentContainer = false, @@ -89,13 +87,11 @@ export const AboutModal: React.FunctionComponent = ({ hasNoBodyWrapper > diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModal.md b/packages/react-core/src/components/AboutModal/examples/AboutModal.md index 0f7470df817..7d84f1141b6 100644 --- a/packages/react-core/src/components/AboutModal/examples/AboutModal.md +++ b/packages/react-core/src/components/AboutModal/examples/AboutModal.md @@ -20,6 +20,3 @@ import bgImg from './patternfly-orb.svg'; ```ts file="./AboutModalComplexUserPositionedContent.tsx" ``` -### Custom background image -```ts file="./AboutModalCustomBackgroundImage.tsx" -``` diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx index 5f0bb86fbbf..cdee329bbb5 100644 --- a/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx +++ b/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx @@ -5,7 +5,7 @@ import brandImg from './brandImg.svg'; export const AboutModalBasic: React.FunctionComponent = () => { const [isModalOpen, setIsModalOpen] = React.useState(false); - const toggleModal = (_event: React.MouseEvent) => { + const toggleModal = (_event: React.MouseEvent | KeyboardEvent | MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -16,10 +16,11 @@ export const AboutModalBasic: React.FunctionComponent = () => { ) => toggleModal(e)} + onClose={(e: React.MouseEvent | KeyboardEvent | MouseEvent) => toggleModal(e)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" + backgroundImageSrc='/assets/images/pfbg-icon.svg' productName="Product Name" > diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx index 55a758d244c..73be08b733d 100644 --- a/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx +++ b/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx @@ -5,7 +5,7 @@ import brandImg from './brandImg.svg'; export const AboutModalComplexUserPositionedContent: React.FunctionComponent = () => { const [isModalOpen, setIsModalOpen] = React.useState(false); - const toggleModal = (_event: React.MouseEvent) => { + const toggleModal = (_event: React.MouseEvent | KeyboardEvent | MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -16,10 +16,11 @@ export const AboutModalComplexUserPositionedContent: React.FunctionComponent = ( ) => toggleModal(e)} + onClose={(e: React.MouseEvent | KeyboardEvent | MouseEvent) => toggleModal(e)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" + backgroundImageSrc='/assets/images/pfbg-icon.svg' hasNoContentContainer={true} productName="Product Name" > diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx deleted file mode 100644 index 541eb14e8ee..00000000000 --- a/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import { AboutModal, Button, TextContent, TextList, TextListItem } from '@patternfly/react-core'; -import brandImg from './brandImg.svg'; -import bgImg from './patternfly-orb.svg'; - -export const AboutModalCustomBackgroundImage: React.FunctionComponent = () => { - const [isModalOpen, setIsModalOpen] = React.useState(false); - - const toggleModal = (_event: React.MouseEvent) => { - setIsModalOpen(!isModalOpen); - }; - - return ( - - - toggleModal(event)} - trademark="Trademark and copyright information here" - brandImageSrc={brandImg} - brandImageAlt="Patternfly Logo" - backgroundImageSrc={bgImg} - aria-label="Background image about modal" - > - - - CFME Version - 5.5.3.4.20102789036450 - - - - - ); -}; diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx index ca133f2445f..e03ed49a65b 100644 --- a/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx +++ b/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx @@ -5,7 +5,7 @@ import brandImg from './brandImg.svg'; export const AboutModalWithoutProductName: React.FunctionComponent = () => { const [isModalOpen, setIsModalOpen] = React.useState(false); - const toggleModal = (_event: React.MouseEvent) => { + const toggleModal = (_event: React.MouseEvent | KeyboardEvent | MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -16,10 +16,11 @@ export const AboutModalWithoutProductName: React.FunctionComponent = () => { toggleModal(event)} + onClose={(e: React.MouseEvent | KeyboardEvent | MouseEvent) => toggleModal(e)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" + backgroundImageSrc='/assets/images/pfbg-icon.svg' aria-label="No product name about modal" >