fix: allow InputProps default to be overriden

ocadotechnology · Jun 26, 2023 · 4b44d00 · 4b44d00
1 parent 3f550d5
commit 4b44d00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/src/components/form/EmailField.tsx b/src/components/form/EmailField.tsx
@@ -22,25 +22,18 @@ const EmailField: React.FC<EmailFieldProps> = ({
   validate = YupString().email(),
   ...otherTextFieldProps
 }) => {
-  let {
-    endAdornment,
-    ...otherInputProps
-  } = InputProps;
-
-  endAdornment = (
-    <InputAdornment position='end'>
-      <EmailOutlinedIcon />
-    </InputAdornment>
-  );
-
   return (
     <TextField
       type='email'
       name={name}
       validate={validate}
       InputProps={{
-        endAdornment,
-        ...otherInputProps
+        endAdornment: (
+          <InputAdornment position='end'>
+            <EmailOutlinedIcon />
+          </InputAdornment>
+        ),
+        ...InputProps
       }}
       {...otherTextFieldProps}
     />

diff --git a/src/components/form/PasswordField.tsx b/src/components/form/PasswordField.tsx
@@ -28,12 +28,12 @@ const PasswordField: React.FC<PasswordFieldProps> = ({
       name={name}
       validate={validate}
       InputProps={{
-        ...InputProps,
         endAdornment: (
           <InputAdornment position='end'>
             <SecurityIcon />
           </InputAdornment>
-        )
+        ),
+        ...InputProps
       }}
       {...otherTextFieldProps}
     />