@bpmn-io/form-js-viewer 1.7.0 → 1.7.2

package/dist/index.es.js

@@ -3,7 +3,7 @@ import { isString, get, isNil, isObject, some, isNumber, set, findIndex, isArray
 import Big from 'big.js';
 import classNames from 'classnames';
 import { jsx, jsxs, Fragment } from 'preact/jsx-runtime';
-import { useContext, useMemo, useRef, useEffect, useState, useCallback, useLayoutEffect } from 'preact/hooks';
+import { useContext, useMemo, useRef, useCallback, useEffect, useState, useLayoutEffect } from 'preact/hooks';
 import { createContext, createElement, Fragment as Fragment$1, render } from 'preact';
 import isEqual from 'lodash/isEqual';
 import flatpickr from 'flatpickr';
@@ -772,20 +772,59 @@ function useCondition(condition) {
   }, [conditionChecker, condition, expressionContextInfo]);
 }
 
-// parses the options data from the provided form field and form data
-function getOptionsData(formField, formData) {
+/**
+ * Returns the options data for the provided if they can be simply determined, ignoring expression defined options.
+ *
+ * @param {object} formField
+ * @param {object} formData
+ */
+function getSimpleOptionsData(formField, formData) {
   const {
+    valuesExpression: optionsExpression,
     valuesKey: optionsKey,
     values: staticOptions
   } = formField;
+  if (optionsExpression) {
+    return null;
+  }
   return optionsKey ? get(formData, [optionsKey]) : staticOptions;
 }
 
-// transforms the provided options into a normalized format, trimming invalid options
+/**
+ * Normalizes the provided options data to a format that can be used by the select components.
+ * If the options data is not valid, it is filtered out.
+ *
+ * @param {any[]} optionsData
+ *
+ * @returns {object[]}
+ */
 function normalizeOptionsData(optionsData) {
   return optionsData.filter(_isAllowedValue).map(_normalizeOption).filter(o => !isNil(o));
 }
 
+/**
+ * Creates an options object with default values if no options are provided.
+ *
+ * @param {object} options
+ *
+ * @returns {object}
+ */
+function createEmptyOptions(options = {}) {
+  const defaults = {};
+
+  // provide default options if valuesKey and valuesExpression are not set
+  if (!options.valuesKey && !options.valuesExpression) {
+    defaults.values = [{
+      label: 'Value',
+      value: 'value'
+    }];
+  }
+  return {
+    ...defaults,
+    ...options
+  };
+}
+
 /**
  * Converts the provided option to a normalized format.
  * If the option is not valid, null is returned.
@@ -836,21 +875,6 @@ function _isAllowedValue(value) {
   }
   return _isAllowedPrimitive(value);
 }
-function createEmptyOptions(options = {}) {
-  const defaults = {};
-
-  // provide default options if valuesKey and valuesExpression are not set
-  if (!options.valuesKey && !options.valuesExpression) {
-    defaults.values = [{
-      label: 'Value',
-      value: 'value'
-    }];
-  }
-  return {
-    ...defaults,
-    ...options
-  };
-}
 
 /**
  * Evaluate a string reactively based on the expressionLanguage and form data.
@@ -871,29 +895,19 @@ function useExpressionEvaluation(value) {
   }, [expressionLanguage, expressionContextInfo, value]);
 }
 
-function usePrevious(value, defaultValue = null) {
-  const ref = useRef(defaultValue);
-  useEffect(() => ref.current = value, [value]);
-  return ref.current;
-}
-
 /**
  * A custom hook to manage state changes with deep comparison.
  *
- * @param {any} value - The current value to manage.
- * @param {any} defaultValue - The initial default value for the state.
- * @returns {any} - Returns the current state.
+ * @template T
+ * @param {T} value - The current value to manage.
+ * @returns {T} - Returns the current state.
  */
-function useDeepCompareState(value, defaultValue) {
-  const [state, setState] = useState(defaultValue);
-  const previous = usePrevious(value, defaultValue);
-  const changed = !isEqual(previous, value);
-  useEffect(() => {
-    if (changed) {
-      setState(value);
-    }
-  }, [changed, value]);
-  return state;
+function useDeepCompareMemoize(value) {
+  const ref = useRef();
+  if (!isEqual(value, ref.current)) {
+    ref.current = value;
+  }
+  return ref.current;
 }
 
 /**
@@ -923,15 +937,10 @@ function useOptionsAsync(field) {
     valuesKey: optionsKey,
     values: staticOptions
   } = field;
-  const [optionsGetter, setOptionsGetter] = useState({
-    options: [],
-    error: undefined,
-    loadState: LOAD_STATES.LOADING
-  });
   const initialData = useService('form')._getState().initialData;
   const expressionEvaluation = useExpressionEvaluation(optionsExpression);
-  const evaluatedOptions = useDeepCompareState(expressionEvaluation || [], []);
-  useEffect(() => {
+  const evaluatedOptions = useDeepCompareMemoize(expressionEvaluation || []);
+  const optionsGetter = useMemo(() => {
     let options = [];
 
     // dynamic options
@@ -946,18 +955,16 @@ function useOptionsAsync(field) {
       options = Array.isArray(staticOptions) ? staticOptions : [];
 
       // expression
-    } else if (optionsExpression) {
-      if (evaluatedOptions && Array.isArray(evaluatedOptions)) {
-        options = evaluatedOptions;
-      }
+    } else if (optionsExpression && evaluatedOptions && Array.isArray(evaluatedOptions)) {
+      options = evaluatedOptions;
+
+      // error case
     } else {
-      setOptionsGetter(buildErrorState('No options source defined in the form definition'));
-      return;
+      return buildErrorState('No options source defined in the form definition');
     }
 
     // normalize data to support primitives and partially defined objects
-    options = normalizeOptionsData(options);
-    setOptionsGetter(buildLoadedState(options));
+    return buildLoadedState(normalizeOptionsData(options));
   }, [optionsKey, staticOptions, initialData, optionsExpression, evaluatedOptions]);
   return optionsGetter;
 }
@@ -1002,14 +1009,14 @@ const getDOMPurifyConfig = sanitizeStyleTags => {
   };
 };
 
-/**
- * A custom hook to build up security attributes from form configuration.
- *
- * @param {Object} security - The security configuration.
- * @returns {Array} - Returns a tuple with sandbox and allow attributes.
+/**
+ * A custom hook to build up security attributes from form configuration.
+ *
+ * @param {Object} security - The security configuration.
+ * @returns {Array} - Returns a tuple with sandbox and allow attributes.
  */
 function useSecurityAttributesMap(security) {
-  const securityMemoized = useDeepCompareState(security);
+  const securityMemoized = useDeepCompareMemoize(security);
   const sandbox = useMemo(() => SECURITY_ATTRIBUTES_DEFINITIONS.filter(({
     attribute
   }) => attribute === SANDBOX_ATTRIBUTE).filter(({
@@ -1181,6 +1188,12 @@ function useReadonly(formField, properties = {}) {
   return readonly || false;
 }
 
+function usePrevious(value, defaultValue = null) {
+  const ref = useRef(defaultValue);
+  useEffect(() => ref.current = value, [value]);
+  return ref.current;
+}
+
 function useFlushDebounce(func) {
   const timeoutRef = useRef(null);
   const lastArgsRef = useRef(null);
@@ -1445,8 +1458,16 @@ function sanitizeSingleSelectValue(options) {
     data,
     value
   } = options;
+  const {
+    valuesExpression: optionsExpression
+  } = formField;
   try {
-    const validValues = normalizeOptionsData(getOptionsData(formField, data)).map(v => v.value);
+    // if options are expression evaluated, we don't need to sanitize the value against the options
+    // and defer to the field's internal validation
+    if (optionsExpression) {
+      return value;
+    }
+    const validValues = normalizeOptionsData(getSimpleOptionsData(formField, data)).map(v => v.value);
     return hasEqualValue(value, validValues) ? value : null;
   } catch (error) {
     // use default value in case of formatting error
@@ -1460,8 +1481,16 @@ function sanitizeMultiSelectValue(options) {
     data,
     value
   } = options;
+  const {
+    valuesExpression: optionsExpression
+  } = formField;
   try {
-    const validValues = normalizeOptionsData(getOptionsData(formField, data)).map(v => v.value);
+    // if options are expression evaluated, we don't need to sanitize the values against the options
+    // and defer to the field's internal validation
+    if (optionsExpression) {
+      return value;
+    }
+    const validValues = normalizeOptionsData(getSimpleOptionsData(formField, data)).map(v => v.value);
     return value.filter(v => hasEqualValue(v, validValues));
   } catch (error) {
     // use default value in case of formatting error
@@ -1549,7 +1578,7 @@ function useCleanupMultiSelectValue(props) {
     onChange,
     values
   } = props;
-  const memoizedValues = useDeepCompareState(values, []);
+  const memoizedValues = useDeepCompareMemoize(values || []);
 
   // ensures that the values are always a subset of the possible options
   useEffect(() => {
@@ -1569,7 +1598,8 @@ function useCleanupMultiSelectValue(props) {
 
 function Description(props) {
   const {
-    description
+    description,
+    id
   } = props;
   const evaluatedDescription = useSingleLineTemplateEvaluation(description || '', {
     debug: true
@@ -1578,6 +1608,7 @@ function Description(props) {
     return null;
   }
   return jsx("div", {
+    id: id,
     class: "fjs-form-field-description",
     children: evaluatedDescription
   });
@@ -1608,6 +1639,7 @@ function Errors(props) {
 function Label(props) {
   const {
     id,
+    htmlFor,
     label,
     collapseOnEmpty = true,
     required = false
@@ -1616,12 +1648,14 @@ function Label(props) {
     debug: true
   });
   return jsxs("label", {
-    for: id,
+    id: id,
+    for: htmlFor,
     class: classNames('fjs-form-field-label', {
       'fjs-incollapsible-label': !collapseOnEmpty
     }, props['class']),
     children: [props.children, evaluatedLabel, required && jsx("span", {
       class: "fjs-asterix",
+      "aria-hidden": true,
       children: "*"
     })]
   });
@@ -1632,7 +1666,6 @@ function Checkbox(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -1656,6 +1689,8 @@ function Checkbox(props) {
       value: target.checked
     });
   };
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     class: classNames(formFieldClasses(type$f, {
       errors,
@@ -1665,7 +1700,7 @@ function Checkbox(props) {
       'fjs-checked': value
     }),
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required,
       children: jsx("input", {
@@ -1678,13 +1713,16 @@ function Checkbox(props) {
         onChange: onChange,
         onBlur: () => onBlur && onBlur(),
         onFocus: () => onFocus && onFocus(),
-        "aria-describedby": errorMessageId
+        required: required,
+        "aria-invalid": errors.length > 0,
+        "aria-describedby": [descriptionId, errorMessageId].join(' ')
       })
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -1707,7 +1745,6 @@ function Checklist(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -1754,6 +1791,8 @@ function Checklist(props) {
     values,
     onChange: props.onChange
   });
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     class: classNames(formFieldClasses(type$e, {
       errors,
@@ -1768,7 +1807,7 @@ function Checklist(props) {
       const itemDomId = `${domId}-${index}`;
       const isChecked = hasEqualValue(o.value, values);
       return jsx(Label, {
-        id: itemDomId,
+        htmlFor: itemDomId,
         label: o.label,
         class: classNames({
           'fjs-checked': isChecked
@@ -1784,14 +1823,17 @@ function Checklist(props) {
           onClick: () => toggleCheckbox(o.value),
           onBlur: onCheckboxBlur,
           onFocus: onCheckboxFocus,
-          "aria-describedby": errorMessageId
+          required: required,
+          "aria-invalid": errors.length > 0,
+          "aria-describedby": [descriptionId, errorMessageId].join(' ')
         })
       });
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -1871,6 +1913,7 @@ function FormField(props) {
     }
   }, [viewerCommands, field, initialValue, initialValidationTrigger, indexes]);
   const onBlur = useCallback(() => {
+    const value = get(data, valuePath);
     if (initialValidationTrigger) {
       setInitialValidationTrigger(false);
       viewerCommands.updateFieldValidation(field, value, indexes);
@@ -1878,7 +1921,7 @@ function FormField(props) {
     eventBus.fire('formField.blur', {
       formField: field
     });
-  }, [eventBus, field, indexes, value, viewerCommands, initialValidationTrigger]);
+  }, [eventBus, field, indexes, viewerCommands, initialValidationTrigger, data, valuePath]);
   const onFocus = useCallback(() => {
     eventBus.fire('formField.focus', {
       formField: field
@@ -1902,7 +1945,6 @@ function FormField(props) {
   }
   const domId = `${prefixId(field.id, formId, indexes)}`;
   const fieldErrors = get(errors, [field.id, ...Object.values(indexes || {})]) || [];
-  const errorMessageId = errors.length === 0 ? undefined : `${domId}-error-message`;
   return jsx(Column, {
     field: field,
     class: gridColumnClasses(field),
@@ -1913,7 +1955,6 @@ function FormField(props) {
         ...props,
         disabled: disabled,
         errors: fieldErrors,
-        errorMessageId: errorMessageId,
         domId: domId,
         onChange: disabled || readonly ? noop$1 : onChangeIndexed,
         onBlur: disabled || readonly ? noop$1 : onBlur,
@@ -2225,7 +2266,7 @@ function Datepicker(props) {
   const [forceFocusCalendar, setForceFocusCalendar] = useState(false);
 
   // ensures we render based on date value instead of reference
-  const date = useDeepCompareState(dateObject, null);
+  const date = useDeepCompareMemoize(dateObject);
 
   // shorts the date value back to the source
   useEffect(() => {
@@ -2316,7 +2357,7 @@ function Datepicker(props) {
   return jsxs("div", {
     class: "fjs-datetime-subsection",
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       collapseOnEmpty: collapseLabelOnEmpty,
       required: required
@@ -2588,7 +2629,7 @@ function Timepicker(props) {
   return jsxs("div", {
     class: "fjs-datetime-subsection",
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       collapseOnEmpty: collapseLabelOnEmpty,
       required: required
@@ -2775,6 +2816,7 @@ function Datetime(props) {
     });
   }, []);
   const errorMessageId = allErrors.length === 0 ? undefined : `${prefixId(id, formId)}-error-message`;
+  const descriptionId = `${prefixId(id, formId)}-description`;
   const datePickerProps = {
     label: dateLabel,
     collapseLabelOnEmpty: !timeLabel,
@@ -2787,7 +2829,7 @@ function Datetime(props) {
     date: dateTime.date,
     readonly,
     setDate,
-    'aria-describedby': errorMessageId
+    'aria-describedby': [descriptionId, errorMessageId].join(' ')
   };
   const timePickerProps = {
     label: timeLabel,
@@ -2802,7 +2844,7 @@ function Datetime(props) {
     timeInterval,
     time: dateTime.time,
     setTime,
-    'aria-describedby': errorMessageId
+    'aria-describedby': [descriptionId, errorMessageId].join(' ')
   };
   return jsxs("div", {
     class: formFieldClasses(type$d, {
@@ -2821,6 +2863,7 @@ function Datetime(props) {
         ...timePickerProps
       })]
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
       errors: allErrors,
@@ -2924,7 +2967,7 @@ function IFrame(props) {
       readonly
     }),
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: evaluatedLabel
     }), !evaluatedUrl && jsx(IFramePlaceholder, {
       text: "No content to show."
@@ -3470,7 +3513,6 @@ function Numberfield(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -3608,6 +3650,8 @@ function Numberfield(props) {
       e.preventDefault();
     }
   };
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     class: formFieldClasses(type$a, {
       errors,
@@ -3615,7 +3659,7 @@ function Numberfield(props) {
       readonly
     }),
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), jsx(TemplatedInputAdorner, {
@@ -3649,15 +3693,17 @@ function Numberfield(props) {
           autoComplete: "off",
           step: incrementAmount,
           value: displayValue,
-          "aria-describedby": errorMessageId
+          "aria-describedby": [descriptionId, errorMessageId].join(' '),
+          required: required,
+          "aria-invalid": errors.length > 0
         }), jsxs("div", {
           class: classNames('fjs-number-arrow-container', {
             'fjs-disabled': disabled,
             'fjs-readonly': readonly
           }),
           children: [jsx("button", {
-            class: "fjs-number-arrow-up",
             type: "button",
+            class: "fjs-number-arrow-up",
             "aria-label": "Increment",
             onClick: () => increment(),
             tabIndex: -1,
@@ -3665,8 +3711,8 @@ function Numberfield(props) {
           }), jsx("div", {
             class: "fjs-number-arrow-separator"
           }), jsx("button", {
-            class: "fjs-number-arrow-down",
             type: "button",
+            class: "fjs-number-arrow-down",
             "aria-label": "Decrement",
             onClick: () => decrement(),
             tabIndex: -1,
@@ -3675,10 +3721,11 @@ function Numberfield(props) {
         })]
       })
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -3708,7 +3755,6 @@ function Radio(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -3754,6 +3800,8 @@ function Radio(props) {
     value,
     onChange: props.onChange
   });
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     class: formFieldClasses(type$9, {
       errors,
@@ -3768,7 +3816,7 @@ function Radio(props) {
       const itemDomId = `${domId}-${index}`;
       const isChecked = isEqual(option.value, value);
       return jsx(Label, {
-        id: itemDomId,
+        htmlFor: itemDomId,
         label: option.label,
         class: classNames({
           'fjs-checked': isChecked
@@ -3784,14 +3832,17 @@ function Radio(props) {
           onClick: () => onChange(option.value),
           onBlur: onRadioBlur,
           onFocus: onRadioFocus,
-          "aria-describedby": errorMessageId
+          "aria-describedby": [descriptionId, errorMessageId].join(' '),
+          required: required,
+          "aria-invalid": errors.length > 0
         })
       }, index);
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -3856,7 +3907,7 @@ function SearchableSelect(props) {
 
   // whenever we change the underlying value, set the label to it
   useEffect(() => {
-    setFilter(label);
+    setFilter(label || '');
   }, [label]);
   const filteredOptions = useMemo(() => {
     if (loadState !== LOAD_STATES.LOADED) {
@@ -3936,7 +3987,7 @@ function SearchableSelect(props) {
   }, [onFocus]);
   const onInputBlur = useCallback(() => {
     setIsDropdownExpanded(false);
-    setFilter(label);
+    setFilter(label || '');
     onBlur && onBlur();
   }, [onBlur, label]);
   return jsxs(Fragment, {
@@ -4032,6 +4083,9 @@ function SimpleSelect(props) {
   }, [disabled, isDropdownExpanded, loadState, readonly, value]);
   const onMouseDown = useCallback(e => {
     const input = inputRef.current;
+    if (disabled || !input) {
+      return;
+    }
     setIsDropdownExpanded(!isDropdownExpanded);
     if (isDropdownExpanded) {
       input.blur();
@@ -4039,7 +4093,7 @@ function SimpleSelect(props) {
       input.focus();
     }
     e.preventDefault();
-  }, [isDropdownExpanded]);
+  }, [disabled, isDropdownExpanded]);
   const initialFocusIndex = useMemo(() => value && findIndex(options, o => o.value === value) || 0, [options, value]);
   const onInputFocus = useCallback(() => {
     if (!readonly) {
@@ -4111,7 +4165,6 @@ function Select(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -4129,6 +4182,8 @@ function Select(props) {
   const {
     required
   } = validate;
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   const selectProps = {
     domId,
     disabled,
@@ -4139,7 +4194,9 @@ function Select(props) {
     value,
     onChange,
     readonly,
-    'aria-describedby': errorMessageId
+    required,
+    'aria-invalid': errors.length > 0,
+    'aria-describedby': [descriptionId, errorMessageId].join(' ')
   };
   return jsxs("div", {
     class: formFieldClasses(type$8, {
@@ -4154,7 +4211,7 @@ function Select(props) {
       }
     },
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), searchable ? jsx(SearchableSelect, {
@@ -4162,10 +4219,11 @@ function Select(props) {
     }) : jsx(SimpleSelect, {
       ...selectProps
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -4298,7 +4356,6 @@ function Taglist(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     onFocus,
     domId,
     onBlur,
@@ -4326,7 +4383,7 @@ function Taglist(props) {
   } = useOptionsAsync(field);
 
   // ensures we render based on array content instead of reference
-  const values = useDeepCompareState(value || [], []);
+  const values = useDeepCompareMemoize(value || []);
   useCleanupMultiSelectValue({
     field,
     loadState,
@@ -4434,6 +4491,8 @@ function Taglist(props) {
     inputRef.current.focus();
   };
   const shouldDisplayDropdown = useMemo(() => !disabled && loadState === LOAD_STATES.LOADED && isDropdownExpanded && !isEscapeClosed, [disabled, isDropdownExpanded, isEscapeClosed, loadState]);
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     ref: focusScopeRef,
     class: formFieldClasses(type$5, {
@@ -4450,7 +4509,7 @@ function Taglist(props) {
     children: [jsx(Label, {
       label: label,
       required: required,
-      id: domId
+      htmlFor: domId
     }), !disabled && !readonly && !!values.length && jsx(SkipLink, {
       className: "fjs-taglist-skip-link",
       label: "Skip to search",
@@ -4498,7 +4557,9 @@ function Taglist(props) {
         onMouseDown: () => setIsEscapeClose(false),
         onFocus: onInputFocus,
         onBlur: onInputBlur,
-        "aria-describedby": errorMessageId
+        "aria-describedby": [descriptionId, errorMessageId].join(' '),
+        required: required,
+        "aria-invalid": errors.length > 0
       })]
     }), jsx("div", {
       class: "fjs-taglist-anchor",
@@ -4510,10 +4571,11 @@ function Taglist(props) {
         listenerElement: inputRef.current
       })
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -4830,7 +4892,6 @@ function Textfield(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -4866,6 +4927,8 @@ function Textfield(props) {
   const onInputFocus = () => {
     onFocus && onFocus();
   };
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     class: formFieldClasses(type$2, {
       errors,
@@ -4873,7 +4936,7 @@ function Textfield(props) {
       readonly
     }),
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), jsx(TemplatedInputAdorner, {
@@ -4891,13 +4954,16 @@ function Textfield(props) {
         onFocus: onInputFocus,
         type: "text",
         value: value,
-        "aria-describedby": errorMessageId
+        "aria-describedby": [descriptionId, errorMessageId].join(' '),
+        required: required,
+        "aria-invalid": errors.length > 0
       })
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -4930,7 +4996,6 @@ function Textarea(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -4974,6 +5039,8 @@ function Textarea(props) {
   useEffect(() => {
     autoSizeTextarea(textareaRef.current);
   }, []);
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxs("div", {
     class: formFieldClasses(type$1, {
       errors,
@@ -4981,7 +5048,7 @@ function Textarea(props) {
       readonly
     }),
     children: [jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), jsx("textarea", {
@@ -4994,12 +5061,15 @@ function Textarea(props) {
       onFocus: onInputFocus,
       value: value,
       ref: textareaRef,
-      "aria-describedby": errorMessageId
+      "aria-describedby": [descriptionId, errorMessageId].join(' '),
+      required: required,
+      "aria-invalid": errors.length > 0
     }), jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -5168,7 +5238,7 @@ function Table(props) {
   return jsxs("div", {
     class: formFieldClasses(type),
     children: [jsx(Label, {
-      id: prefixId(id),
+      htmlFor: prefixId(id),
       label: label
     }), jsxs("div", {
       class: classNames('fjs-table-middle-container', {
@@ -5568,7 +5638,7 @@ class FormFields {
 }
 
 const EXPRESSION_PROPERTIES = ['alt', 'appearance.prefixAdorner', 'appearance.suffixAdorner', 'conditional.hide', 'description', 'label', 'source', 'readonly', 'text', 'validate.min', 'validate.max', 'validate.minLength', 'validate.maxLength', 'valuesExpression', 'url', 'dataSource', 'columnsExpression'];
-const TEMPLATE_PROPERTIES = ['alt', 'appearance.prefixAdorner', 'appearance.suffixAdorner', 'description', 'label', 'source', 'text', 'url'];
+const TEMPLATE_PROPERTIES = ['alt', 'appearance.prefixAdorner', 'appearance.suffixAdorner', 'description', 'label', 'source', 'text', 'content', 'url'];
 
 /**
  * @typedef { import('../types').Schema } Schema
@@ -6554,47 +6624,17 @@ class RepeatRenderManager {
     };
     const parentExpressionContextInfo = useContext(LocalExpressionContext);
     return jsx(Fragment, {
-      children: displayValues.map((value, index) => {
-        const elementProps = useMemo(() => ({
-          ...restProps,
-          indexes: {
-            ...(indexes || {}),
-            [repeaterField.id]: index
-          }
-        }), [index]);
-        const localExpressionContextInfo = useMemo(() => ({
-          data: parentExpressionContextInfo.data,
-          this: value,
-          parent: buildExpressionContext(parentExpressionContextInfo),
-          i: [...parentExpressionContextInfo.i, index + 1]
-        }), [index, value]);
-        return !showRemove ? jsx(LocalExpressionContext.Provider, {
-          value: localExpressionContextInfo,
-          children: jsx(RowsRenderer, {
-            ...elementProps
-          })
-        }) : jsxs("div", {
-          class: "fjs-repeat-row-container",
-          children: [jsx("div", {
-            class: "fjs-repeat-row-rows",
-            children: jsx(LocalExpressionContext.Provider, {
-              value: localExpressionContextInfo,
-              children: jsx(RowsRenderer, {
-                ...elementProps
-              })
-            })
-          }), jsx("button", {
-            class: "fjs-repeat-row-remove",
-            type: "button",
-            "aria-label": `Remove list item ${index + 1}`,
-            onClick: () => onDeleteItem(index),
-            children: jsx("div", {
-              class: "fjs-repeat-row-remove-icon-container",
-              children: jsx(DeleteSvg, {})
-            })
-          })]
-        });
-      })
+      children: displayValues.map((value, index) => jsx(RepetitionScaffold, {
+        index: index,
+        value: value,
+        parentExpressionContextInfo: parentExpressionContextInfo,
+        repeaterField: repeaterField,
+        RowsRenderer: RowsRenderer,
+        indexes: indexes,
+        onDeleteItem: onDeleteItem,
+        showRemove: showRemove,
+        ...restProps
+      }, index))
     });
   }
   RepeatFooter(props) {
@@ -6657,18 +6697,18 @@ class RepeatRenderManager {
         'fjs-remove-allowed': repeaterField.allowAddRemove
       }),
       children: [showAdd ? jsx("button", {
+        type: "button",
         readOnly: readonly,
         disabled: disabled || readonly,
         class: "fjs-repeat-render-add",
-        type: "button",
         ref: addButtonRef,
         onClick: onAddItem,
         children: jsxs(Fragment, {
           children: [jsx(AddSvg, {}), " ", 'Add new']
         })
       }) : null, collapseEnabled ? jsx("button", {
-        class: "fjs-repeat-render-collapse",
         type: "button",
+        class: "fjs-repeat-render-collapse",
         onClick: toggle,
         children: isCollapsed ? jsxs(Fragment, {
           children: [jsx(ExpandSvg, {}), " ", `Expand all (${values.length})`]
@@ -6686,6 +6726,73 @@ class RepeatRenderManager {
     return nonCollapsedItems ? nonCollapsedItems : DEFAULT_NON_COLLAPSED_ITEMS;
   }
 }
+
+/**
+ * Individual repetition of a repeated field and context scaffolding.
+ *
+ * @param {Object} props
+ * @param {number} props.index
+ * @param {Object} props.value
+ * @param {Object} props.parentExpressionContextInfo
+ * @param {Object} props.repeaterField
+ * @param {Function} props.RowsRenderer
+ * @param {Object} props.indexes
+ * @param {Function} props.onDeleteItem
+ * @param {boolean} props.showRemove
+ */
+
+const RepetitionScaffold = props => {
+  const {
+    index,
+    value,
+    parentExpressionContextInfo,
+    repeaterField,
+    RowsRenderer,
+    indexes,
+    onDeleteItem,
+    showRemove,
+    ...restProps
+  } = props;
+  const elementProps = useMemo(() => ({
+    ...restProps,
+    indexes: {
+      ...(indexes || {}),
+      [repeaterField.id]: index
+    }
+  }), [index, indexes, repeaterField.id, restProps]);
+  const localExpressionContextInfo = useMemo(() => ({
+    data: parentExpressionContextInfo.data,
+    this: value,
+    parent: buildExpressionContext(parentExpressionContextInfo),
+    i: [...parentExpressionContextInfo.i, index + 1]
+  }), [index, parentExpressionContextInfo, value]);
+  return !showRemove ? jsx(LocalExpressionContext.Provider, {
+    value: localExpressionContextInfo,
+    children: jsx(RowsRenderer, {
+      ...elementProps
+    })
+  }) : jsxs("div", {
+    class: "fjs-repeat-row-container",
+    children: [jsx("div", {
+      class: "fjs-repeat-row-rows",
+      children: jsx(LocalExpressionContext.Provider, {
+        value: localExpressionContextInfo,
+        children: jsx(RowsRenderer, {
+          ...elementProps
+        })
+      })
+    }), jsx("button", {
+      type: "button",
+      class: "fjs-repeat-row-remove",
+      "aria-label": `Remove list item ${index + 1}`,
+      onClick: () => onDeleteItem(index),
+      children: jsx("div", {
+        class: "fjs-repeat-row-remove-icon-container",
+        children: jsx(DeleteSvg, {})
+      })
+    })]
+  });
+};
 RepeatRenderManager.$inject = ['form', 'formFields', 'formFieldRegistry', 'pathRegistry'];
 
 const RepeatRenderModule = {