Merge pull request #3900 from bluewave-labs/fix/hover-states
fix(client): add hover states to tables, cards, stat boxes and icon buttons
This commit is contained in:
6 files changed
+61
-7
No files matched your search
@@ -3,6 +3,7 @@ import Menu from "@mui/material/Menu";
|
|||||||
import MenuItem from "@mui/material/MenuItem";
|
import MenuItem from "@mui/material/MenuItem";
|
||||||
import IconButton from "@mui/material/IconButton";
|
import IconButton from "@mui/material/IconButton";
|
||||||
import { Settings } from "lucide-react";
|
import { Settings } from "lucide-react";
|
||||||
|
import { useTheme } from "@mui/material/styles";
|
||||||
|
|
||||||
export type ActionMenuItem = {
|
export type ActionMenuItem = {
|
||||||
id: number | string;
|
id: number | string;
|
||||||
@@ -12,6 +13,7 @@ export type ActionMenuItem = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
|
export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
|
||||||
|
const theme = useTheme();
|
||||||
const [anchorEl, setAnchorEl] = useState<null | any>(null);
|
const [anchorEl, setAnchorEl] = useState<null | any>(null);
|
||||||
const open = Boolean(anchorEl);
|
const open = Boolean(anchorEl);
|
||||||
|
|
||||||
@@ -27,7 +29,14 @@ export const ActionsMenu = ({ items }: { items: ActionMenuItem[] }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<IconButton onClick={handleClick}>
|
<IconButton
|
||||||
|
onClick={handleClick}
|
||||||
|
sx={{
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: theme.palette.action.controlHover,
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
<Settings
|
<Settings
|
||||||
size={20}
|
size={20}
|
||||||
strokeWidth={1.5}
|
strokeWidth={1.5}
|
||||||
|
|||||||
@@ -11,9 +11,10 @@ import type { SxProps } from "@mui/material";
|
|||||||
type GradientBox = React.PropsWithChildren<{
|
type GradientBox = React.PropsWithChildren<{
|
||||||
palette?: PaletteKey;
|
palette?: PaletteKey;
|
||||||
sx?: SxProps;
|
sx?: SxProps;
|
||||||
|
interactive?: boolean;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
export const GradientBox = ({ children, palette, sx }: GradientBox) => {
|
export const GradientBox = ({ children, palette, sx, interactive }: GradientBox) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
const isLight = theme.palette.mode === "light";
|
const isLight = theme.palette.mode === "light";
|
||||||
@@ -30,6 +31,12 @@ export const GradientBox = ({ children, palette, sx }: GradientBox) => {
|
|||||||
padding: `${theme.spacing(4)} ${theme.spacing(8)}`,
|
padding: `${theme.spacing(4)} ${theme.spacing(8)}`,
|
||||||
width: isSmall ? `100%` : `calc(25% - (3 * ${theme.spacing(8)} / 4))`,
|
width: isSmall ? `100%` : `calc(25% - (3 * ${theme.spacing(8)} / 4))`,
|
||||||
background: bg,
|
background: bg,
|
||||||
|
...(interactive && {
|
||||||
|
cursor: "pointer",
|
||||||
|
"&:hover": {
|
||||||
|
backgroundImage: `linear-gradient(${theme.palette.action.rowHover}, ${theme.palette.action.rowHover}), ${bg}`,
|
||||||
|
},
|
||||||
|
}),
|
||||||
...sx,
|
...sx,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -62,10 +69,8 @@ export const StatBox = ({
|
|||||||
return (
|
return (
|
||||||
<GradientBox
|
<GradientBox
|
||||||
palette={palette}
|
palette={palette}
|
||||||
sx={{
|
interactive={Boolean(onClick)}
|
||||||
...(sx as object),
|
sx={{ ...(sx as object) }}
|
||||||
...(onClick ? { cursor: "pointer", "&:hover": { opacity: 0.95 } } : {}),
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<Stack onClick={onClick}>
|
<Stack onClick={onClick}>
|
||||||
<Box sx={{ display: "flex", alignItems: "center", gap: theme.spacing(2) }}>
|
<Box sx={{ display: "flex", alignItems: "center", gap: theme.spacing(2) }}>
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ export function DataTable<
|
|||||||
};
|
};
|
||||||
|
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
||||||
|
const isInteractive = Boolean(onRowClick) || expandableRows;
|
||||||
|
|
||||||
if (data.length === 0 || headers.length === 0) {
|
if (data.length === 0 || headers.length === 0) {
|
||||||
return (
|
return (
|
||||||
@@ -108,6 +109,11 @@ export function DataTable<
|
|||||||
borderRadius: theme.shape.borderRadius,
|
borderRadius: theme.shape.borderRadius,
|
||||||
padding: theme.spacing(LAYOUT.XS),
|
padding: theme.spacing(LAYOUT.XS),
|
||||||
cursor: onRowClick ? "pointer" : "default",
|
cursor: onRowClick ? "pointer" : "default",
|
||||||
|
...(onRowClick && {
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: theme.palette.action.rowHover,
|
||||||
|
},
|
||||||
|
}),
|
||||||
}}
|
}}
|
||||||
key={key}
|
key={key}
|
||||||
>
|
>
|
||||||
@@ -207,6 +213,10 @@ export function DataTable<
|
|||||||
"& .MuiTableBody-root .MuiTableRow-root:last-child .MuiTableCell-root": {
|
"& .MuiTableBody-root .MuiTableRow-root:last-child .MuiTableCell-root": {
|
||||||
borderBottom: "none",
|
borderBottom: "none",
|
||||||
},
|
},
|
||||||
|
"& .MuiTableBody-root .MuiTableRow-root.is-clickable:hover .MuiTableCell-root":
|
||||||
|
{
|
||||||
|
backgroundColor: theme.palette.action.rowHover,
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TableHead>
|
<TableHead>
|
||||||
@@ -231,8 +241,9 @@ export function DataTable<
|
|||||||
return (
|
return (
|
||||||
<Fragment key={key}>
|
<Fragment key={key}>
|
||||||
<TableRow
|
<TableRow
|
||||||
|
className={isInteractive ? "is-clickable" : undefined}
|
||||||
sx={{
|
sx={{
|
||||||
cursor: onRowClick ? "pointer" : "default",
|
cursor: isInteractive ? "pointer" : "default",
|
||||||
...(getRowSx?.(row) as object),
|
...(getRowSx?.(row) as object),
|
||||||
}}
|
}}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
@@ -292,6 +303,12 @@ interface TablePaginationActionsProps {
|
|||||||
onPageChange: (event: React.MouseEvent<HTMLButtonElement>, newPage: number) => void;
|
onPageChange: (event: React.MouseEvent<HTMLButtonElement>, newPage: number) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const controlHoverSx = (theme: Theme): SxProps<Theme> => ({
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: theme.palette.action.controlHover,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
function TablePaginationActions(props: TablePaginationActionsProps) {
|
function TablePaginationActions(props: TablePaginationActionsProps) {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const { count, page, rowsPerPage, onPageChange } = props;
|
const { count, page, rowsPerPage, onPageChange } = props;
|
||||||
@@ -321,6 +338,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleFirstPageButtonClick}
|
onClick={handleFirstPageButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="first page"
|
aria-label="first page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronsRight
|
<ChevronsRight
|
||||||
@@ -338,6 +356,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleBackButtonClick}
|
onClick={handleBackButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="previous page"
|
aria-label="previous page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronRight
|
<ChevronRight
|
||||||
@@ -355,6 +374,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleNextButtonClick}
|
onClick={handleNextButtonClick}
|
||||||
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
||||||
aria-label="next page"
|
aria-label="next page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronLeft
|
<ChevronLeft
|
||||||
@@ -372,6 +392,7 @@ function TablePaginationActions(props: TablePaginationActionsProps) {
|
|||||||
onClick={handleLastPageButtonClick}
|
onClick={handleLastPageButtonClick}
|
||||||
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
disabled={page >= Math.ceil(count / rowsPerPage) - 1}
|
||||||
aria-label="last page"
|
aria-label="last page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronsLeft
|
<ChevronsLeft
|
||||||
@@ -419,6 +440,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
onClick={handleFirstPageButtonClick}
|
onClick={handleFirstPageButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="first page"
|
aria-label="first page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronsRight
|
<ChevronsRight
|
||||||
@@ -436,6 +458,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
onClick={handleBackButtonClick}
|
onClick={handleBackButtonClick}
|
||||||
disabled={page === 0}
|
disabled={page === 0}
|
||||||
aria-label="previous page"
|
aria-label="previous page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronRight
|
<ChevronRight
|
||||||
@@ -453,6 +476,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
onClick={handleNextButtonClick}
|
onClick={handleNextButtonClick}
|
||||||
disabled={hasMore === false}
|
disabled={hasMore === false}
|
||||||
aria-label="next page"
|
aria-label="next page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
{theme.direction === "rtl" ? (
|
{theme.direction === "rtl" ? (
|
||||||
<ChevronLeft
|
<ChevronLeft
|
||||||
@@ -470,6 +494,7 @@ function HasMoreTablePaginationActions(props: HasMoreTablePaginationActionsProps
|
|||||||
<IconButton
|
<IconButton
|
||||||
disabled={hasMore === false}
|
disabled={hasMore === false}
|
||||||
aria-label="next page"
|
aria-label="next page"
|
||||||
|
sx={controlHoverSx(theme)}
|
||||||
>
|
>
|
||||||
<Ellipsis
|
<Ellipsis
|
||||||
size={20}
|
size={20}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { alpha } from "@mui/material/styles";
|
import { alpha } from "@mui/material/styles";
|
||||||
|
import { HOVER } from "@/Utils/Theme/constants";
|
||||||
|
|
||||||
const typographyBase = 13;
|
const typographyBase = 13;
|
||||||
|
|
||||||
@@ -39,6 +40,10 @@ export const lightPalette = {
|
|||||||
primary: {
|
primary: {
|
||||||
main: colors.brandGreen,
|
main: colors.brandGreen,
|
||||||
},
|
},
|
||||||
|
action: {
|
||||||
|
rowHover: alpha(colors.gray900, HOVER.ROW),
|
||||||
|
controlHover: alpha(colors.gray900, HOVER.CONTROL),
|
||||||
|
},
|
||||||
secondary: {
|
secondary: {
|
||||||
main: colors.gray200,
|
main: colors.gray200,
|
||||||
},
|
},
|
||||||
@@ -65,6 +70,10 @@ export const darkPalette = {
|
|||||||
primary: {
|
primary: {
|
||||||
main: colors.brandGreen,
|
main: colors.brandGreen,
|
||||||
},
|
},
|
||||||
|
action: {
|
||||||
|
rowHover: alpha("#FFFFFF", HOVER.ROW),
|
||||||
|
controlHover: alpha("#FFFFFF", HOVER.CONTROL),
|
||||||
|
},
|
||||||
secondary: {
|
secondary: {
|
||||||
main: colors.gray700,
|
main: colors.gray700,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ declare module "@mui/material/styles" {
|
|||||||
eyebrow?: React.CSSProperties;
|
eyebrow?: React.CSSProperties;
|
||||||
fontFamilyMonospace?: string;
|
fontFamilyMonospace?: string;
|
||||||
}
|
}
|
||||||
|
interface TypeAction {
|
||||||
|
rowHover: string;
|
||||||
|
controlHover: string;
|
||||||
|
}
|
||||||
interface Palette {
|
interface Palette {
|
||||||
sidebar: { accent: string };
|
sidebar: { accent: string };
|
||||||
rowStatus: { running: string; paused: string };
|
rowStatus: { running: string; paused: string };
|
||||||
|
|||||||
@@ -20,4 +20,6 @@ export const LAYOUT = {
|
|||||||
|
|
||||||
export const HOVER = {
|
export const HOVER = {
|
||||||
DARKEN: 0.06, // This is a coefficient for darkening function
|
DARKEN: 0.06, // This is a coefficient for darkening function
|
||||||
|
ROW: 0.025, // Overlay alpha for hoverable rows and cards
|
||||||
|
CONTROL: 0.05, // Stronger overlay for controls nested inside a hoverable row
|
||||||
} as const;
|
} as const;
|
||||||
Reference in new issue
Block a user