@dnb/eufemia 10.51.2 → 10.52.0

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

@@ -2,10 +2,12 @@ import React from 'react';
 import { Ajv } from '../utils/ajv';
 import { AllJSONSchemaVersions, CustomErrorMessagesWithPaths, SubmitState, Path, EventStateObject, EventReturnWithStateObject, Identifier, FieldProps, FormError, ValueProps, OnChange, OnSubmitParams } from '../types';
 import { Props as ProviderProps } from './Provider';
+import { SnapshotName } from '../Form/Snapshot';
 export type MountState = {
     isPreMounted?: boolean;
     isMounted?: boolean;
     isVisible?: boolean;
+    isFocused?: boolean;
     wasStepChange?: boolean;
 };
 export type EventListenerCall = {
@@ -96,11 +98,14 @@ export interface ContextState {
         remove?: boolean;
     }) => void;
     setFieldConnection?: (path: Path, connections: FieldConnections) => void;
+    isEmptyDataRef?: React.MutableRefObject<boolean>;
     fieldPropsRef?: React.MutableRefObject<Record<string, FieldProps>>;
     valuePropsRef?: React.MutableRefObject<Record<string, ValueProps>>;
     fieldConnectionsRef?: React.RefObject<Record<Path, FieldConnections>>;
     mountedFieldsRef?: React.MutableRefObject<Record<Path, MountState>>;
+    snapshotsRef?: React.MutableRefObject<Map<SnapshotName, Map<Path, unknown>>>;
     formElementRef?: React.MutableRefObject<HTMLFormElement>;
+    fieldErrorRef?: React.MutableRefObject<Record<Path, Error>>;
     showAllErrors: boolean;
     hasVisibleError: boolean;
     formState: SubmitState;

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","setFieldState","setFieldError","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  ValueProps,\n  OnChange,\n  OnSubmitParams,\n} from '../types'\nimport { Props as ProviderProps } from './Provider'\n\nexport type MountState = {\n  isPreMounted?: boolean\n  isMounted?: boolean\n  isVisible?: 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 =\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 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}\n\nexport interface ContextState {\n  id?: Identifier\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<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: (\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  getSubmitOptions?: () => OnSubmitParams\n  setFieldEventListener?: (\n    path: EventListenerCall['path'],\n    type: EventListenerCall['type'],\n    callback: EventListenerCall['callback']\n  ) => void\n  setVisibleError?: (path: Path, hasError: boolean) => void\n  setFieldProps?: (path: Path, props: unknown) => void\n  setValueProps?: (path: Path, props: unknown) => void\n  setHandleSubmit?: (\n    callback: HandleSubmitCallback,\n    params?: { remove?: boolean }\n  ) => void\n  setFieldConnection?: (path: Path, connections: FieldConnections) => void\n  fieldPropsRef?: React.MutableRefObject<Record<string, FieldProps>>\n  valuePropsRef?: React.MutableRefObject<Record<string, ValueProps>>\n  fieldConnectionsRef?: React.RefObject<Record<Path, FieldConnections>>\n  mountedFieldsRef?: React.MutableRefObject<Record<Path, MountState>>\n  formElementRef?: React.MutableRefObject<HTMLFormElement>\n  showAllErrors: boolean\n  hasVisibleError: boolean\n  formState: SubmitState\n  ajvInstance: Ajv\n  contextErrorMessages: CustomErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  path?: Path\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  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  setFieldState: () => null,\n  setFieldError: () => 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;AA+KnD,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,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,WAAW,EAAE3B,eAAe,CAAC,CAAC;EAC9B4B,oBAAoB,EAAExB,SAAS;EAC/ByB,mBAAmB,EAAE,KAAK;EAC1BC,KAAK,EAAE;AACT,CAAC;AAED,MAAMC,OAAO,GAAGhC,KAAK,CAACiC,aAAa,CAAe/B,mBAAmB,CAAC;AAEtE,eAAe8B,OAAO"}
+{"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","setFieldState","setFieldError","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  ValueProps,\n  OnChange,\n  OnSubmitParams,\n} from '../types'\nimport { Props as ProviderProps } from './Provider'\nimport { SnapshotName } from '../Form/Snapshot'\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 =\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 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}\n\nexport interface ContextState {\n  id?: Identifier\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<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: (\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  getSubmitOptions?: () => OnSubmitParams\n  setFieldEventListener?: (\n    path: EventListenerCall['path'],\n    type: EventListenerCall['type'],\n    callback: EventListenerCall['callback']\n  ) => void\n  setVisibleError?: (path: Path, hasError: boolean) => void\n  setFieldProps?: (path: Path, props: unknown) => void\n  setValueProps?: (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  fieldPropsRef?: React.MutableRefObject<Record<string, FieldProps>>\n  valuePropsRef?: React.MutableRefObject<Record<string, ValueProps>>\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  formElementRef?: React.MutableRefObject<HTMLFormElement>\n  fieldErrorRef?: React.MutableRefObject<Record<Path, Error>>\n  showAllErrors: boolean\n  hasVisibleError: boolean\n  formState: SubmitState\n  ajvInstance: Ajv\n  contextErrorMessages: CustomErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  path?: Path\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  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  setFieldState: () => null,\n  setFieldError: () => 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;AAsLnD,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,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,WAAW,EAAE3B,eAAe,CAAC,CAAC;EAC9B4B,oBAAoB,EAAExB,SAAS;EAC/ByB,mBAAmB,EAAE,KAAK;EAC1BC,KAAK,EAAE;AACT,CAAC;AAED,MAAMC,OAAO,GAAGhC,KAAK,CAACiC,aAAa,CAAe/B,mBAAmB,CAAC;AAEtE,eAAe8B,OAAO"}

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

@@ -4,7 +4,18 @@ import { Ajv } from '../../utils/ajv';
 import { CustomErrorMessagesWithPaths, AllJSONSchemaVersions, Path, OnSubmit, OnChange, EventReturnWithStateObject } from '../../types';
 import type { IsolationProviderProps } from '../../Form/Isolation/Isolation';
 import { ContextProps } from '../../../../shared/Context';
-import { FilterData, TransformData } from '../Context';
+import { ContextState, FilterData, FilterDataHandler, TransformData, VisibleDataHandler } from '../Context';
+export type SharedAttachments<Data = unknown> = {
+    visibleDataHandler?: VisibleDataHandler<Data>;
+    filterDataHandler?: FilterDataHandler<Data>;
+    hasErrors?: ContextState['hasErrors'];
+    hasFieldError?: ContextState['hasFieldError'];
+    setShowAllErrors?: ContextState['setShowAllErrors'];
+    setSubmitState?: ContextState['setSubmitState'];
+    rerenderUseDataHook?: () => void;
+    clearData?: () => void;
+    fieldConnectionsRef?: ContextState['fieldConnectionsRef'];
+};
 export interface Props<Data extends JsonObject> extends IsolationProviderProps<Data> {
     /**
      * Unique ID to communicate with the hook Form.useData

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

@@ -19,7 +19,7 @@ import structuredClone from '@ungap/structured-clone';
 const useLayoutEffect = typeof window === 'undefined' ? React.useEffect : React.useLayoutEffect;
 const isArrayJsonPointer = /^\/\d+(\/|$)/;
 export default function Provider(props) {
-  var _sharedAttachments$da, _sharedData$data3;
+  var _sharedAttachments$da;
   const [, forceUpdate] = useReducer(() => ({}), {});
   const {
       id,
@@ -64,6 +64,10 @@ export default function Provider(props) {
   const translation = useTranslation().Field;
   const ajvRef = useRef(makeAjvInstance(ajvInstance));
   const mountedFieldsRef = useRef({});
+  const snapshotsRef = useRef();
+  if (!snapshotsRef.current) {
+    snapshotsRef.current = new Map();
+  }
   const hasVisibleErrorRef = useRef({});
   const errorsRef = useRef();
   const showAllErrorsRef = useRef(false);
@@ -107,6 +111,7 @@ export default function Provider(props) {
     return data !== null && data !== void 0 ? data : defaultData;
   }, []);
   const internalDataRef = useRef(initialData);
+  const isEmptyDataRef = useRef(false);
   const ajvValidatorRef = useRef();
   const executeAjvValidator = useCallback(() => {
     var _ajvValidatorRef$curr;
@@ -313,6 +318,7 @@ export default function Provider(props) {
   }, []);
   const sharedData = useSharedState(id);
   const sharedAttachments = useSharedState(id + '-attachments');
+  const sharedDataContext = useSharedState(id + '-data-context');
   const setSharedData = sharedData.set;
   const extendSharedData = sharedData.extend;
   const extendAttachment = sharedAttachments.extend;
@@ -328,34 +334,38 @@ export default function Provider(props) {
       sharedData.update(initialData);
     }
     if (id && initialData && sharedData.data && cacheRef.current.shared === sharedData.data && internalDataRef.current === initialData && typeof internalDataRef.current === 'object') {
-      return _objectSpread(_objectSpread({}, internalDataRef.current), sharedData.data);
+      return _objectSpread(_objectSpread({}, internalDataRef.current), sharedData.data || {});
     }
     if (id && !initialData && !internalDataRef.current && sharedData.data && cacheRef.current.shared === sharedData.data) {
       return sharedData.data;
     }
     if (id && sharedData.data && cacheRef.current.shared !== sharedData.data && sharedData.data !== internalDataRef.current && typeof internalDataRef.current === 'object') {
-      var _sharedData$data;
       cacheRef.current.shared = sharedData.data;
-      if ((_sharedData$data = sharedData.data) !== null && _sharedData$data !== void 0 && _sharedData$data.clearForm) {
-        const clear = cacheRef.current.shared = clearedData;
-        setSharedData(clear);
-        return clear;
+      if (isEmptyDataRef.current) {
+        return Array.isArray(internalDataRef.current) ? [] : clearedData;
       }
-      return _objectSpread(_objectSpread({}, internalDataRef.current), sharedData.data);
+      return _objectSpread(_objectSpread({}, internalDataRef.current), sharedData.data || {});
     }
     if (data !== cacheRef.current.data) {
       cacheRef.current.data = data;
       return data;
     }
     return internalDataRef.current;
-  }, [id, initialData, sharedData, data, setSharedData]);
+  }, [id, initialData, sharedData, data]);
   internalDataRef.current = props.path && pointer.has(internalData, props.path) ? pointer.get(internalData, props.path) : internalData;
-  useEffect(() => {
-    var _sharedData$data2;
-    if ((_sharedData$data2 = sharedData.data) !== null && _sharedData$data2 !== void 0 && _sharedData$data2.clearForm) {
-      onClear === null || onClear === void 0 ? void 0 : onClear();
+  const clearData = useCallback(() => {
+    var _ref4, _requestAnimationFram;
+    isEmptyDataRef.current = true;
+    internalDataRef.current = (_ref4 = typeof emptyData === 'function' ? emptyData(internalDataRef.current) : emptyData) !== null && _ref4 !== void 0 ? _ref4 : Array.isArray(internalDataRef.current) ? [] : clearedData;
+    if (id) {
+      setSharedData === null || setSharedData === void 0 ? void 0 : setSharedData(internalDataRef.current);
     }
-  }, [onClear, (_sharedData$data3 = sharedData.data) === null || _sharedData$data3 === void 0 ? void 0 : _sharedData$data3.clearForm]);
+    forceUpdate();
+    onClear === null || onClear === void 0 ? void 0 : onClear();
+    (_requestAnimationFram = requestAnimationFrame) === null || _requestAnimationFram === void 0 ? void 0 : _requestAnimationFram(() => {
+      isEmptyDataRef.current = false;
+    });
+  }, [emptyData, id, onClear, setSharedData]);
   useLayoutEffect(() => {
     if (id && initialData && !sharedData.data) {
       extendSharedData === null || extendSharedData === void 0 ? void 0 : extendSharedData(initialData);
@@ -373,13 +383,14 @@ export default function Provider(props) {
         hasFieldError,
         setShowAllErrors,
         setSubmitState,
+        clearData,
         fieldConnectionsRef
       });
       if (filterSubmitData) {
         rerenderUseDataHook === null || rerenderUseDataHook === void 0 ? void 0 : rerenderUseDataHook();
       }
     }
-  }, [extendAttachment, visibleDataHandler, filterDataHandler, filterSubmitData, hasErrors, hasFieldError, id, rerenderUseDataHook, setShowAllErrors, setSubmitState]);
+  }, [extendAttachment, visibleDataHandler, filterDataHandler, filterSubmitData, hasErrors, hasFieldError, id, rerenderUseDataHook, setShowAllErrors, setSubmitState, clearData]);
   const storeInSession = useMemo(() => {
     return debounce(() => {
       var _window$sessionStorag2;
@@ -512,15 +523,6 @@ export default function Provider(props) {
       });
     }
   }, []);
-  const clearData = useCallback(() => {
-    internalDataRef.current = emptyData !== null && emptyData !== void 0 ? emptyData : clearedData;
-    if (id) {
-      setSharedData === null || setSharedData === void 0 ? void 0 : setSharedData(internalDataRef.current);
-    } else {
-      forceUpdate();
-    }
-    onClear === null || onClear === void 0 ? void 0 : onClear();
-  }, [emptyData, id, onClear, setSharedData]);
   const handleSubmitCall = useCallback(async args => {
     const {
       onSubmit,
@@ -687,12 +689,12 @@ export default function Provider(props) {
   }, [getSubmitData, getSubmitOptions, handleSubmitCall, handleSubmitListeners, onSubmit, onSubmitComplete, scrollToTop, scrollTopOnSubmit]);
   const fieldEventListenersRef = useRef([]);
   const setFieldEventListener = useCallback((path, type, callback) => {
-    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref4 => {
+    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref5 => {
       let {
         path: p,
         type: t,
         callback: c
-      } = _ref4;
+      } = _ref5;
       return !(p === path && t === type && c === callback);
     });
     fieldEventListenersRef.current.push({
@@ -743,58 +745,65 @@ export default function Provider(props) {
   });
   const submitState = submitStateRef.current;
   const disabled = typeof (rest === null || rest === void 0 ? void 0 : rest['disabled']) === 'boolean' ? rest === null || rest === void 0 ? void 0 : rest['disabled'] : formState === 'pending' === true ? true : undefined;
+  const contextValue = _objectSpread({
+    handlePathChange,
+    handlePathChangeUnvalidated,
+    handleSubmit,
+    setMountedFieldState,
+    handleSubmitCall,
+    setFormState,
+    setSubmitState,
+    setShowAllErrors,
+    setVisibleError,
+    setFieldEventListener,
+    setFieldState,
+    setFieldError,
+    setFieldConnection,
+    setFieldProps,
+    setValueProps,
+    hasErrors,
+    hasFieldError,
+    hasFieldState,
+    validateData,
+    updateDataValue,
+    setData,
+    clearData,
+    visibleDataHandler,
+    filterDataHandler,
+    getSubmitData,
+    getSubmitOptions,
+    addOnChangeHandler,
+    setHandleSubmit,
+    scrollToTop,
+    schema,
+    disabled,
+    required,
+    formState,
+    submitState,
+    contextErrorMessages,
+    hasContext: true,
+    errors: errorsRef.current,
+    showAllErrors: showAllErrorsRef.current,
+    hasVisibleError: Object.keys(hasVisibleErrorRef.current).length > 0,
+    fieldConnectionsRef,
+    fieldPropsRef,
+    valuePropsRef,
+    mountedFieldsRef,
+    snapshotsRef,
+    formElementRef,
+    isEmptyDataRef,
+    fieldErrorRef,
+    ajvInstance: ajvRef.current,
+    id,
+    data: internalDataRef.current,
+    internalDataRef,
+    props
+  }, rest);
+  if (id) {
+    sharedDataContext.set(contextValue);
+  }
   return React.createElement(Context.Provider, {
-    value: _objectSpread({
-      handlePathChange,
-      handlePathChangeUnvalidated,
-      handleSubmit,
-      setMountedFieldState,
-      handleSubmitCall,
-      setFormState,
-      setSubmitState,
-      setShowAllErrors,
-      setVisibleError,
-      setFieldEventListener,
-      setFieldState,
-      setFieldError,
-      setFieldConnection,
-      setFieldProps,
-      setValueProps,
-      hasErrors,
-      hasFieldError,
-      hasFieldState,
-      validateData,
-      updateDataValue,
-      setData,
-      clearData,
-      visibleDataHandler,
-      filterDataHandler,
-      getSubmitData,
-      getSubmitOptions,
-      addOnChangeHandler,
-      setHandleSubmit,
-      scrollToTop,
-      schema,
-      disabled,
-      required,
-      formState,
-      submitState,
-      contextErrorMessages,
-      hasContext: true,
-      errors: errorsRef.current,
-      showAllErrors: showAllErrorsRef.current,
-      hasVisibleError: Object.keys(hasVisibleErrorRef.current).length > 0,
-      fieldConnectionsRef,
-      fieldPropsRef,
-      valuePropsRef,
-      mountedFieldsRef,
-      formElementRef,
-      ajvInstance: ajvRef.current,
-      id,
-      data: internalDataRef.current,
-      internalDataRef,
-      props
-    }, rest)
+    value: contextValue
   }, React.createElement(FieldPropsProvider, {
     FormStatus: globalStatusId ? {
       globalStatus: {