From aef0717a0f18181ff1ae140c6367beca4058025d Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 18 Jul 2023 21:07:03 +0100 Subject: [PATCH 1/3] Add children to the header props --- .../HeaderWithBackButton/headerWithBackButtonPropTypes.js | 3 +++ src/components/HeaderWithBackButton/index.js | 1 + 2 files changed, 4 insertions(+) diff --git a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js index cd8ce2761815..2eb7f38acc24 100644 --- a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js +++ b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js @@ -89,6 +89,9 @@ const propTypes = { /** Policies, if we're showing the details for a report and need participant details for AvatarWithDisplay */ personalDetails: PropTypes.objectOf(participantPropTypes), + + /** Children to wrap in Header. */ + children: PropTypes.node.isRequired, }; export default propTypes; diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js index 602a3492c76a..341731f03967 100755 --- a/src/components/HeaderWithBackButton/index.js +++ b/src/components/HeaderWithBackButton/index.js @@ -51,6 +51,7 @@ function HeaderWithBackButton({ horizontal: 0, }, threeDotsMenuItems = [], + children, }) { const [isDownloadButtonActive, temporarilyDisableDownloadButton] = useThrottledButtonState(); const {translate} = useLocalize(); From 8fe414a8761bb6ccdb6d604c3d3e7483c1921ec6 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 18 Jul 2023 21:08:19 +0100 Subject: [PATCH 2/3] Make the button non-required --- .../HeaderWithBackButton/headerWithBackButtonPropTypes.js | 4 ++-- src/components/HeaderWithBackButton/index.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js index 2eb7f38acc24..a1311433f2d3 100644 --- a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js +++ b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js @@ -90,8 +90,8 @@ const propTypes = { /** Policies, if we're showing the details for a report and need participant details for AvatarWithDisplay */ personalDetails: PropTypes.objectOf(participantPropTypes), - /** Children to wrap in Header. */ - children: PropTypes.node.isRequired, + /** Children to wrap in Header */ + children: PropTypes.node, }; export default propTypes; diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js index 341731f03967..ec6a7149e137 100755 --- a/src/components/HeaderWithBackButton/index.js +++ b/src/components/HeaderWithBackButton/index.js @@ -94,6 +94,7 @@ function HeaderWithBackButton({ /> )} + {children} {shouldShowDownloadButton && ( Date: Tue, 18 Jul 2023 22:25:27 +0100 Subject: [PATCH 3/3] Pass default as null to the children argument --- src/components/HeaderWithBackButton/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js index ec6a7149e137..7dd00515f06a 100755 --- a/src/components/HeaderWithBackButton/index.js +++ b/src/components/HeaderWithBackButton/index.js @@ -51,7 +51,7 @@ function HeaderWithBackButton({ horizontal: 0, }, threeDotsMenuItems = [], - children, + children = null, }) { const [isDownloadButtonActive, temporarilyDisableDownloadButton] = useThrottledButtonState(); const {translate} = useLocalize();