@abgov/jsonforms-components 2.43.1 → 2.43.3

package/index.esm.js

@@ -1,7 +1,7 @@
 import * as runtime from 'react/jsx-runtime';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import React, { createContext, useContext, useReducer, useMemo, useEffect, useCallback, useState, useRef, useLayoutEffect } from 'react';
-import { GoabFormItem, GoabInput, GoabTextArea, GoabCallout, GoabRadioGroup, GoabRadioItem, GoabCheckbox, GoabIcon, GoabGrid, GoabFormStepper, GoabFormStep, GoabPages, GoabButton, GoabModal, GoabButtonGroup, GoabBadge, GoabText, GoabTable, GoabIconButton, GoabFileUploadInput, GoabCircularProgress, GoabContainer, GoabDropdown, GoabDropdownItem, GoabDetails, GoabSpinner } from '@abgov/react-components';
+import { GoabFormItem, GoabInput, GoabTextArea, GoabCallout, GoabDatePicker, GoabRadioGroup, GoabRadioItem, GoabCheckbox, GoabIcon, GoabGrid, GoabFormStepper, GoabFormStep, GoabPages, GoabButton, GoabModal, GoabButtonGroup, GoabBadge, GoabText, GoabTable, GoabIconButton, GoabFileUploadInput, GoabCircularProgress, GoabContainer, GoabDropdown, GoabDropdownItem, GoabDetails, GoabSpinner } from '@abgov/react-components';
 import styled from 'styled-components';
 import axios from 'axios';
 import get$1 from 'lodash/get';
@@ -3175,7 +3175,7 @@ const checkFieldValidity = props => {
     uischema,
     schema
   } = props;
-  const labelToUpdate = (uischema === null || uischema === void 0 ? void 0 : uischema.scope) ? convertToSentenceCase(getLabelText(uischema === null || uischema === void 0 ? void 0 : uischema.scope, label)) : label;
+  const labelToUpdate = label;
   const extraSchema = schema;
   if (extraSchema && data && (extraSchema === null || extraSchema === void 0 ? void 0 : extraSchema.title) === sinTitle) {
     if (data.length === 11 && !validateSinWithLuhn(data)) {
@@ -3236,23 +3236,6 @@ const convertToReadableFormat = input => {
   }
   return input.replace(/([a-z])([A-Z])/g, '$1 $2').split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ');
 };
-/**
- * Converts a input to sentence case (eg: incomeThresholdExample or IncomeThresholdExample)
- * to 'Income threshold example' with the first letter in the sentence capitalized.
- *
- * @param input - The camelCase or PascalCase string (e.g., "incomeThresholdExample").
- * @returns A formatted string with spaces and capitalization (e.g., "Income threshold example").
- */
-const convertToSentenceCase = input => {
-  if (!input) {
-    return input;
-  }
-  const convertedInput = convertToReadableFormat(input);
-  if (!convertedInput) return convertedInput;
-  const firstWord = convertedInput.split(' ').splice(0, 1);
-  const newWords = convertedInput.split(' ').splice(1).map(word => word.charAt(0).toLowerCase() + word.slice(1).toLowerCase()).join(' ');
-  return firstWord.concat(newWords).join(' ');
-};
 
 var $$t = _export;
 var call$a = functionCall;
@@ -6251,7 +6234,7 @@ const GoAInputBaseControl = props => {
     skipInitialValidation
   } = props;
   const InnerComponent = input;
-  const labelToUpdate = convertToSentenceCase(getLabelText(uischema.scope, label || ''));
+  const labelToUpdate = label || '';
   let modifiedErrors = checkFieldValidity(props);
   const formStepperCtx = useContext(JsonFormsStepperContext);
   const stepperState = (_a = formStepperCtx === null || formStepperCtx === void 0 ? void 0 : formStepperCtx.selectStepperState) === null || _a === void 0 ? void 0 : _a.call(formStepperCtx);
@@ -6739,6 +6722,7 @@ const Dropdown = props => {
         width: "100%",
         value: inputText,
         testId: `${id}-input`,
+        ariaLabel: `${id}-input`,
         id: `${id}-input`,
         readonly: !isAutoCompletion,
         onChange: detail => {
@@ -7077,8 +7061,8 @@ const GoADateInput = props => {
     const today = new Date();
     minDate = today.toISOString().split('T')[0];
   }
-  return jsx(GoabInput, Object.assign({
-    type: "date",
+  return jsx(GoabDatePicker, Object.assign({
+    type: "calendar",
     error: isVisited && errors.length > 0,
     width: width,
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
@@ -7089,12 +7073,13 @@ const GoADateInput = props => {
     min: minDate && new Date(minDate),
     max: maxDate && new Date(maxDate),
     onChange: detail => {
+      var _a;
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
       onChangeForDateControl({
-        name: detail.name,
-        value: detail.value,
+        name: (_a = detail.name) !== null && _a !== void 0 ? _a : 'date',
+        value: detail.valueStr,
         controlProps: props
       });
     },
@@ -7777,11 +7762,17 @@ const GoABaseInputReviewComponent = props => {
     return null;
   };
   if (isBoolean) {
-    const checkboxLabel = ((_b = (_a = uischema.options) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.trim()) || convertToSentenceCase(getLastSegmentFromPointer(uischema.scope));
+    let checkboxLabel = '';
+    if ((_b = (_a = uischema.options) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.trim()) {
+      checkboxLabel = uischema.options.text.trim();
+    } else if (uischema.scope && uischema.scope.startsWith('#/')) {
+      const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
+      checkboxLabel = fallbackLabel.charAt(0).toUpperCase() + fallbackLabel.slice(1);
+    }
     if (((_c = uischema.options) === null || _c === void 0 ? void 0 : _c.radio) === true) {
       reviewText = data ? `Yes` : `No`;
     } else {
-      reviewText = data ? `Yes (${checkboxLabel.trim()})` : `No (${checkboxLabel.trim()})`;
+      reviewText = data ? `Yes (${checkboxLabel})` : `No (${checkboxLabel})`;
     }
   }
   if (isTime) {
@@ -7794,9 +7785,17 @@ const GoABaseInputReviewComponent = props => {
     reviewText = jsx("ul", {
       children: data.map((checkbox, index) => {
         var _a, _b;
-        const checkboxLabel = ((_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.trim()) || convertToSentenceCase(getLastSegmentFromPointer(uischema.scope));
+        let checkboxLabel = '';
+        // Use explicit text if provided, otherwise fall back to property name from scope
+        if ((_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.trim()) {
+          checkboxLabel = uischema.options.text.trim();
+        } else if (uischema.scope && uischema.scope.startsWith('#/')) {
+          const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
+          // Capitalize first letter only when falling back to property name from scope
+          checkboxLabel = fallbackLabel.charAt(0).toUpperCase() + fallbackLabel.slice(1);
+        }
         return jsx("li", {
-          children: checkbox.trim() || checkboxLabel.trim()
+          children: checkbox.trim() || checkboxLabel
         }, index);
       })
     });
@@ -7830,18 +7829,24 @@ const GoAInputBaseTableReview = props => {
     enabled,
     cells
   } = props;
-  const labelToUpdate = convertToSentenceCase(getLabelText(uischema.scope, label || ''));
+  const labelToUpdate = label || '';
   let reviewText = data;
   const isBoolean = typeof data === 'boolean';
   if (isBoolean) {
-    const checkboxLabel = ((_b = (_a = uischema.options) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.trim()) || convertToSentenceCase(getLastSegmentFromPointer(uischema.scope));
+    let checkboxLabel = '';
+    if ((_b = (_a = uischema.options) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.trim()) {
+      checkboxLabel = uischema.options.text.trim();
+    } else if (uischema.scope && uischema.scope.startsWith('#/')) {
+      const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
+      checkboxLabel = fallbackLabel.charAt(0).toUpperCase() + fallbackLabel.slice(1);
+    }
     if (((_c = uischema.options) === null || _c === void 0 ? void 0 : _c.radio) === true) {
       reviewText = data ? `Yes` : `No`;
     } else {
       if (label !== '' || typeof label === 'boolean') {
         reviewText = data ? `Yes` : `No`;
       } else {
-        reviewText = data ? `Yes (${checkboxLabel.trim()})` : `No (${checkboxLabel.trim()})`;
+        reviewText = data ? `Yes (${checkboxLabel})` : `No (${checkboxLabel})`;
       }
     }
   }
@@ -9816,7 +9821,7 @@ const FileUploader = _ref => {
     return jsx(Fragment, {});
   }
   const helpText = (_0 = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _0 === void 0 ? void 0 : _0.help;
-  const sentenceCaseLabel = convertToSentenceCase(label);
+  const sentenceCaseLabel = label;
   const DownloadFileWidget = ({
     index
   }) => {
@@ -10597,7 +10602,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
                 if (!isInReview) {
                   return jsx("th", {
                     children: jsxs("p", {
-                      children: [(currentProperty === null || currentProperty === void 0 ? void 0 : currentProperty.title) || convertToSentenceCase(index), (required === null || required === void 0 ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
+                      children: [(currentProperty === null || currentProperty === void 0 ? void 0 : currentProperty.title) || index, (required === null || required === void 0 ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
                         children: "(required)"
                       })]
                     })
@@ -10605,7 +10610,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
                 }
                 return jsx(TableTHHeader, {
                   children: jsxs("p", {
-                    children: [`${(currentProperty === null || currentProperty === void 0 ? void 0 : currentProperty.title) || convertToSentenceCase(index)}`, (required === null || required === void 0 ? void 0 : required.includes(value)) && jsxs(RequiredSpan, {
+                    children: [`${(currentProperty === null || currentProperty === void 0 ? void 0 : currentProperty.title) || index}`, (required === null || required === void 0 ? void 0 : required.includes(value)) && jsxs(RequiredSpan, {
                       children: [jsx("br", {}), " (required)"]
                     })]
                   })
@@ -10676,7 +10681,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
                         error: !!(error === null || error === void 0 ? void 0 : error.message),
                         children: [!(required === null || required === void 0 ? void 0 : required.includes(schemaName)) && jsx(GoabDropdownItem, {
                           value: "",
-                          label: `-- Select ${convertToSentenceCase(schemaName)} --`
+                          label: `-- Select ${schemaName} --`
                         }), dataObject.enum.map(opt => jsx(GoabDropdownItem, {
                           value: String(opt),
                           label: String(opt)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.43.1",
+  "version": "2.43.3",
   "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",