Skip to content

Commit 3019202

Browse files
committed
fix: harmonize support for additional props in all basic input components
Lack of additional props prevent integrators from adding custom data-cy properties for Cypress selectors.
1 parent 269c6a8 commit 3019202

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import DateFnsUtils from '@date-io/date-fns';
88
import { MuiPickersUtilsProvider, KeyboardDatePicker } from '@material-ui/pickers';
99

1010
export const BasicDateInput = (props) => {
11-
const { id, label, format, value, dateProps, changeSelectedDate } = props;
11+
const { id, label, format, value, dateProps, changeSelectedDate, ...otherProps } = props;
1212

1313
return (
1414
<MuiPickersUtilsProvider utils={DateFnsUtils}>
@@ -19,13 +19,13 @@ export const BasicDateInput = (props) => {
1919
format={format}
2020
label={label}
2121
id={id}
22-
data-cy={id + '-date-input'}
2322
onChange={changeSelectedDate}
2423
KeyboardButtonProps={{
2524
'aria-label': 'change date',
2625
}}
2726
value={value}
2827
{...dateProps}
28+
{...otherProps}
2929
/>
3030
</MuiPickersUtilsProvider>
3131
);

src/inputs/BasicInputs/BasicEnumInput/BasicEnumInput.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ const useStyles = makeStyles((theme) => ({
1313

1414
export const BasicEnumInput = (props) => {
1515
const classes = useStyles();
16-
const { label, value, textFieldProps, enumValues, changeEnumField } = props;
17-
const { containerProps, labelProps } = props;
16+
const { label, value, textFieldProps, enumValues, changeEnumField, containerProps, labelProps, ...otherProps } =
17+
props;
1818

1919
return (
20-
<Grid container className={classes.root} {...containerProps}>
20+
<Grid container className={classes.root} {...containerProps} {...otherProps}>
2121
<Grid item>
2222
<Typography {...labelProps}>{label}</Typography>
2323
</Grid>
2424
<Grid item>
2525
<TextField
26+
data-cy="text_field"
2627
select
2728
value={value}
2829
{...textFieldProps}

src/inputs/BasicInputs/BasicTextInput/BasicTextInput.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ const useStyles = makeStyles((theme) => ({
1313

1414
export const BasicTextInput = (props) => {
1515
const classes = useStyles();
16-
const { label, value, textFieldProps, changeTextField, containerProps, labelProps } = props;
16+
const { label, value, textFieldProps, changeTextField, containerProps, labelProps, ...otherProps } = props;
1717

1818
return (
19-
<Grid container className={classes.root} {...containerProps}>
19+
<Grid container className={classes.root} {...containerProps} {...otherProps}>
2020
<Grid item>
2121
<Typography {...labelProps}>{label}</Typography>
2222
</Grid>

src/inputs/BasicInputs/BasicToggleInput/BasicToggleInput.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ const useStyles = makeStyles((theme) => ({
1313

1414
export const BasicToggleInput = (props) => {
1515
const classes = useStyles();
16-
const { label, value, switchProps, changeSwitchType, containerProps, labelProps } = props;
16+
const { label, value, switchProps, changeSwitchType, containerProps, labelProps, ...otherProps } = props;
1717

1818
return (
19-
<Grid container className={classes.root} {...containerProps}>
19+
<Grid container className={classes.root} {...containerProps} {...otherProps}>
2020
<Grid item>
2121
<Typography {...labelProps}>{label}</Typography>
2222
</Grid>

0 commit comments

Comments
 (0)