@abgov/jsonforms-components 2.57.4 → 2.58.1

package/index.esm.js

@@ -7,7 +7,7 @@ import styled from 'styled-components';
 import axios from 'axios';
 import get$1 from 'lodash/get';
 import { isVisible, isEnabled, deriveLabelForUISchemaElement, rankWith, isStringControl, and, optionIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, uiTypeIs, isControl as isControl$1, isEnumControl, isBooleanControl, createDefaultValue, Paths, Resolve, toDataPath, schemaTypeIs, formatIs, getAjv, schemaMatches, or, isObjectArrayControl, isPrimitiveArrayControl, composePaths, hasType, isCategorization, isLayout } from '@jsonforms/core';
-import * as _$b from 'lodash';
+import * as _$c from 'lodash';
 import ___default, { isObject as isObject$i, isEmpty as isEmpty$1 } from 'lodash';
 import { useJsonForms, withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, withJsonFormsAllOfProps, withJsonFormsArrayLayoutProps, withJsonFormsLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
 import dompurify from 'dompurify';
@@ -2636,6 +2636,63 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall
   ];
 }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
 
+// a string of all valid unicode whitespaces
+var whitespaces$3 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
+  '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
+
+var uncurryThis$m = functionUncurryThis;
+var requireObjectCoercible$6 = requireObjectCoercible$e;
+var toString$e = toString$m;
+var whitespaces$2 = whitespaces$3;
+
+var replace$6 = uncurryThis$m(''.replace);
+var ltrim = RegExp('^[' + whitespaces$2 + ']+');
+var rtrim = RegExp('(^|[^' + whitespaces$2 + '])[' + whitespaces$2 + ']+$');
+
+// `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
+var createMethod$2 = function (TYPE) {
+  return function ($this) {
+    var string = toString$e(requireObjectCoercible$6($this));
+    if (TYPE & 1) string = replace$6(string, ltrim, '');
+    if (TYPE & 2) string = replace$6(string, rtrim, '$1');
+    return string;
+  };
+};
+
+var stringTrim = {
+  // `String.prototype.trim` method
+  // https://tc39.es/ecma262/#sec-string.prototype.trim
+  trim: createMethod$2(3)
+};
+
+var PROPER_FUNCTION_NAME = functionName.PROPER;
+var fails$d = fails$x;
+var whitespaces$1 = whitespaces$3;
+
+var non = '\u200B\u0085\u180E';
+
+// check that a method works with the correct list
+// of whitespaces and has a correct name
+var stringTrimForced = function (METHOD_NAME) {
+  return fails$d(function () {
+    return !!whitespaces$1[METHOD_NAME]()
+      || non[METHOD_NAME]() !== non
+      || (PROPER_FUNCTION_NAME && whitespaces$1[METHOD_NAME].name !== METHOD_NAME);
+  });
+};
+
+var $$C = _export;
+var $trim = stringTrim.trim;
+var forcedStringTrimMethod = stringTrimForced;
+
+// `String.prototype.trim` method
+// https://tc39.es/ecma262/#sec-string.prototype.trim
+$$C({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
+  trim: function trim() {
+    return $trim(this);
+  }
+});
+
 var isPrototypeOf$3 = objectIsPrototypeOf;
 
 var $TypeError$c = TypeError;
@@ -2663,7 +2720,7 @@ var createProperty$4 = function (object, key, value) {
   else object[key] = value;
 };
 
-var $$C = _export;
+var $$B = _export;
 var global$e = global$t;
 var anInstance$3 = anInstance$4;
 var anObject$j = anObject$t;
@@ -2671,7 +2728,7 @@ var isCallable$a = isCallable$t;
 var getPrototypeOf = objectGetPrototypeOf;
 var defineBuiltInAccessor$6 = defineBuiltInAccessor$7;
 var createProperty$3 = createProperty$4;
-var fails$d = fails$x;
+var fails$c = fails$x;
 var hasOwn$7 = hasOwnProperty_1;
 var wellKnownSymbol$b = wellKnownSymbol$o;
 var IteratorPrototype$1 = iteratorsCore.IteratorPrototype;
@@ -2688,7 +2745,7 @@ var NativeIterator = global$e[ITERATOR$6];
 var FORCED$3 = !isCallable$a(NativeIterator)
   || NativeIterator.prototype !== IteratorPrototype$1
   // FF44- non-standard `Iterator` passes previous tests
-  || !fails$d(function () { NativeIterator({}); });
+  || !fails$c(function () { NativeIterator({}); });
 
 var IteratorConstructor = function Iterator() {
   anInstance$3(this, IteratorPrototype$1);
@@ -2722,28 +2779,192 @@ IteratorConstructor.prototype = IteratorPrototype$1;
 
 // `Iterator` constructor
 // https://github.com/tc39/proposal-iterator-helpers
-$$C({ global: true, constructor: true, forced: FORCED$3 }, {
+$$B({ global: true, constructor: true, forced: FORCED$3 }, {
   Iterator: IteratorConstructor
 });
 
-var uncurryThis$m = functionUncurryThisClause;
+// `GetIteratorDirect(obj)` abstract operation
+// https://tc39.es/proposal-iterator-helpers/#sec-getiteratordirect
+var getIteratorDirect$a = function (obj) {
+  return {
+    iterator: obj,
+    next: obj.next,
+    done: false
+  };
+};
+
+var defineBuiltIn$7 = defineBuiltIn$d;
+
+var defineBuiltIns$2 = function (target, src, options) {
+  for (var key in src) defineBuiltIn$7(target, key, src[key], options);
+  return target;
+};
+
+var call$j = functionCall;
+var anObject$i = anObject$t;
+var getMethod$4 = getMethod$7;
+
+var iteratorClose$6 = function (iterator, kind, value) {
+  var innerResult, innerError;
+  anObject$i(iterator);
+  try {
+    innerResult = getMethod$4(iterator, 'return');
+    if (!innerResult) {
+      if (kind === 'throw') throw value;
+      return value;
+    }
+    innerResult = call$j(innerResult, iterator);
+  } catch (error) {
+    innerError = true;
+    innerResult = error;
+  }
+  if (kind === 'throw') throw value;
+  if (innerError) throw innerResult;
+  anObject$i(innerResult);
+  return value;
+};
+
+var call$i = functionCall;
+var create$2 = objectCreate;
+var createNonEnumerableProperty$1 = createNonEnumerableProperty$a;
+var defineBuiltIns$1 = defineBuiltIns$2;
+var wellKnownSymbol$a = wellKnownSymbol$o;
+var InternalStateModule$4 = internalState;
+var getMethod$3 = getMethod$7;
+var IteratorPrototype = iteratorsCore.IteratorPrototype;
+var createIterResultObject$2 = createIterResultObject$4;
+var iteratorClose$5 = iteratorClose$6;
+
+var TO_STRING_TAG = wellKnownSymbol$a('toStringTag');
+var ITERATOR_HELPER = 'IteratorHelper';
+var WRAP_FOR_VALID_ITERATOR = 'WrapForValidIterator';
+var setInternalState$4 = InternalStateModule$4.set;
+
+var createIteratorProxyPrototype = function (IS_ITERATOR) {
+  var getInternalState = InternalStateModule$4.getterFor(IS_ITERATOR ? WRAP_FOR_VALID_ITERATOR : ITERATOR_HELPER);
+
+  return defineBuiltIns$1(create$2(IteratorPrototype), {
+    next: function next() {
+      var state = getInternalState(this);
+      // for simplification:
+      //   for `%WrapForValidIteratorPrototype%.next` our `nextHandler` returns `IterResultObject`
+      //   for `%IteratorHelperPrototype%.next` - just a value
+      if (IS_ITERATOR) return state.nextHandler();
+      try {
+        var result = state.done ? undefined : state.nextHandler();
+        return createIterResultObject$2(result, state.done);
+      } catch (error) {
+        state.done = true;
+        throw error;
+      }
+    },
+    'return': function () {
+      var state = getInternalState(this);
+      var iterator = state.iterator;
+      state.done = true;
+      if (IS_ITERATOR) {
+        var returnMethod = getMethod$3(iterator, 'return');
+        return returnMethod ? call$i(returnMethod, iterator) : createIterResultObject$2(undefined, true);
+      }
+      if (state.inner) try {
+        iteratorClose$5(state.inner.iterator, 'normal');
+      } catch (error) {
+        return iteratorClose$5(iterator, 'throw', error);
+      }
+      iteratorClose$5(iterator, 'normal');
+      return createIterResultObject$2(undefined, true);
+    }
+  });
+};
+
+var WrapForValidIteratorPrototype = createIteratorProxyPrototype(true);
+var IteratorHelperPrototype = createIteratorProxyPrototype(false);
+
+createNonEnumerableProperty$1(IteratorHelperPrototype, TO_STRING_TAG, 'Iterator Helper');
+
+var iteratorCreateProxy = function (nextHandler, IS_ITERATOR) {
+  var IteratorProxy = function Iterator(record, state) {
+    if (state) {
+      state.iterator = record.iterator;
+      state.next = record.next;
+    } else state = record;
+    state.type = IS_ITERATOR ? WRAP_FOR_VALID_ITERATOR : ITERATOR_HELPER;
+    state.nextHandler = nextHandler;
+    state.counter = 0;
+    state.done = false;
+    setInternalState$4(this, state);
+  };
+
+  IteratorProxy.prototype = IS_ITERATOR ? WrapForValidIteratorPrototype : IteratorHelperPrototype;
+
+  return IteratorProxy;
+};
+
+var anObject$h = anObject$t;
+var iteratorClose$4 = iteratorClose$6;
+
+// call something on iterator step with safe closing on error
+var callWithSafeIterationClosing$3 = function (iterator, fn, value, ENTRIES) {
+  try {
+    return ENTRIES ? fn(anObject$h(value)[0], value[1]) : fn(value);
+  } catch (error) {
+    iteratorClose$4(iterator, 'throw', error);
+  }
+};
+
+var $$A = _export;
+var call$h = functionCall;
 var aCallable$g = aCallable$j;
+var anObject$g = anObject$t;
+var getIteratorDirect$9 = getIteratorDirect$a;
+var createIteratorProxy$2 = iteratorCreateProxy;
+var callWithSafeIterationClosing$2 = callWithSafeIterationClosing$3;
+var IS_PURE$3 = isPure;
+
+var IteratorProxy$2 = createIteratorProxy$2(function () {
+  var iterator = this.iterator;
+  var predicate = this.predicate;
+  var next = this.next;
+  var result, done, value;
+  while (true) {
+    result = anObject$g(call$h(next, iterator));
+    done = this.done = !!result.done;
+    if (done) return;
+    value = result.value;
+    if (callWithSafeIterationClosing$2(iterator, predicate, [value, this.counter++], true)) return value;
+  }
+});
+
+// `Iterator.prototype.filter` method
+// https://github.com/tc39/proposal-iterator-helpers
+$$A({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$3 }, {
+  filter: function filter(predicate) {
+    anObject$g(this);
+    aCallable$g(predicate);
+    return new IteratorProxy$2(getIteratorDirect$9(this), {
+      predicate: predicate
+    });
+  }
+});
+
+var uncurryThis$l = functionUncurryThisClause;
+var aCallable$f = aCallable$j;
 var NATIVE_BIND = functionBindNative;
 
-var bind$8 = uncurryThis$m(uncurryThis$m.bind);
+var bind$8 = uncurryThis$l(uncurryThis$l.bind);
 
 // optional / simple context binding
 var functionBindContext = function (fn, that) {
-  aCallable$g(fn);
+  aCallable$f(fn);
   return that === undefined ? fn : NATIVE_BIND ? bind$8(fn, that) : function (/* ...args */) {
     return fn.apply(that, arguments);
   };
 };
 
-var wellKnownSymbol$a = wellKnownSymbol$o;
+var wellKnownSymbol$9 = wellKnownSymbol$o;
 var Iterators$1 = iterators;
 
-var ITERATOR$5 = wellKnownSymbol$a('iterator');
+var ITERATOR$5 = wellKnownSymbol$9('iterator');
 var ArrayPrototype = Array.prototype;
 
 // check on default Array iterator
@@ -2752,22 +2973,22 @@ var isArrayIteratorMethod$2 = function (it) {
 };
 
 var classof$6 = classof$a;
-var getMethod$4 = getMethod$7;
+var getMethod$2 = getMethod$7;
 var isNullOrUndefined$3 = isNullOrUndefined$7;
 var Iterators = iterators;
-var wellKnownSymbol$9 = wellKnownSymbol$o;
+var wellKnownSymbol$8 = wellKnownSymbol$o;
 
-var ITERATOR$4 = wellKnownSymbol$9('iterator');
+var ITERATOR$4 = wellKnownSymbol$8('iterator');
 
 var getIteratorMethod$5 = function (it) {
-  if (!isNullOrUndefined$3(it)) return getMethod$4(it, ITERATOR$4)
-    || getMethod$4(it, '@@iterator')
+  if (!isNullOrUndefined$3(it)) return getMethod$2(it, ITERATOR$4)
+    || getMethod$2(it, '@@iterator')
     || Iterators[classof$6(it)];
 };
 
-var call$j = functionCall;
-var aCallable$f = aCallable$j;
-var anObject$i = anObject$t;
+var call$g = functionCall;
+var aCallable$e = aCallable$j;
+var anObject$f = anObject$t;
 var tryToString$2 = tryToString$4;
 var getIteratorMethod$4 = getIteratorMethod$5;
 
@@ -2775,44 +2996,20 @@ var $TypeError$a = TypeError;
 
 var getIterator$3 = function (argument, usingIterator) {
   var iteratorMethod = arguments.length < 2 ? getIteratorMethod$4(argument) : usingIterator;
-  if (aCallable$f(iteratorMethod)) return anObject$i(call$j(iteratorMethod, argument));
+  if (aCallable$e(iteratorMethod)) return anObject$f(call$g(iteratorMethod, argument));
   throw new $TypeError$a(tryToString$2(argument) + ' is not iterable');
 };
 
-var call$i = functionCall;
-var anObject$h = anObject$t;
-var getMethod$3 = getMethod$7;
-
-var iteratorClose$6 = function (iterator, kind, value) {
-  var innerResult, innerError;
-  anObject$h(iterator);
-  try {
-    innerResult = getMethod$3(iterator, 'return');
-    if (!innerResult) {
-      if (kind === 'throw') throw value;
-      return value;
-    }
-    innerResult = call$i(innerResult, iterator);
-  } catch (error) {
-    innerError = true;
-    innerResult = error;
-  }
-  if (kind === 'throw') throw value;
-  if (innerError) throw innerResult;
-  anObject$h(innerResult);
-  return value;
-};
-
 var bind$7 = functionBindContext;
-var call$h = functionCall;
-var anObject$g = anObject$t;
+var call$f = functionCall;
+var anObject$e = anObject$t;
 var tryToString$1 = tryToString$4;
 var isArrayIteratorMethod$1 = isArrayIteratorMethod$2;
 var lengthOfArrayLike$7 = lengthOfArrayLike$a;
 var isPrototypeOf$2 = objectIsPrototypeOf;
 var getIterator$2 = getIterator$3;
 var getIteratorMethod$3 = getIteratorMethod$5;
-var iteratorClose$5 = iteratorClose$6;
+var iteratorClose$3 = iteratorClose$6;
 
 var $TypeError$9 = TypeError;
 
@@ -2833,13 +3030,13 @@ var iterate$a = function (iterable, unboundFunction, options) {
   var iterator, iterFn, index, length, result, next, step;
 
   var stop = function (condition) {
-    if (iterator) iteratorClose$5(iterator, 'normal', condition);
+    if (iterator) iteratorClose$3(iterator, 'normal', condition);
     return new Result(true, condition);
   };
 
   var callFn = function (value) {
     if (AS_ENTRIES) {
-      anObject$g(value);
+      anObject$e(value);
       return INTERRUPTED ? fn(value[0], value[1], stop) : fn(value[0], value[1]);
     } return INTERRUPTED ? fn(value, stop) : fn(value);
   };
@@ -2862,39 +3059,29 @@ var iterate$a = function (iterable, unboundFunction, options) {
   }
 
   next = IS_RECORD ? iterable.next : iterator.next;
-  while (!(step = call$h(next, iterator)).done) {
+  while (!(step = call$f(next, iterator)).done) {
     try {
       result = callFn(step.value);
     } catch (error) {
-      iteratorClose$5(iterator, 'throw', error);
+      iteratorClose$3(iterator, 'throw', error);
     }
     if (typeof result == 'object' && result && isPrototypeOf$2(ResultPrototype, result)) return result;
   } return new Result(false);
 };
 
-// `GetIteratorDirect(obj)` abstract operation
-// https://tc39.es/proposal-iterator-helpers/#sec-getiteratordirect
-var getIteratorDirect$a = function (obj) {
-  return {
-    iterator: obj,
-    next: obj.next,
-    done: false
-  };
-};
-
-var $$B = _export;
+var $$z = _export;
 var iterate$9 = iterate$a;
-var aCallable$e = aCallable$j;
-var anObject$f = anObject$t;
-var getIteratorDirect$9 = getIteratorDirect$a;
+var aCallable$d = aCallable$j;
+var anObject$d = anObject$t;
+var getIteratorDirect$8 = getIteratorDirect$a;
 
 // `Iterator.prototype.find` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$B({ target: 'Iterator', proto: true, real: true }, {
+$$z({ target: 'Iterator', proto: true, real: true }, {
   find: function find(predicate) {
-    anObject$f(this);
-    aCallable$e(predicate);
-    var record = getIteratorDirect$9(this);
+    anObject$d(this);
+    aCallable$d(predicate);
+    var record = getIteratorDirect$8(this);
     var counter = 0;
     return iterate$9(record, function (value, stop) {
       if (predicate(value, counter++)) return stop(value);
@@ -2902,19 +3089,19 @@ $$B({ target: 'Iterator', proto: true, real: true }, {
   }
 });
 
-var $$A = _export;
+var $$y = _export;
 var iterate$8 = iterate$a;
-var aCallable$d = aCallable$j;
-var anObject$e = anObject$t;
-var getIteratorDirect$8 = getIteratorDirect$a;
+var aCallable$c = aCallable$j;
+var anObject$c = anObject$t;
+var getIteratorDirect$7 = getIteratorDirect$a;
 
 // `Iterator.prototype.forEach` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$A({ target: 'Iterator', proto: true, real: true }, {
+$$y({ target: 'Iterator', proto: true, real: true }, {
   forEach: function forEach(fn) {
-    anObject$e(this);
-    aCallable$d(fn);
-    var record = getIteratorDirect$8(this);
+    anObject$c(this);
+    aCallable$c(fn);
+    var record = getIteratorDirect$7(this);
     var counter = 0;
     iterate$8(record, function (value) {
       fn(value, counter++);
@@ -2922,132 +3109,37 @@ $$A({ target: 'Iterator', proto: true, real: true }, {
   }
 });
 
-var defineBuiltIn$7 = defineBuiltIn$d;
-
-var defineBuiltIns$2 = function (target, src, options) {
-  for (var key in src) defineBuiltIn$7(target, key, src[key], options);
-  return target;
-};
-
-var call$g = functionCall;
-var create$2 = objectCreate;
-var createNonEnumerableProperty$1 = createNonEnumerableProperty$a;
-var defineBuiltIns$1 = defineBuiltIns$2;
-var wellKnownSymbol$8 = wellKnownSymbol$o;
-var InternalStateModule$4 = internalState;
-var getMethod$2 = getMethod$7;
-var IteratorPrototype = iteratorsCore.IteratorPrototype;
-var createIterResultObject$2 = createIterResultObject$4;
-var iteratorClose$4 = iteratorClose$6;
-
-var TO_STRING_TAG = wellKnownSymbol$8('toStringTag');
-var ITERATOR_HELPER = 'IteratorHelper';
-var WRAP_FOR_VALID_ITERATOR = 'WrapForValidIterator';
-var setInternalState$4 = InternalStateModule$4.set;
-
-var createIteratorProxyPrototype = function (IS_ITERATOR) {
-  var getInternalState = InternalStateModule$4.getterFor(IS_ITERATOR ? WRAP_FOR_VALID_ITERATOR : ITERATOR_HELPER);
-
-  return defineBuiltIns$1(create$2(IteratorPrototype), {
-    next: function next() {
-      var state = getInternalState(this);
-      // for simplification:
-      //   for `%WrapForValidIteratorPrototype%.next` our `nextHandler` returns `IterResultObject`
-      //   for `%IteratorHelperPrototype%.next` - just a value
-      if (IS_ITERATOR) return state.nextHandler();
-      try {
-        var result = state.done ? undefined : state.nextHandler();
-        return createIterResultObject$2(result, state.done);
-      } catch (error) {
-        state.done = true;
-        throw error;
-      }
-    },
-    'return': function () {
-      var state = getInternalState(this);
-      var iterator = state.iterator;
-      state.done = true;
-      if (IS_ITERATOR) {
-        var returnMethod = getMethod$2(iterator, 'return');
-        return returnMethod ? call$g(returnMethod, iterator) : createIterResultObject$2(undefined, true);
-      }
-      if (state.inner) try {
-        iteratorClose$4(state.inner.iterator, 'normal');
-      } catch (error) {
-        return iteratorClose$4(iterator, 'throw', error);
-      }
-      iteratorClose$4(iterator, 'normal');
-      return createIterResultObject$2(undefined, true);
-    }
-  });
-};
-
-var WrapForValidIteratorPrototype = createIteratorProxyPrototype(true);
-var IteratorHelperPrototype = createIteratorProxyPrototype(false);
-
-createNonEnumerableProperty$1(IteratorHelperPrototype, TO_STRING_TAG, 'Iterator Helper');
-
-var iteratorCreateProxy = function (nextHandler, IS_ITERATOR) {
-  var IteratorProxy = function Iterator(record, state) {
-    if (state) {
-      state.iterator = record.iterator;
-      state.next = record.next;
-    } else state = record;
-    state.type = IS_ITERATOR ? WRAP_FOR_VALID_ITERATOR : ITERATOR_HELPER;
-    state.nextHandler = nextHandler;
-    state.counter = 0;
-    state.done = false;
-    setInternalState$4(this, state);
-  };
-
-  IteratorProxy.prototype = IS_ITERATOR ? WrapForValidIteratorPrototype : IteratorHelperPrototype;
-
-  return IteratorProxy;
-};
-
-var anObject$d = anObject$t;
-var iteratorClose$3 = iteratorClose$6;
-
-// call something on iterator step with safe closing on error
-var callWithSafeIterationClosing$3 = function (iterator, fn, value, ENTRIES) {
-  try {
-    return ENTRIES ? fn(anObject$d(value)[0], value[1]) : fn(value);
-  } catch (error) {
-    iteratorClose$3(iterator, 'throw', error);
-  }
-};
-
-var call$f = functionCall;
-var aCallable$c = aCallable$j;
-var anObject$c = anObject$t;
-var getIteratorDirect$7 = getIteratorDirect$a;
-var createIteratorProxy$2 = iteratorCreateProxy;
-var callWithSafeIterationClosing$2 = callWithSafeIterationClosing$3;
+var call$e = functionCall;
+var aCallable$b = aCallable$j;
+var anObject$b = anObject$t;
+var getIteratorDirect$6 = getIteratorDirect$a;
+var createIteratorProxy$1 = iteratorCreateProxy;
+var callWithSafeIterationClosing$1 = callWithSafeIterationClosing$3;
 
-var IteratorProxy$2 = createIteratorProxy$2(function () {
+var IteratorProxy$1 = createIteratorProxy$1(function () {
   var iterator = this.iterator;
-  var result = anObject$c(call$f(this.next, iterator));
+  var result = anObject$b(call$e(this.next, iterator));
   var done = this.done = !!result.done;
-  if (!done) return callWithSafeIterationClosing$2(iterator, this.mapper, [result.value, this.counter++], true);
+  if (!done) return callWithSafeIterationClosing$1(iterator, this.mapper, [result.value, this.counter++], true);
 });
 
 // `Iterator.prototype.map` method
 // https://github.com/tc39/proposal-iterator-helpers
 var iteratorMap = function map(mapper) {
-  anObject$c(this);
-  aCallable$c(mapper);
-  return new IteratorProxy$2(getIteratorDirect$7(this), {
+  anObject$b(this);
+  aCallable$b(mapper);
+  return new IteratorProxy$1(getIteratorDirect$6(this), {
     mapper: mapper
   });
 };
 
-var $$z = _export;
+var $$x = _export;
 var map = iteratorMap;
-var IS_PURE$3 = isPure;
+var IS_PURE$2 = isPure;
 
 // `Iterator.prototype.map` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$z({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$3 }, {
+$$x({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$2 }, {
   map: map
 });
 
@@ -3067,19 +3159,19 @@ const getAddressLookupFieldLabel = fieldName => {
   return ADDRESS_LOOKUP_LABELS[fieldName] || fieldName;
 };
 
-var $$y = _export;
+var $$w = _export;
 var iterate$7 = iterate$a;
-var aCallable$b = aCallable$j;
-var anObject$b = anObject$t;
-var getIteratorDirect$6 = getIteratorDirect$a;
+var aCallable$a = aCallable$j;
+var anObject$a = anObject$t;
+var getIteratorDirect$5 = getIteratorDirect$a;
 
 // `Iterator.prototype.every` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$y({ target: 'Iterator', proto: true, real: true }, {
+$$w({ target: 'Iterator', proto: true, real: true }, {
   every: function every(predicate) {
-    anObject$b(this);
-    aCallable$b(predicate);
-    var record = getIteratorDirect$6(this);
+    anObject$a(this);
+    aCallable$a(predicate);
+    var record = getIteratorDirect$5(this);
     var counter = 0;
     return !iterate$7(record, function (value, stop) {
       if (!predicate(value, counter++)) return stop();
@@ -3087,42 +3179,7 @@ $$y({ target: 'Iterator', proto: true, real: true }, {
   }
 });
 
-var $$x = _export;
-var call$e = functionCall;
-var aCallable$a = aCallable$j;
-var anObject$a = anObject$t;
-var getIteratorDirect$5 = getIteratorDirect$a;
-var createIteratorProxy$1 = iteratorCreateProxy;
-var callWithSafeIterationClosing$1 = callWithSafeIterationClosing$3;
-var IS_PURE$2 = isPure;
-
-var IteratorProxy$1 = createIteratorProxy$1(function () {
-  var iterator = this.iterator;
-  var predicate = this.predicate;
-  var next = this.next;
-  var result, done, value;
-  while (true) {
-    result = anObject$a(call$e(next, iterator));
-    done = this.done = !!result.done;
-    if (done) return;
-    value = result.value;
-    if (callWithSafeIterationClosing$1(iterator, predicate, [value, this.counter++], true)) return value;
-  }
-});
-
-// `Iterator.prototype.filter` method
-// https://github.com/tc39/proposal-iterator-helpers
-$$x({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$2 }, {
-  filter: function filter(predicate) {
-    anObject$a(this);
-    aCallable$a(predicate);
-    return new IteratorProxy$1(getIteratorDirect$5(this), {
-      predicate: predicate
-    });
-  }
-});
-
-var uncurryThis$l = functionUncurryThis;
+var uncurryThis$k = functionUncurryThis;
 
 // eslint-disable-next-line es/no-set -- safe
 var SetPrototype$1 = Set.prototype;
@@ -3130,9 +3187,9 @@ var SetPrototype$1 = Set.prototype;
 var setHelpers = {
   // eslint-disable-next-line es/no-set -- safe
   Set: Set,
-  add: uncurryThis$l(SetPrototype$1.add),
-  has: uncurryThis$l(SetPrototype$1.has),
-  remove: uncurryThis$l(SetPrototype$1['delete']),
+  add: uncurryThis$k(SetPrototype$1.add),
+  has: uncurryThis$k(SetPrototype$1.has),
+  remove: uncurryThis$k(SetPrototype$1['delete']),
   proto: SetPrototype$1
 };
 
@@ -3156,14 +3213,14 @@ var iterateSimple$7 = function (record, fn, ITERATOR_INSTEAD_OF_RECORD) {
   }
 };
 
-var uncurryThis$k = functionUncurryThis;
+var uncurryThis$j = functionUncurryThis;
 var iterateSimple$6 = iterateSimple$7;
 var SetHelpers$5 = setHelpers;
 
 var Set$3 = SetHelpers$5.Set;
 var SetPrototype = SetHelpers$5.proto;
-var forEach$2 = uncurryThis$k(SetPrototype.forEach);
-var keys$1 = uncurryThis$k(SetPrototype.keys);
+var forEach$2 = uncurryThis$j(SetPrototype.forEach);
+var keys$1 = uncurryThis$j(SetPrototype.keys);
 var next = keys$1(new Set$3()).next;
 
 var setIterate = function (set, fn, interruptible) {
@@ -3292,13 +3349,13 @@ var setMethodAcceptSetLike$7 = function (name) {
   }
 };
 
-var $$w = _export;
+var $$v = _export;
 var difference = setDifference;
 var setMethodAcceptSetLike$6 = setMethodAcceptSetLike$7;
 
 // `Set.prototype.difference` method
 // https://github.com/tc39/proposal-set-methods
-$$w({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$6('difference') }, {
+$$v({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$6('difference') }, {
   difference: difference
 });
 
@@ -3333,19 +3390,19 @@ var setIntersection = function intersection(other) {
   return result;
 };
 
-var $$v = _export;
-var fails$c = fails$x;
+var $$u = _export;
+var fails$b = fails$x;
 var intersection = setIntersection;
 var setMethodAcceptSetLike$5 = setMethodAcceptSetLike$7;
 
-var INCORRECT = !setMethodAcceptSetLike$5('intersection') || fails$c(function () {
+var INCORRECT = !setMethodAcceptSetLike$5('intersection') || fails$b(function () {
   // eslint-disable-next-line es/no-array-from, es/no-set -- testing
   return String(Array.from(new Set([1, 2, 3]).intersection(new Set([3, 2])))) !== '3,2';
 });
 
 // `Set.prototype.intersection` method
 // https://github.com/tc39/proposal-set-methods
-$$v({ target: 'Set', proto: true, real: true, forced: INCORRECT }, {
+$$u({ target: 'Set', proto: true, real: true, forced: INCORRECT }, {
   intersection: intersection
 });
 
@@ -3371,13 +3428,13 @@ var setIsDisjointFrom = function isDisjointFrom(other) {
   }) !== false;
 };
 
-var $$u = _export;
+var $$t = _export;
 var isDisjointFrom = setIsDisjointFrom;
 var setMethodAcceptSetLike$4 = setMethodAcceptSetLike$7;
 
 // `Set.prototype.isDisjointFrom` method
 // https://github.com/tc39/proposal-set-methods
-$$u({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$4('isDisjointFrom') }, {
+$$t({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$4('isDisjointFrom') }, {
   isDisjointFrom: isDisjointFrom
 });
 
@@ -3397,13 +3454,13 @@ var setIsSubsetOf = function isSubsetOf(other) {
   }, true) !== false;
 };
 
-var $$t = _export;
+var $$s = _export;
 var isSubsetOf = setIsSubsetOf;
 var setMethodAcceptSetLike$3 = setMethodAcceptSetLike$7;
 
 // `Set.prototype.isSubsetOf` method
 // https://github.com/tc39/proposal-set-methods
-$$t({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$3('isSubsetOf') }, {
+$$s({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$3('isSubsetOf') }, {
   isSubsetOf: isSubsetOf
 });
 
@@ -3426,13 +3483,13 @@ var setIsSupersetOf = function isSupersetOf(other) {
   }) !== false;
 };
 
-var $$s = _export;
+var $$r = _export;
 var isSupersetOf = setIsSupersetOf;
 var setMethodAcceptSetLike$2 = setMethodAcceptSetLike$7;
 
 // `Set.prototype.isSupersetOf` method
 // https://github.com/tc39/proposal-set-methods
-$$s({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$2('isSupersetOf') }, {
+$$r({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$2('isSupersetOf') }, {
   isSupersetOf: isSupersetOf
 });
 
@@ -3459,13 +3516,13 @@ var setSymmetricDifference = function symmetricDifference(other) {
   return result;
 };
 
-var $$r = _export;
+var $$q = _export;
 var symmetricDifference = setSymmetricDifference;
 var setMethodAcceptSetLike$1 = setMethodAcceptSetLike$7;
 
 // `Set.prototype.symmetricDifference` method
 // https://github.com/tc39/proposal-set-methods
-$$r({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$1('symmetricDifference') }, {
+$$q({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike$1('symmetricDifference') }, {
   symmetricDifference: symmetricDifference
 });
 
@@ -3487,13 +3544,13 @@ var setUnion = function union(other) {
   return result;
 };
 
-var $$q = _export;
+var $$p = _export;
 var union = setUnion;
 var setMethodAcceptSetLike = setMethodAcceptSetLike$7;
 
 // `Set.prototype.union` method
 // https://github.com/tc39/proposal-set-methods
-$$q({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike('union') }, {
+$$p({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike('union') }, {
   union: union
 });
 
@@ -3633,8 +3690,8 @@ const capitalizeFirstLetter = words => {
 const controlScopeMatchesLabel = (scope, label) => {
   var _scope$replace$split$, _scope$replace$split;
   // Get the property name in the string from the scope
-  const splitIdName = (_scope$replace$split$ = scope == null || (_scope$replace$split = scope.replace(' ', '').split('/')) == null || (_scope$replace$split = _scope$replace$split.at(-1)) == null ? void 0 : _scope$replace$split.toLowerCase()) != null ? _scope$replace$split$ : '';
-  const labelWithNoSpaces = label == null ? void 0 : label.replace(' ', '').toLowerCase();
+  const splitIdName = (_scope$replace$split$ = scope == null || (_scope$replace$split = scope.replace(/\s+/g, '').split('/')) == null || (_scope$replace$split = _scope$replace$split.at(-1)) == null ? void 0 : _scope$replace$split.toLowerCase()) != null ? _scope$replace$split$ : '';
+  const labelWithNoSpaces = label == null ? void 0 : label.replace(/\s+/g, '').toLowerCase();
   return splitIdName === labelWithNoSpaces;
 };
 /**
@@ -3655,6 +3712,46 @@ const getLabelText = (scope, label) => {
 const areAllUppercase = label => {
   return /^[^a-z]*$/.test(label);
 };
+const getExplicitControlLabel = props => {
+  var _props$uischema, _props$schema, _props$uischema2;
+  const optionText = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.text;
+  if (typeof optionText === 'string' && optionText.trim()) {
+    return optionText.trim();
+  }
+  if (typeof ((_props$schema = props.schema) == null ? void 0 : _props$schema.title) === 'string' && props.schema.title.trim()) {
+    return props.schema.title.trim();
+  }
+  const uiLabel = (_props$uischema2 = props.uischema) == null ? void 0 : _props$uischema2.label;
+  if (typeof uiLabel === 'string' && uiLabel.trim()) {
+    return uiLabel.trim();
+  }
+  if (typeof uiLabel === 'object' && uiLabel !== null && 'text' in uiLabel) {
+    const text = uiLabel.text;
+    if (typeof text === 'string' && text.trim()) {
+      return text.trim();
+    }
+  }
+  return undefined;
+};
+const getGeneratedLabelFromScope = scope => {
+  if (!(scope != null && scope.startsWith('#/'))) {
+    return '';
+  }
+  const propertyName = getLastSegmentFromPointer(scope);
+  const readableLabel = convertToReadableFormat(propertyName);
+  return getLabelText(scope, readableLabel);
+};
+const getControlLabelText = props => {
+  var _props$uischema3;
+  const explicitLabel = getExplicitControlLabel(props);
+  if (explicitLabel) {
+    return explicitLabel;
+  }
+  if ((_props$uischema3 = props.uischema) != null && (_props$uischema3 = _props$uischema3.scope) != null && _props$uischema3.startsWith('#/')) {
+    return getGeneratedLabelFromScope(props.uischema.scope);
+  }
+  return props.label || '';
+};
 const isEmptyBoolean = (schema, data) => {
   return schema.type !== undefined && schema.type === 'boolean' && (data === null || data === undefined);
 };
@@ -3748,10 +3845,9 @@ const checkFieldValidity = (props, rootData) => {
     data,
     errors: ajvErrors,
     required,
-    label,
     schema
   } = props;
-  const labelToUpdate = label;
+  const labelToUpdate = getControlLabelText(props);
   const extraSchema = schema;
   if (extraSchema && data && (extraSchema == null ? void 0 : extraSchema.title) === sinTitle) {
     if (data.length === 11 && !validateSinWithLuhn(data)) {
@@ -3813,7 +3909,7 @@ const convertToReadableFormat = input => {
   if (!input) {
     return input;
   }
-  return input.replace(/([a-z])([A-Z])/g, '$1 $2').split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ');
+  return input.replace(/([a-z])([A-Z])/g, '$1 $2').replace(/[_-]/g, ' ').split(' ').filter(Boolean).map(word => areAllUppercase(word) ? word : word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ');
 };
 
 const standardizeDate = date => {
@@ -4078,23 +4174,23 @@ const ensureGoaDatePointerCursor = host => {
   sr.appendChild(style);
 };
 
-let _$a = t => t,
-  _t$b,
+let _$b = t => t,
+  _t$c,
   _t2$6;
-styled.div(_t$b || (_t$b = _$a`
+styled.div(_t$c || (_t$c = _$b`
   height: 70vh;
   overflow-y: auto;
   padding-left: var(--goa-space-2xs);
   padding-right: var(--goa-space-2xs);
 `));
-const Visible = styled.div(_t2$6 || (_t2$6 = _$a`
+const Visible = styled.div(_t2$6 || (_t2$6 = _$b`
   display: ${0};
   width: 100%;
 `), p => p.visible ? 'block' : 'none');
 
-var uncurryThis$j = functionUncurryThis;
+var uncurryThis$i = functionUncurryThis;
 
-var arraySlice$4 = uncurryThis$j([].slice);
+var arraySlice$4 = uncurryThis$i([].slice);
 
 var classof$5 = classofRaw$2;
 
@@ -4105,13 +4201,13 @@ var isArray$5 = Array.isArray || function isArray(argument) {
   return classof$5(argument) === 'Array';
 };
 
-var uncurryThis$i = functionUncurryThis;
+var uncurryThis$h = functionUncurryThis;
 var isArray$4 = isArray$5;
 var isCallable$9 = isCallable$t;
 var classof$4 = classofRaw$2;
-var toString$e = toString$m;
+var toString$d = toString$m;
 
-var push$6 = uncurryThis$i([].push);
+var push$6 = uncurryThis$h([].push);
 
 var getJsonReplacerFunction = function (replacer) {
   if (isCallable$9(replacer)) return replacer;
@@ -4121,7 +4217,7 @@ var getJsonReplacerFunction = function (replacer) {
   for (var i = 0; i < rawLength; i++) {
     var element = replacer[i];
     if (typeof element == 'string') push$6(keys, element);
-    else if (typeof element == 'number' || classof$4(element) === 'Number' || classof$4(element) === 'String') push$6(keys, toString$e(element));
+    else if (typeof element == 'number' || classof$4(element) === 'Number' || classof$4(element) === 'String') push$6(keys, toString$d(element));
   }
   var keysLength = keys.length;
   var root = true;
@@ -4135,12 +4231,12 @@ var getJsonReplacerFunction = function (replacer) {
   };
 };
 
-var $$p = _export;
+var $$o = _export;
 var getBuiltIn$5 = getBuiltIn$b;
 var apply$1 = functionApply;
 var call$b = functionCall;
-var uncurryThis$h = functionUncurryThis;
-var fails$b = fails$x;
+var uncurryThis$g = functionUncurryThis;
+var fails$a = fails$x;
 var isCallable$8 = isCallable$t;
 var isSymbol = isSymbol$3;
 var arraySlice$3 = arraySlice$4;
@@ -4149,17 +4245,17 @@ var NATIVE_SYMBOL$2 = symbolConstructorDetection;
 
 var $String = String;
 var $stringify = getBuiltIn$5('JSON', 'stringify');
-var exec$7 = uncurryThis$h(/./.exec);
-var charAt$4 = uncurryThis$h(''.charAt);
-var charCodeAt$1 = uncurryThis$h(''.charCodeAt);
-var replace$6 = uncurryThis$h(''.replace);
-var numberToString$1 = uncurryThis$h(1.0.toString);
+var exec$7 = uncurryThis$g(/./.exec);
+var charAt$4 = uncurryThis$g(''.charAt);
+var charCodeAt$1 = uncurryThis$g(''.charCodeAt);
+var replace$5 = uncurryThis$g(''.replace);
+var numberToString$1 = uncurryThis$g(1.0.toString);
 
 var tester = /[\uD800-\uDFFF]/g;
 var low = /^[\uD800-\uDBFF]$/;
 var hi = /^[\uDC00-\uDFFF]$/;
 
-var WRONG_SYMBOLS_CONVERSION = !NATIVE_SYMBOL$2 || fails$b(function () {
+var WRONG_SYMBOLS_CONVERSION = !NATIVE_SYMBOL$2 || fails$a(function () {
   var symbol = getBuiltIn$5('Symbol')('stringify detection');
   // MS Edge converts symbol values to JSON as {}
   return $stringify([symbol]) !== '[null]'
@@ -4170,7 +4266,7 @@ var WRONG_SYMBOLS_CONVERSION = !NATIVE_SYMBOL$2 || fails$b(function () {
 });
 
 // https://github.com/tc39/proposal-well-formed-stringify
-var ILL_FORMED_UNICODE = fails$b(function () {
+var ILL_FORMED_UNICODE = fails$a(function () {
   return $stringify('\uDF06\uD834') !== '"\\udf06\\ud834"'
     || $stringify('\uDEAD') !== '"\\udead"';
 });
@@ -4198,12 +4294,12 @@ var fixIllFormed = function (match, offset, string) {
 if ($stringify) {
   // `JSON.stringify` method
   // https://tc39.es/ecma262/#sec-json.stringify
-  $$p({ target: 'JSON', stat: true, arity: 3, forced: WRONG_SYMBOLS_CONVERSION || ILL_FORMED_UNICODE }, {
+  $$o({ target: 'JSON', stat: true, arity: 3, forced: WRONG_SYMBOLS_CONVERSION || ILL_FORMED_UNICODE }, {
     // eslint-disable-next-line no-unused-vars -- required for `.length`
     stringify: function stringify(it, replacer, space) {
       var args = arraySlice$3(arguments);
       var result = apply$1(WRONG_SYMBOLS_CONVERSION ? stringifyWithSymbolsFix : $stringify, null, args);
-      return ILL_FORMED_UNICODE && typeof result == 'string' ? replace$6(result, tester, fixIllFormed) : result;
+      return ILL_FORMED_UNICODE && typeof result == 'string' ? replace$5(result, tester, fixIllFormed) : result;
     }
   });
 }
@@ -4213,6 +4309,15 @@ const OPTION_DEFINITIONS = defineFields$1({
   mainTitle: {
     schema: 'Main form title'
   },
+  enableEmail: {
+    schema: true
+  },
+  enablePhone: {
+    schema: true
+  },
+  emailFirst: {
+    schema: true
+  },
   noDataMessage: {
     schema: 'no data'
   },
@@ -4282,14 +4387,14 @@ var doesNotExceedSafeInteger$2 = function (it) {
   return it;
 };
 
-var $$o = _export;
+var $$n = _export;
 var toObject$4 = toObject$a;
 var lengthOfArrayLike$6 = lengthOfArrayLike$a;
 var setArrayLength = arraySetLength;
 var doesNotExceedSafeInteger$1 = doesNotExceedSafeInteger$2;
-var fails$a = fails$x;
+var fails$9 = fails$x;
 
-var INCORRECT_TO_LENGTH = fails$a(function () {
+var INCORRECT_TO_LENGTH = fails$9(function () {
   return [].push.call({ length: 0x100000000 }, 1) !== 4294967297;
 });
 
@@ -4308,7 +4413,7 @@ var FORCED$2 = INCORRECT_TO_LENGTH || !properErrorOnNonWritableLength();
 
 // `Array.prototype.push` method
 // https://tc39.es/ecma262/#sec-array.prototype.push
-$$o({ target: 'Array', proto: true, arity: 1, forced: FORCED$2 }, {
+$$n({ target: 'Array', proto: true, arity: 1, forced: FORCED$2 }, {
   // eslint-disable-next-line no-unused-vars -- required for `.length`
   push: function push(item) {
     var O = toObject$4(this);
@@ -4365,20 +4470,20 @@ function registerReducer(state, action) {
   return state;
 }
 
-var $$n = _export;
+var $$m = _export;
 var $includes = arrayIncludes.includes;
-var fails$9 = fails$x;
+var fails$8 = fails$x;
 var addToUnscopables$2 = addToUnscopables$5;
 
 // FF99+ bug
-var BROKEN_ON_SPARSE = fails$9(function () {
+var BROKEN_ON_SPARSE = fails$8(function () {
   // eslint-disable-next-line es/no-array-prototype-includes -- detection
   return !Array(1).includes();
 });
 
 // `Array.prototype.includes` method
 // https://tc39.es/ecma262/#sec-array.prototype.includes
-$$n({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+$$m({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
   includes: function includes(el /* , fromIndex = 0 */) {
     return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
   }
@@ -4410,8 +4515,8 @@ var setSpecies$2 = function (CONSTRUCTOR_NAME) {
   }
 };
 
-var uncurryThis$g = functionUncurryThis;
-var fails$8 = fails$x;
+var uncurryThis$f = functionUncurryThis;
+var fails$7 = fails$x;
 var isCallable$7 = isCallable$t;
 var classof$2 = classof$a;
 var getBuiltIn$3 = getBuiltIn$b;
@@ -4420,7 +4525,7 @@ var inspectSource$1 = inspectSource$3;
 var noop = function () { /* empty */ };
 var construct = getBuiltIn$3('Reflect', 'construct');
 var constructorRegExp = /^\s*(?:class|function)\b/;
-var exec$6 = uncurryThis$g(constructorRegExp.exec);
+var exec$6 = uncurryThis$f(constructorRegExp.exec);
 var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
 var isConstructorModern = function isConstructor(argument) {
@@ -4454,7 +4559,7 @@ isConstructorLegacy.sham = true;
 
 // `IsConstructor` abstract operation
 // https://tc39.es/ecma262/#sec-isconstructor
-var isConstructor$3 = !construct || fails$8(function () {
+var isConstructor$3 = !construct || fails$7(function () {
   var called;
   return isConstructorModern(isConstructorModern.call)
     || !isConstructorModern(Object)
@@ -4505,7 +4610,7 @@ var apply = functionApply;
 var bind$6 = functionBindContext;
 var isCallable$6 = isCallable$t;
 var hasOwn$6 = hasOwnProperty_1;
-var fails$7 = fails$x;
+var fails$6 = fails$x;
 var html = html$2;
 var arraySlice$2 = arraySlice$4;
 var createElement = documentCreateElement$2;
@@ -4525,7 +4630,7 @@ var queue$2 = {};
 var ONREADYSTATECHANGE = 'onreadystatechange';
 var $location, defer, channel, port;
 
-fails$7(function () {
+fails$6(function () {
   // Deno throws a ReferenceError on `location` access without `--location` flag
   $location = global$c.location;
 });
@@ -4592,7 +4697,7 @@ if (!set || !clear) {
     isCallable$6(global$c.postMessage) &&
     !global$c.importScripts &&
     $location && $location.protocol !== 'file:' &&
-    !fails$7(globalPostMessageDefer)
+    !fails$6(globalPostMessageDefer)
   ) {
     defer = globalPostMessageDefer;
     global$c.addEventListener('message', eventListener, false);
@@ -4837,7 +4942,7 @@ newPromiseCapability$2.f = function (C) {
   return new PromiseCapability(C);
 };
 
-var $$m = _export;
+var $$l = _export;
 var IS_NODE$1 = engineIsNode;
 var global$7 = global$t;
 var call$a = functionCall;
@@ -5117,7 +5222,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) {
   }
 }
 
-$$m({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTRUCTOR$4 }, {
+$$l({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTRUCTOR$4 }, {
   Promise: PromiseConstructor
 });
 
@@ -5173,7 +5278,7 @@ var promiseStaticsIncorrectIteration = FORCED_PROMISE_CONSTRUCTOR$3 || !checkCor
   NativePromiseConstructor$1.all(iterable).then(undefined, function () { /* empty */ });
 });
 
-var $$l = _export;
+var $$k = _export;
 var call$9 = functionCall;
 var aCallable$6 = aCallable$j;
 var newPromiseCapabilityModule$2 = newPromiseCapability$2;
@@ -5183,7 +5288,7 @@ var PROMISE_STATICS_INCORRECT_ITERATION$1 = promiseStaticsIncorrectIteration;
 
 // `Promise.all` method
 // https://tc39.es/ecma262/#sec-promise.all
-$$l({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$1 }, {
+$$k({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$1 }, {
   all: function all(iterable) {
     var C = this;
     var capability = newPromiseCapabilityModule$2.f(C);
@@ -5212,7 +5317,7 @@ $$l({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION
   }
 });
 
-var $$k = _export;
+var $$j = _export;
 var FORCED_PROMISE_CONSTRUCTOR$2 = promiseConstructorDetection.CONSTRUCTOR;
 var NativePromiseConstructor = promiseNativeConstructor;
 var getBuiltIn$2 = getBuiltIn$b;
@@ -5223,7 +5328,7 @@ var NativePromisePrototype = NativePromiseConstructor && NativePromiseConstructo
 
 // `Promise.prototype.catch` method
 // https://tc39.es/ecma262/#sec-promise.prototype.catch
-$$k({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, real: true }, {
+$$j({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, real: true }, {
   'catch': function (onRejected) {
     return this.then(undefined, onRejected);
   }
@@ -5237,7 +5342,7 @@ if (isCallable$3(NativePromiseConstructor)) {
   }
 }
 
-var $$j = _export;
+var $$i = _export;
 var call$8 = functionCall;
 var aCallable$5 = aCallable$j;
 var newPromiseCapabilityModule$1 = newPromiseCapability$2;
@@ -5247,7 +5352,7 @@ var PROMISE_STATICS_INCORRECT_ITERATION = promiseStaticsIncorrectIteration;
 
 // `Promise.race` method
 // https://tc39.es/ecma262/#sec-promise.race
-$$j({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION }, {
+$$i({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION }, {
   race: function race(iterable) {
     var C = this;
     var capability = newPromiseCapabilityModule$1.f(C);
@@ -5263,13 +5368,13 @@ $$j({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION
   }
 });
 
-var $$i = _export;
+var $$h = _export;
 var newPromiseCapabilityModule = newPromiseCapability$2;
 var FORCED_PROMISE_CONSTRUCTOR$1 = promiseConstructorDetection.CONSTRUCTOR;
 
 // `Promise.reject` method
 // https://tc39.es/ecma262/#sec-promise.reject
-$$i({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, {
+$$h({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, {
   reject: function reject(r) {
     var capability = newPromiseCapabilityModule.f(this);
     var capabilityReject = capability.reject;
@@ -5291,7 +5396,7 @@ var promiseResolve$1 = function (C, x) {
   return promiseCapability.promise;
 };
 
-var $$h = _export;
+var $$g = _export;
 var getBuiltIn$1 = getBuiltIn$b;
 var FORCED_PROMISE_CONSTRUCTOR = promiseConstructorDetection.CONSTRUCTOR;
 var promiseResolve = promiseResolve$1;
@@ -5300,34 +5405,34 @@ getBuiltIn$1('Promise');
 
 // `Promise.resolve` method
 // https://tc39.es/ecma262/#sec-promise.resolve
-$$h({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, {
+$$g({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, {
   resolve: function resolve(x) {
     return promiseResolve(this, x);
   }
 });
 
-var $$g = _export;
-var uncurryThis$f = functionUncurryThis;
+var $$f = _export;
+var uncurryThis$e = functionUncurryThis;
 var notARegExp$1 = notARegexp;
-var requireObjectCoercible$6 = requireObjectCoercible$e;
-var toString$d = toString$m;
+var requireObjectCoercible$5 = requireObjectCoercible$e;
+var toString$c = toString$m;
 var correctIsRegExpLogic$1 = correctIsRegexpLogic;
 
-var stringIndexOf$1 = uncurryThis$f(''.indexOf);
+var stringIndexOf$1 = uncurryThis$e(''.indexOf);
 
 // `String.prototype.includes` method
 // https://tc39.es/ecma262/#sec-string.prototype.includes
-$$g({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, {
+$$f({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, {
   includes: function includes(searchString /* , position = 0 */) {
     return !!~stringIndexOf$1(
-      toString$d(requireObjectCoercible$6(this)),
-      toString$d(notARegExp$1(searchString)),
+      toString$c(requireObjectCoercible$5(this)),
+      toString$c(notARegExp$1(searchString)),
       arguments.length > 1 ? arguments[1] : undefined
     );
   }
 });
 
-var $$f = _export;
+var $$e = _export;
 var iterate$2 = iterate$a;
 var aCallable$4 = aCallable$j;
 var anObject$6 = anObject$t;
@@ -5335,7 +5440,7 @@ var getIteratorDirect$3 = getIteratorDirect$a;
 
 // `Iterator.prototype.some` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$f({ target: 'Iterator', proto: true, real: true }, {
+$$e({ target: 'Iterator', proto: true, real: true }, {
   some: function some(predicate) {
     anObject$6(this);
     aCallable$4(predicate);
@@ -5349,7 +5454,7 @@ $$f({ target: 'Iterator', proto: true, real: true }, {
 
 var DESCRIPTORS$7 = descriptors;
 var global$6 = global$t;
-var uncurryThis$e = functionUncurryThis;
+var uncurryThis$d = functionUncurryThis;
 var isForced = isForced_1;
 var inheritIfRequired = inheritIfRequired$2;
 var createNonEnumerableProperty = createNonEnumerableProperty$a;
@@ -5357,12 +5462,12 @@ var create$1 = objectCreate;
 var getOwnPropertyNames = objectGetOwnPropertyNames.f;
 var isPrototypeOf$1 = objectIsPrototypeOf;
 var isRegExp = isRegexp;
-var toString$c = toString$m;
+var toString$b = toString$m;
 var getRegExpFlags = regexpGetFlags;
 var stickyHelpers$1 = regexpStickyHelpers;
 var proxyAccessor = proxyAccessor$2;
 var defineBuiltIn$4 = defineBuiltIn$d;
-var fails$6 = fails$x;
+var fails$5 = fails$x;
 var hasOwn$5 = hasOwnProperty_1;
 var enforceInternalState = internalState.enforce;
 var setSpecies = setSpecies$2;
@@ -5374,11 +5479,11 @@ var MATCH = wellKnownSymbol$3('match');
 var NativeRegExp = global$6.RegExp;
 var RegExpPrototype$1 = NativeRegExp.prototype;
 var SyntaxError$2 = global$6.SyntaxError;
-var exec$5 = uncurryThis$e(RegExpPrototype$1.exec);
-var charAt$3 = uncurryThis$e(''.charAt);
-var replace$5 = uncurryThis$e(''.replace);
-var stringIndexOf = uncurryThis$e(''.indexOf);
-var stringSlice$5 = uncurryThis$e(''.slice);
+var exec$5 = uncurryThis$d(RegExpPrototype$1.exec);
+var charAt$3 = uncurryThis$d(''.charAt);
+var replace$4 = uncurryThis$d(''.replace);
+var stringIndexOf = uncurryThis$d(''.indexOf);
+var stringSlice$5 = uncurryThis$d(''.slice);
 // TODO: Use only proper RegExpIdentifierName
 var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/;
 var re1 = /a/g;
@@ -5391,7 +5496,7 @@ var MISSED_STICKY = stickyHelpers$1.MISSED_STICKY;
 var UNSUPPORTED_Y$1 = stickyHelpers$1.UNSUPPORTED_Y;
 
 var BASE_FORCED = DESCRIPTORS$7 &&
-  (!CORRECT_NEW || MISSED_STICKY || UNSUPPORTED_DOT_ALL$1 || UNSUPPORTED_NCG || fails$6(function () {
+  (!CORRECT_NEW || MISSED_STICKY || UNSUPPORTED_DOT_ALL$1 || UNSUPPORTED_NCG || fails$5(function () {
     re2[MATCH] = false;
     // RegExp constructor can alter flags and IsRegExp works correct with @@match
     return NativeRegExp(re1) !== re1 || NativeRegExp(re2) === re2 || String(NativeRegExp(re1, 'i')) !== '/a/i';
@@ -5485,20 +5590,20 @@ if (isForced('RegExp', BASE_FORCED)) {
       if (flagsAreUndefined) flags = getRegExpFlags(rawPattern);
     }
 
-    pattern = pattern === undefined ? '' : toString$c(pattern);
-    flags = flags === undefined ? '' : toString$c(flags);
+    pattern = pattern === undefined ? '' : toString$b(pattern);
+    flags = flags === undefined ? '' : toString$b(flags);
     rawPattern = pattern;
 
     if (UNSUPPORTED_DOT_ALL$1 && 'dotAll' in re1) {
       dotAll = !!flags && stringIndexOf(flags, 's') > -1;
-      if (dotAll) flags = replace$5(flags, /s/g, '');
+      if (dotAll) flags = replace$4(flags, /s/g, '');
     }
 
     rawFlags = flags;
 
     if (MISSED_STICKY && 'sticky' in re1) {
       sticky = !!flags && stringIndexOf(flags, 'y') > -1;
-      if (sticky && UNSUPPORTED_Y$1) flags = replace$5(flags, /y/g, '');
+      if (sticky && UNSUPPORTED_Y$1) flags = replace$4(flags, /y/g, '');
     }
 
     if (UNSUPPORTED_NCG) {
@@ -5767,8 +5872,8 @@ const useRegisterUser = () => {
   return ctx.user;
 };
 
-let _$9 = t => t,
-  _t$a,
+let _$a = t => t,
+  _t$b,
   _t2$5,
   _t3$4,
   _t4$4,
@@ -5780,10 +5885,10 @@ let _$9 = t => t,
   _t0$2,
   _t1$2,
   _t10$2;
-const FormFieldWrapper = styled.div(_t$a || (_t$a = _$9`
+const FormFieldWrapper$1 = styled.div(_t$b || (_t$b = _$a`
   margin-bottom: var(--goa-space-l);
 `));
-const WarningIconDiv = styled.div(_t2$5 || (_t2$5 = _$9`
+const WarningIconDiv = styled.div(_t2$5 || (_t2$5 = _$a`
   display: flex;
   align-items: flex-start;
   gap: var(--goa-space-2xs);
@@ -5791,58 +5896,58 @@ const WarningIconDiv = styled.div(_t2$5 || (_t2$5 = _$9`
   color: var(--goa-form-item-error-message-color);
   margin-top: var(--goa-form-item-message-margin-top);
 `));
-const RequiredTextLabel = styled.label(_t3$4 || (_t3$4 = _$9`
+const RequiredTextLabel = styled.label(_t3$4 || (_t3$4 = _$a`
   color: var(--goa-color-greyscale-700);
   font-weight: var(--goa-font-weight-regular);
   font-size: var(--goa-font-size-2);
   line-height: var(--goa-line-height-1);
   font-style: normal;
 `));
-styled.td(_t4$4 || (_t4$4 = _$9`
+styled.td(_t4$4 || (_t4$4 = _$a`
   width: 40%;
   padding-top: var(--goa-space-s);
   padding-bottom: var(--goa-space-s);
   padding-right: var(--goa-space-m);
   vertical-align: top;
 `));
-styled.td(_t5$3 || (_t5$3 = _$9`
+styled.td(_t5$3 || (_t5$3 = _$a`
   width: 40%;
   text-align: left;
   vertical-align: top;
 `));
-const PageReviewContainer = styled.td(_t6$3 || (_t6$3 = _$9`
+const PageReviewContainer = styled.td(_t6$3 || (_t6$3 = _$a`
   padding: 12px 0px;
   border-bottom: 1px solid #ccc;
   width: 100%;
   vertical-align: top;
 `));
-const ReviewHeader = styled.div(_t7$2 || (_t7$2 = _$9`
+const ReviewHeader = styled.div(_t7$2 || (_t7$2 = _$a`
   display: flex;
   justify-content: space-between;
   align-items: center;
   width: 100%;
 `));
-const ReviewLabel = styled.div(_t8$2 || (_t8$2 = _$9`
+const ReviewLabel = styled.div(_t8$2 || (_t8$2 = _$a`
   font-weight: var(--goa-font-weight-bold);
   font-size: var(--goa-font-size-4);
   line-height: var(--goa-line-height-3);
   color: var(--goa-color-text-default);
 `));
-const ReviewValue = styled.div(_t9$2 || (_t9$2 = _$9`
+const ReviewValue = styled.div(_t9$2 || (_t9$2 = _$a`
   margin-top: var(--goa-space-m);
   color: var(--goa-color-text-default);
   font-size: var(--goa-font-size-4);
   line-height: var(--goa-line-height-3);
 `));
 //Check and unchecked are different heights otherwise
-const CheckboxWrapper = styled.div(_t0$2 || (_t0$2 = _$9`
+const CheckboxWrapper = styled.div(_t0$2 || (_t0$2 = _$a`
   min-height: 28px;
 `));
-styled.h4(_t1$2 || (_t1$2 = _$9`
+styled.h4(_t1$2 || (_t1$2 = _$a`
   margin: 0 0 0.25rem 0;
   fontsize: larger;
 `));
-styled.h4(_t10$2 || (_t10$2 = _$9`
+styled.h4(_t10$2 || (_t10$2 = _$a`
   border-bottom: 1px solid #ddd;
 `));
 
@@ -5856,7 +5961,7 @@ var $TypeError$1 = TypeError;
 var REDUCE_EMPTY = 'Reduce of empty array with no initial value';
 
 // `Array.prototype.{ reduce, reduceRight }` methods implementation
-var createMethod$2 = function (IS_RIGHT) {
+var createMethod$1 = function (IS_RIGHT) {
   return function (that, callbackfn, argumentsLength, memo) {
     var O = toObject$3(that);
     var self = IndexedObject(O);
@@ -5886,19 +5991,19 @@ var createMethod$2 = function (IS_RIGHT) {
 var arrayReduce = {
   // `Array.prototype.reduce` method
   // https://tc39.es/ecma262/#sec-array.prototype.reduce
-  left: createMethod$2(false)};
+  left: createMethod$1(false)};
 
-var fails$5 = fails$x;
+var fails$4 = fails$x;
 
 var arrayMethodIsStrict$1 = function (METHOD_NAME, argument) {
   var method = [][METHOD_NAME];
-  return !!method && fails$5(function () {
+  return !!method && fails$4(function () {
     // eslint-disable-next-line no-useless-call -- required for testing
     method.call(null, argument || function () { return 1; }, 1);
   });
 };
 
-var $$e = _export;
+var $$d = _export;
 var $reduce = arrayReduce.left;
 var arrayMethodIsStrict = arrayMethodIsStrict$1;
 var CHROME_VERSION = engineV8Version;
@@ -5911,14 +6016,14 @@ var FORCED$1 = CHROME_BUG || !arrayMethodIsStrict('reduce');
 
 // `Array.prototype.reduce` method
 // https://tc39.es/ecma262/#sec-array.prototype.reduce
-$$e({ target: 'Array', proto: true, forced: FORCED$1 }, {
+$$d({ target: 'Array', proto: true, forced: FORCED$1 }, {
   reduce: function reduce(callbackfn /* , initialValue */) {
     var length = arguments.length;
     return $reduce(this, callbackfn, length, length > 1 ? arguments[1] : undefined);
   }
 });
 
-var $$d = _export;
+var $$c = _export;
 var iterate$1 = iterate$a;
 var aCallable$2 = aCallable$j;
 var anObject$5 = anObject$t;
@@ -5928,7 +6033,7 @@ var $TypeError = TypeError;
 
 // `Iterator.prototype.reduce` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$d({ target: 'Iterator', proto: true, real: true }, {
+$$c({ target: 'Iterator', proto: true, real: true }, {
   reduce: function reduce(reducer /* , initialValue */) {
     anObject$5(this);
     aCallable$2(reducer);
@@ -5957,7 +6062,7 @@ const pickPropertyValues = (obj, property, endWithType) => {
   Object.entries(obj).forEach(function ([key, value]) {
     if (key === property) {
       values.push(value);
-    } else if (_$b.isObject(value)) {
+    } else if (_$c.isObject(value)) {
       // if the object type is equal to end type, we are not going to continue the recursive approach
       if ((value == null ? void 0 : value.type) === endWithType) {
         if (property in value) {
@@ -5966,7 +6071,7 @@ const pickPropertyValues = (obj, property, endWithType) => {
       } else {
         values = [...values, ...pickPropertyValues(value, property, endWithType)];
       }
-    } else if (_$b.isArray(value)) {
+    } else if (_$c.isArray(value)) {
       const nextValues = value.map(function (arrayObj) {
         return pickPropertyValues(arrayObj, property, endWithType);
       });
@@ -5976,63 +6081,6 @@ const pickPropertyValues = (obj, property, endWithType) => {
   return values;
 };
 
-// a string of all valid unicode whitespaces
-var whitespaces$3 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
-  '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
-
-var uncurryThis$d = functionUncurryThis;
-var requireObjectCoercible$5 = requireObjectCoercible$e;
-var toString$b = toString$m;
-var whitespaces$2 = whitespaces$3;
-
-var replace$4 = uncurryThis$d(''.replace);
-var ltrim = RegExp('^[' + whitespaces$2 + ']+');
-var rtrim = RegExp('(^|[^' + whitespaces$2 + '])[' + whitespaces$2 + ']+$');
-
-// `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
-var createMethod$1 = function (TYPE) {
-  return function ($this) {
-    var string = toString$b(requireObjectCoercible$5($this));
-    if (TYPE & 1) string = replace$4(string, ltrim, '');
-    if (TYPE & 2) string = replace$4(string, rtrim, '$1');
-    return string;
-  };
-};
-
-var stringTrim = {
-  // `String.prototype.trim` method
-  // https://tc39.es/ecma262/#sec-string.prototype.trim
-  trim: createMethod$1(3)
-};
-
-var PROPER_FUNCTION_NAME = functionName.PROPER;
-var fails$4 = fails$x;
-var whitespaces$1 = whitespaces$3;
-
-var non = '\u200B\u0085\u180E';
-
-// check that a method works with the correct list
-// of whitespaces and has a correct name
-var stringTrimForced = function (METHOD_NAME) {
-  return fails$4(function () {
-    return !!whitespaces$1[METHOD_NAME]()
-      || non[METHOD_NAME]() !== non
-      || (PROPER_FUNCTION_NAME && whitespaces$1[METHOD_NAME].name !== METHOD_NAME);
-  });
-};
-
-var $$c = _export;
-var $trim = stringTrim.trim;
-var forcedStringTrimMethod = stringTrimForced;
-
-// `String.prototype.trim` method
-// https://tc39.es/ecma262/#sec-string.prototype.trim
-$$c({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
-  trim: function trim() {
-    return $trim(this);
-  }
-});
-
 var uncurryThis$c = functionUncurryThis;
 var hasOwn$4 = hasOwnProperty_1;
 
@@ -6912,7 +6960,7 @@ const GoAInputBaseControl = props => {
     skipInitialValidation
   } = props;
   const InnerComponent = input;
-  const labelToUpdate = label || '';
+  const labelToUpdate = getControlLabelText(props);
   const controlRef = useRef(null);
   const formStepperCtx = useContext(JsonFormsStepperContext);
   const stepperState = formStepperCtx == null || formStepperCtx.selectStepperState == null ? void 0 : formStepperCtx.selectStepperState();
@@ -6969,7 +7017,7 @@ const GoAInputBaseControl = props => {
     defaultRegisters: undefined,
     children: jsx(Visible, {
       visible: visible,
-      children: jsx(FormFieldWrapper, {
+      children: jsx(FormFieldWrapper$1, {
         ref: controlRef,
         className: "jsonforms-elements-wrapper",
         id: isStepperReview === true ? `review-base-${path}-element-wrapper` : `${path}-element-wrapper`,
@@ -8270,8 +8318,8 @@ const BooleanRadioControl = props => jsx(GoAInputBaseControl, Object.assign({},
 const GoABooleanRadioControlTester = rankWith(3, and(isBooleanControl, optionIs('radio', true)));
 const GoABooleanRadioControl = withJsonFormsControlProps(BooleanRadioControl);
 
-let _$8 = t => t,
-  _t$9;
+let _$9 = t => t,
+  _t$a;
 const Checkboxes = ({
   children,
   orientation,
@@ -8283,7 +8331,7 @@ const Checkboxes = ({
     children: children
   });
 };
-const CheckBoxGroupDiv = styled.div(_t$9 || (_t$9 = _$8`
+const CheckBoxGroupDiv = styled.div(_t$a || (_t$a = _$9`
   .horizontal {
     display: flex;
     flex-direction: row;
@@ -8419,6 +8467,7 @@ const GoABaseInputReviewComponent = props => {
     }) : null;
   };
   const requiredText = getRequiredLabelText();
+  const getFallbackCheckboxLabel = () => getControlLabelText(props);
   const renderWarningMessage = () => {
     var _uischema$options4;
     if ((_uischema$options4 = uischema.options) != null && _uischema$options4.radio) return null;
@@ -8428,15 +8477,9 @@ const GoABaseInputReviewComponent = props => {
     return null;
   };
   if (isBoolean) {
-    var _uischema$options5, _uischema$options6;
-    let checkboxLabel = '';
-    if ((_uischema$options5 = uischema.options) != null && (_uischema$options5 = _uischema$options5.text) != null && _uischema$options5.trim()) {
-      checkboxLabel = uischema.options.text.trim();
-    } else if (uischema.scope && uischema.scope.startsWith('#/')) {
-      const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
-      checkboxLabel = fallbackLabel.charAt(0).toUpperCase() + fallbackLabel.slice(1);
-    }
-    if (((_uischema$options6 = uischema.options) == null ? void 0 : _uischema$options6.radio) === true) {
+    var _uischema$options5;
+    const checkboxLabel = getFallbackCheckboxLabel();
+    if (((_uischema$options5 = uischema.options) == null ? void 0 : _uischema$options5.radio) === true) {
       reviewText = data ? `Yes` : `No`;
     } else {
       reviewText = data ? `Yes (${checkboxLabel})` : `No (${checkboxLabel})`;
@@ -8451,16 +8494,7 @@ const GoABaseInputReviewComponent = props => {
   if (Array.isArray(data) && data.length > 0) {
     reviewText = jsx("ul", {
       children: data.map((checkbox, index) => {
-        var _uischema$options7;
-        let checkboxLabel = '';
-        // Use explicit text if provided, otherwise fall back to property name from scope
-        if (uischema != null && (_uischema$options7 = uischema.options) != null && (_uischema$options7 = _uischema$options7.text) != null && _uischema$options7.trim()) {
-          checkboxLabel = uischema.options.text.trim();
-        } else if (uischema.scope && uischema.scope.startsWith('#/')) {
-          const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
-          // Capitalize first letter only when falling back to property name from scope
-          checkboxLabel = fallbackLabel.charAt(0).toUpperCase() + fallbackLabel.slice(1);
-        }
+        const checkboxLabel = getFallbackCheckboxLabel();
         return jsx("li", {
           children: checkbox.trim() || checkboxLabel
         }, index);
@@ -8643,8 +8677,8 @@ $$7({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$1 }, {
   }
 });
 
-let _$7 = t => t,
-  _t$8,
+let _$8 = t => t,
+  _t$9,
   _t2$4,
   _t3$3,
   _t4$3,
@@ -8675,21 +8709,21 @@ let _$7 = t => t,
   _t27$1,
   _t28$1,
   _t29;
-const DeleteDialogContent = styled.div(_t$8 || (_t$8 = _$7`
+const DeleteDialogContent = styled.div(_t$9 || (_t$9 = _$8`
   margin-bottom: var(--goa-space-m);
 `));
-const MarginTop = styled.div(_t2$4 || (_t2$4 = _$7`
+const MarginTop = styled.div(_t2$4 || (_t2$4 = _$8`
   margin-top: var(--goa-space-l);
 `));
-const NonEmptyCellStyle = styled.div(_t3$3 || (_t3$3 = _$7`
+const NonEmptyCellStyle = styled.div(_t3$3 || (_t3$3 = _$8`
   goa-table thead th {
     background-color: #000:
   }
 `));
-const ToolBarHeader = styled.div(_t4$3 || (_t4$3 = _$7`
+const ToolBarHeader = styled.div(_t4$3 || (_t4$3 = _$8`
   margin-bottom: var(--goa-space-s);
 `));
-const ObjectArrayTitle = styled.h3(_t5$2 || (_t5$2 = _$7`
+const ObjectArrayTitle = styled.h3(_t5$2 || (_t5$2 = _$8`
   margin-bottom: var(--goa-space-s);
 
   span {
@@ -8697,24 +8731,24 @@ const ObjectArrayTitle = styled.h3(_t5$2 || (_t5$2 = _$7`
     font-size: var(--goa-font-size-2);
   }
 `));
-const RequiredSpan = styled.span(_t6$2 || (_t6$2 = _$7`
+const RequiredSpan = styled.span(_t6$2 || (_t6$2 = _$8`
   color: #666666;
   font-weight: var(--goa-font-weight-regular);
   font-size: var(--goa-font-size-2);
 `));
-const TextCenter = styled.div(_t7$1 || (_t7$1 = _$7`
+const TextCenter = styled.div(_t7$1 || (_t7$1 = _$8`
   text-align: center;
 `));
-const SideMenuItem = styled.div(_t8$1 || (_t8$1 = _$7`
+const SideMenuItem = styled.div(_t8$1 || (_t8$1 = _$8`
   margin-top: 1rem;
 `));
-const RowFlex = styled.div(_t9$1 || (_t9$1 = _$7`
+const RowFlex = styled.div(_t9$1 || (_t9$1 = _$8`
   display: flex;
   margin: 1.5rem 0 1.5rem 0;
 
   align-items: flex-start;
 `));
-const RowFlexMenuMain = styled.div(_t0$1 || (_t0$1 = _$7`
+const RowFlexMenuMain = styled.div(_t0$1 || (_t0$1 = _$8`
   display: flex;
   flex-direction: column;
   align-items: stretch;
@@ -8731,7 +8765,7 @@ const RowFlexMenuMain = styled.div(_t0$1 || (_t0$1 = _$7`
     border-color: var(--goa-color-greyscale-400);
   }
 `));
-const RowFlexMenuLeft = styled.div(_t1$1 || (_t1$1 = _$7`
+const RowFlexMenuLeft = styled.div(_t1$1 || (_t1$1 = _$8`
   display: flex;
   flex-direction: row;
   align-items: stretch;
@@ -8747,12 +8781,12 @@ const RowFlexMenuLeft = styled.div(_t1$1 || (_t1$1 = _$7`
     border-color: var(--goa-color-greyscale-400);
   }
 `));
-const FlexTabs = styled.div(_t10$1 || (_t10$1 = _$7`
+const FlexTabs = styled.div(_t10$1 || (_t10$1 = _$8`
   flex-direction: column;
   flex: 1;
   overflow-y: auto !important;
 `));
-const FlexTabsWithMargin = styled.div(_t11$1 || (_t11$1 = _$7`
+const FlexTabsWithMargin = styled.div(_t11$1 || (_t11$1 = _$8`
   flex-direction: column;
   flex: 1;
   overflow-y: auto !important;
@@ -8761,64 +8795,64 @@ const FlexTabsWithMargin = styled.div(_t11$1 || (_t11$1 = _$7`
   flex-shrink: 1;
   // max-height: 500px;
 `));
-const FlexForm = styled.div(_t12$1 || (_t12$1 = _$7`
+const FlexForm = styled.div(_t12$1 || (_t12$1 = _$8`
   flex-direction: column;
   flex: 3;
   flex-shrink: 0;
   overflow-y: visible;
 `));
-const TabName = styled.div(_t13$1 || (_t13$1 = _$7`
+const TabName = styled.div(_t13$1 || (_t13$1 = _$8`
   margin: 1rem 0 1rem 1rem;
   font-weight: 400;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 `));
-const Trash = styled.div(_t14$1 || (_t14$1 = _$7`
+const Trash = styled.div(_t14$1 || (_t14$1 = _$8`
   margin: 0.9rem 0.4rem 0.6rem 0.75rem;
   margin-left: auto;
 `));
-const ListContainer = styled.div(_t15$1 || (_t15$1 = _$7`
+const ListContainer = styled.div(_t15$1 || (_t15$1 = _$8`
   padding: 0 0 0 0;
 `));
-styled.div(_t16$1 || (_t16$1 = _$7`
+styled.div(_t16$1 || (_t16$1 = _$8`
   padding: 0 0 var(--goa-space-l) 0;
 `));
-const UpdateListContainer = styled.div(_t17$1 || (_t17$1 = _$7`
+const UpdateListContainer = styled.div(_t17$1 || (_t17$1 = _$8`
   width: 100%;
   border: 1px solid #dcdcdc;
   padding: var(--goa-space-xl);
 `));
-styled.div(_t18$1 || (_t18$1 = _$7`
+styled.div(_t18$1 || (_t18$1 = _$8`
   padding: 0 1.5rem 0 0;
   border: 1px solid #dcdcdc;
 `));
-const TableTHHeader = styled.th(_t19$1 || (_t19$1 = _$7`
+const TableTHHeader = styled.th(_t19$1 || (_t19$1 = _$8`
   background-color: var(--goa-color-greyscale-100) !important;
   vertical-align: top;
 `));
-const ObjectArrayWarningIconDiv = styled.div(_t20$1 || (_t20$1 = _$7`
+const ObjectArrayWarningIconDiv = styled.div(_t20$1 || (_t20$1 = _$8`
   display: inline-flex;
   align-items: flex-start;
   gap: 0.25rem;
   font-size: var(--goa-font-size-2);
   color: var(--goa-color-interactive-error);
 `));
-const ListWithDetailWarningIconDiv = styled.div(_t21$1 || (_t21$1 = _$7`
+const ListWithDetailWarningIconDiv = styled.div(_t21$1 || (_t21$1 = _$8`
   display: inline-flex;
   align-items: flex-start;
   gap: 0.25rem;
   font-size: var(--goa-font-size-3);
   color: var(--goa-color-interactive-error);
 `));
-styled.label(_t22$1 || (_t22$1 = _$7`
+styled.label(_t22$1 || (_t22$1 = _$8`
   color: var(--goa-color-interactive-error);
   font-weight: var(--goa-font-weight-regular);
   font-size: var(--goa-font-size-3);
   line-height: var(--goa-line-height-1);
   font-style: normal;
 `));
-styled.div(_t23$1 || (_t23$1 = _$7`
+styled.div(_t23$1 || (_t23$1 = _$8`
   margin-top: var(--goa-space-m);
   color: var(--goa-color-interactive-error);
   font-weight: var(--goa-font-weight-regular);
@@ -8826,10 +8860,10 @@ styled.div(_t23$1 || (_t23$1 = _$7`
   line-height: var(--goa-line-height-1);
   font-style: normal;
 `));
-const HilightCellWarning = styled.div(_t24$1 || (_t24$1 = _$7`
+const HilightCellWarning = styled.div(_t24$1 || (_t24$1 = _$8`
   background-color: transparent;
 `));
-const FixTableHeaderAlignment = styled.div(_t25$1 || (_t25$1 = _$7`
+const FixTableHeaderAlignment = styled.div(_t25$1 || (_t25$1 = _$8`
   table thead th:nth-child(3) {
     text-align: center;
   }
@@ -8838,22 +8872,22 @@ const FixTableHeaderAlignment = styled.div(_t25$1 || (_t25$1 = _$7`
     text-align: center;
   }
 `));
-const ListWithDetailsReviewCellDiv = styled.div(_t26$1 || (_t26$1 = _$7`
+const ListWithDetailsReviewCellDiv = styled.div(_t26$1 || (_t26$1 = _$8`
   display: 'flex';
   flex-direction: 'column';
   text-align: 'start';
 `));
-const IconsContainer = styled.div(_t27$1 || (_t27$1 = _$7`
+const IconsContainer = styled.div(_t27$1 || (_t27$1 = _$8`
   display: flex;
   align-items: center;
   justify-content: flex-end;
   gap: var(--goa-space-xs);
   padding-bottom: var(--goa-space-xs);
 `));
-const TableContentContainer = styled.div(_t28$1 || (_t28$1 = _$7`
+const TableContentContainer = styled.div(_t28$1 || (_t28$1 = _$8`
   padding: var(--goa-space-l);
 `));
-const NoDataMessage = styled.div(_t29 || (_t29 = _$7`
+const NoDataMessage = styled.div(_t29 || (_t29 = _$8`
   padding: var(--goa-space-xl) var(--goa-space-l);
   color: var(--goa-color-greyscale-700);
   font: var(--goa-typography-body-m);
@@ -9856,7 +9890,7 @@ class ListWithDetailControl extends React.Component {
 }
 
 const GoAInputBaseTableReview = props => {
-  var _uischema$options, _uischema$scope, _jsonForms$core, _uischema$options4;
+  var _uischema$options, _uischema$scope2, _jsonForms$core, _uischema$options4;
   const {
     data,
     uischema,
@@ -9880,11 +9914,19 @@ const GoAInputBaseTableReview = props => {
   let labelToUpdate = '';
   if (reviewLabel.trim() !== '') {
     labelToUpdate = reviewLabel;
+  } else if (typeof (schema == null ? void 0 : schema.title) === 'string' && schema.title.trim()) {
+    labelToUpdate = schema.title;
   } else if (propLabel.trim() !== '') {
+    var _uischema$scope;
+    if ((_uischema$scope = uischema.scope) != null && _uischema$scope.startsWith('#/') && controlScopeMatchesLabel(uischema.scope, propLabel)) {
+      labelToUpdate = getLabelText(uischema.scope, propLabel);
+    } else {
+      labelToUpdate = propLabel;
+    }
+  } else if ((_uischema$scope2 = uischema.scope) != null && _uischema$scope2.startsWith('#/')) {
+    labelToUpdate = getGeneratedLabelFromScope(uischema.scope);
+  } else {
     labelToUpdate = propLabel;
-  } else if ((_uischema$scope = uischema.scope) != null && _uischema$scope.startsWith('#/')) {
-    const scopeName = uischema.scope ? getLastSegmentFromPointer(uischema.scope) : '';
-    labelToUpdate = convertToReadableFormat(scopeName);
   }
   let reviewText = data;
   const isBoolean = typeof data === 'boolean';
@@ -9912,8 +9954,7 @@ const GoAInputBaseTableReview = props => {
     if ((_uischema$options2 = uischema.options) != null && (_uischema$options2 = _uischema$options2.text) != null && _uischema$options2.trim()) {
       checkboxLabel = uischema.options.text.trim();
     } else if (uischema.scope && uischema.scope.startsWith('#/')) {
-      const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
-      checkboxLabel = convertToReadableFormat(fallbackLabel);
+      checkboxLabel = getGeneratedLabelFromScope(uischema.scope);
     }
     if (((_uischema$options3 = uischema.options) == null ? void 0 : _uischema$options3.radio) === true) {
       reviewText = data ? `Yes` : `No`;
@@ -10206,7 +10247,7 @@ const GoAEmailInput = props => {
     visible: visible,
     children: jsx(JsonFormRegisterProvider, {
       defaultRegisters: undefined,
-      children: jsx(FormFieldWrapper, {
+      children: jsx(FormFieldWrapper$1, {
         children: jsx(GoabFormItem, {
           error: isVisited && finalErrors,
           testId: "form-email-input-wrapper",
@@ -10251,8 +10292,8 @@ const GoAEmailControl = props => jsx(GoAEmailInput, Object.assign({}, props));
 const GoAEmailControlTester = rankWith(4, and(isControl$1, schemaTypeIs('string'), formatIs('email')));
 const GoAInputEmailControl = withJsonFormsControlProps(GoAEmailControl);
 
-let _$6 = t => t,
-  _t$7;
+let _$7 = t => t,
+  _t$8;
 const renderLayoutElements = (elements, schema, path, enabled, renderers, cells) => {
   return elements.map((child, index) => jsx(JsonFormsDispatch, {
     uischema: child,
@@ -10331,14 +10372,14 @@ const ReviewLayoutRenderer = ({
     }
   }
 };
-const ReviewGrid = styled.div(_t$7 || (_t$7 = _$6`
+const ReviewGrid = styled.div(_t$8 || (_t$8 = _$7`
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(250px, calc(50% - 8px)));
   gap: 16px;
 `));
 
-let _$5 = t => t,
-  _t$6,
+let _$6 = t => t,
+  _t$7,
   _t2$3,
   _t3$2,
   _t4$2,
@@ -10368,11 +10409,11 @@ let _$5 = t => t,
   _t26,
   _t27,
   _t28;
-const ReviewItem = styled.div(_t$6 || (_t$6 = _$5`
+const ReviewItem = styled.div(_t$7 || (_t$7 = _$6`
   display: flex;
   flex-direction: column;
 `));
-const CompletionStatus = styled.div(_t2$3 || (_t2$3 = _$5`
+const CompletionStatus = styled.div(_t2$3 || (_t2$3 = _$6`
   padding: 0;
   margin: 0;
   padding-top: var(--goa-space-xl);
@@ -10380,14 +10421,14 @@ const CompletionStatus = styled.div(_t2$3 || (_t2$3 = _$5`
   display: flex;
   flex-direction: column;
 `));
-const BarTop = styled.div(_t3$2 || (_t3$2 = _$5`
+const BarTop = styled.div(_t3$2 || (_t3$2 = _$6`
   display: flex;
 
   .progress-text {
     margin-left: auto;
   }
 `));
-const Bar = styled.div(_t4$2 || (_t4$2 = _$5`
+const Bar = styled.div(_t4$2 || (_t4$2 = _$6`
   display: flex;
   flex-direction: row;
 
@@ -10417,15 +10458,15 @@ const Bar = styled.div(_t4$2 || (_t4$2 = _$5`
     box-sizing: border-box;
   }
 `));
-styled.div(_t5$1 || (_t5$1 = _$5``));
-const BadgeWrapper = styled.div(_t6$1 || (_t6$1 = _$5`
+styled.div(_t5$1 || (_t5$1 = _$6``));
+const BadgeWrapper = styled.div(_t6$1 || (_t6$1 = _$6`
   margin-left: 10px;
   margin-top: 7px;
 `));
-const CompletionTextHeader = styled.h3(_t7 || (_t7 = _$5`
+const CompletionTextHeader = styled.h3(_t7 || (_t7 = _$6`
   display: flex;
 `));
-const ReviewItemSection = styled.div(_t8 || (_t8 = _$5`
+const ReviewItemSection = styled.div(_t8 || (_t8 = _$6`
   margin-bottom: var(--goa-space-m);
   padding: var(--goa-space-xl) var(--goa-space-2xl);
   border: 1px solid var(--goa-color-greyscale-300);
@@ -10435,18 +10476,18 @@ const ReviewItemSection = styled.div(_t8 || (_t8 = _$5`
     max-width: 1600px;
   }
 `));
-const ReviewItemHeader = styled.div(_t9 || (_t9 = _$5`
+const ReviewItemHeader = styled.div(_t9 || (_t9 = _$6`
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin-bottom: var(--goa-space-xl);
 `));
-const ReviewItemTitle = styled.div(_t0 || (_t0 = _$5`
+const ReviewItemTitle = styled.div(_t0 || (_t0 = _$6`
   font-size: var(--goa-space-l);
   line-height: var(--goa-space-xl);
   font-weight: 300;
 `));
-styled.div(_t1 || (_t1 = _$5`
+styled.div(_t1 || (_t1 = _$6`
   color: #0070c4;
   text-decoration: underline;
   outline: none;
@@ -10457,20 +10498,20 @@ styled.div(_t1 || (_t1 = _$5`
     background-color: #e6f7ff;
   }
 `));
-styled.div(_t10 || (_t10 = _$5`
+styled.div(_t10 || (_t10 = _$6`
   margin-left: var(--goa-space-m);
 `));
-styled.div(_t11 || (_t11 = _$5`
+styled.div(_t11 || (_t11 = _$6`
   margin-bottom: var(--goa-space-m);
 `));
-styled.div(_t12 || (_t12 = _$5`
+styled.div(_t12 || (_t12 = _$6`
   margin: var(--goa-space-s);
   width: 100%;
 `));
-styled.h3(_t13 || (_t13 = _$5`
+styled.h3(_t13 || (_t13 = _$6`
   text-transform: capitalize;
 `));
-const RightAlignmentDiv = styled.div(_t14 || (_t14 = _$5`
+const RightAlignmentDiv = styled.div(_t14 || (_t14 = _$6`
   @media screen and (max-width: 767px) {
     margin-bottom: var(--goa-space-l);
   }
@@ -10480,50 +10521,50 @@ const RightAlignmentDiv = styled.div(_t14 || (_t14 = _$5`
     margin-bottom: var(--goa-space-l);
   }
 `));
-const FormStepperSummaryH3 = styled.h3(_t15 || (_t15 = _$5`
+const FormStepperSummaryH3 = styled.h3(_t15 || (_t15 = _$6`
   flex: 1;
   margin-bottom: var(--goa-space-m);
   font-size: var(--goa-font-size-7);
   line-height: var(--goa-line-height-4);
   font-weight: var(--goa-font-weight-regular);
 `));
-const PageRenderPadding = styled.div(_t16 || (_t16 = _$5`
+const PageRenderPadding = styled.div(_t16 || (_t16 = _$6`
   margin-top: var(--goa-space-2xl);
 `));
-styled.div(_t17 || (_t17 = _$5`
+styled.div(_t17 || (_t17 = _$6`
   margin-bottom: var(--goa-space-2xl);
 `));
-const PageBorder = styled.div(_t18 || (_t18 = _$5`
+const PageBorder = styled.div(_t18 || (_t18 = _$6`
   padding: var(--goa-space-m) var(--goa-space-3xl);
 `));
-styled.div(_t19 || (_t19 = _$5`
+styled.div(_t19 || (_t19 = _$6`
   .element-style {
     max-width: 1600px;
   }
 `));
-styled.div(_t20 || (_t20 = _$5`
+styled.div(_t20 || (_t20 = _$6`
   padding: var(--goa-space-xl) var(--goa-space-2xl);
   border: 1px solid var(--goa-color-greyscale-300);
   border-radius: var(--goa-border-radius-xl);
 `));
-styled.div(_t21 || (_t21 = _$5`
+styled.div(_t21 || (_t21 = _$6`
   margin-top: var(--goa-space-xl);
   display: flex;
   justify-content: space-between;
 `));
-styled.h3(_t22 || (_t22 = _$5`
+styled.h3(_t22 || (_t22 = _$6`
   color: var(--goa-color-text-secondary) !important;
   margin-bottom: var(--goa-space-l);
 `));
-const CategoryStatus = styled.td(_t23 || (_t23 = _$5`
+const CategoryStatus = styled.td(_t23 || (_t23 = _$6`
   width: var(--goa-space-xl);
   padding-right: var(--goa-space-xl);
   align-content: center;
 `));
-const Center = styled.div(_t24 || (_t24 = _$5`
+const Center = styled.div(_t24 || (_t24 = _$6`
   padding-top: 5px;
 `));
-const PageStepperRow = styled.tr(_t25 || (_t25 = _$5`
+const PageStepperRow = styled.tr(_t25 || (_t25 = _$6`
   ${0}
 `), ({
   disabled
@@ -10548,7 +10589,7 @@ const PageStepperRow = styled.tr(_t25 || (_t25 = _$5`
             outline: 3px solid var(--goa-color-interactive-focus);
           }
         `);
-const SectionHeaderRowTr = styled.tr(_t26 || (_t26 = _$5`
+const SectionHeaderRowTr = styled.tr(_t26 || (_t26 = _$6`
   & > td {
     border: 0 !important;
     padding-top: var(--goa-space-l);
@@ -10560,7 +10601,7 @@ const SectionHeaderRowTr = styled.tr(_t26 || (_t26 = _$5`
     border-top: none !important;
   }
 `));
-const SummaryRowLink = styled.a(_t27 || (_t27 = _$5`
+const SummaryRowLink = styled.a(_t27 || (_t27 = _$6`
   position: relative;
   top: var(--goa-space-xs);
   &:focus-visible {
@@ -10569,7 +10610,7 @@ const SummaryRowLink = styled.a(_t27 || (_t27 = _$5`
   }
   padding: 0 var(--goa-space-s) var(--goa-space-xs); var(--goa-space-s);
 `));
-const SummaryTd = styled.td(_t28 || (_t28 = _$5`
+const SummaryTd = styled.td(_t28 || (_t28 = _$6`
   border: 0 !important;
   padding: 0 !important;
 `));
@@ -10710,129 +10751,511 @@ const ContextProviderFactory = () => new ContextProviderClass().setup;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const JsonFormContext = /*#__PURE__*/createContext(null);
 
-const RenderStepElements = props => {
-  var _props$category;
-  const memoizedSchema = useMemo(() => Object.assign({}, props.schema), [props.schema]);
-  return jsx(Visible, {
-    visible: props.visible,
-    "data-testid": `${(props == null ? void 0 : props.path) || ((_props$category = props.category) == null ? void 0 : _props$category.label)}-categories-${props.categoryIndex}`,
-    children: props.category.elements.map((uiSchema, index) => {
-      var _props$category2;
-      return jsx(JsonFormsDispatch, {
-        schema: memoizedSchema,
-        uischema: uiSchema,
-        renderers: props.renderers,
-        cells: props.cells,
-        path: props.path,
-        visible: props.visible,
-        enabled: props.enabled
-      }, `${(props == null ? void 0 : props.path) || ((_props$category2 = props.category) == null ? void 0 : _props$category2.label)}-category-page-${index}`);
+const RenderStepElements = props => {
+  var _props$category;
+  const memoizedSchema = useMemo(() => Object.assign({}, props.schema), [props.schema]);
+  return jsx(Visible, {
+    visible: props.visible,
+    "data-testid": `${(props == null ? void 0 : props.path) || ((_props$category = props.category) == null ? void 0 : _props$category.label)}-categories-${props.categoryIndex}`,
+    children: props.category.elements.map((uiSchema, index) => {
+      var _props$category2;
+      return jsx(JsonFormsDispatch, {
+        schema: memoizedSchema,
+        uischema: uiSchema,
+        renderers: props.renderers,
+        cells: props.cells,
+        path: props.path,
+        visible: props.visible,
+        enabled: props.enabled
+      }, `${(props == null ? void 0 : props.path) || ((_props$category2 = props.category) == null ? void 0 : _props$category2.label)}-category-page-${index}`);
+    })
+  });
+};
+
+var $$6 = _export;
+var flattenIntoArray = flattenIntoArray_1;
+var toObject$1 = toObject$a;
+var lengthOfArrayLike$1 = lengthOfArrayLike$a;
+var toIntegerOrInfinity = toIntegerOrInfinity$9;
+var arraySpeciesCreate = arraySpeciesCreate$2;
+
+// `Array.prototype.flat` method
+// https://tc39.es/ecma262/#sec-array.prototype.flat
+$$6({ target: 'Array', proto: true }, {
+  flat: function flat(/* depthArg = 1 */) {
+    var depthArg = arguments.length ? arguments[0] : undefined;
+    var O = toObject$1(this);
+    var sourceLen = lengthOfArrayLike$1(O);
+    var A = arraySpeciesCreate(O, 0);
+    A.length = flattenIntoArray(A, O, O, sourceLen, 0, depthArg === undefined ? 1 : toIntegerOrInfinity(depthArg));
+    return A;
+  }
+});
+
+// this method was added to unscopables after implementation
+// in popular engines, so it's moved to a separate module
+var addToUnscopables = addToUnscopables$5;
+
+// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+addToUnscopables('flat');
+
+const isPropertiesMatch = (obj, props, isExactMatch) => {
+  if (isObject$i(obj)) {
+    const keys = Object.keys(obj);
+    if (isExactMatch) {
+      return props.every(attr => keys.includes(attr)) && keys.length === props.length;
+    } else {
+      return props.every(attr => keys.includes(attr));
+    }
+  }
+  return false;
+};
+const createSchemaMatchTester = (props, isExactMatch = false) => {
+  return schemaMatches(schema => {
+    return schema && isPropertiesMatch(schema.properties, props, isExactMatch);
+  });
+};
+
+const isFullName = createSchemaMatchTester(['firstName', 'middleName', 'lastName'], true);
+const FullNameTester = rankWith(4, isFullName);
+
+const FullNameControlReview = props => {
+  var _props$uischema, _props$schema$require, _props$schema;
+  const context = useContext(JsonFormsStepperContext);
+  const stepId = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.stepId;
+  const {
+    uischema,
+    data,
+    id
+  } = props;
+  const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
+  const isMissing = value => isNilOrEmptyString(value);
+  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
+    children: jsxs(PageReviewContainer, {
+      colSpan: 3,
+      children: [jsxs(ReviewHeader, {
+        children: [jsx(ReviewLabel, {
+          children: fieldLabel
+        }), stepId !== undefined && jsx(GoabButton, {
+          type: "tertiary",
+          size: "compact",
+          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+          testId: `${fieldName}-change-btn`,
+          children: "Change"
+        })]
+      }), jsxs(ReviewValue, {
+        children: [jsx("div", {
+          "data-testid": testId,
+          children: value != null ? value : ''
+        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+          error: `${fieldLabel} is required`,
+          label: ""
+        })]
+      })]
+    })
+  }, testId);
+  return jsxs(Fragment, {
+    children: [renderRow('First name', data == null ? void 0 : data.firstName, 'firstName', `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, 'middleName', `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, 'lastName', `lastName-control-${id}`)]
+  });
+};
+const GoAInputBaseFullNameControlReview = withJsonFormsAllOfProps(FullNameControlReview);
+
+const isFullNameDoB = createSchemaMatchTester(['firstName', 'middleName', 'lastName', 'dateOfBirth'], true);
+const FullNameDobTester = rankWith(4, isFullNameDoB);
+
+const FullNameDobReviewControl = props => {
+  var _uischema$options, _props$schema$require, _props$schema;
+  const {
+    data,
+    id,
+    uischema
+  } = props;
+  const context = useContext(JsonFormsStepperContext);
+  const stepId = uischema == null || (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.stepId;
+  const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
+  const isMissing = value => isNilOrEmptyString(value);
+  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
+    children: jsxs(PageReviewContainer, {
+      colSpan: 3,
+      children: [jsxs(ReviewHeader, {
+        children: [jsx(ReviewLabel, {
+          children: fieldLabel
+        }), stepId !== undefined && jsx(GoabButton, {
+          type: "tertiary",
+          size: "compact",
+          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+          testId: `${fieldName}-change-btn`,
+          children: "Change"
+        })]
+      }), jsxs(ReviewValue, {
+        children: [jsx("div", {
+          "data-testid": testId,
+          children: value != null ? value : ''
+        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+          error: `${fieldLabel} is required`,
+          label: ""
+        })]
+      })]
+    })
+  }, testId);
+  return jsxs(Fragment, {
+    children: [renderRow('First name', data == null ? void 0 : data.firstName, 'firstName', `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, 'middleName', `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, 'lastName', `lastName-control-${id}`), renderRow('Date of birth', data == null ? void 0 : data.dateOfBirth, 'dateOfBirth', `dob-control-${id}`)]
+  });
+};
+const GoAInputBaseFullNameDobControlReview = withJsonFormsAllOfProps(FullNameDobReviewControl);
+
+let _$5 = t => t,
+  _t$6;
+const PhoneGrid = styled.div(_t$6 || (_t$6 = _$5`
+  display: grid;
+  grid-template-columns: 1fr 2fr;
+  gap: 0.2rem;
+  align-items: start;
+  margin-bottom: var(--goa-space-l) !important;
+
+  goa-form-item {
+    margin-right: 0 !important;
+  }
+`));
+const PHONE_REGEX = /^\(?\d{3}\)?[-.\s]?\d{3}[-.\s]?\d{4}$/;
+const normalizePhoneData = value => ({
+  type: (value == null ? void 0 : value.type) || '',
+  number: (value == null ? void 0 : value.number) || ''
+});
+const PhoneNumberWithTypeControl = props => {
+  const {
+    data,
+    path,
+    handleChange,
+    enabled,
+    visible,
+    required
+  } = props;
+  const [formData, setFormData] = useState(normalizePhoneData(data));
+  const [error, setError] = useState(undefined);
+  useEffect(() => {
+    const nextData = normalizePhoneData(data);
+    setFormData(currentData => currentData.type === nextData.type && currentData.number === nextData.number ? currentData : nextData);
+  }, [data]);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const updateFormData = updated => {
+    setFormData(updated);
+    if (updated.number && !PHONE_REGEX.test(updated.number)) {
+      setError('Enter a valid phone number (e.g., (780) 123-4567)');
+    } else {
+      setError(undefined);
+    }
+    handleChange(path, updated);
+  };
+  return jsx(Visible, {
+    visible: visible,
+    children: jsxs(PhoneGrid, {
+      children: [jsx(GoabFormItem, {
+        label: "Phone type",
+        requirement: required ? 'required' : undefined,
+        children: jsxs(GoabDropdown, {
+          name: "type",
+          value: formData.type || '',
+          disabled: !enabled,
+          onChange: detail => updateFormData(Object.assign({}, formData, {
+            type: detail.value
+          })),
+          children: [jsx(GoabDropdownItem, {
+            value: "Mobile"
+          }), jsx(GoabDropdownItem, {
+            value: "Landline"
+          })]
+        })
+      }), jsx(GoabFormItem, {
+        label: "Phone number",
+        error: error,
+        requirement: required ? 'required' : undefined,
+        children: jsx(GoabInput, {
+          type: "tel",
+          name: "number",
+          placeholder: "(000) 000-0000",
+          value: formData.number || '',
+          disabled: !enabled,
+          onChange: detail => updateFormData(Object.assign({}, formData, {
+            number: detail.value
+          }))
+        })
+      })]
+    })
+  });
+};
+const GoAPhoneNumberWithTypeControl = withJsonFormsControlProps(PhoneNumberWithTypeControl);
+
+const PhoneNumberControl = props => {
+  const {
+    data,
+    path,
+    schema,
+    handleChange,
+    enabled,
+    visible,
+    required
+  } = props;
+  const [error, setError] = useState('');
+  const handleInputChange = (name, value) => {
+    if (value && !PHONE_REGEX.test(value)) {
+      setError('Must be a valid 10-digit phone number in format (000) 000-0000');
+    } else {
+      setError('');
+    }
+    handleChange(path, value);
+  };
+  return jsx(Visible, {
+    visible: visible,
+    children: jsx(GoabFormItem, {
+      label: (schema == null ? void 0 : schema.title) || 'Phone number',
+      requirement: required ? 'required' : undefined,
+      error: error,
+      testId: `form-item-${path}`,
+      children: jsx(GoabInput, {
+        type: "tel",
+        name: path,
+        disabled: !enabled,
+        "aria-label": "phone number input",
+        testId: `phone-input-${path}`,
+        value: data || '',
+        onChange: detail => handleInputChange(detail.name, detail.value),
+        placeholder: "(000) 000-0000",
+        width: "100%"
+      })
+    })
+  });
+};
+const GoAPhoneNumberControl = withJsonFormsControlProps(PhoneNumberControl);
+
+const PhoneNumberTester = rankWith(4, and(isControl$1, schemaTypeIs('string'), formatIs('phone')));
+
+let _$4 = t => t,
+  _t$5,
+  _t2$2,
+  _t3$1,
+  _t4$1,
+  _t5,
+  _t6;
+const SearchBox = styled.div(_t$5 || (_t$5 = _$4`
+  position: relative;
+
+  .suggestions {
+    width: 100%;
+    margin-top: 3px;
+    border-top-width: 0;
+    list-style: none;
+    max-height: 15.5rem;
+    width: 100%;
+    position: absolute;
+
+    background: var(--goa-color-greyscale-white);
+    box-shadow: 0 8px 8px rgb(0 0 0 / 20%), 0 4px 4px rgb(0 0 0 / 10%);
+    z-index: 99;
+    overflow: hidden auto;
+    padding-left: 0;
+  }
+  .suggestions li {
+  }
+  .suggestion-active,
+  .suggestions li:hover {
+    background-color: var(--goa-color-interactive-default);
+    color: var(--goa-color-greyscale-white);
+    cursor: pointer;
+    font-weight: 600;
+  }
+  .input-container {
+    position: relative;
+    display: inline-block;
+    width: 100%; /* Ensures it spans the parent container */
+  }
+
+  .input-container .input-spinner {
+    position: absolute;
+    top: 50%;
+    right: 8px; /* Adjust based on padding or margin of the input field */
+    transform: translateY(-50%);
+    z-index: 1; /* Ensure it appears above the input */
+    pointer-events: none; /* Prevent spinner from interfering with clicks */
+  }
+`));
+const AddressIndent = styled.div(_t2$2 || (_t2$2 = _$4`
+  margin: 0 0 var(--goa-space-m) 0;
+  text-wrap: wrap;
+  word-break: break-word;
+  border: 1px solid var(--goa-color-greyscale-300);
+  border-radius: var(--goa-border-radius-xl);
+  padding: var(--goa-space-l);
+`));
+const TextWrap = styled.p(_t3$1 || (_t3$1 = _$4`
+  text-wrap: auto;
+  word-break: break-word;
+`));
+const TextWrapDiv = styled.div(_t4$1 || (_t4$1 = _$4`
+  text-wrap: auto;
+  word-break: break-word;
+`));
+const LabelDiv = styled.div(_t5 || (_t5 = _$4`
+  font-size: var(--goa-font-size-2);
+  padding-bottom: var(--goa-space-l);
+`));
+/* istanbul ignore next */
+const ListItem = styled.li(_t6 || (_t6 = _$4`
+  background-color: ${0};
+  color: ${0};
+  font-weight: ${0};
+  padding: var(--goa-space-xs) var(--goa-space-2xs) var(--goa-space-xs) var(--goa-space-xs);
+  margin-left: 0.25rem;
+`), ({
+  selected,
+  index
+}) => selected === index ? 'var(--goa-color-interactive-default)' : '', ({
+  selected,
+  index
+}) => selected === index ? 'var(--goa-color-greyscale-white) !important' : '', ({
+  selected,
+  index
+}) => selected === index ? '600' : '');
+
+const PhoneNumberReviewControl = props => {
+  const {
+    data,
+    id,
+    required
+  } = props;
+  return jsx(GoabFormItem, {
+    label: "Phone number",
+    error: required && !data ? 'Phone number is required' : '',
+    requirement: required ? 'required' : undefined,
+    children: jsx(TextWrapDiv, {
+      children: jsx("div", {
+        "data-testid": `phone-control-${id}`,
+        children: data || ''
+      })
     })
   });
 };
+const GoabInputBasePhoneNumberReviewControl = withJsonFormsAllOfProps(PhoneNumberReviewControl);
 
-var $$6 = _export;
-var flattenIntoArray = flattenIntoArray_1;
-var toObject$1 = toObject$a;
-var lengthOfArrayLike$1 = lengthOfArrayLike$a;
-var toIntegerOrInfinity = toIntegerOrInfinity$9;
-var arraySpeciesCreate = arraySpeciesCreate$2;
-
-// `Array.prototype.flat` method
-// https://tc39.es/ecma262/#sec-array.prototype.flat
-$$6({ target: 'Array', proto: true }, {
-  flat: function flat(/* depthArg = 1 */) {
-    var depthArg = arguments.length ? arguments[0] : undefined;
-    var O = toObject$1(this);
-    var sourceLen = lengthOfArrayLike$1(O);
-    var A = arraySpeciesCreate(O, 0);
-    A.length = flattenIntoArray(A, O, O, sourceLen, 0, depthArg === undefined ? 1 : toIntegerOrInfinity(depthArg));
-    return A;
-  }
-});
-
-// this method was added to unscopables after implementation
-// in popular engines, so it's moved to a separate module
-var addToUnscopables = addToUnscopables$5;
-
-// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-addToUnscopables('flat');
+const isPhoneNumberWithType = createSchemaMatchTester(['number', 'type'], true);
+const PhoneNumberWithTypeTester = rankWith(4, isPhoneNumberWithType);
 
-const isPropertiesMatch = (obj, props, isExactMatch) => {
-  if (isObject$i(obj)) {
-    const keys = Object.keys(obj);
-    if (isExactMatch) {
-      return props.every(attr => keys.includes(attr)) && keys.length === props.length;
-    } else {
-      return props.every(attr => keys.includes(attr));
-    }
-  }
-  return false;
-};
-const createSchemaMatchTester = (props, isExactMatch = false) => {
-  return schemaMatches(schema => {
-    return schema && isPropertiesMatch(schema.properties, props, isExactMatch);
+const PhoneNumberWithTypeReviewControl = props => {
+  const {
+    data,
+    id,
+    required
+  } = props;
+  return jsxs(PhoneGrid, {
+    children: [jsx(GoabFormItem, {
+      label: "Phone number",
+      error: required && !(data != null && data.number) ? 'Phone number is required' : '',
+      requirement: required ? 'required' : undefined,
+      children: jsx(TextWrapDiv, {
+        children: jsx("div", {
+          "data-testid": `phone-number-control-${id}`,
+          children: (data == null ? void 0 : data.number) || ''
+        })
+      })
+    }), jsx(GoabFormItem, {
+      label: "Phone type",
+      error: required && !(data != null && data.type) ? 'Phone type is required' : '',
+      requirement: required ? 'required' : undefined,
+      children: jsx(TextWrapDiv, {
+        children: jsx("div", {
+          "data-testid": `phone-type-control-${id}`,
+          children: (data == null ? void 0 : data.type) || ''
+        })
+      })
+    })]
   });
 };
+const GoabInputBasePhoneNumberWithTypeReviewControl = withJsonFormsAllOfProps(PhoneNumberWithTypeReviewControl);
 
-const isFullName = createSchemaMatchTester(['firstName', 'middleName', 'lastName'], true);
-const FullNameTester = rankWith(4, isFullName);
+let _$3 = t => t,
+  _t$4;
+const FormFieldWrapper = styled.div(_t$4 || (_t$4 = _$3`
+  margin-bottom: var(--goa-space-l);
+`));
 
-const FullNameControlReview = props => {
-  var _props$uischema, _props$schema$require, _props$schema;
-  const context = useContext(JsonFormsStepperContext);
-  const stepId = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.stepId;
+const ContractInfoControl = props => {
+  var _options$enableEmail, _options$enablePhone, _options$emailFirst;
   const {
-    uischema,
-    data,
-    id
+    data = {},
+    path,
+    handleChange,
+    enabled,
+    visible,
+    required,
+    uischema
   } = props;
-  const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
-  const isMissing = value => isNilOrEmptyString(value);
-  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
-    children: jsxs(PageReviewContainer, {
-      colSpan: 3,
-      children: [jsxs(ReviewHeader, {
-        children: [jsx(ReviewLabel, {
-          children: fieldLabel
-        }), stepId !== undefined && jsx(GoabButton, {
-          type: "tertiary",
-          size: "compact",
-          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-          testId: `${fieldName}-change-btn`,
-          children: "Change"
-        })]
-      }), jsxs(ReviewValue, {
-        children: [jsx("div", {
-          "data-testid": testId,
-          children: value != null ? value : ''
-        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
-          error: `${fieldLabel} is required`,
-          label: ""
-        })]
-      })]
-    })
-  }, testId);
-  return jsxs(Fragment, {
-    children: [renderRow('First name', data == null ? void 0 : data.firstName, 'firstName', `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, 'middleName', `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, 'lastName', `lastName-control-${id}`)]
+  const handleFieldChange = (field, value) => {
+    handleChange(`${path}.${field}`, value);
+  };
+  const emailProps = Object.assign({}, props, {
+    data: data == null ? void 0 : data.email,
+    path: `${path}.email`
+  });
+  const phoneProps = Object.assign({}, props, {
+    data: data == null ? void 0 : data.phone,
+    path: `${path}.phone`
+  });
+  const {
+    options
+  } = uischema;
+  const enableEmail = (_options$enableEmail = options == null ? void 0 : options.enableEmail) != null ? _options$enableEmail : true;
+  const enablePhone = (_options$enablePhone = options == null ? void 0 : options.enablePhone) != null ? _options$enablePhone : true;
+  const emailFirst = (_options$emailFirst = options == null ? void 0 : options.emailFirst) != null ? _options$emailFirst : false;
+  if (!enableEmail && !enablePhone) {
+    throw new Error('At least one contact method must be enabled');
+  }
+  return jsxs("div", {
+    style: {
+      display: visible ? 'block' : 'none'
+    },
+    children: [enableEmail && emailFirst && jsx(GoAEmailInput, Object.assign({}, emailProps)), enablePhone && jsx(FormFieldWrapper, {
+      children: jsx(PhoneNumberControl, Object.assign({}, phoneProps))
+    }), enableEmail && !emailFirst && jsx(GoAEmailInput, Object.assign({}, emailProps)), enableEmail && enablePhone && jsx(FormFieldWrapper, {
+      children: jsx(GoabFormItem, {
+        label: "Preferred Contact Method",
+        requirement: required ? 'required' : undefined,
+        children: jsxs(GoabDropdown, {
+          testId: `preferred-contact-${path}`,
+          disabled: !enabled,
+          value: data.preferredContactMethod || '',
+          onChange: detail => handleFieldChange('preferredContactMethod', detail.value || ''),
+          width: "250px",
+          children: [jsx(GoabDropdownItem, {
+            value: "",
+            label: "Select a Contact Method"
+          }), emailFirst && jsx(GoabDropdownItem, {
+            value: "Email",
+            label: "Email"
+          }), jsx(GoabDropdownItem, {
+            value: "Phone",
+            label: "Phone"
+          }), !emailFirst && jsx(GoabDropdownItem, {
+            value: "Email",
+            label: "Email"
+          })]
+        })
+      })
+    })]
   });
 };
-const GoAInputBaseFullNameControlReview = withJsonFormsAllOfProps(FullNameControlReview);
-
-const isFullNameDoB = createSchemaMatchTester(['firstName', 'middleName', 'lastName', 'dateOfBirth'], true);
-const FullNameDobTester = rankWith(4, isFullNameDoB);
 
-const FullNameDobReviewControl = props => {
-  var _uischema$options, _props$schema$require, _props$schema;
+const ContractInfoControlReview = props => {
+  var _props$uischema, _schema$required, _options$enableEmail, _options$enablePhone, _options$emailFirst;
+  const context = useContext(JsonFormsStepperContext);
+  const stepId = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.stepId;
   const {
-    data,
+    uischema,
+    data = {},
     id,
-    uischema
+    schema
   } = props;
-  const context = useContext(JsonFormsStepperContext);
-  const stepId = uischema == null || (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.stepId;
-  const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
-  const isMissing = value => isNilOrEmptyString(value);
+  const requiredFields = (_schema$required = schema == null ? void 0 : schema.required) != null ? _schema$required : [];
+  const isMissing = value => value === undefined || value === null || value === '';
   const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
     children: jsxs(PageReviewContainer, {
       colSpan: 3,
@@ -10857,11 +11280,23 @@ const FullNameDobReviewControl = props => {
       })]
     })
   }, testId);
+  const {
+    options
+  } = uischema;
+  const enableEmail = (_options$enableEmail = options == null ? void 0 : options.enableEmail) != null ? _options$enableEmail : true;
+  const enablePhone = (_options$enablePhone = options == null ? void 0 : options.enablePhone) != null ? _options$enablePhone : true;
+  const emailFirst = (_options$emailFirst = options == null ? void 0 : options.emailFirst) != null ? _options$emailFirst : false;
+  if (!enableEmail && !enablePhone) {
+    throw new Error('At least one contact method must be enabled');
+  }
   return jsxs(Fragment, {
-    children: [renderRow('First name', data == null ? void 0 : data.firstName, 'firstName', `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, 'middleName', `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, 'lastName', `lastName-control-${id}`), renderRow('Date of birth', data == null ? void 0 : data.dateOfBirth, 'dateOfBirth', `dob-control-${id}`)]
+    children: [enableEmail && emailFirst && renderRow('Email', data == null ? void 0 : data.email, 'email', `email-control-${id}`), enablePhone && renderRow('Phone number', data == null ? void 0 : data.phone, 'phone', `phone-control-${id}`), enableEmail && !emailFirst && renderRow('Email', data == null ? void 0 : data.email, 'email', `email-control-${id}`), enableEmail && enablePhone && renderRow('Preferred contact method', (data == null ? void 0 : data.preferredContactMethod) || 'Email', 'preferredContactMethod', `preferred-contact-${id}`)]
   });
 };
-const GoAInputBaseFullNameDobControlReview = withJsonFormsAllOfProps(FullNameDobReviewControl);
+const GoAContractInfoControlReview = withJsonFormsAllOfProps(ContractInfoControlReview);
+
+const isContactInformation = createSchemaMatchTester(['email', 'phone', 'preferredContactMethod']);
+const ContactInformationTester = rankWith(4, isContactInformation);
 
 var $$5 = _export;
 var iterate = iterate$a;
@@ -11960,115 +12395,28 @@ const ListWithDetailsControl = props => {
     }
     setOpen(false);
     // eslint-disable-next-line
-  }, [setOpen, path, rowData, rowData]);
-  return jsxs(Visible, {
-    visible: visible,
-    children: [jsx(ListWithDetailControl, Object.assign({}, props, {
-      openDeleteDialog: openDeleteDialog,
-      enabled: props.enabled,
-      currentTab: currentTab,
-      setCurrentTab: setCurrentTab
-    })), jsx(DeleteDialog, {
-      open: open,
-      onCancel: deleteCancel,
-      onConfirm: deleteConfirm,
-      title: 'Delete confirmation',
-      message: `Are you sure you wish to delete ${name}`
-    })]
-  });
-};
-const GoAListWithDetailsControlRenderer = withJsonFormsArrayLayoutProps(ListWithDetailsControl);
-const GoAListWithDetailsTester = rankWith(3, and(uiTypeIs('ListWithDetail')));
-
-const isAddressLookup = createSchemaMatchTester(['addressLine2', 'municipality', 'addressLine1', 'subdivisionCode', 'postalCode']);
-const AddressLookUpTester = rankWith(4, isAddressLookup);
-
-let _$4 = t => t,
-  _t$5,
-  _t2$2,
-  _t3$1,
-  _t4$1,
-  _t5,
-  _t6;
-const SearchBox = styled.div(_t$5 || (_t$5 = _$4`
-  position: relative;
-
-  .suggestions {
-    width: 100%;
-    margin-top: 3px;
-    border-top-width: 0;
-    list-style: none;
-    max-height: 15.5rem;
-    width: 100%;
-    position: absolute;
-
-    background: var(--goa-color-greyscale-white);
-    box-shadow: 0 8px 8px rgb(0 0 0 / 20%), 0 4px 4px rgb(0 0 0 / 10%);
-    z-index: 99;
-    overflow: hidden auto;
-    padding-left: 0;
-  }
-  .suggestions li {
-  }
-  .suggestion-active,
-  .suggestions li:hover {
-    background-color: var(--goa-color-interactive-default);
-    color: var(--goa-color-greyscale-white);
-    cursor: pointer;
-    font-weight: 600;
-  }
-  .input-container {
-    position: relative;
-    display: inline-block;
-    width: 100%; /* Ensures it spans the parent container */
-  }
+  }, [setOpen, path, rowData, rowData]);
+  return jsxs(Visible, {
+    visible: visible,
+    children: [jsx(ListWithDetailControl, Object.assign({}, props, {
+      openDeleteDialog: openDeleteDialog,
+      enabled: props.enabled,
+      currentTab: currentTab,
+      setCurrentTab: setCurrentTab
+    })), jsx(DeleteDialog, {
+      open: open,
+      onCancel: deleteCancel,
+      onConfirm: deleteConfirm,
+      title: 'Delete confirmation',
+      message: `Are you sure you wish to delete ${name}`
+    })]
+  });
+};
+const GoAListWithDetailsControlRenderer = withJsonFormsArrayLayoutProps(ListWithDetailsControl);
+const GoAListWithDetailsTester = rankWith(3, and(uiTypeIs('ListWithDetail')));
 
-  .input-container .input-spinner {
-    position: absolute;
-    top: 50%;
-    right: 8px; /* Adjust based on padding or margin of the input field */
-    transform: translateY(-50%);
-    z-index: 1; /* Ensure it appears above the input */
-    pointer-events: none; /* Prevent spinner from interfering with clicks */
-  }
-`));
-const AddressIndent = styled.div(_t2$2 || (_t2$2 = _$4`
-  margin: 0 0 var(--goa-space-m) 0;
-  text-wrap: wrap;
-  word-break: break-word;
-  border: 1px solid var(--goa-color-greyscale-300);
-  border-radius: var(--goa-border-radius-xl);
-  padding: var(--goa-space-l);
-`));
-const TextWrap = styled.p(_t3$1 || (_t3$1 = _$4`
-  text-wrap: auto;
-  word-break: break-word;
-`));
-const TextWrapDiv = styled.div(_t4$1 || (_t4$1 = _$4`
-  text-wrap: auto;
-  word-break: break-word;
-`));
-const LabelDiv = styled.div(_t5 || (_t5 = _$4`
-  font-size: var(--goa-font-size-2);
-  padding-bottom: var(--goa-space-l);
-`));
-/* istanbul ignore next */
-const ListItem = styled.li(_t6 || (_t6 = _$4`
-  background-color: ${0};
-  color: ${0};
-  font-weight: ${0};
-  padding: var(--goa-space-xs) var(--goa-space-2xs) var(--goa-space-xs) var(--goa-space-xs);
-  margin-left: 0.25rem;
-`), ({
-  selected,
-  index
-}) => selected === index ? 'var(--goa-color-interactive-default)' : '', ({
-  selected,
-  index
-}) => selected === index ? 'var(--goa-color-greyscale-white) !important' : '', ({
-  selected,
-  index
-}) => selected === index ? '600' : '');
+const isAddressLookup = createSchemaMatchTester(['addressLine2', 'municipality', 'addressLine1', 'subdivisionCode', 'postalCode']);
+const AddressLookUpTester = rankWith(4, isAddressLookup);
 
 const AddressViews = ({
   data,
@@ -12500,10 +12848,10 @@ const GoAGroupReviewControlComponent = props => {
 const GoAGroupReviewLayoutTester = rankWith(1, uiTypeIs('Group'));
 const GoAGroupReviewControl = withJsonFormsLayoutProps(GoAGroupReviewControlComponent, true);
 
-let _$3 = t => t,
-  _t$4,
+let _$2 = t => t,
+  _t$3,
   _t2$1;
-const HelpContentDiv = styled.div(_t$4 || (_t$4 = _$3`
+const HelpContentDiv = styled.div(_t$3 || (_t$3 = _$2`
   .parent-label {
     font-size: 24px;
     margin-bottom: var(--goa-space-m);
@@ -12591,12 +12939,12 @@ const HelpContentDiv = styled.div(_t$4 || (_t$4 = _$3`
     text-decoration: underline;
   }
 `));
-const InvalidMarkdown = styled.div(_t2$1 || (_t2$1 = _$3`
+const InvalidMarkdown = styled.div(_t2$1 || (_t2$1 = _$2`
   color: var(--goa-color-interactive-error);
 `));
 
-let _$2 = t => t,
-  _t$3;
+let _$1 = t => t,
+  _t$2;
 const GoAContextMenuIcon = props => {
   return jsx(GoabIconButton, {
     icon: props.type,
@@ -12607,7 +12955,7 @@ const GoAContextMenuIcon = props => {
     disabled: props.disabled
   });
 };
-const GoAContextMenu = styled.div(_t$3 || (_t$3 = _$2`
+const GoAContextMenu = styled.div(_t$2 || (_t$2 = _$1`
   display: flex;
   align-items: center;
   background-color: #fff;
@@ -12986,6 +13334,9 @@ const GoABaseTableReviewRenderers$1 = [
 }, {
   tester: GoACalloutControlTester,
   renderer: CalloutReviewControl
+}, {
+  tester: ContactInformationTester,
+  renderer: withJsonFormsControlProps(ContractInfoControlReview)
 }];
 [
 // controls
@@ -13644,9 +13995,9 @@ const FormStepperPageReviewer = props => {
 };
 withAjvProps(withTranslateProps(withJsonFormsLayoutProps(FormStepperPageReviewer)));
 
-let _$1 = t => t,
-  _t$2;
-const BackButtonWrapper = styled.span(_t$2 || (_t$2 = _$1`
+let _ = t => t,
+  _t$1;
+const BackButtonWrapper = styled.span(_t$1 || (_t$1 = _`
   .back-link::before {
     content: '';
     display: inline-block;
@@ -14038,7 +14389,7 @@ const DeleteFileModal = ({
 };
 
 let _2 = t => t,
-  _t$1,
+  _t,
   _t2,
   _t3,
   _t4;
@@ -14239,7 +14590,7 @@ const FileUploader = _ref => {
     })
   });
 };
-const HelpText = styled.div(_t$1 || (_t$1 = _2`
+const HelpText = styled.div(_t || (_t = _2`
   margin-top: var(--goa-space-xs);
   font-size: var(--goa-font-size-3);
   color: var(--goa-color-text-secondary);
@@ -17248,187 +17599,6 @@ const FullNameDobControl = props => {
   });
 };
 
-let _ = t => t,
-  _t;
-const PhoneGrid = styled.div(_t || (_t = _`
-  display: grid;
-  grid-template-columns: 1fr 2fr;
-  gap: 0.2rem;
-  align-items: start;
-  margin-bottom: var(--goa-space-l) !important;
-
-  goa-form-item {
-    margin-right: 0 !important;
-  }
-`));
-const PHONE_REGEX = /^\(?\d{3}\)?[-.\s]?\d{3}[-.\s]?\d{4}$/;
-const normalizePhoneData = value => ({
-  type: (value == null ? void 0 : value.type) || '',
-  number: (value == null ? void 0 : value.number) || ''
-});
-const PhoneNumberWithTypeControl = props => {
-  const {
-    data,
-    path,
-    handleChange,
-    enabled,
-    visible,
-    required
-  } = props;
-  const [formData, setFormData] = useState(normalizePhoneData(data));
-  const [error, setError] = useState(undefined);
-  useEffect(() => {
-    const nextData = normalizePhoneData(data);
-    setFormData(currentData => currentData.type === nextData.type && currentData.number === nextData.number ? currentData : nextData);
-  }, [data]);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const updateFormData = updated => {
-    setFormData(updated);
-    if (updated.number && !PHONE_REGEX.test(updated.number)) {
-      setError('Enter a valid phone number (e.g., (780) 123-4567)');
-    } else {
-      setError(undefined);
-    }
-    handleChange(path, updated);
-  };
-  return jsx(Visible, {
-    visible: visible,
-    children: jsxs(PhoneGrid, {
-      children: [jsx(GoabFormItem, {
-        label: "Phone type",
-        requirement: required ? 'required' : undefined,
-        children: jsxs(GoabDropdown, {
-          name: "type",
-          value: formData.type || '',
-          disabled: !enabled,
-          onChange: detail => updateFormData(Object.assign({}, formData, {
-            type: detail.value
-          })),
-          children: [jsx(GoabDropdownItem, {
-            value: "Mobile"
-          }), jsx(GoabDropdownItem, {
-            value: "Landline"
-          })]
-        })
-      }), jsx(GoabFormItem, {
-        label: "Phone number",
-        error: error,
-        requirement: required ? 'required' : undefined,
-        children: jsx(GoabInput, {
-          type: "tel",
-          name: "number",
-          placeholder: "(000) 000-0000",
-          value: formData.number || '',
-          disabled: !enabled,
-          onChange: detail => updateFormData(Object.assign({}, formData, {
-            number: detail.value
-          }))
-        })
-      })]
-    })
-  });
-};
-const GoAPhoneNumberWithTypeControl = withJsonFormsControlProps(PhoneNumberWithTypeControl);
-
-const PhoneNumberControl = props => {
-  const {
-    data,
-    path,
-    schema,
-    handleChange,
-    enabled,
-    visible,
-    required
-  } = props;
-  const [error, setError] = useState('');
-  const handleInputChange = (name, value) => {
-    if (value && !PHONE_REGEX.test(value)) {
-      setError('Must be a valid 10-digit phone number in format (000) 000-0000');
-    } else {
-      setError('');
-    }
-    handleChange(path, value);
-  };
-  return jsx(Visible, {
-    visible: visible,
-    children: jsx(GoabFormItem, {
-      label: (schema == null ? void 0 : schema.title) || 'Phone number',
-      requirement: required ? 'required' : undefined,
-      error: error,
-      testId: `form-item-${path}`,
-      children: jsx(GoabInput, {
-        type: "tel",
-        name: path,
-        disabled: !enabled,
-        "aria-label": "phone number input",
-        testId: `phone-input-${path}`,
-        value: data || '',
-        onChange: detail => handleInputChange(detail.name, detail.value),
-        placeholder: "(000) 000-0000",
-        width: "100%"
-      })
-    })
-  });
-};
-const GoAPhoneNumberControl = withJsonFormsControlProps(PhoneNumberControl);
-
-const PhoneNumberTester = rankWith(4, and(isControl$1, schemaTypeIs('string'), formatIs('phone')));
-
-const PhoneNumberReviewControl = props => {
-  const {
-    data,
-    id,
-    required
-  } = props;
-  return jsx(GoabFormItem, {
-    label: "Phone number",
-    error: required && !data ? 'Phone number is required' : '',
-    requirement: required ? 'required' : undefined,
-    children: jsx(TextWrapDiv, {
-      children: jsx("div", {
-        "data-testid": `phone-control-${id}`,
-        children: data || ''
-      })
-    })
-  });
-};
-const GoabInputBasePhoneNumberReviewControl = withJsonFormsAllOfProps(PhoneNumberReviewControl);
-
-const isPhoneNumberWithType = createSchemaMatchTester(['number', 'type'], true);
-const PhoneNumberWithTypeTester = rankWith(4, isPhoneNumberWithType);
-
-const PhoneNumberWithTypeReviewControl = props => {
-  const {
-    data,
-    id,
-    required
-  } = props;
-  return jsxs(PhoneGrid, {
-    children: [jsx(GoabFormItem, {
-      label: "Phone number",
-      error: required && !(data != null && data.number) ? 'Phone number is required' : '',
-      requirement: required ? 'required' : undefined,
-      children: jsx(TextWrapDiv, {
-        children: jsx("div", {
-          "data-testid": `phone-number-control-${id}`,
-          children: (data == null ? void 0 : data.number) || ''
-        })
-      })
-    }), jsx(GoabFormItem, {
-      label: "Phone type",
-      error: required && !(data != null && data.type) ? 'Phone type is required' : '',
-      requirement: required ? 'required' : undefined,
-      children: jsx(TextWrapDiv, {
-        children: jsx("div", {
-          "data-testid": `phone-type-control-${id}`,
-          children: (data == null ? void 0 : data.type) || ''
-        })
-      })
-    })]
-  });
-};
-const GoabInputBasePhoneNumberWithTypeReviewControl = withJsonFormsAllOfProps(PhoneNumberWithTypeReviewControl);
-
 /**
  * Escape for use in RegExp
  */
@@ -18223,7 +18393,10 @@ const GoARenderers = [...GoABaseRenderers, {
 }, {
   tester: GoACalculationControlTester,
   renderer: GoACalculationControl
+}, {
+  tester: ContactInformationTester,
+  renderer: withJsonFormsControlProps(ContractInfoControl)
 }];
 const GoACells = [...InputCells];
 
-export { ADD_DATALIST_ACTION, ADD_NO_ANONYMOUS_ACTION, ADD_REGISTER_DATA_ACTION, ADD_REGISTER_DATA_ERROR, ADD_USER_ACTION, AddressLookUpControl, AddressLookUpControlReview, AddressLookUpTester, AddressLoopUpControlTableReview, ArrayControl, ArrayControlBase, ArrayControlReview, BooleanComponent, BooleanControl, BooleanRadioComponent, BooleanRadioControl, CategorizationPagesRendererTester, CategorizationStepperRendererTester, CheckboxGroup, ContextProviderC, ContextProviderClass, ContextProviderFactory, EnumCheckboxControl, EnumRadioControl, EnumSelect, FileUploader, FileUploaderReview, FileUploaderTester, FormPageStepper, FormPagesView, FormStepper, FormStepperControl, FormStepperPagesControl, FormStepperReviewControl, FormStepperReviewer, FormStepperView, FullNameControl, FullNameControlReview, FullNameDobControl, FullNameDobReviewControl, FullNameDobTester, FullNameReviewControl, FullNameTester, GoAArrayControlRenderer, GoAArrayControlReviewRenderer, GoAArrayControlTester, GoABaseInputReviewComponent, GoABaseRenderers, GoABaseReviewRenderers, GoABaseTableReviewRenderers, GoABooleanControl, GoABooleanControlTester, GoABooleanRadioControl, GoABooleanRadioControlTester, GoACalculationControl, GoACalculationControlTester, GoACells, GoACheckoutGroupControlTester, GoADateControl, GoADateControlTester, GoADateInput, GoADateTimeControl, GoADateTimeControlTester, GoADateTimeInput, GoAEmailControl, GoAEmailControlTester, GoAEmailInput, GoAEnumCheckboxGroupControl, GoAEnumControl, GoAEnumControlTester, GoAEnumRadioGroupControl, GoAInputBaseControl, GoAInputBaseFullNameControlReview, GoAInputBaseFullNameDobControlReview, GoAInputBaseReviewControl, GoAInputBaseTableReview, GoAInputBaseTableReviewControl, GoAInputDateControl, GoAInputDateTimeControl, GoAInputEmailControl, GoAInputIntegerControl, GoAInputNumberControl, GoAInputText, GoAInputTextControl, GoAInputTimeControl, GoAIntegerControl, GoAIntegerControlTester, GoAListWithDetailsControlRenderer, GoAListWithDetailsTester, GoANumberControl, GoANumberControlTester, GoANumberInput, GoAPhoneNumberControl, GoAPhoneNumberWithTypeControl, GoAPrimitiveArrayRenderer, GoAPrimitiveArrayTester, GoARadioGroupControlTester, GoARenderers, GoAReviewRenderers, GoATextControl, GoATextControlTester, GoATimeControl, GoATimeControlTester, GoATimeInput, GoInputBaseReview, GoabInputBasePhoneNumberReviewControl, GoabInputBasePhoneNumberWithTypeReviewControl, GoabInputInteger, InnerGoAInputText, JsonFormContext, JsonFormRegisterProvider, JsonFormsRegisterContext, ListWithDetailsControl, MultiLineText, MultiLineTextControl, MultiLineTextControlInput, MultiLineTextControlTester, OPTION_DEFINITIONS, PHONE_REGEX, PhoneGrid, PhoneNumberControl, PhoneNumberReviewControl, PhoneNumberTester, PhoneNumberWithTypeControl, PhoneNumberWithTypeReviewControl, PhoneNumberWithTypeTester, PrimitiveArrayControl, RadioGroup, USER_FIELD_DEFINITIONS, autoPopulatePropertiesMonaco, autoPopulateValue, categoriesAreValid, createDefaultAjv, enumControl, errMalformedDate, fetchRegisterConfigFromOptions$1 as fetchRegisterConfigFromOptions, formatSin, getByJsonPointer, getCategoryScopes, hasDataInScopes, hasDataValue, isAddressLookup, isFullName, isFullNameDoB, isPhoneNumberWithType, predictiveOptionsMonaco, registerReducer, resolveRefs, tryResolveRefs, useRegisterUser };
+export { ADD_DATALIST_ACTION, ADD_NO_ANONYMOUS_ACTION, ADD_REGISTER_DATA_ACTION, ADD_REGISTER_DATA_ERROR, ADD_USER_ACTION, AddressLookUpControl, AddressLookUpControlReview, AddressLookUpTester, AddressLoopUpControlTableReview, ArrayControl, ArrayControlBase, ArrayControlReview, BooleanComponent, BooleanControl, BooleanRadioComponent, BooleanRadioControl, CategorizationPagesRendererTester, CategorizationStepperRendererTester, CheckboxGroup, ContactInformationTester, ContextProviderC, ContextProviderClass, ContextProviderFactory, ContractInfoControl, ContractInfoControlReview, EnumCheckboxControl, EnumRadioControl, EnumSelect, FileUploader, FileUploaderReview, FileUploaderTester, FormPageStepper, FormPagesView, FormStepper, FormStepperControl, FormStepperPagesControl, FormStepperReviewControl, FormStepperReviewer, FormStepperView, FullNameControl, FullNameControlReview, FullNameDobControl, FullNameDobReviewControl, FullNameDobTester, FullNameReviewControl, FullNameTester, GoAArrayControlRenderer, GoAArrayControlReviewRenderer, GoAArrayControlTester, GoABaseInputReviewComponent, GoABaseRenderers, GoABaseReviewRenderers, GoABaseTableReviewRenderers, GoABooleanControl, GoABooleanControlTester, GoABooleanRadioControl, GoABooleanRadioControlTester, GoACalculationControl, GoACalculationControlTester, GoACells, GoACheckoutGroupControlTester, GoAContractInfoControlReview, GoADateControl, GoADateControlTester, GoADateInput, GoADateTimeControl, GoADateTimeControlTester, GoADateTimeInput, GoAEmailControl, GoAEmailControlTester, GoAEmailInput, GoAEnumCheckboxGroupControl, GoAEnumControl, GoAEnumControlTester, GoAEnumRadioGroupControl, GoAInputBaseControl, GoAInputBaseFullNameControlReview, GoAInputBaseFullNameDobControlReview, GoAInputBaseReviewControl, GoAInputBaseTableReview, GoAInputBaseTableReviewControl, GoAInputDateControl, GoAInputDateTimeControl, GoAInputEmailControl, GoAInputIntegerControl, GoAInputNumberControl, GoAInputText, GoAInputTextControl, GoAInputTimeControl, GoAIntegerControl, GoAIntegerControlTester, GoAListWithDetailsControlRenderer, GoAListWithDetailsTester, GoANumberControl, GoANumberControlTester, GoANumberInput, GoAPhoneNumberControl, GoAPhoneNumberWithTypeControl, GoAPrimitiveArrayRenderer, GoAPrimitiveArrayTester, GoARadioGroupControlTester, GoARenderers, GoAReviewRenderers, GoATextControl, GoATextControlTester, GoATimeControl, GoATimeControlTester, GoATimeInput, GoInputBaseReview, GoabInputBasePhoneNumberReviewControl, GoabInputBasePhoneNumberWithTypeReviewControl, GoabInputInteger, InnerGoAInputText, JsonFormContext, JsonFormRegisterProvider, JsonFormsRegisterContext, ListWithDetailsControl, MultiLineText, MultiLineTextControl, MultiLineTextControlInput, MultiLineTextControlTester, OPTION_DEFINITIONS, PHONE_REGEX, PhoneGrid, PhoneNumberControl, PhoneNumberReviewControl, PhoneNumberTester, PhoneNumberWithTypeControl, PhoneNumberWithTypeReviewControl, PhoneNumberWithTypeTester, PrimitiveArrayControl, RadioGroup, USER_FIELD_DEFINITIONS, autoPopulatePropertiesMonaco, autoPopulateValue, categoriesAreValid, createDefaultAjv, enumControl, errMalformedDate, fetchRegisterConfigFromOptions$1 as fetchRegisterConfigFromOptions, formatSin, getByJsonPointer, getCategoryScopes, hasDataInScopes, hasDataValue, isAddressLookup, isContactInformation, isFullName, isFullNameDoB, isPhoneNumberWithType, predictiveOptionsMonaco, registerReducer, resolveRefs, tryResolveRefs, useRegisterUser };