@abgov/jsonforms-components 1.24.0 → 1.24.2

package/index.esm.js

@@ -3402,7 +3402,7 @@ if (DESCRIPTORS$1 && isCallable$2(NativeSymbol) && (!('description' in SymbolPro
 }
 
 const GoAInputText = props => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const {
     data,
     config,
@@ -3424,7 +3424,8 @@ const GoAInputText = props => {
     value: data,
     width: '100%',
     readonly: readOnly,
-    placeholder: placeholder,
+    placeholder: placeholder
+  }, (_g = uischema.options) === null || _g === void 0 ? void 0 : _g.componentProps, {
     // maxLength={appliedUiSchemaOptions?.maxLength}
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
@@ -3447,7 +3448,7 @@ const GoAInputText = props => {
         value: autoCapitalize ? value.toUpperCase() : value
       });
     }
-  }, (_g = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _g === void 0 ? void 0 : _g.componentProps));
+  }, (_h = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _h === void 0 ? void 0 : _h.componentProps));
 };
 const GoATextControl = props => jsx(GoAInputBaseControl, Object.assign({}, props, {
   input: GoAInputText
@@ -5844,7 +5845,7 @@ const ctxToNonEmptyCellProps = (ctx, ownProps) => {
   };
 };
 const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellComponent(props) {
-  var _a, _b, _c;
+  var _a, _b;
   const {
     schema,
     errors,
@@ -5863,11 +5864,25 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
   const scopesNotInElements = propScopes.filter(scope => {
     return !scopesInElements.includes(scope);
   });
+  /**
+   * Get the first layout type in the elements for the object array and used it
+   * as the default type, if none is provided.
+   * @returns layout type
+   */
+  const getFirstLayoutType = () => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    let defaultType = 'VerticalLayout';
+    if ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.defaultType) return (_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.defaultType;
+    if (((_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.detail) && ((_f = (_e = (_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.detail) === null || _e === void 0 ? void 0 : _e.elements) === null || _f === void 0 ? void 0 : _f.length) > 0) {
+      defaultType = (_h = (_g = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _g === void 0 ? void 0 : _g.detail) === null || _h === void 0 ? void 0 : _h.elements.at(0).type;
+    }
+    return defaultType;
+  };
   /* Create default elements for scope not defined in the uischema
    * future work: merge the options
    */
   const uiSchemaElementsForNotDefined = {
-    type: ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.defaultType) || 'VerticalLayout',
+    type: getFirstLayoutType(),
     elements: scopesNotInElements.map(scope => {
       return {
         type: 'Control',
@@ -5878,7 +5893,7 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
   return jsxs(Fragment, {
     children: [
     // eslint-disable-next-line
-    (_b = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _b === void 0 ? void 0 : _b.map(element => {
+    (_a = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _a === void 0 ? void 0 : _a.map(element => {
       return jsx(JsonFormsDispatch, {
         "data-testid": `jsonforms-object-list-defined-elements-dispatch`,
         schema: schema,
@@ -5888,7 +5903,7 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
         renderers: renderers,
         cells: cells
       }, rowPath);
-    }), ((_c = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _c === void 0 ? void 0 : _c.length) > 0 && jsx(JsonFormsDispatch, {
+    }), ((_b = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _b === void 0 ? void 0 : _b.length) > 0 && jsx(JsonFormsDispatch, {
       schema: schema,
       uischema: uiSchemaElementsForNotDefined,
       path: rowPath,

package/package.json

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