Skip to content

Fix bugs found in v0.4.0 #148

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
akademy merged 5 commits into from
Feb 23, 2026
Merged

Fix bugs found in v0.4.0 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a97040
Add Progress and ProgressDelayed to export.
Feb 17, 2026
1a6600e
Make menu close if something is selected
Feb 17, 2026
eedf6e0
Correct styling for dark mode (style now similar to NavMenu)
Feb 17, 2026
964b712
Fix User login button having wrong colour
akademy Feb 18, 2026
31d1438
Update src/components/navigation/Navbar.stories.tsx
akademy Feb 23, 2026
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
34 changes: 32 additions & 2 deletions src/components/controls/User.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,36 @@ const User = ({
anchorEl={anchorEl}
open={open}
onClose={handleClose}
autoFocus={false}
sx={{
"li:hover": {
color: theme.palette.secondary.main,
borderLeft: "solid 4px",
borderBottom: "none",
},
"li:focus": {
color: theme.palette.secondary.main,
borderLeft: "solid 4px",
},
li: {
paddingLeft: "8px",
textDecoration: "none",
alignItems: "center",
display: "flex",
borderLeft: "4px solid transparent",
backgroundColor: { md: "none" },
color: theme.palette.primary.contrastText,
},
a: {
backgroundColor: { md: "none" },
color: theme.palette.primary.contrastText,
},
}}
slotProps={{
paper: {
style: { backgroundColor: theme.palette.primary.light },
},
}}
>
{menuItems}
{auth && (
Expand All @@ -155,8 +185,8 @@ const User = ({
onClick={handleLogin}
startIcon={<MdLogin />}
sx={{
backgroundColor: theme.palette.primary.main,
color: theme.palette.primary.contrastText,
backgroundColor: theme.vars.palette.primary.light,
color: theme.vars.palette.primary.contrastText,
}}
>
Login
Expand Down
8 changes: 7 additions & 1 deletion src/components/navigation/NavMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ import { NavLink, NavLinkProps } from "./Navbar";

type NavMenuLinkProps = MenuItemProps & NavLinkProps;

const NavMenuContext = React.createContext({ close: () => {} });

const NavMenuLink = forwardRef<HTMLElement, NavMenuLinkProps>(
function NavMenuLink({ children, ...props }: NavMenuLinkProps, ref) {
const navMenuContext = React.useContext(NavMenuContext);
const theme = useTheme();

return (
<MenuItem
ref={ref}
component={NavLink}
onClick={navMenuContext.close}
{...props}
sx={{
"&:hover": {
Expand Down Expand Up @@ -122,7 +126,9 @@ const NavMenu = ({ label, children }: NavMenuProps) => {
paper: { style: { backgroundColor: theme.palette.primary.light } },
}}
>
{children}
<NavMenuContext.Provider value={{ close: closeMenu }}>
{children}
</NavMenuContext.Provider>
</Menu>
</>
);
Expand Down
27 changes: 15 additions & 12 deletions src/components/navigation/Navbar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,18 @@ export const All: Story = {
<NavLink href="#Venus" key="venus">
Venus
</NavLink>
<NavLink href="#Earth" key="earth">
</NavLinks>
<NavMenu key="links" label={"Planets"}>
<NavMenuLink href="#Earth" key="earth">
Earth
</NavLink>
<NavLink href="#Mars" key="mars">
</NavMenuLink>
<NavMenuLink href="#Mars" key="mars">
Mars
</NavLink>
</NavLinks>
</NavMenuLink>
<NavMenuLink href="#Jupiter" key="jupiter">
Jupiter
</NavMenuLink>
</NavMenu>
</>
),
logo: "theme",
Expand Down Expand Up @@ -270,17 +275,15 @@ export const LinksInSlot: Story = {
},
};

export const MenuLinkInSlot: Story = {
export const LinksAndMenus: Story = {
args: {
leftSlot: (
<>
<NavLinks>
<NavLink href="#Mercury">Mercury</NavLink>
<NavLink href="#Venus">Venus</NavLink>
</NavLinks>
<NavMenu key="links" label={"Planets"}>
<NavMenuLink href="#Mercury" key="mercury">
Mercury
</NavMenuLink>
<NavMenuLink href="#Venus" key="venus">
Venus
</NavMenuLink>
<NavMenuLink href="#Earth" key="earth">
Earth
</NavMenuLink>
Expand Down
2 changes: 2 additions & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export * from "./components/controls/Bar";
export * from "./components/controls/ColourSchemeButton";
export * from "./components/controls/ImageColourSchemeSwitch";
export * from "./components/controls/Logo";
export * from "./components/controls/Progress";
export * from "./components/controls/ProgressDelayed";
export * from "./components/controls/User";
export * from "./components/controls/ScrollableImages";
export * from "./components/controls/VisitInput";
Expand Down