@dnb/eufemia 10.69.0 → 10.70.0

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

@@ -13,9 +13,11 @@ export type MountState = {
 };
 export type EventListenerCall = {
     path?: Path;
-    type?: 'onSubmit' | 'onPathChange' | 'onMount';
+    type?: 'onSubmit' | 'onSubmitCall' | 'onSubmitRequest' | 'onPathChange' | 'onMount';
     callback: (params?: {
         value: unknown;
+    } | {
+        preventSubmit: () => void;
     }) => void | Promise<void | Error>;
 };
 export type VisibleDataHandler<Data> = (data?: Data, options?: VisibleDataOptions) => Partial<Data>;
@@ -109,13 +111,12 @@ export interface ContextState {
     }) => Promise<EventStateObject | undefined>;
     getSubmitData?: () => unknown;
     getSubmitParams?: () => OnSubmitParams;
-    setFieldEventListener?: (path: EventListenerCall['path'], type: EventListenerCall['type'], callback: EventListenerCall['callback']) => void;
+    setFieldEventListener?: (path: EventListenerCall['path'], type: EventListenerCall['type'], callback: EventListenerCall['callback'], params?: {
+        remove?: boolean;
+    }) => void;
     revealError?: (path: Path, hasError: boolean) => void;
     setFieldInternals?: (path: Path, props: unknown, id?: string) => void;
     setValueInternals?: (path: Path, props: unknown) => void;
-    setHandleSubmit?: (callback: HandleSubmitCallback, params?: {
-        remove?: boolean;
-    }) => void;
     setFieldConnection?: (path: Path, connections: FieldConnections) => void;
     isEmptyDataRef?: React.MutableRefObject<boolean>;
     addSetShowAllErrorsRef?: React.MutableRefObject<Array<(showAllErrors: boolean) => void>>;
@@ -126,7 +127,7 @@ export interface ContextState {
     fieldInternalsRef?: React.MutableRefObject<FieldInternalsRef>;
     valueInternalsRef?: React.MutableRefObject<ValueInternalsRef>;
     fieldConnectionsRef?: React.RefObject<Record<Path, FieldConnections>>;
-    mountedFieldsRef?: React.MutableRefObject<Record<Path, MountState>>;
+    mountedFieldsRef?: React.MutableRefObject<Map<Path, MountState>>;
     snapshotsRef?: React.MutableRefObject<Map<SnapshotName, Map<Path, unknown>>>;
     existingFieldsRef?: React.MutableRefObject<Map<Path, boolean>>;
     formElementRef?: React.MutableRefObject<HTMLFormElement>;

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","hasVisibleError","formState","setFormState","setSubmitState","handleSubmitCall","setShowAllErrors","setMountedFieldState","hasErrors","hasFieldState","hasFieldError","ajvInstance","contextErrorMessages","props","Context","createContext"],"sources":["../../../../../src/extensions/forms/DataContext/Context.ts"],"sourcesContent":["import React from 'react'\nimport { Ajv, FormError, JsonObject, makeAjvInstance } from '../utils'\nimport {\n  AllJSONSchemaVersions,\n  GlobalErrorMessagesWithPaths,\n  SubmitState,\n  Path,\n  EventStateObject,\n  EventReturnWithStateObject,\n  FieldProps,\n  ValueProps,\n  OnChange,\n  OnSubmitParams,\n  CountryCode,\n} from '../types'\nimport { Props as ProviderProps } from './Provider'\nimport { SnapshotName } from '../Form/Snapshot'\nimport { SharedStateId } from '../../../shared/helpers/useSharedState'\n\nexport type MountState = {\n  isPreMounted?: boolean\n  isMounted?: boolean\n  isVisible?: boolean\n  isFocused?: boolean\n  wasStepChange?: boolean\n}\n\nexport type EventListenerCall = {\n  path?: Path\n  type?: 'onSubmit' | 'onPathChange' | 'onMount'\n  callback: (params?: { value: unknown }) => void | Promise<void | Error>\n}\n\nexport type VisibleDataHandler<Data> = (\n  data?: Data,\n  options?: VisibleDataOptions\n) => Partial<Data>\nexport type VisibleDataOptions = {\n  keepPaths?: Array<Path>\n  removePaths?: Array<Path>\n}\nexport type MutateDataHandler<Data> = (\n  data: Data,\n  mutate: TransformData\n) => Partial<Data>\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 = DataPathHandlerParameters & {\n  path: Path\n}\nexport type DataPathHandler<Data = unknown> = (\n  parameters: DataPathHandlerParameters<Data>\n) => boolean | undefined\nexport type DataPathHandlerParameters<Data = unknown> = {\n  path: Path\n  value: unknown\n  displayValue: undefined | React.ReactNode | Array<React.ReactNode>\n  label: React.ReactNode\n  props: FieldProps\n  error: Error | undefined\n\n  /**\n   * Used in the \"filterData\" given by the \"useData\" hook.\n   */\n  data: Data\n\n  /** @deprecated – can be removed in v11 */\n  internal: {\n    error: Error | undefined\n  }\n}\nexport type FilterDataPathObject<Data> = Record<\n  Path,\n  DataPathHandler<Data> | boolean | undefined\n>\nexport type FilterData<Data = unknown> =\n  | FilterDataPathObject<Data>\n  | FilterDataHandlerCallback<boolean | undefined>\nexport type VisibleData<Data = unknown> = Partial<Data>\nexport type TransformData = FilterDataHandlerCallback<unknown>\nexport type HandleSubmitCallback = ({\n  preventSubmit,\n}: {\n  preventSubmit: () => void\n}) => void\nexport type FieldConnections = {\n  setEventResult?: (status: EventStateObject) => void\n}\nexport type FieldInternalsRefProps =\n  | (FieldProps & { children: unknown })\n  | undefined\nexport type FieldInternalsRef = Record<\n  Path,\n  {\n    props: FieldInternalsRefProps\n    id: string | undefined\n  }\n>\nexport type ValueInternalsRef = Record<\n  Path,\n  { props: ValueProps | undefined }\n>\n\nexport interface ContextState {\n  id?: SharedStateId\n  hasContext: boolean\n  /** The dataset for the form / form wizard */\n  data: any\n  internalDataRef?: React.MutableRefObject<any>\n  /** Should the form validate data before submitting? */\n  errors?: Record<Path, 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: (\n    path: Path,\n    value: any,\n    options?: { preventUpdate?: boolean }\n  ) => void\n  setData: (data: any) => void\n  clearData?: () => void\n  mutateDataHandler?: MutateDataHandler<unknown>\n  filterDataHandler?: FilterDataHandler<unknown>\n  visibleDataHandler?: VisibleDataHandler<unknown>\n  validateData: () => void\n  handleSubmit: () => Promise<EventStateObject | undefined>\n  scrollToTop: () => void\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  setMountedFieldState: (path: Path, options: MountState) => void\n  setFormState?: (\n    state: SubmitState,\n    options?: { keepPending?: boolean }\n  ) => void\n  setSubmitState?: (state: EventStateObject) => void\n  addOnChangeHandler?: (callback: OnChange) => void\n  handleSubmitCall: ({\n    onSubmit,\n    enableAsyncBehavior,\n    skipFieldValidation,\n    skipErrorCheck,\n  }: {\n    onSubmit: () =>\n      | EventReturnWithStateObject\n      | void\n      | Promise<EventReturnWithStateObject | void>\n    enableAsyncBehavior: boolean\n    skipFieldValidation?: boolean\n    skipErrorCheck?: boolean\n  }) => Promise<EventStateObject | undefined>\n  getSubmitData?: () => unknown\n  getSubmitParams?: () => OnSubmitParams\n  setFieldEventListener?: (\n    path: EventListenerCall['path'],\n    type: EventListenerCall['type'],\n    callback: EventListenerCall['callback']\n  ) => void\n  revealError?: (path: Path, hasError: boolean) => void\n  setFieldInternals?: (path: Path, props: unknown, id?: string) => void\n  setValueInternals?: (path: Path, props: unknown) => void\n  setHandleSubmit?: (\n    callback: HandleSubmitCallback,\n    params?: { remove?: boolean }\n  ) => void\n  setFieldConnection?: (path: Path, connections: FieldConnections) => void\n  isEmptyDataRef?: React.MutableRefObject<boolean>\n  addSetShowAllErrorsRef?: React.MutableRefObject<\n    Array<(showAllErrors: boolean) => void>\n  >\n  fieldDisplayValueRef?: React.MutableRefObject<\n    Record<Path, { type: 'field'; value?: React.ReactNode }>\n  >\n  fieldInternalsRef?: React.MutableRefObject<FieldInternalsRef>\n  valueInternalsRef?: React.MutableRefObject<ValueInternalsRef>\n  fieldConnectionsRef?: React.RefObject<Record<Path, FieldConnections>>\n  mountedFieldsRef?: React.MutableRefObject<Record<Path, MountState>>\n  snapshotsRef?: React.MutableRefObject<\n    Map<SnapshotName, Map<Path, unknown>>\n  >\n  existingFieldsRef?: React.MutableRefObject<Map<Path, boolean>>\n  formElementRef?: React.MutableRefObject<HTMLFormElement>\n  fieldErrorRef?: React.MutableRefObject<Record<Path, Error>>\n  showAllErrors: boolean | number\n  hasVisibleError: boolean\n  formState: SubmitState\n  ajvInstance: Ajv\n  contextErrorMessages: GlobalErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  path?: Path\n  disabled?: boolean\n  required?: boolean\n  countryCode?: CountryCode\n  submitState: Partial<EventStateObject>\n  prerenderFieldProps?: boolean\n  decoupleForm?: boolean\n  hasElementRef?: React.MutableRefObject<boolean>\n  restHandlerProps?: Record<string, unknown>\n  props: ProviderProps<JsonObject>\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  hasVisibleError: false,\n  formState: undefined,\n  setFormState: () => null,\n  setSubmitState: () => null,\n  handleSubmitCall: () => null,\n  setShowAllErrors: () => null,\n  setMountedFieldState: () => null,\n  hasErrors: () => false,\n  hasFieldState: () => false,\n  hasFieldError: () => false,\n  ajvInstance: makeAjvInstance(),\n  contextErrorMessages: undefined,\n  props: null,\n}\n\nconst Context = React.createContext<ContextState>(defaultContextState)\n\nexport default Context\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAqCC,eAAe,QAAQ,UAAU;AAuNtE,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,eAAe,EAAE,KAAK;EACtBC,SAAS,EAAEZ,SAAS;EACpBa,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,cAAc,EAAEA,CAAA,KAAM,IAAI;EAC1BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,oBAAoB,EAAEA,CAAA,KAAM,IAAI;EAChCC,SAAS,EAAEA,CAAA,KAAM,KAAK;EACtBC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,WAAW,EAAEzB,eAAe,CAAC,CAAC;EAC9B0B,oBAAoB,EAAEtB,SAAS;EAC/BuB,KAAK,EAAE;AACT,CAAC;AAED,MAAMC,OAAO,GAAG7B,KAAK,CAAC8B,aAAa,CAAe5B,mBAAmB,CAAC;AAEtE,eAAe2B,OAAO","ignoreList":[]}
+{"version":3,"file":"Context.js","names":["React","makeAjvInstance","defaultContextState","hasContext","data","undefined","schema","submitState","handlePathChange","handlePathChangeUnvalidated","updateDataValue","setData","validateData","handleSubmit","scrollToTop","showAllErrors","hasVisibleError","formState","setFormState","setSubmitState","handleSubmitCall","setShowAllErrors","setMountedFieldState","hasErrors","hasFieldState","hasFieldError","ajvInstance","contextErrorMessages","props","Context","createContext"],"sources":["../../../../../src/extensions/forms/DataContext/Context.ts"],"sourcesContent":["import React from 'react'\nimport { Ajv, FormError, JsonObject, makeAjvInstance } from '../utils'\nimport {\n  AllJSONSchemaVersions,\n  GlobalErrorMessagesWithPaths,\n  SubmitState,\n  Path,\n  EventStateObject,\n  EventReturnWithStateObject,\n  FieldProps,\n  ValueProps,\n  OnChange,\n  OnSubmitParams,\n  CountryCode,\n} from '../types'\nimport { Props as ProviderProps } from './Provider'\nimport { SnapshotName } from '../Form/Snapshot'\nimport { SharedStateId } from '../../../shared/helpers/useSharedState'\n\nexport type MountState = {\n  isPreMounted?: boolean\n  isMounted?: boolean\n  isVisible?: boolean\n  isFocused?: boolean\n  wasStepChange?: boolean\n}\n\nexport type EventListenerCall = {\n  path?: Path\n  type?:\n    | 'onSubmit'\n    | 'onSubmitCall'\n    | 'onSubmitRequest'\n    | 'onPathChange'\n    | 'onMount'\n  callback: (\n    params?: { value: unknown } | { preventSubmit: () => void }\n  ) => void | Promise<void | Error>\n}\n\nexport type VisibleDataHandler<Data> = (\n  data?: Data,\n  options?: VisibleDataOptions\n) => Partial<Data>\nexport type VisibleDataOptions = {\n  keepPaths?: Array<Path>\n  removePaths?: Array<Path>\n}\nexport type MutateDataHandler<Data> = (\n  data: Data,\n  mutate: TransformData\n) => Partial<Data>\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 = DataPathHandlerParameters & {\n  path: Path\n}\nexport type DataPathHandler<Data = unknown> = (\n  parameters: DataPathHandlerParameters<Data>\n) => boolean | undefined\nexport type DataPathHandlerParameters<Data = unknown> = {\n  path: Path\n  value: unknown\n  displayValue: undefined | React.ReactNode | Array<React.ReactNode>\n  label: React.ReactNode\n  props: FieldProps\n  error: Error | undefined\n\n  /**\n   * Used in the \"filterData\" given by the \"useData\" hook.\n   */\n  data: Data\n\n  /** @deprecated – can be removed in v11 */\n  internal: {\n    error: Error | undefined\n  }\n}\nexport type FilterDataPathObject<Data> = Record<\n  Path,\n  DataPathHandler<Data> | boolean | undefined\n>\nexport type FilterData<Data = unknown> =\n  | FilterDataPathObject<Data>\n  | FilterDataHandlerCallback<boolean | undefined>\nexport type VisibleData<Data = unknown> = Partial<Data>\nexport type TransformData = FilterDataHandlerCallback<unknown>\nexport type HandleSubmitCallback = ({\n  preventSubmit,\n}: {\n  preventSubmit: () => void\n}) => void\nexport type FieldConnections = {\n  setEventResult?: (status: EventStateObject) => void\n}\nexport type FieldInternalsRefProps =\n  | (FieldProps & { children: unknown })\n  | undefined\nexport type FieldInternalsRef = Record<\n  Path,\n  {\n    props: FieldInternalsRefProps\n    id: string | undefined\n  }\n>\nexport type ValueInternalsRef = Record<\n  Path,\n  { props: ValueProps | undefined }\n>\n\nexport interface ContextState {\n  id?: SharedStateId\n  hasContext: boolean\n  /** The dataset for the form / form wizard */\n  data: any\n  internalDataRef?: React.MutableRefObject<any>\n  /** Should the form validate data before submitting? */\n  errors?: Record<Path, 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: (\n    path: Path,\n    value: any,\n    options?: { preventUpdate?: boolean }\n  ) => void\n  setData: (data: any) => void\n  clearData?: () => void\n  mutateDataHandler?: MutateDataHandler<unknown>\n  filterDataHandler?: FilterDataHandler<unknown>\n  visibleDataHandler?: VisibleDataHandler<unknown>\n  validateData: () => void\n  handleSubmit: () => Promise<EventStateObject | undefined>\n  scrollToTop: () => void\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  setMountedFieldState: (path: Path, options: MountState) => void\n  setFormState?: (\n    state: SubmitState,\n    options?: { keepPending?: boolean }\n  ) => void\n  setSubmitState?: (state: EventStateObject) => void\n  addOnChangeHandler?: (callback: OnChange) => void\n  handleSubmitCall: ({\n    onSubmit,\n    enableAsyncBehavior,\n    skipFieldValidation,\n    skipErrorCheck,\n  }: {\n    onSubmit: () =>\n      | EventReturnWithStateObject\n      | void\n      | Promise<EventReturnWithStateObject | void>\n    enableAsyncBehavior: boolean\n    skipFieldValidation?: boolean\n    skipErrorCheck?: boolean\n  }) => Promise<EventStateObject | undefined>\n  getSubmitData?: () => unknown\n  getSubmitParams?: () => OnSubmitParams\n  setFieldEventListener?: (\n    path: EventListenerCall['path'],\n    type: EventListenerCall['type'],\n    callback: EventListenerCall['callback'],\n    params?: { remove?: boolean }\n  ) => void\n  revealError?: (path: Path, hasError: boolean) => void\n  setFieldInternals?: (path: Path, props: unknown, id?: string) => void\n  setValueInternals?: (path: Path, props: unknown) => void\n  setFieldConnection?: (path: Path, connections: FieldConnections) => void\n  isEmptyDataRef?: React.MutableRefObject<boolean>\n  addSetShowAllErrorsRef?: React.MutableRefObject<\n    Array<(showAllErrors: boolean) => void>\n  >\n  fieldDisplayValueRef?: React.MutableRefObject<\n    Record<Path, { type: 'field'; value?: React.ReactNode }>\n  >\n  fieldInternalsRef?: React.MutableRefObject<FieldInternalsRef>\n  valueInternalsRef?: React.MutableRefObject<ValueInternalsRef>\n  fieldConnectionsRef?: React.RefObject<Record<Path, FieldConnections>>\n  mountedFieldsRef?: React.MutableRefObject<Map<Path, MountState>>\n  snapshotsRef?: React.MutableRefObject<\n    Map<SnapshotName, Map<Path, unknown>>\n  >\n  existingFieldsRef?: React.MutableRefObject<Map<Path, boolean>>\n  formElementRef?: React.MutableRefObject<HTMLFormElement>\n  fieldErrorRef?: React.MutableRefObject<Record<Path, Error>>\n  showAllErrors: boolean | number\n  hasVisibleError: boolean\n  formState: SubmitState\n  ajvInstance: Ajv\n  contextErrorMessages: GlobalErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  path?: Path\n  disabled?: boolean\n  required?: boolean\n  countryCode?: CountryCode\n  submitState: Partial<EventStateObject>\n  prerenderFieldProps?: boolean\n  decoupleForm?: boolean\n  hasElementRef?: React.MutableRefObject<boolean>\n  restHandlerProps?: Record<string, unknown>\n  props: ProviderProps<JsonObject>\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  hasVisibleError: false,\n  formState: undefined,\n  setFormState: () => null,\n  setSubmitState: () => null,\n  handleSubmitCall: () => null,\n  setShowAllErrors: () => null,\n  setMountedFieldState: () => null,\n  hasErrors: () => false,\n  hasFieldState: () => false,\n  hasFieldError: () => false,\n  ajvInstance: makeAjvInstance(),\n  contextErrorMessages: undefined,\n  props: null,\n}\n\nconst Context = React.createContext<ContextState>(defaultContextState)\n\nexport default Context\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAqCC,eAAe,QAAQ,UAAU;AA2NtE,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,eAAe,EAAE,KAAK;EACtBC,SAAS,EAAEZ,SAAS;EACpBa,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,cAAc,EAAEA,CAAA,KAAM,IAAI;EAC1BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,oBAAoB,EAAEA,CAAA,KAAM,IAAI;EAChCC,SAAS,EAAEA,CAAA,KAAM,KAAK;EACtBC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,aAAa,EAAEA,CAAA,KAAM,KAAK;EAC1BC,WAAW,EAAEzB,eAAe,CAAC,CAAC;EAC9B0B,oBAAoB,EAAEtB,SAAS;EAC/BuB,KAAK,EAAE;AACT,CAAC;AAED,MAAMC,OAAO,GAAG7B,KAAK,CAAC8B,aAAa,CAAe5B,mBAAmB,CAAC;AAEtE,eAAe2B,OAAO","ignoreList":[]}

package/extensions/forms/DataContext/FieldBoundary/FieldBoundaryProvider.js

@@ -31,12 +31,12 @@ export default function FieldBoundaryProvider(props) {
     forceUpdate();
     (_onPathErrorRef$curre = onPathErrorRef.current) === null || _onPathErrorRef$curre === void 0 ? void 0 : _onPathErrorRef$curre.call(onPathErrorRef, path, error);
   }, []);
-  const hasVisibleErrorRef = useRef({});
+  const hasVisibleErrorRef = useRef(new Map());
   const revealError = useCallback((path, hasError) => {
     if (hasError) {
-      hasVisibleErrorRef.current[path] = hasError;
+      hasVisibleErrorRef.current.set(path, hasError);
     } else {
-      delete hasVisibleErrorRef.current[path];
+      hasVisibleErrorRef.current.delete(path);
     }
     forceUpdate();
   }, []);
@@ -47,7 +47,7 @@ export default function FieldBoundaryProvider(props) {
   const context = {
     hasError,
     hasSubmitError,
-    hasVisibleError: Object.keys(hasVisibleErrorRef.current).length > 0,
+    hasVisibleError: hasVisibleErrorRef.current.size > 0,
     errorsRef,
     showBoundaryErrors: showBoundaryErrorsRef.current,
     setShowBoundaryErrors,

package/extensions/forms/DataContext/FieldBoundary/FieldBoundaryProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"FieldBoundaryProvider.js","names":["React","useCallback","useContext","useReducer","useRef","FieldBoundaryContext","DataContext","FieldBoundaryProvider","props","showErrors","undefined","onPathError","children","forceUpdate","showAllErrors","onPathErrorRef","current","errorsRef","showBoundaryErrorsRef","hasError","Object","keys","length","hasSubmitError","setFieldError","path","error","_onPathErrorRef$curre","_errorsRef$current","call","hasVisibleErrorRef","revealError","setShowBoundaryErrors","showBoundaryErrors","Date","now","context","hasVisibleError","createElement","Provider","value"],"sources":["../../../../../../src/extensions/forms/DataContext/FieldBoundary/FieldBoundaryProvider.tsx"],"sourcesContent":["import React, { useCallback, useContext, useReducer, useRef } from 'react'\nimport FieldBoundaryContext, {\n  FieldBoundaryContextState,\n} from './FieldBoundaryContext'\nimport DataContext from '../Context'\nimport { Path } from '../../types'\n\nexport type Props = {\n  showErrors?: boolean\n  onPathError?: (path: Path, error: Error) => void\n  children: React.ReactNode\n}\n\nexport default function FieldBoundaryProvider(props: Props) {\n  const { showErrors = undefined, onPathError = null, children } = props\n  const [, forceUpdate] = useReducer(() => ({}), {})\n  const { showAllErrors } = useContext(DataContext)\n\n  const onPathErrorRef = useRef(onPathError)\n  onPathErrorRef.current = onPathError\n  const errorsRef = useRef<Record<Path, boolean>>({})\n  const showBoundaryErrorsRef =\n    useRef<FieldBoundaryContextState['showBoundaryErrors']>(showErrors)\n  const hasError = Object.keys(errorsRef.current).length > 0\n  const hasSubmitError = showAllErrors && hasError\n\n  const setFieldError = useCallback((path: Path, error: Error) => {\n    if (error) {\n      errorsRef.current[path] = !!error\n    } else {\n      delete errorsRef.current?.[path]\n    }\n    forceUpdate()\n    onPathErrorRef.current?.(path, error)\n  }, [])\n\n  const hasVisibleErrorRef = useRef<Record<Path, boolean>>({})\n  const revealError = useCallback((path: Path, hasError: boolean) => {\n    if (hasError) {\n      hasVisibleErrorRef.current[path] = hasError\n    } else {\n      delete hasVisibleErrorRef.current[path]\n    }\n    forceUpdate()\n  }, [])\n\n  const setShowBoundaryErrors: FieldBoundaryContextState['setShowBoundaryErrors'] =\n    useCallback((showBoundaryErrors) => {\n      showBoundaryErrorsRef.current = showBoundaryErrors\n        ? Date.now() // in order to renew the internal dependency \"showBoundaryErrors\"\n        : false\n      forceUpdate()\n    }, [])\n\n  const context: FieldBoundaryContextState = {\n    hasError,\n    hasSubmitError,\n    hasVisibleError: Object.keys(hasVisibleErrorRef.current).length > 0,\n    errorsRef,\n    showBoundaryErrors: showBoundaryErrorsRef.current,\n    setShowBoundaryErrors,\n    setFieldError,\n    revealError,\n  }\n\n  return (\n    <FieldBoundaryContext.Provider value={context}>\n      {children}\n    </FieldBoundaryContext.Provider>\n  )\n}\n"],"mappings":";;;AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,UAAU,EAAEC,UAAU,EAAEC,MAAM,QAAQ,OAAO;AAC1E,OAAOC,oBAAoB,MAEpB,wBAAwB;AAC/B,OAAOC,WAAW,MAAM,YAAY;AASpC,eAAe,SAASC,qBAAqBA,CAACC,KAAY,EAAE;EAC1D,MAAM;IAAEC,UAAU,GAAGC,SAAS;IAAEC,WAAW,GAAG,IAAI;IAAEC;EAAS,CAAC,GAAGJ,KAAK;EACtE,MAAM,GAAGK,WAAW,CAAC,GAAGV,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAClD,MAAM;IAAEW;EAAc,CAAC,GAAGZ,UAAU,CAACI,WAAW,CAAC;EAEjD,MAAMS,cAAc,GAAGX,MAAM,CAACO,WAAW,CAAC;EAC1CI,cAAc,CAACC,OAAO,GAAGL,WAAW;EACpC,MAAMM,SAAS,GAAGb,MAAM,CAAwB,CAAC,CAAC,CAAC;EACnD,MAAMc,qBAAqB,GACzBd,MAAM,CAAkDK,UAAU,CAAC;EACrE,MAAMU,QAAQ,GAAGC,MAAM,CAACC,IAAI,CAACJ,SAAS,CAACD,OAAO,CAAC,CAACM,MAAM,GAAG,CAAC;EAC1D,MAAMC,cAAc,GAAGT,aAAa,IAAIK,QAAQ;EAEhD,MAAMK,aAAa,GAAGvB,WAAW,CAAC,CAACwB,IAAU,EAAEC,KAAY,KAAK;IAAA,IAAAC,qBAAA;IAC9D,IAAID,KAAK,EAAE;MACTT,SAAS,CAACD,OAAO,CAACS,IAAI,CAAC,GAAG,CAAC,CAACC,KAAK;IACnC,CAAC,MAAM;MAAA,IAAAE,kBAAA;MACL,CAAAA,kBAAA,GAAOX,SAAS,CAACD,OAAO,cAAAY,kBAAA,qBAAxB,OAAOA,kBAAA,CAAoBH,IAAI,CAAC;IAClC;IACAZ,WAAW,CAAC,CAAC;IACb,CAAAc,qBAAA,GAAAZ,cAAc,CAACC,OAAO,cAAAW,qBAAA,uBAAtBA,qBAAA,CAAAE,IAAA,CAAAd,cAAc,EAAWU,IAAI,EAAEC,KAAK,CAAC;EACvC,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMI,kBAAkB,GAAG1B,MAAM,CAAwB,CAAC,CAAC,CAAC;EAC5D,MAAM2B,WAAW,GAAG9B,WAAW,CAAC,CAACwB,IAAU,EAAEN,QAAiB,KAAK;IACjE,IAAIA,QAAQ,EAAE;MACZW,kBAAkB,CAACd,OAAO,CAACS,IAAI,CAAC,GAAGN,QAAQ;IAC7C,CAAC,MAAM;MACL,OAAOW,kBAAkB,CAACd,OAAO,CAACS,IAAI,CAAC;IACzC;IACAZ,WAAW,CAAC,CAAC;EACf,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMmB,qBAAyE,GAC7E/B,WAAW,CAAEgC,kBAAkB,IAAK;IAClCf,qBAAqB,CAACF,OAAO,GAAGiB,kBAAkB,GAC9CC,IAAI,CAACC,GAAG,CAAC,CAAC,GACV,KAAK;IACTtB,WAAW,CAAC,CAAC;EACf,CAAC,EAAE,EAAE,CAAC;EAER,MAAMuB,OAAkC,GAAG;IACzCjB,QAAQ;IACRI,cAAc;IACdc,eAAe,EAAEjB,MAAM,CAACC,IAAI,CAACS,kBAAkB,CAACd,OAAO,CAAC,CAACM,MAAM,GAAG,CAAC;IACnEL,SAAS;IACTgB,kBAAkB,EAAEf,qBAAqB,CAACF,OAAO;IACjDgB,qBAAqB;IACrBR,aAAa;IACbO;EACF,CAAC;EAED,OACE/B,KAAA,CAAAsC,aAAA,CAACjC,oBAAoB,CAACkC,QAAQ;IAACC,KAAK,EAAEJ;EAAQ,GAC3CxB,QAC4B,CAAC;AAEpC","ignoreList":[]}
+{"version":3,"file":"FieldBoundaryProvider.js","names":["React","useCallback","useContext","useReducer","useRef","FieldBoundaryContext","DataContext","FieldBoundaryProvider","props","showErrors","undefined","onPathError","children","forceUpdate","showAllErrors","onPathErrorRef","current","errorsRef","showBoundaryErrorsRef","hasError","Object","keys","length","hasSubmitError","setFieldError","path","error","_onPathErrorRef$curre","_errorsRef$current","call","hasVisibleErrorRef","Map","revealError","set","delete","setShowBoundaryErrors","showBoundaryErrors","Date","now","context","hasVisibleError","size","createElement","Provider","value"],"sources":["../../../../../../src/extensions/forms/DataContext/FieldBoundary/FieldBoundaryProvider.tsx"],"sourcesContent":["import React, { useCallback, useContext, useReducer, useRef } from 'react'\nimport FieldBoundaryContext, {\n  FieldBoundaryContextState,\n} from './FieldBoundaryContext'\nimport DataContext from '../Context'\nimport { Path } from '../../types'\n\nexport type Props = {\n  showErrors?: boolean\n  onPathError?: (path: Path, error: Error) => void\n  children: React.ReactNode\n}\n\nexport default function FieldBoundaryProvider(props: Props) {\n  const { showErrors = undefined, onPathError = null, children } = props\n  const [, forceUpdate] = useReducer(() => ({}), {})\n  const { showAllErrors } = useContext(DataContext)\n\n  const onPathErrorRef = useRef(onPathError)\n  onPathErrorRef.current = onPathError\n  const errorsRef = useRef<Record<Path, boolean>>({})\n  const showBoundaryErrorsRef =\n    useRef<FieldBoundaryContextState['showBoundaryErrors']>(showErrors)\n  const hasError = Object.keys(errorsRef.current).length > 0\n  const hasSubmitError = showAllErrors && hasError\n\n  const setFieldError = useCallback((path: Path, error: Error) => {\n    if (error) {\n      errorsRef.current[path] = !!error\n    } else {\n      delete errorsRef.current?.[path]\n    }\n    forceUpdate()\n    onPathErrorRef.current?.(path, error)\n  }, [])\n\n  const hasVisibleErrorRef = useRef<Map<Path, boolean>>(new Map())\n  const revealError = useCallback((path: Path, hasError: boolean) => {\n    if (hasError) {\n      hasVisibleErrorRef.current.set(path, hasError)\n    } else {\n      hasVisibleErrorRef.current.delete(path)\n    }\n    forceUpdate()\n  }, [])\n\n  const setShowBoundaryErrors: FieldBoundaryContextState['setShowBoundaryErrors'] =\n    useCallback((showBoundaryErrors) => {\n      showBoundaryErrorsRef.current = showBoundaryErrors\n        ? Date.now() // in order to renew the internal dependency \"showBoundaryErrors\"\n        : false\n      forceUpdate()\n    }, [])\n\n  const context: FieldBoundaryContextState = {\n    hasError,\n    hasSubmitError,\n    hasVisibleError: hasVisibleErrorRef.current.size > 0,\n    errorsRef,\n    showBoundaryErrors: showBoundaryErrorsRef.current,\n    setShowBoundaryErrors,\n    setFieldError,\n    revealError,\n  }\n\n  return (\n    <FieldBoundaryContext.Provider value={context}>\n      {children}\n    </FieldBoundaryContext.Provider>\n  )\n}\n"],"mappings":";;;AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,UAAU,EAAEC,UAAU,EAAEC,MAAM,QAAQ,OAAO;AAC1E,OAAOC,oBAAoB,MAEpB,wBAAwB;AAC/B,OAAOC,WAAW,MAAM,YAAY;AASpC,eAAe,SAASC,qBAAqBA,CAACC,KAAY,EAAE;EAC1D,MAAM;IAAEC,UAAU,GAAGC,SAAS;IAAEC,WAAW,GAAG,IAAI;IAAEC;EAAS,CAAC,GAAGJ,KAAK;EACtE,MAAM,GAAGK,WAAW,CAAC,GAAGV,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAClD,MAAM;IAAEW;EAAc,CAAC,GAAGZ,UAAU,CAACI,WAAW,CAAC;EAEjD,MAAMS,cAAc,GAAGX,MAAM,CAACO,WAAW,CAAC;EAC1CI,cAAc,CAACC,OAAO,GAAGL,WAAW;EACpC,MAAMM,SAAS,GAAGb,MAAM,CAAwB,CAAC,CAAC,CAAC;EACnD,MAAMc,qBAAqB,GACzBd,MAAM,CAAkDK,UAAU,CAAC;EACrE,MAAMU,QAAQ,GAAGC,MAAM,CAACC,IAAI,CAACJ,SAAS,CAACD,OAAO,CAAC,CAACM,MAAM,GAAG,CAAC;EAC1D,MAAMC,cAAc,GAAGT,aAAa,IAAIK,QAAQ;EAEhD,MAAMK,aAAa,GAAGvB,WAAW,CAAC,CAACwB,IAAU,EAAEC,KAAY,KAAK;IAAA,IAAAC,qBAAA;IAC9D,IAAID,KAAK,EAAE;MACTT,SAAS,CAACD,OAAO,CAACS,IAAI,CAAC,GAAG,CAAC,CAACC,KAAK;IACnC,CAAC,MAAM;MAAA,IAAAE,kBAAA;MACL,CAAAA,kBAAA,GAAOX,SAAS,CAACD,OAAO,cAAAY,kBAAA,qBAAxB,OAAOA,kBAAA,CAAoBH,IAAI,CAAC;IAClC;IACAZ,WAAW,CAAC,CAAC;IACb,CAAAc,qBAAA,GAAAZ,cAAc,CAACC,OAAO,cAAAW,qBAAA,uBAAtBA,qBAAA,CAAAE,IAAA,CAAAd,cAAc,EAAWU,IAAI,EAAEC,KAAK,CAAC;EACvC,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMI,kBAAkB,GAAG1B,MAAM,CAAqB,IAAI2B,GAAG,CAAC,CAAC,CAAC;EAChE,MAAMC,WAAW,GAAG/B,WAAW,CAAC,CAACwB,IAAU,EAAEN,QAAiB,KAAK;IACjE,IAAIA,QAAQ,EAAE;MACZW,kBAAkB,CAACd,OAAO,CAACiB,GAAG,CAACR,IAAI,EAAEN,QAAQ,CAAC;IAChD,CAAC,MAAM;MACLW,kBAAkB,CAACd,OAAO,CAACkB,MAAM,CAACT,IAAI,CAAC;IACzC;IACAZ,WAAW,CAAC,CAAC;EACf,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMsB,qBAAyE,GAC7ElC,WAAW,CAAEmC,kBAAkB,IAAK;IAClClB,qBAAqB,CAACF,OAAO,GAAGoB,kBAAkB,GAC9CC,IAAI,CAACC,GAAG,CAAC,CAAC,GACV,KAAK;IACTzB,WAAW,CAAC,CAAC;EACf,CAAC,EAAE,EAAE,CAAC;EAER,MAAM0B,OAAkC,GAAG;IACzCpB,QAAQ;IACRI,cAAc;IACdiB,eAAe,EAAEV,kBAAkB,CAACd,OAAO,CAACyB,IAAI,GAAG,CAAC;IACpDxB,SAAS;IACTmB,kBAAkB,EAAElB,qBAAqB,CAACF,OAAO;IACjDmB,qBAAqB;IACrBX,aAAa;IACbQ;EACF,CAAC;EAED,OACEhC,KAAA,CAAA0C,aAAA,CAACrC,oBAAoB,CAACsC,QAAQ;IAACC,KAAK,EAAEL;EAAQ,GAC3C3B,QAC4B,CAAC;AAEpC","ignoreList":[]}

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

@@ -69,10 +69,10 @@ export default function Provider(props) {
   } = useContext(SharedContext) || {};
   const translation = useTranslation().Field;
   const ajvRef = useRef(makeAjvInstance(ajvInstance));
-  const mountedFieldsRef = useRef({});
+  const mountedFieldsRef = useRef(new Map());
   const snapshotsRef = useRef(new Map());
   const existingFieldsRef = useRef(new Map());
-  const hasVisibleErrorRef = useRef({});
+  const hasVisibleErrorRef = useRef(new Map());
   const errorsRef = useRef();
   const addSetShowAllErrorsRef = useRef([]);
   const showAllErrorsRef = useRef(false);
@@ -83,9 +83,9 @@ export default function Provider(props) {
   }, []);
   const revealError = useCallback((path, hasError) => {
     if (hasError) {
-      hasVisibleErrorRef.current[path] = hasError;
+      hasVisibleErrorRef.current.set(path, hasError);
     } else {
-      delete hasVisibleErrorRef.current[path];
+      hasVisibleErrorRef.current.delete(path);
     }
     forceUpdate();
   }, []);
@@ -142,22 +142,16 @@ export default function Provider(props) {
     return Boolean(state === 'error' ? ((_errorsRef$current = errorsRef.current) === null || _errorsRef$current === void 0 ? void 0 : _errorsRef$current[path]) instanceof Error || fieldErrorRef.current[path] instanceof Error : fieldStateRef.current[path] === state);
   }, []);
   const hasFieldState = useCallback(state => {
-    for (const path in mountedFieldsRef.current) {
-      const item = mountedFieldsRef.current[path];
-      if (item.isMounted && checkFieldStateFor(path, state)) {
-        return true;
-      }
-    }
-    return false;
+    return Array.from(mountedFieldsRef.current.entries()).some(_ref => {
+      let [path, item] = _ref;
+      return item.isMounted && checkFieldStateFor(path, state);
+    });
   }, [checkFieldStateFor]);
   const hasFieldError = useCallback(path => {
-    for (const p in mountedFieldsRef.current) {
-      const item = mountedFieldsRef.current[path];
-      if (item.isMounted && p === path && checkFieldStateFor(path, 'error')) {
-        return true;
-      }
-    }
-    return false;
+    return Array.from(mountedFieldsRef.current.entries()).some(_ref2 => {
+      let [p, item] = _ref2;
+      return item.isMounted && p === path && checkFieldStateFor(path, 'error');
+    });
   }, [checkFieldStateFor]);
   const hasErrors = useCallback(() => {
     return hasFieldState('error');
@@ -238,11 +232,11 @@ export default function Provider(props) {
       }
       return data;
     } else if (handler) {
-      const runFilter = _ref => {
+      const runFilter = _ref3 => {
         let {
           path,
           condition
-        } = _ref;
+        } = _ref3;
         const exists = pointer.has(data, path);
         if (exists) {
           const result = typeof condition === 'function' ? condition(getDataPathHandlerParameters(path, data)) : condition;
@@ -250,8 +244,8 @@ export default function Provider(props) {
         }
       };
       const wildcardPaths = [];
-      Object.entries(handler).forEach(_ref2 => {
-        let [path, condition] = _ref2;
+      Object.entries(handler).forEach(_ref4 => {
+        let [path, condition] = _ref4;
         if (path.includes('*')) {
           const parts = path.split(/\/\*/g);
           const exists = pointer.has(data, parts[0]);
@@ -292,12 +286,11 @@ export default function Provider(props) {
       removePaths
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     const visibleData = {};
-    for (const path in mountedFieldsRef.current) {
-      const item = mountedFieldsRef.current[path];
+    mountedFieldsRef.current.forEach((item, path) => {
       if (item && item.isVisible !== false && (item.isPreMounted !== false || item.wasStepChange === true) && (removePaths ? !removePaths.includes(path) : true) && pointer.has(data, path)) {
         pointer.set(visibleData, path, pointer.get(data, path));
       }
-    }
+    });
     if (keepPaths) {
       keepPaths.forEach(path => {
         if (pointer.has(data, path)) {
@@ -340,7 +333,7 @@ export default function Provider(props) {
   const hasFieldWithAsyncValidator = useCallback(() => {
     for (const path in fieldInternalsRef.current) {
       var _mountedFieldsRef$cur;
-      if ((_mountedFieldsRef$cur = mountedFieldsRef.current[path]) !== null && _mountedFieldsRef$cur !== void 0 && _mountedFieldsRef$cur.isMounted) {
+      if ((_mountedFieldsRef$cur = mountedFieldsRef.current.get(path)) !== null && _mountedFieldsRef$cur !== void 0 && _mountedFieldsRef$cur.isMounted) {
         var _fieldInternalsRef$cu2;
         const props = (_fieldInternalsRef$cu2 = fieldInternalsRef.current[path]) === null || _fieldInternalsRef$cu2 === void 0 ? void 0 : _fieldInternalsRef$cu2.props;
         if (isAsync(props === null || props === void 0 ? void 0 : props.onChangeValidator) || isAsync(props === null || props === void 0 ? void 0 : props.onBlurValidator)) {
@@ -388,9 +381,9 @@ export default function Provider(props) {
   }, [id, initialData, sharedData, data]);
   internalDataRef.current = props.path && pointer.has(internalData, props.path) ? pointer.get(internalData, props.path) : internalData;
   const clearData = useCallback(() => {
-    var _ref3, _requestAnimationFram;
+    var _ref5, _requestAnimationFram;
     isEmptyDataRef.current = true;
-    internalDataRef.current = (_ref3 = typeof emptyData === 'function' ? emptyData(internalDataRef.current) : emptyData) !== null && _ref3 !== void 0 ? _ref3 : Array.isArray(internalDataRef.current) ? [] : clearedData;
+    internalDataRef.current = (_ref5 = typeof emptyData === 'function' ? emptyData(internalDataRef.current) : emptyData) !== null && _ref5 !== void 0 ? _ref5 : Array.isArray(internalDataRef.current) ? [] : clearedData;
     if (id) {
       setSharedData(internalDataRef.current);
     }
@@ -514,11 +507,7 @@ export default function Provider(props) {
     }
   }, []);
   const setMountedFieldState = useCallback((path, state) => {
-    if (!mountedFieldsRef.current[path]) {
-      mountedFieldsRef.current[path] = _objectSpread({}, state);
-    } else {
-      Object.assign(mountedFieldsRef.current[path], state);
-    }
+    mountedFieldsRef.current.set(path, _objectSpread(_objectSpread({}, mountedFieldsRef.current.get(path)), state));
     for (const itm of fieldEventListenersRef.current) {
       if (itm.type === 'onMount' && itm.path === path) {
         const {
@@ -560,7 +549,7 @@ export default function Provider(props) {
           type,
           callback
         } = item;
-        if (type === 'onSubmit' && (_mountedFieldsRef$cur2 = mountedFieldsRef.current[path]) !== null && _mountedFieldsRef$cur2 !== void 0 && _mountedFieldsRef$cur2.isMounted) {
+        if (type === 'onSubmitCall' && (_mountedFieldsRef$cur2 = mountedFieldsRef.current.get(path)) !== null && _mountedFieldsRef$cur2 !== void 0 && _mountedFieldsRef$cur2.isMounted) {
           if (asyncBehaviorIsEnabled) {
             await callback();
           } else {
@@ -607,9 +596,8 @@ export default function Provider(props) {
       }
     } else {
       if (asyncBehaviorIsEnabled) {
-        window.requestAnimationFrame(() => {
-          setFormState(undefined);
-        });
+        await new Promise(resolve => window.requestAnimationFrame(resolve));
+        setFormState(undefined);
         if (!skipFieldValidation) {
           onSubmitContinueRef.current = () => {
             window.requestAnimationFrame(() => {
@@ -624,38 +612,21 @@ export default function Provider(props) {
       onSubmitRequest === null || onSubmitRequest === void 0 ? void 0 : onSubmitRequest({
         getErrors: () => Object.keys(fieldErrorRef.current).map(path => {
           return getDataPathHandlerParameters(path);
-        }).filter(_ref4 => {
+        }).filter(_ref6 => {
           let {
             error
-          } = _ref4;
+          } = _ref6;
           return error;
         })
       });
+      for (const itm of fieldEventListenersRef.current) {
+        if (itm.type === 'onSubmitRequest') {
+          itm.callback();
+        }
+      }
     }
     return result;
   }, [clearData, getDataPathHandlerParameters, hasErrors, hasFieldState, hasFieldWithAsyncValidator, isolate, onCommit, onSubmitRequest, setFormState, setShowAllErrors, setSubmitState]);
-  const handleSubmitListenersRef = useRef([]);
-  const setHandleSubmit = useCallback(function (callback) {
-    let {
-      remove = false
-    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    const listeners = handleSubmitListenersRef.current;
-    if (remove) {
-      handleSubmitListenersRef.current = listeners.filter(item => item !== callback);
-    } else if (!listeners.includes(callback)) {
-      listeners.push(callback);
-    }
-  }, []);
-  const handleSubmitListeners = useCallback(() => {
-    let stop = false;
-    const preventSubmit = () => stop = true;
-    handleSubmitListenersRef.current.forEach(cb => {
-      cb({
-        preventSubmit
-      });
-    });
-    return stop;
-  }, []);
   const getSubmitData = useCallback(() => {
     const data = internalDataRef.current;
     const mutatedData = transformOut ? mutateDataHandler(data, transformOut) : data;
@@ -669,10 +640,10 @@ export default function Provider(props) {
     const transformData = (data, handler) => {
       return mutateDataHandler(data, handler, {
         mutate: false,
-        fireHandlerWhen: _ref5 => {
+        fireHandlerWhen: _ref7 => {
           let {
             type
-          } = _ref5;
+          } = _ref7;
           return type === 'field';
         }
       });
@@ -700,7 +671,20 @@ export default function Provider(props) {
     return await handleSubmitCall({
       enableAsyncBehavior: isAsync(onSubmit),
       onSubmit: async () => {
-        if (handleSubmitListeners()) {
+        let stop = false;
+        const preventSubmit = () => stop = true;
+        for (const item of fieldEventListenersRef.current) {
+          const {
+            type,
+            callback
+          } = item;
+          if (type === 'onSubmit') {
+            callback({
+              preventSubmit
+            });
+          }
+        }
+        if (stop) {
           return;
         }
         const data = getSubmitData();
@@ -721,22 +705,27 @@ export default function Provider(props) {
         return result;
       }
     });
-  }, [getSubmitData, getSubmitParams, handleSubmitCall, handleSubmitListeners, onSubmit, onSubmitComplete, scrollToTop, scrollTopOnSubmit]);
+  }, [getSubmitData, getSubmitParams, handleSubmitCall, onSubmit, onSubmitComplete, scrollToTop, scrollTopOnSubmit]);
   const fieldEventListenersRef = useRef([]);
-  const setFieldEventListener = useCallback((path, type, callback) => {
-    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref6 => {
+  const setFieldEventListener = useCallback(function (path, type, callback) {
+    let {
+      remove = false
+    } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref8 => {
       let {
         path: p,
         type: t,
         callback: c
-      } = _ref6;
+      } = _ref8;
       return !(p === path && t === type && c === callback);
     });
-    fieldEventListenersRef.current.push({
-      path,
-      type,
-      callback
-    });
+    if (!remove) {
+      fieldEventListenersRef.current.push({
+        path,
+        type,
+        callback
+      });
+    }
   }, []);
   const onSubmitContinueRef = useRef(null);
   if (!hasFieldState('pending')) {
@@ -847,7 +836,6 @@ export default function Provider(props) {
     getSubmitData,
     getSubmitParams,
     addOnChangeHandler,
-    setHandleSubmit,
     scrollToTop,
     schema,
     disabled,
@@ -858,7 +846,7 @@ export default function Provider(props) {
     hasContext: true,
     errors: errorsRef.current,
     showAllErrors: showAllErrorsRef.current,
-    hasVisibleError: Object.keys(hasVisibleErrorRef.current).length > 0,
+    hasVisibleError: hasVisibleErrorRef.current.size > 0,
     addSetShowAllErrorsRef,
     fieldConnectionsRef,
     fieldDisplayValueRef,