Skip to content
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

[pickers] Fix date calendar issues #9652

Merged
merged 4 commits into from
Jul 12, 2023
Merged

[pickers] Fix date calendar issues #9652

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
0bc56af
Fix selected day styling correctly
LukasTy Jun 9, 2023
793e633
Remove toolbar pen icon leftovers
LukasTy May 18, 2023
af6d616
Remove unwanted extra `opacity`
LukasTy May 17, 2023
52aacee
Code review: Alex
LukasTy Jul 12, 2023
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
8 changes: 1 addition & 7 deletions packages/x-date-pickers-pro/src/DateRangePicker/DateRangePickerToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { unstable_composeClasses as composeClasses } from '@mui/utils';
import {
PickersToolbar,
PickersToolbarButton,
pickersToolbarClasses,
useUtils,
BaseToolbarProps,
useLocaleText,
Expand Down Expand Up @@ -47,12 +46,7 @@ const DateRangePickerToolbarRoot = styled(PickersToolbar, {
overridesResolver: (_, styles) => styles.root,
})<{
ownerState: DateRangePickerToolbarProps<any>;
}>({
[`& .${pickersToolbarClasses.penIconButton}`]: {
position: 'relative',
top: 4,
},
});
}>({});

const DateRangePickerToolbarContainer = styled('div', {
name: 'MuiDateRangePickerToolbar',
Expand Down
9 changes: 1 addition & 8 deletions packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useLicenseVerifier } from '@mui/x-license-pro';
import { alpha, styled, useThemeProps } from '@mui/material/styles';
import { unstable_composeClasses as composeClasses } from '@mui/utils';
import { useUtils } from '@mui/x-date-pickers/internals';
import { PickersDay, pickersDayClasses, PickersDayProps } from '@mui/x-date-pickers/PickersDay';
import { PickersDay, PickersDayProps } from '@mui/x-date-pickers/PickersDay';
import {
DateRangePickerDayClasses,
getDateRangePickerDayUtilityClass,
Expand Down Expand Up @@ -253,13 +253,6 @@ const DateRangePickerDayDay = styled(PickersDay, {
'& > *': {
transform: 'scale(0.9)',
},
...(!ownerState.selected &&
ownerState.isHighlighting && {
opacity: 0.7,
[`&.${pickersDayClasses.dayOutsideMonth}`]: {
opacity: 0.4,
},
}),
...(ownerState.draggable && {
cursor: 'grab',
}),
Expand Down
6 changes: 0 additions & 6 deletions packages/x-date-pickers/src/DateTimePicker/DateTimePickerToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { styled, useThemeProps, useTheme, Theme } from '@mui/material/styles';
import { unstable_composeClasses as composeClasses } from '@mui/utils';
import { PickersToolbarText } from '../internals/components/PickersToolbarText';
import { PickersToolbar } from '../internals/components/PickersToolbar';
import { pickersToolbarClasses } from '../internals/components/pickersToolbarClasses';
import { PickersToolbarButton } from '../internals/components/PickersToolbarButton';
import { useLocaleText, useUtils } from '../internals/hooks/useUtils';
import { BaseToolbarProps, ExportedBaseToolbarProps } from '../internals/models/props/toolbar';
Expand Down Expand Up @@ -64,11 +63,6 @@ const DateTimePickerToolbarRoot = styled(PickersToolbar, {
: undefined,
justifyContent: 'space-around',
position: 'relative',
[`& .${pickersToolbarClasses.penIconButton}`]: {
position: 'absolute',
top: 8,
...(theme.direction === 'rtl' ? { left: 8 } : { right: 8 }),
},
}));

DateTimePickerToolbarRoot.propTypes = {
Expand Down
5 changes: 3 additions & 2 deletions packages/x-date-pickers/src/PickersDay/PickersDay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,16 @@ const useUtilityClasses = (ownerState: PickersDayProps<any>) => {
classes,
} = ownerState;

const isHiddenDaySpacingFiller = outsideCurrentMonth && !showDaysOutsideCurrentMonth;
const slots = {
root: [
'root',
selected && 'selected',
selected && !isHiddenDaySpacingFiller && 'selected',
disabled && 'disabled',
!disableMargin && 'dayWithMargin',
!disableHighlightToday && today && 'today',
outsideCurrentMonth && showDaysOutsideCurrentMonth && 'dayOutsideMonth',
outsideCurrentMonth && !showDaysOutsideCurrentMonth && 'hiddenDaySpacingFiller',
isHiddenDaySpacingFiller && 'hiddenDaySpacingFiller',
],
hiddenDaySpacingFiller: ['hiddenDaySpacingFiller'],
};
Expand Down
7 changes: 1 addition & 6 deletions packages/x-date-pickers/src/TimePicker/TimePickerToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { unstable_composeClasses as composeClasses } from '@mui/utils';
import { PickersToolbarText } from '../internals/components/PickersToolbarText';
import { PickersToolbarButton } from '../internals/components/PickersToolbarButton';
import { PickersToolbar } from '../internals/components/PickersToolbar';
import { pickersToolbarClasses } from '../internals/components/pickersToolbarClasses';
import { arrayIncludes } from '../internals/utils/utils';
import { useLocaleText, useUtils } from '../internals/hooks/useUtils';
import { useMeridiemMode } from '../internals/hooks/date-helpers-hooks';
Expand Down Expand Up @@ -53,11 +52,7 @@ const TimePickerToolbarRoot = styled(PickersToolbar, {
overridesResolver: (props, styles) => styles.root,
})<{
ownerState: TimePickerToolbarProps<any>;
}>({
[`& .${pickersToolbarClasses.penIconButtonLandscape}`]: {
marginTop: 'auto',
},
});
}>({});

const TimePickerToolbarSeparator = styled(PickersToolbarText, {
name: 'MuiTimePickerToolbar',
Expand Down
6 changes: 0 additions & 6 deletions packages/x-date-pickers/src/internals/components/pickersToolbarClasses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ export interface PickersToolbarClasses {
root: string;
/** Styles applied to the content element. */
content: string;
/** Styles applied to the pen icon button element. */
penIconButton: string;
/** Styles applied to the pen icon button element in landscape mode. */
penIconButtonLandscape: string;
}

export type PickersToolbarClassKey = keyof PickersToolbarClasses;
Expand All @@ -23,6 +19,4 @@ export function getPickersToolbarUtilityClass(slot: string) {
export const pickersToolbarClasses = generateUtilityClasses('MuiPickersToolbar', [
'root',
'content',
'penIconButton',
'penIconButtonLandscape',
]);
9 changes: 1 addition & 8 deletions packages/x-date-pickers/src/themeAugmentation/themeAugmentation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ import {
} from '../TimeClock';
import { datePickerToolbarClasses } from '../DatePicker';
import { dateTimePickerToolbarClasses } from '../DateTimePicker';
import {
pickersArrowSwitcherClasses,
pickersPopperClasses,
pickersToolbarClasses,
} from '../internals';
import { pickersArrowSwitcherClasses, pickersPopperClasses } from '../internals';
import { pickersDayClasses } from '../PickersDay';
import { timePickerToolbarClasses } from '../TimePicker';
import { pickersMonthClasses } from '../MonthCalendar';
Expand Down Expand Up @@ -410,9 +406,6 @@ createTheme({
styleOverrides: {
root: {
backgroundColor: 'red',
[`.${pickersToolbarClasses.penIconButton}`]: {
backgroundColor: 'green',
},
},
// @ts-expect-error invalid MuiPickersToolbar class key
contentWrapper: {
Expand Down