Merge pull request #128 from indec-it/fix/showMessageWhenIsDisabled

fix(fieldMessage): display message if input is disabled
indec-it · Sep 30, 2024 · f95f776 · f95f776
2 parents 40124d5 + b71c0ab
commit f95f776
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@indec/form-builder",
-  "version": "3.5.8",
+  "version": "3.5.9",
   "description": "Form builder",
   "main": "index.js",
   "private": false,

diff --git a/src/components/Checkbox/Checkbox.js b/src/components/Checkbox/Checkbox.js
@@ -58,7 +58,7 @@ function Checkbox({options, label, field, form, disabled, warnings}) {
           />
         ))}
       </FormGroup>
-      <FieldMessage warnings={warnings} form={form} field={field} disabled={disabled} />
+      <FieldMessage warnings={warnings} form={form} field={field} />
     </Stack>
   );
 }

diff --git a/src/components/DatePicker/DatePicker.js b/src/components/DatePicker/DatePicker.js
@@ -70,7 +70,7 @@ function DatePicker({metadata: {dateType}, field, label, form, warnings, disable
             />
           )}
         </Stack>
-        <FieldMessage warnings={warnings} form={form} field={field} disabled={disabled} />
+        <FieldMessage warnings={warnings} form={form} field={field} />
       </Stack>
     </LocalizationProvider>
   );

diff --git a/src/components/FieldMessage/FieldMessage.js b/src/components/FieldMessage/FieldMessage.js
@@ -6,16 +6,16 @@ import hasFormikErrorsAndWarnings from '@/utils/hasFormikErrorsAndWarnings';
 
 const alertStyles = {justifyContent: 'center', mt: 2};
 
-function FieldMessage({form, field, disabled, warnings}) {
+function FieldMessage({form, field, warnings}) {
   const {hasWarning, warning, hasError, error} = hasFormikErrorsAndWarnings({form, field, warnings});
-  if (hasError && !disabled) {
+  if (hasError) {
     return (
       <Alert severity="error" sx={alertStyles}>
         {error}
       </Alert>
     );
   }
-  if (hasWarning && !disabled) {
+  if (hasWarning) {
     return (
       <Alert severity="warning" sx={alertStyles}>
         {warning}
@@ -28,7 +28,6 @@ function FieldMessage({form, field, disabled, warnings}) {
 FieldMessage.propTypes = {
   field: formikField.isRequired,
   form: formikForm.isRequired,
-  disabled: PropTypes.bool.isRequired,
   warnings: PropTypes.shape({}).isRequired
 };
 

diff --git a/src/components/Radio/MobileRadio/MobileRadio.js b/src/components/Radio/MobileRadio/MobileRadio.js
@@ -28,7 +28,7 @@ function MobileRadio({options, field, disabled, label, form, warnings}) {
           </Button>
         ))}
       </Stack>
-      <FieldMessage form={form} field={field} warnings={warnings} disabled={disabled} />
+      <FieldMessage form={form} field={field} warnings={warnings} />
     </Stack>
   );
 }

diff --git a/src/components/Radio/Radio.js b/src/components/Radio/Radio.js
@@ -51,7 +51,7 @@ function Radio({options, field, disabled, label, form, warnings}) {
           </Stack>
         ))}
       </RadioGroup>
-      <FieldMessage form={form} field={field} warnings={warnings} disabled={disabled} />
+      <FieldMessage form={form} field={field} warnings={warnings} />
     </Stack>
   );
 }

diff --git a/src/components/RadioTable/RadioTable.js b/src/components/RadioTable/RadioTable.js
@@ -79,7 +79,7 @@ function RadioTable({options, label, form, field, disabled, warnings}) {
           </Stack>
         </Box>
       ))}
-      <FieldMessage warnings={warnings} form={form} field={field} disabled={disabled} />
+      <FieldMessage warnings={warnings} form={form} field={field} />
     </Stack>
   );
 }

diff --git a/src/components/TextField/TextField.js b/src/components/TextField/TextField.js
@@ -50,7 +50,7 @@ function TextField({form, field, placeholder, label, disabled, tooltip, warnings
         rows={multiline ? 2 : 1}
         onWheel={e => e.target.blur()}
       />
-      <FieldMessage warnings={warnings} form={form} field={field} disabled={disabled} />
+      <FieldMessage warnings={warnings} form={form} field={field} />
     </Box>
   );
 }