♿ [open-formulieren/open-forms#4716] Added aria attributes to invalid…

… form fields
open-formulieren · Oct 24, 2024 · 875f791 · 875f791
1 parent ee27e5c
commit 875f791
Show file tree

Hide file tree

Showing 17 changed files with 139 additions and 11 deletions.
diff --git a/src/formio/components/Checkbox.js b/src/formio/components/Checkbox.js
@@ -1,5 +1,6 @@
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
 import './Checkbox.scss';
 
 /**
@@ -17,6 +18,11 @@ class Checkbox extends Formio.Components.components.checkbox {
     ].join(' ');
     return info;
   }
+
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
 }
 
 export default Checkbox;
diff --git a/src/formio/components/Currency.js b/src/formio/components/Currency.js
@@ -3,6 +3,8 @@ import FormioUtils from 'formiojs/utils';
 import _, {set} from 'lodash';
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
+
 /**
  * Extend the default text field to modify it to our needs.
  */
@@ -79,6 +81,11 @@ class Currency extends Formio.Components.components.currency {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   // Issue OF#1351
   // Taken from Formio https://github.com/formio/formio.js/blob/v4.13.13/src/components/currency/Currency.js#L65
   // Modified for the case where negative currencies are allowed.

diff --git a/src/formio/components/DateField.js b/src/formio/components/DateField.js
@@ -2,6 +2,8 @@ import {Formio} from 'react-formio';
 
 import {MinMaxDateValidator} from 'formio/validators/minMaxDateAndDatetimeValidator';
 
+import {setErrorAttributes} from '../utils';
+
 const DateTimeField = Formio.Components.components.datetime;
 
 const extractDate = value => {
@@ -40,6 +42,12 @@ class DateField extends DateTimeField {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    const targetElements = [this.element.querySelector('input:not([type="hidden"])')];
+    setErrorAttributes(targetElements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(targetElements, dirty, hasErrors, hasMessages);
+  }
+
   beforeSubmit() {
     // The field itself should prevent any invalid dates from being passed in
     // so we are not checking that here

diff --git a/src/formio/components/DateTimeField.js b/src/formio/components/DateTimeField.js
@@ -2,6 +2,8 @@ import {Formio} from 'react-formio';
 
 import {MinMaxDatetimeValidator} from 'formio/validators/minMaxDateAndDatetimeValidator';
 
+import {setErrorAttributes} from '../utils';
+
 const DateTimeFormio = Formio.Components.components.datetime;
 
 class DateTimeField extends DateTimeFormio {
@@ -27,6 +29,12 @@ class DateTimeField extends DateTimeFormio {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    const targetElements = [this.element.querySelector('input:not([type="hidden"])')];
+    setErrorAttributes(targetElements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(targetElements, dirty, hasErrors, hasMessages);
+  }
+
   get suffix() {
     // Don't show an icon
     return null;

diff --git a/src/formio/components/Email.js b/src/formio/components/Email.js
@@ -1,5 +1,7 @@
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
+
 /**
  * Extend the default email field to modify it to our needs.
  */
@@ -16,6 +18,11 @@ class Email extends Formio.Components.components.email {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   restoreCaretPosition() {
     if (!this.root?.currentSelection || !this.refs.input?.length) return;
 

diff --git a/src/formio/components/IBANField.js b/src/formio/components/IBANField.js
@@ -1,6 +1,8 @@
 import {electronicFormatIBAN, isValidIBAN} from 'ibantools';
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
+
 const TextField = Formio.Components.components.textfield;
 
 const IbanValidator = {
@@ -49,4 +51,9 @@ export default class IBANField extends TextField {
     ].join(' ');
     return info;
   }
+
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
 }
diff --git a/src/formio/components/Number.js b/src/formio/components/Number.js
@@ -2,6 +2,7 @@ import {maskInput} from '@formio/vanilla-text-mask';
 import {set} from 'lodash';
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
 import enableValidationPlugins from '../validators/plugins';
 
 /**
@@ -32,6 +33,11 @@ class Number extends Formio.Components.components.number {
     return super.checkComponentValidity(data, dirty, row, updatedOptions);
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   // Issue OF#1351
   // Taken from Formio https://github.com/formio/formio.js/blob/v4.13.13/src/components/number/Number.js#L112
   // Modified for the case where negative numbers are allowed.

diff --git a/src/formio/components/Password.js b/src/formio/components/Password.js
@@ -1,5 +1,7 @@
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
+
 /**
  * Extend the default password field to modify it to our needs.
  *
@@ -16,6 +18,11 @@ class Password extends Formio.Components.components.password {
     ].join(' ');
     return info;
   }
+
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
 }
 
 export default Password;
diff --git a/src/formio/components/PhoneNumberField.js b/src/formio/components/PhoneNumberField.js
@@ -1,5 +1,6 @@
 import {Formio} from 'formiojs';
 
+import {setErrorAttributes} from '../utils';
 import enableValidationPlugins from '../validators/plugins';
 
 const PhoneNumber = Formio.Components.components.phoneNumber;
@@ -44,6 +45,11 @@ class PhoneNumberField extends PhoneNumber {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   checkComponentValidity(data, dirty, row, options = {}) {
     let updatedOptions = {...options};
     if (this.component.validate.plugins && this.component.validate.plugins.length) {

diff --git a/src/formio/components/Radio.js b/src/formio/components/Radio.js
@@ -1,5 +1,7 @@
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
+
 /**
  * Extend the default radio field to modify it to our needs.
  */
@@ -14,6 +16,11 @@ class Radio extends Formio.Components.components.radio {
     ].join(' ');
     return info;
   }
+
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
 }
 
 export default Radio;
diff --git a/src/formio/components/Select.js b/src/formio/components/Select.js
@@ -1,7 +1,7 @@
 import isObject from 'lodash/isObject';
 import {Formio} from 'react-formio';
 
-import {applyPrefix} from '../utils';
+import {applyPrefix, setErrorAttributes} from '../utils';
 
 /**
  * Extend the default select field to modify it to our needs.
@@ -16,6 +16,14 @@ class Select extends Formio.Components.components.select {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    const targetElements = [
+      this.element.querySelector('.form-control input.choices__input.choices__input--cloned'),
+    ];
+    setErrorAttributes(targetElements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(targetElements, dirty, hasErrors, hasMessages);
+  }
+
   setValue(value, flags = {}) {
     // check if it's an appointment config field
     if (this.component?.appointments != null) {

diff --git a/src/formio/components/Selectboxes.js b/src/formio/components/Selectboxes.js
@@ -1,5 +1,6 @@
 import {Formio} from 'react-formio';
 
+import {setErrorAttributes} from '../utils';
 import './Checkbox.scss';
 
 /**
@@ -17,6 +18,11 @@ class Selectboxes extends Formio.Components.components.selectboxes {
     ].join(' ');
     return info;
   }
+
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
 }
 
 export default Selectboxes;
diff --git a/src/formio/components/TextArea.js b/src/formio/components/TextArea.js
@@ -1,6 +1,6 @@
 import {Formio} from 'react-formio';
 
-import {escapeHtml} from '../utils';
+import {escapeHtml, setErrorAttributes} from '../utils';
 
 /**
  * Extend the default text field to modify it to our needs.
@@ -17,6 +17,11 @@ class TextArea extends Formio.Components.components.textarea {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   renderElement(value, index) {
     // security issue #19 - self XSS if the contents are not escaped and formio ends
     // up rendering the unsanitized content. As a workaround, we apply the escaping

diff --git a/src/formio/components/TextField.js b/src/formio/components/TextField.js
@@ -2,6 +2,7 @@ import debounce from 'lodash/debounce';
 import {Formio} from 'react-formio';
 
 import {get} from '../../api';
+import {setErrorAttributes} from '../utils';
 import enableValidationPlugins from '../validators/plugins';
 
 const POSTCODE_REGEX = /^[0-9]{4}\s?[a-zA-Z]{2}$/;
@@ -29,13 +30,6 @@ class TextField extends Formio.Components.components.textfield {
     return info;
   }
 
-  checkValidity(data, dirty, row, silentCheck) {
-    const validity = super.checkValidity(data, dirty, row, silentCheck);
-    console.log({data, dirty, row, validity});
-    // info.attr['aria-describedby'] = '';
-    return validity;
-  }
-
   checkComponentValidity(data, dirty, row, options = {}) {
     let updatedOptions = {...options};
     if (this.component.validate.plugins && this.component.validate.plugins.length) {
@@ -44,6 +38,11 @@ class TextField extends Formio.Components.components.textfield {
     return super.checkComponentValidity(data, dirty, row, updatedOptions);
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   /**
    * Return a debounced method to look up and autocomplete the location data.
    */

diff --git a/src/formio/components/TimeField.js b/src/formio/components/TimeField.js
@@ -2,6 +2,8 @@ import {Formio} from 'react-formio';
 
 import MinMaxTimeValidator from 'formio/validators/MinMaxTimeValidator';
 
+import {setErrorAttributes} from '../utils';
+
 const Time = Formio.Components.components.time;
 
 class TimeField extends Time {
@@ -30,6 +32,11 @@ class TimeField extends Time {
     return info;
   }
 
+  setErrorClasses(elements, dirty, hasErrors, hasMessages) {
+    setErrorAttributes(elements, hasErrors, hasMessages, this.element);
+    return super.setErrorClasses(elements, dirty, hasErrors, hasMessages);
+  }
+
   getStringAsValue(value) {
     const result = super.getStringAsValue(value);
     if (result === 'Invalid date') return value;

diff --git a/src/formio/templates/map.ejs b/src/formio/templates/map.ejs
@@ -1 +1 @@
-<div ref="mapContainer" id="map-{{ctx.instance.id}}" class="{{ctx.ofPrefix}}leaflet-map"></div>
+<div ref="mapContainer" id="{{ctx.instance.id}}-map" class="{{ctx.ofPrefix}}leaflet-map"></div>
diff --git a/src/formio/utils.js b/src/formio/utils.js
@@ -14,4 +14,38 @@ const escapeHtml = source => {
   return pre.innerHTML.replace(/"/g, '&quot;').replace(/'/g, '&apos;').replace(/&/g, '&amp;');
 };
 
-export {applyPrefix, escapeHtml};
+const setErrorAttributes = (elements, hasErrors, hasMessages, parentElement) => {
+  // Update the attributes 'aria-invalid' and 'aria-describedby' using on hasErrors
+  elements.forEach(element => {
+    const errorMessageElementId = parentElement?.querySelector('[ref="messageContainer"]')?.id;
+    let ariaDescriptions = (element.getAttribute('aria-describedby') || '')
+      .split(' ')
+      .filter(description => description !== '');
+
+    if (hasErrors && hasMessages && !ariaDescriptions.includes(errorMessageElementId)) {
+      // The input has an error and the error message isn't part of the ariaDescriptions
+      ariaDescriptions.push(errorMessageElementId);
+    }
+
+    if (!hasErrors && ariaDescriptions.includes(errorMessageElementId)) {
+      // The input doesn't have an error, but the error message is part of the ariaDescriptions
+      ariaDescriptions = ariaDescriptions.filter(
+        description => description !== errorMessageElementId
+      );
+    }
+
+    if (ariaDescriptions.length > 0) {
+      element.setAttribute('aria-describedby', ariaDescriptions.join(' '));
+    } else {
+      element.removeAttribute('aria-describedby');
+    }
+
+    if (hasErrors) {
+      element.setAttribute('aria-invalid', 'true');
+    } else {
+      element.removeAttribute('aria-invalid');
+    }
+  });
+};
+
+export {applyPrefix, escapeHtml, setErrorAttributes};
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div ref="mapContainer" id="map-{{ctx.instance.id}}" class="{{ctx.ofPrefix}}leaflet-map"></div>
		<div ref="mapContainer" id="{{ctx.instance.id}}-map" class="{{ctx.ofPrefix}}leaflet-map"></div>