From 30192023d947823d83a20fb0249acf77be1d88e7 Mon Sep 17 00:00:00 2001
From: Tristan Huet <tristan.huet@cosmotech.com>
Date: Fri, 29 Oct 2021 14:31:21 +0200
Subject: [PATCH] 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.
---
 src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js    | 4 ++--
 src/inputs/BasicInputs/BasicEnumInput/BasicEnumInput.js    | 7 ++++---
 src/inputs/BasicInputs/BasicTextInput/BasicTextInput.js    | 4 ++--
 .../BasicInputs/BasicToggleInput/BasicToggleInput.js       | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js b/src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js
index 45bca263..e49a3cc2 100644
--- a/src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js
+++ b/src/inputs/BasicInputs/BasicDateInput/BasicDateInput.js
@@ -8,7 +8,7 @@ import DateFnsUtils from '@date-io/date-fns';
 import { MuiPickersUtilsProvider, KeyboardDatePicker } from '@material-ui/pickers';
 
 export const BasicDateInput = (props) => {
-  const { id, label, format, value, dateProps, changeSelectedDate } = props;
+  const { id, label, format, value, dateProps, changeSelectedDate, ...otherProps } = props;
 
   return (
     <MuiPickersUtilsProvider utils={DateFnsUtils}>
@@ -19,13 +19,13 @@ export const BasicDateInput = (props) => {
         format={format}
         label={label}
         id={id}
-        data-cy={id + '-date-input'}
         onChange={changeSelectedDate}
         KeyboardButtonProps={{
           'aria-label': 'change date',
         }}
         value={value}
         {...dateProps}
+        {...otherProps}
       />
     </MuiPickersUtilsProvider>
   );
diff --git a/src/inputs/BasicInputs/BasicEnumInput/BasicEnumInput.js b/src/inputs/BasicInputs/BasicEnumInput/BasicEnumInput.js
index 0ccd7899..afc5fc4c 100644
--- a/src/inputs/BasicInputs/BasicEnumInput/BasicEnumInput.js
+++ b/src/inputs/BasicInputs/BasicEnumInput/BasicEnumInput.js
@@ -13,16 +13,17 @@ const useStyles = makeStyles((theme) => ({
 
 export const BasicEnumInput = (props) => {
   const classes = useStyles();
-  const { label, value, textFieldProps, enumValues, changeEnumField } = props;
-  const { containerProps, labelProps } = props;
+  const { label, value, textFieldProps, enumValues, changeEnumField, containerProps, labelProps, ...otherProps } =
+    props;
 
   return (
-    <Grid container className={classes.root} {...containerProps}>
+    <Grid container className={classes.root} {...containerProps} {...otherProps}>
       <Grid item>
         <Typography {...labelProps}>{label}</Typography>
       </Grid>
       <Grid item>
         <TextField
+          data-cy="text_field"
           select
           value={value}
           {...textFieldProps}
diff --git a/src/inputs/BasicInputs/BasicTextInput/BasicTextInput.js b/src/inputs/BasicInputs/BasicTextInput/BasicTextInput.js
index 88583b2b..95886318 100644
--- a/src/inputs/BasicInputs/BasicTextInput/BasicTextInput.js
+++ b/src/inputs/BasicInputs/BasicTextInput/BasicTextInput.js
@@ -13,10 +13,10 @@ const useStyles = makeStyles((theme) => ({
 
 export const BasicTextInput = (props) => {
   const classes = useStyles();
-  const { label, value, textFieldProps, changeTextField, containerProps, labelProps } = props;
+  const { label, value, textFieldProps, changeTextField, containerProps, labelProps, ...otherProps } = props;
 
   return (
-    <Grid container className={classes.root} {...containerProps}>
+    <Grid container className={classes.root} {...containerProps} {...otherProps}>
       <Grid item>
         <Typography {...labelProps}>{label}</Typography>
       </Grid>
diff --git a/src/inputs/BasicInputs/BasicToggleInput/BasicToggleInput.js b/src/inputs/BasicInputs/BasicToggleInput/BasicToggleInput.js
index 17393d02..eae441ac 100644
--- a/src/inputs/BasicInputs/BasicToggleInput/BasicToggleInput.js
+++ b/src/inputs/BasicInputs/BasicToggleInput/BasicToggleInput.js
@@ -13,10 +13,10 @@ const useStyles = makeStyles((theme) => ({
 
 export const BasicToggleInput = (props) => {
   const classes = useStyles();
-  const { label, value, switchProps, changeSwitchType, containerProps, labelProps } = props;
+  const { label, value, switchProps, changeSwitchType, containerProps, labelProps, ...otherProps } = props;
 
   return (
-    <Grid container className={classes.root} {...containerProps}>
+    <Grid container className={classes.root} {...containerProps} {...otherProps}>
       <Grid item>
         <Typography {...labelProps}>{label}</Typography>
       </Grid>