diff --git a/docs/data/joy/components/alert/AlertInvertedColors.js b/docs/data/joy/components/alert/AlertInvertedColors.js index 430c673439be1b..a90dc2acb4fc39 100644 --- a/docs/data/joy/components/alert/AlertInvertedColors.js +++ b/docs/data/joy/components/alert/AlertInvertedColors.js @@ -55,16 +55,16 @@ export default function AlertInvertedColors() { ({ + sx={{ position: 'absolute', bottom: 0, left: 0, right: 0, - color: `rgb(${theme.vars.palette.success.lightChannel} / 0.72)`, - '--LinearProgress-radius': '0px', - })} + borderRadius: 0, + }} /> + } diff --git a/docs/data/joy/components/alert/AlertInvertedColors.tsx b/docs/data/joy/components/alert/AlertInvertedColors.tsx index 430c673439be1b..a90dc2acb4fc39 100644 --- a/docs/data/joy/components/alert/AlertInvertedColors.tsx +++ b/docs/data/joy/components/alert/AlertInvertedColors.tsx @@ -55,16 +55,16 @@ export default function AlertInvertedColors() { ({ + sx={{ position: 'absolute', bottom: 0, left: 0, right: 0, - color: `rgb(${theme.vars.palette.success.lightChannel} / 0.72)`, - '--LinearProgress-radius': '0px', - })} + borderRadius: 0, + }} /> + } diff --git a/packages/mui-joy/src/CircularProgress/CircularProgress.tsx b/packages/mui-joy/src/CircularProgress/CircularProgress.tsx index 7b71e59c98ab72..e2c98d71f3dc33 100644 --- a/packages/mui-joy/src/CircularProgress/CircularProgress.tsx +++ b/packages/mui-joy/src/CircularProgress/CircularProgress.tsx @@ -128,6 +128,15 @@ const CircularProgressRoot = styled('span', { ...rest, }, }), + ...(ownerState.variant === 'soft' && { + '--CircularProgress-trackColor': theme.variants.soft.neutral.backgroundColor, + '--CircularProgress-progressColor': theme.variants.solid?.[ownerState.color!].backgroundColor, + }), + ...(ownerState.variant === 'solid' && { + '--CircularProgress-trackColor': + theme.variants.softHover?.[ownerState.color!].backgroundColor, + '--CircularProgress-progressColor': theme.variants.solid?.[ownerState.color!].backgroundColor, + }), }; }); diff --git a/packages/mui-joy/src/LinearProgress/LinearProgress.tsx b/packages/mui-joy/src/LinearProgress/LinearProgress.tsx index ee7d2d03f8ec9b..caee207b2e8455 100644 --- a/packages/mui-joy/src/LinearProgress/LinearProgress.tsx +++ b/packages/mui-joy/src/LinearProgress/LinearProgress.tsx @@ -113,6 +113,14 @@ const LinearProgressRoot = styled('div', { color: 'inherit', position: 'absolute', // required to make `left` animation works. }, + ...(ownerState.variant === 'soft' && { + backgroundColor: theme.variants.soft.neutral.backgroundColor, + color: theme.variants.solid?.[ownerState.color!].backgroundColor, + }), + ...(ownerState.variant === 'solid' && { + backgroundColor: theme.variants.softHover?.[ownerState.color!].backgroundColor, + color: theme.variants.solid?.[ownerState.color!].backgroundColor, + }), }), ({ ownerState }) => ownerState.determinate