From 173adf86129e2c7c456a7b6f7c45467b7ebeea38 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 7 Aug 2023 13:07:09 -0400 Subject: [PATCH] fix: add legacyBehavior prop on Link to support next/link --- src/components/Button/Button.js | 2 +- src/components/Header/Header.js | 6 ++++++ src/components/Language/Language.js | 1 + src/components/Link/Link.js | 6 ++++++ src/components/Menu/Menu.js | 16 ++++++++++++---- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js index 9f3e8cfa..b00f88f3 100644 --- a/src/components/Button/Button.js +++ b/src/components/Button/Button.js @@ -12,7 +12,7 @@ export function Button(props) { id={props.id} disabled={props.disabled} {...props.attributes} - data-testId={props?.id} + data-testid={props?.id} alt={props.iconAltText} > {props.icon && !props.iconEnd ? ( diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index ab00837d..d3d6f477 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -27,6 +27,7 @@ export function Header(props) { useParentContainer, customLink, dataGcAnalyticsCustomClickInstitutionVariable, + legacyBehavior, } = props; const containerClass = useParentContainer ? "" : "ds-container"; @@ -63,6 +64,7 @@ export function Header(props) { path={linkPath} locale={locale} customLink={customLink} + legacyBehavior={legacyBehavior} dataGcAnalyticsCustomClickInstitutionVariable={ dataGcAnalyticsCustomClickInstitutionVariable } @@ -85,6 +87,7 @@ export function Header(props) { path={linkPath} customLink={customLink} locale={locale} + legacyBehavior={legacyBehavior} dataGcAnalyticsCustomClickInstitutionVariable={ dataGcAnalyticsCustomClickInstitutionVariable } @@ -99,6 +102,7 @@ export function Header(props) { path={linkPath} customLink={customLink} locale={locale} + legacyBehavior={legacyBehavior} dataGcAnalyticsCustomClickInstitutionVariable={ dataGcAnalyticsCustomClickInstitutionVariable } @@ -112,6 +116,7 @@ export function Header(props) { isAuthenticated={isAuthenticated} menuList={menuProps.menuList} onSignOut={menuProps.onSignOut} + legacyBehavior={menuProps.legacyBehavior} dataGcAnalyticsCustomClickInstitutionVariable={ dataGcAnalyticsCustomClickInstitutionVariable } @@ -223,6 +228,7 @@ Header.propTypes = { ), hasNoMenu: PropTypes.bool, useParentContainer: PropTypes.bool, + legacyBehavior: PropTypes.bool, }), /** diff --git a/src/components/Language/Language.js b/src/components/Language/Language.js index 84dc302b..a14c3b10 100644 --- a/src/components/Language/Language.js +++ b/src/components/Language/Language.js @@ -17,6 +17,7 @@ export function Language(props) { locale={props.locale} component={props.customLink} lang={lang === "en" ? "fr" : "en"} + legacyBehavior={props.legacyBehavior} dataGcAnalyticsCustomClick={`${ props.dataGcAnalyticsCustomClickInstitutionVariable }:${lang === "en" ? "Français" : "English"}`} diff --git a/src/components/Link/Link.js b/src/components/Link/Link.js index eae59c4c..a5cc396c 100644 --- a/src/components/Link/Link.js +++ b/src/components/Link/Link.js @@ -49,6 +49,7 @@ export function Link(props) { lang={props.lang} target={props.target} aria-label={props.ariaLabel || props.text} + legacyBehavior={props.legacyBehavior} role="link" > setShowDropdown((e) => !e)} - data-gc-analytics-customclick={`${ - props.dataGcAnalyticsCustomClickInstitutionVariable - }:${showDropdown ? "Menu Contract" : "Expand Menu"}`} + data-gc-analytics-customclick={`${dataGcAnalyticsCustomClickInstitutionVariable}:${ + showDropdown ? "Menu Contract" : "Expand Menu" + }`} aria-haspopup="true" data-testid="menuButton" aria-expanded={showDropdown} @@ -117,7 +117,10 @@ export function Menu(props) { onClick={() => setShowDropdown(false)} key={element.key} > - +