@abgov/jsonforms-components 1.50.1 → 1.50.2

package/index.esm.js

@@ -1,12 +1,12 @@
 import * as runtime from 'react/jsx-runtime';
 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, GoATable, GoADropdown, GoADropdownItem, GoADetails, GoASpinner } from '@abgov/react-components';
+import { useJsonForms, withJsonFormsControlProps, withJsonFormsRendererProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
 import styled from 'styled-components';
-import React, { createContext, useContext, useReducer, useMemo, useEffect, useState, useRef, useCallback } from 'react';
 import axios from 'axios';
 import get$1 from 'lodash/get';
 import { rankWith, isStringControl, and, optionIs, uiTypeIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, getAjv, isVisible, toDataPath, deriveLabelForUISchemaElement, isEnabled, schemaTypeIs, formatIs, createDefaultValue, Paths, or, isObjectArrayControl, isPrimitiveArrayControl, schemaMatches, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
-import { withJsonFormsControlProps, withJsonFormsRendererProps, withJsonFormsEnumProps, withTranslateProps, useJsonForms, JsonFormsDispatch, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
 import * as _$b from 'lodash';
 import { isEqual, isObject as isObject$f } from 'lodash';
 import merge from 'lodash/merge';
@@ -3864,14 +3864,44 @@ const GoAInputBaseControl = props => {
     required,
     errors,
     path,
-    isStepperReview
+    isStepperReview,
+    id
   } = props;
   const InnerComponent = input;
   const labelToUpdate = getLabelText(uischema.scope, label || '');
+  const ctx = useJsonForms();
   let modifiedErrors = checkFieldValidity(props);
   if (modifiedErrors === 'must be equal to one of the allowed values') {
     modifiedErrors = '';
   }
+  useEffect(() => {
+    var _a, _b, _c, _d;
+    if ((_a = ctx.core) === null || _a === void 0 ? void 0 : _a.ajv) {
+      // eslint-disable-next-line
+      const newError = {
+        instancePath: path,
+        message: modifiedErrors,
+        schemaPath: id,
+        keyword: '',
+        params: {}
+      };
+      const existingErrorIndex = (ctx.core.ajv.errors || []).findIndex(error => {
+        return (error === null || error === void 0 ? void 0 : error.schemaPath) === id;
+      });
+      if (modifiedErrors) {
+        if (existingErrorIndex > -1) {
+          (ctx.core.ajv.errors || [])[existingErrorIndex] = newError;
+        } else {
+          ctx.core.ajv.errors = [...(ctx.core.ajv.errors || []), newError];
+        }
+      } else {
+        if (existingErrorIndex > -1) {
+          delete (ctx.core.ajv.errors || [])[existingErrorIndex];
+        }
+      }
+      ctx.core.ajv.errors = ((_d = (_c = (_b = ctx.core) === null || _b === void 0 ? void 0 : _b.ajv) === null || _c === void 0 ? void 0 : _c.errors) === null || _d === void 0 ? void 0 : _d.filter(e => e !== null)) || [];
+    }
+  }, [modifiedErrors, ctx, path, id]);
   return jsx(JsonFormRegisterProvider, {
     defaultRegisters: undefined,
     children: jsx(Visible, {
@@ -7807,7 +7837,7 @@ const SearchBox = styled.div(_t$1 || (_t$1 = _$1`
     width: 100%;
     position: absolute;
 
-    background: var(--color-white);
+    background: var(--goa-color-greyscale-white);
     box-shadow: 0 8px 8px rgb(0 0 0 / 20%), 0 4px 4px rgb(0 0 0 / 10%);
     z-index: 99;
     overflow: hidden auto;
@@ -7817,10 +7847,10 @@ const SearchBox = styled.div(_t$1 || (_t$1 = _$1`
   }
   .suggestion-active,
   .suggestions li:hover {
-    background-color: var(--color-primary);
-    color: var(--color-white);
+    background-color: var(--goa-color-interactive-default);
+    color: var(--goa-color-greyscale-white);
     cursor: pointer;
-    font-weight: var(--fw-bold);
+    font-weight: 600;
   }
   .input-container {
     position: relative;
@@ -7866,13 +7896,13 @@ const ListItem = styled.li(_t6 || (_t6 = _$1`
 `), ({
   selectedIndex,
   index
-}) => selectedIndex === index ? 'var(--color-primary)' : '', ({
+}) => selectedIndex === index ? 'var(--goa-color-interactive-default)' : '', ({
   selectedIndex,
   index
-}) => selectedIndex === index ? 'var(--color-white) !important' : '', ({
+}) => selectedIndex === index ? 'var(--goa-color-greyscale-white) !important' : '', ({
   selectedIndex,
   index
-}) => selectedIndex === index ? 'var(--fw-bold)' : '');
+}) => selectedIndex === index ? '600' : '');
 
 const AddressInputs = ({
   address,
@@ -8367,6 +8397,7 @@ const AddressLookUpControl = props => {
   const formCtx = useContext(JsonFormContext);
   const formHost = formCtx === null || formCtx === void 0 ? void 0 : formCtx.formUrl;
   const formUrl = `${formHost}/${ADDRESS_PATH}`;
+  const ctx = useJsonForms();
   const autocompletion = ((_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.autocomplete) !== false;
   const [open, setOpen] = useState(false);
   const label = typeof (uischema === null || uischema === void 0 ? void 0 : uischema.label) === 'string' && uischema.label ? uischema.label : '';
@@ -8420,6 +8451,23 @@ const AddressLookUpControl = props => {
       showLabel: false
     }));
   };
+  useEffect(() => {
+    var _a;
+    if ((_a = ctx.core) === null || _a === void 0 ? void 0 : _a.ajv) {
+      // eslint-disable-next-line
+      const newError = [];
+      Object.keys(errors).forEach(err => {
+        newError.push({
+          instancePath: path,
+          message: err,
+          schemaPath: '',
+          keyword: '',
+          params: {}
+        });
+      });
+      ctx.core.ajv.errors = newError;
+    }
+  }, [errors, ctx, path]);
   useEffect(() => {
     const fetchSuggestions = () => __awaiter(void 0, void 0, void 0, function* () {
       if (searchTerm.length > 2 && dropdownSelected === false) {

package/package.json

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