@openmrs/esm-form-engine-lib 3.1.5-pre.1884 → 3.1.5-pre.1886

package/package.json

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

package/src/components/field-label/field-label.component.tsx

@@ -27,34 +27,28 @@ const TooltipWrapper: React.FC<{ field: FormField; children: React.ReactNode }>
   );
 };
 
-const FieldLabelContent: React.FC<FieldLabelProps> = ({ field, customLabel }) => {
+const FieldLabel: React.FC<FieldLabelProps> = ({ field, customLabel }) => {
   const { t } = useTranslation();
   const hasTooltip = Boolean(field.questionInfo);
   const labelText = customLabel || t(field.label);
   return (
-    <div className={styles.questionLabel} data-testid={`${field.id}-label`}>
-      <span>{labelText}</span>
-      {field.isRequired && (
-        <span title={t('required', 'Required')} className={styles.required}>
-          *
-        </span>
-      )}
-      {hasTooltip && (
-        <Information
-          size={20}
-          aria-hidden="true"
-          className={styles.tooltipIcon}
-          data-testid={`${field.id}-information-icon`}
-        />
-      )}
-    </div>
-  );
-};
-
-const FieldLabel: React.FC<FieldLabelProps> = (props) => {
-  return (
-    <TooltipWrapper field={props.field}>
-      <FieldLabelContent {...props} />
+    <TooltipWrapper field={field}>
+      <div className={styles.questionLabel} data-testid={`${field.id}-label`}>
+        <span>{labelText}</span>
+        {field.isRequired && (
+          <span title={t('required', 'Required')} className={styles.required}>
+            *
+          </span>
+        )}
+        {hasTooltip && (
+          <Information
+            size={20}
+            aria-hidden="true"
+            className={styles.tooltipIcon}
+            data-testid={`${field.id}-information-icon`}
+          />
+        )}
+      </div>
     </TooltipWrapper>
   );
 };

package/src/form-engine.test.tsx

@@ -253,7 +253,7 @@ describe('Form engine component', () => {
         renderForm(null, sampleFieldsForm);
       });
 
-      screen.findByRole('textbox', { name: /text question/i });
+      screen.findByLabelText(/text question/i);
 
       const textFieldTooltip = screen.getByTestId('id_text-label');
       expect(textFieldTooltip).toBeInTheDocument();
@@ -359,7 +359,7 @@ describe('Form engine component', () => {
       const requiredAsterisks = screen.getAllByText('*');
       expect(requiredAsterisks).toHaveLength(2);
 
-      const inputFields = screen.getAllByRole('textbox', { name: /Text question/i });
+      const inputFields = screen.getAllByLabelText(/Text question/i);
       expect(inputFields).toHaveLength(2);
 
       inputFields.forEach((inputField) => {