@bpmn-io/form-js-viewer 1.7.0-alpha.0 → 1.7.1

package/dist/index.cjs

@@ -1589,7 +1589,8 @@ function useCleanupMultiSelectValue(props) {
 
 function Description(props) {
   const {
-    description
+    description,
+    id
   } = props;
   const evaluatedDescription = useSingleLineTemplateEvaluation(description || '', {
     debug: true
@@ -1598,6 +1599,7 @@ function Description(props) {
     return null;
   }
   return jsxRuntime.jsx("div", {
+    id: id,
     class: "fjs-form-field-description",
     children: evaluatedDescription
   });
@@ -1628,6 +1630,7 @@ function Errors(props) {
 function Label(props) {
   const {
     id,
+    htmlFor,
     label,
     collapseOnEmpty = true,
     required = false
@@ -1636,12 +1639,14 @@ function Label(props) {
     debug: true
   });
   return jsxRuntime.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 && jsxRuntime.jsx("span", {
       class: "fjs-asterix",
+      "aria-hidden": true,
       children: "*"
     })]
   });
@@ -1652,7 +1657,6 @@ function Checkbox(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -1676,6 +1680,8 @@ function Checkbox(props) {
       value: target.checked
     });
   };
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     class: classNames(formFieldClasses(type$f, {
       errors,
@@ -1685,7 +1691,7 @@ function Checkbox(props) {
       'fjs-checked': value
     }),
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required,
       children: jsxRuntime.jsx("input", {
@@ -1698,13 +1704,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(' ')
       })
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -1727,7 +1736,6 @@ function Checklist(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -1774,6 +1782,8 @@ function Checklist(props) {
     values,
     onChange: props.onChange
   });
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     class: classNames(formFieldClasses(type$e, {
       errors,
@@ -1788,7 +1798,7 @@ function Checklist(props) {
       const itemDomId = `${domId}-${index}`;
       const isChecked = hasEqualValue(o.value, values);
       return jsxRuntime.jsx(Label, {
-        id: itemDomId,
+        htmlFor: itemDomId,
         label: o.label,
         class: classNames({
           'fjs-checked': isChecked
@@ -1804,14 +1814,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(' ')
         })
       });
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -1851,6 +1864,10 @@ function FormField(props) {
   const {
     formId
   } = hooks.useContext(FormContext);
+
+  // track whether we should trigger initial validation on certain actions, e.g. field blur
+  // disabled straight away, if viewerCommands are not available
+  const [initialValidationTrigger, setInitialValidationTrigger] = hooks.useState(!!viewerCommands);
   const FormFieldComponent = formFields.get(field.type);
   if (!FormFieldComponent) {
     throw new Error(`cannot render field <${field.type}>`);
@@ -1864,26 +1881,48 @@ function FormField(props) {
 
   // add precedence: global readonly > form field disabled
   const disabled = !properties.readOnly && (properties.disabled || field.disabled || false);
+
+  // ensures the initial validation behavior can be re-triggered upon form reset
+  hooks.useEffect(() => {
+    if (!viewerCommands) {
+      return;
+    }
+    const resetValidation = () => {
+      setInitialValidationTrigger(true);
+    };
+    eventBus.on('import.done', resetValidation);
+    eventBus.on('reset', resetValidation);
+    return () => {
+      eventBus.off('import.done', resetValidation);
+      eventBus.off('reset', resetValidation);
+    };
+  }, [eventBus, viewerCommands]);
+  hooks.useEffect(() => {
+    if (initialValidationTrigger && initialValue) {
+      setInitialValidationTrigger(false);
+      viewerCommands.updateFieldValidation(field, initialValue, indexes);
+    }
+  }, [viewerCommands, field, initialValue, initialValidationTrigger, indexes]);
   const onBlur = hooks.useCallback(() => {
-    if (viewerCommands) {
+    const value = minDash.get(data, valuePath);
+    if (initialValidationTrigger) {
+      setInitialValidationTrigger(false);
       viewerCommands.updateFieldValidation(field, value, indexes);
     }
     eventBus.fire('formField.blur', {
       formField: field
     });
-  }, [eventBus, viewerCommands, field, value, indexes]);
+  }, [eventBus, field, indexes, viewerCommands, initialValidationTrigger, data, valuePath]);
   const onFocus = hooks.useCallback(() => {
     eventBus.fire('formField.focus', {
       formField: field
     });
   }, [eventBus, field]);
-  hooks.useEffect(() => {
-    if (viewerCommands && initialValue) {
-      viewerCommands.updateFieldValidation(field, initialValue, indexes);
-    }
-  }, [viewerCommands, field, initialValue, indexes]);
   const hidden = useCondition(field.conditional && field.conditional.hide || null);
   const onChangeIndexed = hooks.useCallback(update => {
+    // any data change will trigger validation
+    setInitialValidationTrigger(false);
+
     // add indexes of the keyed field to the update, if any
     onChange(FormFieldComponent.config.keyed ? {
       ...update,
@@ -1897,7 +1936,6 @@ function FormField(props) {
   }
   const domId = `${prefixId(field.id, formId, indexes)}`;
   const fieldErrors = minDash.get(errors, [field.id, ...Object.values(indexes || {})]) || [];
-  const errorMessageId = errors.length === 0 ? undefined : `${domId}-error-message`;
   return jsxRuntime.jsx(Column, {
     field: field,
     class: gridColumnClasses(field),
@@ -1908,7 +1946,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,
@@ -2311,7 +2348,7 @@ function Datepicker(props) {
   return jsxRuntime.jsxs("div", {
     class: "fjs-datetime-subsection",
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       collapseOnEmpty: collapseLabelOnEmpty,
       required: required
@@ -2583,7 +2620,7 @@ function Timepicker(props) {
   return jsxRuntime.jsxs("div", {
     class: "fjs-datetime-subsection",
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       collapseOnEmpty: collapseLabelOnEmpty,
       required: required
@@ -2770,6 +2807,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,
@@ -2782,7 +2820,7 @@ function Datetime(props) {
     date: dateTime.date,
     readonly,
     setDate,
-    'aria-describedby': errorMessageId
+    'aria-describedby': [descriptionId, errorMessageId].join(' ')
   };
   const timePickerProps = {
     label: timeLabel,
@@ -2797,7 +2835,7 @@ function Datetime(props) {
     timeInterval,
     time: dateTime.time,
     setTime,
-    'aria-describedby': errorMessageId
+    'aria-describedby': [descriptionId, errorMessageId].join(' ')
   };
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$d, {
@@ -2816,6 +2854,7 @@ function Datetime(props) {
         ...timePickerProps
       })]
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
       errors: allErrors,
@@ -2919,7 +2958,7 @@ function IFrame(props) {
       readonly
     }),
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: evaluatedLabel
     }), !evaluatedUrl && jsxRuntime.jsx(IFramePlaceholder, {
       text: "No content to show."
@@ -3465,7 +3504,6 @@ function Numberfield(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -3603,6 +3641,8 @@ function Numberfield(props) {
       e.preventDefault();
     }
   };
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$a, {
       errors,
@@ -3610,7 +3650,7 @@ function Numberfield(props) {
       readonly
     }),
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), jsxRuntime.jsx(TemplatedInputAdorner, {
@@ -3644,7 +3684,9 @@ function Numberfield(props) {
           autoComplete: "off",
           step: incrementAmount,
           value: displayValue,
-          "aria-describedby": errorMessageId
+          "aria-describedby": [descriptionId, errorMessageId].join(' '),
+          required: required,
+          "aria-invalid": errors.length > 0
         }), jsxRuntime.jsxs("div", {
           class: classNames('fjs-number-arrow-container', {
             'fjs-disabled': disabled,
@@ -3670,10 +3712,11 @@ function Numberfield(props) {
         })]
       })
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -3703,7 +3746,6 @@ function Radio(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -3749,6 +3791,8 @@ function Radio(props) {
     value,
     onChange: props.onChange
   });
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$9, {
       errors,
@@ -3763,7 +3807,7 @@ function Radio(props) {
       const itemDomId = `${domId}-${index}`;
       const isChecked = isEqual(option.value, value);
       return jsxRuntime.jsx(Label, {
-        id: itemDomId,
+        htmlFor: itemDomId,
         label: option.label,
         class: classNames({
           'fjs-checked': isChecked
@@ -3779,14 +3823,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);
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -3851,7 +3898,7 @@ function SearchableSelect(props) {
 
   // whenever we change the underlying value, set the label to it
   hooks.useEffect(() => {
-    setFilter(label);
+    setFilter(label || '');
   }, [label]);
   const filteredOptions = hooks.useMemo(() => {
     if (loadState !== LOAD_STATES.LOADED) {
@@ -3931,7 +3978,7 @@ function SearchableSelect(props) {
   }, [onFocus]);
   const onInputBlur = hooks.useCallback(() => {
     setIsDropdownExpanded(false);
-    setFilter(label);
+    setFilter(label || '');
     onBlur && onBlur();
   }, [onBlur, label]);
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -4027,6 +4074,9 @@ function SimpleSelect(props) {
   }, [disabled, isDropdownExpanded, loadState, readonly, value]);
   const onMouseDown = hooks.useCallback(e => {
     const input = inputRef.current;
+    if (disabled || !input) {
+      return;
+    }
     setIsDropdownExpanded(!isDropdownExpanded);
     if (isDropdownExpanded) {
       input.blur();
@@ -4034,7 +4084,7 @@ function SimpleSelect(props) {
       input.focus();
     }
     e.preventDefault();
-  }, [isDropdownExpanded]);
+  }, [disabled, isDropdownExpanded]);
   const initialFocusIndex = hooks.useMemo(() => value && minDash.findIndex(options, o => o.value === value) || 0, [options, value]);
   const onInputFocus = hooks.useCallback(() => {
     if (!readonly) {
@@ -4106,7 +4156,6 @@ function Select(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -4124,6 +4173,8 @@ function Select(props) {
   const {
     required
   } = validate;
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   const selectProps = {
     domId,
     disabled,
@@ -4134,7 +4185,9 @@ function Select(props) {
     value,
     onChange,
     readonly,
-    'aria-describedby': errorMessageId
+    required,
+    'aria-invalid': errors.length > 0,
+    'aria-describedby': [descriptionId, errorMessageId].join(' ')
   };
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$8, {
@@ -4149,7 +4202,7 @@ function Select(props) {
       }
     },
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), searchable ? jsxRuntime.jsx(SearchableSelect, {
@@ -4157,10 +4210,11 @@ function Select(props) {
     }) : jsxRuntime.jsx(SimpleSelect, {
       ...selectProps
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -4293,7 +4347,6 @@ function Taglist(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     onFocus,
     domId,
     onBlur,
@@ -4429,6 +4482,8 @@ function Taglist(props) {
     inputRef.current.focus();
   };
   const shouldDisplayDropdown = hooks.useMemo(() => !disabled && loadState === LOAD_STATES.LOADED && isDropdownExpanded && !isEscapeClosed, [disabled, isDropdownExpanded, isEscapeClosed, loadState]);
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     ref: focusScopeRef,
     class: formFieldClasses(type$5, {
@@ -4445,7 +4500,7 @@ function Taglist(props) {
     children: [jsxRuntime.jsx(Label, {
       label: label,
       required: required,
-      id: domId
+      htmlFor: domId
     }), !disabled && !readonly && !!values.length && jsxRuntime.jsx(SkipLink, {
       className: "fjs-taglist-skip-link",
       label: "Skip to search",
@@ -4493,7 +4548,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
       })]
     }), jsxRuntime.jsx("div", {
       class: "fjs-taglist-anchor",
@@ -4505,10 +4562,11 @@ function Taglist(props) {
         listenerElement: inputRef.current
       })
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -4825,7 +4883,6 @@ function Textfield(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -4861,6 +4918,8 @@ function Textfield(props) {
   const onInputFocus = () => {
     onFocus && onFocus();
   };
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$2, {
       errors,
@@ -4868,7 +4927,7 @@ function Textfield(props) {
       readonly
     }),
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), jsxRuntime.jsx(TemplatedInputAdorner, {
@@ -4886,13 +4945,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
       })
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -4925,7 +4987,6 @@ function Textarea(props) {
   const {
     disabled,
     errors = [],
-    errorMessageId,
     domId,
     onBlur,
     onFocus,
@@ -4942,7 +5003,7 @@ function Textarea(props) {
     required
   } = validate;
   const textareaRef = hooks.useRef();
-  const [onInputChange, flushOnChange] = useFlushDebounce(({
+  const [onChange, flushOnChange] = useFlushDebounce(({
     target
   }) => {
     props.onChange({
@@ -4957,12 +5018,20 @@ function Textarea(props) {
   const onInputFocus = () => {
     onFocus && onFocus();
   };
+  const onInputChange = event => {
+    onChange({
+      target: event.target
+    });
+    autoSizeTextarea(textareaRef.current);
+  };
   hooks.useLayoutEffect(() => {
     autoSizeTextarea(textareaRef.current);
   }, [value]);
   hooks.useEffect(() => {
     autoSizeTextarea(textareaRef.current);
   }, []);
+  const descriptionId = `${domId}-description`;
+  const errorMessageId = `${domId}-error-message`;
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$1, {
       errors,
@@ -4970,7 +5039,7 @@ function Textarea(props) {
       readonly
     }),
     children: [jsxRuntime.jsx(Label, {
-      id: domId,
+      htmlFor: domId,
       label: label,
       required: required
     }), jsxRuntime.jsx("textarea", {
@@ -4983,12 +5052,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
     }), jsxRuntime.jsx(Description, {
+      id: descriptionId,
       description: description
     }), jsxRuntime.jsx(Errors, {
-      errors: errors,
-      id: errorMessageId
+      id: errorMessageId,
+      errors: errors
     })]
   });
 }
@@ -5157,7 +5229,7 @@ function Table(props) {
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type),
     children: [jsxRuntime.jsx(Label, {
-      id: prefixId(id),
+      htmlFor: prefixId(id),
       label: label
     }), jsxRuntime.jsxs("div", {
       class: classNames('fjs-table-middle-container', {
@@ -5557,7 +5629,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
@@ -6543,47 +6615,17 @@ class RepeatRenderManager {
     };
     const parentExpressionContextInfo = hooks.useContext(LocalExpressionContext);
     return jsxRuntime.jsx(jsxRuntime.Fragment, {
-      children: displayValues.map((value, index) => {
-        const elementProps = hooks.useMemo(() => ({
-          ...restProps,
-          indexes: {
-            ...(indexes || {}),
-            [repeaterField.id]: index
-          }
-        }), [index]);
-        const localExpressionContextInfo = hooks.useMemo(() => ({
-          data: parentExpressionContextInfo.data,
-          this: value,
-          parent: buildExpressionContext(parentExpressionContextInfo),
-          i: [...parentExpressionContextInfo.i, index + 1]
-        }), [index, value]);
-        return !showRemove ? jsxRuntime.jsx(LocalExpressionContext.Provider, {
-          value: localExpressionContextInfo,
-          children: jsxRuntime.jsx(RowsRenderer, {
-            ...elementProps
-          })
-        }) : jsxRuntime.jsxs("div", {
-          class: "fjs-repeat-row-container",
-          children: [jsxRuntime.jsx("div", {
-            class: "fjs-repeat-row-rows",
-            children: jsxRuntime.jsx(LocalExpressionContext.Provider, {
-              value: localExpressionContextInfo,
-              children: jsxRuntime.jsx(RowsRenderer, {
-                ...elementProps
-              })
-            })
-          }), jsxRuntime.jsx("button", {
-            class: "fjs-repeat-row-remove",
-            type: "button",
-            "aria-label": `Remove list item ${index + 1}`,
-            onClick: () => onDeleteItem(index),
-            children: jsxRuntime.jsx("div", {
-              class: "fjs-repeat-row-remove-icon-container",
-              children: jsxRuntime.jsx(DeleteSvg, {})
-            })
-          })]
-        });
-      })
+      children: displayValues.map((value, index) => jsxRuntime.jsx(RepetitionScaffold, {
+        index: index,
+        value: value,
+        parentExpressionContextInfo: parentExpressionContextInfo,
+        repeaterField: repeaterField,
+        RowsRenderer: RowsRenderer,
+        indexes: indexes,
+        onDeleteItem: onDeleteItem,
+        showRemove: showRemove,
+        ...restProps
+      }, index))
     });
   }
   RepeatFooter(props) {
@@ -6675,6 +6717,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 = hooks.useMemo(() => ({
+    ...restProps,
+    indexes: {
+      ...(indexes || {}),
+      [repeaterField.id]: index
+    }
+  }), [index, indexes, repeaterField.id, restProps]);
+  const localExpressionContextInfo = hooks.useMemo(() => ({
+    data: parentExpressionContextInfo.data,
+    this: value,
+    parent: buildExpressionContext(parentExpressionContextInfo),
+    i: [...parentExpressionContextInfo.i, index + 1]
+  }), [index, parentExpressionContextInfo, value]);
+  return !showRemove ? jsxRuntime.jsx(LocalExpressionContext.Provider, {
+    value: localExpressionContextInfo,
+    children: jsxRuntime.jsx(RowsRenderer, {
+      ...elementProps
+    })
+  }) : jsxRuntime.jsxs("div", {
+    class: "fjs-repeat-row-container",
+    children: [jsxRuntime.jsx("div", {
+      class: "fjs-repeat-row-rows",
+      children: jsxRuntime.jsx(LocalExpressionContext.Provider, {
+        value: localExpressionContextInfo,
+        children: jsxRuntime.jsx(RowsRenderer, {
+          ...elementProps
+        })
+      })
+    }), jsxRuntime.jsx("button", {
+      class: "fjs-repeat-row-remove",
+      type: "button",
+      "aria-label": `Remove list item ${index + 1}`,
+      onClick: () => onDeleteItem(index),
+      children: jsxRuntime.jsx("div", {
+        class: "fjs-repeat-row-remove-icon-container",
+        children: jsxRuntime.jsx(DeleteSvg, {})
+      })
+    })]
+  });
+};
 RepeatRenderManager.$inject = ['form', 'formFields', 'formFieldRegistry', 'pathRegistry'];
 
 const RepeatRenderModule = {
@@ -8112,10 +8221,10 @@ class Form {
     }
   }
   clear() {
-    // clear form services
+    // clear diagram services (e.g. EventBus)
     this._emit('diagram.clear');
 
-    // clear diagram services (e.g. EventBus)
+    // clear form services
     this._emit('form.clear');
   }