Skip to content

Fix bulk action buttons hover style #10788

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
fzaninotto merged 4 commits into from
Jun 18, 2025
Merged

Fix bulk action buttons hover style #10788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5684ef
Remove default styles from bulk actions buttons
djhi Jun 18, 2025
3a0a636
Fix themes
djhi Jun 18, 2025
6343272
Fix default bulk action buttons background on dark theme
fzaninotto Jun 18, 2025
2d03f7a
Fix alignment
fzaninotto Jun 18, 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
11 changes: 1 addition & 10 deletions packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,16 +197,7 @@ const PREFIX = 'RaBulkDeleteWithConfirmButton';
const StyledButton = styled(Button, {
name: PREFIX,
overridesResolver: (props, styles) => styles.root,
})(({ theme }) => ({
color: (theme.vars || theme).palette.error.main,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${(theme.vars || theme).palette.error.main}, transparent 12%)`,
// Reset on mouse devices
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
}));
})(() => ({}));

const defaultIcon = <ActionDelete />;

Expand Down
12 changes: 2 additions & 10 deletions packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export const BulkDeleteWithUndoButton = (
onClick={handleClick}
label={label}
disabled={isPending}
color="error"
{...sanitizeRestProps(rest)}
>
{icon}
Expand Down Expand Up @@ -131,16 +132,7 @@ const PREFIX = 'RaBulkDeleteWithUndoButton';
const StyledButton = styled(Button, {
name: PREFIX,
overridesResolver: (props, styles) => styles.root,
})(({ theme }) => ({
color: (theme.vars || theme).palette.error.main,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${(theme.vars || theme).palette.error.main}, transparent 12%)`,
// Reset on mouse devices
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
}));
})(() => ({}));

declare module '@mui/material/styles' {
interface ComponentNameToClassKey {
Expand Down
11 changes: 1 addition & 10 deletions packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,7 @@ const PREFIX = 'RaBulkUpdateWithConfirmButton';
const StyledButton = styled(Button, {
name: PREFIX,
overridesResolver: (props, styles) => styles.root,
})(({ theme }) => ({
color: (theme.vars || theme).palette.primary.main,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${(theme.vars || theme).palette.primary.main}, transparent 12%)`,
// Reset on mouse devices
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
}));
})(() => ({}));

const defaultIcon = <ActionUpdate />;

Expand Down
11 changes: 1 addition & 10 deletions packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,7 @@ const PREFIX = 'RaBulkUpdateWithUndoButton';
const StyledButton = styled(Button, {
name: PREFIX,
overridesResolver: (props, styles) => styles.root,
})(({ theme }) => ({
color: (theme.vars || theme).palette.primary.main,
'&:hover': {
backgroundColor: `color-mix(in srgb, ${(theme.vars || theme).palette.primary.main}, transparent 12%)`,
// Reset on mouse devices
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
}));
})(() => ({}));

declare module '@mui/material/styles' {
interface ComponentNameToClassKey {
Expand Down
10 changes: 1 addition & 9 deletions packages/ra-ui-materialui/src/button/SelectAllButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,7 @@ const PREFIX = 'RaSelectAllButton';
const StyledButton = styled(Button, {
name: PREFIX,
overridesResolver: (props, styles) => styles.root,
})(({ theme }) => ({
'&:hover': {
backgroundColor: `color-mix(in srgb, ${(theme.vars || theme).palette.primary.main}, transparent 12%)`,
// Reset on mouse devices
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
}));
})(() => ({}));

declare module '@mui/material/styles' {
interface ComponentNameToClassKey {
Expand Down
9 changes: 4 additions & 5 deletions packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
styled,
useThemeProps,
lighten,
darken,
} from '@mui/material/styles';
import clsx from 'clsx';
import Toolbar from '@mui/material/Toolbar';
Expand Down Expand Up @@ -69,7 +70,7 @@ export const BulkActionsToolbar = (inProps: BulkActionsToolbarProps) => {
color: theme =>
(theme.vars || theme).palette.text.primary,
}}
variant="subtitle1"
variant="body1"
>
{translate(label, {
_: label,
Expand Down Expand Up @@ -124,7 +125,7 @@ const Root = styled('div', {
? theme.vars.palette.bulkActionsToolbarBackgroundColor
: theme.palette.mode === 'light'
? lighten(theme.palette.primary.light, 0.8)
: theme.palette.primary.dark,
: darken(theme.palette.primary.dark, 0.5),
minHeight: theme.spacing(6),
height: theme.spacing(6),
paddingRight: theme.spacing(2),
Expand Down Expand Up @@ -158,14 +159,12 @@ const Root = styled('div', {
[`& .${BulkActionsToolbarClasses.title}`]: {
display: 'flex',
flex: '0 0 auto',
alignItems: 'center',
gap: theme.spacing(1),
},

[`& .${BulkActionsToolbarClasses.icon}`]: {
marginLeft: '-0.5em',
'&:hover': {
backgroundColor: `color-mix(in srgb, ${(theme.vars || theme).palette.primary.main}, transparent 12%)`,
},
},
}));

Expand Down
31 changes: 31 additions & 0 deletions packages/ra-ui-materialui/src/theme/bwTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,37 @@ const createBWTheme = (mode: 'light' | 'dark'): ThemeOptions => {
},
MuiIconButton: {
defaultProps: { disableRipple: true },
styleOverrides: {
root: {
textTransform: 'none',
boxShadow: 'none',
},
colorPrimary: {
'&:hover': {
backgroundColor: GREY,
},
},
colorSuccess: {
borderColor: isDarkMode
? alpha(green['500'], 0.7)
: alpha(green['800'], 0.5),
'&:hover': {
borderColor: isDarkMode
? green['500']
: green['800'],
},
},
colorError: {
borderColor: isDarkMode
? alpha(deepOrange['600'], 0.7)
: alpha(red['900'], 0.5),
'&:hover': {
borderColor: isDarkMode
? deepOrange['600']
: red['900'],
},
},
},
},
MuiListItemButton: {
defaultProps: { disableRipple: true },
Expand Down
9 changes: 8 additions & 1 deletion packages/ra-ui-materialui/src/theme/houseTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const componentsOverrides = (theme: Theme): ThemeOptions['components'] => ({
},
'&.Mui-selected, &.Mui-selected:hover': {
color: theme.palette.primary.contrastText,
zIndex: 5,
zIndex: 2,
},
'&:hover': {
color: theme.palette.primary.main,
Expand Down Expand Up @@ -165,6 +165,13 @@ const componentsOverrides = (theme: Theme): ThemeOptions['components'] => ({
fullWidth: true,
},
},
RaBulkActionsToolbar: {
styleOverrides: {
toolbar: {
zIndex: 10,
},
},
},
});

const alert = {
Expand Down
7 changes: 7 additions & 0 deletions packages/ra-ui-materialui/src/theme/radiantTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ const componentsOverrides = (theme: Theme): ThemeOptions['components'] => {
fullWidth: true,
},
},
RaBulkActionsToolbar: {
styleOverrides: {
toolbar: {
zIndex: 10,
},
},
},
};
};

Expand Down
Loading