Skip to content

fix(menu): Styling active menu in SPA navigation #25533

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
justinpark merged 5 commits into from
Dec 4, 2023
Merged

fix(menu): Styling active menu in SPA navigation #25533

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80753fa
fix(menu): Active menu style during SPA navigation
justinpark Oct 5, 2023
bc01dbf
fix antd active style
justinpark Oct 5, 2023
9c9f4c4
remove unused
justinpark Oct 5, 2023
f309c4a
Merge branch 'master' into fix--spa-menu-active-style
justinpark Oct 19, 2023
6b82e91
remove redundant !important
justinpark Dec 4, 2023
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
37 changes: 33 additions & 4 deletions superset-frontend/src/features/home/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { getUrlParam } from 'src/utils/urlUtils';
import { Row, Col, Grid } from 'src/components';
import { MainNav as DropdownMenu, MenuMode } from 'src/components/Menu';
import { Tooltip } from 'src/components/Tooltip';
import { Link, useLocation } from 'react-router-dom';
import { NavLink, useLocation } from 'react-router-dom';
import { GenericLink } from 'src/components/GenericLink/GenericLink';
import Icons from 'src/components/Icons';
import { useUiConfig } from 'src/components/UiConfigContext';
Expand Down Expand Up @@ -154,6 +154,29 @@ const globalStyles = (theme: SupersetTheme) => css`
margin-left: ${theme.gridUnit * 1.75}px;
}
}
.ant-menu-item-selected {
background-color: transparent;
&:not(.ant-menu-item-active) {
color: inherit;
border-bottom-color: transparent;
& > a {
color: inherit;
}
}
}
.ant-menu-horizontal > .ant-menu-item:has(> .is-active) {
color: ${theme.colors.primary.base};
border-bottom-color: ${theme.colors.primary.base};
& > a {
color: ${theme.colors.primary.base};
}
}
.ant-menu-vertical > .ant-menu-item:has(> .is-active) {
background-color: ${theme.colors.primary.light5};
& > a {
color: ${theme.colors.primary.base};
}
}
`;
const { SubMenu } = DropdownMenu;

Expand Down Expand Up @@ -226,9 +249,9 @@ export function Menu({
if (url && isFrontendRoute) {
return (
<DropdownMenu.Item key={label} role="presentation">
<Link role="button" to={url}>
<NavLink role="button" to={url} activeClassName="is-active">
{label}
</Link>
</NavLink>
</DropdownMenu.Item>
);
}
Expand All @@ -253,7 +276,13 @@ export function Menu({
return (
<DropdownMenu.Item key={`${child.label}`}>
{child.isFrontendRoute ? (
<Link to={child.url || ''}>{child.label}</Link>
<NavLink
to={child.url || ''}
exact
activeClassName="is-active"
>
{child.label}
</NavLink>
) : (
<a href={child.url}>{child.label}</a>
)}
Expand Down