From 2753c0220103943237c6f6d4791e0411bafcdb83 Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 21 Feb 2025 12:30:32 +0200 Subject: [PATCH 1/2] [pickers] Fix `TimeClock` meridiem button selected styles --- packages/x-date-pickers/src/TimeClock/Clock.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/x-date-pickers/src/TimeClock/Clock.tsx b/packages/x-date-pickers/src/TimeClock/Clock.tsx index b13ae9d11ddc3..36764675fa6d8 100644 --- a/packages/x-date-pickers/src/TimeClock/Clock.tsx +++ b/packages/x-date-pickers/src/TimeClock/Clock.tsx @@ -158,7 +158,10 @@ const ClockPin = styled('div', { transform: 'translate(-50%, -50%)', })); -const meridiemButtonCommonStyles = (theme: Theme, meridiemMode: Meridiem) => ({ +const meridiemButtonCommonStyles = ( + theme: Theme, + clockMeridiemMode: ClockOwnerState['clockMeridiemMode'], +) => ({ zIndex: 1, bottom: 8, paddingLeft: 4, @@ -166,7 +169,7 @@ const meridiemButtonCommonStyles = (theme: Theme, meridiemMode: Meridiem) => ({ width: CLOCK_HOUR_WIDTH, variants: [ { - props: { meridiemMode }, + props: { clockMeridiemMode }, style: { backgroundColor: (theme.vars || theme).palette.primary.main, color: (theme.vars || theme).palette.primary.contrastText, From 69de7d373b0a5803092f251e21f501efcc14f82b Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 21 Feb 2025 12:43:55 +0200 Subject: [PATCH 2/2] Yet another fix... --- packages/x-date-pickers/src/TimeClock/ClockPointer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x-date-pickers/src/TimeClock/ClockPointer.tsx b/packages/x-date-pickers/src/TimeClock/ClockPointer.tsx index 65eb157ebb58f..9142e63f1370e 100644 --- a/packages/x-date-pickers/src/TimeClock/ClockPointer.tsx +++ b/packages/x-date-pickers/src/TimeClock/ClockPointer.tsx @@ -84,7 +84,7 @@ const ClockPointerThumb = styled('div', { boxSizing: 'content-box', variants: [ { - props: { isBetweenTwoClockValues: false }, + props: { isClockPointerBetweenTwoValues: false }, style: { backgroundColor: (theme.vars || theme).palette.primary.main, },