Skip to content

feat(mui-datepicker): replace action bar clear button with input adornment #903

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

Closed
LauRoxx wants to merge 1 commit into from
Closed

feat(mui-datepicker): replace action bar clear button with input adornment #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/controlled-form/src/lib/Types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ export const DatepickerPropsCategorized: DatepickerPropsObject = {
disableOpenPicker: { table: { category: 'Input Props' } },
placement: { table: { category: 'Input Props' } },
clearable: { table: { category: 'Input Props' } },
onClear: { table: { category: 'Input Props' } }
};

export const CodesAutocompletePropsCategorized: CodesAutocompletePropsObject = {
Expand Down
12 changes: 5 additions & 7 deletions packages/datepicker/src/lib/Datepicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DatePicker as MuiDatePicker, DatePickerProps as MuiDatePickerProps } fr
import type { Dayjs } from 'dayjs';
import type {} from '@mui/x-date-pickers/AdapterDayjs';
import { PickersTextField as MuiPickersTextField, PickersTextFieldProps as MuiPickersTextFieldProps } from '@mui/x-date-pickers/PickersTextField';
import { PickerFieldUISlotProps } from '@mui/x-date-pickers/internals';
import { ExportedPickerFieldUIProps, PickerFieldUISlotProps } from '@mui/x-date-pickers/internals';
import { FormHelperText, FormLabel, InputPropOverrides } from '@availity/mui-form-utils';
import { forwardRef } from 'react';

Expand All @@ -18,9 +18,8 @@ export type DatepickerProps = {
* @default bottom-start
*/
placement?: 'bottom-start' | 'bottom' | 'bottom-end';
/** Determines if the clear button appears in the action bar */
clearable?: boolean;
} & Omit<
} & Pick<ExportedPickerFieldUIProps, 'onClear' | 'clearable'>
& Omit<
MuiDatePickerProps<false>,
| 'components'
| 'componentsProps'
Expand Down Expand Up @@ -76,22 +75,21 @@ export const Datepicker = ({
FieldProps,
placement = 'bottom-start',
clearable,
onClear,
...props
}: DatepickerProps): React.JSX.Element => {
return (
<MuiDatePicker
{...props}
dayOfWeekFormatter={(weekday: Dayjs) => weekday.format('dd')}
slotProps={{
actionBar: {
actions: clearable ? ['clear'] : [],
},
desktopPaper: paperProps,
mobilePaper: {
...paperProps,
'aria-label': FieldProps?.label?.toString() || FieldProps?.inputProps?.['aria-label'] || 'Date picker',
'aria-labelledby': FieldProps?.inputProps?.['aria-labelledby'] || undefined,
},
field: { clearable, onClear },
textField: FieldProps,
popper: {
placement,
Expand Down
4 changes: 4 additions & 0 deletions packages/theme/src/lib/light-theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,6 +1858,10 @@ export const lightTheme = {
// padding: '8px',
color: tokens.colorGrey400,
},
'.MuiInputAdornment-root .MuiIconButton-root': {
width: '2.25rem',
height: '2.25rem',
},
},
},
},
Expand Down
Loading