@abgov/jsonforms-components 1.2.3 → 1.2.4

package/index.esm.js

@@ -2,6 +2,7 @@ import { withAjvProps, materialSliderControlTester, MaterialSliderControl, mater
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { GoAFormItem, GoACallout, GoAInputDate, GoAInput, GoATextArea, GoAInputDateTime, GoAInputTime, GoADropdown, GoADropdownItem, GoARadioGroup, GoARadioItem, GoACheckbox, GoAFormStepper, GoAFormStep, GoAPages, GoAButton, GoAIconButton, GoAFileUploadInput, GoAModal, GoACircularProgress, GoAGrid, GoAContainer, GoAButtonGroup, GoADetails } from '@abgov/react-components';
 import { Hidden, Typography, FormHelperText } from '@mui/material';
+import styled from 'styled-components';
 import { rankWith, isDateControl, isStringControl, and, optionIs, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, isDescriptionHidden, isVisible, isEnabled, deriveLabelForUISchemaElement, uiTypeIs, schemaTypeIs, formatIs, createDefaultValue, Paths, or, isObjectArrayControl, isPrimitiveArrayControl, withIncreasedRank, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
 import { withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, withJsonFormsLayoutProps, JsonFormsDispatch, useJsonForms, withJsonFormsArrayLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
 import React, { createContext, useEffect, useState, useMemo, useContext, useCallback } from 'react';
@@ -9,7 +10,6 @@ import merge from 'lodash/merge';
 import axios from 'axios';
 import TextField from '@mui/material/TextField';
 import Autocomplete from '@mui/material/Autocomplete';
-import styled from 'styled-components';
 import isEmpty from 'lodash/isEmpty';
 import range from 'lodash/range';
 
@@ -1739,6 +1739,12 @@ $$3({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }
   assign: assign
 });
 
+let _$6 = t => t,
+  _t$6;
+const FormFieldWrapper = styled.div(_t$6 || (_t$6 = _$6`
+  margin-bottom: var(--goa-space-l);
+`));
+
 var anObject$3 = anObject$9;
 
 // `RegExp.prototype.flags` getter implementation
@@ -2389,12 +2395,14 @@ const GoAInputBaseControl = props => {
   }
   return jsx(Hidden, {
     xsUp: !visible,
-    children: jsx(GoAFormItem, {
-      requirement: required ? 'required' : undefined,
-      error: modifiedErrors,
-      label: (props === null || props === void 0 ? void 0 : props.noLabel) === true ? '' : labelToUpdate,
-      helpText: typeof ((_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.help) === 'string' ? (_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.help : '',
-      children: jsx(InnerComponent, Object.assign({}, props))
+    children: jsx(FormFieldWrapper, {
+      children: jsx(GoAFormItem, {
+        requirement: required ? 'required' : undefined,
+        error: modifiedErrors,
+        label: (props === null || props === void 0 ? void 0 : props.noLabel) === true ? '' : labelToUpdate,
+        helpText: typeof ((_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.help) === 'string' ? (_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.help : '',
+        children: jsx(InnerComponent, Object.assign({}, props))
+      })
     })
   });
 };
@@ -4704,7 +4712,7 @@ const GoAGroupControlComponent = props => {
   const group = uischema;
   return jsx(Hidden, {
     xsUp: !visible,
-    children: jsx(GoAContainer, Object.assign({}, group.options, (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.componentProps, {
+    children: jsx(GoAContainer, Object.assign({}, (_a = group.options) === null || _a === void 0 ? void 0 : _a.componentProps, {
       children: renderLayoutElements(group.elements, schema, path, enabled, renderers, cells)
     }))
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "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/Inputs/style-component.d.ts

@@ -0,0 +1 @@
+export declare const FormFieldWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;

package/src/lib/layouts/GroupControl.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { LayoutProps, RankedTester } from '@jsonforms/core';
 export declare const groupTester: RankedTester;
+export declare const GoAGroupControlComponent: (props: LayoutProps) => JSX.Element;
 export declare const GoAGroupLayoutTester: RankedTester;
 export declare const GoAGroupControl: React.ComponentType<LayoutProps & import("@jsonforms/core").OwnPropsOfLayout>;