@abgov/jsonforms-components 1.50.0 → 1.50.1

package/index.esm.js

@@ -5,7 +5,7 @@ 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, isControl, isScoped, hasType, isCategorization, isLayout } from '@jsonforms/core';
+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';
@@ -5288,7 +5288,7 @@ const ReviewLayoutRenderer = ({
 };
 const ReviewGrid = styled.div(_t$6 || (_t$6 = _$6`
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(250px, calc(50% - 8px)));
   gap: 16px;
 `));
 
@@ -8699,21 +8699,9 @@ const isPropertiesMatch = (obj, props, isExactMatch) => {
   return false;
 };
 const createSchemaMatchTester = (props, isExactMatch = false) => {
-  return (uischema, schema, context) => {
-    if (!isControl(uischema) || !isScoped(uischema)) {
-      return false;
-    }
-    if ((schema === null || schema === void 0 ? void 0 : schema.properties) && isObject$f(schema === null || schema === void 0 ? void 0 : schema.properties)) {
-      const propertyFromScope = uischema['scope'].split('/').pop();
-      if (isObject$f(schema.properties[propertyFromScope]) && 'properties' in schema.properties[propertyFromScope]) {
-        const objToTest = schema.properties[propertyFromScope]['properties'];
-        if (objToTest && isPropertiesMatch(objToTest, props, isExactMatch)) {
-          return true;
-        }
-      }
-    }
-    return false;
-  };
+  return schemaMatches(schema => {
+    return schema && isPropertiesMatch(schema.properties, props, isExactMatch);
+  });
 };
 
 const isAddressLookup = createSchemaMatchTester(['addressLine2', 'municipality', 'addressLine1', 'subdivisionCode', 'postalCode']);
@@ -8886,28 +8874,7 @@ const FullNameControl = props => {
   });
 };
 
-const isFullNameSchema = obj => {
-  if (isObject$f(obj)) {
-    const keys = Object.keys(obj);
-    return ['firstName', 'middleName', 'lastName'].every(attr => keys.includes(attr)) && keys.length === 3;
-  }
-  return false;
-};
-const isFullName = (uischema, schema, context) => {
-  if (!isControl(uischema) || !isScoped(uischema)) {
-    return false;
-  }
-  if ((schema === null || schema === void 0 ? void 0 : schema.properties) && isObject$f(schema === null || schema === void 0 ? void 0 : schema.properties)) {
-    const propertyFromScope = uischema['scope'].split('/').pop();
-    if (isObject$f(schema.properties[propertyFromScope]) && 'properties' in schema.properties[propertyFromScope]) {
-      const objToTest = schema.properties[propertyFromScope]['properties'];
-      if (objToTest && isFullNameSchema(objToTest)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
+const isFullName = createSchemaMatchTester(['firstName', 'middleName', 'lastName'], true);
 const FullNameTester = rankWith(4, isFullName);
 
 const FullNameDobControl = props => {
@@ -9119,28 +9086,7 @@ const FullNameDobReviewControl = props => {
   });
 };
 
-const isFullNameDoBSchema = obj => {
-  if (isObject$f(obj)) {
-    const keys = Object.keys(obj);
-    return ['firstName', 'middleName', 'lastName', 'dateOfBirth'].every(attr => keys.includes(attr)) && keys.length === 4;
-  }
-  return false;
-};
-const isFullNameDoB = (uischema, schema, context) => {
-  if (!isControl(uischema) || !isScoped(uischema)) {
-    return false;
-  }
-  if ((schema === null || schema === void 0 ? void 0 : schema.properties) && isObject$f(schema === null || schema === void 0 ? void 0 : schema.properties)) {
-    const propertyFromScope = uischema['scope'].split('/').pop();
-    if (isObject$f(schema.properties[propertyFromScope]) && 'properties' in schema.properties[propertyFromScope]) {
-      const objToTest = schema.properties[propertyFromScope]['properties'];
-      if (objToTest && isFullNameDoBSchema(objToTest)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
+const isFullNameDoB = createSchemaMatchTester(['firstName', 'middleName', 'lastName', 'dateOfBirth'], true);
 const FullNameDobTester = rankWith(4, isFullNameDoB);
 
 const GoATextCell = props => jsx(GoAInputText, Object.assign({}, props));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.50.0",
+  "version": "1.50.1",
   "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/Controls/FullName/FullNameTester.d.ts

@@ -1,3 +1,3 @@
-import { RankedTester, UISchemaElement, JsonSchema, TesterContext } from '@jsonforms/core';
-export declare const isFullName: (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) => boolean;
+import { RankedTester } from '@jsonforms/core';
+export declare const isFullName: import("@jsonforms/core").Tester;
 export declare const FullNameTester: RankedTester;

package/src/lib/Controls/FullNameDOB/FullNameDobTester.d.ts

@@ -1,3 +1,3 @@
-import { RankedTester, UISchemaElement, JsonSchema, TesterContext } from '@jsonforms/core';
-export declare const isFullNameDoB: (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) => boolean;
+import { RankedTester } from '@jsonforms/core';
+export declare const isFullNameDoB: import("@jsonforms/core").Tester;
 export declare const FullNameDobTester: RankedTester;