@abgov/jsonforms-components 2.4.0 → 2.4.2

package/index.esm.js

@@ -7,7 +7,7 @@ import axios from 'axios';
 import get$1 from 'lodash/get';
 import { rankWith, isStringControl, and, optionIs, uiTypeIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, getAjv, isVisible, getControlPath, toDataPath, deriveLabelForUISchemaElement, isEnabled, schemaTypeIs, formatIs, createDefaultValue, or, isObjectArrayControl, isPrimitiveArrayControl, Paths, schemaMatches, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
 import { withJsonFormsControlProps, withJsonFormsRendererProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, useJsonForms, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsAllOfProps, withJsonFormsCellProps } from '@jsonforms/react';
-import * as _$c from 'lodash';
+import * as _$b from 'lodash';
 import { isEqual, isEmpty as isEmpty$1, isObject as isObject$f } from 'lodash';
 import merge from 'lodash/merge';
 import isEmpty from 'lodash/isEmpty';
@@ -2719,59 +2719,201 @@ $$o({ global: true, constructor: true, forced: FORCED$3 }, {
   Iterator: IteratorConstructor
 });
 
-// `GetIteratorDirect(obj)` abstract operation
-// https://tc39.es/proposal-iterator-helpers/#sec-getiteratordirect
-var getIteratorDirect$7 = function (obj) {
-  return {
-    iterator: obj,
-    next: obj.next,
-    done: false
+var uncurryThis$a = functionUncurryThisClause;
+var aCallable$d = aCallable$g;
+var NATIVE_BIND = functionBindNative;
+
+var bind$5 = uncurryThis$a(uncurryThis$a.bind);
+
+// optional / simple context binding
+var functionBindContext = function (fn, that) {
+  aCallable$d(fn);
+  return that === undefined ? fn : NATIVE_BIND ? bind$5(fn, that) : function (/* ...args */) {
+    return fn.apply(that, arguments);
   };
 };
 
-var defineBuiltIn$3 = defineBuiltIn$9;
+var wellKnownSymbol$8 = wellKnownSymbol$m;
+var Iterators$1 = iterators;
 
-var defineBuiltIns$1 = function (target, src, options) {
-  for (var key in src) defineBuiltIn$3(target, key, src[key], options);
-  return target;
+var ITERATOR$3 = wellKnownSymbol$8('iterator');
+var ArrayPrototype = Array.prototype;
+
+// check on default Array iterator
+var isArrayIteratorMethod$1 = function (it) {
+  return it !== undefined && (Iterators$1.Array === it || ArrayPrototype[ITERATOR$3] === it);
+};
+
+var classof$5 = classof$9;
+var getMethod$3 = getMethod$6;
+var isNullOrUndefined$2 = isNullOrUndefined$6;
+var Iterators = iterators;
+var wellKnownSymbol$7 = wellKnownSymbol$m;
+
+var ITERATOR$2 = wellKnownSymbol$7('iterator');
+
+var getIteratorMethod$2 = function (it) {
+  if (!isNullOrUndefined$2(it)) return getMethod$3(it, ITERATOR$2)
+    || getMethod$3(it, '@@iterator')
+    || Iterators[classof$5(it)];
 };
 
 var call$a = functionCall;
+var aCallable$c = aCallable$g;
 var anObject$d = anObject$o;
-var getMethod$3 = getMethod$6;
+var tryToString$2 = tryToString$4;
+var getIteratorMethod$1 = getIteratorMethod$2;
+
+var $TypeError$9 = TypeError;
+
+var getIterator$1 = function (argument, usingIterator) {
+  var iteratorMethod = arguments.length < 2 ? getIteratorMethod$1(argument) : usingIterator;
+  if (aCallable$c(iteratorMethod)) return anObject$d(call$a(iteratorMethod, argument));
+  throw new $TypeError$9(tryToString$2(argument) + ' is not iterable');
+};
+
+var call$9 = functionCall;
+var anObject$c = anObject$o;
+var getMethod$2 = getMethod$6;
 
 var iteratorClose$3 = function (iterator, kind, value) {
   var innerResult, innerError;
-  anObject$d(iterator);
+  anObject$c(iterator);
   try {
-    innerResult = getMethod$3(iterator, 'return');
+    innerResult = getMethod$2(iterator, 'return');
     if (!innerResult) {
       if (kind === 'throw') throw value;
       return value;
     }
-    innerResult = call$a(innerResult, iterator);
+    innerResult = call$9(innerResult, iterator);
   } catch (error) {
     innerError = true;
     innerResult = error;
   }
   if (kind === 'throw') throw value;
   if (innerError) throw innerResult;
-  anObject$d(innerResult);
+  anObject$c(innerResult);
   return value;
 };
 
-var call$9 = functionCall;
+var bind$4 = functionBindContext;
+var call$8 = functionCall;
+var anObject$b = anObject$o;
+var tryToString$1 = tryToString$4;
+var isArrayIteratorMethod = isArrayIteratorMethod$1;
+var lengthOfArrayLike$4 = lengthOfArrayLike$7;
+var isPrototypeOf$2 = objectIsPrototypeOf;
+var getIterator = getIterator$1;
+var getIteratorMethod = getIteratorMethod$2;
+var iteratorClose$2 = iteratorClose$3;
+
+var $TypeError$8 = TypeError;
+
+var Result = function (stopped, result) {
+  this.stopped = stopped;
+  this.result = result;
+};
+
+var ResultPrototype = Result.prototype;
+
+var iterate$8 = function (iterable, unboundFunction, options) {
+  var that = options && options.that;
+  var AS_ENTRIES = !!(options && options.AS_ENTRIES);
+  var IS_RECORD = !!(options && options.IS_RECORD);
+  var IS_ITERATOR = !!(options && options.IS_ITERATOR);
+  var INTERRUPTED = !!(options && options.INTERRUPTED);
+  var fn = bind$4(unboundFunction, that);
+  var iterator, iterFn, index, length, result, next, step;
+
+  var stop = function (condition) {
+    if (iterator) iteratorClose$2(iterator, 'normal', condition);
+    return new Result(true, condition);
+  };
+
+  var callFn = function (value) {
+    if (AS_ENTRIES) {
+      anObject$b(value);
+      return INTERRUPTED ? fn(value[0], value[1], stop) : fn(value[0], value[1]);
+    } return INTERRUPTED ? fn(value, stop) : fn(value);
+  };
+
+  if (IS_RECORD) {
+    iterator = iterable.iterator;
+  } else if (IS_ITERATOR) {
+    iterator = iterable;
+  } else {
+    iterFn = getIteratorMethod(iterable);
+    if (!iterFn) throw new $TypeError$8(tryToString$1(iterable) + ' is not iterable');
+    // optimisation for array iterators
+    if (isArrayIteratorMethod(iterFn)) {
+      for (index = 0, length = lengthOfArrayLike$4(iterable); length > index; index++) {
+        result = callFn(iterable[index]);
+        if (result && isPrototypeOf$2(ResultPrototype, result)) return result;
+      } return new Result(false);
+    }
+    iterator = getIterator(iterable, iterFn);
+  }
+
+  next = IS_RECORD ? iterable.next : iterator.next;
+  while (!(step = call$8(next, iterator)).done) {
+    try {
+      result = callFn(step.value);
+    } catch (error) {
+      iteratorClose$2(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$7 = function (obj) {
+  return {
+    iterator: obj,
+    next: obj.next,
+    done: false
+  };
+};
+
+var $$n = _export;
+var iterate$7 = iterate$8;
+var aCallable$b = aCallable$g;
+var anObject$a = anObject$o;
+var getIteratorDirect$6 = getIteratorDirect$7;
+
+// `Iterator.prototype.find` method
+// https://github.com/tc39/proposal-iterator-helpers
+$$n({ target: 'Iterator', proto: true, real: true }, {
+  find: function find(predicate) {
+    anObject$a(this);
+    aCallable$b(predicate);
+    var record = getIteratorDirect$6(this);
+    var counter = 0;
+    return iterate$7(record, function (value, stop) {
+      if (predicate(value, counter++)) return stop(value);
+    }, { IS_RECORD: true, INTERRUPTED: true }).result;
+  }
+});
+
+var defineBuiltIn$3 = defineBuiltIn$9;
+
+var defineBuiltIns$1 = function (target, src, options) {
+  for (var key in src) defineBuiltIn$3(target, key, src[key], options);
+  return target;
+};
+
+var call$7 = functionCall;
 var create$1 = objectCreate;
 var createNonEnumerableProperty$1 = createNonEnumerableProperty$a;
 var defineBuiltIns = defineBuiltIns$1;
-var wellKnownSymbol$8 = wellKnownSymbol$m;
+var wellKnownSymbol$6 = wellKnownSymbol$m;
 var InternalStateModule$1 = internalState;
-var getMethod$2 = getMethod$6;
+var getMethod$1 = getMethod$6;
 var IteratorPrototype = iteratorsCore.IteratorPrototype;
 var createIterResultObject = createIterResultObject$2;
-var iteratorClose$2 = iteratorClose$3;
+var iteratorClose$1 = iteratorClose$3;
 
-var TO_STRING_TAG = wellKnownSymbol$8('toStringTag');
+var TO_STRING_TAG = wellKnownSymbol$6('toStringTag');
 var ITERATOR_HELPER = 'IteratorHelper';
 var WRAP_FOR_VALID_ITERATOR = 'WrapForValidIterator';
 var setInternalState$1 = InternalStateModule$1.set;
@@ -2799,15 +2941,15 @@ var createIteratorProxyPrototype = function (IS_ITERATOR) {
       var iterator = state.iterator;
       state.done = true;
       if (IS_ITERATOR) {
-        var returnMethod = getMethod$2(iterator, 'return');
-        return returnMethod ? call$9(returnMethod, iterator) : createIterResultObject(undefined, true);
+        var returnMethod = getMethod$1(iterator, 'return');
+        return returnMethod ? call$7(returnMethod, iterator) : createIterResultObject(undefined, true);
       }
       if (state.inner) try {
-        iteratorClose$2(state.inner.iterator, 'normal');
+        iteratorClose$1(state.inner.iterator, 'normal');
       } catch (error) {
-        return iteratorClose$2(iterator, 'throw', error);
+        return iteratorClose$1(iterator, 'throw', error);
       }
-      iteratorClose$2(iterator, 'normal');
+      iteratorClose$1(iterator, 'normal');
       return createIterResultObject(undefined, true);
     }
   });
@@ -2836,28 +2978,28 @@ var iteratorCreateProxy = function (nextHandler, IS_ITERATOR) {
   return IteratorProxy;
 };
 
-var anObject$c = anObject$o;
-var iteratorClose$1 = iteratorClose$3;
+var anObject$9 = anObject$o;
+var iteratorClose = iteratorClose$3;
 
 // call something on iterator step with safe closing on error
 var callWithSafeIterationClosing$2 = function (iterator, fn, value, ENTRIES) {
   try {
-    return ENTRIES ? fn(anObject$c(value)[0], value[1]) : fn(value);
+    return ENTRIES ? fn(anObject$9(value)[0], value[1]) : fn(value);
   } catch (error) {
-    iteratorClose$1(iterator, 'throw', error);
+    iteratorClose(iterator, 'throw', error);
   }
 };
 
-var call$8 = functionCall;
-var aCallable$d = aCallable$g;
-var anObject$b = anObject$o;
-var getIteratorDirect$6 = getIteratorDirect$7;
+var call$6 = functionCall;
+var aCallable$a = aCallable$g;
+var anObject$8 = anObject$o;
+var getIteratorDirect$5 = getIteratorDirect$7;
 var createIteratorProxy$1 = iteratorCreateProxy;
 var callWithSafeIterationClosing$1 = callWithSafeIterationClosing$2;
 
 var IteratorProxy$1 = createIteratorProxy$1(function () {
   var iterator = this.iterator;
-  var result = anObject$b(call$8(this.next, iterator));
+  var result = anObject$8(call$6(this.next, iterator));
   var done = this.done = !!result.done;
   if (!done) return callWithSafeIterationClosing$1(iterator, this.mapper, [result.value, this.counter++], true);
 });
@@ -2865,20 +3007,20 @@ var IteratorProxy$1 = createIteratorProxy$1(function () {
 // `Iterator.prototype.map` method
 // https://github.com/tc39/proposal-iterator-helpers
 var iteratorMap = function map(mapper) {
-  anObject$b(this);
-  aCallable$d(mapper);
-  return new IteratorProxy$1(getIteratorDirect$6(this), {
+  anObject$8(this);
+  aCallable$a(mapper);
+  return new IteratorProxy$1(getIteratorDirect$5(this), {
     mapper: mapper
   });
 };
 
-var $$n = _export;
+var $$m = _export;
 var map = iteratorMap;
 var IS_PURE$1 = isPure;
 
 // `Iterator.prototype.map` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$n({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$1 }, {
+$$m({ target: 'Iterator', proto: true, real: true, forced: IS_PURE$1 }, {
   map: map
 });
 
@@ -2950,6 +3092,28 @@ const validateSinWithLuhn = input => {
   }
   return sum % 10 === 0;
 };
+/**
+ * Gets the required field in the If/Then json schema condition.
+ * @param props - ControlProps
+ * @returns - The required field name.
+ */
+const getRequiredIfThen = props => {
+  var _a, _b, _c, _d;
+  const {
+    path
+  } = props;
+  const rootSchema = props.rootSchema;
+  let rootRequired = '';
+  if ((rootSchema === null || rootSchema === void 0 ? void 0 : rootSchema.if) && rootSchema.then) {
+    if (((_a = rootSchema === null || rootSchema === void 0 ? void 0 : rootSchema.then) === null || _a === void 0 ? void 0 : _a.required) && Array.isArray((_b = rootSchema.then) === null || _b === void 0 ? void 0 : _b.required)) {
+      const foundRequired = (_d = (_c = rootSchema.then) === null || _c === void 0 ? void 0 : _c.required) === null || _d === void 0 ? void 0 : _d.find(req => req === path);
+      if (foundRequired !== undefined) {
+        rootRequired = foundRequired;
+      }
+    }
+  }
+  return rootRequired;
+};
 /**
  * Check if a required, defined input value is valid. Returns an appropriate
  * error message if not.
@@ -2965,7 +3129,7 @@ const checkFieldValidity = props => {
     uischema,
     schema
   } = props;
-  const labelToUpdate = (uischema === null || uischema === void 0 ? void 0 : uischema.scope) ? getLabelText(uischema === null || uischema === void 0 ? void 0 : uischema.scope, label) : label;
+  const labelToUpdate = (uischema === null || uischema === void 0 ? void 0 : uischema.scope) ? convertToSentenceCase(getLabelText(uischema === null || uischema === void 0 ? void 0 : uischema.scope, label)) : label;
   const extraSchema = schema;
   if (extraSchema && data && (extraSchema === null || extraSchema === void 0 ? void 0 : extraSchema.title) === sinTitle) {
     if (data.length === 11 && !validateSinWithLuhn(data)) {
@@ -2974,7 +3138,8 @@ const checkFieldValidity = props => {
       return extraSchema.errorMessage;
     }
   }
-  if (required) {
+  const rootRequired = getRequiredIfThen(props);
+  if (required || rootRequired.length > 0) {
     if (schema) {
       if (isEmptyBoolean(schema, data)) {
         return `${labelToUpdate} is required`;
@@ -3043,11 +3208,11 @@ const convertToSentenceCase = input => {
   return firstWord.concat(newWords).join(' ');
 };
 
-var $$m = _export;
-var call$7 = functionCall;
-var aCallable$c = aCallable$g;
-var anObject$a = anObject$o;
-var getIteratorDirect$5 = getIteratorDirect$7;
+var $$l = _export;
+var call$5 = functionCall;
+var aCallable$9 = aCallable$g;
+var anObject$7 = anObject$o;
+var getIteratorDirect$4 = getIteratorDirect$7;
 var createIteratorProxy = iteratorCreateProxy;
 var callWithSafeIterationClosing = callWithSafeIterationClosing$2;
 var IS_PURE = isPure;
@@ -3058,7 +3223,7 @@ var IteratorProxy = createIteratorProxy(function () {
   var next = this.next;
   var result, done, value;
   while (true) {
-    result = anObject$a(call$7(next, iterator));
+    result = anObject$7(call$5(next, iterator));
     done = this.done = !!result.done;
     if (done) return;
     value = result.value;
@@ -3068,11 +3233,11 @@ var IteratorProxy = createIteratorProxy(function () {
 
 // `Iterator.prototype.filter` method
 // https://github.com/tc39/proposal-iterator-helpers
-$$m({ target: 'Iterator', proto: true, real: true, forced: IS_PURE }, {
+$$l({ target: 'Iterator', proto: true, real: true, forced: IS_PURE }, {
   filter: function filter(predicate) {
-    anObject$a(this);
-    aCallable$c(predicate);
-    return new IteratorProxy(getIteratorDirect$5(this), {
+    anObject$7(this);
+    aCallable$9(predicate);
+    return new IteratorProxy(getIteratorDirect$4(this), {
       predicate: predicate
     });
   }
@@ -3334,16 +3499,16 @@ const onChangeForNumericControl = props => {
   }
 };
 
-let _$b = t => t,
+let _$a = t => t,
   _t$b,
   _t2$7;
-styled.div(_t$b || (_t$b = _$b`
+styled.div(_t$b || (_t$b = _$a`
   height: 70vh;
   overflow-y: auto;
   padding-left: var(--goa-space-2xs);
   padding-right: var(--goa-space-2xs);
 `));
-const Visible = styled.div(_t2$7 || (_t2$7 = _$b`
+const Visible = styled.div(_t2$7 || (_t2$7 = _$a`
   display: ${0};
 `), p => p.visible ? 'initial' : 'none');
 
@@ -3352,19 +3517,19 @@ const ADD_NO_ANONYMOUS_ACTION = 'jsonforms/register/no_anonymous';
 const ADD_DATALIST_ACTION = 'jsonforms/register/add_datalist_action';
 const ADD_REGISTER_DATA_ERROR = 'jsonforms/register/add_register_data_error';
 
-var classof$5 = classofRaw$2;
+var classof$4 = classofRaw$2;
 
 // `IsArray` abstract operation
 // https://tc39.es/ecma262/#sec-isarray
 // eslint-disable-next-line es/no-array-isarray -- safe
 var isArray$4 = Array.isArray || function isArray(argument) {
-  return classof$5(argument) === 'Array';
+  return classof$4(argument) === 'Array';
 };
 
 var DESCRIPTORS$5 = descriptors;
 var isArray$3 = isArray$4;
 
-var $TypeError$9 = TypeError;
+var $TypeError$7 = TypeError;
 // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
 var getOwnPropertyDescriptor$2 = Object.getOwnPropertyDescriptor;
 
@@ -3382,23 +3547,23 @@ var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS$5 && !function () {
 
 var arraySetLength = SILENT_ON_NON_WRITABLE_LENGTH_SET ? function (O, length) {
   if (isArray$3(O) && !getOwnPropertyDescriptor$2(O, 'length').writable) {
-    throw new $TypeError$9('Cannot set read only .length');
+    throw new $TypeError$7('Cannot set read only .length');
   } return O.length = length;
 } : function (O, length) {
   return O.length = length;
 };
 
-var $TypeError$8 = TypeError;
+var $TypeError$6 = TypeError;
 var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
 
 var doesNotExceedSafeInteger$2 = function (it) {
-  if (it > MAX_SAFE_INTEGER) throw $TypeError$8('Maximum allowed index exceeded');
+  if (it > MAX_SAFE_INTEGER) throw $TypeError$6('Maximum allowed index exceeded');
   return it;
 };
 
-var $$l = _export;
+var $$k = _export;
 var toObject$2 = toObject$8;
-var lengthOfArrayLike$4 = lengthOfArrayLike$7;
+var lengthOfArrayLike$3 = lengthOfArrayLike$7;
 var setArrayLength = arraySetLength;
 var doesNotExceedSafeInteger$1 = doesNotExceedSafeInteger$2;
 var fails$8 = fails$t;
@@ -3422,11 +3587,11 @@ var FORCED$2 = INCORRECT_TO_LENGTH || !properErrorOnNonWritableLength();
 
 // `Array.prototype.push` method
 // https://tc39.es/ecma262/#sec-array.prototype.push
-$$l({ target: 'Array', proto: true, arity: 1, forced: FORCED$2 }, {
+$$k({ 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$2(this);
-    var len = lengthOfArrayLike$4(O);
+    var len = lengthOfArrayLike$3(O);
     var argCount = arguments.length;
     doesNotExceedSafeInteger$1(len + argCount);
     for (var i = 0; i < argCount; i++) {
@@ -3473,7 +3638,7 @@ function registerReducer(state, action) {
   return state;
 }
 
-var $$k = _export;
+var $$j = _export;
 var $includes = arrayIncludes.includes;
 var fails$7 = fails$t;
 var addToUnscopables$1 = addToUnscopables$4;
@@ -3486,7 +3651,7 @@ var BROKEN_ON_SPARSE = fails$7(function () {
 
 // `Array.prototype.includes` method
 // https://tc39.es/ecma262/#sec-array.prototype.includes
-$$k({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+$$j({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
   includes: function includes(el /* , fromIndex = 0 */) {
     return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
   }
@@ -3495,17 +3660,17 @@ $$k({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
 // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
 addToUnscopables$1('includes');
 
-var uncurryThis$a = functionUncurryThis;
+var uncurryThis$9 = functionUncurryThis;
 
-var arraySlice$2 = uncurryThis$a([].slice);
+var arraySlice$2 = uncurryThis$9([].slice);
 
-var uncurryThis$9 = functionUncurryThis;
+var uncurryThis$8 = functionUncurryThis;
 var isArray$2 = isArray$4;
 var isCallable$7 = isCallable$r;
-var classof$4 = classofRaw$2;
+var classof$3 = classofRaw$2;
 var toString$7 = toString$f;
 
-var push = uncurryThis$9([].push);
+var push = uncurryThis$8([].push);
 
 var getJsonReplacerFunction = function (replacer) {
   if (isCallable$7(replacer)) return replacer;
@@ -3515,7 +3680,7 @@ var getJsonReplacerFunction = function (replacer) {
   for (var i = 0; i < rawLength; i++) {
     var element = replacer[i];
     if (typeof element == 'string') push(keys, element);
-    else if (typeof element == 'number' || classof$4(element) === 'Number' || classof$4(element) === 'String') push(keys, toString$7(element));
+    else if (typeof element == 'number' || classof$3(element) === 'Number' || classof$3(element) === 'String') push(keys, toString$7(element));
   }
   var keysLength = keys.length;
   var root = true;
@@ -3529,11 +3694,11 @@ var getJsonReplacerFunction = function (replacer) {
   };
 };
 
-var $$j = _export;
+var $$i = _export;
 var getBuiltIn$4 = getBuiltIn$9;
 var apply$1 = functionApply;
-var call$6 = functionCall;
-var uncurryThis$8 = functionUncurryThis;
+var call$4 = functionCall;
+var uncurryThis$7 = functionUncurryThis;
 var fails$6 = fails$t;
 var isCallable$6 = isCallable$r;
 var isSymbol = isSymbol$3;
@@ -3543,11 +3708,11 @@ var NATIVE_SYMBOL$1 = symbolConstructorDetection;
 
 var $String = String;
 var $stringify = getBuiltIn$4('JSON', 'stringify');
-var exec$3 = uncurryThis$8(/./.exec);
-var charAt$1 = uncurryThis$8(''.charAt);
-var charCodeAt = uncurryThis$8(''.charCodeAt);
-var replace$3 = uncurryThis$8(''.replace);
-var numberToString = uncurryThis$8(1.0.toString);
+var exec$3 = uncurryThis$7(/./.exec);
+var charAt$1 = uncurryThis$7(''.charAt);
+var charCodeAt = uncurryThis$7(''.charCodeAt);
+var replace$3 = uncurryThis$7(''.replace);
+var numberToString = uncurryThis$7(1.0.toString);
 
 var tester = /[\uD800-\uDFFF]/g;
 var low = /^[\uD800-\uDBFF]$/;
@@ -3575,7 +3740,7 @@ var stringifyWithSymbolsFix = function (it, replacer) {
   if (!isCallable$6($replacer) && (it === undefined || isSymbol(it))) return; // IE8 returns string on undefined
   args[1] = function (key, value) {
     // some old implementations (like WebKit) could pass numbers as keys
-    if (isCallable$6($replacer)) value = call$6($replacer, this, $String(key), value);
+    if (isCallable$6($replacer)) value = call$4($replacer, this, $String(key), value);
     if (!isSymbol(value)) return value;
   };
   return apply$1($stringify, null, args);
@@ -3592,7 +3757,7 @@ var fixIllFormed = function (match, offset, string) {
 if ($stringify) {
   // `JSON.stringify` method
   // https://tc39.es/ecma262/#sec-json.stringify
-  $$j({ target: 'JSON', stat: true, arity: 3, forced: WRONG_SYMBOLS_CONVERSION || ILL_FORMED_UNICODE }, {
+  $$i({ 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$1(arguments);
@@ -3602,18 +3767,18 @@ if ($stringify) {
   });
 }
 
-var $$i = _export;
-var uncurryThis$7 = functionUncurryThis;
+var $$h = _export;
+var uncurryThis$6 = functionUncurryThis;
 var notARegExp$1 = notARegexp;
 var requireObjectCoercible$3 = requireObjectCoercible$b;
 var toString$6 = toString$f;
 var correctIsRegExpLogic$1 = correctIsRegexpLogic;
 
-var stringIndexOf$1 = uncurryThis$7(''.indexOf);
+var stringIndexOf$1 = uncurryThis$6(''.indexOf);
 
 // `String.prototype.includes` method
 // https://tc39.es/ecma262/#sec-string.prototype.includes
-$$i({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, {
+$$h({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, {
   includes: function includes(searchString /* , position = 0 */) {
     return !!~stringIndexOf$1(
       toString$6(requireObjectCoercible$3(this)),
@@ -3623,148 +3788,6 @@ $$i({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes')
   }
 });
 
-var uncurryThis$6 = functionUncurryThisClause;
-var aCallable$b = aCallable$g;
-var NATIVE_BIND = functionBindNative;
-
-var bind$5 = uncurryThis$6(uncurryThis$6.bind);
-
-// optional / simple context binding
-var functionBindContext = function (fn, that) {
-  aCallable$b(fn);
-  return that === undefined ? fn : NATIVE_BIND ? bind$5(fn, that) : function (/* ...args */) {
-    return fn.apply(that, arguments);
-  };
-};
-
-var wellKnownSymbol$7 = wellKnownSymbol$m;
-var Iterators$1 = iterators;
-
-var ITERATOR$3 = wellKnownSymbol$7('iterator');
-var ArrayPrototype = Array.prototype;
-
-// check on default Array iterator
-var isArrayIteratorMethod$1 = function (it) {
-  return it !== undefined && (Iterators$1.Array === it || ArrayPrototype[ITERATOR$3] === it);
-};
-
-var classof$3 = classof$9;
-var getMethod$1 = getMethod$6;
-var isNullOrUndefined$2 = isNullOrUndefined$6;
-var Iterators = iterators;
-var wellKnownSymbol$6 = wellKnownSymbol$m;
-
-var ITERATOR$2 = wellKnownSymbol$6('iterator');
-
-var getIteratorMethod$2 = function (it) {
-  if (!isNullOrUndefined$2(it)) return getMethod$1(it, ITERATOR$2)
-    || getMethod$1(it, '@@iterator')
-    || Iterators[classof$3(it)];
-};
-
-var call$5 = functionCall;
-var aCallable$a = aCallable$g;
-var anObject$9 = anObject$o;
-var tryToString$2 = tryToString$4;
-var getIteratorMethod$1 = getIteratorMethod$2;
-
-var $TypeError$7 = TypeError;
-
-var getIterator$1 = function (argument, usingIterator) {
-  var iteratorMethod = arguments.length < 2 ? getIteratorMethod$1(argument) : usingIterator;
-  if (aCallable$a(iteratorMethod)) return anObject$9(call$5(iteratorMethod, argument));
-  throw new $TypeError$7(tryToString$2(argument) + ' is not iterable');
-};
-
-var bind$4 = functionBindContext;
-var call$4 = functionCall;
-var anObject$8 = anObject$o;
-var tryToString$1 = tryToString$4;
-var isArrayIteratorMethod = isArrayIteratorMethod$1;
-var lengthOfArrayLike$3 = lengthOfArrayLike$7;
-var isPrototypeOf$2 = objectIsPrototypeOf;
-var getIterator = getIterator$1;
-var getIteratorMethod = getIteratorMethod$2;
-var iteratorClose = iteratorClose$3;
-
-var $TypeError$6 = TypeError;
-
-var Result = function (stopped, result) {
-  this.stopped = stopped;
-  this.result = result;
-};
-
-var ResultPrototype = Result.prototype;
-
-var iterate$8 = function (iterable, unboundFunction, options) {
-  var that = options && options.that;
-  var AS_ENTRIES = !!(options && options.AS_ENTRIES);
-  var IS_RECORD = !!(options && options.IS_RECORD);
-  var IS_ITERATOR = !!(options && options.IS_ITERATOR);
-  var INTERRUPTED = !!(options && options.INTERRUPTED);
-  var fn = bind$4(unboundFunction, that);
-  var iterator, iterFn, index, length, result, next, step;
-
-  var stop = function (condition) {
-    if (iterator) iteratorClose(iterator, 'normal', condition);
-    return new Result(true, condition);
-  };
-
-  var callFn = function (value) {
-    if (AS_ENTRIES) {
-      anObject$8(value);
-      return INTERRUPTED ? fn(value[0], value[1], stop) : fn(value[0], value[1]);
-    } return INTERRUPTED ? fn(value, stop) : fn(value);
-  };
-
-  if (IS_RECORD) {
-    iterator = iterable.iterator;
-  } else if (IS_ITERATOR) {
-    iterator = iterable;
-  } else {
-    iterFn = getIteratorMethod(iterable);
-    if (!iterFn) throw new $TypeError$6(tryToString$1(iterable) + ' is not iterable');
-    // optimisation for array iterators
-    if (isArrayIteratorMethod(iterFn)) {
-      for (index = 0, length = lengthOfArrayLike$3(iterable); length > index; index++) {
-        result = callFn(iterable[index]);
-        if (result && isPrototypeOf$2(ResultPrototype, result)) return result;
-      } return new Result(false);
-    }
-    iterator = getIterator(iterable, iterFn);
-  }
-
-  next = IS_RECORD ? iterable.next : iterator.next;
-  while (!(step = call$4(next, iterator)).done) {
-    try {
-      result = callFn(step.value);
-    } catch (error) {
-      iteratorClose(iterator, 'throw', error);
-    }
-    if (typeof result == 'object' && result && isPrototypeOf$2(ResultPrototype, result)) return result;
-  } return new Result(false);
-};
-
-var $$h = _export;
-var iterate$7 = iterate$8;
-var aCallable$9 = aCallable$g;
-var anObject$7 = anObject$o;
-var getIteratorDirect$4 = getIteratorDirect$7;
-
-// `Iterator.prototype.find` method
-// https://github.com/tc39/proposal-iterator-helpers
-$$h({ target: 'Iterator', proto: true, real: true }, {
-  find: function find(predicate) {
-    anObject$7(this);
-    aCallable$9(predicate);
-    var record = getIteratorDirect$4(this);
-    var counter = 0;
-    return iterate$7(record, function (value, stop) {
-      if (predicate(value, counter++)) return stop(value);
-    }, { IS_RECORD: true, INTERRUPTED: true }).result;
-  }
-});
-
 var $$g = _export;
 var iterate$6 = iterate$8;
 var aCallable$8 = aCallable$g;
@@ -4276,7 +4299,7 @@ const JsonFormRegisterProvider = ({
   });
 };
 
-let _$a = t => t,
+let _$9 = t => t,
   _t$a,
   _t2$6,
   _t3$5,
@@ -4285,42 +4308,42 @@ let _$a = t => t,
   _t6$3,
   _t7$2,
   _t8$2;
-const FormFieldWrapper = styled.div(_t$a || (_t$a = _$a`
+const FormFieldWrapper = styled.div(_t$a || (_t$a = _$9`
   margin-bottom: var(--goa-space-l);
 `));
-const WarningIconDiv = styled.div(_t2$6 || (_t2$6 = _$a`
+const WarningIconDiv = styled.div(_t2$6 || (_t2$6 = _$9`
   display: inline-flex;
   align-items: flex-start;
   gap: 0.25rem;
   font-size: var(--goa-font-size-2);
   color: var(--goa-color-interactive-error);
 `));
-const RequiredTextLabel = styled.label(_t3$5 || (_t3$5 = _$a`
+const RequiredTextLabel = styled.label(_t3$5 || (_t3$5 = _$9`
   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;
 `));
-const PageReviewNameCol = styled.td(_t4$5 || (_t4$5 = _$a`
+const PageReviewNameCol = styled.td(_t4$5 || (_t4$5 = _$9`
   width: 5%;
   padding-top: var(--goa-space-s);
   padding-bottom: var(--goa-space-s);
   padding-right: var(--goa-space-m);
 `));
-const PageReviewValueCol = styled.td(_t5$3 || (_t5$3 = _$a`
+const PageReviewValueCol = styled.td(_t5$3 || (_t5$3 = _$9`
   width: 20%;
   text-align: left;
 `));
 //Check and unchecked are different heights otherwise
-const CheckboxWrapper = styled.div(_t6$3 || (_t6$3 = _$a`
+const CheckboxWrapper = styled.div(_t6$3 || (_t6$3 = _$9`
   height: 28px;
 `));
-styled.h4(_t7$2 || (_t7$2 = _$a`
+styled.h4(_t7$2 || (_t7$2 = _$9`
   margin: 0 0 0.25rem 0;
   fontsize: larger;
 `));
-styled.h4(_t8$2 || (_t8$2 = _$a`
+styled.h4(_t8$2 || (_t8$2 = _$9`
   border-bottom: 1px solid #ddd;
 `));
 
@@ -4332,6 +4355,7 @@ const GoAInputBaseControl = props => {
     label,
     input,
     required,
+    errors,
     path,
     isStepperReview,
     skipInitialValidation
@@ -4349,7 +4373,7 @@ const GoAInputBaseControl = props => {
       visible: visible,
       children: jsx(FormFieldWrapper, {
         children: jsx(GoAFormItem, {
-          requirement: required ? 'required' : undefined,
+          requirement: required || getRequiredIfThen(props).length > 0 ? 'required' : undefined,
           error: isVisited === true ? modifiedErrors : undefined,
           testId: `${isStepperReview === true && 'review-base-'}${path}`,
           label: (props === null || props === void 0 ? void 0 : props.noLabel) === true ? '' : labelToUpdate,
@@ -4544,12 +4568,12 @@ const SPACE_KEY = ' ';
 const ALT_KEY = 'Alt';
 const SHIFT_KEY = 'Shift';
 
-let _$9 = t => t,
+let _$8 = t => t,
   _t$9,
   _t2$5,
   _t3$4,
   _t4$4;
-const GoADropdownTextbox = styled.div(_t$9 || (_t$9 = _$9`
+const GoADropdownTextbox = styled.div(_t$9 || (_t$9 = _$8`
   border-radius: var(--goa-space-2xs);
   box-shadow: ${0};
   &:hover {
@@ -4560,11 +4584,11 @@ const GoADropdownTextbox = styled.div(_t$9 || (_t$9 = _$9`
     box-shadow: ${0};
   }
 `), p => p.isOpen ? `0 0 0 3px var(--goa-color-interactive-focus)` : '', p => p.isOpen ? `0 0 0 3px var(--goa-color-interactive-focus) !important` : '');
-const GoADropdownListContainerWrapper = styled.div(_t2$5 || (_t2$5 = _$9`
+const GoADropdownListContainerWrapper = styled.div(_t2$5 || (_t2$5 = _$8`
   position: relative;
   display: ${0};
 `), p => !(p === null || p === void 0 ? void 0 : p.isOpen) && 'none');
-const GoADropdownListContainer = styled.div(_t3$4 || (_t3$4 = _$9`
+const GoADropdownListContainer = styled.div(_t3$4 || (_t3$4 = _$8`
   border: solid 1px var(--goa-color-greyscale-200);
   border-radius: var(--goa-space-2xs);
   background: var(--goa-color-greyscale-white);
@@ -4588,7 +4612,7 @@ const GoADropdownListContainer = styled.div(_t3$4 || (_t3$4 = _$9`
     scrollbar-color: #a8a8a8 var(--goa-color-greyscale-100) !important;
   }
 `), p => p.optionListMaxHeight || '272px');
-const GoADropdownListOption = styled.div(_t4$4 || (_t4$4 = _$9`
+const GoADropdownListOption = styled.div(_t4$4 || (_t4$4 = _$8`
   padding: var(--goa-space-2xs) var(--goa-space-s);
   text-overflow: ellipsis;
   color: ${0} !important;
@@ -5655,7 +5679,7 @@ const BooleanRadioControl = props => jsx(GoAInputBaseControl, Object.assign({},
 const GoABooleanRadioControlTester = rankWith(3, and(isBooleanControl, optionIs('radio', true)));
 const GoABooleanRadioControl = withJsonFormsControlProps(BooleanRadioControl);
 
-let _$8 = t => t,
+let _$7 = t => t,
   _t$8;
 const Checkboxes = ({
   children,
@@ -5668,7 +5692,7 @@ const Checkboxes = ({
     children: children
   });
 };
-const CheckBoxGroupDiv = styled.div(_t$8 || (_t$8 = _$8`
+const CheckBoxGroupDiv = styled.div(_t$8 || (_t$8 = _$7`
   .horizontal {
     display: flex;
     flex-direction: row;
@@ -5868,7 +5892,7 @@ const GoAInputBaseTableReview = props => {
 };
 const GoAInputBaseTableReviewControl = withJsonFormsControlProps(GoAInputBaseTableReview);
 
-let _$7 = t => t,
+let _$6 = t => t,
   _t$7;
 const renderLayoutElements = (elements, schema, path, enabled, renderers, cells) => {
   return elements.map((child, index) => jsx(JsonFormsDispatch, {
@@ -5948,13 +5972,13 @@ const ReviewLayoutRenderer = ({
     }
   }
 };
-const ReviewGrid = styled.div(_t$7 || (_t$7 = _$7`
+const ReviewGrid = styled.div(_t$7 || (_t$7 = _$6`
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(250px, calc(50% - 8px)));
   gap: 16px;
 `));
 
-let _$6 = t => t,
+let _$5 = t => t,
   _t$6,
   _t2$4,
   _t3$3,
@@ -5977,7 +6001,7 @@ let _$6 = t => t,
   _t20$1,
   _t21,
   _t22;
-const ReviewItem = styled.div(_t$6 || (_t$6 = _$6`
+const ReviewItem = styled.div(_t$6 || (_t$6 = _$5`
   display: flex;
   flex-direction: column;
   border: var(--goa-border-width-s) solid grey;
@@ -5988,7 +6012,7 @@ const ReviewItem = styled.div(_t$6 || (_t$6 = _$6`
     display: none;
   }
 `));
-const ReviewItemSection = styled.div(_t2$4 || (_t2$4 = _$6`
+const ReviewItemSection = styled.div(_t2$4 || (_t2$4 = _$5`
   background-color: #f1f1f1;
   margin-bottom: var(--goa-space-m);
   padding: var(--goa-space-m);
@@ -5999,18 +6023,18 @@ const ReviewItemSection = styled.div(_t2$4 || (_t2$4 = _$6`
     max-width: 1600px;
   }
 `));
-const ReviewItemHeader = styled.div(_t3$3 || (_t3$3 = _$6`
+const ReviewItemHeader = styled.div(_t3$3 || (_t3$3 = _$5`
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin-bottom: var(--goa-space-xl);
 `));
-const ReviewItemTitle = styled.div(_t4$3 || (_t4$3 = _$6`
+const ReviewItemTitle = styled.div(_t4$3 || (_t4$3 = _$5`
   font-size: var(--goa-space-l);
   line-height: var(--goa-space-xl);
   font-weight: 300;
 `));
-const Anchor = styled.div(_t5$2 || (_t5$2 = _$6`
+const Anchor = styled.div(_t5$2 || (_t5$2 = _$5`
   color: #0070c4;
   text-decoration: underline;
   outline: none;
@@ -6021,20 +6045,20 @@ const Anchor = styled.div(_t5$2 || (_t5$2 = _$6`
     background-color: #e6f7ff;
   }
 `));
-styled.div(_t6$2 || (_t6$2 = _$6`
+styled.div(_t6$2 || (_t6$2 = _$5`
   margin-left: var(--goa-space-m);
 `));
-styled.div(_t7$1 || (_t7$1 = _$6`
+styled.div(_t7$1 || (_t7$1 = _$5`
   margin-bottom: var(--goa-space-m);
 `));
-styled.div(_t8$1 || (_t8$1 = _$6`
+styled.div(_t8$1 || (_t8$1 = _$5`
   margin: var(--goa-space-s);
   width: 100%;
 `));
-styled.h3(_t9$1 || (_t9$1 = _$6`
+styled.h3(_t9$1 || (_t9$1 = _$5`
   text-transform: capitalize;
 `));
-const RightAlignmentDiv = styled.div(_t10$1 || (_t10$1 = _$6`
+const RightAlignmentDiv = styled.div(_t10$1 || (_t10$1 = _$5`
   @media screen and (max-width: 767px) {
     margin-bottom: var(--goa-space-l);
   }
@@ -6044,57 +6068,57 @@ const RightAlignmentDiv = styled.div(_t10$1 || (_t10$1 = _$6`
     margin-bottom: var(--goa-space-l);
   }
 `));
-const FormStepperSummaryH3 = styled.h3(_t11$1 || (_t11$1 = _$6`
+const FormStepperSummaryH3 = styled.h3(_t11$1 || (_t11$1 = _$5`
   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(_t12$1 || (_t12$1 = _$6`
+const PageRenderPadding = styled.div(_t12$1 || (_t12$1 = _$5`
   margin-top: var(--goa-space-2xl);
 `));
-const PageBorder = styled.h3(_t13$1 || (_t13$1 = _$6`
+const PageBorder = styled.h3(_t13$1 || (_t13$1 = _$5`
   padding: var(--goa-space-3xl);
 `));
-const TableReviewItemSection = styled.div(_t14$1 || (_t14$1 = _$6`
+const TableReviewItemSection = styled.div(_t14$1 || (_t14$1 = _$5`
   .element-style {
     max-width: 1600px;
   }
 `));
-const TableReviewItem = styled.div(_t15$1 || (_t15$1 = _$6`
+const TableReviewItem = styled.div(_t15$1 || (_t15$1 = _$5`
   border: 1px solid #dcdcdc;
   border-radius: 5px;
   padding: var(--goa-space-2xl);
 `));
-const TableReviewPageTitleRow = styled.div(_t16$1 || (_t16$1 = _$6`
+const TableReviewPageTitleRow = styled.div(_t16$1 || (_t16$1 = _$5`
   margin-top: var(--goa-space-xl);
   display: flex;
   justify-content: space-between;
 `));
-const TableReviewCategoryLabel = styled.h3(_t17$1 || (_t17$1 = _$6`
+const TableReviewCategoryLabel = styled.h3(_t17$1 || (_t17$1 = _$5`
   color: var(--goa-color-text-secondary) !important;
   margin-bottom: var(--goa-space-l);
 `));
-const CategoryStatus = styled.td(_t18$1 || (_t18$1 = _$6`
+const CategoryStatus = styled.td(_t18$1 || (_t18$1 = _$5`
   width: var(--goa-space-xl);
   padding-right: var(--goa-space-xl);
 `));
-const TocPageRef = styled.td(_t19$1 || (_t19$1 = _$6`
+const TocPageRef = styled.td(_t19$1 || (_t19$1 = _$5`
   padding-left: var(--goa-space-xl);
 `));
-const TocTitle = styled.h1(_t20$1 || (_t20$1 = _$6`
+const TocTitle = styled.h1(_t20$1 || (_t20$1 = _$5`
   padding: 0;
   margin: 0;
   padding-left: var(--goa-space-xl);
   padding-bottom: var(--goa-space-3xl);
 `));
-const TocSubtitle = styled.h2(_t21 || (_t21 = _$6`
+const TocSubtitle = styled.h2(_t21 || (_t21 = _$5`
   padding: 0;
   margin: 0;
   padding-left: var(--goa-space-xl);
 `));
-const CompletionStatus = styled.div(_t22 || (_t22 = _$6`
+const CompletionStatus = styled.div(_t22 || (_t22 = _$5`
   padding: 0;
   margin: 0;
   padding-left: var(--goa-space-xl);
@@ -6410,7 +6434,7 @@ const pickPropertyValues = (obj, property, endWithType) => {
     var _a;
     if (key === property) {
       values.push(obj[key]);
-    } else if (_$c.isObject(obj[key])) {
+    } else if (_$b.isObject(obj[key])) {
       // if the object type is equal to end type, we are not going to continue the recursive approach
       if (endWithType && ((_a = obj[key]) === null || _a === void 0 ? void 0 : _a.type) === endWithType) {
         if (property in obj[key]) {
@@ -6419,7 +6443,7 @@ const pickPropertyValues = (obj, property, endWithType) => {
       } else {
         values = [...values, ...pickPropertyValues(obj[key], property, endWithType)];
       }
-    } else if (_$c.isArray(obj[key])) {
+    } else if (_$b.isArray(obj[key])) {
       const nextValues = obj[key].map(function (arrayObj) {
         return pickPropertyValues(arrayObj, property, endWithType);
       });
@@ -7307,9 +7331,9 @@ const FormStepperPageReviewer = props => {
 };
 withAjvProps(withTranslateProps(withJsonFormsLayoutProps(FormStepperPageReviewer)));
 
-let _$5 = t => t,
+let _$4 = t => t,
   _t$5;
-const BackButtonWrapper = styled.span(_t$5 || (_t$5 = _$5`
+const BackButtonWrapper = styled.span(_t$5 || (_t$5 = _$4`
   .back-link::before {
     content: '';
     display: inline-block;
@@ -7561,7 +7585,7 @@ const CategorizationPagesRendererTester = rankWith(2, and(uiTypeIs('Categorizati
   return ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.variant) === 'pages';
 }));
 
-let _$4 = t => t,
+let _$3 = t => t,
   _t$4;
 const GoAContextMenuIcon = props => {
   return jsx(GoAIconButton, {
@@ -7573,7 +7597,7 @@ const GoAContextMenuIcon = props => {
     disabled: props.disabled
   });
 };
-const GoAContextMenu = styled.div(_t$4 || (_t$4 = _$4`
+const GoAContextMenu = styled.div(_t$4 || (_t$4 = _$3`
   display: flex;
   align-items: center;
   background-color: #fff;
@@ -7620,7 +7644,7 @@ const DeleteFileModal = ({
   });
 };
 
-let _$3 = t => t,
+let _2 = t => t,
   _t$3,
   _t2$3,
   _t3$2,
@@ -7633,7 +7657,7 @@ const FileUploaderReview = props => {
   }));
 };
 const FileUploader = _a => {
-  var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+  var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   var {
       data,
       path,
@@ -7661,7 +7685,8 @@ const FileUploader = _a => {
   } = props;
   const propertyId = i18nKeyPrefix;
   const variant = ((_e = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _e === void 0 ? void 0 : _e.variant) || 'button';
-  const [showFileDeleteConfirmation, setShowFileDeleteConfirmation] = useState(false);
+  const multiFileUploader = variant === 'dragdrop';
+  const [deleteHide, setDeleteHide] = useState(false);
   function uploadFile(file) {
     if (uploadTrigger) {
       uploadTrigger(file, propertyId);
@@ -7669,6 +7694,7 @@ const FileUploader = _a => {
         const value = ['Loading', Array.isArray(data) ? data[1] : file === null || file === void 0 ? void 0 : file.name];
         handleChange(propertyId, value);
       };
+      setDeleteHide(false);
       setTimeout(handleFunction, DELAY_UPLOAD_TIMEOUT_MS);
     }
   }
@@ -7682,11 +7708,12 @@ const FileUploader = _a => {
       deleteTrigger(file, propertyId);
     }
   }
-  function getFileName() {
-    return fileList && fileList[props.i18nKeyPrefix].filename;
+  function getFileName(index) {
+    var _a;
+    return fileList && fileList[props.i18nKeyPrefix] && ((_a = fileList[props.i18nKeyPrefix][index]) === null || _a === void 0 ? void 0 : _a.filename);
   }
-  function getFile() {
-    return fileList && fileList[props.i18nKeyPrefix];
+  function getFile(index) {
+    return fileList && fileList[props.i18nKeyPrefix] && fileList[props.i18nKeyPrefix][index];
   }
   useEffect(() => {
     // UseEffect is required because not having it causes a react update error, but
@@ -7708,6 +7735,55 @@ const FileUploader = _a => {
   }
   const helpText = (_p = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _p === void 0 ? void 0 : _p.help;
   const sentenceCaseLabel = convertToSentenceCase(label);
+  const DownloadFileWidget = ({
+    index
+  }) => {
+    var _a;
+    const [showFileDeleteConfirmation, setShowFileDeleteConfirmation] = useState(false);
+    return jsx("div", {
+      children: readOnly && index ? jsxs(AttachmentBorderDisabled, {
+        children: [getFileName(index), jsx(GoAContextMenuIcon, {
+          testId: "download-icon",
+          title: "Download",
+          type: "download",
+          onClick: () => downloadFile(getFile(index))
+        })]
+      }) : jsxs(AttachmentBorder, {
+        children: [jsx("div", {
+          children: getFileName(index)
+        }), jsxs(GoAContextMenu, {
+          children: [jsx(GoAContextMenuIcon, {
+            testId: "download-icon",
+            title: "Download",
+            type: "download",
+            onClick: () => downloadFile(getFile(index))
+          }), jsx(GoAContextMenuIcon, {
+            "data-testid": "delete-icon",
+            title: "Delete",
+            type: "trash",
+            onClick: () => {
+              setShowFileDeleteConfirmation(true);
+            }
+          })]
+        }), jsx(DeleteFileModal, {
+          isOpen: showFileDeleteConfirmation,
+          title: "Delete file",
+          content: `Delete file ${(_a = getFile(index)) === null || _a === void 0 ? void 0 : _a.filename} ?`,
+          onCancel: () => setShowFileDeleteConfirmation(false),
+          onDelete: () => {
+            setShowFileDeleteConfirmation(false);
+            deleteFile(getFile(index));
+            setDeleteHide(true);
+            const handleFunction = () => {
+              handleChange(propertyId, '');
+            };
+            setTimeout(handleFunction, DELAY_DELETE_TIMEOUT_MS);
+          }
+        })]
+      })
+    });
+  };
+  const fileListLength = fileList && ((_q = fileList[props.i18nKeyPrefix]) === null || _q === void 0 ? void 0 : _q.length) || 0;
   return jsxs(FileUploaderStyle, {
     className: "FileUploader",
     children: [required ? jsx(GoAFormItem, {
@@ -7738,57 +7814,23 @@ const FileUploader = _a => {
           })
         })
       }) : jsx("div", {
-        children: fileList && getFile() && jsx("div", {
-          children: readOnly ? jsxs(AttachmentBorderDisabled, {
-            children: [getFileName(), ' ', jsx(GoAContextMenuIcon, {
-              testId: "download-icon",
-              title: "Download",
-              type: "download",
-              onClick: () => downloadFile(getFile())
-            })]
-          }) : jsxs(AttachmentBorder, {
-            children: [jsx("div", {
-              children: getFileName()
-            }), jsxs(GoAContextMenu, {
-              children: [jsx(GoAContextMenuIcon, {
-                testId: "download-icon",
-                title: "Download",
-                type: "download",
-                onClick: () => downloadFile(getFile())
-              }), jsx(GoAContextMenuIcon, {
-                "data-testid": "delete-icon",
-                title: "Delete",
-                type: "trash",
-                onClick: () => {
-                  setShowFileDeleteConfirmation(true);
-                }
-              })]
-            }), jsx(DeleteFileModal, {
-              isOpen: showFileDeleteConfirmation,
-              title: "Delete file",
-              content: `Delete file ${getFile().filename} ?`,
-              onCancel: () => setShowFileDeleteConfirmation(false),
-              onDelete: () => {
-                setShowFileDeleteConfirmation(false);
-                deleteFile(getFile());
-                const handleFunction = () => {
-                  handleChange(propertyId, '');
-                };
-                setTimeout(handleFunction, DELAY_DELETE_TIMEOUT_MS);
-              }
-            })]
-          })
+        children: multiFileUploader ? fileList && (fileList[props.i18nKeyPrefix] || []).map((_, index) => {
+          return jsx(DownloadFileWidget, {
+            index: index
+          });
+        }) : fileList && !deleteHide && getFile(fileListLength - 1) && fileListLength >= 0 && jsx(DownloadFileWidget, {
+          index: fileListLength - 1
         })
       })
     })]
   });
 };
-const HelpText = styled.div(_t$3 || (_t$3 = _$3`
+const HelpText = styled.div(_t$3 || (_t$3 = _2`
   margin-top: var(--goa-space-xs);
   font-size: var(--goa-font-size-3);
   color: var(--goa-color-text-secondary);
 `));
-const AttachmentBorderDisabled = styled.div(_t2$3 || (_t2$3 = _$3`
+const AttachmentBorderDisabled = styled.div(_t2$3 || (_t2$3 = _2`
   display: flex;
   flex-direction: row;
   border: var(--goa-border-width-s) solid #dcdcdc;
@@ -7797,7 +7839,7 @@ const AttachmentBorderDisabled = styled.div(_t2$3 || (_t2$3 = _$3`
   width: fit-content;
   background-color: #f1f1f1;
 `));
-const AttachmentBorder = styled.div(_t3$2 || (_t3$2 = _$3`
+const AttachmentBorder = styled.div(_t3$2 || (_t3$2 = _2`
   display: flex;
   flex-direction: row;
   border: var(--goa-border-width-s) solid #dcdcdc;
@@ -7806,7 +7848,7 @@ const AttachmentBorder = styled.div(_t3$2 || (_t3$2 = _$3`
   width: fit-content;
   margin-top: var(--goa-space-2xs);
 `));
-const FileUploaderStyle = styled.div(_t4$2 || (_t4$2 = _$3`
+const FileUploaderStyle = styled.div(_t4$2 || (_t4$2 = _2`
   margin-bottom: var(--goa-space-l);
   .label {
     display: block;
@@ -10124,7 +10166,7 @@ const AddressViews = ({
         gap: "s",
         children: [jsx(GoAFormItem, {
           label: "Address line 1",
-          error: (data === null || data === void 0 ? void 0 : data.addressLine1) === undefined ? 'addressLine1 is required' : '',
+          error: (data === null || data === void 0 ? void 0 : data.addressLine1) === undefined ? 'Address line 1 is required' : '',
           requirement: "required",
           children: jsx(TextWrap, {
             children: data === null || data === void 0 ? void 0 : data.addressLine1
@@ -10139,14 +10181,14 @@ const AddressViews = ({
         minChildWidth: "0ch",
         gap: "s",
         children: [jsx(GoAFormItem, {
-          error: (data === null || data === void 0 ? void 0 : data.municipality) === undefined ? 'city is required' : '',
+          error: (data === null || data === void 0 ? void 0 : data.municipality) === undefined ? 'City is required' : '',
           label: "City",
           requirement: "required",
           children: jsx(TextWrap, {
             children: data === null || data === void 0 ? void 0 : data.municipality
           })
         }), jsx(GoAFormItem, {
-          error: (data === null || data === void 0 ? void 0 : data.postalCode) === undefined ? 'postalCode is required' : '',
+          error: (data === null || data === void 0 ? void 0 : data.postalCode) === undefined ? 'Postal code is required' : '',
           label: "Postal Code",
           requirement: "required",
           children: jsx(TextWrap, {
@@ -10992,7 +11034,8 @@ const createDefaultAjv = (...schemas) => {
   const ajv = new Ajv({
     allErrors: true,
     verbose: true,
-    strict: 'log'
+    strict: 'log',
+    strictRequired: false
   });
   ajv.addSchema(schemas);
   addErrors(ajv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",

package/src/lib/util/stringUtils.d.ts

@@ -22,6 +22,12 @@ export declare const getLabelText: (scope: string, label: string) => string;
 export declare const isEmptyBoolean: (schema: JsonSchema, data: unknown) => boolean;
 export declare const isEmptyNumber: (schema: JsonSchema, data: unknown) => boolean;
 export declare const validateSinWithLuhn: (input: number) => boolean;
+/**
+ * Gets the required field in the If/Then json schema condition.
+ * @param props - ControlProps
+ * @returns - The required field name.
+ */
+export declare const getRequiredIfThen: (props: ControlProps) => string;
 /**
  * Check if a required, defined input value is valid. Returns an appropriate
  * error message if not.