From ab3642206f5a059ae7f09c89328ea4ce8eb4f9b9 Mon Sep 17 00:00:00 2001 From: jenny-s51 Date: Fri, 27 Jan 2023 14:28:56 -0500 Subject: [PATCH] add event params to onClose --- .../react-core/src/components/AboutModal/AboutModal.tsx | 6 +++--- .../src/components/AboutModal/AboutModalBoxCloseButton.tsx | 4 ++-- .../src/components/AboutModal/AboutModalContainer.tsx | 4 ++-- .../src/components/AboutModal/examples/AboutModalBasic.tsx | 4 ++-- .../examples/AboutModalComplexUserPositionedContent.tsx | 4 ++-- .../AboutModal/examples/AboutModalCustomBackgroundImage.tsx | 4 ++-- .../AboutModal/examples/AboutModalWithoutProductName.tsx | 4 ++-- .../src/components/demos/AboutModal/AboutModalDemo.tsx | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/react-core/src/components/AboutModal/AboutModal.tsx b/packages/react-core/src/components/AboutModal/AboutModal.tsx index ab107bea736..40f9a72fc01 100644 --- a/packages/react-core/src/components/AboutModal/AboutModal.tsx +++ b/packages/react-core/src/components/AboutModal/AboutModal.tsx @@ -15,7 +15,7 @@ export interface AboutModalProps { /** Flag to show the about modal */ isOpen?: boolean; /** A callback for when the close button is clicked */ - onClose?: () => void; + onClose?: (event: React.MouseEvent | MouseEvent | KeyboardEvent) => void; /** Product name */ productName?: string; /** Trademark information */ @@ -50,7 +50,7 @@ export class AboutModal extends React.Component { static defaultProps: PickOptional = { className: '', isOpen: false, - onClose: (): any => undefined, + onClose: (_e): any => undefined, productName: '', trademark: '', backgroundImageSrc: '', @@ -72,7 +72,7 @@ export class AboutModal extends React.Component { handleEscKeyClick = (event: KeyboardEvent) => { if (event.key === KeyTypes.Escape && this.props.isOpen) { - this.props.onClose(); + this.props.onClose?.(event); } }; diff --git a/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx b/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx index ecfc11b2423..e6a5972d82a 100644 --- a/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx +++ b/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx @@ -8,14 +8,14 @@ export interface AboutModalBoxCloseButtonProps extends React.HTMLProps void; + onClose?: (event: React.MouseEvent | MouseEvent | KeyboardEvent) => void; /** Set close button aria label */ 'aria-label'?: string; } export const AboutModalBoxCloseButton: React.FunctionComponent = ({ className = '', - onClose = () => undefined as any, + onClose = _e => undefined as any, 'aria-label': ariaLabel = 'Close Dialog', ...props }: AboutModalBoxCloseButtonProps) => ( diff --git a/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx b/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx index 4ae348766c1..478f015d987 100644 --- a/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx +++ b/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx @@ -19,7 +19,7 @@ export interface AboutModalContainerProps extends React.HTMLProps void; + onClose?: (event: React.MouseEvent | MouseEvent | KeyboardEvent) => void; /** Product Name */ productName?: string; /** Trademark information */ @@ -44,7 +44,7 @@ export const AboutModalContainer: React.FunctionComponent undefined, + onClose = _e => undefined, productName = '', trademark, brandImageSrc, diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx index 3a20a8743d0..5f0bb86fbbf 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 = () => { + const toggleModal = (_event: React.MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -16,7 +16,7 @@ export const AboutModalBasic: React.FunctionComponent = () => { ) => toggleModal(e)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx index 916b5ed322f..39caefedadc 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 = () => { + const toggleModal = (_event: React.MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -16,7 +16,7 @@ export const AboutModalComplexUserPositionedContent: React.FunctionComponent = ( ) => toggleModal(e)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx index 3bcc7ed013d..07b33af907b 100644 --- a/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx +++ b/packages/react-core/src/components/AboutModal/examples/AboutModalCustomBackgroundImage.tsx @@ -6,7 +6,7 @@ import bgImg from './patternfly-orb.svg'; export const AboutModalCustomBackgroundImage: React.FunctionComponent = () => { const [isModalOpen, setIsModalOpen] = React.useState(false); - const toggleModal = () => { + const toggleModal = (_event: React.MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -17,7 +17,7 @@ export const AboutModalCustomBackgroundImage: React.FunctionComponent = () => { toggleModal(event)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx index 1870c112617..535ec18d123 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 = () => { + const toggleModal = (_event: React.MouseEvent) => { setIsModalOpen(!isModalOpen); }; @@ -16,7 +16,7 @@ export const AboutModalWithoutProductName: React.FunctionComponent = () => { toggleModal(event)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo" diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx index 47617c7e808..366a8cab14f 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx @@ -15,7 +15,7 @@ export class AboutModalDemo extends React.Component<{}, AboutModalState> { }; } - handleModalToggle = () => { + handleModalToggle = (_event: React.MouseEvent) => { this.setState(({ isModalOpen }) => ({ isModalOpen: !isModalOpen })); @@ -31,7 +31,7 @@ export class AboutModalDemo extends React.Component<{}, AboutModalState> { this.handleModalToggle(event)} trademark="Trademark and copyright information here" brandImageSrc={brandImg} brandImageAlt="Patternfly Logo"