Skip to content

Commit

Permalink
Bugfix/spread input props (mui#1046)
Browse files Browse the repository at this point in the history
* [mui#1031] Fix className of ClockNumber selected state

* [mui#1039] Fix not passing down InputProps

* Make InputProps not required
  • Loading branch information
dmtrKovalenko authored May 19, 2019
1 parent 4e24991 commit 055fa20
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions lib/src/_shared/KeyboardDateInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export interface KeyboardDateInputProps
onClick?: () => void;
validationError?: React.ReactNode;
inputValue: string;
InputProps?: TextFieldProps['InputProps'];
/** Pass material-ui text field variant down, bypass internal variant prop */
inputVariant?: TextFieldProps['variant'];
/**
Expand Down Expand Up @@ -52,6 +53,7 @@ const KeyboardDateInput: React.FunctionComponent<KeyboardDateInputProps> = ({
InputAdornmentProps,
onClick,
onChange,
InputProps,
mask,
maskChar = '_',
format,
Expand Down Expand Up @@ -80,6 +82,7 @@ const KeyboardDateInput: React.FunctionComponent<KeyboardDateInputProps> = ({
onChange={onChange}
variant={inputVariant as any}
InputProps={{
...InputProps,
[`${position}Adornment`]: (
<InputAdornment position={position} {...InputAdornmentProps}>
<IconButton disabled={disabled} {...KeyboardButtonProps} onClick={onClick}>
Expand Down

0 comments on commit 055fa20

Please sign in to comment.