@abgov/jsonforms-components 2.60.0 → 2.60.2

package/index.esm.js

@@ -3713,16 +3713,11 @@ const areAllUppercase = label => {
   return /^[^a-z]*$/.test(label);
 };
 const getExplicitControlLabel = props => {
-  var _props$uischema, _props$schema, _props$uischema2;
-  const optionText = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.text;
-  if (typeof optionText === 'string' && optionText.trim()) {
-    return optionText.trim();
-  }
-  if (typeof ((_props$schema = props.schema) == null ? void 0 : _props$schema.title) === 'string' && props.schema.title.trim()) {
-    return props.schema.title.trim();
-  }
-  const uiLabel = (_props$uischema2 = props.uischema) == null ? void 0 : _props$uischema2.label;
-  if (typeof uiLabel === 'string' && uiLabel.trim()) {
+  var _props$uischema, _props$uischema2, _props$schema;
+  // uischema.label has highest priority. An explicit empty string suppresses the
+  // auto-generated label (and prevents options.text from leaking into the form-item label).
+  const uiLabel = (_props$uischema = props.uischema) == null ? void 0 : _props$uischema.label;
+  if (typeof uiLabel === 'string') {
     return uiLabel.trim();
   }
   if (typeof uiLabel === 'object' && uiLabel !== null && 'text' in uiLabel) {
@@ -3731,6 +3726,13 @@ const getExplicitControlLabel = props => {
       return text.trim();
     }
   }
+  const optionText = (_props$uischema2 = props.uischema) == null || (_props$uischema2 = _props$uischema2.options) == null ? void 0 : _props$uischema2.text;
+  if (typeof optionText === 'string' && optionText.trim()) {
+    return optionText.trim();
+  }
+  if (typeof ((_props$schema = props.schema) == null ? void 0 : _props$schema.title) === 'string' && props.schema.title.trim()) {
+    return props.schema.title.trim();
+  }
   return undefined;
 };
 const getGeneratedLabelFromScope = scope => {
@@ -3744,7 +3746,7 @@ const getGeneratedLabelFromScope = scope => {
 const getControlLabelText = props => {
   var _props$uischema3;
   const explicitLabel = getExplicitControlLabel(props);
-  if (explicitLabel) {
+  if (explicitLabel !== undefined) {
     return explicitLabel;
   }
   if ((_props$uischema3 = props.uischema) != null && (_props$uischema3 = _props$uischema3.scope) != null && _props$uischema3.startsWith('#/')) {
@@ -7286,7 +7288,7 @@ const GoAInputText = props => {
   });
 };
 const InnerGoAInputText = props => {
-  var _ref, _ref2, _schema$default, _uischema$options$com, _uischema$options, _props$uischema, _props$uischema2, _uischema$options2, _uischema$options3, _uischema$options$com2, _uischema$options4, _uischema$options5, _uischema$options6;
+  var _uischema$options$com, _uischema$options, _props$uischema, _props$uischema2, _uischema$options2, _uischema$options3, _uischema$options$com2, _uischema$options4, _uischema$options5, _uischema$options6;
   const {
     data,
     config,
@@ -7302,7 +7304,8 @@ const InnerGoAInputText = props => {
     setIsVisited
   } = props;
   const user = useRegisterUser();
-  const initialValue = (_ref = (_ref2 = (_schema$default = schema.default) != null ? _schema$default : user && autoPopulateValue(user, props)) != null ? _ref2 : data) != null ? _ref : '';
+  const initialValue = data;
+  const [manualInput, setManualInput] = useState(false);
   const [localValue, setLocalValue] = useState(initialValue);
   const debouncedValue = useDebounce(localValue, 300);
   useEffect(() => {
@@ -7311,13 +7314,13 @@ const InnerGoAInputText = props => {
   useEffect(() => {
     if (!user || data) return;
     const autoPopulatedValue = schema.default || user && autoPopulateValue(user, props);
-    if (autoPopulatedValue && autoPopulatedValue !== data) {
+    if (autoPopulatedValue && autoPopulatedValue !== data && !manualInput) {
       handleChange(props.path, autoPopulatedValue);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [schema, user]);
+  }, [user]);
   useEffect(() => {
-    if (typeof handleChange === 'function' && (schema == null ? void 0 : schema.default) !== undefined) {
+    if (typeof handleChange === 'function' && (schema == null ? void 0 : schema.default) !== undefined && !manualInput) {
       handleChange(props.path, schema.default);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -7410,6 +7413,7 @@ const InnerGoAInputText = props => {
           formattedValue = formatSin(detail.value);
         }
         setLocalValue(formattedValue);
+        setManualInput(true);
         if (isVisited === false && setIsVisited) {
           setIsVisited();
         }
@@ -8491,7 +8495,7 @@ const GoABaseInputReviewComponent = props => {
     if (((_uischema$options5 = uischema.options) == null ? void 0 : _uischema$options5.radio) === true) {
       reviewText = data ? `Yes` : `No`;
     } else {
-      reviewText = data ? `Yes (${checkboxLabel})` : `No (${checkboxLabel})`;
+      reviewText = data ? checkboxLabel ? `Yes (${checkboxLabel})` : `Yes` : checkboxLabel ? `No (${checkboxLabel})` : `No`;
     }
   }
   if (isTime) {
@@ -10056,9 +10060,19 @@ const GoAInputBaseTableReview = props => {
   if (activeError && /\sis required$/i.test(activeError)) {
     activeError = `${labelToUpdate} is required`;
   }
+  // For required boolean fields (e.g. anyOf: [{enum: [true]}]), suppress the raw AJV
+  // "must be equal to one of the allowed values" error and show a friendly message instead.
+  if ((schema == null ? void 0 : schema.type) === 'boolean' && activeError && activeError.toLowerCase().includes('must be equal')) {
+    activeError = data === false ? `${labelToUpdate} is required` : undefined;
+  }
   if (required && isNilOrEmptyValue(data, true) && !activeError) {
     activeError = `${labelToUpdate} is required`;
   }
+  // If a required checkbox is unchecked, show only the validation message in
+  // review mode (not a contradictory "No (...)" value line).
+  if ((schema == null ? void 0 : schema.type) === 'boolean' && data === false && activeError && /\sis required$/i.test(activeError)) {
+    reviewText = '';
+  }
   // eslint-disable-next-line
   const stepId = (_uischema$options4 = uischema.options) == null ? void 0 : _uischema$options4.stepId;
   const showInlineValue = reviewText === null || reviewText === undefined || typeof reviewText === 'string' || typeof reviewText === 'number' || /*#__PURE__*/React.isValidElement(reviewText) || Array.isArray(reviewText) && reviewText.length === 0;
@@ -10234,6 +10248,20 @@ const GoAEmailInput = props => {
   const stepperState = formStepperCtx == null || formStepperCtx.selectStepperState == null ? void 0 : formStepperCtx.selectStepperState();
   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 [localValue, setLocalValue] = useState(data);
+  const debouncedValue = useDebounce(localValue, 300);
+  /* istanbul ignore next */
+  useEffect(() => {
+    if (debouncedValue === data) return;
+    // Only sync if debouncedValue differs from data and is not initial empty state
+    if (debouncedValue !== data && (debouncedValue !== '' || data !== undefined)) {
+      onChangeForInputControl({
+        value: debouncedValue,
+        controlProps: props
+      });
+    }
+  }, [debouncedValue]);
+  const [manualInput, setManualInput] = useState(false);
   const [isVisited, setIsVisited] = useState(false);
   useEffect(() => {
     if (showReviewLink === true) {
@@ -10248,7 +10276,7 @@ const GoAEmailInput = props => {
   useEffect(() => {
     if (!user || data) return;
     const autoPopulatedValue = schema.default || user && autoPopulateValue(user, props);
-    if (autoPopulatedValue && autoPopulatedValue !== data) {
+    if (autoPopulatedValue && autoPopulatedValue !== data && !manualInput) {
       handleChange(props.path, autoPopulatedValue);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -10279,14 +10307,11 @@ const GoAEmailInput = props => {
             disabled: !enabled,
             readonly: readOnly,
             onChange: detail => {
+              setManualInput(true);
               if (!isVisited) {
                 setIsVisited(true);
               }
-              onChangeForInputControl({
-                name: detail.name,
-                value: detail.value,
-                controlProps: props
-              });
+              setLocalValue(detail.value);
             },
             onBlur: detail => {
               if (!isVisited) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.60.0",
+  "version": "2.60.2",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",
@@ -20,7 +20,7 @@
     "pluralize": "^8.0.0"
   },
   "dependencies": {
-    "axios": "1.13.5",
+    "axios": "1.15.0",
     "lodash": "^4.17.23",
     "styled-components": "^6.0.0"
   },

package/renderer-catalog.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": "1.0.0",
-  "generatedAt": "2026-04-08T16:11:13.566Z",
-  "sourceCommit": "6e09c179d6bc219c658e0626bf92dcce5f77c112",
+  "generatedAt": "2026-04-15T21:58:29.714Z",
+  "sourceCommit": "437fc5583187822f070dbda79b67b20daa47557d",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 33,
   "renderers": [