Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions src/components/navigation/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Adapted from https://github.com/DiamondLightSource/web-ui-components
import {
Breadcrumbs as Mui_Breadcrumbs,
BreadcrumbsProps as Mui_BreadcrumbsProps,
Link as Mui_Link,
Breadcrumbs as MuiBreadcrumbs,
BreadcrumbsProps as MuiBreadcrumbsProps,
Link as MuiLink,
styled,
Typography,
} from "@mui/material";
Expand All @@ -15,7 +15,7 @@ import { Bar, BarProps } from "../controls/Bar";
interface BreadcrumbsProps extends BarProps {
path: string | string[] | CustomLink[];
linkComponent?: React.ElementType;
muiBreadcrumbsProps?: Mui_BreadcrumbsProps;
muiBreadcrumbsProps?: MuiBreadcrumbsProps;
}

/**
Expand Down Expand Up @@ -57,7 +57,7 @@ const BarStyled = styled(Bar)<BarProps>(({ theme }) => ({
backgroundColor: theme.vars.palette.primary.light,
}));

const Mui_BreadcrumbsStyled = styled(Mui_Breadcrumbs)<Mui_BreadcrumbsProps>(
const MuiBreadcrumbsStyled = styled(MuiBreadcrumbs)<MuiBreadcrumbsProps>(
({ theme }) => ({
color: theme.vars.palette.primary.contrastText,
padding: 0,
Expand All @@ -74,12 +74,12 @@ const Breadcrumbs = ({

return (
<BarStyled {...props}>
<Mui_BreadcrumbsStyled
<MuiBreadcrumbsStyled
aria-label="breadcrumb"
separator={<NavigateNextIcon fontSize="small" />}
{...muiBreadcrumbsProps}
>
<Mui_Link
<MuiLink
aria-label="Go to home page"
key={"crumb-0"}
underline="hover"
Expand All @@ -98,12 +98,12 @@ const Breadcrumbs = ({
aria-hidden="true"
sx={{ pt: 0.4, fontSize: "1.5em", mt: 0.3 }}
/>
</Mui_Link>
</MuiLink>

{crumbs.map((crumb, i, all) => {
if (i < all.length - 1)
return (
<Mui_Link
<MuiLink
key={`crumb-${i + 1}`}
sx={{ fontSize: "smaller", mt: 0.1 }}
underline="hover"
Expand All @@ -113,7 +113,7 @@ const Breadcrumbs = ({
: { href: crumb.href })}
>
{crumb.name}
</Mui_Link>
</MuiLink>
);
else {
return (
Expand All @@ -126,7 +126,7 @@ const Breadcrumbs = ({
);
}
})}
</Mui_BreadcrumbsStyled>
</MuiBreadcrumbsStyled>
</BarStyled>
);
};
Expand Down
10 changes: 5 additions & 5 deletions src/themes/ThemeProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ThemeProvider as Mui_ThemeProvider } from "@mui/material/styles";
import { ThemeProvider as MuiThemeProvider } from "@mui/material/styles";
import { CssBaseline } from "@mui/material";
import { GenericTheme } from "./GenericTheme";
import { ThemeProviderProps as Mui_ThemeProviderProps } from "@mui/material/styles";
import { ThemeProviderProps as MuiThemeProviderProps } from "@mui/material/styles";

interface ThemeProviderProps extends Partial<Mui_ThemeProviderProps> {
interface ThemeProviderProps extends Partial<MuiThemeProviderProps> {
baseline?: boolean;
}

Expand All @@ -15,10 +15,10 @@ const ThemeProvider = function ({
...props
}: ThemeProviderProps) {
return (
<Mui_ThemeProvider theme={theme} defaultMode={defaultMode} {...props}>
<MuiThemeProvider theme={theme} defaultMode={defaultMode} {...props}>
{baseline && <CssBaseline />}
{children}
</Mui_ThemeProvider>
</MuiThemeProvider>
);
};

Expand Down
Loading