@abgov/jsonforms-components 2.45.1 → 2.46.0

package/index.esm.js

@@ -7,15 +7,15 @@ import axios from 'axios';
 import get$1 from 'lodash/get';
 import { isVisible, isEnabled, deriveLabelForUISchemaElement, rankWith, isStringControl, and, optionIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, uiTypeIs, isControl as isControl$1, isEnumControl, isBooleanControl, schemaMatches, getAjv, createDefaultValue, or, isObjectArrayControl, isPrimitiveArrayControl, Paths, toDataPath, Resolve, schemaTypeIs, formatIs, hasType, isCategorization, isLayout } from '@jsonforms/core';
 import * as _$c from 'lodash';
-import ___default, { isEqual, isObject as isObject$g, isEmpty as isEmpty$1 } from 'lodash';
+import ___default, { isEqual, isObject as isObject$h, isEmpty as isEmpty$1 } from 'lodash';
 import { useJsonForms, withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, withJsonFormsAllOfProps, withJsonFormsArrayLayoutProps, withJsonFormsLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
+import Ajv from 'ajv';
 import merge from 'lodash/merge';
 import isEmpty from 'lodash/isEmpty';
 import range from 'lodash/range';
 import pluralize from 'pluralize';
 import { evaluateSync, compileSync } from '@mdx-js/mdx';
 import { Parser } from 'expr-eval-fork';
-import Ajv from 'ajv';
 import addErrors from 'ajv-errors';
 import addFormats from 'ajv-formats';
 
@@ -276,18 +276,18 @@ var isCallable$s = typeof documentAll == 'undefined' && documentAll !== undefine
 
 var isCallable$r = isCallable$s;
 
-var isObject$f = function (it) {
+var isObject$g = function (it) {
   return typeof it == 'object' ? it !== null : isCallable$r(it);
 };
 
-var isObject$e = isObject$f;
+var isObject$f = isObject$g;
 
 var $String$5 = String;
 var $TypeError$k = TypeError;
 
 // `Assert: Type(argument) is Object`
 var anObject$s = function (argument) {
-  if (isObject$e(argument)) return argument;
+  if (isObject$f(argument)) return argument;
   throw new $TypeError$k($String$5(argument) + ' is not an object');
 };
 
@@ -317,11 +317,11 @@ var v8PrototypeDefineBug = DESCRIPTORS$j && fails$r(function () {
 var objectDefineProperty = {};
 
 var global$m = global$r;
-var isObject$d = isObject$f;
+var isObject$e = isObject$g;
 
 var document$3 = global$m.document;
 // typeof document.createElement is 'object' in old IE
-var EXISTS$1 = isObject$d(document$3) && isObject$d(document$3.createElement);
+var EXISTS$1 = isObject$e(document$3) && isObject$e(document$3.createElement);
 
 var documentCreateElement$2 = function (it) {
   return EXISTS$1 ? document$3.createElement(it) : {};
@@ -409,7 +409,7 @@ var getMethod$7 = function (V, P) {
 
 var call$s = functionCall;
 var isCallable$n = isCallable$s;
-var isObject$c = isObject$f;
+var isObject$d = isObject$g;
 
 var $TypeError$i = TypeError;
 
@@ -417,14 +417,14 @@ var $TypeError$i = TypeError;
 // https://tc39.es/ecma262/#sec-ordinarytoprimitive
 var ordinaryToPrimitive$1 = function (input, pref) {
   var fn, val;
-  if (pref === 'string' && isCallable$n(fn = input.toString) && !isObject$c(val = call$s(fn, input))) return val;
-  if (isCallable$n(fn = input.valueOf) && !isObject$c(val = call$s(fn, input))) return val;
-  if (pref !== 'string' && isCallable$n(fn = input.toString) && !isObject$c(val = call$s(fn, input))) return val;
+  if (pref === 'string' && isCallable$n(fn = input.toString) && !isObject$d(val = call$s(fn, input))) return val;
+  if (isCallable$n(fn = input.valueOf) && !isObject$d(val = call$s(fn, input))) return val;
+  if (pref !== 'string' && isCallable$n(fn = input.toString) && !isObject$d(val = call$s(fn, input))) return val;
   throw new $TypeError$i("Can't convert object to primitive value");
 };
 
 var call$r = functionCall;
-var isObject$b = isObject$f;
+var isObject$c = isObject$g;
 var isSymbol$2 = isSymbol$3;
 var getMethod$6 = getMethod$7;
 var ordinaryToPrimitive = ordinaryToPrimitive$1;
@@ -436,13 +436,13 @@ var TO_PRIMITIVE = wellKnownSymbol$l('toPrimitive');
 // `ToPrimitive` abstract operation
 // https://tc39.es/ecma262/#sec-toprimitive
 var toPrimitive$1 = function (input, pref) {
-  if (!isObject$b(input) || isSymbol$2(input)) return input;
+  if (!isObject$c(input) || isSymbol$2(input)) return input;
   var exoticToPrim = getMethod$6(input, TO_PRIMITIVE);
   var result;
   if (exoticToPrim) {
     if (pref === undefined) pref = 'default';
     result = call$r(exoticToPrim, input, pref);
-    if (!isObject$b(result) || isSymbol$2(result)) return result;
+    if (!isObject$c(result) || isSymbol$2(result)) return result;
     throw new $TypeError$h("Can't convert object to primitive value");
   }
   if (pref === undefined) pref = 'number';
@@ -804,7 +804,7 @@ var createNonEnumerableProperty$a = DESCRIPTORS$f ? function (object, key, value
 
 var NATIVE_WEAK_MAP = weakMapBasicDetection;
 var global$j = global$r;
-var isObject$a = isObject$f;
+var isObject$b = isObject$g;
 var createNonEnumerableProperty$9 = createNonEnumerableProperty$a;
 var hasOwn$e = hasOwnProperty_1;
 var shared$1 = sharedStoreExports;
@@ -823,7 +823,7 @@ var enforce = function (it) {
 var getterFor = function (TYPE) {
   return function (it) {
     var state;
-    if (!isObject$a(it) || (state = get(it)).type !== TYPE) {
+    if (!isObject$b(it) || (state = get(it)).type !== TYPE) {
       throw new TypeError$2('Incompatible receiver, ' + TYPE + ' required');
     } return state;
   };
@@ -1195,7 +1195,7 @@ var objectGetPrototypeOf = CORRECT_PROTOTYPE_GETTER ? $Object$1.getPrototypeOf :
 
 var fails$m = fails$w;
 var isCallable$g = isCallable$s;
-var isObject$9 = isObject$f;
+var isObject$a = isObject$g;
 var getPrototypeOf$2 = objectGetPrototypeOf;
 var defineBuiltIn$7 = defineBuiltIn$9;
 var wellKnownSymbol$j = wellKnownSymbol$m;
@@ -1218,7 +1218,7 @@ if ([].keys) {
   }
 }
 
-var NEW_ITERATOR_PROTOTYPE = !isObject$9(IteratorPrototype$4) || fails$m(function () {
+var NEW_ITERATOR_PROTOTYPE = !isObject$a(IteratorPrototype$4) || fails$m(function () {
   var test = {};
   // FF44- legacy iterators case
   return IteratorPrototype$4[ITERATOR$7].call(test) !== test;
@@ -1278,10 +1278,10 @@ var functionUncurryThisAccessor = function (object, key, method) {
   } catch (error) { /* empty */ }
 };
 
-var isObject$8 = isObject$f;
+var isObject$9 = isObject$g;
 
 var isPossiblePrototype$1 = function (argument) {
-  return isObject$8(argument) || argument === null;
+  return isObject$9(argument) || argument === null;
 };
 
 var isPossiblePrototype = isPossiblePrototype$1;
@@ -1296,7 +1296,7 @@ var aPossiblePrototype$1 = function (argument) {
 
 /* eslint-disable no-proto -- safe */
 var uncurryThisAccessor$1 = functionUncurryThisAccessor;
-var isObject$7 = isObject$f;
+var isObject$8 = isObject$g;
 var requireObjectCoercible$b = requireObjectCoercible$e;
 var aPossiblePrototype = aPossiblePrototype$1;
 
@@ -1316,7 +1316,7 @@ var objectSetPrototypeOf = Object.setPrototypeOf || ('__proto__' in {} ? functio
   return function setPrototypeOf(O, proto) {
     requireObjectCoercible$b(O);
     aPossiblePrototype(proto);
-    if (!isObject$7(O)) return O;
+    if (!isObject$8(O)) return O;
     if (CORRECT_SETTER) setter(O, proto);
     else O.__proto__ = proto;
     return O;
@@ -1696,7 +1696,7 @@ var toString$j = function (argument) {
   return $String$1(argument);
 };
 
-var isObject$6 = isObject$f;
+var isObject$7 = isObject$g;
 var classof$7 = classofRaw$2;
 var wellKnownSymbol$d = wellKnownSymbol$m;
 
@@ -1706,7 +1706,7 @@ var MATCH$2 = wellKnownSymbol$d('match');
 // https://tc39.es/ecma262/#sec-isregexp
 var isRegexp = function (it) {
   var isRegExp;
-  return isObject$6(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$7(it) === 'RegExp');
+  return isObject$7(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$7(it) === 'RegExp');
 };
 
 var isRegExp$1 = isRegexp;
@@ -1788,7 +1788,7 @@ var proxyAccessor$2 = function (Target, Source, key) {
 };
 
 var isCallable$d = isCallable$s;
-var isObject$5 = isObject$f;
+var isObject$6 = isObject$g;
 var setPrototypeOf$2 = objectSetPrototypeOf;
 
 // makes subclassing work correct for wrapped built-ins
@@ -1800,7 +1800,7 @@ var inheritIfRequired$2 = function ($this, dummy, Wrapper) {
     // we haven't completely correct pre-ES6 way for getting `new.target`, so use this
     isCallable$d(NewTarget = dummy.constructor) &&
     NewTarget !== Wrapper &&
-    isObject$5(NewTargetPrototype = NewTarget.prototype) &&
+    isObject$6(NewTargetPrototype = NewTarget.prototype) &&
     NewTargetPrototype !== Wrapper.prototype
   ) setPrototypeOf$2($this, NewTargetPrototype);
   return $this;
@@ -1812,13 +1812,13 @@ var normalizeStringArgument$1 = function (argument, $default) {
   return argument === undefined ? arguments.length < 2 ? '' : $default : toString$h(argument);
 };
 
-var isObject$4 = isObject$f;
+var isObject$5 = isObject$g;
 var createNonEnumerableProperty$5 = createNonEnumerableProperty$a;
 
 // `InstallErrorCause` abstract operation
 // https://tc39.es/proposal-error-cause/#sec-errorobjects-install-error-cause
 var installErrorCause$1 = function (O, options) {
-  if (isObject$4(options) && 'cause' in options) {
+  if (isObject$5(options) && 'cause' in options) {
     createNonEnumerableProperty$5(O, 'cause', options.cause);
   }
 };
@@ -4278,7 +4278,7 @@ var setToStringTag = setToStringTag$4;
 var setSpecies$1 = setSpecies$2;
 var aCallable$9 = aCallable$j;
 var isCallable$3 = isCallable$s;
-var isObject$3 = isObject$f;
+var isObject$4 = isObject$g;
 var anInstance = anInstance$2;
 var speciesConstructor$1 = speciesConstructor$2;
 var task = task$1.set;
@@ -4320,7 +4320,7 @@ var Internal, OwnPromiseCapability, PromiseWrapper, nativeThen;
 // helpers
 var isThenable = function (it) {
   var then;
-  return isObject$3(it) && isCallable$3(then = it.then) ? then : false;
+  return isObject$4(it) && isCallable$3(then = it.then) ? then : false;
 };
 
 var callReaction = function (reaction, state) {
@@ -4710,12 +4710,12 @@ $$n({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, {
 });
 
 var anObject$8 = anObject$s;
-var isObject$2 = isObject$f;
+var isObject$3 = isObject$g;
 var newPromiseCapability = newPromiseCapability$2;
 
 var promiseResolve$1 = function (C, x) {
   anObject$8(C);
-  if (isObject$2(x) && x.constructor === C) return x;
+  if (isObject$3(x) && x.constructor === C) return x;
   var promiseCapability = newPromiseCapability.f(C);
   var resolve = promiseCapability.resolve;
   resolve(x);
@@ -5212,14 +5212,14 @@ const RequiredTextLabel = styled.label(_t3$5 || (_t3$5 = _$a`
   line-height: var(--goa-line-height-1);
   font-style: normal;
 `));
-const PageReviewNameCol = styled.td(_t4$5 || (_t4$5 = _$a`
+styled.td(_t4$5 || (_t4$5 = _$a`
   width: 40%;
   padding-top: var(--goa-space-s);
   padding-bottom: var(--goa-space-s);
   padding-right: var(--goa-space-m);
   vertical-align: top;
 `));
-const PageReviewValueCol = styled.td(_t5$4 || (_t5$4 = _$a`
+styled.td(_t5$4 || (_t5$4 = _$a`
   width: 40%;
   text-align: left;
   vertical-align: top;
@@ -5463,7 +5463,7 @@ var getBuiltIn$1 = getBuiltIn$b;
 var uncurryThis$8 = functionUncurryThis;
 var call$6 = functionCall;
 var isCallable$1 = isCallable$s;
-var isObject$1 = isObject$f;
+var isObject$2 = isObject$g;
 var isArray$2 = isArray$5;
 var hasOwn$1 = hasOwnProperty_1;
 var toString$8 = toString$j;
@@ -5510,7 +5510,7 @@ var internalize = function (holder, name, reviver, node) {
   var unmodified = node && val === node.value;
   var context = unmodified && typeof node.source == 'string' ? { source: node.source } : {};
   var elementRecordsLen, keys, len, i, P;
-  if (isObject$1(val)) {
+  if (isObject$2(val)) {
     var nodeIsArray = isArray$2(val);
     var nodes = unmodified ? node.nodes : nodeIsArray ? [] : {};
     if (nodeIsArray) {
@@ -6591,6 +6591,143 @@ const JsonFormsStepperContextProvider = ({
   });
 };
 
+var $$9 = _export;
+var iterate$1 = iterate$a;
+var aCallable$2 = aCallable$j;
+var anObject$4 = anObject$s;
+var getIteratorDirect$2 = getIteratorDirect$a;
+
+// `Iterator.prototype.every` method
+// https://github.com/tc39/proposal-iterator-helpers
+$$9({ target: 'Iterator', proto: true, real: true }, {
+  every: function every(predicate) {
+    anObject$4(this);
+    aCallable$2(predicate);
+    var record = getIteratorDirect$2(this);
+    var counter = 0;
+    return !iterate$1(record, function (value, stop) {
+      if (!predicate(value, counter++)) return stop();
+    }, { IS_RECORD: true, INTERRUPTED: true }).stopped;
+  }
+});
+
+const isObject$1 = v => v !== null && typeof v === 'object' && !Array.isArray(v);
+const splitPath = path => path.replace(/^#\/properties\//, '').replace(/\//g, '.').split('.').filter(Boolean);
+const getDataAt = (rootData, pathSegs) => {
+  let cur = rootData;
+  for (const seg of pathSegs) {
+    if (cur == null) return undefined;
+    if (Array.isArray(cur) && /^\d+$/.test(seg)) {
+      cur = cur[Number(seg)];
+    } else {
+      cur = cur[seg];
+    }
+  }
+  return cur;
+};
+const compileAndTest = (ajv, schema, data) => {
+  var _validate$errors;
+  const validate = ajv.compile(schema);
+  const ok = validate(data);
+  return {
+    valid: ok,
+    errors: (_validate$errors = validate.errors) != null ? _validate$errors : undefined
+  };
+};
+const pickBranch = (ajv, branches, data, strategy) => {
+  const results = branches.map(s => compileAndTest(ajv, s, data));
+  const validIdx = results.map((r, i) => r.valid ? i : -1).filter(i => i >= 0);
+  if (validIdx.length > 0) {
+    if (strategy === 'union') return validIdx.map(i => branches[i]);
+    if (strategy === 'intersection') return validIdx.map(i => branches[i]);
+    // bestMatch
+    return [branches[validIdx[0]]];
+  }
+  if (strategy === 'bestMatch') {
+    let best = 0;
+    let bestCount = Number.POSITIVE_INFINITY;
+    results.forEach((r, i) => {
+      var _r$errors$length, _r$errors;
+      const c = (_r$errors$length = (_r$errors = r.errors) == null ? void 0 : _r$errors.length) != null ? _r$errors$length : 9999;
+      if (c < bestCount) {
+        bestCount = c;
+        best = i;
+      }
+    });
+    return [branches[best]];
+  }
+  return branches;
+};
+const mergeSets = (a, b) => {
+  b.forEach(x => a.add(x));
+};
+const intersectSets = sets => {
+  if (sets.length === 0) return new Set();
+  const [first, ...rest] = sets;
+  const out = new Set();
+  first.forEach(x => {
+    if (rest.every(s => s.has(x))) out.add(x);
+  });
+  return out;
+};
+const collectRequired = (ajv, schema, rootSchema, rootData, basePath, strategy) => {
+  const requiredPaths = new Set();
+  if (!schema || typeof schema !== 'object') return requiredPaths;
+  const dataHere = basePath ? getDataAt(rootData, splitPath(basePath)) : rootData;
+  if (schema.if && (schema.then || schema.else)) {
+    const ifResult = compileAndTest(ajv, schema.if, dataHere);
+    const branch = ifResult.valid ? schema.then : schema.else;
+    if (branch) {
+      mergeSets(requiredPaths, collectRequired(ajv, branch, rootSchema, rootData, basePath, strategy));
+    }
+  }
+  if (Array.isArray(schema.allOf)) {
+    schema.allOf.forEach(sub => {
+      mergeSets(requiredPaths, collectRequired(ajv, sub, rootSchema, rootData, basePath, strategy));
+    });
+  }
+  const altKey = Array.isArray(schema.oneOf) ? 'oneOf' : Array.isArray(schema.anyOf) ? 'anyOf' : null;
+  if (altKey) {
+    const branches = schema[altKey];
+    const chosen = pickBranch(ajv, branches, dataHere, strategy);
+    if (strategy === 'intersection') {
+      const sets = chosen.map(sub => collectRequired(ajv, sub, rootSchema, rootData, basePath, strategy));
+      return intersectSets([requiredPaths, ...sets]);
+    }
+    chosen.forEach(sub => {
+      mergeSets(requiredPaths, collectRequired(ajv, sub, rootSchema, rootData, basePath, strategy));
+    });
+  }
+  if (Array.isArray(schema.required) && isObject$1(schema.properties)) {
+    for (const key of schema.required) {
+      requiredPaths.add(basePath ? `${basePath}.${key}` : key);
+    }
+  }
+  if (isObject$1(schema.properties)) {
+    for (const [key, subSchema] of Object.entries(schema.properties)) {
+      const nextPath = basePath ? `${basePath}.${key}` : key;
+      mergeSets(requiredPaths, collectRequired(ajv, subSchema, rootSchema, rootData, nextPath, strategy));
+    }
+  }
+  if (schema.type === 'array' && schema.items) {
+    const nextPath = basePath ? `${basePath}.0` : '0';
+    mergeSets(requiredPaths, collectRequired(ajv, schema.items, rootSchema, rootData, nextPath, strategy));
+  }
+  return requiredPaths;
+};
+const isRequiredBySchema = (rootSchema, rootData, path, options = {}) => {
+  var _options$ajv, _options$strategy;
+  if (!path) return false;
+  const ajv = (_options$ajv = options.ajv) != null ? _options$ajv : new Ajv({
+    allErrors: true,
+    strict: false
+  });
+  const strategy = (_options$strategy = options.strategy) != null ? _options$strategy : 'bestMatch';
+  const reqSet = collectRequired(ajv, rootSchema, rootSchema, rootData, '', strategy);
+  const dotPath = splitPath(path).join('.');
+  return reqSet.has(dotPath);
+};
+
 const GoAInputBaseControl = props => {
   var _stepperState$categor, _uischema$options$com, _uischema$options, _uischema$options2, _uischema$options3;
   const {
@@ -6613,6 +6750,10 @@ const GoAInputBaseControl = props => {
   const currentCategory = stepperState == null || (_stepperState$categor = stepperState.categories) == null ? void 0 : _stepperState$categor[stepperState == null ? void 0 : stepperState.activeId];
   const showReviewLink = currentCategory == null ? void 0 : currentCategory.showReviewPageLink;
   const [isVisited, setIsVisited] = useState(skipInitialValidation === true);
+  const {
+    core
+  } = useJsonForms();
+  const rootData = core == null ? void 0 : core.data;
   useEffect(() => {
     if (showReviewLink === true && !isStepperReview) {
       setIsVisited(true);
@@ -6651,6 +6792,9 @@ const GoAInputBaseControl = props => {
   if (modifiedErrors === 'must be equal to one of the allowed values') {
     modifiedErrors = '';
   }
+  const requiredNow = required || isRequiredBySchema(props.rootSchema, rootData, props.path, {
+    strategy: 'bestMatch'
+  });
   return jsx(JsonFormRegisterProvider, {
     defaultRegisters: undefined,
     children: jsx(Visible, {
@@ -6658,7 +6802,7 @@ const GoAInputBaseControl = props => {
       children: jsx(FormFieldWrapper, {
         ref: controlRef,
         children: jsx(GoabFormItem, {
-          requirement: (_uischema$options$com = uischema == null || (_uischema$options = uischema.options) == null || (_uischema$options = _uischema$options.componentProps) == null ? void 0 : _uischema$options.requirement) != null ? _uischema$options$com : required || getRequiredIfThen(props).length > 0 ? 'required' : undefined,
+          requirement: (_uischema$options$com = uischema == null || (_uischema$options = uischema.options) == null || (_uischema$options = _uischema$options.componentProps) == null ? void 0 : _uischema$options.requirement) != null ? _uischema$options$com : requiredNow ? 'required' : undefined,
           error: isVisited === true ? modifiedErrors : undefined,
           testId: isStepperReview === true ? `review-base-${path}` : path,
           label: (props == null ? void 0 : props.noLabel) === true ? '' : labelToUpdate,
@@ -6676,7 +6820,7 @@ const GoAInputBaseControl = props => {
   });
 };
 
-var $$9 = _export;
+var $$8 = _export;
 var DESCRIPTORS = descriptors;
 var global$2 = global$r;
 var uncurryThis$5 = functionUncurryThis;
@@ -6728,14 +6872,14 @@ if (DESCRIPTORS && isCallable(NativeSymbol) && (!('description' in SymbolPrototy
     }
   });
 
-  $$9({ global: true, constructor: true, forced: true }, {
+  $$8({ global: true, constructor: true, forced: true }, {
     Symbol: SymbolWrapper
   });
 }
 
 var call$3 = functionCall;
 var fixRegExpWellKnownSymbolLogic$1 = fixRegexpWellKnownSymbolLogic;
-var anObject$4 = anObject$s;
+var anObject$3 = anObject$s;
 var isNullOrUndefined$1 = isNullOrUndefined$7;
 var toLength$3 = toLength$7;
 var toString$6 = toString$j;
@@ -6757,7 +6901,7 @@ fixRegExpWellKnownSymbolLogic$1('match', function (MATCH, nativeMatch, maybeCall
     // `RegExp.prototype[@@match]` method
     // https://tc39.es/ecma262/#sec-regexp.prototype-@@match
     function (string) {
-      var rx = anObject$4(this);
+      var rx = anObject$3(this);
       var S = toString$6(string);
       var res = maybeCallNative(nativeMatch, rx, S);
 
@@ -6826,13 +6970,13 @@ var stringTrimForced = function (METHOD_NAME) {
   });
 };
 
-var $$8 = _export;
+var $$7 = _export;
 var $trim = stringTrim.trim;
 var forcedStringTrimMethod = stringTrimForced;
 
 // `String.prototype.trim` method
 // https://tc39.es/ecma262/#sec-string.prototype.trim
-$$8({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
+$$7({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
   trim: function trim() {
     return $trim(this);
   }
@@ -7436,13 +7580,13 @@ var userAgent = engineUserAgent;
 
 var stringPadWebkitBug = /Version\/10(?:\.\d+){1,2}(?: [\w./]+)?(?: Mobile\/\w+)? Safari\//.test(userAgent);
 
-var $$7 = _export;
+var $$6 = _export;
 var $padStart = stringPad.start;
 var WEBKIT_BUG = stringPadWebkitBug;
 
 // `String.prototype.padStart` method
 // https://tc39.es/ecma262/#sec-string.prototype.padstart
-$$7({ target: 'String', proto: true, forced: WEBKIT_BUG }, {
+$$6({ target: 'String', proto: true, forced: WEBKIT_BUG }, {
   padStart: function padStart(maxLength /* , fillString = ' ' */) {
     return $padStart(this, maxLength, arguments.length > 1 ? arguments[1] : undefined);
   }
@@ -8437,7 +8581,7 @@ const GoAInputBaseTableReviewControl = withJsonFormsControlProps(GoAInputBaseTab
 var call$2 = functionCall;
 var uncurryThis$2 = functionUncurryThis;
 var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic;
-var anObject$3 = anObject$s;
+var anObject$2 = anObject$s;
 var isNullOrUndefined = isNullOrUndefined$7;
 var requireObjectCoercible$1 = requireObjectCoercible$e;
 var speciesConstructor = speciesConstructor$2;
@@ -8497,7 +8641,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa
     // NOTE: This cannot be properly polyfilled in engines that don't support
     // the 'y' flag.
     function (string, limit) {
-      var rx = anObject$3(this);
+      var rx = anObject$2(this);
       var S = toString$2(string);
 
       if (!BUGGY) {
@@ -9138,7 +9282,7 @@ var flattenIntoArray_1 = flattenIntoArray$2;
 
 var isArray = isArray$5;
 var isConstructor = isConstructor$2;
-var isObject = isObject$f;
+var isObject = isObject$g;
 var wellKnownSymbol = wellKnownSymbol$m;
 
 var SPECIES = wellKnownSymbol('species');
@@ -9167,7 +9311,7 @@ var arraySpeciesCreate$2 = function (originalArray, length) {
   return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
 };
 
-var $$6 = _export;
+var $$5 = _export;
 var flattenIntoArray$1 = flattenIntoArray_1;
 var toObject$1 = toObject$9;
 var lengthOfArrayLike$1 = lengthOfArrayLike$9;
@@ -9176,7 +9320,7 @@ var arraySpeciesCreate$1 = arraySpeciesCreate$2;
 
 // `Array.prototype.flat` method
 // https://tc39.es/ecma262/#sec-array.prototype.flat
-$$6({ target: 'Array', proto: true }, {
+$$5({ target: 'Array', proto: true }, {
   flat: function flat(/* depthArg = 1 */) {
     var depthArg = arguments.length ? arguments[0] : undefined;
     var O = toObject$1(this);
@@ -9194,28 +9338,8 @@ var addToUnscopables$1 = addToUnscopables$5;
 // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
 addToUnscopables$1('flat');
 
-var $$5 = _export;
-var iterate$1 = iterate$a;
-var aCallable$2 = aCallable$j;
-var anObject$2 = anObject$s;
-var getIteratorDirect$2 = getIteratorDirect$a;
-
-// `Iterator.prototype.every` method
-// https://github.com/tc39/proposal-iterator-helpers
-$$5({ target: 'Iterator', proto: true, real: true }, {
-  every: function every(predicate) {
-    anObject$2(this);
-    aCallable$2(predicate);
-    var record = getIteratorDirect$2(this);
-    var counter = 0;
-    return !iterate$1(record, function (value, stop) {
-      if (!predicate(value, counter++)) return stop();
-    }, { IS_RECORD: true, INTERRUPTED: true }).stopped;
-  }
-});
-
 const isPropertiesMatch = (obj, props, isExactMatch) => {
-  if (isObject$g(obj)) {
+  if (isObject$h(obj)) {
     const keys = Object.keys(obj);
     if (isExactMatch) {
       return props.every(attr => keys.includes(attr)) && keys.length === props.length;
@@ -9235,27 +9359,24 @@ const isFullName = createSchemaMatchTester(['firstName', 'middleName', 'lastName
 const FullNameTester = rankWith(4, isFullName);
 
 const FullNameControlReview = props => {
-  var _props$uischema, _props$data, _props$data2, _props$data3, _props$data4;
+  var _props$uischema;
   const context = useContext(JsonFormsStepperContext);
   const stepId = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.stepId;
   const {
     label,
     errors,
     required,
-    uischema
+    uischema,
+    data,
+    id
   } = props;
-  const renderRow = (label, value, testId) => jsx("tr", {
+  const renderRow = (fieldLabel, value, testId) => jsx("tr", {
     children: jsxs(PageReviewContainer, {
       colSpan: 3,
-      children: [jsxs(ReviewHeader, {
-        children: [jsx(ReviewLabel, {
-          children: label
-        }), jsx(GoabButton, {
-          type: "tertiary",
-          size: "compact",
-          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-          children: "Change"
-        })]
+      children: [jsx(ReviewHeader, {
+        children: jsx(ReviewLabel, {
+          children: fieldLabel
+        })
       }), jsx(ReviewValue, {
         children: jsx("div", {
           "data-testid": testId,
@@ -9263,15 +9384,23 @@ const FullNameControlReview = props => {
         })
       })]
     })
-  });
+  }, testId);
   return jsxs(Fragment, {
     children: [jsx("tr", {
       "data-testid": "full-name-header",
       children: jsxs(PageReviewContainer, {
         colSpan: 3,
-        children: [jsxs(ReviewLabel, {
-          children: [label, required && jsx(RequiredTextLabel, {
-            children: " (required)"
+        children: [jsxs(ReviewHeader, {
+          children: [jsxs(ReviewLabel, {
+            children: [label, required && jsx(RequiredTextLabel, {
+              children: " (required)"
+            })]
+          }), stepId !== undefined && jsx(GoabButton, {
+            type: "tertiary",
+            size: "compact",
+            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+            testId: "full-name-change-btn",
+            children: "Change"
           })]
         }), errors && jsxs(WarningIconDiv, {
           children: [jsx(GoabIcon, {
@@ -9280,7 +9409,7 @@ const FullNameControlReview = props => {
           }), errors != null && errors.includes('is a required property') ? `${label} is required` : errors]
         })]
       })
-    }), renderRow('First name', (_props$data = props.data) == null ? void 0 : _props$data.firstName, `firstName-control-${props.id}`), ((_props$data2 = props.data) == null ? void 0 : _props$data2.middleName) && renderRow('Middle name', (_props$data3 = props.data) == null ? void 0 : _props$data3.middleName, `middleName-control-${props.id}`), renderRow('Last name', (_props$data4 = props.data) == null ? void 0 : _props$data4.lastName, `lastName-control-${props.id}`)]
+    }), renderRow('First name', data == null ? void 0 : data.firstName, `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, `lastName-control-${id}`)]
   });
 };
 const GoAInputBaseFullNameControlReview = withJsonFormsAllOfProps(FullNameControlReview);
@@ -9293,32 +9422,53 @@ const FullNameDobReviewControl = props => {
   const {
     data,
     id,
-    uischema
+    uischema,
+    label,
+    required,
+    errors
   } = props;
   const context = useContext(JsonFormsStepperContext);
   const stepId = uischema == null || (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.stepId;
-  const renderRow = (label, value, testId) => jsxs("tr", {
-    children: [jsx(PageReviewNameCol, {
-      children: jsx("strong", {
-        children: label
-      })
-    }), jsx(PageReviewValueCol, {
-      children: jsx("div", {
-        "data-testid": testId,
-        children: value
-      })
-    }), jsx("td", {
-      className: "goa-table-width-limit",
-      children: jsx(GoabButton, {
-        type: "tertiary",
-        size: "compact",
-        onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-        children: "Change"
-      })
-    })]
-  });
+  const renderRow = (fieldLabel, value, testId) => jsx("tr", {
+    children: jsxs(PageReviewContainer, {
+      colSpan: 3,
+      children: [jsx(ReviewHeader, {
+        children: jsx(ReviewLabel, {
+          children: fieldLabel
+        })
+      }), jsx(ReviewValue, {
+        children: jsx("div", {
+          "data-testid": testId,
+          children: value
+        })
+      })]
+    })
+  }, testId);
   return jsxs(Fragment, {
-    children: [renderRow('First name', data == null ? void 0 : data.firstName, `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, `lastName-control-${id}`), renderRow('Date of birth', data == null ? void 0 : data.dateOfBirth, `dob-control-${id}`)]
+    children: [jsx("tr", {
+      "data-testid": "fullname-dob-header",
+      children: jsxs(PageReviewContainer, {
+        colSpan: 3,
+        children: [jsxs(ReviewHeader, {
+          children: [jsxs(ReviewLabel, {
+            children: [label, required && jsx(RequiredTextLabel, {
+              children: " (required)"
+            })]
+          }), stepId !== undefined && jsx(GoabButton, {
+            type: "tertiary",
+            size: "compact",
+            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+            testId: "fullname-dob-change-btn",
+            children: "Change"
+          })]
+        }), errors && jsxs(WarningIconDiv, {
+          children: [jsx(GoabIcon, {
+            type: "warning",
+            size: "small"
+          }), errors != null && errors.includes('is a required property') ? `${label} is required` : errors]
+        })]
+      })
+    }), renderRow('First name', data == null ? void 0 : data.firstName, `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, `lastName-control-${id}`), renderRow('Date of birth', data == null ? void 0 : data.dateOfBirth, `dob-control-${id}`)]
   });
 };
 const GoAInputBaseFullNameDobControlReview = withJsonFormsAllOfProps(FullNameDobReviewControl);
@@ -11672,10 +11822,11 @@ const AddressLoopUpControlTableReview = props => {
     data,
     schema,
     uischema,
-    path
+    path,
+    label,
+    required
   } = props;
   const jsonForms = useJsonForms();
-  // eslint-disable-next-line
   const stepId = (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.stepId;
   const formStepperCtx = useContext(JsonFormsStepperContext);
   const isAlbertaAddress = (schema == null || (_schema$properties2 = schema.properties) == null || (_schema$properties2 = _schema$properties2.subdivisionCode) == null ? void 0 : _schema$properties2.const) === 'AB';
@@ -11752,7 +11903,9 @@ const AddressLoopUpControlTableReview = props => {
     var _schema$required;
     return schema == null || (_schema$required = schema.required) == null ? void 0 : _schema$required.includes(propName);
   };
-  const renderRow = (label, value, propName, showButton = true) => {
+  // Build the target scope for the address control
+  const targetScope = (uischema == null ? void 0 : uischema.scope) || (path ? `#/properties/${path}` : undefined);
+  const renderRow = (label, value, propName, showButton = false) => {
     var _error, _error2;
     let error = getError(propName);
     const required = isRequired(propName);
@@ -11767,10 +11920,11 @@ const AddressLoopUpControlTableReview = props => {
             children: [label, required && jsx(RequiredTextLabel, {
               children: " (required)"
             })]
-          }), showButton && jsx(GoabButton, {
+          }), showButton && stepId !== undefined && jsx(GoabButton, {
             type: "tertiary",
             size: "compact",
-            onClick: () => formStepperCtx == null ? void 0 : formStepperCtx.goToPage(stepId, uischema.scope),
+            onClick: () => formStepperCtx == null ? void 0 : formStepperCtx.goToPage(stepId, targetScope),
+            testId: "address-change-btn",
             children: "Change"
           })]
         }), jsxs(ReviewValue, {
@@ -11782,7 +11936,7 @@ const AddressLoopUpControlTableReview = props => {
           })]
         })]
       })
-    });
+    }, propName);
   };
   return jsxs(Fragment, {
     children: [jsx("tr", {
@@ -11793,7 +11947,7 @@ const AddressLoopUpControlTableReview = props => {
           children: `${isAlbertaAddress ? 'Alberta' : 'Canada'} postal address`
         })
       })
-    }), renderRow('Address line 1', data == null ? void 0 : data.addressLine1, 'addressLine1'), (data == null ? void 0 : data.addressLine2) && renderRow('Address line 2', data.addressLine2, 'addressLine2'), renderRow('City', data == null ? void 0 : data.municipality, 'municipality'), renderRow('Postal Code', data == null ? void 0 : data.postalCode, 'postalCode'), renderRow('Province', provinceLabel, 'subdivisionCode'), renderRow('Country', 'Canada', 'country', false)]
+    }), renderRow('Address line 1', data == null ? void 0 : data.addressLine1, 'addressLine1', true), (data == null ? void 0 : data.addressLine2) && renderRow('Address line 2', data.addressLine2, 'addressLine2', false), renderRow('City', data == null ? void 0 : data.municipality, 'municipality', false), renderRow('Postal Code', data == null ? void 0 : data.postalCode, 'postalCode', false), renderRow('Province', provinceLabel, 'subdivisionCode', false), renderRow('Country', 'Canada', 'country', false)]
   });
 };
 
@@ -14047,10 +14201,12 @@ const AddressLookUpControl = props => {
   } = props;
   const isAlbertaAddress = (schema == null || (_schema$properties = schema.properties) == null || (_schema$properties = _schema$properties.subdivisionCode) == null ? void 0 : _schema$properties.const) === 'AB';
   const formCtx = useContext(JsonFormContext);
+  const formStepperCtx = useContext(JsonFormsStepperContext);
   const formHost = formCtx == null ? void 0 : formCtx.formUrl;
   const formUrl = `${formHost}/${ADDRESS_PATH}`;
   const autocompletion = (uischema == null || (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.autocomplete) !== false;
   const [open, setOpen] = useState(false);
+  const addressContainerRef = useRef(null);
   const label = typeof (uischema == null ? void 0 : uischema.label) === 'string' && uischema.label ? uischema.label : '';
   let defaultAddress = {};
   if (isAlbertaAddress) {
@@ -14178,74 +14334,102 @@ const AddressLookUpControl = props => {
       }
     }
   }, [activeIndex]);
+  // Handle focus when navigated from review page
+  useEffect(() => {
+    const stepperState = formStepperCtx == null || formStepperCtx.selectStepperState == null ? void 0 : formStepperCtx.selectStepperState();
+    if (stepperState != null && stepperState.targetScope && uischema != null && uischema.scope && stepperState.targetScope === uischema.scope && addressContainerRef.current) {
+      const addressInput = addressContainerRef.current.querySelector('goa-input[name="addressLine1"]');
+      if (addressInput) {
+        addressContainerRef.current.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center'
+        });
+        setTimeout(() => {
+          if (typeof addressInput.focus === 'function') {
+            addressInput.focus();
+          }
+          const shadowRoot = addressInput.shadowRoot;
+          if (shadowRoot) {
+            const actualInput = shadowRoot.querySelector('input');
+            if (actualInput instanceof HTMLElement) {
+              actualInput.focus();
+            }
+          }
+        }, 300);
+      }
+    }
+  }, [formStepperCtx, uischema == null ? void 0 : uischema.scope]);
   const readOnly = (_uischema$options$com = uischema == null || (_uischema$options2 = uischema.options) == null || (_uischema$options2 = _uischema$options2.componentProps) == null ? void 0 : _uischema$options2.readOnly) != null ? _uischema$options$com : false;
-  return jsxs(Visible, {
+  return jsx(Visible, {
     visible: visible,
-    children: [renderHelp(), jsx("h3", {
-      children: label
-    }), jsx(GoabFormItem, {
-      requirement: 'required',
-      label: 'Street address or P.O. box',
-      error: (_errors$addressLine = errors == null ? void 0 : errors['addressLine1']) != null ? _errors$addressLine : '',
-      "data-testId": "form-address-line1",
-      children: jsxs(SearchBox, {
-        children: [jsxs("div", {
-          className: "input-container",
-          children: [jsx(GoabInput, {
-            leadingIcon: autocompletion && enabled ? 'search' : undefined,
-            id: "goaInput",
-            name: "addressLine1",
-            testId: "address-form-address1",
-            readonly: readOnly,
-            disabled: !enabled,
-            ariaLabel: 'address-form-address1',
-            placeholder: "Start typing the first line of your address, required.",
-            value: (address == null ? void 0 : address.addressLine1) || '',
-            onChange: detail => handleDropdownChange(detail.value),
-            onBlur: detail => handleRequiredFieldBlur(detail.name),
-            width: "100%",
-            onKeyPress: detail => {
-              if (open) {
-                const newIndex = handleAddressKeyDown(detail.key, detail.value, activeIndex, suggestions, val => handleInputChange('addressLine1', val), suggestion => handleSuggestionClick(suggestion));
-                setActiveIndex(newIndex);
+    children: jsxs("div", {
+      ref: addressContainerRef,
+      children: [renderHelp(), jsx("h3", {
+        children: label
+      }), jsx(GoabFormItem, {
+        requirement: 'required',
+        label: 'Street address or P.O. box',
+        error: (_errors$addressLine = errors == null ? void 0 : errors['addressLine1']) != null ? _errors$addressLine : '',
+        "data-testId": "form-address-line1",
+        children: jsxs(SearchBox, {
+          children: [jsxs("div", {
+            className: "input-container",
+            children: [jsx(GoabInput, {
+              leadingIcon: autocompletion && enabled ? 'search' : undefined,
+              id: "goaInput",
+              name: "addressLine1",
+              testId: "address-form-address1",
+              readonly: readOnly,
+              disabled: !enabled,
+              ariaLabel: 'address-form-address1',
+              placeholder: "Start typing the first line of your address, required.",
+              value: (address == null ? void 0 : address.addressLine1) || '',
+              onChange: detail => handleDropdownChange(detail.value),
+              onBlur: detail => handleRequiredFieldBlur(detail.name),
+              width: "100%",
+              onKeyPress: detail => {
+                if (open) {
+                  const newIndex = handleAddressKeyDown(detail.key, detail.value, activeIndex, suggestions, val => handleInputChange('addressLine1', val), suggestion => handleSuggestionClick(suggestion));
+                  setActiveIndex(newIndex);
+                }
               }
-            }
-          }), loading && jsx("div", {
-            className: "input-spinner",
-            children: jsx(GoabSpinner, {
-              type: "infinite",
-              size: "small"
-            })
+            }), loading && jsx("div", {
+              className: "input-spinner",
+              children: jsx(GoabSpinner, {
+                type: "infinite",
+                size: "small"
+              })
+            })]
+          }), !loading && suggestions && autocompletion && jsx("ul", {
+            ref: dropdownRef,
+            className: "suggestions",
+            children: suggestions && autocompletion && open && suggestions.map((suggestion, index) => jsx(ListItem, {
+              "data-index": index,
+              onMouseDown: e => {
+                e.preventDefault();
+                e.stopPropagation();
+              },
+              onClick: () => {
+                handleSuggestionClick(suggestion);
+              },
+              selected: activeIndex,
+              index: index,
+              "data-testId": `listItem-${index}`,
+              children: `${suggestion.Text}  ${suggestion.Description}`
+            }, index))
           })]
-        }), !loading && suggestions && autocompletion && jsx("ul", {
-          ref: dropdownRef,
-          className: "suggestions",
-          children: suggestions && autocompletion && open && suggestions.map((suggestion, index) => jsx(ListItem, {
-            "data-index": index,
-            onMouseDown: e => {
-              e.preventDefault();
-              e.stopPropagation();
-            },
-            onClick: () => {
-              handleSuggestionClick(suggestion);
-            },
-            selected: activeIndex,
-            index: index,
-            "data-testId": `listItem-${index}`,
-            children: `${suggestion.Text}  ${suggestion.Description}`
-          }, index))
-        })]
-      })
-    }), jsx("br", {}), jsx(AddressInputs, {
-      address: address,
-      errors: errors,
-      readOnly: readOnly,
-      enabled: enabled,
-      handleInputChange: handleInputChange,
-      isAlbertaAddress: isAlbertaAddress,
-      handleOnBlur: handleRequiredFieldBlur,
-      requiredFields: requiredFields
-    })]
+        })
+      }), jsx("br", {}), jsx(AddressInputs, {
+        address: address,
+        errors: errors,
+        readOnly: readOnly,
+        enabled: enabled,
+        handleInputChange: handleInputChange,
+        isAlbertaAddress: isAlbertaAddress,
+        handleOnBlur: handleRequiredFieldBlur,
+        requiredFields: requiredFields
+      })]
+    })
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.45.1",
+  "version": "2.46.0",
   "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/requiredUtil.d.ts

@@ -0,0 +1,10 @@
+import type { JsonSchema7 } from '@jsonforms/core';
+import Ajv from 'ajv';
+type RequiredStrategy = 'bestMatch' | 'union' | 'intersection';
+type Options = {
+    /** anyOf/oneOf required */
+    strategy?: RequiredStrategy;
+    ajv?: Ajv;
+};
+export declare const isRequiredBySchema: (rootSchema: JsonSchema7, rootData: any, path?: string, options?: Options) => boolean;
+export {};