@abgov/jsonforms-components 2.6.3 → 2.6.5

package/index.esm.js

@@ -9871,6 +9871,11 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
       };
     })
   };
+  const hasNoElements = () => {
+    var _a, _b, _c, _d;
+    const hasNoLayoutElements = ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.elements) === null || _a === void 0 ? void 0 : _a.length) === 0 && ((_d = (_c = (_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.detail) === null || _c === void 0 ? void 0 : _c.elements) === null || _d === void 0 ? void 0 : _d.length) === 0;
+    return hasNoLayoutElements;
+  };
   return jsxs(Fragment, {
     children: [
     // eslint-disable-next-line
@@ -9896,7 +9901,7 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
         renderers: renderers,
         cells: cells
       }, `${rowPath}-${index}`);
-    }), ((_e = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _e === void 0 ? void 0 : _e.length) > 0 && jsx(JsonFormsDispatch, {
+    }), hasNoElements() && ((_e = uiSchemaElementsForNotDefined === null || uiSchemaElementsForNotDefined === void 0 ? void 0 : uiSchemaElementsForNotDefined.elements) === null || _e === void 0 ? void 0 : _e.length) > 0 && jsx(JsonFormsDispatch, {
       schema: schema,
       uischema: uiSchemaElementsForNotDefined,
       path: rowPath,
@@ -9921,10 +9926,14 @@ const NonEmptyRowComponent = ({
   cells,
   uischema
 }) => {
+  var _a, _b;
+  const isHorizontal = ((_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.detail) === null || _b === void 0 ? void 0 : _b.type) === 'HorizontalLayout';
   return jsx("div", {
-    children: enabled ? jsx(GoAGrid, {
+    children: enabled && isHorizontal ? jsx(GoAGrid, {
       minChildWidth: "30ch",
       children: GenerateRows(NonEmptyCell, schema, childPath, enabled, cells, uischema)
+    }) : enabled && !isHorizontal ? jsx(Fragment, {
+      children: GenerateRows(NonEmptyCell, schema, childPath, enabled, cells, uischema)
     }) : null
   }, childPath);
 };
@@ -10702,8 +10711,11 @@ const HelpContentComponent = _ref => {
   };
   const textVariant = !((_e = uischema.options) === null || _e === void 0 ? void 0 : _e.variant) || ((_f = uischema.options) === null || _f === void 0 ? void 0 : _f.variant) !== 'details' && ((_g = uischema.options) === null || _g === void 0 ? void 0 : _g.variant) !== 'hyperlink';
   if (markdown) {
-    return MarkdownComponent({
-      markdown: getMarkDownData((_h = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _h === void 0 ? void 0 : _h.help)
+    return jsx(Visible, {
+      visible: visible,
+      children: MarkdownComponent({
+        markdown: getMarkDownData((_h = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _h === void 0 ? void 0 : _h.help)
+      })
     });
   }
   return jsx(Visible, {

package/package.json

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