@abgov/jsonforms-components 1.35.3 → 1.35.4

package/index.esm.js

@@ -1,6 +1,6 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import React, { createContext, useContext, useReducer, useMemo, useEffect, useState, useRef, useCallback } from 'react';
-import { GoAFormItem, GoAInput, GoATextArea, GoACallout, GoAInputDate, GoAInputDateTime, GoAInputTime, GoARadioGroup, GoARadioItem, GoACheckbox, GoAGrid, GoAFormStepper, GoAFormStep, GoAPages, GoAButton, GoAModal, GoAButtonGroup, GoAIconButton, GoAFileUploadInput, GoACircularProgress, GoAContainer, GoADropdown, GoADropdownItem, GoADetails, GoASkeleton } from '@abgov/react-components';
+import { GoAFormItem, GoAInput, GoATextArea, GoACallout, GoAInputDate, GoAInputDateTime, GoAInputTime, GoARadioGroup, GoARadioItem, GoACheckbox, GoAGrid, GoAFormStepper, GoAFormStep, GoAPages, GoAButton, GoAModal, GoAButtonGroup, GoAIconButton, GoAFileUploadInput, GoACircularProgress, GoAContainer, GoATable, GoADropdown, GoADropdownItem, GoADetails, GoASkeleton } from '@abgov/react-components';
 import styled from 'styled-components';
 import axios from 'axios';
 import get$1 from 'lodash/get';
@@ -292,12 +292,12 @@ var descriptors = !fails$n(function () {
   return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
 });
 
-var DESCRIPTORS$g = descriptors;
+var DESCRIPTORS$h = descriptors;
 var fails$m = fails$r;
 
 // V8 ~ Chrome 36-
 // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-var v8PrototypeDefineBug = DESCRIPTORS$g && fails$m(function () {
+var v8PrototypeDefineBug = DESCRIPTORS$h && fails$m(function () {
   // eslint-disable-next-line es/no-object-defineproperty -- required for testing
   return Object.defineProperty(function () { /* empty */ }, 'prototype', {
     value: 42,
@@ -318,12 +318,12 @@ var documentCreateElement$2 = function (it) {
   return EXISTS$1 ? document$3.createElement(it) : {};
 };
 
-var DESCRIPTORS$f = descriptors;
+var DESCRIPTORS$g = descriptors;
 var fails$l = fails$r;
 var createElement$1 = documentCreateElement$2;
 
 // Thanks to IE8 for its funny defineProperty
-var ie8DomDefine = !DESCRIPTORS$f && !fails$l(function () {
+var ie8DomDefine = !DESCRIPTORS$g && !fails$l(function () {
   // eslint-disable-next-line es/no-object-defineproperty -- required for testing
   return Object.defineProperty(createElement$1('div'), 'a', {
     get: function () { return 7; }
@@ -450,7 +450,7 @@ var toPropertyKey$2 = function (argument) {
   return isSymbol$1(key) ? key : key + '';
 };
 
-var DESCRIPTORS$e = descriptors;
+var DESCRIPTORS$f = descriptors;
 var IE8_DOM_DEFINE$1 = ie8DomDefine;
 var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
 var anObject$e = anObject$f;
@@ -467,7 +467,7 @@ var WRITABLE = 'writable';
 
 // `Object.defineProperty` method
 // https://tc39.es/ecma262/#sec-object.defineproperty
-objectDefineProperty.f = DESCRIPTORS$e ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
+objectDefineProperty.f = DESCRIPTORS$f ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
   anObject$e(O);
   P = toPropertyKey$1(P);
   anObject$e(Attributes);
@@ -625,9 +625,9 @@ var objectKeys$2 = Object.keys || function keys(O) {
   return internalObjectKeys$1(O, enumBugKeys$2);
 };
 
-var DESCRIPTORS$d = descriptors;
+var DESCRIPTORS$e = descriptors;
 var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-var definePropertyModule$3 = objectDefineProperty;
+var definePropertyModule$4 = objectDefineProperty;
 var anObject$d = anObject$f;
 var toIndexedObject$2 = toIndexedObject$5;
 var objectKeys$1 = objectKeys$2;
@@ -635,14 +635,14 @@ var objectKeys$1 = objectKeys$2;
 // `Object.defineProperties` method
 // https://tc39.es/ecma262/#sec-object.defineproperties
 // eslint-disable-next-line es/no-object-defineproperties -- safe
-objectDefineProperties.f = DESCRIPTORS$d && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+objectDefineProperties.f = DESCRIPTORS$e && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
   anObject$d(O);
   var props = toIndexedObject$2(Properties);
   var keys = objectKeys$1(Properties);
   var length = keys.length;
   var index = 0;
   var key;
-  while (length > index) definePropertyModule$3.f(O, key = keys[index++], props[key]);
+  while (length > index) definePropertyModule$4.f(O, key = keys[index++], props[key]);
   return O;
 };
 
@@ -773,7 +773,7 @@ var WeakMap$1 = global$h.WeakMap;
 
 var weakMapBasicDetection = isCallable$k(WeakMap$1) && /native code/.test(String(WeakMap$1));
 
-var createPropertyDescriptor$4 = function (bitmap, value) {
+var createPropertyDescriptor$5 = function (bitmap, value) {
   return {
     enumerable: !(bitmap & 1),
     configurable: !(bitmap & 2),
@@ -782,12 +782,12 @@ var createPropertyDescriptor$4 = function (bitmap, value) {
   };
 };
 
-var DESCRIPTORS$c = descriptors;
-var definePropertyModule$2 = objectDefineProperty;
-var createPropertyDescriptor$3 = createPropertyDescriptor$4;
+var DESCRIPTORS$d = descriptors;
+var definePropertyModule$3 = objectDefineProperty;
+var createPropertyDescriptor$4 = createPropertyDescriptor$5;
 
-var createNonEnumerableProperty$9 = DESCRIPTORS$c ? function (object, key, value) {
-  return definePropertyModule$2.f(object, key, createPropertyDescriptor$3(1, value));
+var createNonEnumerableProperty$9 = DESCRIPTORS$d ? function (object, key, value) {
+  return definePropertyModule$3.f(object, key, createPropertyDescriptor$4(1, value));
 } : function (object, key, value) {
   object[key] = value;
   return object;
@@ -882,10 +882,10 @@ objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
   return !!descriptor && descriptor.enumerable;
 } : $propertyIsEnumerable;
 
-var DESCRIPTORS$b = descriptors;
+var DESCRIPTORS$c = descriptors;
 var call$h = functionCall;
 var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-var createPropertyDescriptor$2 = createPropertyDescriptor$4;
+var createPropertyDescriptor$3 = createPropertyDescriptor$5;
 var toIndexedObject$1 = toIndexedObject$5;
 var toPropertyKey = toPropertyKey$2;
 var hasOwn$a = hasOwnProperty_1;
@@ -896,28 +896,28 @@ var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
 // `Object.getOwnPropertyDescriptor` method
 // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-objectGetOwnPropertyDescriptor.f = DESCRIPTORS$b ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+objectGetOwnPropertyDescriptor.f = DESCRIPTORS$c ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
   O = toIndexedObject$1(O);
   P = toPropertyKey(P);
   if (IE8_DOM_DEFINE) try {
     return $getOwnPropertyDescriptor(O, P);
   } catch (error) { /* empty */ }
-  if (hasOwn$a(O, P)) return createPropertyDescriptor$2(!call$h(propertyIsEnumerableModule$1.f, O, P), O[P]);
+  if (hasOwn$a(O, P)) return createPropertyDescriptor$3(!call$h(propertyIsEnumerableModule$1.f, O, P), O[P]);
 };
 
 var makeBuiltIn$3 = {exports: {}};
 
-var DESCRIPTORS$a = descriptors;
+var DESCRIPTORS$b = descriptors;
 var hasOwn$9 = hasOwnProperty_1;
 
 var FunctionPrototype$1 = Function.prototype;
 // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-var getDescriptor = DESCRIPTORS$a && Object.getOwnPropertyDescriptor;
+var getDescriptor = DESCRIPTORS$b && Object.getOwnPropertyDescriptor;
 
 var EXISTS = hasOwn$9(FunctionPrototype$1, 'name');
 // additional protection from minified / mangled / dropped function names
 var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-var CONFIGURABLE = EXISTS && (!DESCRIPTORS$a || (DESCRIPTORS$a && getDescriptor(FunctionPrototype$1, 'name').configurable));
+var CONFIGURABLE = EXISTS && (!DESCRIPTORS$b || (DESCRIPTORS$b && getDescriptor(FunctionPrototype$1, 'name').configurable));
 
 var functionName = {
   EXISTS: EXISTS,
@@ -944,7 +944,7 @@ var uncurryThis$k = functionUncurryThis;
 var fails$k = fails$r;
 var isCallable$i = isCallable$q;
 var hasOwn$8 = hasOwnProperty_1;
-var DESCRIPTORS$9 = descriptors;
+var DESCRIPTORS$a = descriptors;
 var CONFIGURABLE_FUNCTION_NAME$1 = functionName.CONFIGURABLE;
 var inspectSource$2 = inspectSource$3;
 var InternalStateModule$2 = internalState;
@@ -958,7 +958,7 @@ var stringSlice$6 = uncurryThis$k(''.slice);
 var replace$7 = uncurryThis$k(''.replace);
 var join = uncurryThis$k([].join);
 
-var CONFIGURABLE_LENGTH = DESCRIPTORS$9 && !fails$k(function () {
+var CONFIGURABLE_LENGTH = DESCRIPTORS$a && !fails$k(function () {
   return defineProperty$5(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
 });
 
@@ -971,7 +971,7 @@ var makeBuiltIn$2 = makeBuiltIn$3.exports = function (value, name, options) {
   if (options && options.getter) name = 'get ' + name;
   if (options && options.setter) name = 'set ' + name;
   if (!hasOwn$8(value, 'name') || (CONFIGURABLE_FUNCTION_NAME$1 && value.name !== name)) {
-    if (DESCRIPTORS$9) defineProperty$5(value, 'name', { value: name, configurable: true });
+    if (DESCRIPTORS$a) defineProperty$5(value, 'name', { value: name, configurable: true });
     else value.name = name;
   }
   if (CONFIGURABLE_LENGTH && options && hasOwn$8(options, 'arity') && value.length !== options.arity) {
@@ -979,7 +979,7 @@ var makeBuiltIn$2 = makeBuiltIn$3.exports = function (value, name, options) {
   }
   try {
     if (options && hasOwn$8(options, 'constructor') && options.constructor) {
-      if (DESCRIPTORS$9) defineProperty$5(value, 'prototype', { writable: false });
+      if (DESCRIPTORS$a) defineProperty$5(value, 'prototype', { writable: false });
     // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
     } else if (value.prototype) value.prototype = undefined;
   } catch (error) { /* empty */ }
@@ -996,7 +996,7 @@ Function.prototype.toString = makeBuiltIn$2(function toString() {
 }, 'toString');
 
 var isCallable$h = isCallable$q;
-var definePropertyModule$1 = objectDefineProperty;
+var definePropertyModule$2 = objectDefineProperty;
 var makeBuiltIn$1 = makeBuiltIn$3.exports;
 var defineGlobalProperty$1 = defineGlobalProperty$3;
 
@@ -1014,7 +1014,7 @@ var defineBuiltIn$8 = function (O, key, value, options) {
       else if (O[key]) simple = true;
     } catch (error) { /* empty */ }
     if (simple) O[key] = value;
-    else definePropertyModule$1.f(O, key, {
+    else definePropertyModule$2.f(O, key, {
       value: value,
       enumerable: false,
       configurable: !options.nonConfigurable,
@@ -1060,11 +1060,11 @@ var ownKeys$1 = getBuiltIn$6('Reflect', 'ownKeys') || function ownKeys(it) {
 var hasOwn$7 = hasOwnProperty_1;
 var ownKeys = ownKeys$1;
 var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-var definePropertyModule = objectDefineProperty;
+var definePropertyModule$1 = objectDefineProperty;
 
 var copyConstructorProperties$3 = function (target, source, exceptions) {
   var keys = ownKeys(source);
-  var defineProperty = definePropertyModule.f;
+  var defineProperty = definePropertyModule$1.f;
   var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
   for (var i = 0; i < keys.length; i++) {
     var key = keys[i];
@@ -1244,7 +1244,7 @@ var setToStringTag$4 = function (target, TAG, STATIC) {
 
 var IteratorPrototype$1 = iteratorsCore.IteratorPrototype;
 var create$2 = objectCreate;
-var createPropertyDescriptor$1 = createPropertyDescriptor$4;
+var createPropertyDescriptor$2 = createPropertyDescriptor$5;
 var setToStringTag$3 = setToStringTag$4;
 var Iterators$4 = iterators;
 
@@ -1252,7 +1252,7 @@ var returnThis$1 = function () { return this; };
 
 var iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) {
   var TO_STRING_TAG = NAME + ' Iterator';
-  IteratorConstructor.prototype = create$2(IteratorPrototype$1, { next: createPropertyDescriptor$1(+!ENUMERABLE_NEXT, next) });
+  IteratorConstructor.prototype = create$2(IteratorPrototype$1, { next: createPropertyDescriptor$2(+!ENUMERABLE_NEXT, next) });
   setToStringTag$3(IteratorConstructor, TO_STRING_TAG, false);
   Iterators$4[TO_STRING_TAG] = returnThis$1;
   return IteratorConstructor;
@@ -1313,7 +1313,7 @@ var objectSetPrototypeOf = Object.setPrototypeOf || ('__proto__' in {} ? functio
   };
 }() : undefined);
 
-var $$k = _export;
+var $$l = _export;
 var call$g = functionCall;
 var FunctionName = functionName;
 var isCallable$d = isCallable$q;
@@ -1401,7 +1401,7 @@ var iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAUL
       if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) {
         defineBuiltIn$5(IterablePrototype, KEY, methods[KEY]);
       }
-    } else $$k({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
+    } else $$l({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
   }
 
   // define iterator
@@ -1426,7 +1426,7 @@ var InternalStateModule$1 = internalState;
 var defineProperty$3 = objectDefineProperty.f;
 var defineIterator = iteratorDefine;
 var createIterResultObject = createIterResultObject$1;
-var DESCRIPTORS$8 = descriptors;
+var DESCRIPTORS$9 = descriptors;
 
 var ARRAY_ITERATOR = 'Array Iterator';
 var setInternalState$1 = InternalStateModule$1.set;
@@ -1476,7 +1476,7 @@ addToUnscopables$2('values');
 addToUnscopables$2('entries');
 
 // V8 ~ Chrome 45- bug
-if (DESCRIPTORS$8 && values.name !== 'values') try {
+if (DESCRIPTORS$9 && values.name !== 'values') try {
   defineProperty$3(values, 'name', { value: 'values' });
 } catch (error) { /* empty */ }
 
@@ -1561,7 +1561,7 @@ for (var COLLECTION_NAME in DOMIterables) {
 
 handlePrototype(DOMTokenListPrototype, 'DOMTokenList');
 
-var DESCRIPTORS$7 = descriptors;
+var DESCRIPTORS$8 = descriptors;
 var uncurryThis$h = functionUncurryThis;
 var call$f = functionCall;
 var fails$g = fails$r;
@@ -1581,7 +1581,7 @@ var concat$1 = uncurryThis$h([].concat);
 // https://tc39.es/ecma262/#sec-object.assign
 var objectAssign = !$assign || fails$g(function () {
   // should have correct order of operations (Edge bug)
-  if (DESCRIPTORS$7 && $assign({ b: 1 }, $assign(defineProperty$2({}, 'a', {
+  if (DESCRIPTORS$8 && $assign({ b: 1 }, $assign(defineProperty$2({}, 'a', {
     enumerable: true,
     get: function () {
       defineProperty$2(this, 'b', {
@@ -1613,18 +1613,18 @@ var objectAssign = !$assign || fails$g(function () {
     var key;
     while (length > j) {
       key = keys[j++];
-      if (!DESCRIPTORS$7 || call$f(propertyIsEnumerable, S, key)) T[key] = S[key];
+      if (!DESCRIPTORS$8 || call$f(propertyIsEnumerable, S, key)) T[key] = S[key];
     }
   } return T;
 } : $assign;
 
-var $$j = _export;
+var $$k = _export;
 var assign = objectAssign;
 
 // `Object.assign` method
 // https://tc39.es/ecma262/#sec-object.assign
 // eslint-disable-next-line es/no-object-assign -- required for testing
-$$j({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+$$k({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
   assign: assign
 });
 
@@ -1634,7 +1634,7 @@ const FormFieldWrapper = styled.div(_t$9 || (_t$9 = _$9`
   margin-bottom: var(--goa-space-l);
 `));
 
-var $$i = _export;
+var $$j = _export;
 var toObject$3 = toObject$7;
 var lengthOfArrayLike$3 = lengthOfArrayLike$5;
 var toIntegerOrInfinity$3 = toIntegerOrInfinity$6;
@@ -1642,7 +1642,7 @@ var addToUnscopables$1 = addToUnscopables$3;
 
 // `Array.prototype.at` method
 // https://tc39.es/ecma262/#sec-array.prototype.at
-$$i({ target: 'Array', proto: true }, {
+$$j({ target: 'Array', proto: true }, {
   at: function at(index) {
     var O = toObject$3(this);
     var len = lengthOfArrayLike$3(O);
@@ -1891,18 +1891,18 @@ if (PATCH) {
 
 var regexpExec$2 = patchedExec;
 
-var $$h = _export;
+var $$i = _export;
 var exec$3 = regexpExec$2;
 
 // `RegExp.prototype.exec` method
 // https://tc39.es/ecma262/#sec-regexp.prototype.exec
-$$h({ target: 'RegExp', proto: true, forced: /./.exec !== exec$3 }, {
+$$i({ target: 'RegExp', proto: true, forced: /./.exec !== exec$3 }, {
   exec: exec$3
 });
 
 // TODO: Remove from `core-js@4` since it's moved to entry points
 
-var $$g = _export;
+var $$h = _export;
 var call$d = functionCall;
 var isCallable$b = isCallable$q;
 var anObject$9 = anObject$f;
@@ -1922,7 +1922,7 @@ var nativeTest = /./.test;
 
 // `RegExp.prototype.test` method
 // https://tc39.es/ecma262/#sec-regexp.prototype.test
-$$g({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, {
+$$h({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, {
   test: function (S) {
     var R = anObject$9(this);
     var string = toString$b(S);
@@ -1974,7 +1974,7 @@ if (NOT_GENERIC || INCORRECT_NAME) {
   }, { unsafe: true });
 }
 
-var $$f = _export;
+var $$g = _export;
 var uncurryThis$f = functionUncurryThis;
 var requireObjectCoercible$6 = requireObjectCoercible$a;
 var toIntegerOrInfinity$2 = toIntegerOrInfinity$6;
@@ -1990,7 +1990,7 @@ var FORCED$3 = fails$b(function () {
 
 // `String.prototype.at` method
 // https://tc39.es/ecma262/#sec-string.prototype.at
-$$f({ target: 'String', proto: true, forced: FORCED$3 }, {
+$$g({ target: 'String', proto: true, forced: FORCED$3 }, {
   at: function at(index) {
     var S = toString$a(requireObjectCoercible$6(this));
     var len = S.length;
@@ -2810,7 +2810,7 @@ var isArray$2 = Array.isArray || function isArray(argument) {
   return classof$6(argument) === 'Array';
 };
 
-var DESCRIPTORS$6 = descriptors;
+var DESCRIPTORS$7 = descriptors;
 var isArray$1 = isArray$2;
 
 var $TypeError$a = TypeError;
@@ -2818,7 +2818,7 @@ var $TypeError$a = TypeError;
 var getOwnPropertyDescriptor$2 = Object.getOwnPropertyDescriptor;
 
 // Safari < 13 does not throw an error in this case
-var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS$6 && !function () {
+var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS$7 && !function () {
   // makes no sense without proper strict mode support
   if (this !== undefined) return true;
   try {
@@ -2845,7 +2845,7 @@ var doesNotExceedSafeInteger$1 = function (it) {
   return it;
 };
 
-var $$e = _export;
+var $$f = _export;
 var toObject$1 = toObject$7;
 var lengthOfArrayLike$2 = lengthOfArrayLike$5;
 var setArrayLength = arraySetLength;
@@ -2871,7 +2871,7 @@ var FORCED$2 = INCORRECT_TO_LENGTH || !properErrorOnNonWritableLength();
 
 // `Array.prototype.push` method
 // https://tc39.es/ecma262/#sec-array.prototype.push
-$$e({ target: 'Array', proto: true, arity: 1, forced: FORCED$2 }, {
+$$f({ 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$1(this);
@@ -2922,7 +2922,7 @@ function registerReducer(state, action) {
   return state;
 }
 
-var $$d = _export;
+var $$e = _export;
 var $includes = arrayIncludes.includes;
 var fails$7 = fails$r;
 var addToUnscopables = addToUnscopables$3;
@@ -2935,7 +2935,7 @@ var BROKEN_ON_SPARSE = fails$7(function () {
 
 // `Array.prototype.includes` method
 // https://tc39.es/ecma262/#sec-array.prototype.includes
-$$d({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+$$e({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
   includes: function includes(el /* , fromIndex = 0 */) {
     return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
   }
@@ -2978,7 +2978,7 @@ var getJsonReplacerFunction = function (replacer) {
   };
 };
 
-var $$c = _export;
+var $$d = _export;
 var getBuiltIn$5 = getBuiltIn$9;
 var apply$2 = functionApply;
 var call$7 = functionCall;
@@ -3041,7 +3041,7 @@ var fixIllFormed = function (match, offset, string) {
 if ($stringify) {
   // `JSON.stringify` method
   // https://tc39.es/ecma262/#sec-json.stringify
-  $$c({ target: 'JSON', stat: true, arity: 3, forced: WRONG_SYMBOLS_CONVERSION || ILL_FORMED_UNICODE }, {
+  $$d({ 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);
@@ -3090,7 +3090,7 @@ var correctIsRegexpLogic = function (METHOD_NAME) {
   } return false;
 };
 
-var $$b = _export;
+var $$c = _export;
 var uncurryThis$8 = functionUncurryThis;
 var notARegExp$1 = notARegexp;
 var requireObjectCoercible$3 = requireObjectCoercible$a;
@@ -3101,7 +3101,7 @@ var stringIndexOf$1 = uncurryThis$8(''.indexOf);
 
 // `String.prototype.includes` method
 // https://tc39.es/ecma262/#sec-string.prototype.includes
-$$b({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, {
+$$c({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, {
   includes: function includes(searchString /* , position = 0 */) {
     return !!~stringIndexOf$1(
       toString$6(requireObjectCoercible$3(this)),
@@ -3194,14 +3194,14 @@ var defineBuiltInAccessor$3 = function (target, name, descriptor) {
 var getBuiltIn$4 = getBuiltIn$9;
 var defineBuiltInAccessor$2 = defineBuiltInAccessor$3;
 var wellKnownSymbol$6 = wellKnownSymbol$j;
-var DESCRIPTORS$5 = descriptors;
+var DESCRIPTORS$6 = descriptors;
 
 var SPECIES$2 = wellKnownSymbol$6('species');
 
 var setSpecies$2 = function (CONSTRUCTOR_NAME) {
   var Constructor = getBuiltIn$4(CONSTRUCTOR_NAME);
 
-  if (DESCRIPTORS$5 && Constructor && !Constructor[SPECIES$2]) {
+  if (DESCRIPTORS$6 && Constructor && !Constructor[SPECIES$2]) {
     defineBuiltInAccessor$2(Constructor, SPECIES$2, {
       configurable: true,
       get: function () { return this; }
@@ -3209,7 +3209,7 @@ var setSpecies$2 = function (CONSTRUCTOR_NAME) {
   }
 };
 
-var DESCRIPTORS$4 = descriptors;
+var DESCRIPTORS$5 = descriptors;
 var global$a = global$o;
 var uncurryThis$7 = functionUncurryThis;
 var isForced$1 = isForced_1;
@@ -3252,7 +3252,7 @@ var CORRECT_NEW = new NativeRegExp(re1) !== re1;
 var MISSED_STICKY = stickyHelpers.MISSED_STICKY;
 var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y;
 
-var BASE_FORCED = DESCRIPTORS$4 &&
+var BASE_FORCED = DESCRIPTORS$5 &&
   (!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
@@ -3401,7 +3401,7 @@ if (isForced$1('RegExp', BASE_FORCED)) {
 // https://tc39.es/ecma262/#sec-get-regexp-@@species
 setSpecies$1('RegExp');
 
-var DESCRIPTORS$3 = descriptors;
+var DESCRIPTORS$4 = descriptors;
 var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll;
 var classof$3 = classofRaw$2;
 var defineBuiltInAccessor$1 = defineBuiltInAccessor$3;
@@ -3412,7 +3412,7 @@ var $TypeError$7 = TypeError;
 
 // `RegExp.prototype.dotAll` getter
 // https://tc39.es/ecma262/#sec-get-regexp.prototype.dotall
-if (DESCRIPTORS$3 && UNSUPPORTED_DOT_ALL) {
+if (DESCRIPTORS$4 && UNSUPPORTED_DOT_ALL) {
   defineBuiltInAccessor$1(RegExpPrototype, 'dotAll', {
     configurable: true,
     get: function dotAll() {
@@ -3680,8 +3680,8 @@ const GoAInputBaseControl = props => {
   });
 };
 
-var $$a = _export;
-var DESCRIPTORS$2 = descriptors;
+var $$b = _export;
+var DESCRIPTORS$3 = descriptors;
 var global$9 = global$o;
 var uncurryThis$6 = functionUncurryThis;
 var hasOwn$2 = hasOwnProperty_1;
@@ -3694,7 +3694,7 @@ var copyConstructorProperties$1 = copyConstructorProperties$3;
 var NativeSymbol = global$9.Symbol;
 var SymbolPrototype = NativeSymbol && NativeSymbol.prototype;
 
-if (DESCRIPTORS$2 && isCallable$5(NativeSymbol) && (!('description' in SymbolPrototype) ||
+if (DESCRIPTORS$3 && isCallable$5(NativeSymbol) && (!('description' in SymbolPrototype) ||
   // Safari 12 bug
   NativeSymbol().description !== undefined
 )) {
@@ -3732,7 +3732,7 @@ if (DESCRIPTORS$2 && isCallable$5(NativeSymbol) && (!('description' in SymbolPro
     }
   });
 
-  $$a({ global: true, constructor: true, forced: true }, {
+  $$b({ global: true, constructor: true, forced: true }, {
     Symbol: SymbolWrapper
   });
 }
@@ -4895,13 +4895,13 @@ var errorStackClear = function (stack, dropEntries) {
 };
 
 var fails$4 = fails$r;
-var createPropertyDescriptor = createPropertyDescriptor$4;
+var createPropertyDescriptor$1 = createPropertyDescriptor$5;
 
 var errorStackInstallable = !fails$4(function () {
   var error = new Error('a');
   if (!('stack' in error)) return true;
   // eslint-disable-next-line es/no-object-defineproperty -- safe
-  Object.defineProperty(error, 'stack', createPropertyDescriptor(1, 7));
+  Object.defineProperty(error, 'stack', createPropertyDescriptor$1(1, 7));
   return error.stack !== 7;
 });
 
@@ -4930,7 +4930,7 @@ var inheritIfRequired = inheritIfRequired$2;
 var normalizeStringArgument = normalizeStringArgument$1;
 var installErrorCause = installErrorCause$1;
 var installErrorStack = errorStackInstall;
-var DESCRIPTORS$1 = descriptors;
+var DESCRIPTORS$2 = descriptors;
 
 var wrapErrorConstructorWithCause$1 = function (FULL_NAME, wrapper, FORCED, IS_AGGREGATE_ERROR) {
   var STACK_TRACE_LIMIT = 'stackTraceLimit';
@@ -4965,7 +4965,7 @@ var wrapErrorConstructorWithCause$1 = function (FULL_NAME, wrapper, FORCED, IS_A
   if (ERROR_NAME !== 'Error') {
     if (setPrototypeOf$1) setPrototypeOf$1(WrappedError, BaseError);
     else copyConstructorProperties(WrappedError, BaseError, { name: true });
-  } else if (DESCRIPTORS$1 && STACK_TRACE_LIMIT in OriginalError) {
+  } else if (DESCRIPTORS$2 && STACK_TRACE_LIMIT in OriginalError) {
     proxyAccessor(WrappedError, OriginalError, STACK_TRACE_LIMIT);
     proxyAccessor(WrappedError, OriginalError, 'prepareStackTrace');
   }
@@ -4984,7 +4984,7 @@ var wrapErrorConstructorWithCause$1 = function (FULL_NAME, wrapper, FORCED, IS_A
 };
 
 /* eslint-disable no-unused-vars -- required for functions `.length` */
-var $$9 = _export;
+var $$a = _export;
 var global$8 = global$o;
 var apply$1 = functionApply;
 var wrapErrorConstructorWithCause = wrapErrorConstructorWithCause$1;
@@ -4998,14 +4998,14 @@ var FORCED$1 = new Error('e', { cause: 7 }).cause !== 7;
 var exportGlobalErrorCauseWrapper = function (ERROR_NAME, wrapper) {
   var O = {};
   O[ERROR_NAME] = wrapErrorConstructorWithCause(ERROR_NAME, wrapper, FORCED$1);
-  $$9({ global: true, constructor: true, arity: 1, forced: FORCED$1 }, O);
+  $$a({ global: true, constructor: true, arity: 1, forced: FORCED$1 }, O);
 };
 
 var exportWebAssemblyErrorCauseWrapper = function (ERROR_NAME, wrapper) {
   if (WebAssembly && WebAssembly[ERROR_NAME]) {
     var O = {};
     O[ERROR_NAME] = wrapErrorConstructorWithCause(WEB_ASSEMBLY + '.' + ERROR_NAME, wrapper, FORCED$1);
-    $$9({ target: WEB_ASSEMBLY, stat: true, constructor: true, arity: 1, forced: FORCED$1 }, O);
+    $$a({ target: WEB_ASSEMBLY, stat: true, constructor: true, arity: 1, forced: FORCED$1 }, O);
   }
 };
 
@@ -5787,36 +5787,185 @@ const FileUploaderStyle = styled.div(_t3$1 || (_t3$1 = _$3`
 
 const FileUploaderTester = rankWith(3, and(schemaTypeIs('string'), formatIs('file-urn')));
 
-const ObjectArrayToolBar = /*#__PURE__*/React.memo(function TableToolbar({
-  numColumns,
-  errors,
-  label,
-  path,
-  addItem,
-  schema,
-  enabled,
-  translations,
-  rootSchema,
-  uischema
-}) {
-  var _a, _b, _c, _d;
-  const buttonPosition = ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.addButtonPosition) || 'left';
-  const arrayLabel = getLabelText(uischema.scope, label);
-  return jsx(Fragment, {
-    children: jsx("div", {
-      style: {
-        textAlign: buttonPosition
-      },
-      children: jsx(GoAButton, {
-        disabled: !enabled,
-        testId: `object-array-toolbar-${label}`,
-        "aria-label": translations.addAriaLabel,
-        onClick: addItem(path, createDefaultValue(schema, rootSchema)),
-        type: (_c = (_b = uischema.options) === null || _b === void 0 ? void 0 : _b.addButtonType) !== null && _c !== void 0 ? _c : 'primary',
-        children: ((_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.addButtonText) || capitalizeFirstLetter(`Add ${arrayLabel}`)
-      })
-    })
-  });
+var classofRaw = classofRaw$2;
+var uncurryThis$4 = functionUncurryThis;
+
+var functionUncurryThisClause = function (fn) {
+  // Nashorn bug:
+  //   https://github.com/zloirock/core-js/issues/1128
+  //   https://github.com/zloirock/core-js/issues/1130
+  if (classofRaw(fn) === 'Function') return uncurryThis$4(fn);
+};
+
+var uncurryThis$3 = functionUncurryThisClause;
+var aCallable$6 = aCallable$9;
+var NATIVE_BIND = functionBindNative;
+
+var bind$4 = uncurryThis$3(uncurryThis$3.bind);
+
+// optional / simple context binding
+var functionBindContext = function (fn, that) {
+  aCallable$6(fn);
+  return that === undefined ? fn : NATIVE_BIND ? bind$4(fn, that) : function (/* ...args */) {
+    return fn.apply(that, arguments);
+  };
+};
+
+var wellKnownSymbol$4 = wellKnownSymbol$j;
+var Iterators$1 = iterators;
+
+var ITERATOR$2 = wellKnownSymbol$4('iterator');
+var ArrayPrototype = Array.prototype;
+
+// check on default Array iterator
+var isArrayIteratorMethod$1 = function (it) {
+  return it !== undefined && (Iterators$1.Array === it || ArrayPrototype[ITERATOR$2] === it);
+};
+
+var classof$2 = classof$9;
+var getMethod$1 = getMethod$5;
+var isNullOrUndefined$1 = isNullOrUndefined$6;
+var Iterators = iterators;
+var wellKnownSymbol$3 = wellKnownSymbol$j;
+
+var ITERATOR$1 = wellKnownSymbol$3('iterator');
+
+var getIteratorMethod$2 = function (it) {
+  if (!isNullOrUndefined$1(it)) return getMethod$1(it, ITERATOR$1)
+    || getMethod$1(it, '@@iterator')
+    || Iterators[classof$2(it)];
+};
+
+var call$5 = functionCall;
+var aCallable$5 = aCallable$9;
+var anObject$4 = anObject$f;
+var tryToString$2 = tryToString$4;
+var getIteratorMethod$1 = getIteratorMethod$2;
+
+var $TypeError$6 = TypeError;
+
+var getIterator$1 = function (argument, usingIterator) {
+  var iteratorMethod = arguments.length < 2 ? getIteratorMethod$1(argument) : usingIterator;
+  if (aCallable$5(iteratorMethod)) return anObject$4(call$5(iteratorMethod, argument));
+  throw new $TypeError$6(tryToString$2(argument) + ' is not iterable');
+};
+
+var call$4 = functionCall;
+var anObject$3 = anObject$f;
+var getMethod = getMethod$5;
+
+var iteratorClose$1 = function (iterator, kind, value) {
+  var innerResult, innerError;
+  anObject$3(iterator);
+  try {
+    innerResult = getMethod(iterator, 'return');
+    if (!innerResult) {
+      if (kind === 'throw') throw value;
+      return value;
+    }
+    innerResult = call$4(innerResult, iterator);
+  } catch (error) {
+    innerError = true;
+    innerResult = error;
+  }
+  if (kind === 'throw') throw value;
+  if (innerError) throw innerResult;
+  anObject$3(innerResult);
+  return value;
+};
+
+var bind$3 = functionBindContext;
+var call$3 = functionCall;
+var anObject$2 = anObject$f;
+var tryToString$1 = tryToString$4;
+var isArrayIteratorMethod = isArrayIteratorMethod$1;
+var lengthOfArrayLike$1 = lengthOfArrayLike$5;
+var isPrototypeOf$1 = objectIsPrototypeOf;
+var getIterator = getIterator$1;
+var getIteratorMethod = getIteratorMethod$2;
+var iteratorClose = iteratorClose$1;
+
+var $TypeError$5 = TypeError;
+
+var Result = function (stopped, result) {
+  this.stopped = stopped;
+  this.result = result;
+};
+
+var ResultPrototype = Result.prototype;
+
+var iterate$3 = 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$3(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$2(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$5(tryToString$1(iterable) + ' is not iterable');
+    // optimisation for array iterators
+    if (isArrayIteratorMethod(iterFn)) {
+      for (index = 0, length = lengthOfArrayLike$1(iterable); length > index; index++) {
+        result = callFn(iterable[index]);
+        if (result && isPrototypeOf$1(ResultPrototype, result)) return result;
+      } return new Result(false);
+    }
+    iterator = getIterator(iterable, iterFn);
+  }
+
+  next = IS_RECORD ? iterable.next : iterator.next;
+  while (!(step = call$3(next, iterator)).done) {
+    try {
+      result = callFn(step.value);
+    } catch (error) {
+      iteratorClose(iterator, 'throw', error);
+    }
+    if (typeof result == 'object' && result && isPrototypeOf$1(ResultPrototype, result)) return result;
+  } return new Result(false);
+};
+
+var DESCRIPTORS$1 = descriptors;
+var definePropertyModule = objectDefineProperty;
+var createPropertyDescriptor = createPropertyDescriptor$5;
+
+var createProperty$1 = function (object, key, value) {
+  if (DESCRIPTORS$1) definePropertyModule.f(object, key, createPropertyDescriptor(0, value));
+  else object[key] = value;
+};
+
+var $$9 = _export;
+var iterate$2 = iterate$3;
+var createProperty = createProperty$1;
+
+// `Object.fromEntries` method
+// https://github.com/tc39/proposal-object-from-entries
+$$9({ target: 'Object', stat: true }, {
+  fromEntries: function fromEntries(iterable) {
+    var obj = {};
+    iterate$2(iterable, function (k, v) {
+      createProperty(obj, k, v);
+    }, { AS_ENTRIES: true });
+    return obj;
+  }
 });
 
 let _$2 = t => t,
@@ -5831,82 +5980,234 @@ let _$2 = t => t,
   _t9,
   _t10,
   _t11,
-  _t12;
+  _t12,
+  _t13;
 const DeleteDialogContent = styled.div(_t$2 || (_t$2 = _$2`
   margin-bottom: var(--goa-space-m);
 `));
-const ToolBarHeader = styled.div(_t2$1 || (_t2$1 = _$2`
+const NonEmptyCellStyle = styled.div(_t2$1 || (_t2$1 = _$2`
+  goa-table thead th {
+    background-color: #000:
+  }
+`));
+const ToolBarHeader = styled.div(_t3 || (_t3 = _$2`
   margin-bottom: var(--goa-space-l);
 `));
-const ObjectArrayTitle = styled.h2(_t3 || (_t3 = _$2`
+const ObjectArrayTitle = styled.h2(_t4 || (_t4 = _$2`
   margin-bottom: var(--goa-space-l);
 `));
-const TextCenter = styled.div(_t4 || (_t4 = _$2`
+const TextCenter = styled.div(_t5 || (_t5 = _$2`
   text-align: center;
 `));
-const SideMenuItem = styled.div(_t5 || (_t5 = _$2`
+const SideMenuItem = styled.div(_t6 || (_t6 = _$2`
   &:hover {
     background: #f1f1f1;
   }
 `));
-const RowFlex = styled.div(_t6 || (_t6 = _$2`
+const RowFlex = styled.div(_t7 || (_t7 = _$2`
   display: flex;
   align-items: stretch;
 `));
-const RowFlexMenu = styled.div(_t7 || (_t7 = _$2`
+const RowFlexMenu = styled.div(_t8 || (_t8 = _$2`
   display: flex;
   flex-direction: row;
   border-bottom: 1px solid #dcdcdc;
 `));
-const FlexTabs = styled.div(_t8 || (_t8 = _$2`
+const FlexTabs = styled.div(_t9 || (_t9 = _$2`
   flex-direction: column;
   flex: 1;
   overflow-y: auto !important;
   margin-right: 1.5rem;
 `));
-const FlexForm = styled.div(_t9 || (_t9 = _$2`
+const FlexForm = styled.div(_t10 || (_t10 = _$2`
   flex-direction: column;
   margin: 1.5rem 0;
   flex: 3;
 `));
-const TabName = styled.div(_t10 || (_t10 = _$2`
+const TabName = styled.div(_t11 || (_t11 = _$2`
   margin: 1rem 0 1rem 1rem;
   font-weight: 700;
 `));
-const Trash = styled.div(_t11 || (_t11 = _$2`
+const Trash = styled.div(_t12 || (_t12 = _$2`
   margin: 0.75rem 1.25rem 0.75rem 0.75rem;
   margin-left: auto;
 `));
-const ListContainer = styled.div(_t12 || (_t12 = _$2`
+const ListContainer = styled.div(_t13 || (_t13 = _$2`
   padding: 0 1.5rem 0 0;
   border: 1px solid #dcdcdc;
 `));
 
-// eslint-disable-next-line
-const extractScopesFromUISchema$1 = uischema => {
-  var _a;
-  const scopes = [];
-  if (uischema === null || uischema === void 0 ? void 0 : uischema.elements) {
-    // eslint-disable-next-line
-    (_a = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _a === void 0 ? void 0 : _a.forEach(element => {
-      var _a;
-      if (element === null || element === void 0 ? void 0 : element.elements) {
-        // eslint-disable-next-line
-        (_a = element === null || element === void 0 ? void 0 : element.elements) === null || _a === void 0 ? void 0 : _a.forEach(internalElement => {
-          if (internalElement === null || internalElement === void 0 ? void 0 : internalElement.scope) {
-            scopes.push(internalElement === null || internalElement === void 0 ? void 0 : internalElement.scope);
-          }
-        });
-      } else {
-        if (element === null || element === void 0 ? void 0 : element.scope) {
-          scopes.push(element === null || element === void 0 ? void 0 : element.scope);
-        }
-      }
+const DeleteDialog = /*#__PURE__*/React.memo(function DeleteDialog({
+  open,
+  onConfirm,
+  onCancel,
+  title,
+  message
+}) {
+  return jsxs(GoAModal, {
+    open: open,
+    testId: "object-array-modal",
+    heading: title,
+    children: [jsx(DeleteDialogContent, {
+      "data-testid": "object-array-modal-content",
+      children: message
+    }), jsxs(GoAButtonGroup, {
+      alignment: "end",
+      children: [jsx(GoAButton, {
+        type: "secondary",
+        testId: "object-array-modal-button",
+        onClick: () => {
+          onCancel();
+        },
+        children: "Cancel"
+      }), jsx(GoAButton, {
+        type: "primary",
+        variant: "destructive",
+        testId: "object-array-confirm-button",
+        onClick: () => {
+          onConfirm();
+        },
+        children: "Delete"
+      })]
+    })]
+  }, 1);
+});
+
+const ObjectArrayToolBar = /*#__PURE__*/React.memo(function TableToolbar({
+  label,
+  path,
+  addItem,
+  schema,
+  enabled,
+  translations,
+  rootSchema,
+  uischema
+}) {
+  var _a, _b, _c, _d;
+  const buttonPosition = ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.addButtonPosition) || 'left';
+  const arrayLabel = getLabelText(uischema.scope, label);
+  return jsx(Fragment, {
+    children: jsx("div", {
+      style: {
+        textAlign: buttonPosition
+      },
+      children: jsx(GoAButton, {
+        disabled: !enabled,
+        testId: `object-array-toolbar-${label}`,
+        "aria-label": translations.addAriaLabel,
+        onClick: addItem(path, createDefaultValue(schema, rootSchema)),
+        type: (_c = (_b = uischema.options) === null || _b === void 0 ? void 0 : _b.addButtonType) !== null && _c !== void 0 ? _c : 'primary',
+        children: ((_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.addButtonText) || capitalizeFirstLetter(`Add ${arrayLabel}`)
+      })
+    })
+  });
+});
+
+const ADD_DATA_ACTION = 'jsonforms/register/add_data_action';
+const SET_DATA_ACTION = 'jsonforms/register/set_data_action';
+const INCREMENT_ACTION = 'jsonforms/register/increment_action';
+const DELETE_ACTION = 'jsonforms/register/delete_action';
+const initialState = {
+  categories: {}
+};
+
+function objectListReducer(state, action) {
+  switch (action.type) {
+    case ADD_DATA_ACTION:
+      {
+        //ok so we're assuming we're already getting the updated category data
+        const {
+          categories
+        } = state;
+        const {
+          name,
+          category
+        } = action.payload;
+        const newCategories = Object.assign({}, categories);
+        newCategories[name].data = category;
+        return Object.assign(Object.assign({}, state), {
+          categories: newCategories
+        });
+      }
+    case SET_DATA_ACTION:
+      {
+        const CategoriesStateData = action.payload;
+        return Object.assign(Object.assign({}, state), {
+          categories: CategoriesStateData
+        });
+      }
+    case INCREMENT_ACTION:
+      {
+        const {
+          categories
+        } = state;
+        const name = action.payload;
+        const newCategories = Object.assign({}, categories);
+        // Assuming you want to increment the count of a category:
+        if (newCategories[name]) {
+          const updatedCategory = Object.assign(Object.assign({}, categories[name]), {
+            count: (categories[name].count || 0) + 1
+          });
+          return Object.assign(Object.assign({}, state), {
+            categories: Object.assign(Object.assign({}, categories), {
+              [name]: updatedCategory
+            })
+          });
+        } else {
+          newCategories[name] = {
+            count: 1,
+            data: {}
+          };
+        }
+        return Object.assign(Object.assign({}, state), {
+          categories: newCategories
+        });
+      }
+    case DELETE_ACTION:
+      {
+        const {
+          name,
+          category
+        } = action.payload;
+        const {
+          categories
+        } = state;
+        const newCategories = Object.assign({}, categories);
+        newCategories[name] = category;
+        return Object.assign(Object.assign({}, state), {
+          categories: newCategories
+        });
+      }
+    default:
+      return state;
+  }
+}
+
+// eslint-disable-next-line
+const extractScopesFromUISchema$1 = uischema => {
+  var _a;
+  const scopes = [];
+  if (uischema === null || uischema === void 0 ? void 0 : uischema.elements) {
+    // eslint-disable-next-line
+    (_a = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _a === void 0 ? void 0 : _a.forEach(element => {
+      var _a;
+      if (element === null || element === void 0 ? void 0 : element.elements) {
+        // eslint-disable-next-line
+        (_a = element === null || element === void 0 ? void 0 : element.elements) === null || _a === void 0 ? void 0 : _a.forEach(internalElement => {
+          if (internalElement === null || internalElement === void 0 ? void 0 : internalElement.scope) {
+            scopes.push(internalElement === null || internalElement === void 0 ? void 0 : internalElement.scope);
+          }
+        });
+      } else {
+        if (element === null || element === void 0 ? void 0 : element.scope) {
+          scopes.push(element === null || element === void 0 ? void 0 : element.scope);
+        }
+      }
     });
   }
   return scopes;
 };
-const GenerateRows$1 = (Cell, schema, rowPath, enabled, cells, uischema, isInReview) => {
+const GenerateRows$1 = (Cell, schema, rowPath, enabled, openDeleteDialog, handleChange, cells, uischema, isInReview, count, data) => {
   if (schema.type === 'object') {
     const props = {
       schema,
@@ -5914,19 +6215,34 @@ const GenerateRows$1 = (Cell, schema, rowPath, enabled, cells, uischema, isInRev
       enabled,
       cells,
       uischema,
-      isInReview
+      isInReview,
+      openDeleteDialog,
+      data,
+      handleChange
     };
-    return jsx(Cell, Object.assign({}, props));
+    return jsxs("div", {
+      style: {
+        display: 'flex',
+        flexDirection: 'column'
+      },
+      children: [jsx(Cell, Object.assign({}, props, {
+        count: count || 0
+      })), "d"]
+    });
   } else {
-    // primitives
     const props = {
       schema,
       rowPath,
       cellPath: rowPath,
       enabled,
-      isInReview
+      isInReview,
+      openDeleteDialog,
+      handleChange,
+      data
     };
-    return jsx(Cell, Object.assign({}, props), rowPath);
+    return jsx(Cell, Object.assign({}, props, {
+      count: count || 0
+    }), rowPath);
   }
 };
 const getValidColumnProps$1 = scopedSchema => {
@@ -5952,7 +6268,6 @@ const EmptyList$1 = ({
 });
 const ctxToNonEmptyCellProps$1 = (ctx, ownProps) => {
   var _a;
-  ownProps.rowPath + (ownProps.schema.type === 'object' ? '.' + ownProps.propName : '');
   const errors = '';
   return {
     uischema: ownProps.uischema,
@@ -5962,21 +6277,24 @@ const ctxToNonEmptyCellProps$1 = (ctx, ownProps) => {
     errors,
     enabled: ownProps.enabled,
     cells: ownProps.cells || ctx.cells,
-    renderers: ownProps.renderers || ctx.renderers
+    renderers: ownProps.renderers || ctx.renderers,
+    handleChange: ownProps.handleChange
   };
 };
 const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellComponent(props) {
-  var _a, _b;
+  var _a;
   const {
     schema,
-    errors,
     enabled,
     renderers,
     cells,
     rowPath,
-    isValid,
     uischema,
-    isInReview
+    isInReview,
+    data,
+    count,
+    openDeleteDialog,
+    handleChange
   } = props;
   const propNames = getValidColumnProps$1(schema);
   const propScopes = (uischema === null || uischema === void 0 ? void 0 : uischema.scope) ? propNames.map(name => {
@@ -5993,7 +6311,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
    */
   const getFirstLayoutType = () => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    let defaultType = 'VerticalLayout';
+    let defaultType = 'HorizontalLayout';
     if ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.defaultType) return (_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.defaultType;
     if (((_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.detail) && ((_f = (_e = (_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.detail) === null || _e === void 0 ? void 0 : _e.elements) === null || _f === void 0 ? void 0 : _f.length) > 0) {
       defaultType = (_h = (_g = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _g === void 0 ? void 0 : _g.detail) === null || _h === void 0 ? void 0 : _h.elements.at(0).type;
@@ -6003,7 +6321,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
   /* Create default elements for scope not defined in the uischema
    * future work: merge the options
    */
-  const uiSchemaElementsForNotDefined = {
+  ({
     type: getFirstLayoutType(),
     elements: scopesNotInElements.map(scope => {
       return {
@@ -6014,8 +6332,10 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
         }
       };
     })
-  };
-  return jsxs(Fragment, {
+  });
+  const properties = (schema === null || schema === void 0 ? void 0 : schema.items) && 'properties' in schema.items && schema.items.properties || {};
+  const title = rowPath.split('.')[0];
+  return jsxs(NonEmptyCellStyle, {
     children: [
     // eslint-disable-next-line
     (_a = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _a === void 0 ? void 0 : _a.map(element => {
@@ -6028,47 +6348,99 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
         renderers: isInReview ? GoAReviewRenderers : renderers,
         cells: cells
       }, rowPath);
-    }), ((_b = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _b === void 0 ? void 0 : _b.length) > 0 && jsx(JsonFormsDispatch, {
-      schema: schema,
-      uischema: uiSchemaElementsForNotDefined,
-      path: rowPath,
-      enabled: enabled,
-      renderers: isInReview ? GoAReviewRenderers : renderers,
-      cells: cells
+    }), Object.keys(properties).length > 0 && jsxs(GoATable, {
+      width: "100%",
+      children: [jsx("thead", {
+        children: jsxs("tr", {
+          children: [Object.keys(properties).map((key, index) => {
+            return jsx("th", {
+              children: jsx("p", {
+                children: key
+              })
+            }, index);
+          }), isInReview !== true && jsx("th", {
+            children: jsx("p", {
+              children: "Actions"
+            })
+          })]
+        }, 0)
+      }), jsx("tbody", {
+        children: range(count || 0).map((num, i) => {
+          return jsxs("tr", {
+            children: [Object.keys(properties).map((element, ix) => {
+              const dataObject = properties[element];
+              const schemaName = element;
+              return jsx("td", {
+                children: isInReview ? jsx("div", {
+                  "data-testid": `#/properties/${schemaName}-input-${i}-review`,
+                  children: data && data[num] ? data[num][element] : ''
+                }) : jsx("div", {
+                  children: jsx(GoAInput, {
+                    type: dataObject.type === 'number' ? 'number' : 'text',
+                    id: schemaName,
+                    name: schemaName,
+                    value: data && data[num] ? data[num][element] : '',
+                    testId: `#/properties/${schemaName}-input-${i}`,
+                    onChange: (name, value) => {
+                      handleChange(title, {
+                        [num]: {
+                          [name]: value
+                        }
+                      });
+                    },
+                    "aria-label": schemaName,
+                    width: "100%"
+                  })
+                })
+              }, ix);
+            }), jsx("td", {
+              children: isInReview !== true && jsx(GoAIconButton, {
+                icon: "trash",
+                "aria-label": `remove-element-${num}`,
+                onClick: () => openDeleteDialog(num)
+              })
+            })]
+          }, i);
+        })
+      })]
     })]
   });
 });
 const NonEmptyCell$1 = ownProps => {
+  const data = ownProps.data || {};
   const ctx = useJsonForms();
-  const emptyCellProps = ctxToNonEmptyCellProps$1(ctx, ownProps);
+  const emptyCellProps = ctxToNonEmptyCellProps$1(ctx, Object.assign(Object.assign({}, ownProps), {
+    data
+  }));
   const isValid = isEmpty$1(emptyCellProps.errors);
   return jsx(NonEmptyCellComponent$1, Object.assign({}, emptyCellProps, {
+    handleChange: ownProps === null || ownProps === void 0 ? void 0 : ownProps.handleChange,
     isInReview: ownProps === null || ownProps === void 0 ? void 0 : ownProps.isInReview,
-    isValid: isValid
+    isValid: isValid,
+    openDeleteDialog: ownProps === null || ownProps === void 0 ? void 0 : ownProps.openDeleteDialog,
+    data: data,
+    count: ownProps === null || ownProps === void 0 ? void 0 : ownProps.count
   }));
 };
 const NonEmptyRowComponent$1 = ({
   childPath,
   schema,
-  rowIndex,
   openDeleteDialog,
   enabled,
   cells,
-  path,
-  translations,
   uischema,
-  isInReview
+  isInReview,
+  data,
+  count,
+  handleChange
 }) => {
   return jsx("div", {
-    children: enabled ? jsxs(GoAContainer, {
-      children: [isInReview !== true && jsx(GoAGrid, {
-        minChildWidth: "30ch",
-        children: jsx(GoAIconButton, {
-          icon: "trash",
-          "aria-label": translations.removeAriaLabel,
-          onClick: () => openDeleteDialog(childPath, rowIndex)
+    children: enabled ? jsx(GoAContainer, {
+      children: jsx("div", {
+        children: jsx("div", {
+          children: GenerateRows$1(NonEmptyCell$1, schema, childPath, enabled, openDeleteDialog, handleChange, cells, uischema, isInReview, count, data)
         })
-      }), GenerateRows$1(NonEmptyCell$1, schema, childPath, enabled, cells, uischema, isInReview)]
+      })
     }) : null
   }, childPath);
 };
@@ -6083,9 +6455,11 @@ const ObjectArrayList$1 = ({
   enabled,
   cells,
   translations,
-  isInReview
+  count,
+  isInReview,
+  handleChange
 }) => {
-  const isEmptyList = data === 0;
+  const isEmptyList = count === 0;
   if (isEmptyList) {
     return jsx(EmptyList$1, {
       numColumns: getValidColumnProps$1(schema).length + 1,
@@ -6093,182 +6467,230 @@ const ObjectArrayList$1 = ({
     });
   }
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
-  return jsx(Fragment, {
-    children: range(data).map(index => {
-      const childPath = Paths.compose(path, `${index}`);
-      return jsx(NonEmptyList$1, {
-        childPath: childPath,
-        rowIndex: index,
-        schema: schema,
-        openDeleteDialog: openDeleteDialog,
-        showSortButtons: appliedUiSchemaOptions.showSortButtons || appliedUiSchemaOptions.showArrayTableSortButtons,
-        enabled: enabled,
-        cells: cells,
-        path: path,
-        uischema: uischema,
-        translations: translations,
-        isInReview: isInReview
-      }, childPath);
-    })
-  });
+  const childPath = Paths.compose(path, `${0}`);
+  return jsx(NonEmptyList$1, {
+    childPath: childPath,
+    rowIndex: 0,
+    schema: schema,
+    openDeleteDialog: openDeleteDialog,
+    showSortButtons: appliedUiSchemaOptions.showSortButtons || appliedUiSchemaOptions.showArrayTableSortButtons,
+    enabled: enabled,
+    handleChange: handleChange,
+    cells: cells,
+    path: path,
+    uischema: uischema,
+    translations: translations,
+    isInReview: isInReview,
+    count: count,
+    data: data
+  }, 0);
 };
 // eslint-disable-next-line
-class ObjectArrayControl extends React.Component {
-  constructor() {
-    super(...arguments);
-    // eslint-disable-next-line
-    this.addItem = (path, value) => this.props.addItem(path, value);
-  }
-  render() {
-    var _a;
-    const _b = this.props,
-      {
-        label,
-        path,
-        schema,
-        rootSchema,
-        uischema,
-        errors,
-        openDeleteDialog,
-        visible,
-        enabled,
-        cells,
-        translations,
-        data,
-        config,
-        isStepperReview
-      } = _b,
-      additionalProps = __rest(_b, ["label", "path", "schema", "rootSchema", "uischema", "errors", "openDeleteDialog", "visible", "enabled", "cells", "translations", "data", "config", "isStepperReview"]);
-    const controlElement = uischema;
-    // eslint-disable-next-line
-    const listTitle = label || ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.title);
-    const isInReview = isStepperReview === true;
-    return jsxs(Visible, {
-      visible: visible,
-      "data-testid": "jsonforms-object-list-wrapper",
-      children: [jsxs(ToolBarHeader, {
-        children: [isInReview && listTitle && jsx("b", {
-          children: listTitle
-        }), !isInReview && listTitle && jsx(ObjectArrayTitle, {
-          children: listTitle
-        }), !isInReview && jsx(ObjectArrayToolBar, {
-          errors: errors,
-          label: label,
-          addItem: this.addItem,
-          numColumns: 0,
-          path: path,
-          uischema: controlElement,
-          schema: schema,
-          rootSchema: rootSchema,
-          enabled: enabled,
-          translations: translations
-        })]
-      }), jsx("div", {
-        children: jsx(ObjectArrayList$1, Object.assign({
-          path: path,
-          schema: schema,
-          uischema: uischema,
-          enabled: enabled,
-          openDeleteDialog: openDeleteDialog,
-          translations: translations,
-          data: data,
-          cells: cells,
-          config: config,
-          isInReview: isInReview
-        }, additionalProps))
-      })]
-    });
-  }
-}
-
-const DeleteDialog = /*#__PURE__*/React.memo(function DeleteDialog({
-  open,
-  onConfirm,
-  onCancel,
-  title,
-  message
-}) {
-  return jsxs(GoAModal, {
-    open: open,
-    testId: "object-array-modal",
-    heading: title,
-    children: [jsx(DeleteDialogContent, {
-      "data-testid": "object-array-modal-content",
-      children: message
-    }), jsxs(GoAButtonGroup, {
-      alignment: "end",
-      children: [jsx(GoAButton, {
-        type: "secondary",
-        testId: "object-array-modal-button",
-        onClick: () => {
-          onCancel();
-        },
-        children: "Cancel"
-      }), jsx(GoAButton, {
-        type: "primary",
-        variant: "destructive",
-        testId: "object-array-confirm-button",
-        onClick: () => {
-          onConfirm();
-        },
-        children: "Delete"
-      })]
-    })]
-  }, 1);
-});
-
-const ArrayControl = props => {
+const ObjectArrayControl = props => {
+  var _a, _b, _c;
+  const [registers, dispatch] = useReducer(objectListReducer, initialState);
   const [open, setOpen] = useState(false);
-  const [path, setPath] = useState();
   const [rowData, setRowData] = useState(0);
   const {
-    removeItems,
-    visible
-  } = props;
-  const openDeleteDialog = useCallback((p, rowIndex) => {
+      label,
+      path,
+      schema,
+      rootSchema,
+      uischema,
+      errors,
+      visible,
+      enabled,
+      cells,
+      translations,
+      data,
+      config,
+      isStepperReview,
+      handleChange,
+      removeItems
+    } = props,
+    additionalProps = __rest(props, ["label", "path", "schema", "rootSchema", "uischema", "errors", "visible", "enabled", "cells", "translations", "data", "config", "isStepperReview", "handleChange", "removeItems"]);
+  const parsedData = data;
+  const openDeleteDialog = useCallback((rowIndex, name) => {
     setOpen(true);
-    setPath(p);
     setRowData(rowIndex);
-  }, [setOpen, setPath, setRowData]);
+  }, [setOpen, setRowData]);
   const deleteCancel = useCallback(() => setOpen(false), [setOpen]);
-  // eslint-disable-next-line
-  const deleteConfirm = useCallback(() => {
-    const p = path === null || path === void 0 ? void 0 : path.substring(0, path.lastIndexOf('.'));
-    if (removeItems && p) {
-      removeItems(p, [rowData])();
+  const deleteConfirm = () => {
+    if (deleteItem && path) {
+      deleteItem(path, rowData);
     }
     setOpen(false);
+  };
+  //  eslint-disable-next-line
+  const addItem = (path, value) => {
+    dispatch({
+      type: INCREMENT_ACTION,
+      payload: path
+    });
+    return () => props.addItem(path, value);
+  };
+  // eslint-disable-next-line
+  const deleteItem = (path, value) => {
+    const categories = registers.categories;
+    const currentCategory = categories[path];
+    const newCategoryData = {};
+    if (currentCategory === null || currentCategory === void 0 ? void 0 : currentCategory.data) {
+      delete currentCategory.data[value];
+      Object.keys(currentCategory.data).forEach((key, index) => {
+        newCategoryData[index] = currentCategory.data[key];
+      });
+      currentCategory.data = newCategoryData;
+    }
+    if ((currentCategory === null || currentCategory === void 0 ? void 0 : currentCategory.count) > 0) currentCategory.count--;
+    const handleChangeData = Object.keys(newCategoryData).map(key => {
+      return newCategoryData[key];
+    });
+    props.handleChange(path, handleChangeData);
+    dispatch({
+      type: DELETE_ACTION,
+      payload: {
+        name: path,
+        category: currentCategory
+      }
+    });
+  };
+  const handleChangeWithData = (name, value) => {
+    const categories = registers.categories;
+    const currentCategory = categories[name].data;
+    const newData = {};
+    const allKeys = Object.keys(value).concat(Object.keys(currentCategory));
+    const allKeysUnique = allKeys.filter((a, b) => allKeys.indexOf(a) === b);
+    Object.keys(allKeysUnique).forEach(num => {
+      if (!newData[num]) {
+        newData[num] = {};
+      }
+      currentCategory[num] && Object.keys(currentCategory[num]).forEach(name => {
+        newData[num][name] = currentCategory[num][name];
+      });
+      value[num] && Object.keys(value[num]).forEach(name => {
+        newData[num][name] = value[num][name] || currentCategory[num] && currentCategory[num][name];
+      });
+    });
+    const handleChangeData = Object.keys(newData).map(key => {
+      return newData[key];
+    });
+    props.handleChange(name, handleChangeData);
+    dispatch({
+      type: ADD_DATA_ACTION,
+      payload: {
+        name,
+        category: newData
+      }
+    });
+  };
+  useEffect(() => {
     // eslint-disable-next-line
-  }, [setOpen, path, rowData]);
+    const updatedData = Object.fromEntries((parsedData || []).map((item, index) => [index, item]));
+    const count = Object.keys(updatedData).length;
+    const dispatchData = {
+      [path]: {
+        count: count,
+        data: updatedData
+      }
+    };
+    if (Object.keys(updatedData).length > 0) {
+      dispatch({
+        type: SET_DATA_ACTION,
+        payload: dispatchData
+      });
+    }
+  }, []);
+  const title = path.split('.')[0];
+  const controlElement = uischema;
+  // eslint-disable-next-line
+  const listTitle = label || ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.title);
+  const isInReview = isStepperReview === true;
   return jsxs(Visible, {
     visible: visible,
-    children: [jsx(ObjectArrayControl, Object.assign({}, props, {
-      openDeleteDialog: openDeleteDialog
-    })), jsx(DeleteDialog, {
-      open: open,
-      onCancel: deleteCancel,
-      onConfirm: deleteConfirm,
-      title: props.translations.deleteDialogTitle || '',
-      message: props.translations.deleteDialogMessage || ''
+    "data-testid": "jsonforms-object-list-wrapper",
+    children: [jsxs(ToolBarHeader, {
+      children: [isInReview && listTitle && jsx("b", {
+        children: listTitle
+      }), !isInReview && listTitle && jsx(ObjectArrayTitle, {
+        children: listTitle
+      }), !isInReview && jsx(ObjectArrayToolBar, {
+        errors: errors,
+        label: label,
+        addItem: (a, b) => () => addItem(a, b),
+        numColumns: 0,
+        path: path,
+        uischema: controlElement,
+        schema: schema,
+        rootSchema: rootSchema,
+        enabled: enabled,
+        translations: translations
+      })]
+    }), jsxs("div", {
+      children: [jsx(ObjectArrayList$1, Object.assign({
+        path: path,
+        schema: schema,
+        uischema: uischema,
+        enabled: enabled,
+        openDeleteDialog: openDeleteDialog,
+        translations: translations,
+        count: ((_b = registers.categories[title]) === null || _b === void 0 ? void 0 : _b.count) || Object.keys(data || []).length,
+        data: data || ((_c = registers.categories[title]) === null || _c === void 0 ? void 0 : _c.data),
+        cells: cells,
+        config: config,
+        isInReview: isInReview,
+        handleChange: handleChangeWithData
+      }, additionalProps)), jsx(DeleteDialog, {
+        open: open,
+        onCancel: deleteCancel,
+        onConfirm: deleteConfirm,
+        title: 'Remove item',
+        message: 'Are you sure you wish to remove the selected item'
+      })]
     })]
   });
 };
-const ArrayBaseReviewControl = props => {
+
+const ArrayControl = props => {
+  const {
+    visible,
+    handleChange
+  } = props;
+  return jsx(Visible, {
+    visible: visible,
+    children: jsx(ObjectArrayControl, Object.assign({}, props, {
+      handleChange: handleChange
+    }))
+  });
+};
+const GoAArrayControlTester = rankWith(3, or(isObjectArrayControl, isPrimitiveArrayControl));
+const ArrayControlBase = props => {
+  const {
+    visible
+  } = props;
+  return jsx(Visible, {
+    visible: visible,
+    children: jsx(ArrayControl, Object.assign({}, props, {
+      addItem: () => () => {},
+      translations: {}
+    }))
+  });
+};
+const ArrayControlReview = props => {
   const {
     visible
   } = props;
   return jsx(Visible, {
     visible: visible,
     children: jsx(ObjectArrayControl, Object.assign({}, props, {
-      openDeleteDialog: () => {},
+      addItem: () => () => {},
+      translations: {},
       isStepperReview: true,
       enabled: true
     }))
   });
 };
-const GoAArrayControlTester = rankWith(3, or(isObjectArrayControl, isPrimitiveArrayControl));
-const GoAArrayControlRenderer = withJsonFormsArrayLayoutProps(ArrayControl);
-const GoAArrayControlReviewRenderer = withJsonFormsArrayLayoutProps(ArrayBaseReviewControl);
+const GoAArrayControlRenderer = withJsonFormsControlProps(ArrayControlBase);
+const GoAArrayControlReviewRenderer = withJsonFormsControlProps(ArrayControlReview);
 
 // eslint-disable-next-line
 const extractScopesFromUISchema = uischema => {
@@ -6727,7 +7149,7 @@ const SearchBox = styled.div(_t$1 || (_t$1 = _$1`
 const LabelDiv = styled.div(_t2 || (_t2 = _$1`
   font-size: var(--fs-sl);
   font-weight: var(--fw-bold);
-  padding-bottom: 0.5rem;
+  padding-bottom: 1.5rem;
 `));
 
 const AddressInputs = ({
@@ -6735,7 +7157,8 @@ const AddressInputs = ({
   handleInputChange,
   isAlbertaAddress,
   errors,
-  handleOnBlur
+  handleOnBlur,
+  requiredFields
 }) => {
   var _a, _b;
   const provinces = [{
@@ -6796,18 +7219,20 @@ const AddressInputs = ({
       children: [jsx(GoAFormItem, {
         label: "City",
         error: (_a = errors === null || errors === void 0 ? void 0 : errors['municipality']) !== null && _a !== void 0 ? _a : '',
+        requirement: (requiredFields === null || requiredFields === void 0 ? void 0 : requiredFields.includes('municipality')) ? 'required' : 'optional',
         children: jsx(GoAInput, {
-          name: "city",
+          name: "municipality",
           testId: "address-form-city",
           ariaLabel: 'address-form-city',
-          value: (address === null || address === void 0 ? void 0 : address.city) || '',
+          value: (address === null || address === void 0 ? void 0 : address.municipality) || '',
           onChange: (name, value) => handleInputChange(name, value),
-          onBlur: (name, value) => handleOnBlur('municipality'),
+          onBlur: (name, value) => handleOnBlur(name),
           width: "100%"
         })
       }), jsx(GoAFormItem, {
         label: "Postal Code",
         error: (_b = errors === null || errors === void 0 ? void 0 : errors['postalCode']) !== null && _b !== void 0 ? _b : '',
+        requirement: (requiredFields === null || requiredFields === void 0 ? void 0 : requiredFields.includes('postalCode')) ? 'required' : 'optional',
         children: jsx(GoAInput, {
           name: "postalCode",
           testId: "address-form-postal-code",
@@ -6832,7 +7257,7 @@ const AddressInputs = ({
           name: "province",
           testId: "address-form-province-dropdown",
           ariaLabel: 'address-form-province',
-          value: (address === null || address === void 0 ? void 0 : address.province) || '',
+          value: (address === null || address === void 0 ? void 0 : address.subdivisionCode) || '',
           onChange: value => handleInputChange('province', value),
           relative: true,
           width: "25ch",
@@ -6852,18 +7277,8 @@ const AddressInputs = ({
   });
 };
 
-var classofRaw = classofRaw$2;
-var uncurryThis$4 = functionUncurryThis;
-
-var functionUncurryThisClause = function (fn) {
-  // Nashorn bug:
-  //   https://github.com/zloirock/core-js/issues/1128
-  //   https://github.com/zloirock/core-js/issues/1130
-  if (classofRaw(fn) === 'Function') return uncurryThis$4(fn);
-};
-
 var $$8 = _export;
-var uncurryThis$3 = functionUncurryThisClause;
+var uncurryThis$2 = functionUncurryThisClause;
 var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f;
 var toLength = toLength$4;
 var toString$1 = toString$d;
@@ -6871,7 +7286,7 @@ var notARegExp = notARegexp;
 var requireObjectCoercible$1 = requireObjectCoercible$a;
 var correctIsRegExpLogic = correctIsRegexpLogic;
 
-var slice = uncurryThis$3(''.slice);
+var slice = uncurryThis$2(''.slice);
 var min = Math.min;
 
 var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('endsWith');
@@ -6899,12 +7314,12 @@ $$8({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_RE
 var whitespaces$2 = '\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$2 = functionUncurryThis;
+var uncurryThis$1 = functionUncurryThis;
 var requireObjectCoercible = requireObjectCoercible$a;
 var toString = toString$d;
 var whitespaces$1 = whitespaces$2;
 
-var replace = uncurryThis$2(''.replace);
+var replace = uncurryThis$1(''.replace);
 var ltrim = RegExp('^[' + whitespaces$1 + ']+');
 var rtrim = RegExp('(^|[^' + whitespaces$1 + '])[' + whitespaces$1 + ']+$');
 
@@ -6996,15 +7411,15 @@ const mapSuggestionToAddress = suggestion => {
     addressLine1 = suggestion.Text.trim();
   }
   const descriptionParts = suggestion.Description.split(',');
-  const city = descriptionParts[0].trim();
+  const municipality = descriptionParts[0].trim();
   const provinceAndPostalCode = descriptionParts[1].trim().split(' ');
-  const province = provinceAndPostalCode[0];
+  const subdivisionCode = provinceAndPostalCode[0];
   const postalCode = descriptionParts[2].trim();
   return {
     addressLine1,
     addressLine2,
-    city,
-    province,
+    municipality,
+    subdivisionCode,
     postalCode,
     country: 'CA'
   };
@@ -7022,6 +7437,12 @@ const handlePostalCodeValidation = (validatePc, message, value, errors) => {
   }
   return newErrors;
 };
+const formatPostalCode = value => {
+  if (value.length >= 4 && value.indexOf(' ') === -1) {
+    return value.slice(0, 3) + ' ' + value.slice(3);
+  }
+  return value;
+};
 
 let _ = t => t,
   _t;
@@ -7225,8 +7646,8 @@ const AddressLookUpControl = props => {
   const defaultAddress = {
     addressLine1: '',
     addressLine2: '',
-    city: '',
-    province: isAlbertaAddress ? 'AB' : '',
+    municipality: '',
+    subdivisionCode: isAlbertaAddress ? 'AB' : '',
     postalCode: '',
     country: 'CA'
   };
@@ -7235,6 +7656,7 @@ const AddressLookUpControl = props => {
   const [suggestions, setSuggestions] = useState([]);
   const [loading, setLoading] = useState(false);
   const [errors, setErrors] = useState({});
+  const requiredFields = schema.required;
   const updateFormData = updatedAddress => {
     setAddress(updatedAddress);
     handleChange(path, updatedAddress);
@@ -7246,9 +7668,7 @@ const AddressLookUpControl = props => {
     if (field === 'postalCode') {
       const validatePc = validatePostalCode(value);
       setErrors(handlePostalCodeValidation(validatePc, postalCodeErrorMessage ? postalCodeErrorMessage : '', value, errors));
-      if (value.length >= 4 && value.indexOf(' ') === -1) {
-        value = value.slice(0, 3) + ' ' + value.slice(3);
-      }
+      value = formatPostalCode(value);
       newAddress = Object.assign(Object.assign({}, address), {
         [field]: value.toUpperCase()
       });
@@ -7256,6 +7676,7 @@ const AddressLookUpControl = props => {
       newAddress = Object.assign(Object.assign({}, address), {
         [field]: value
       });
+      delete errors[field];
     }
     setAddress(newAddress);
     updateFormData(newAddress);
@@ -7298,8 +7719,7 @@ const AddressLookUpControl = props => {
     setErrors({});
   };
   const handleRequiredFieldBlur = name => {
-    const requiredFields = schema.required;
-    if (!(data === null || data === void 0 ? void 0 : data[name]) || data[name] === '' || requiredFields.includes(name)) {
+    if ((!(data === null || data === void 0 ? void 0 : data[name]) || (data === null || data === void 0 ? void 0 : data[name]) === '') && requiredFields.includes(name)) {
       const err = Object.assign({}, errors);
       err[name] = name === 'municipality' ? `city is required` : `${name} is required`;
       setErrors(err);
@@ -7318,10 +7738,10 @@ const AddressLookUpControl = props => {
           name: "addressLine1",
           testId: "address-form-address1",
           ariaLabel: 'address-form-address1',
-          placeholder: "Start typing the first line of your address",
+          placeholder: "Start typing the first line of your address, required.",
           value: (address === null || address === void 0 ? void 0 : address.addressLine1) || '',
           onChange: (name, value) => handleDropdownChange(value),
-          onBlur: (name, value) => handleRequiredFieldBlur(name),
+          onBlur: name => handleRequiredFieldBlur(name),
           width: "100%"
         }), loading && autocompletion && jsx(GoASkeleton, {
           type: "text",
@@ -7330,7 +7750,7 @@ const AddressLookUpControl = props => {
           className: "suggestions",
           tabIndex: 0,
           children: suggestions && autocompletion && open && suggestions.map((suggestion, index) => jsx("li", {
-            onClick: () => handleSuggestionClick(suggestion),
+            onClick: e => handleSuggestionClick(suggestion),
             children: `${suggestion.Text}  ${suggestion.Description}`
           }, index))
         })]
@@ -7340,7 +7760,8 @@ const AddressLookUpControl = props => {
       errors: errors,
       handleInputChange: handleInputChange,
       isAlbertaAddress: isAlbertaAddress,
-      handleOnBlur: handleRequiredFieldBlur
+      handleOnBlur: handleRequiredFieldBlur,
+      requiredFields: requiredFields
     })]
   });
 };
@@ -7696,12 +8117,12 @@ const createDefaultAjv = (...schemas) => {
   return ajv;
 };
 
-var aCallable$6 = aCallable$9;
+var aCallable$4 = aCallable$9;
 var toObject = toObject$7;
 var IndexedObject = indexedObject;
-var lengthOfArrayLike$1 = lengthOfArrayLike$5;
+var lengthOfArrayLike = lengthOfArrayLike$5;
 
-var $TypeError$6 = TypeError;
+var $TypeError$4 = TypeError;
 
 var REDUCE_EMPTY = 'Reduce of empty array with no initial value';
 
@@ -7710,9 +8131,9 @@ var createMethod = function (IS_RIGHT) {
   return function (that, callbackfn, argumentsLength, memo) {
     var O = toObject(that);
     var self = IndexedObject(O);
-    var length = lengthOfArrayLike$1(O);
-    aCallable$6(callbackfn);
-    if (length === 0 && argumentsLength < 2) throw new $TypeError$6(REDUCE_EMPTY);
+    var length = lengthOfArrayLike(O);
+    aCallable$4(callbackfn);
+    if (length === 0 && argumentsLength < 2) throw new $TypeError$4(REDUCE_EMPTY);
     var index = IS_RIGHT ? length - 1 : 0;
     var i = IS_RIGHT ? -1 : 1;
     if (argumentsLength < 2) while (true) {
@@ -7723,7 +8144,7 @@ var createMethod = function (IS_RIGHT) {
       }
       index += i;
       if (IS_RIGHT ? index < 0 : length <= index) {
-        throw new $TypeError$6(REDUCE_EMPTY);
+        throw new $TypeError$4(REDUCE_EMPTY);
       }
     }
     for (;IS_RIGHT ? index >= 0 : length > index; index += i) if (index in self) {
@@ -7753,9 +8174,9 @@ var arrayMethodIsStrict$1 = function (METHOD_NAME, argument) {
 };
 
 var global$7 = global$o;
-var classof$2 = classofRaw$2;
+var classof$1 = classofRaw$2;
 
-var engineIsNode = classof$2(global$7.process) === 'process';
+var engineIsNode = classof$1(global$7.process) === 'process';
 
 var $$6 = _export;
 var $reduce = arrayReduce.left;
@@ -7777,26 +8198,26 @@ $$6({ target: 'Array', proto: true, forced: FORCED }, {
   }
 });
 
-var isPrototypeOf$1 = objectIsPrototypeOf;
+var isPrototypeOf = objectIsPrototypeOf;
 
-var $TypeError$5 = TypeError;
+var $TypeError$3 = TypeError;
 
 var anInstance$1 = function (it, Prototype) {
-  if (isPrototypeOf$1(Prototype, it)) return it;
-  throw new $TypeError$5('Incorrect invocation');
+  if (isPrototypeOf(Prototype, it)) return it;
+  throw new $TypeError$3('Incorrect invocation');
 };
 
-var uncurryThis$1 = functionUncurryThis;
+var uncurryThis = functionUncurryThis;
 var fails$1 = fails$r;
 var isCallable$4 = isCallable$q;
-var classof$1 = classof$9;
+var classof = classof$9;
 var getBuiltIn$2 = getBuiltIn$9;
 var inspectSource$1 = inspectSource$3;
 
 var noop = function () { /* empty */ };
 var construct = getBuiltIn$2('Reflect', 'construct');
 var constructorRegExp = /^\s*(?:class|function)\b/;
-var exec = uncurryThis$1(constructorRegExp.exec);
+var exec = uncurryThis(constructorRegExp.exec);
 var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
 var isConstructorModern = function isConstructor(argument) {
@@ -7811,7 +8232,7 @@ var isConstructorModern = function isConstructor(argument) {
 
 var isConstructorLegacy = function isConstructor(argument) {
   if (!isCallable$4(argument)) return false;
-  switch (classof$1(argument)) {
+  switch (classof(argument)) {
     case 'AsyncFunction':
     case 'GeneratorFunction':
     case 'AsyncGeneratorFunction': return false;
@@ -7839,49 +8260,35 @@ var isConstructor$1 = !construct || fails$1(function () {
 }) ? isConstructorLegacy : isConstructorModern;
 
 var isConstructor = isConstructor$1;
-var tryToString$2 = tryToString$4;
+var tryToString = tryToString$4;
 
-var $TypeError$4 = TypeError;
+var $TypeError$2 = TypeError;
 
 // `Assert: IsConstructor(argument) is true`
 var aConstructor$1 = function (argument) {
   if (isConstructor(argument)) return argument;
-  throw new $TypeError$4(tryToString$2(argument) + ' is not a constructor');
+  throw new $TypeError$2(tryToString(argument) + ' is not a constructor');
 };
 
-var anObject$4 = anObject$f;
+var anObject$1 = anObject$f;
 var aConstructor = aConstructor$1;
-var isNullOrUndefined$1 = isNullOrUndefined$6;
-var wellKnownSymbol$4 = wellKnownSymbol$j;
+var isNullOrUndefined = isNullOrUndefined$6;
+var wellKnownSymbol$2 = wellKnownSymbol$j;
 
-var SPECIES$1 = wellKnownSymbol$4('species');
+var SPECIES$1 = wellKnownSymbol$2('species');
 
 // `SpeciesConstructor` abstract operation
 // https://tc39.es/ecma262/#sec-speciesconstructor
 var speciesConstructor$1 = function (O, defaultConstructor) {
-  var C = anObject$4(O).constructor;
+  var C = anObject$1(O).constructor;
   var S;
-  return C === undefined || isNullOrUndefined$1(S = anObject$4(C)[SPECIES$1]) ? defaultConstructor : aConstructor(S);
-};
-
-var uncurryThis = functionUncurryThisClause;
-var aCallable$5 = aCallable$9;
-var NATIVE_BIND = functionBindNative;
-
-var bind$4 = uncurryThis(uncurryThis.bind);
-
-// optional / simple context binding
-var functionBindContext = function (fn, that) {
-  aCallable$5(fn);
-  return that === undefined ? fn : NATIVE_BIND ? bind$4(fn, that) : function (/* ...args */) {
-    return fn.apply(that, arguments);
-  };
+  return C === undefined || isNullOrUndefined(S = anObject$1(C)[SPECIES$1]) ? defaultConstructor : aConstructor(S);
 };
 
-var $TypeError$3 = TypeError;
+var $TypeError$1 = TypeError;
 
 var validateArgumentsLength$1 = function (passed, required) {
-  if (passed < required) throw new $TypeError$3('Not enough arguments');
+  if (passed < required) throw new $TypeError$1('Not enough arguments');
   return passed;
 };
 
@@ -7892,7 +8299,7 @@ var engineIsIos = /(?:ipad|iphone|ipod).*applewebkit/i.test(userAgent$2);
 
 var global$6 = global$o;
 var apply = functionApply;
-var bind$3 = functionBindContext;
+var bind$2 = functionBindContext;
 var isCallable$3 = isCallable$q;
 var hasOwn = hasOwnProperty_1;
 var fails = fails$r;
@@ -7974,7 +8381,7 @@ if (!set || !clear) {
     channel = new MessageChannel();
     port = channel.port2;
     channel.port1.onmessage = eventListener;
-    defer = bind$3(port.postMessage, port);
+    defer = bind$2(port.postMessage, port);
   // Browsers with postMessage, skip WebWorkers
   // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
   } else if (
@@ -8055,7 +8462,7 @@ var engineIsWebosWebkit = /web0s(?!.*chrome)/i.test(userAgent);
 
 var global$4 = global$o;
 var safeGetBuiltIn = safeGetBuiltIn$1;
-var bind$2 = functionBindContext;
+var bind$1 = functionBindContext;
 var macrotask = task$1.set;
 var Queue$1 = queue$1;
 var IS_IOS = engineIsIos;
@@ -8101,7 +8508,7 @@ if (!microtask$1) {
     promise = Promise$1.resolve(undefined);
     // workaround of WebKit ~ iOS Safari 10.1 bug
     promise.constructor = Promise$1;
-    then = bind$2(promise.then, promise);
+    then = bind$1(promise.then, promise);
     notify$1 = function () {
       then(flush);
     };
@@ -8118,7 +8525,7 @@ if (!microtask$1) {
   // - setTimeout
   } else {
     // `webpack` dev server bug on IE global methods - use bind(fn, global)
-    macrotask = bind$2(macrotask, global$4);
+    macrotask = bind$1(macrotask, global$4);
     notify$1 = function () {
       macrotask(flush);
     };
@@ -8166,13 +8573,13 @@ var NativePromiseConstructor$3 = promiseNativeConstructor;
 var isCallable$2 = isCallable$q;
 var isForced = isForced_1;
 var inspectSource = inspectSource$3;
-var wellKnownSymbol$3 = wellKnownSymbol$j;
+var wellKnownSymbol$1 = wellKnownSymbol$j;
 var IS_BROWSER = engineIsBrowser;
 var IS_DENO = engineIsDeno;
 var V8_VERSION = engineV8Version;
 
 NativePromiseConstructor$3 && NativePromiseConstructor$3.prototype;
-var SPECIES = wellKnownSymbol$3('species');
+var SPECIES = wellKnownSymbol$1('species');
 var SUBCLASSING = false;
 var NATIVE_PROMISE_REJECTION_EVENT$1 = isCallable$2(global$2.PromiseRejectionEvent);
 
@@ -8208,19 +8615,19 @@ var promiseConstructorDetection = {
 
 var newPromiseCapability$2 = {};
 
-var aCallable$4 = aCallable$9;
+var aCallable$3 = aCallable$9;
 
-var $TypeError$2 = TypeError;
+var $TypeError = TypeError;
 
 var PromiseCapability = function (C) {
   var resolve, reject;
   this.promise = new C(function ($$resolve, $$reject) {
-    if (resolve !== undefined || reject !== undefined) throw new $TypeError$2('Bad Promise constructor');
+    if (resolve !== undefined || reject !== undefined) throw new $TypeError('Bad Promise constructor');
     resolve = $$resolve;
     reject = $$reject;
   });
-  this.resolve = aCallable$4(resolve);
-  this.reject = aCallable$4(reject);
+  this.resolve = aCallable$3(resolve);
+  this.reject = aCallable$3(reject);
 };
 
 // `NewPromiseCapability` abstract operation
@@ -8232,12 +8639,12 @@ newPromiseCapability$2.f = function (C) {
 var $$5 = _export;
 var IS_NODE = engineIsNode;
 var global$1 = global$o;
-var call$5 = functionCall;
+var call$2 = functionCall;
 var defineBuiltIn$1 = defineBuiltIn$8;
 var setPrototypeOf = objectSetPrototypeOf;
 var setToStringTag = setToStringTag$4;
 var setSpecies = setSpecies$2;
-var aCallable$3 = aCallable$9;
+var aCallable$2 = aCallable$9;
 var isCallable$1 = isCallable$q;
 var isObject$1 = isObject$d;
 var anInstance = anInstance$1;
@@ -8310,7 +8717,7 @@ var callReaction = function (reaction, state) {
       if (result === reaction.promise) {
         reject(new TypeError$1('Promise-chain cycle'));
       } else if (then = isThenable(result)) {
-        call$5(then, result, resolve, reject);
+        call$2(then, result, resolve, reject);
       } else resolve(result);
     } else reject(value);
   } catch (error) {
@@ -8347,7 +8754,7 @@ var dispatchEvent = function (name, promise, reason) {
 };
 
 var onUnhandled = function (state) {
-  call$5(task, global$1, function () {
+  call$2(task, global$1, function () {
     var promise = state.facade;
     var value = state.value;
     var IS_UNHANDLED = isUnhandled(state);
@@ -8370,7 +8777,7 @@ var isUnhandled = function (state) {
 };
 
 var onHandleUnhandled = function (state) {
-  call$5(task, global$1, function () {
+  call$2(task, global$1, function () {
     var promise = state.facade;
     if (IS_NODE) {
       process.emit('rejectionHandled', promise);
@@ -8378,7 +8785,7 @@ var onHandleUnhandled = function (state) {
   });
 };
 
-var bind$1 = function (fn, state, unwrap) {
+var bind = function (fn, state, unwrap) {
   return function (value) {
     fn(state, value, unwrap);
   };
@@ -8404,9 +8811,9 @@ var internalResolve = function (state, value, unwrap) {
       microtask(function () {
         var wrapper = { done: false };
         try {
-          call$5(then, value,
-            bind$1(internalResolve, wrapper, state),
-            bind$1(internalReject, wrapper, state)
+          call$2(then, value,
+            bind(internalResolve, wrapper, state),
+            bind(internalReject, wrapper, state)
           );
         } catch (error) {
           internalReject(wrapper, error, state);
@@ -8427,11 +8834,11 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) {
   // 25.4.3.1 Promise(executor)
   PromiseConstructor = function Promise(executor) {
     anInstance(this, PromisePrototype);
-    aCallable$3(executor);
-    call$5(Internal, this);
+    aCallable$2(executor);
+    call$2(Internal, this);
     var state = getInternalPromiseState(this);
     try {
-      executor(bind$1(internalResolve, state), bind$1(internalReject, state));
+      executor(bind(internalResolve, state), bind(internalReject, state));
     } catch (error) {
       internalReject(state, error);
     }
@@ -8473,8 +8880,8 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) {
     var promise = new Internal();
     var state = getInternalPromiseState(promise);
     this.promise = promise;
-    this.resolve = bind$1(internalResolve, state);
-    this.reject = bind$1(internalReject, state);
+    this.resolve = bind(internalResolve, state);
+    this.reject = bind(internalReject, state);
   };
 
   newPromiseCapabilityModule$3.f = newPromiseCapability$1 = function (C) {
@@ -8491,7 +8898,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) {
       defineBuiltIn$1(NativePromisePrototype$1, 'then', function then(onFulfilled, onRejected) {
         var that = this;
         return new PromiseConstructor(function (resolve, reject) {
-          call$5(nativeThen, that, resolve, reject);
+          call$2(nativeThen, that, resolve, reject);
         }).then(onFulfilled, onRejected);
       // https://github.com/zloirock/core-js/issues/640
       }, { unsafe: true });
@@ -8516,138 +8923,6 @@ $$5({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTR
 setToStringTag(PromiseConstructor, PROMISE, false);
 setSpecies(PROMISE);
 
-var wellKnownSymbol$2 = wellKnownSymbol$j;
-var Iterators$1 = iterators;
-
-var ITERATOR$2 = wellKnownSymbol$2('iterator');
-var ArrayPrototype = Array.prototype;
-
-// check on default Array iterator
-var isArrayIteratorMethod$1 = function (it) {
-  return it !== undefined && (Iterators$1.Array === it || ArrayPrototype[ITERATOR$2] === it);
-};
-
-var classof = classof$9;
-var getMethod$1 = getMethod$5;
-var isNullOrUndefined = isNullOrUndefined$6;
-var Iterators = iterators;
-var wellKnownSymbol$1 = wellKnownSymbol$j;
-
-var ITERATOR$1 = wellKnownSymbol$1('iterator');
-
-var getIteratorMethod$2 = function (it) {
-  if (!isNullOrUndefined(it)) return getMethod$1(it, ITERATOR$1)
-    || getMethod$1(it, '@@iterator')
-    || Iterators[classof(it)];
-};
-
-var call$4 = functionCall;
-var aCallable$2 = aCallable$9;
-var anObject$3 = anObject$f;
-var tryToString$1 = tryToString$4;
-var getIteratorMethod$1 = getIteratorMethod$2;
-
-var $TypeError$1 = TypeError;
-
-var getIterator$1 = function (argument, usingIterator) {
-  var iteratorMethod = arguments.length < 2 ? getIteratorMethod$1(argument) : usingIterator;
-  if (aCallable$2(iteratorMethod)) return anObject$3(call$4(iteratorMethod, argument));
-  throw new $TypeError$1(tryToString$1(argument) + ' is not iterable');
-};
-
-var call$3 = functionCall;
-var anObject$2 = anObject$f;
-var getMethod = getMethod$5;
-
-var iteratorClose$1 = function (iterator, kind, value) {
-  var innerResult, innerError;
-  anObject$2(iterator);
-  try {
-    innerResult = getMethod(iterator, 'return');
-    if (!innerResult) {
-      if (kind === 'throw') throw value;
-      return value;
-    }
-    innerResult = call$3(innerResult, iterator);
-  } catch (error) {
-    innerError = true;
-    innerResult = error;
-  }
-  if (kind === 'throw') throw value;
-  if (innerError) throw innerResult;
-  anObject$2(innerResult);
-  return value;
-};
-
-var bind = functionBindContext;
-var call$2 = functionCall;
-var anObject$1 = anObject$f;
-var tryToString = tryToString$4;
-var isArrayIteratorMethod = isArrayIteratorMethod$1;
-var lengthOfArrayLike = lengthOfArrayLike$5;
-var isPrototypeOf = objectIsPrototypeOf;
-var getIterator = getIterator$1;
-var getIteratorMethod = getIteratorMethod$2;
-var iteratorClose = iteratorClose$1;
-
-var $TypeError = TypeError;
-
-var Result = function (stopped, result) {
-  this.stopped = stopped;
-  this.result = result;
-};
-
-var ResultPrototype = Result.prototype;
-
-var iterate$2 = 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(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$1(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(tryToString(iterable) + ' is not iterable');
-    // optimisation for array iterators
-    if (isArrayIteratorMethod(iterFn)) {
-      for (index = 0, length = lengthOfArrayLike(iterable); length > index; index++) {
-        result = callFn(iterable[index]);
-        if (result && isPrototypeOf(ResultPrototype, result)) return result;
-      } return new Result(false);
-    }
-    iterator = getIterator(iterable, iterFn);
-  }
-
-  next = IS_RECORD ? iterable.next : iterator.next;
-  while (!(step = call$2(next, iterator)).done) {
-    try {
-      result = callFn(step.value);
-    } catch (error) {
-      iteratorClose(iterator, 'throw', error);
-    }
-    if (typeof result == 'object' && result && isPrototypeOf(ResultPrototype, result)) return result;
-  } return new Result(false);
-};
-
 var wellKnownSymbol = wellKnownSymbol$j;
 
 var ITERATOR = wellKnownSymbol('iterator');
@@ -8702,7 +8977,7 @@ var call$1 = functionCall;
 var aCallable$1 = aCallable$9;
 var newPromiseCapabilityModule$2 = newPromiseCapability$2;
 var perform$1 = perform$3;
-var iterate$1 = iterate$2;
+var iterate$1 = iterate$3;
 var PROMISE_STATICS_INCORRECT_ITERATION$1 = promiseStaticsIncorrectIteration;
 
 // `Promise.all` method
@@ -8766,7 +9041,7 @@ var call = functionCall;
 var aCallable = aCallable$9;
 var newPromiseCapabilityModule$1 = newPromiseCapability$2;
 var perform = perform$3;
-var iterate = iterate$2;
+var iterate = iterate$3;
 var PROMISE_STATICS_INCORRECT_ITERATION = promiseStaticsIncorrectIteration;
 
 // `Promise.race` method