@openmrs/esm-form-engine-lib 2.1.0-pre.1373 → 2.1.0-pre.1382

package/package.json

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

package/src/components/inputs/number/number.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { Layer, NumberInput } from '@carbon/react';
 import classNames from 'classnames';
 import { isTrue } from '../../../utils/boolean-utils';
@@ -22,6 +22,11 @@ const NumberField: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
     }
   };
 
+  const handleChange = useCallback((event) => {
+    const parsedValue = Number(event.target.value);
+    setFieldValue(isNaN(parsedValue) ? undefined : parsedValue);
+  }, [setFieldValue]);
+
   const isInline = useMemo(() => {
     if (['view', 'embedded-view'].includes(sessionMode) || isTrue(field.readonly)) {
       return shouldUseInlineLayout(field.inlineRendering, layoutType, workspaceLayout, sessionMode);
@@ -49,7 +54,7 @@ const NumberField: React.FC<FormFieldInputProps> = ({ field, value, errors, warn
         min={Number(field.questionOptions.min) || undefined}
         name={field.id}
         value={field.value ?? ''}
-        onChange={setFieldValue}
+        onChange={handleChange}
         onBlur={onBlur}
         allowEmpty={true}
         size="lg"

package/src/processors/encounter/encounter-form-processor.ts

@@ -257,7 +257,11 @@ export class EncounterFormProcessor extends FormProcessor {
           const adapter = formFieldAdapters[field.type];
           initialValues[field.id] = emptyValues[field.questionOptions.rendering] ?? null;
           if (field.questionOptions.calculate?.calculateExpression) {
-            await evaluateCalculateExpression(field, initialValues, context);
+            try {
+              await evaluateCalculateExpression(field, initialValues, context);
+            } catch (error) {
+              console.error(error);
+            }
           }
           if (isEmpty(initialValues[field.id]) && contextInitializableTypes.includes(field.type)) {
             try {

package/src/provider/form-factory-helper.ts

@@ -17,6 +17,7 @@ export function validateForm(context: FormContextProps) {
   } = context;
   const values = getValues();
   const errors = formFields
+    .filter((field) => !field.isHidden && !field.isDisabled)
     .flatMap((field) =>
       field.validators?.flatMap((validatorConfig) => {
         const validator = formFieldValidators[validatorConfig.type];