hrm_ui_lib 2.0.0-alpha.12 → 2.0.0-alpha.14

package/components/FormContainer/FormContainer.js

@@ -1,11 +1,10 @@
 import _extends from '@babel/runtime/helpers/extends';
-import React, { useMemo, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import classNames from 'classnames';
 import { FormContext } from '../../context/types.js';
 import { B as Button } from '../../Alert--0rz5XL1.js';
-import instance from '../../i18n.js';
 import '../../utils/helpers.js';
 import 'dayjs';
 import '../Alert/consts.js';
@@ -55,8 +54,6 @@ import '../Progress/Progress.js';
 import '../SVGIcons/IconArrowDownloadFilled.js';
 import '../../helpers/download-file.js';
 import '../Button/consts.js';
-import '@babel/runtime/helpers/asyncToGenerator';
-import '@babel/runtime/regenerator';
 
 var FormContainer = function FormContainer(props) {
   var children = props.children,
@@ -71,16 +68,11 @@ var FormContainer = function FormContainer(props) {
     validationScheme = props.validationScheme,
     buttonConfigs = props.buttonConfigs,
     formId = props.formId,
-    onSubmit = props.onSubmit;
-  var schema = useMemo(function () {
-    return validationScheme;
-  }, [instance.language, validationScheme]);
-  var resolver = useMemo(function () {
-    return yupResolver(schema);
-  }, [schema]);
+    onSubmit = props.onSubmit,
+    language = props.language;
   var _useForm = useForm({
       mode: mode,
-      resolver: resolver,
+      resolver: yupResolver(validationScheme),
       defaultValues: initialValues,
       shouldFocusError: shouldFocusError,
       shouldUnregister: shouldUnregister
@@ -98,6 +90,9 @@ var FormContainer = function FormContainer(props) {
     trigger = _useForm.trigger,
     getFieldState = _useForm.getFieldState,
     unregister = _useForm.unregister;
+  useEffect(function () {
+    trigger();
+  }, [language]);
   var errors = formState.errors,
     isDirty = formState.isDirty,
     isSubmitted = formState.isSubmitted,
@@ -108,10 +103,6 @@ var FormContainer = function FormContainer(props) {
       onSubmit(data, formState, dirtyFields);
     }
   };
-  useEffect(function () {
-    console.log('Language changed, updating validation messages', instance.language);
-    trigger(); // re-run validation with new messages
-  }, [instance.language]);
   return /*#__PURE__*/React.createElement("form", {
     onSubmit: handleSubmit(customSubmit),
     id: formId,

package/components/FormContainer/index.js

@@ -55,6 +55,3 @@ import '../Progress/Progress.js';
 import '../SVGIcons/IconArrowDownloadFilled.js';
 import '../../helpers/download-file.js';
 import '../Button/consts.js';
-import '../../i18n.js';
-import '@babel/runtime/helpers/asyncToGenerator';
-import '@babel/runtime/regenerator';

package/components/FormContainer/types.d.ts

@@ -18,4 +18,5 @@ export interface FormPropTypes {
     mode?: keyof ValidationMode;
     reValidateMode?: 'onChange' | 'onSubmit' | 'onBlur' | undefined;
     formId?: string;
+    language?: string;
 }