@openmrs/esm-form-engine-lib 3.1.3-pre.1747 → 3.1.3-pre.1754

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "3.1.3-pre.1747",
+  "version": "3.1.3-pre.1754",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/components/group/obs-group.component.tsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { type FormFieldInputProps } from '../../types';
 import styles from './obs-group.scss';
-import { FormFieldRenderer, isGroupField } from '../renderer/field/form-field-renderer.component';
+import { ErrorFallback, FormFieldRenderer, isGroupField } from '../renderer/field/form-field-renderer.component';
 import { useFormProviderContext } from '../../provider/form-provider';
 import { FormGroup } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
@@ -18,6 +18,11 @@ export const ObsGroup: React.FC<FormFieldInputProps> = ({ field, ...restProps })
         .filter((child) => !child.isHidden)
         .map((child, index) => {
           const key = `${child.id}_${index}`;
+          if (child.id === field.id) {
+            return (
+              <ErrorFallback error={new Error('ObsGroup child has same id as parent question')}/>
+            );
+          }
 
           if (child.type === 'obsGroup' && isGroupField(child.questionOptions.rendering)) {
             return (

package/src/components/renderer/field/form-field-renderer.component.tsx

@@ -215,7 +215,7 @@ export const FormFieldRenderer = ({ fieldId, valueAdapter, repeatOptions }: Form
   );
 };
 
-function ErrorFallback({ error }) {
+export function ErrorFallback({ error }) {
   const { t } = useTranslation();
   return (
     <ToastNotification

package/src/components/sidebar/sidebar.scss

@@ -105,4 +105,8 @@
   &:global(.cds--inline-loading) {
     min-height: layout.$spacing-05;
   }
-}
+}
+
+.closeButton {
+  @extend .button;
+}