Skip to content

fix(#2779): remove non-required event handling from version switcher #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArakTaiRoth merged 3 commits into from
Sep 29, 2025
Merged

fix(#2779): remove non-required event handling from version switcher #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e132361
fix(#2779): remove non-required event handling from version switcher
chrisolsen Sep 29, 2025
8b652bb
fix: correct css style name
chrisolsen Sep 29, 2025
048ec57
fix: better vertically align microsite header version menus
chrisolsen Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"prettier": "npx prettier . --write"
},
"dependencies": {
"@abgov/react-components": "6.7.1-alpha.1",
"@abgov/react-components": "6.8.0-alpha.2",
"@abgov/ui-components-common": "1.7.0",
"@abgov/web-components": "1.37.1-alpha.2",
"@abgov/web-components": "1.38.0-alpha.3",
"@faker-js/faker": "^8.3.1",
"highlight.js": "^11.8.0",
"js-cookie": "^3.0.5",
Expand Down
3 changes: 1 addition & 2 deletions src/components/version-language-switcher/HelpButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export function HelpButton() {
return (
<GoabTooltip content="Version and framework info">
<GoabIconButton ml={"xs"}
mb={"2xs"}
variant="color"
size="small"
icon="help-circle"
Expand All @@ -35,4 +34,4 @@ export function HelpButton() {
/>
</GoabTooltip>
);
}
}
36 changes: 14 additions & 22 deletions src/components/version-language-switcher/VersionLanguageSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
GoabIcon,
GoabPopover
} from "@abgov/react-components";

import {
ANGULAR_VERSIONS, getVersionedUrlPath, Language, LanguageVersion,
VERSIONED_ANGULAR_URL_SEGMENT,
Expand All @@ -16,7 +17,7 @@ export const VersionLanguageSwitcher = () => {
const {language, version, setLanguage, setVersion} = useContext(LanguageVersionContext);
const location = useLocation();
const navigate = useNavigate();
const [hash, setHash] = React.useState<string>(window.location.hash);
const [hash, setHash] = React.useState<string>(window.location.hash);

useEffect(() => {
function setLanguageAndVersionFromUrl() {
Expand All @@ -33,7 +34,7 @@ export const VersionLanguageSwitcher = () => {
setLanguageAndVersionFromUrl();
});

// popover collapses when Url hash tag changes
// popover collapses when Url hash tag changes
const generateHyperlink = (newValue: LanguageVersion | Language) => {
return hash === newValue ? "#" : `#${newValue}`;
};
Expand Down Expand Up @@ -85,30 +86,22 @@ export const VersionLanguageSwitcher = () => {
return str.charAt(0).toUpperCase() + str.slice(1);
}

const openLanguagePopOver = (e: React.MouseEvent<HTMLAnchorElement>) => {
e.preventDefault();
};

const openVersionPopOver = (e: React.MouseEvent<HTMLAnchorElement>) => {
e.preventDefault();
};

const getCurrentVersionLabel = (language: string, version: string) => {
if (language === "react") {
return version === "new" ? REACT_VERSIONS.NEW.label : REACT_VERSIONS.OLD.label;
} if (language === "angular") {
} if (language === "angular") {
return version === "new" ? ANGULAR_VERSIONS.NEW.label : ANGULAR_VERSIONS.OLD.label;
}
}

return (
<>
<div className="version-language-switcher">
<div className="version-language-switcher">
<GoabPopover
target={
<a className="version-language-switcher__heading" href="#" id="language-switcher" onClick={e => openLanguagePopOver(e)}>
<GoabIcon type="chevron-down" size="small"></GoabIcon> {capitalizeFirstLetter(language)}
</a>
<div className="menu-link">
<GoabIcon type="chevron-down" size="small"></GoabIcon>
{capitalizeFirstLetter(language)}
</div>
}
padded={false}>
<>
Expand All @@ -121,10 +114,10 @@ export const VersionLanguageSwitcher = () => {
</GoabPopover>

<GoabPopover target={
<a className="version-language-switcher__heading" href="#"
onClick={e => openVersionPopOver(e)}>
<GoabIcon type="chevron-down" size="small"></GoabIcon> {getCurrentVersionLabel(language, version)}
</a>
<div className="menu-link">
<GoabIcon type="chevron-down" size="small"></GoabIcon>
{getCurrentVersionLabel(language, version)}
</div>
} padded={false}>
<>
{["new", "old"].map(ver => (
Expand All @@ -134,7 +127,6 @@ export const VersionLanguageSwitcher = () => {
))}
</>
</GoabPopover>
</div>
</>
</div>
);
}
16 changes: 13 additions & 3 deletions src/components/version-language-switcher/version-language-switcher.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@
}

.version-language-switcher {
height: 20px;
display: flex;
flex-direction: row;
align-items: center; /* vertically align content */
gap: var(--goa-space-s);
margin-bottom: var(--goa-space-xs);
}

@media (max-width: 623px) {
Expand All @@ -55,4 +53,16 @@
gap: 0;
margin-bottom: var(--goa-space-3xs);
}
}
}

.menu-link {
display: flex;
align-items: center;
justify-content: center;
color: var(--goa-color-interactive-default);
}

.menu-link:hover {
color: var(--goa-color-interactive-hover);
text-decoration: underline;
}