@dnb/eufemia 10.30.2 → 10.32.0

package/extensions/forms/DataContext/Context.d.ts

@@ -11,12 +11,22 @@ export type EventListenerCall = {
     callback: () => any;
 };
 export type FilterDataHandler<Data> = (data: Data, filter: FilterData) => Partial<Data>;
-export type FilterData = (path: Path, value: any, props: FieldProps, internal: {
-    error: Error | undefined;
-}) => boolean | undefined;
-export type TransformData = (path: Path, value: any, props: FieldProps, internal: {
-    error: Error | undefined;
-}) => any;
+export type FilterDataHandlerCallback<R> = (parameters: FilterDataHandlerParameters) => R;
+export type FilterDataHandlerParameters = FilterDataPathConditionParameters & {
+    path: Path;
+};
+export type FilterDataPathCondition<Data = unknown> = (parameters: FilterDataPathConditionParameters<Data>) => boolean | undefined;
+export type FilterDataPathConditionParameters<Data = unknown> = {
+    value: unknown;
+    props: FieldProps;
+    data: Data;
+    internal: {
+        error: Error | undefined;
+    };
+};
+export type FilterDataPathObject<Data> = Record<Path, FilterDataPathCondition<Data> | boolean | undefined>;
+export type FilterData<Data = unknown> = FilterDataPathObject<Data> | FilterDataHandlerCallback<boolean | undefined>;
+export type TransformData = FilterDataHandlerCallback<unknown>;
 export interface ContextState {
     id?: Identifier;
     hasContext: boolean;
@@ -39,10 +49,10 @@ export interface ContextState {
     setShowAllErrors: (showAllErrors: boolean) => void;
     hasErrors: () => boolean;
     hasFieldState: (state: SubmitState) => boolean;
-    checkFieldStateFor: (path: Path, state: SubmitState) => boolean;
+    hasFieldError: (path: Path) => boolean;
     setFieldState: (path: Path, fieldState: SubmitState) => void;
     setFieldError: (path: Path, error: Error | FormError) => void;
-    mountedFieldPaths: string[];
+    fieldPropsRef?: React.MutableRefObject<Record<string, FieldProps>>;
     handleMountField: (path: Path) => void;
     handleUnMountField: (path: Path) => void;
     formState: SubmitState;
@@ -62,7 +72,8 @@ export interface ContextState {
     disabled?: boolean;
     required?: boolean;
     submitState: Partial<EventStateObject>;
-    _isInsideFormElement?: boolean;
+    isInsideFormElement?: boolean;
+    prerenderFieldProps?: boolean;
     props: ProviderProps<unknown>;
 }
 export declare const defaultContextState: ContextState;

package/extensions/forms/DataContext/Context.js

@@ -19,18 +19,17 @@ export const defaultContextState = {
   setFieldEventListener: () => null,
   handleSubmitCall: () => null,
   setShowAllErrors: () => null,
-  mountedFieldPaths: [],
   handleMountField: () => null,
   handleUnMountField: () => null,
   hasErrors: () => false,
   hasFieldState: () => false,
-  checkFieldStateFor: () => false,
+  hasFieldError: () => false,
   setFieldState: () => null,
   setFieldError: () => null,
   setProps: () => null,
   ajvInstance: makeAjvInstance(),
   contextErrorMessages: undefined,
-  _isInsideFormElement: false,
+  isInsideFormElement: false,
   props: null
 };
 const Context = React.createContext(defaultContextState);

package/extensions/forms/DataContext/Context.js.map

@@ -1 +1 @@
-{"version":3,"file":"Context.js","names":["React","makeAjvInstance","defaultContextState","hasContext","data","undefined","schema","submitState","handlePathChange","handlePathChangeUnvalidated","updateDataValue","setData","validateData","handleSubmit","scrollToTop","showAllErrors","formState","setFormState","setSubmitState","setFieldEventListener","handleSubmitCall","setShowAllErrors","mountedFieldPaths","handleMountField","handleUnMountField","hasErrors","hasFieldState","checkFieldStateFor","setFieldState","setFieldError","setProps","ajvInstance","contextErrorMessages","_isInsideFormElement","props","Context","createContext"],"sources":["../../../../../src/extensions/forms/DataContext/Context.ts"],"sourcesContent":["import React from 'react'\nimport { Ajv, makeAjvInstance } from '../utils/ajv'\nimport {\n  AllJSONSchemaVersions,\n  CustomErrorMessagesWithPaths,\n  SubmitState,\n  Path,\n  EventStateObject,\n  EventReturnWithStateObject,\n  Identifier,\n  FieldProps,\n  FormError,\n} from '../types'\nimport { Props as ProviderProps } from './Provider'\n\ntype HandleSubmitProps = {\n  formElement?: HTMLFormElement\n}\n\nexport type EventListenerCall = {\n  path: Path\n  type: 'onSubmit'\n  callback: () => any\n}\n\nexport type FilterDataHandler<Data> = (\n  data: Data,\n  filter: FilterData\n) => Partial<Data>\nexport type FilterData = (\n  path: Path,\n  value: any,\n  props: FieldProps,\n  internal: {\n    error: Error | undefined\n  }\n) => boolean | undefined\nexport type TransformData = (\n  path: Path,\n  value: any,\n  props: FieldProps,\n  internal: {\n    error: Error | undefined\n  }\n) => any\n\nexport interface ContextState {\n  id?: Identifier\n  hasContext: boolean\n  /** The dataset for the form / form wizard */\n  data: any\n  /** Should the form validate data before submitting? */\n  errors?: Record<string, Error>\n  /** Will set autoComplete=\"on\" on each nested Field.String and Field.Number */\n  autoComplete?: boolean\n  handlePathChange: (\n    path: Path,\n    value?: any\n  ) =>\n    | EventReturnWithStateObject\n    | unknown\n    | Promise<EventReturnWithStateObject | unknown>\n  handlePathChangeUnvalidated: (path: Path, value: any) => void\n  updateDataValue: (path: Path, value: any) => void\n  setData: (data: any) => void\n  mutateDataHandler?: (data: any, mutate: TransformData) => any\n  filterDataHandler?: (data: any, filter: FilterData) => any\n  validateData: () => void\n  handleSubmit: (props?: HandleSubmitProps) => any\n  scrollToTop: () => void\n  // Error status\n  showAllErrors: boolean\n  setShowAllErrors: (showAllErrors: boolean) => void\n  hasErrors: () => boolean\n  hasFieldState: (state: SubmitState) => boolean\n  checkFieldStateFor: (path: Path, state: SubmitState) => boolean\n  setFieldState: (path: Path, fieldState: SubmitState) => void\n  setFieldError: (path: Path, error: Error | FormError) => void\n  // Mounted fields - Components telling the provider what fields is on screen at any time\n  mountedFieldPaths: string[]\n  handleMountField: (path: Path) => void\n  handleUnMountField: (path: Path) => void\n  formState: SubmitState\n  setFormState?: (state: SubmitState) => void\n  setSubmitState?: (state: EventStateObject) => void\n  handleSubmitCall: ({\n    onSubmit,\n    enableAsyncBehaviour,\n    skipFieldValidation,\n    skipErrorCheck,\n  }: {\n    onSubmit: () =>\n      | EventReturnWithStateObject\n      | void\n      | Promise<EventReturnWithStateObject | void>\n    enableAsyncBehaviour: boolean\n    skipFieldValidation?: boolean\n    skipErrorCheck?: boolean\n  }) => void\n  setFieldEventListener: (\n    path: EventListenerCall['path'],\n    type: EventListenerCall['type'],\n    callback: EventListenerCall['callback']\n  ) => void\n  setProps: (path: Path, props: any) => void\n  ajvInstance: Ajv\n  contextErrorMessages: CustomErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  disabled?: boolean\n  required?: boolean\n  submitState: Partial<EventStateObject>\n  _isInsideFormElement?: boolean\n  props: ProviderProps<unknown>\n}\n\nexport const defaultContextState: ContextState = {\n  hasContext: false,\n  data: undefined,\n  schema: undefined,\n  submitState: undefined,\n  handlePathChange: () => null,\n  handlePathChangeUnvalidated: () => null,\n  updateDataValue: () => null,\n  setData: () => null,\n  validateData: () => null,\n  handleSubmit: () => null,\n  scrollToTop: () => null,\n  showAllErrors: false,\n  formState: undefined,\n  setFormState: () => null,\n  setSubmitState: () => null,\n  setFieldEventListener: () => null,\n  handleSubmitCall: () => null,\n  setShowAllErrors: () => null,\n  mountedFieldPaths: [],\n  handleMountField: () => null,\n  handleUnMountField: () => null,\n  hasErrors: () => false,\n  hasFieldState: () => false,\n  checkFieldStateFor: () => false,\n  setFieldState: () => null,\n  setFieldError: () => null,\n  setProps: () => null,\n  ajvInstance: makeAjvInstance(),\n  contextErrorMessages: undefined,\n  _isInsideFormElement: false,\n  props: null,\n}\n\nconst Context = React.createContext<ContextState>(defaultContextState)\n\nexport default Context\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAcC,eAAe,QAAQ,cAAc;AAkHnD,OAAO,MAAMC,mBAAiC,GAAG;EAC/CC,UAAU,EAAE,KAAK;EACjBC,IAAI,EAAEC,SAAS;EACfC,MAAM,EAAED,SAAS;EACjBE,WAAW,EAAEF,SAAS;EACtBG,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,2BAA2B,EAAEA,CAAA,KAAM,IAAI;EACvCC,eAAe,EAAEA,CAAA,KAAM,IAAI;EAC3BC,OAAO,EAAEA,CAAA,KAAM,IAAI;EACnBC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,WAAW,EAAEA,CAAA,KAAM,IAAI;EACvBC,aAAa,EAAE,KAAK;EACpBC,SAAS,EAAEX,SAAS;EACpBY,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,cAAc,EAAEA,CAAA,KAAM,IAAI;EAC1BC,qBAAqB,EAAEA,CAAA,KAAM,IAAI;EACjCC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,iBAAiB,EAAE,EAAE;EACrBC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,kBAAkB,EAAEA,CAAA,KAAM,IAAI;EAC9BC,SAAS,EAAEA,CAAA,KAAM,KAAK;EACtBC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,kBAAkB,EAAEA,CAAA,KAAM,KAAK;EAC/BC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,QAAQ,EAAEA,CAAA,KAAM,IAAI;EACpBC,WAAW,EAAE9B,eAAe,CAAC,CAAC;EAC9B+B,oBAAoB,EAAE3B,SAAS;EAC/B4B,oBAAoB,EAAE,KAAK;EAC3BC,KAAK,EAAE;AACT,CAAC;AAED,MAAMC,OAAO,GAAGnC,KAAK,CAACoC,aAAa,CAAelC,mBAAmB,CAAC;AAEtE,eAAeiC,OAAO"}
+{"version":3,"file":"Context.js","names":["React","makeAjvInstance","defaultContextState","hasContext","data","undefined","schema","submitState","handlePathChange","handlePathChangeUnvalidated","updateDataValue","setData","validateData","handleSubmit","scrollToTop","showAllErrors","formState","setFormState","setSubmitState","setFieldEventListener","handleSubmitCall","setShowAllErrors","handleMountField","handleUnMountField","hasErrors","hasFieldState","hasFieldError","setFieldState","setFieldError","setProps","ajvInstance","contextErrorMessages","isInsideFormElement","props","Context","createContext"],"sources":["../../../../../src/extensions/forms/DataContext/Context.ts"],"sourcesContent":["import React from 'react'\nimport { Ajv, makeAjvInstance } from '../utils/ajv'\nimport {\n  AllJSONSchemaVersions,\n  CustomErrorMessagesWithPaths,\n  SubmitState,\n  Path,\n  EventStateObject,\n  EventReturnWithStateObject,\n  Identifier,\n  FieldProps,\n  FormError,\n} from '../types'\nimport { Props as ProviderProps } from './Provider'\n\ntype HandleSubmitProps = {\n  formElement?: HTMLFormElement\n}\n\nexport type EventListenerCall = {\n  path: Path\n  type: 'onSubmit'\n  callback: () => any\n}\n\nexport type FilterDataHandler<Data> = (\n  data: Data,\n  filter: FilterData\n) => Partial<Data>\nexport type FilterDataHandlerCallback<R> = (\n  parameters: FilterDataHandlerParameters\n) => R\nexport type FilterDataHandlerParameters =\n  FilterDataPathConditionParameters & {\n    path: Path\n  }\nexport type FilterDataPathCondition<Data = unknown> = (\n  parameters: FilterDataPathConditionParameters<Data>\n) => boolean | undefined\nexport type FilterDataPathConditionParameters<Data = unknown> = {\n  value: unknown\n  props: FieldProps\n  data: Data\n  internal: {\n    error: Error | undefined\n  }\n}\nexport type FilterDataPathObject<Data> = Record<\n  Path,\n  FilterDataPathCondition<Data> | boolean | undefined\n>\nexport type FilterData<Data = unknown> =\n  | FilterDataPathObject<Data>\n  | FilterDataHandlerCallback<boolean | undefined>\nexport type TransformData = FilterDataHandlerCallback<unknown>\n\nexport interface ContextState {\n  id?: Identifier\n  hasContext: boolean\n  /** The dataset for the form / form wizard */\n  data: any\n  /** Should the form validate data before submitting? */\n  errors?: Record<string, Error>\n  /** Will set autoComplete=\"on\" on each nested Field.String and Field.Number */\n  autoComplete?: boolean\n  handlePathChange: (\n    path: Path,\n    value?: any\n  ) =>\n    | EventReturnWithStateObject\n    | unknown\n    | Promise<EventReturnWithStateObject | unknown>\n  handlePathChangeUnvalidated: (path: Path, value: any) => void\n  updateDataValue: (path: Path, value: any) => void\n  setData: (data: any) => void\n  mutateDataHandler?: (data: any, mutate: TransformData) => any\n  filterDataHandler?: (data: any, filter: FilterData) => any\n  validateData: () => void\n  handleSubmit: (props?: HandleSubmitProps) => any\n  scrollToTop: () => void\n  // Error status\n  showAllErrors: boolean\n  setShowAllErrors: (showAllErrors: boolean) => void\n  hasErrors: () => boolean\n  hasFieldState: (state: SubmitState) => boolean\n  hasFieldError: (path: Path) => boolean\n  setFieldState: (path: Path, fieldState: SubmitState) => void\n  setFieldError: (path: Path, error: Error | FormError) => void\n  fieldPropsRef?: React.MutableRefObject<Record<string, FieldProps>>\n  handleMountField: (path: Path) => void\n  handleUnMountField: (path: Path) => void\n  formState: SubmitState\n  setFormState?: (state: SubmitState) => void\n  setSubmitState?: (state: EventStateObject) => void\n  handleSubmitCall: ({\n    onSubmit,\n    enableAsyncBehaviour,\n    skipFieldValidation,\n    skipErrorCheck,\n  }: {\n    onSubmit: () =>\n      | EventReturnWithStateObject\n      | void\n      | Promise<EventReturnWithStateObject | void>\n    enableAsyncBehaviour: boolean\n    skipFieldValidation?: boolean\n    skipErrorCheck?: boolean\n  }) => void\n  setFieldEventListener: (\n    path: EventListenerCall['path'],\n    type: EventListenerCall['type'],\n    callback: EventListenerCall['callback']\n  ) => void\n  setProps: (path: Path, props: any) => void\n  ajvInstance: Ajv\n  contextErrorMessages: CustomErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  disabled?: boolean\n  required?: boolean\n  submitState: Partial<EventStateObject>\n  isInsideFormElement?: boolean\n  prerenderFieldProps?: boolean\n  props: ProviderProps<unknown>\n}\n\nexport const defaultContextState: ContextState = {\n  hasContext: false,\n  data: undefined,\n  schema: undefined,\n  submitState: undefined,\n  handlePathChange: () => null,\n  handlePathChangeUnvalidated: () => null,\n  updateDataValue: () => null,\n  setData: () => null,\n  validateData: () => null,\n  handleSubmit: () => null,\n  scrollToTop: () => null,\n  showAllErrors: false,\n  formState: undefined,\n  setFormState: () => null,\n  setSubmitState: () => null,\n  setFieldEventListener: () => null,\n  handleSubmitCall: () => null,\n  setShowAllErrors: () => null,\n  handleMountField: () => null,\n  handleUnMountField: () => null,\n  hasErrors: () => false,\n  hasFieldState: () => false,\n  hasFieldError: () => false,\n  setFieldState: () => null,\n  setFieldError: () => null,\n  setProps: () => null,\n  ajvInstance: makeAjvInstance(),\n  contextErrorMessages: undefined,\n  isInsideFormElement: false,\n  props: null,\n}\n\nconst Context = React.createContext<ContextState>(defaultContextState)\n\nexport default Context\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAcC,eAAe,QAAQ,cAAc;AA4HnD,OAAO,MAAMC,mBAAiC,GAAG;EAC/CC,UAAU,EAAE,KAAK;EACjBC,IAAI,EAAEC,SAAS;EACfC,MAAM,EAAED,SAAS;EACjBE,WAAW,EAAEF,SAAS;EACtBG,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,2BAA2B,EAAEA,CAAA,KAAM,IAAI;EACvCC,eAAe,EAAEA,CAAA,KAAM,IAAI;EAC3BC,OAAO,EAAEA,CAAA,KAAM,IAAI;EACnBC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,WAAW,EAAEA,CAAA,KAAM,IAAI;EACvBC,aAAa,EAAE,KAAK;EACpBC,SAAS,EAAEX,SAAS;EACpBY,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,cAAc,EAAEA,CAAA,KAAM,IAAI;EAC1BC,qBAAqB,EAAEA,CAAA,KAAM,IAAI;EACjCC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,kBAAkB,EAAEA,CAAA,KAAM,IAAI;EAC9BC,SAAS,EAAEA,CAAA,KAAM,KAAK;EACtBC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,QAAQ,EAAEA,CAAA,KAAM,IAAI;EACpBC,WAAW,EAAE7B,eAAe,CAAC,CAAC;EAC9B8B,oBAAoB,EAAE1B,SAAS;EAC/B2B,mBAAmB,EAAE,KAAK;EAC1BC,KAAK,EAAE;AACT,CAAC;AAED,MAAMC,OAAO,GAAGlC,KAAK,CAACmC,aAAa,CAAejC,mBAAmB,CAAC;AAEtE,eAAegC,OAAO"}

package/extensions/forms/DataContext/Provider/Provider.d.ts

@@ -34,7 +34,7 @@ export interface Props<Data extends JsonObject> {
      */
     errorMessages?: CustomErrorMessagesWithPaths;
     /**
-     * Filter the `onSubmit` output data, based on your criteria: `(path, value, props, internal) => !props?.disabled`. It will iterate on each data entry (/path). Return false to exclude the entry.
+     * Filter the `onSubmit` output data, based on your criteria: `({ path, value, data, props, internal }) => !props?.disabled`. It will iterate on each data entry (/path). Return false to exclude the entry.
      */
     filterSubmitData?: FilterData;
     /**
@@ -42,11 +42,11 @@ export interface Props<Data extends JsonObject> {
      */
     filterData?: FilterData;
     /**
-     * Transform the data context (internally as well) based on your criteria: `(path, value, props, internal) => 'new value'`. It will iterate on each data entry (/path).
+     * Transform the data context (internally as well) based on your criteria: `({ path, value, data, props, internal }) => 'new value'`. It will iterate on each data entry (/path).
      */
     transformIn?: TransformData;
     /**
-     * Mutate the data before it enters onSubmit or onChange based on your criteria: `(path, value, props, internal) => 'new value'`. It will iterate on each data entry (/path).
+     * Mutate the data before it enters onSubmit or onChange based on your criteria: `({ path, value, data, props, internal }) => 'new value'`. It will iterate on each data entry (/path).
      */
     transformOut?: TransformData;
     /**

package/extensions/forms/DataContext/Provider/Provider.js

@@ -112,6 +112,11 @@ export default function Provider(props) {
       return checkFieldStateFor(path, state);
     });
   }, [checkFieldStateFor]);
+  const hasFieldError = useCallback(path => {
+    return mountedFieldPathsRef.current.some(p => {
+      return p === path && checkFieldStateFor(p, 'error');
+    });
+  }, [checkFieldStateFor]);
   const hasErrors = useCallback(() => {
     return hasFieldState('error');
   }, [hasFieldState]);
@@ -124,28 +129,60 @@ export default function Provider(props) {
       forceUpdate();
     }
   }, []);
-  const mutateDataHandler = useCallback(function (data, fn) {
+  const mutateDataHandler = useCallback(function (data, filter) {
     let remove = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    if (fn) {
+    const mutate = (path, result) => {
+      if (remove) {
+        if (result === false) {
+          data = structuredClone(data);
+          pointer.remove(data, path);
+        }
+      } else {
+        if (typeof result !== 'undefined') {
+          data = structuredClone(data);
+          pointer.set(data, path, result);
+        }
+      }
+    };
+    if (typeof filter === 'function') {
       Object.entries(fieldPropsRef.current).forEach(_ref => {
         let [path, props] = _ref;
         const exists = pointer.has(data, path);
         if (exists) {
           var _fieldErrorRef$curren;
-          const result = fn(path, pointer.get(data, path), props, {
+          const value = pointer.get(data, path);
+          const internal = {
             error: (_fieldErrorRef$curren = fieldErrorRef.current) === null || _fieldErrorRef$curren === void 0 ? void 0 : _fieldErrorRef$curren[path]
+          };
+          const result = filter({
+            path,
+            value,
+            data: internalDataRef.current,
+            props,
+            internal
           });
-          if (remove) {
-            if (result === false) {
-              data = structuredClone(data);
-              pointer.remove(data, path);
-            }
-          } else {
-            if (typeof result !== 'undefined') {
-              data = structuredClone(data);
-              pointer.set(data, path, result);
-            }
-          }
+          mutate(path, result);
+        }
+      });
+      return data;
+    } else if (filter) {
+      Object.entries(filter).forEach(_ref2 => {
+        let [path, condition] = _ref2;
+        const exists = pointer.has(data, path);
+        if (exists) {
+          var _fieldPropsRef$curren, _fieldErrorRef$curren2;
+          const value = pointer.get(data, path);
+          const props = (_fieldPropsRef$curren = fieldPropsRef.current) === null || _fieldPropsRef$curren === void 0 ? void 0 : _fieldPropsRef$curren[path];
+          const internal = {
+            error: (_fieldErrorRef$curren2 = fieldErrorRef.current) === null || _fieldErrorRef$curren2 === void 0 ? void 0 : _fieldErrorRef$curren2[path]
+          };
+          const result = typeof condition === 'function' ? condition({
+            value,
+            data: internalDataRef.current,
+            props,
+            internal
+          }) : condition;
+          mutate(path, result);
         }
       });
       return data;
@@ -161,18 +198,15 @@ export default function Provider(props) {
   }, [filterData, filterSubmitData, mutateDataHandler]);
   const fieldPropsRef = useRef({});
   const setProps = useCallback((path, props) => {
-    fieldPropsRef.current[path] = _objectSpread(_objectSpread({}, fieldPropsRef.current[path]), props);
-    for (const key in fieldPropsRef.current[path]) {
-      if (!Object.prototype.hasOwnProperty.call(props, key)) {
-        delete fieldPropsRef.current[path][key];
-      }
-    }
+    fieldPropsRef.current[path] = props;
   }, []);
   const hasFieldWithAsyncValidator = useCallback(() => {
     for (const path in fieldPropsRef.current) {
-      const props = fieldPropsRef.current[path];
-      if (isAsync(props.validator) || isAsync(props.onBlurValidator)) {
-        return true;
+      if (mountedFieldPathsRef.current.includes(path)) {
+        const props = fieldPropsRef.current[path];
+        if (isAsync(props.validator) || isAsync(props.onBlurValidator)) {
+          return true;
+        }
       }
     }
     return false;
@@ -222,6 +256,7 @@ export default function Provider(props) {
       extendAttachment === null || extendAttachment === void 0 ? void 0 : extendAttachment({
         filterDataHandler,
         hasErrors,
+        hasFieldError,
         setShowAllErrors,
         setSubmitState
       });
@@ -229,7 +264,7 @@ export default function Provider(props) {
         rerenderUseDataHook === null || rerenderUseDataHook === void 0 ? void 0 : rerenderUseDataHook();
       }
     }
-  }, [extendAttachment, filterData, filterDataHandler, filterSubmitData, hasErrors, id, rerenderUseDataHook, setShowAllErrors, setSubmitState]);
+  }, [extendAttachment, filterData, filterDataHandler, filterSubmitData, hasErrors, hasFieldError, id, rerenderUseDataHook, setShowAllErrors, setSubmitState]);
   const storeInSession = useMemo(() => {
     return debounce(() => {
       var _window$sessionStorag2;
@@ -302,11 +337,7 @@ export default function Provider(props) {
     mountedFieldPathsRef.current = addListPath(mountedFieldPathsRef.current, path);
   }, []);
   const handleUnMountField = useCallback(path => {
-    var _fieldPropsRef$curren;
     mountedFieldPathsRef.current = removeListPath(mountedFieldPathsRef.current, path);
-    if ((_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 && _fieldPropsRef$curren[path]) {
-      delete fieldPropsRef.current[path];
-    }
   }, []);
   const scrollToTop = useCallback(() => {
     if (typeof window !== 'undefined') {
@@ -436,11 +467,11 @@ export default function Provider(props) {
   }, [filterDataHandler, handleSubmitCall, id, mutateDataHandler, onSubmit, onSubmitComplete, scrollToTop, scrollTopOnSubmit, sessionStorageId, setSharedData, transformOut]);
   const fieldEventListenersRef = useRef([]);
   const setFieldEventListener = useCallback((path, type, callback) => {
-    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref2 => {
+    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref3 => {
       let {
         path: p,
         type: t
-      } = _ref2;
+      } = _ref3;
       return !(p === path && t === type);
     });
     fieldEventListenersRef.current.push({
@@ -506,8 +537,8 @@ export default function Provider(props) {
       setFieldError,
       setProps,
       hasErrors,
+      hasFieldError,
       hasFieldState,
-      checkFieldStateFor,
       validateData,
       updateDataValue,
       setData,
@@ -522,7 +553,7 @@ export default function Provider(props) {
       hasContext: true,
       errors: errorsRef.current,
       showAllErrors: showAllErrorsRef.current,
-      mountedFieldPaths: mountedFieldPathsRef.current,
+      fieldPropsRef,
       ajvInstance: ajvRef.current,
       id,
       data: internalDataRef.current,
@@ -571,6 +602,7 @@ function useFormStatusBuffer(props) {
     }
   }, []);
   const hadCompleteRef = useRef(false);
+  const activeElementRef = useRef(null);
   useEffect(() => {
     const isTest = process.env.NODE_ENV === 'test';
     const minimum = minimumAsyncBehaviorTime !== null && minimumAsyncBehaviorTime !== void 0 ? minimumAsyncBehaviorTime : isTest ? 1 : 1000;
@@ -592,6 +624,7 @@ function useFormStatusBuffer(props) {
       hadCompleteRef.current = true;
     }
     if (formState === 'pending' && stateRef.current !== 'pending') {
+      activeElementRef.current = document.activeElement;
       clear();
       nowRef.current = Date.now();
       hadCompleteRef.current = false;
@@ -604,6 +637,10 @@ function useFormStatusBuffer(props) {
           if (hadCompleteRef.current) {
             setState('complete');
           }
+          window.requestAnimationFrame(() => {
+            var _activeElementRef$cur, _activeElementRef$cur2;
+            (_activeElementRef$cur = activeElementRef.current) === null || _activeElementRef$cur === void 0 ? void 0 : (_activeElementRef$cur2 = _activeElementRef$cur.focus) === null || _activeElementRef$cur2 === void 0 ? void 0 : _activeElementRef$cur2.call(_activeElementRef$cur);
+          });
         }, delay);
         timeoutRef.current.reset = setTimeout(() => {
           nowRef.current = 0;