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

package/dist/index.es.js

@@ -571,6 +571,18 @@ function gridColumnClasses(formField) {
   // always fall back to top-down on smallest screens
   'cds--col-sm-16', 'cds--col-md-16');
 }
+function textToLabel(text) {
+  if (typeof text != 'string') return null;
+  for (const line of text.split('\n')) {
+    const displayLine = line.trim();
+
+    // we use the first non-whitespace line in the text as label
+    if (displayLine !== '') {
+      return displayLine;
+    }
+  }
+  return null;
+}
 function prefixId(id, formId, indexes) {
   let result = 'fjs-form';
   if (formId) {
@@ -645,12 +657,6 @@ const FormContext = createContext({
   formId: null
 });
 
-/**
- * @template T
- * @param {string} type
- * @param {boolean} [strict=true]
- * @returns {T | null}
- */
 function useService(type, strict) {
   const {
     getService
@@ -729,10 +735,11 @@ function buildExpressionContext(context) {
 }
 
 /**
- * If the value is a valid expression, it is evaluated and returned. Otherwise, it is returned as-is.
+ * Evaluate a string based on the expressionLanguage and context information.
+ * If the string is not an expression, it is returned as is.
  *
  * @param {any} expressionLanguage - The expression language to use.
- * @param {any} value - The static value or expression to evaluate.
+ * @param {string} value - The string to evaluate.
  * @param {Object} expressionContextInfo - The context information to use.
  * @returns {any} - Evaluated value or the original value if not an expression.
  */
@@ -863,10 +870,11 @@ function _isAllowedValue(value) {
 }
 
 /**
- * If the value is a valid expression, it is evaluated and returned. Otherwise, it is returned as-is.
+ * Evaluate a string reactively based on the expressionLanguage and form data.
+ * If the string is not an expression, it is returned as is.
  * The function is memoized to minimize re-renders.
  *
- * @param {any} value - A static value or expression to evaluate.
+ * @param {string} value - The string to evaluate.
  * @returns {any} - Evaluated value or the original value if not an expression.
  */
 function useExpressionEvaluation(value) {
@@ -883,6 +891,7 @@ function useExpressionEvaluation(value) {
  * @returns {T} - Returns the current state.
  */
 function useDeepCompareMemoize(value) {
+  /** @type {import("preact").RefObject<T>} */
   const ref = useRef();
   if (!isEqual(value, ref.current)) {
     ref.current = value;
@@ -1106,7 +1115,7 @@ function _isElementScrollable(el) {
 }
 
 const EMPTY_OBJECT = {};
-const EMPTY_ARRAY$2 = [];
+const EMPTY_ARRAY = [];
 
 /**
  * Custom hook to scroll an element within a scrollable container.
@@ -1122,7 +1131,7 @@ const EMPTY_ARRAY$2 = [];
  */
 function useScrollIntoView(scrolledElementRef, deps, scrollOptions, flagRefs) {
   const _scrollOptions = scrollOptions || EMPTY_OBJECT;
-  const _flagRefs = flagRefs || EMPTY_ARRAY$2;
+  const _flagRefs = flagRefs || EMPTY_ARRAY;
   useEffect(() => {
     // return early if flags are not raised, or component is not mounted
     if (some(_flagRefs, ref => !ref.current) || !scrolledElementRef.current) {
@@ -1176,23 +1185,6 @@ function _getTopOffset(item, scrollContainer, options) {
   return 0;
 }
 
-/**
- * If the value is a valid expression, we evaluate it. Otherwise, we continue with the value as-is.
- * If the resulting value isn't a boolean, we return 'false'
- * The function is memoized to minimize re-renders.
- *
- * @param {boolean | string} value - A static boolean or expression to evaluate.
- * @returns {boolean} - Evaluated boolean result.
- */
-function useBooleanExpressionEvaluation(value) {
-  const expressionLanguage = useService('expressionLanguage');
-  const expressionContextInfo = useContext(LocalExpressionContext);
-  return useMemo(() => {
-    const evaluationResult = runExpressionEvaluation(expressionLanguage, value, expressionContextInfo);
-    return typeof evaluationResult === 'boolean' ? evaluationResult : false;
-  }, [expressionLanguage, expressionContextInfo, value]);
-}
-
 /**
  * Returns the conditionally filtered data of a form reactively.
  * Memoised to minimize re-renders
@@ -1706,9 +1698,10 @@ function Button(props) {
 Button.config = {
   type: type$i,
   keyed: false,
-  label: 'Button',
+  name: 'Button',
   group: 'action',
   create: (options = {}) => ({
+    label: 'Button',
     action: 'submit',
     ...options
   })
@@ -1816,11 +1809,9 @@ function Checkbox(props) {
     }), {
       'fjs-checked': value
     }),
-    children: [jsx(Label, {
-      htmlFor: domId,
-      label: label,
-      required: required,
-      children: jsx("input", {
+    children: [jsxs("div", {
+      class: "fjs-inline-label",
+      children: [jsx("input", {
         checked: value,
         class: "fjs-input",
         disabled: disabled,
@@ -1833,7 +1824,11 @@ function Checkbox(props) {
         required: required,
         "aria-invalid": errors.length > 0,
         "aria-describedby": [descriptionId, errorMessageId].join(' ')
-      })
+      }), jsx(Label, {
+        htmlFor: domId,
+        label: label,
+        required: required
+      })]
     }), jsx(Description, {
       id: descriptionId,
       description: description
@@ -1846,13 +1841,14 @@ function Checkbox(props) {
 Checkbox.config = {
   type: type$h,
   keyed: true,
-  label: 'Checkbox',
+  name: 'Checkbox',
   group: 'selection',
   emptyValue: false,
   sanitizeValue: ({
     value
   }) => value === true,
   create: (options = {}) => ({
+    label: 'Checkbox',
     ...options
   })
 };
@@ -1874,6 +1870,8 @@ function Checklist(props) {
     label,
     validate = {}
   } = field;
+
+  /** @type {import("preact").RefObject<HTMLDivElement>} */
   const outerDivRef = useRef();
   const {
     required
@@ -1919,31 +1917,32 @@ function Checklist(props) {
     children: [jsx(Label, {
       label: label,
       required: required
-    }), loadState == LOAD_STATES.LOADED && options.map((o, index) => {
+    }), loadState == LOAD_STATES.LOADED && options.map((option, index) => {
       const itemDomId = `${domId}-${index}`;
-      const isChecked = hasEqualValue(o.value, values);
-      return jsx(Label, {
-        htmlFor: itemDomId,
-        label: o.label,
-        class: classNames({
+      const isChecked = hasEqualValue(option.value, values);
+      return jsxs("div", {
+        className: classNames('fjs-inline-label', {
           'fjs-checked': isChecked
         }),
-        required: false,
-        children: jsx("input", {
+        children: [jsx("input", {
           checked: isChecked,
           class: "fjs-input",
           disabled: disabled,
           readOnly: readonly,
           id: itemDomId,
           type: "checkbox",
-          onClick: () => toggleCheckbox(o.value),
+          onClick: () => toggleCheckbox(option.value),
           onBlur: onCheckboxBlur,
           onFocus: onCheckboxFocus,
           required: required,
           "aria-invalid": errors.length > 0,
           "aria-describedby": [descriptionId, errorMessageId].join(' ')
-        })
-      });
+        }), jsx(Label, {
+          htmlFor: itemDomId,
+          label: option.label,
+          required: false
+        })]
+      }, option.value);
     }), jsx(Description, {
       id: descriptionId,
       description: description
@@ -1956,17 +1955,18 @@ function Checklist(props) {
 Checklist.config = {
   type: type$g,
   keyed: true,
-  label: 'Checkbox group',
+  name: 'Checkbox group',
   group: 'selection',
   emptyValue: [],
   sanitizeValue: sanitizeMultiSelectValue,
-  create: createEmptyOptions
+  create: (options = {}) => ({
+    label: 'Checkbox group',
+    ...createEmptyOptions(options)
+  })
 };
 
 const noop$1 = () => false;
-const ids$2 = new Ids([32, 36, 1]);
 function FormField(props) {
-  const instanceIdRef = useRef(ids$2.next());
   const {
     field,
     indexes,
@@ -2012,28 +2012,22 @@ function FormField(props) {
   // add precedence: global readonly > form field disabled
   const disabled = !properties.readOnly && (properties.disabled || field.disabled || false);
   const hidden = useCondition(field.conditional && field.conditional.hide || null);
-  const instanceId = useMemo(() => {
-    if (!formFieldInstanceRegistry) {
-      return null;
-    }
-    return formFieldInstanceRegistry.syncInstance(instanceIdRef.current, {
-      id: field.id,
-      expressionContextInfo: localExpressionContext,
-      valuePath,
-      value,
-      indexes,
-      hidden
-    });
-  }, [formFieldInstanceRegistry, field.id, localExpressionContext, valuePath, value, indexes, hidden]);
-  const fieldInstance = instanceId ? formFieldInstanceRegistry.get(instanceId) : null;
+  const fieldInstance = useMemo(() => ({
+    id: field.id,
+    expressionContextInfo: localExpressionContext,
+    valuePath,
+    indexes
+  }), [field.id, valuePath, localExpressionContext, indexes]);
 
-  // cleanup the instance on unmount
+  // register form field instance
   useEffect(() => {
-    const instanceId = instanceIdRef.current;
-    if (formFieldInstanceRegistry) {
-      return () => formFieldInstanceRegistry.cleanupInstance(instanceId);
+    if (formFieldInstanceRegistry && !hidden) {
+      const instanceId = formFieldInstanceRegistry.add(fieldInstance);
+      return () => {
+        formFieldInstanceRegistry.remove(instanceId);
+      };
     }
-  }, [formFieldInstanceRegistry]);
+  }, [fieldInstance, formFieldInstanceRegistry, hidden]);
 
   // ensures the initial validation behavior can be re-triggered upon form reset
   useEffect(() => {
@@ -2266,11 +2260,12 @@ Default.config = {
   create: (options = {}) => ({
     components: [],
     ...options
-  })
+  }),
+  getSubheading: field => field.id
 };
 
 var _path$x;
-function _extends$y() { _extends$y = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$y.apply(this, arguments); }
+function _extends$y() { return _extends$y = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$y.apply(null, arguments); }
 var SvgCalendar = function SvgCalendar(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$y({
     xmlns: "http://www.w3.org/2000/svg",
@@ -2406,7 +2401,11 @@ function Datepicker(props) {
     readonly,
     setDate
   } = props;
+
+  /** @type {import("preact").RefObject<HTMLInputElement>} */
   const dateInputRef = useRef();
+
+  /** @type {import("preact").RefObject<HTMLElement>} */
   const focusScopeRef = useRef();
   const [flatpickrInstance, setFlatpickrInstance] = useState(null);
   const [isInputDirty, setIsInputDirty] = useState(false);
@@ -2544,7 +2543,7 @@ function Datepicker(props) {
 }
 
 var _path$w, _path2$4;
-function _extends$x() { _extends$x = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$x.apply(this, arguments); }
+function _extends$x() { return _extends$x = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$x.apply(null, arguments); }
 var SvgClock = function SvgClock(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$x({
     xmlns: "http://www.w3.org/2000/svg",
@@ -2578,7 +2577,11 @@ function DropdownList(props) {
   const [mouseControl, setMouseControl] = useState(false);
   const [focusedValueIndex, setFocusedValueIndex] = useState(initialFocusIndex);
   const [smoothScrolling, setSmoothScrolling] = useState(false);
+
+  /** @type {import("preact").RefObject<HTMLDivElement>} */
   const dropdownContainer = useRef();
+
+  /** @type {import("preact").RefObject<{ x: number, y: number }>} */
   const mouseScreenPos = useRef();
   const focusedItem = useMemo(() => values.length ? values[focusedValueIndex] : null, [focusedValueIndex, values]);
   const changeFocusedValueIndex = useCallback(delta => {
@@ -2796,7 +2799,7 @@ function Timepicker(props) {
           value: rawValue,
           disabled: disabled,
           readOnly: readonly,
-          placeholder: use24h ? 'hh:mm' : 'hh:mm ?m',
+          placeholder: use24h ? 'hh:mm' : 'hh:mm --',
           autoComplete: "off",
           onInput: e => {
             // @ts-expect-error
@@ -2852,6 +2855,8 @@ function Datetime(props) {
   const {
     formId
   } = useContext(FormContext);
+
+  /** @type {import("preact").RefObject<HTMLDivElement>} */
   const dateTimeGroupRef = useRef();
   const [dateTime, setDateTime] = useState(getNullDateTime());
   const [dateTimeUpdateRequest, setDateTimeUpdateRequest] = useState(null);
@@ -3017,18 +3022,23 @@ function Datetime(props) {
 Datetime.config = {
   type: type$f,
   keyed: true,
-  label: 'Date time',
+  name: 'Date time',
   group: 'basic-input',
   emptyValue: null,
   sanitizeValue: sanitizeDateTimePickerValue,
-  create: (options = {}) => {
+  create: (options = {}, isNewField) => {
     const defaults = {};
     set(defaults, DATETIME_SUBTYPE_PATH, DATETIME_SUBTYPES.DATE);
-    set(defaults, DATE_LABEL_PATH, 'Date');
+    if (isNewField) {
+      set(defaults, DATE_LABEL_PATH, 'Date');
+    }
     return {
       ...defaults,
       ...options
     };
+  },
+  getSubheading: field => {
+    return field.dateLabel || field.timeLabel;
   }
 };
 
@@ -3066,9 +3076,10 @@ function Group(props) {
 Group.config = {
   type: 'group',
   pathed: true,
-  label: 'Group',
+  name: 'Group',
   group: 'container',
   create: (options = {}) => ({
+    label: 'Group',
     components: [],
     showOutline: true,
     ...options
@@ -3142,9 +3153,10 @@ function IFramePlaceholder(props) {
 IFrame.config = {
   type: type$e,
   keyed: false,
-  label: 'iFrame',
+  name: 'iFrame',
   group: 'container',
   create: (options = {}) => ({
+    label: 'iFrame',
     security: {
       allowScripts: true
     },
@@ -3153,7 +3165,7 @@ IFrame.config = {
 };
 
 var _path$v;
-function _extends$w() { _extends$w = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$w.apply(this, arguments); }
+function _extends$w() { return _extends$w = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$w.apply(null, arguments); }
 var SvgButton = function SvgButton(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$w({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3167,7 +3179,7 @@ var SvgButton = function SvgButton(props) {
 };
 
 var _path$u;
-function _extends$v() { _extends$v = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$v.apply(this, arguments); }
+function _extends$v() { return _extends$v = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$v.apply(null, arguments); }
 var SvgCheckbox = function SvgCheckbox(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$v({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3180,7 +3192,7 @@ var SvgCheckbox = function SvgCheckbox(props) {
 };
 
 var _path$t;
-function _extends$u() { _extends$u = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$u.apply(this, arguments); }
+function _extends$u() { return _extends$u = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$u.apply(null, arguments); }
 var SvgChecklist = function SvgChecklist(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$u({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3196,7 +3208,7 @@ var SvgChecklist = function SvgChecklist(props) {
 };
 
 var _path$s, _path2$3, _path3;
-function _extends$t() { _extends$t = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$t.apply(this, arguments); }
+function _extends$t() { return _extends$t = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$t.apply(null, arguments); }
 var SvgDatetime = function SvgDatetime(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$t({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3215,7 +3227,7 @@ var SvgDatetime = function SvgDatetime(props) {
 };
 
 var _path$r, _path2$2;
-function _extends$s() { _extends$s = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$s.apply(this, arguments); }
+function _extends$s() { return _extends$s = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$s.apply(null, arguments); }
 var SvgTaglist = function SvgTaglist(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$s({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3231,7 +3243,7 @@ var SvgTaglist = function SvgTaglist(props) {
 };
 
 var _rect, _rect2, _rect3;
-function _extends$r() { _extends$r = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$r.apply(this, arguments); }
+function _extends$r() { return _extends$r = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$r.apply(null, arguments); }
 var SvgForm = function SvgForm(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$r({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3259,7 +3271,7 @@ var SvgForm = function SvgForm(props) {
 };
 
 var _path$q;
-function _extends$q() { _extends$q = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$q.apply(this, arguments); }
+function _extends$q() { return _extends$q = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$q.apply(null, arguments); }
 var SvgGroup = function SvgGroup(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$q({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3275,7 +3287,7 @@ var SvgGroup = function SvgGroup(props) {
 };
 
 var _path$p;
-function _extends$p() { _extends$p = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$p.apply(this, arguments); }
+function _extends$p() { return _extends$p = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$p.apply(null, arguments); }
 var SvgNumber = function SvgNumber(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$p({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3289,7 +3301,7 @@ var SvgNumber = function SvgNumber(props) {
 };
 
 var _path$o;
-function _extends$o() { _extends$o = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$o.apply(this, arguments); }
+function _extends$o() { return _extends$o = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$o.apply(null, arguments); }
 var SvgRadio = function SvgRadio(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$o({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3302,7 +3314,7 @@ var SvgRadio = function SvgRadio(props) {
 };
 
 var _path$n;
-function _extends$n() { _extends$n = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$n.apply(this, arguments); }
+function _extends$n() { return _extends$n = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$n.apply(null, arguments); }
 var SvgSelect = function SvgSelect(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$n({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3316,7 +3328,7 @@ var SvgSelect = function SvgSelect(props) {
 };
 
 var _path$m;
-function _extends$m() { _extends$m = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$m.apply(this, arguments); }
+function _extends$m() { return _extends$m = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$m.apply(null, arguments); }
 var SvgSeparator = function SvgSeparator(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$m({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3330,7 +3342,7 @@ var SvgSeparator = function SvgSeparator(props) {
 };
 
 var _path$l;
-function _extends$l() { _extends$l = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$l.apply(this, arguments); }
+function _extends$l() { return _extends$l = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$l.apply(null, arguments); }
 var SvgSpacer = function SvgSpacer(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$l({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3344,7 +3356,7 @@ var SvgSpacer = function SvgSpacer(props) {
 };
 
 var _path$k;
-function _extends$k() { _extends$k = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$k.apply(this, arguments); }
+function _extends$k() { return _extends$k = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$k.apply(null, arguments); }
 var SvgDynamicList = function SvgDynamicList(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$k({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3360,7 +3372,7 @@ var SvgDynamicList = function SvgDynamicList(props) {
 };
 
 var _path$j;
-function _extends$j() { _extends$j = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$j.apply(this, arguments); }
+function _extends$j() { return _extends$j = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$j.apply(null, arguments); }
 var SvgText = function SvgText(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$j({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3373,7 +3385,7 @@ var SvgText = function SvgText(props) {
 };
 
 var _path$i;
-function _extends$i() { _extends$i = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$i.apply(this, arguments); }
+function _extends$i() { return _extends$i = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$i.apply(null, arguments); }
 var SvgHtml = function SvgHtml(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$i({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3389,7 +3401,7 @@ var SvgHtml = function SvgHtml(props) {
 };
 
 var _path$h;
-function _extends$h() { _extends$h = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$h.apply(this, arguments); }
+function _extends$h() { return _extends$h = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$h.apply(null, arguments); }
 var SvgExpressionField = function SvgExpressionField(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$h({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3405,7 +3417,7 @@ var SvgExpressionField = function SvgExpressionField(props) {
 };
 
 var _path$g;
-function _extends$g() { _extends$g = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$g.apply(this, arguments); }
+function _extends$g() { return _extends$g = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$g.apply(null, arguments); }
 var SvgTextfield = function SvgTextfield(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$g({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3419,7 +3431,7 @@ var SvgTextfield = function SvgTextfield(props) {
 };
 
 var _path$f;
-function _extends$f() { _extends$f = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$f.apply(this, arguments); }
+function _extends$f() { return _extends$f = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$f.apply(null, arguments); }
 var SvgTextarea = function SvgTextarea(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$f({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3433,7 +3445,7 @@ var SvgTextarea = function SvgTextarea(props) {
 };
 
 var _path$e;
-function _extends$e() { _extends$e = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$e.apply(this, arguments); }
+function _extends$e() { return _extends$e = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$e.apply(null, arguments); }
 var SvgIFrame = function SvgIFrame(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$e({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3449,7 +3461,7 @@ var SvgIFrame = function SvgIFrame(props) {
 };
 
 var _path$d, _path2$1;
-function _extends$d() { _extends$d = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$d.apply(this, arguments); }
+function _extends$d() { return _extends$d = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$d.apply(null, arguments); }
 var SvgImage = function SvgImage(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$d({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3468,7 +3480,7 @@ var SvgImage = function SvgImage(props) {
 };
 
 var _path$c;
-function _extends$c() { _extends$c = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$c.apply(this, arguments); }
+function _extends$c() { return _extends$c = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$c.apply(null, arguments); }
 var SvgTable = function SvgTable(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$c({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3483,7 +3495,7 @@ var SvgTable = function SvgTable(props) {
 };
 
 var _path$b;
-function _extends$b() { _extends$b = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$b.apply(this, arguments); }
+function _extends$b() { return _extends$b = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$b.apply(null, arguments); }
 var SvgFilePicker = function SvgFilePicker(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$b({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3574,11 +3586,10 @@ function Image(props) {
 Image.config = {
   type: type$d,
   keyed: false,
-  label: 'Image view',
+  name: 'Image view',
   group: 'presentation',
-  create: (options = {}) => ({
-    ...options
-  })
+  create: (options = {}) => options,
+  getSubheading: field => field.alt
 };
 
 function TemplatedInputAdorner(props) {
@@ -3600,7 +3611,7 @@ function TemplatedInputAdorner(props) {
 }
 
 var _path$a;
-function _extends$a() { _extends$a = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$a.apply(this, arguments); }
+function _extends$a() { return _extends$a = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$a.apply(null, arguments); }
 var SvgAngelDown = function SvgAngelDown(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$a({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3617,7 +3628,7 @@ var SvgAngelDown = function SvgAngelDown(props) {
 };
 
 var _path$9;
-function _extends$9() { _extends$9 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$9.apply(this, arguments); }
+function _extends$9() { return _extends$9 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$9.apply(null, arguments); }
 var SvgAngelUp = function SvgAngelUp(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$9({
     xmlns: "http://www.w3.org/2000/svg",
@@ -3689,6 +3700,8 @@ function Numberfield(props) {
   const {
     required
   } = validate;
+
+  /** @type {import("preact").RefObject<HTMLInputElement>} */
   const inputRef = useRef();
   const [cachedValue, setCachedValue] = useState(value);
   const [displayValue, setDisplayValue] = useState(value);
@@ -3885,7 +3898,7 @@ function Numberfield(props) {
 Numberfield.config = {
   type: type$c,
   keyed: true,
-  label: 'Number',
+  name: 'Number',
   group: 'basic-input',
   emptyValue: null,
   sanitizeValue: ({
@@ -3899,6 +3912,7 @@ Numberfield.config = {
     return formField.serializeToString ? value.toString() : Number(value);
   },
   create: (options = {}) => ({
+    label: 'Number',
     ...options
   })
 };
@@ -3920,6 +3934,8 @@ function Radio(props) {
     label,
     validate = {}
   } = field;
+
+  /** @type {import("preact").RefObject<HTMLDivElement>} */
   const outerDivRef = useRef();
   const {
     required
@@ -3967,18 +3983,16 @@ function Radio(props) {
     }), loadState == LOAD_STATES.LOADED && options.map((option, index) => {
       const itemDomId = `${domId}-${index}`;
       const isChecked = isEqual(option.value, value);
-      return jsx(Label, {
-        htmlFor: itemDomId,
-        label: option.label,
-        class: classNames({
+      return jsxs("div", {
+        className: classNames('fjs-inline-label', {
           'fjs-checked': isChecked
         }),
-        required: false,
-        children: jsx("input", {
+        children: [jsx("input", {
           checked: isChecked,
           class: "fjs-input",
           disabled: disabled,
           readOnly: readonly,
+          name: domId,
           id: itemDomId,
           type: "radio",
           onClick: () => onChange(option.value),
@@ -3987,8 +4001,15 @@ function Radio(props) {
           "aria-describedby": [descriptionId, errorMessageId].join(' '),
           required: required,
           "aria-invalid": errors.length > 0
-        })
-      }, index);
+        }), jsx(Label, {
+          htmlFor: itemDomId,
+          label: option.label,
+          class: classNames({
+            'fjs-checked': isChecked
+          }),
+          required: false
+        })]
+      }, option.value);
     }), jsx(Description, {
       id: descriptionId,
       description: description
@@ -4001,15 +4022,18 @@ function Radio(props) {
 Radio.config = {
   type: type$b,
   keyed: true,
-  label: 'Radio group',
+  name: 'Radio group',
   group: 'selection',
   emptyValue: null,
   sanitizeValue: sanitizeSingleSelectValue,
-  create: createEmptyOptions
+  create: (options = {}) => ({
+    label: 'Radio group',
+    ...createEmptyOptions(options)
+  })
 };
 
 var _path$8;
-function _extends$8() { _extends$8 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$8.apply(this, arguments); }
+function _extends$8() { return _extends$8 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$8.apply(null, arguments); }
 var SvgXMark = function SvgXMark(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$8({
     xmlns: "http://www.w3.org/2000/svg",
@@ -4040,6 +4064,8 @@ function SearchableSelect(props) {
   const [isDropdownExpanded, setIsDropdownExpanded] = useState(false);
   const [isFilterActive, setIsFilterActive] = useState(true);
   const [isEscapeClosed, setIsEscapeClose] = useState(false);
+
+  /** @type {import("preact").RefObject<HTMLInputElement>} */
   const searchbarRef = useRef();
   const eventBus = useService('eventBus');
   const {
@@ -4067,9 +4093,9 @@ function SearchableSelect(props) {
     if (!filter || !isFilterActive) {
       return options;
     }
-    return options.filter(o => o.label && o.value && o.label.toLowerCase().includes(filter.toLowerCase()));
+    return options.filter(option => option.label && option.value && option.label.toLowerCase().includes(filter.toLowerCase()));
   }, [filter, loadState, options, isFilterActive]);
-  const setValue = useCallback(option => {
+  const pickOption = useCallback(option => {
     setFilter(option && option.label || '');
     props.onChange({
       value: option && option.value || null
@@ -4167,7 +4193,7 @@ function SearchableSelect(props) {
       }), displayState.displayCross && jsxs("span", {
         class: "fjs-select-cross",
         onMouseDown: e => {
-          setValue(null);
+          pickOption(null);
           e.preventDefault();
         },
         children: [jsx(SvgXMark, {}), ' ']
@@ -4180,9 +4206,9 @@ function SearchableSelect(props) {
       class: "fjs-select-anchor",
       children: displayState.displayDropdown && jsx(DropdownList, {
         values: filteredOptions,
-        getLabel: o => o.label,
-        onValueSelected: o => {
-          setValue(o);
+        getLabel: option => option.label,
+        onValueSelected: option => {
+          pickOption(option);
           setIsDropdownExpanded(false);
         },
         listenerElement: searchbarRef.current
@@ -4204,6 +4230,8 @@ function SimpleSelect(props) {
   } = props;
   const [isDropdownExpanded, setIsDropdownExpanded] = useState(false);
   const selectRef = useRef();
+
+  /** @type {import("preact").RefObject<HTMLInputElement>} */
   const inputRef = useRef();
   const {
     loadState,
@@ -4218,7 +4246,7 @@ function SimpleSelect(props) {
   });
   const getLabelCorrelation = useGetLabelCorrelation(options);
   const valueLabel = useMemo(() => value && getLabelCorrelation(value), [value, getLabelCorrelation]);
-  const setValue = useCallback(option => {
+  const pickOption = useCallback(option => {
     props.onChange({
       value: option && option.value || null
     });
@@ -4243,7 +4271,7 @@ function SimpleSelect(props) {
     }
     e.preventDefault();
   }, [disabled, isDropdownExpanded]);
-  const initialFocusIndex = useMemo(() => value && findIndex(options, o => o.value === value) || 0, [options, value]);
+  const initialFocusIndex = useMemo(() => value && findIndex(options, option => option.value === value) || 0, [options, value]);
   const onInputFocus = useCallback(() => {
     if (!readonly) {
       setIsDropdownExpanded(true);
@@ -4285,7 +4313,7 @@ function SimpleSelect(props) {
       }), displayState.displayCross && jsx("span", {
         class: "fjs-select-cross",
         onMouseDown: e => {
-          setValue(null);
+          pickOption(null);
           e.stopPropagation();
         },
         children: jsx(SvgXMark, {})
@@ -4297,10 +4325,10 @@ function SimpleSelect(props) {
       class: "fjs-select-anchor",
       children: displayState.displayDropdown && jsx(DropdownList, {
         values: options,
-        getLabel: o => o.label,
+        getLabel: option => option.label,
         initialFocusIndex: initialFocusIndex,
-        onValueSelected: o => {
-          setValue(o);
+        onValueSelected: option => {
+          pickOption(option);
           setIsDropdownExpanded(false);
         },
         listenerElement: selectRef.current
@@ -4379,11 +4407,14 @@ function Select(props) {
 Select.config = {
   type: type$a,
   keyed: true,
-  label: 'Select',
+  name: 'Select',
   group: 'selection',
   emptyValue: null,
   sanitizeValue: sanitizeSingleSelectValue,
-  create: createEmptyOptions
+  create: (options = {}) => ({
+    label: 'Select',
+    ...createEmptyOptions(options)
+  })
 };
 
 const type$9 = 'separator';
@@ -4396,7 +4427,7 @@ function Separator() {
 Separator.config = {
   type: type$9,
   keyed: false,
-  label: 'Separator',
+  name: 'Separator',
   group: 'presentation',
   create: (options = {}) => ({
     ...options
@@ -4421,7 +4452,7 @@ function Spacer(props) {
 Spacer.config = {
   type: type$8,
   keyed: false,
-  label: 'Spacer',
+  name: 'Spacer',
   group: 'presentation',
   create: (options = {}) => ({
     height: 60,
@@ -4467,9 +4498,10 @@ DynamicList.config = {
   type: 'dynamiclist',
   pathed: true,
   repeatable: true,
-  label: 'Dynamic list',
+  name: 'Dynamic list',
   group: 'container',
   create: (options = {}) => ({
+    label: 'Dynamic list',
     components: [],
     showOutline: true,
     isRepeating: true,
@@ -4523,7 +4555,11 @@ function Taglist(props) {
   const [filter, setFilter] = useState('');
   const [isDropdownExpanded, setIsDropdownExpanded] = useState(false);
   const [isEscapeClosed, setIsEscapeClose] = useState(false);
+
+  /** @type {import("preact").RefObject<HTMLDivElement>} */
   const focusScopeRef = useRef();
+
+  /** @type {import("preact").RefObject<HTMLInputElement>} */
   const inputRef = useRef();
   const eventBus = useService('eventBus');
   const {
@@ -4712,8 +4748,8 @@ function Taglist(props) {
       class: "fjs-taglist-anchor",
       children: shouldDisplayDropdown && jsx(DropdownList, {
         values: filteredOptions,
-        getLabel: o => o.label,
-        onValueSelected: o => selectValue(o.value),
+        getLabel: option => option.label,
+        onValueSelected: option => selectValue(option.value),
         emptyListMessage: hasOptionsLeft ? 'No results' : 'All values selected',
         listenerElement: inputRef.current
       })
@@ -4729,11 +4765,14 @@ function Taglist(props) {
 Taglist.config = {
   type: type$7,
   keyed: true,
-  label: 'Tag list',
+  name: 'Tag list',
   group: 'selection',
   emptyValue: [],
   sanitizeValue: sanitizeMultiSelectValue,
-  create: createEmptyOptions
+  create: (options = {}) => ({
+    label: 'Tag list',
+    ...createEmptyOptions(options)
+  })
 };
 
 const NODE_TYPE_TEXT = 3,
@@ -4758,7 +4797,7 @@ function sanitizeHTML(html) {
   doc.normalize();
   const element = doc.body.firstChild;
   if (element) {
-    sanitizeNode( /** @type Element */element);
+    sanitizeNode(/** @type Element */element);
     return /** @type Element */element.innerHTML;
   } else {
     // handle the case that document parsing
@@ -4815,7 +4854,7 @@ function sanitizeNode(node) {
     node.setAttribute('rel', 'noopener');
   }
   for (let i = node.childNodes.length; i--;) {
-    sanitizeNode( /** @type Element */node.childNodes[i]);
+    sanitizeNode(/** @type Element */node.childNodes[i]);
   }
 }
 
@@ -4902,12 +4941,15 @@ function Text(props) {
 Text.config = {
   type: type$6,
   keyed: false,
-  label: 'Text view',
+  name: 'Text view',
   group: 'presentation',
   create: (options = {}) => ({
     text: '# Text',
     ...options
-  })
+  }),
+  getSubheading: field => {
+    textToLabel(field.text);
+  }
 };
 
 const type$5 = 'html';
@@ -4968,7 +5010,7 @@ function Html(props) {
 Html.config = {
   type: type$5,
   keyed: false,
-  label: 'HTML view',
+  name: 'HTML view',
   group: 'presentation',
   create: (options = {}) => ({
     content: '',
@@ -5014,7 +5056,7 @@ function ExpressionField(props) {
 }
 ExpressionField.config = {
   type: type$4,
-  label: 'Expression',
+  name: 'Expression',
   group: 'basic-input',
   keyed: true,
   emptyValue: null,
@@ -5107,7 +5149,7 @@ function Textfield(props) {
 Textfield.config = {
   type: type$3,
   keyed: true,
-  label: 'Text field',
+  name: 'Text field',
   group: 'basic-input',
   emptyValue: '',
   sanitizeValue: ({
@@ -5124,6 +5166,7 @@ Textfield.config = {
     return String(value);
   },
   create: (options = {}) => ({
+    label: 'Text field',
     ...options
   })
 };
@@ -5212,13 +5255,14 @@ function Textarea(props) {
 Textarea.config = {
   type: type$2,
   keyed: true,
-  label: 'Text area',
+  name: 'Text area',
   group: 'basic-input',
   emptyValue: '',
   sanitizeValue: ({
     value
   }) => isArray(value) || isObject(value) || isNil(value) ? '' : String(value),
   create: (options = {}) => ({
+    label: 'Text area',
     ...options
   })
 };
@@ -5242,7 +5286,7 @@ const autoSizeTextarea = textarea => {
 };
 
 var _path$7;
-function _extends$7() { _extends$7 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$7.apply(this, arguments); }
+function _extends$7() { return _extends$7 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$7.apply(null, arguments); }
 var SvgArrowDown = function SvgArrowDown(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$7({
     xmlns: "http://www.w3.org/2000/svg",
@@ -5254,7 +5298,7 @@ var SvgArrowDown = function SvgArrowDown(props) {
 };
 
 var _path$6;
-function _extends$6() { _extends$6 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$6.apply(this, arguments); }
+function _extends$6() { return _extends$6 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$6.apply(null, arguments); }
 var SvgArrowUp = function SvgArrowUp(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$6({
     xmlns: "http://www.w3.org/2000/svg",
@@ -5266,7 +5310,7 @@ var SvgArrowUp = function SvgArrowUp(props) {
 };
 
 var _path$5;
-function _extends$5() { _extends$5 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$5.apply(this, arguments); }
+function _extends$5() { return _extends$5 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$5.apply(null, arguments); }
 var SvgCaretLeft = function SvgCaretLeft(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$5({
     xmlns: "http://www.w3.org/2000/svg",
@@ -5279,7 +5323,7 @@ var SvgCaretLeft = function SvgCaretLeft(props) {
 };
 
 var _path$4;
-function _extends$4() { _extends$4 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$4.apply(this, arguments); }
+function _extends$4() { return _extends$4 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$4.apply(null, arguments); }
 var SvgCaretRight = function SvgCaretRight(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$4({
     xmlns: "http://www.w3.org/2000/svg",
@@ -5330,9 +5374,7 @@ function Table(props) {
     id,
     label
   } = field;
-
-  /** @type {[(null|Sorting), import("preact/hooks").StateUpdater<null|Sorting>]} */
-  const [sortBy, setSortBy] = useState(null);
+  const [sortBy, setSortBy] = useState(/** @type {Sorting | null} */null);
   const evaluatedColumns = useEvaluatedColumns(columnsExpression || '', columns);
   const columnKeys = evaluatedColumns.map(({
     key
@@ -5348,6 +5390,12 @@ function Table(props) {
   useEffect(() => {
     setCurrentPage(0);
   }, [rowCount, sortBy]);
+  const serializeCellData = cellData => {
+    if (cellData !== null && typeof cellData === 'object') {
+      return JSON.stringify(cellData);
+    }
+    return cellData;
+  };
 
   /** @param {string} key */
   function toggleSortBy(key) {
@@ -5431,7 +5479,7 @@ function Table(props) {
               class: "fjs-table-tr",
               children: columnKeys.map(key => jsx("td", {
                 class: "fjs-table-td",
-                children: row[key]
+                children: serializeCellData(row[key])
               }, key))
             }, index))
           })]
@@ -5467,7 +5515,7 @@ function Table(props) {
 Table.config = {
   type: type$1,
   keyed: false,
-  label: 'Table',
+  name: 'Table',
   group: 'presentation',
   create: (options = {}) => {
     const {
@@ -5496,6 +5544,7 @@ Table.config = {
     }
     return {
       ...remainingOptions,
+      label: 'Table',
       rowCount: 10,
       columns: [{
         label: 'ID',
@@ -5617,11 +5666,7 @@ function getHeaderAriaLabel(sortBy, key, label) {
   return `Click to sort by ${label} ascending`;
 }
 
-const FILE_PICKER_FILE_KEY_PREFIX = 'files::';
-
 const type = 'filepicker';
-const ids$1 = new Ids();
-const EMPTY_ARRAY$1 = [];
 
 /**
  * @typedef Props
@@ -5635,8 +5680,7 @@ const EMPTY_ARRAY$1 = [];
  * @property {string} field.id
  * @property {string} [field.label]
  * @property {string} [field.accept]
- * @property {string|boolean} [field.multiple]
- * @property {string} [value]
+ * @property {boolean} [field.multiple]
  *
  * @param {Props} props
  * @returns {import("preact").JSX.Element}
@@ -5644,8 +5688,9 @@ const EMPTY_ARRAY$1 = [];
 function FilePicker(props) {
   /** @type {import("preact/hooks").Ref<HTMLInputElement>} */
   const fileInputRef = useRef(null);
-  /** @type {import('../../FileRegistry').FileRegistry} */
-  const fileRegistry = useService('fileRegistry', false);
+  /** @type {[File[],import("preact/hooks").StateUpdater<File[]>]} */
+  const [selectedFiles, setSelectedFiles] = useState([]);
+  const eventBus = useService('eventBus');
   const {
     field,
     onChange,
@@ -5653,59 +5698,33 @@ function FilePicker(props) {
     errors = [],
     disabled,
     readonly,
-    required,
-    value: filesKey = ''
+    required
   } = props;
   const {
     label,
-    multiple = false,
-    accept = ''
+    multiple = '',
+    accept = '',
+    id
   } = field;
-  /** @type {string} */
   const evaluatedAccept = useSingleLineTemplateEvaluation(accept);
-  const evaluatedMultiple = useBooleanExpressionEvaluation(multiple);
+  const evaluatedMultiple = useSingleLineTemplateEvaluation(typeof multiple === 'string' ? multiple : multiple.toString()) === 'true';
   const errorMessageId = `${domId}-error-message`;
-  /** @type {File[]} */
-  const selectedFiles = fileRegistry === null ? EMPTY_ARRAY$1 : fileRegistry.getFiles(filesKey);
-  useEffect(() => {
-    if (filesKey && fileRegistry !== null && !fileRegistry.hasKey(filesKey)) {
-      onChange({
-        value: null
-      });
-    }
-  }, [fileRegistry, filesKey, onChange, selectedFiles.length]);
   useEffect(() => {
-    const data = new DataTransfer();
-    selectedFiles.forEach(file => data.items.add(file));
-    fileInputRef.current.files = data.files;
-  }, [selectedFiles]);
-
-  /**
-   * @type import("preact").JSX.GenericEventHandler<HTMLInputElement>
-   */
-  const onFileChange = event => {
-    const input = /** @type {HTMLInputElement} */event.target;
-
-    // if we have an associated file key but no files are selected, clear the file key and associated files
-    if ((input.files === null || input.files.length === 0) && filesKey !== '') {
-      fileRegistry.deleteFiles(filesKey);
+    const reset = () => {
+      setSelectedFiles([]);
       onChange({
         value: null
       });
-      return;
-    }
-    const files = Array.from(input.files);
-
-    // ensure fileKey exists
-    const updatedFilesKey = filesKey || ids$1.nextPrefixed(FILE_PICKER_FILE_KEY_PREFIX);
-    fileRegistry.setFiles(updatedFilesKey, files);
-    onChange({
-      value: updatedFilesKey
-    });
-  };
-  const isInputDisabled = disabled || readonly || fileRegistry === null;
+    };
+    eventBus.on('import.done', reset);
+    eventBus.on('reset', reset);
+    return () => {
+      eventBus.off('import.done', reset);
+      eventBus.off('reset', reset);
+    };
+  }, [eventBus, onChange]);
   return jsxs("div", {
-    className: formFieldClasses(type, {
+    class: formFieldClasses(type, {
       errors,
       disabled,
       readonly
@@ -5720,17 +5739,29 @@ function FilePicker(props) {
       ref: fileInputRef,
       id: domId,
       name: domId,
-      disabled: isInputDisabled,
-      multiple: evaluatedMultiple || undefined,
-      accept: evaluatedAccept || undefined,
-      onChange: onFileChange
+      multiple: evaluatedMultiple === false ? undefined : evaluatedMultiple,
+      accept: evaluatedAccept === '' ? undefined : evaluatedAccept,
+      onChange: event => {
+        const input = /** @type {HTMLInputElement} */event.target;
+        if (input.files === null || input.files.length === 0) {
+          onChange({
+            value: null
+          });
+          return;
+        }
+        const files = Array.from(input.files);
+        onChange({
+          value: `${id}_value_key`
+        });
+        setSelectedFiles(files);
+      }
     }), jsxs("div", {
       className: "fjs-filepicker-container",
       children: [jsx("button", {
         type: "button",
-        disabled: isInputDisabled,
+        disabled: disabled,
         readonly: readonly,
-        className: "fjs-button fjs-filepicker-button",
+        class: "fjs-button",
         onClick: () => {
           fileInputRef.current.click();
         },
@@ -5751,6 +5782,11 @@ FilePicker.config = {
   label: 'File picker',
   group: 'basic-input',
   emptyValue: null,
+  sanitizeValue: ({
+    value
+  }) => {
+    return value;
+  },
   create: (options = {}) => ({
     ...options
   })
@@ -5929,7 +5965,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', 'expression', 'accept', 'multiple'];
+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', 'expression'];
 const TEMPLATE_PROPERTIES = ['alt', 'appearance.prefixAdorner', 'appearance.suffixAdorner', 'description', 'label', 'source', 'text', 'content', 'url'];
 
 /**
@@ -6147,21 +6183,11 @@ class ConditionChecker {
         // if we have a hidden repeatable field, and the data structure allows, we clear it directly at the root and stop recursion
         if (context.isHidden && isRepeatable) {
           context.preventRecursion = true;
-          this._eventBus.fire('conditionChecker.remove', {
-            item: {
-              [field.key]: get(workingData, getFilterPath(field, indexes))
-            }
-          });
           this._cleanlyClearDataAtPath(getFilterPath(field, indexes), workingData);
         }
 
         // for simple leaf fields, we always clear
         if (context.isHidden && isClosed) {
-          this._eventBus.fire('conditionChecker.remove', {
-            item: {
-              [field.key]: get(workingData, getFilterPath(field, indexes))
-            }
-          });
           this._cleanlyClearDataAtPath(getFilterPath(field, indexes), workingData);
         }
       });
@@ -6893,7 +6919,7 @@ const ViewerCommandsModule = {
 };
 
 var _path$3;
-function _extends$3() { _extends$3 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$3.apply(this, arguments); }
+function _extends$3() { return _extends$3 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$3.apply(null, arguments); }
 var SvgExpand = function SvgExpand(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$3({
     xmlns: "http://www.w3.org/2000/svg",
@@ -6907,7 +6933,7 @@ var SvgExpand = function SvgExpand(props) {
 };
 
 var _path$2;
-function _extends$2() { _extends$2 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$2.apply(this, arguments); }
+function _extends$2() { return _extends$2 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$2.apply(null, arguments); }
 var SvgCollapse = function SvgCollapse(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$2({
     xmlns: "http://www.w3.org/2000/svg",
@@ -6921,7 +6947,7 @@ var SvgCollapse = function SvgCollapse(props) {
 };
 
 var _path$1, _path2;
-function _extends$1() { _extends$1 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1.apply(this, arguments); }
+function _extends$1() { return _extends$1 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$1.apply(null, arguments); }
 var SvgAdd = function SvgAdd(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$1({
     xmlns: "http://www.w3.org/2000/svg",
@@ -6938,7 +6964,7 @@ var SvgAdd = function SvgAdd(props) {
 };
 
 var _path;
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 var SvgDelete = function SvgDelete(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
     xmlns: "http://www.w3.org/2000/svg",
@@ -6955,16 +6981,11 @@ var SvgDelete = function SvgDelete(props) {
 /* eslint-disable react-hooks/rules-of-hooks */
 
 class RepeatRenderManager {
-  constructor(form, formFields, formFieldRegistry, pathRegistry, eventBus) {
+  constructor(form, formFields, formFieldRegistry, pathRegistry) {
     this._form = form;
-    /** @type {import('../../render/FormFields').FormFields} */
     this._formFields = formFields;
-    /** @type {import('../../core/FormFieldRegistry').FormFieldRegistry} */
     this._formFieldRegistry = formFieldRegistry;
-    /** @type {import('../../core/PathRegistry').PathRegistry} */
     this._pathRegistry = pathRegistry;
-    /** @type {import('../../core/EventBus').EventBus} */
-    this._eventBus = eventBus;
     this.Repeater = this.Repeater.bind(this);
     this.RepeatFooter = this.RepeatFooter.bind(this);
   }
@@ -7004,18 +7025,11 @@ class RepeatRenderManager {
     const isCollapsed = collapseEnabled && sharedRepeatState.isCollapsed;
     const hasChildren = repeaterField.components && repeaterField.components.length > 0;
     const showRemove = repeaterField.allowAddRemove && hasChildren;
-
-    /**
-     * @param {number} index
-     */
+    const displayValues = isCollapsed ? values.slice(0, nonCollapsedItems) : values;
+    const hiddenValues = isCollapsed ? values.slice(nonCollapsedItems) : [];
     const onDeleteItem = index => {
       const updatedValues = values.slice();
-      const removedItem = updatedValues.splice(index, 1)[0];
-      this._eventBus.fire('repeatRenderManager.remove', {
-        dataPath,
-        index,
-        item: removedItem
-      });
+      updatedValues.splice(index, 1);
       props.onChange({
         field: repeaterField,
         value: updatedValues,
@@ -7023,13 +7037,21 @@ class RepeatRenderManager {
       });
     };
     const parentExpressionContextInfo = useContext(LocalExpressionContext);
-    return jsx(Fragment, {
-      children: values.map((itemValue, itemIndex) => jsx("div", {
-        class: classNames({
-          'fjs-repeat-row-collapsed': isCollapsed ? itemIndex >= nonCollapsedItems : false
-        }),
-        children: jsx(RepetitionScaffold, {
-          itemIndex: itemIndex,
+    return jsxs(Fragment, {
+      children: [displayValues.map((itemValue, itemIndex) => jsx(RepetitionScaffold, {
+        itemIndex: itemIndex,
+        itemValue: itemValue,
+        parentExpressionContextInfo: parentExpressionContextInfo,
+        repeaterField: repeaterField,
+        RowsRenderer: RowsRenderer,
+        indexes: indexes,
+        onDeleteItem: onDeleteItem,
+        showRemove: showRemove,
+        ...restProps
+      }, itemIndex)), hiddenValues.length > 0 ? jsx("div", {
+        className: "fjs-repeat-row-collapsed",
+        children: hiddenValues.map((itemValue, itemIndex) => jsx(RepetitionScaffold, {
+          itemIndex: itemIndex + nonCollapsedItems,
           itemValue: itemValue,
           parentExpressionContextInfo: parentExpressionContextInfo,
           repeaterField: repeaterField,
@@ -7038,8 +7060,8 @@ class RepeatRenderManager {
           onDeleteItem: onDeleteItem,
           showRemove: showRemove,
           ...restProps
-        })
-      }))
+        }, itemIndex))
+      }) : null]
     });
   }
   RepeatFooter(props) {
@@ -7082,11 +7104,6 @@ class RepeatRenderManager {
       });
       updatedValues.push(newItem);
       shouldScroll.current = true;
-      this._eventBus.fire('repeatRenderManager.add', {
-        dataPath,
-        index: updatedValues.length - 1,
-        item: newItem
-      });
       props.onChange({
         value: updatedValues
       });
@@ -7119,7 +7136,7 @@ class RepeatRenderManager {
         class: "fjs-repeat-render-collapse",
         onClick: toggle,
         children: isCollapsed ? jsxs(Fragment, {
-          children: [jsx(SvgExpand, {}), " ", `Expand all (${values.length - 1})`]
+          children: [jsx(SvgExpand, {}), " ", `Expand all (${values.length})`]
         }) : jsxs(Fragment, {
           children: [jsx(SvgCollapse, {}), " ", 'Collapse']
         })
@@ -7143,7 +7160,7 @@ class RepeatRenderManager {
  * @param {Object} props.itemValue
  * @param {Object} props.parentExpressionContextInfo
  * @param {Object} props.repeaterField
- * @param {Function} props.RowsRenderer
+ * @param {import('preact').FunctionComponent} props.RowsRenderer
  * @param {Object} props.indexes
  * @param {Function} props.onDeleteItem
  * @param {boolean} props.showRemove
@@ -7204,7 +7221,7 @@ const RepetitionScaffold = props => {
     })]
   });
 };
-RepeatRenderManager.$inject = ['form', 'formFields', 'formFieldRegistry', 'pathRegistry', 'eventBus'];
+RepeatRenderManager.$inject = ['form', 'formFields', 'formFieldRegistry', 'pathRegistry'];
 
 const RepeatRenderModule = {
   __init__: ['repeatRenderManager'],
@@ -8027,7 +8044,7 @@ class FieldFactory {
     this._pathRegistry = pathRegistry;
     this._formFields = formFields;
   }
-  create(attrs, applyDefaults = true) {
+  create(attrs, isNewField = true) {
     const {
       id,
       type,
@@ -8066,13 +8083,12 @@ class FieldFactory {
     })) {
       throw new Error(`binding path '${[...parentPath, ...path.split('.')].join('.')}' is already claimed`);
     }
-    const labelAttrs = applyDefaults && config.label ? {
-      label: config.label
-    } : {};
     const field = config.create({
-      ...labelAttrs,
+      ...(config.label ? {
+        label: config.label
+      } : {}),
       ...attrs
-    });
+    }, isNewField);
     this._ensureId(field);
     if (config.keyed) {
       this._ensureKey(field);
@@ -8595,52 +8611,39 @@ class FormFieldInstanceRegistry {
     this._formFieldInstances = {};
     eventBus.on('form.clear', () => this.clear());
   }
-  syncInstance(instanceId, formFieldInfo) {
+  add(instance) {
     const {
-      hidden,
-      ...restInfo
-    } = formFieldInfo;
-    const isInstanceExpected = !hidden;
-    const doesInstanceExist = this._formFieldInstances[instanceId];
-    if (isInstanceExpected && !doesInstanceExist) {
-      this._formFieldInstances[instanceId] = {
-        instanceId,
-        ...restInfo
-      };
-      this._eventBus.fire('formFieldInstance.added', {
-        instanceId
-      });
-    } else if (!isInstanceExpected && doesInstanceExist) {
-      delete this._formFieldInstances[instanceId];
-      this._eventBus.fire('formFieldInstance.removed', {
-        instanceId
-      });
-    } else if (isInstanceExpected && doesInstanceExist) {
-      const wasInstanceChaged = Object.keys(restInfo).some(key => {
-        return this._formFieldInstances[instanceId][key] !== restInfo[key];
-      });
-      if (wasInstanceChaged) {
-        this._formFieldInstances[instanceId] = {
-          instanceId,
-          ...restInfo
-        };
-        this._eventBus.fire('formFieldInstance.changed', {
-          instanceId
-        });
-      }
+      id,
+      expressionContextInfo,
+      valuePath,
+      indexes
+    } = instance;
+    const instanceId = [id, ...Object.values(indexes || {})].join('_');
+    if (this._formFieldInstances[instanceId]) {
+      throw new Error('this form field instance is already registered');
     }
+    this._formFieldInstances[instanceId] = {
+      id,
+      instanceId,
+      expressionContextInfo,
+      valuePath,
+      indexes
+    };
+    this._eventBus.fire('formFieldInstanceRegistry.changed', {
+      instanceId,
+      action: 'added'
+    });
     return instanceId;
   }
-  cleanupInstance(instanceId) {
-    if (this._formFieldInstances[instanceId]) {
-      delete this._formFieldInstances[instanceId];
-      this._eventBus.fire('formFieldInstance.removed', {
-        instanceId
-      });
+  remove(instanceId) {
+    if (!this._formFieldInstances[instanceId]) {
+      return;
     }
-  }
-  get(instanceId) {
-    return this._formFieldInstances[instanceId];
+    delete this._formFieldInstances[instanceId];
+    this._eventBus.fire('formFieldInstanceRegistry.changed', {
+      instanceId,
+      action: 'removed'
+    });
   }
   getAll() {
     return Object.values(this._formFieldInstances);
@@ -8720,122 +8723,10 @@ function Renderer(config, eventBus, form, injector) {
 }
 Renderer.$inject = ['config.renderer', 'eventBus', 'form', 'injector'];
 
-/**
- * @typedef {Record<PropertyKey, unknown>} RemovedData
- * @param {RemovedData} removedData
- * @returns {string[]}
- */
-const extractFileReferencesFromRemovedData = removedData => {
-  /** @type {string[]} */
-  const fileReferences = [];
-  if (removedData === null) {
-    return fileReferences;
-  }
-  Object.values(removedData).forEach(value => {
-    if (value === null) {
-      return;
-    }
-    if (typeof value === 'object') {
-      fileReferences.push(...extractFileReferencesFromRemovedData( /** @type {RemovedData} */value));
-    } else if (Array.isArray(value)) {
-      fileReferences.push(...value.map(extractFileReferencesFromRemovedData).flat());
-    } else if (typeof value === 'string' && value.startsWith(FILE_PICKER_FILE_KEY_PREFIX)) {
-      fileReferences.push(value);
-    }
-  });
-  return fileReferences;
-};
-
-const fileRegistry = Symbol('fileRegistry');
-const eventBusSymbol = Symbol('eventBus');
-const formFieldRegistrySymbol = Symbol('formFieldRegistry');
-const formFieldInstanceRegistrySymbol = Symbol('formFieldInstanceRegistry');
-const EMPTY_ARRAY = [];
-class FileRegistry {
-  /**
-   * @param {import('../core/EventBus').EventBus} eventBus
-   * @param {import('../core/FormFieldRegistry').FormFieldRegistry} formFieldRegistry
-   * @param {import('../core/FormFieldInstanceRegistry').FormFieldInstanceRegistry} formFieldInstanceRegistry
-   */
-  constructor(eventBus, formFieldRegistry, formFieldInstanceRegistry) {
-    /** @type {Map<string, File[]>} */
-    this[fileRegistry] = new Map();
-    /** @type {import('../core/EventBus').EventBus} */
-    this[eventBusSymbol] = eventBus;
-    /** @type {import('../core/FormFieldRegistry').FormFieldRegistry} */
-    this[formFieldRegistrySymbol] = formFieldRegistry;
-    /** @type {import('../core/FormFieldInstanceRegistry').FormFieldInstanceRegistry} */
-    this[formFieldInstanceRegistrySymbol] = formFieldInstanceRegistry;
-    const removeFileHandler = ({
-      item
-    }) => {
-      const fileReferences = extractFileReferencesFromRemovedData(item);
-
-      // Remove all file references from the registry
-      fileReferences.forEach(fileReference => {
-        this.deleteFiles(fileReference);
-      });
-    };
-    eventBus.on('form.clear', () => this.clear());
-    eventBus.on('conditionChecker.remove', removeFileHandler);
-    eventBus.on('repeatRenderManager.remove', removeFileHandler);
-  }
-
-  /**
-   * @param {string} id
-   * @param {File[]} files
-   */
-  setFiles(id, files) {
-    this[fileRegistry].set(id, files);
-  }
-
-  /**
-   * @param {string} id
-   * @returns {File[]}
-   */
-  getFiles(id) {
-    return this[fileRegistry].get(id) || EMPTY_ARRAY;
-  }
-
-  /**
-   * @returns {string[]}
-   */
-  getKeys() {
-    return Array.from(this[fileRegistry].keys());
-  }
-
-  /**
-   * @param {string} id
-   * @returns {boolean}
-   */
-  hasKey(id) {
-    return this[fileRegistry].has(id);
-  }
-
-  /**
-   * @param {string} id
-   */
-  deleteFiles(id) {
-    this[fileRegistry].delete(id);
-  }
-
-  /**
-   * @returns {Map<string, File[]>}
-   */
-  getAllFiles() {
-    return new Map(this[fileRegistry]);
-  }
-  clear() {
-    this[fileRegistry].clear();
-  }
-}
-FileRegistry.$inject = ['eventBus', 'formFieldRegistry', 'formFieldInstanceRegistry'];
-
 const RenderModule = {
   __init__: ['formFields', 'renderer'],
   formFields: ['type', FormFields],
-  renderer: ['type', Renderer],
-  fileRegistry: ['type', FileRegistry]
+  renderer: ['type', Renderer]
 };
 
 const CoreModule = {
@@ -8988,7 +8879,7 @@ class Form {
   /**
    * Submit the form, triggering all field validations.
    *
-   * @returns { { data: Data, errors: Errors, files: Map<string, File[]> } }
+   * @returns { { data: Data, errors: Errors } }
    */
   submit() {
     const {
@@ -9000,11 +8891,9 @@ class Form {
     this._emit('presubmit');
     const data = this._getSubmitData();
     const errors = this.validate();
-    const files = this.get('fileRegistry').getAllFiles();
     const result = {
       data,
-      errors,
-      files
+      errors
     };
     this._emit('submit', result);
     return result;
@@ -9323,7 +9212,7 @@ class Form {
   }
 }
 
-const schemaVersion = 16;
+const schemaVersion = 17;
 
 /**
  * @typedef { import('./types').CreateFormOptions } CreateFormOptions