@dnb/eufemia 10.18.0 → 10.20.0

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

@@ -1,24 +1,37 @@
 import React from 'react';
+import { Ajv } from '../utils/ajv';
+import { AllJSONSchemaVersions, CustomErrorMessagesWithPaths } from '../types';
+export type Path = string;
 type HandleSubmitProps = {
     formElement?: HTMLFormElement;
 };
 export interface ContextState {
+    hasContext: boolean;
     /** The dataset for the form / form steps */
     data: any;
     /** Should the form validate data before submitting? */
     errors?: Record<string, Error>;
     /** Will set autoComplete="on" on each nested Field.String and Field.Number */
     autoComplete?: boolean;
-    handlePathChange: (path: string, value: any) => void;
-    updateDataValue: (path: string, value: any) => void;
+    handlePathChange: (path: Path, value: any) => void;
+    updateDataValue: (path: Path, value: any, props: {
+        disabled: boolean;
+    }) => void;
+    validateData: () => void;
     handleSubmit: (props?: HandleSubmitProps) => any;
+    scrollToTop: () => void;
     showAllErrors: boolean;
     setShowAllErrors: (showAllErrors: boolean) => void;
     mountedFieldPaths: string[];
-    handleMountField: (path: string) => void;
-    handleUnMountField: (path: string) => void;
-    setValueWithError: (identifier: string, hasError: boolean) => void;
+    handleMountField: (path: Path) => void;
+    handleUnMountField: (path: Path) => void;
+    setValueWithError: (path: Path, hasError: boolean) => void;
+    setProps: (path: Path, props: any) => void;
     hasErrors: () => boolean;
+    hasFieldError: (path: Path) => boolean;
+    ajvInstance: Ajv;
+    contextErrorMessages: CustomErrorMessagesWithPaths;
+    schema: AllJSONSchemaVersions;
     _isInsideFormElement?: boolean;
 }
 export declare const defaultContextState: ContextState;

package/extensions/forms/DataContext/Context.js

@@ -1,16 +1,25 @@
 import React from 'react';
+import { makeAjvInstance } from '../utils/ajv';
 export const defaultContextState = {
+  hasContext: false,
   data: undefined,
+  schema: undefined,
   handlePathChange: () => null,
   updateDataValue: () => null,
+  validateData: () => null,
   handleSubmit: () => null,
+  scrollToTop: () => null,
   showAllErrors: false,
   setShowAllErrors: () => null,
   mountedFieldPaths: [],
   handleMountField: () => null,
   handleUnMountField: () => null,
   hasErrors: () => false,
+  hasFieldError: () => false,
   setValueWithError: () => null,
+  setProps: () => null,
+  ajvInstance: makeAjvInstance(),
+  contextErrorMessages: undefined,
   _isInsideFormElement: false
 };
 const Context = React.createContext(defaultContextState);

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

@@ -1 +1 @@
-{"version":3,"file":"Context.js","names":["React","defaultContextState","data","undefined","handlePathChange","updateDataValue","handleSubmit","showAllErrors","setShowAllErrors","mountedFieldPaths","handleMountField","handleUnMountField","hasErrors","setValueWithError","_isInsideFormElement","Context","createContext"],"sources":["../../../../../src/extensions/forms/DataContext/Context.ts"],"sourcesContent":["import React from 'react'\n\ntype HandleSubmitProps = {\n  formElement?: HTMLFormElement\n}\n\nexport interface ContextState {\n  /** The dataset for the form / form steps */\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: (path: string, value: any) => void\n  updateDataValue: (path: string, value: any) => void\n  handleSubmit: (props?: HandleSubmitProps) => any\n  // Error status\n  showAllErrors: boolean\n  setShowAllErrors: (showAllErrors: boolean) => void\n  // Mounted fields - Components telling the provider what fields is on screen at any time\n  mountedFieldPaths: string[]\n  handleMountField: (path: string) => void\n  handleUnMountField: (path: string) => void\n  setValueWithError: (identifier: string, hasError: boolean) => void\n  hasErrors: () => boolean\n  _isInsideFormElement?: boolean\n}\n\nexport const defaultContextState: ContextState = {\n  data: undefined,\n  handlePathChange: () => null,\n  updateDataValue: () => null,\n  handleSubmit: () => null,\n  showAllErrors: false,\n  setShowAllErrors: () => null,\n  mountedFieldPaths: [],\n  handleMountField: () => null,\n  handleUnMountField: () => null,\n  hasErrors: () => false,\n  setValueWithError: () => null,\n  _isInsideFormElement: false,\n}\n\nconst Context = React.createContext<ContextState>(defaultContextState)\n\nexport default Context\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AA4BzB,OAAO,MAAMC,mBAAiC,GAAG;EAC/CC,IAAI,EAAEC,SAAS;EACfC,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,eAAe,EAAEA,CAAA,KAAM,IAAI;EAC3BC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,aAAa,EAAE,KAAK;EACpBC,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,iBAAiB,EAAEA,CAAA,KAAM,IAAI;EAC7BC,oBAAoB,EAAE;AACxB,CAAC;AAED,MAAMC,OAAO,GAAGf,KAAK,CAACgB,aAAa,CAAef,mBAAmB,CAAC;AAEtE,eAAec,OAAO"}
+{"version":3,"file":"Context.js","names":["React","makeAjvInstance","defaultContextState","hasContext","data","undefined","schema","handlePathChange","updateDataValue","validateData","handleSubmit","scrollToTop","showAllErrors","setShowAllErrors","mountedFieldPaths","handleMountField","handleUnMountField","hasErrors","hasFieldError","setValueWithError","setProps","ajvInstance","contextErrorMessages","_isInsideFormElement","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} from '../types'\n\nexport type Path = string\n\ntype HandleSubmitProps = {\n  formElement?: HTMLFormElement\n}\n\nexport interface ContextState {\n  hasContext: boolean\n  /** The dataset for the form / form steps */\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: (path: Path, value: any) => void\n  updateDataValue: (\n    path: Path,\n    value: any,\n    props: { disabled: boolean }\n  ) => void\n  validateData: () => void\n  handleSubmit: (props?: HandleSubmitProps) => any\n  scrollToTop: () => void\n  // Error status\n  showAllErrors: boolean\n  setShowAllErrors: (showAllErrors: boolean) => 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  setValueWithError: (path: Path, hasError: boolean) => void\n  setProps: (path: Path, props: any) => void\n  hasErrors: () => boolean\n  hasFieldError: (path: Path) => boolean\n  ajvInstance: Ajv\n  contextErrorMessages: CustomErrorMessagesWithPaths\n  schema: AllJSONSchemaVersions\n  _isInsideFormElement?: boolean\n}\n\nexport const defaultContextState: ContextState = {\n  hasContext: false,\n  data: undefined,\n  schema: undefined,\n  handlePathChange: () => null,\n  updateDataValue: () => null,\n  validateData: () => null,\n  handleSubmit: () => null,\n  scrollToTop: () => null,\n  showAllErrors: false,\n  setShowAllErrors: () => null,\n  mountedFieldPaths: [],\n  handleMountField: () => null,\n  handleUnMountField: () => null,\n  hasErrors: () => false,\n  hasFieldError: () => false,\n  setValueWithError: () => null,\n  setProps: () => null,\n  ajvInstance: makeAjvInstance(),\n  contextErrorMessages: undefined,\n  _isInsideFormElement: false,\n}\n\nconst Context = React.createContext<ContextState>(defaultContextState)\n\nexport default Context\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAcC,eAAe,QAAQ,cAAc;AA8CnD,OAAO,MAAMC,mBAAiC,GAAG;EAC/CC,UAAU,EAAE,KAAK;EACjBC,IAAI,EAAEC,SAAS;EACfC,MAAM,EAAED,SAAS;EACjBE,gBAAgB,EAAEA,CAAA,KAAM,IAAI;EAC5BC,eAAe,EAAEA,CAAA,KAAM,IAAI;EAC3BC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,YAAY,EAAEA,CAAA,KAAM,IAAI;EACxBC,WAAW,EAAEA,CAAA,KAAM,IAAI;EACvBC,aAAa,EAAE,KAAK;EACpBC,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,iBAAiB,EAAEA,CAAA,KAAM,IAAI;EAC7BC,QAAQ,EAAEA,CAAA,KAAM,IAAI;EACpBC,WAAW,EAAEpB,eAAe,CAAC,CAAC;EAC9BqB,oBAAoB,EAAEjB,SAAS;EAC/BkB,oBAAoB,EAAE;AACxB,CAAC;AAED,MAAMC,OAAO,GAAGxB,KAAK,CAACyB,aAAa,CAAevB,mBAAmB,CAAC;AAEtE,eAAesB,OAAO"}

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

@@ -1,33 +1,71 @@
 import React from 'react';
 import { JsonObject } from 'json-pointer';
-import { JSONSchema } from '../../types';
-export type Path = string;
+import { Ajv } from '../../utils/ajv';
+import { CustomErrorMessagesWithPaths, AllJSONSchemaVersions, FieldProps } from '../../types';
+import { Path } from '../Context';
 export type UpdateDataValue = (path: Path, data: unknown) => void;
+export type FilterDataHandler<Data> = (data: Data, filter: FilterData) => Partial<Data>;
+export type FilterData = (path: Path, value: any, props: FieldProps) => boolean | undefined;
+export type OnSubmitReturn = {
+    /** Will remove browser-side stored autocomplete data  */
+    resetForm: () => void;
+    /** Will empty the whole internal data set of the form  */
+    clearData: () => void;
+};
+export type OnSubmit<Data = JsonObject> = (data: Partial<Data>, { resetForm, clearData }: OnSubmitReturn) => void;
 export interface Props<Data extends JsonObject> {
-    /** Unique ID to communicate with the hook Form.useData */
+    /**
+     * Unique ID to communicate with the hook Form.useData
+     */
     id?: string;
-    /** Default source data, only used if no other source is available, and not leading to updates if changed after mount */
+    /**
+     * Default source data, only used if no other source is available, and not leading to updates if changed after mount
+     */
     defaultData?: Partial<Data>;
-    /** Dynamic source data used as both initial data, and updates internal data if changed after mount */
+    /**
+     * Source data, will be used instead of defaultData, and leading to updates if changed after mount
+     */
     data?: Partial<Data>;
-    /** JSON Schema for validating the data, like during input or after attempting submit */
-    schema?: JSONSchema;
-    /** Change handler for the whole data set */
+    /**
+     * JSON Schema to validate the data against.
+     */
+    schema?: AllJSONSchemaVersions;
+    /**
+     * Custom Ajv instance, if you want to use your own
+     */
+    ajvInstance?: Ajv;
+    /**
+     * Custom error messages for the whole data set
+     */
+    errorMessages?: CustomErrorMessagesWithPaths;
+    /**
+     * Filter the internal data context based on your criteria: `(path, value, props) => !props?.disabled`. It will iterate on each data entry.
+     */
+    filterData?: FilterData;
+    /**
+     * Change handler for the whole data set
+     */
     onChange?: (data: Data) => void;
-    /** Change handler for each value  */
+    /**
+     * Change handler for each value
+     */
     onPathChange?: (path: Path, value: any) => void;
-    /** Submit called, data was valid (if validation available) */
-    onSubmit?: (data: Data, { resetForm, clearData, }: {
-        /** Will remove browser-side stored autocomplete data  */
-        resetForm: () => void;
-        /** Will empty the whole internal data set of the form  */
-        clearData: () => void;
-    }) => void;
-    /** Submit was requested, but data was invalid */
+    /**
+     * Submit called, data was valid (if validation available)
+     */
+    onSubmit?: OnSubmit;
+    /**
+     * Submit was requested, but data was invalid
+     */
     onSubmitRequest?: () => void;
+    /**
+     * Scroll to top on submit
+     */
     scrollTopOnSubmit?: boolean;
-    /** Key for caching the data in session storage */
+    /**
+     * Key for caching the data in session storage
+     */
     sessionStorageId?: string;
     children: React.ReactNode;
 }
-export default function Provider<Data extends JsonObject>({ id, defaultData, data, schema, onChange, onPathChange, onSubmit, onSubmitRequest, scrollTopOnSubmit, sessionStorageId, children, ...rest }: Props<Data>): import("react/jsx-runtime").JSX.Element;
+export default function Provider<Data extends JsonObject>({ id, defaultData, data, schema, onChange, onPathChange, onSubmit, onSubmitRequest, scrollTopOnSubmit, sessionStorageId, ajvInstance, filterData, errorMessages: contextErrorMessages, children, ...rest }: Props<Data>): import("react/jsx-runtime").JSX.Element;

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

@@ -2,17 +2,18 @@
 
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["id", "defaultData", "data", "schema", "onChange", "onPathChange", "onSubmit", "onSubmitRequest", "scrollTopOnSubmit", "sessionStorageId", "children"];
+const _excluded = ["id", "defaultData", "data", "schema", "onChange", "onPathChange", "onSubmit", "onSubmitRequest", "scrollTopOnSubmit", "sessionStorageId", "ajvInstance", "filterData", "errorMessages", "children"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React, { useEffect, useRef, useMemo, useCallback, useReducer } from 'react';
+import React, { useRef, useMemo, useCallback, useReducer } from 'react';
 import pointer from 'json-pointer';
-import ajv, { ajvErrorsToFormErrors } from '../../utils/ajv';
+import { makeAjvInstance, ajvErrorsToFormErrors } from '../../utils/ajv';
 import useMountEffect from '../../hooks/useMountEffect';
 import useUpdateEffect from '../../hooks/useUpdateEffect';
 import { useSharedState } from '../../../../shared/helpers/useSharedState';
 import Context from '../Context';
 import structuredClone from '@ungap/structured-clone';
+const useLayoutEffect = typeof window === 'undefined' ? React.useEffect : React.useLayoutEffect;
 function addListPath(paths, path) {
   return paths.includes(path) ? paths : paths.concat(path);
 }
@@ -21,6 +22,7 @@ function removeListPath(paths, path) {
 }
 const isArrayJsonPointer = /^\/\d+(\/|$)/;
 export default function Provider(_ref) {
+  var _sharedAtachments$dat;
   let {
       id,
       defaultData,
@@ -32,6 +34,9 @@ export default function Provider(_ref) {
       onSubmitRequest,
       scrollTopOnSubmit,
       sessionStorageId,
+      ajvInstance,
+      filterData,
+      errorMessages: contextErrorMessages,
       children
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
@@ -39,11 +44,13 @@ export default function Provider(_ref) {
   if (data !== undefined && sessionStorageId !== undefined) {
     console.error('Providing both data and sessionStorageId could lead to competing data sources. To provide default data to use only before anything is changed in the interface, use defaultData.');
   }
+  const ajvRef = useRef(makeAjvInstance(ajvInstance));
   const mountedFieldPathsRef = useRef([]);
   const errorsRef = useRef();
   const showAllErrorsRef = useRef(false);
   const setShowAllErrors = useCallback(showAllErrors => {
     showAllErrorsRef.current = showAllErrors;
+    forceUpdate();
   }, []);
   const valuesWithErrorRef = useRef([]);
   const initialData = useMemo(() => {
@@ -57,43 +64,86 @@ export default function Provider(_ref) {
     return data !== null && data !== void 0 ? data : defaultData;
   }, []);
   const internalDataRef = useRef(initialData);
-  const dataCacheRef = useRef(data);
-  const ajvSchemaValidatorRef = useRef();
-  const sharedState = useSharedState(id, initialData);
-  useMemo(() => {
-    if (sharedState !== null && sharedState !== void 0 && sharedState.data && !initialData) {
-      internalDataRef.current = sharedState.data;
-    }
-  }, [initialData, sharedState.data]);
+  const cacheRef = useRef({
+    data,
+    schema
+  });
+  const ajvValidatorRef = useRef();
   const validateData = useCallback(() => {
-    if (!ajvSchemaValidatorRef.current) {
+    var _ajvValidatorRef$curr;
+    if (!ajvValidatorRef.current) {
       return;
     }
-    if (!ajvSchemaValidatorRef.current(internalDataRef.current)) {
-      const errors = ajvErrorsToFormErrors(ajvSchemaValidatorRef.current.errors);
-      errorsRef.current = errors;
+    if (!((_ajvValidatorRef$curr = ajvValidatorRef.current) !== null && _ajvValidatorRef$curr !== void 0 && _ajvValidatorRef$curr.call(ajvValidatorRef, internalDataRef.current))) {
+      errorsRef.current = ajvErrorsToFormErrors(ajvValidatorRef.current.errors);
     } else {
       errorsRef.current = undefined;
     }
     forceUpdate();
   }, []);
-  useEffect(() => {
-    if (!schema) {
-      return;
-    }
-    ajvSchemaValidatorRef.current = ajv.compile(schema);
-    validateData();
-  }, [schema, validateData]);
-  const hasErrors = useCallback(() => Boolean(mountedFieldPathsRef.current.find(mountedFieldPath => {
+  const hasFieldError = useCallback(path => {
     var _errorsRef$current;
-    return ((_errorsRef$current = errorsRef.current) === null || _errorsRef$current === void 0 ? void 0 : _errorsRef$current[mountedFieldPath]) !== undefined || valuesWithErrorRef.current.includes(mountedFieldPath);
-  })), []);
-  const setValueWithError = useCallback((identifier, withError) => {
-    if (withError !== valuesWithErrorRef.current.includes(identifier)) {
-      valuesWithErrorRef.current = withError ? addListPath(valuesWithErrorRef.current, identifier) : removeListPath(valuesWithErrorRef.current, identifier);
+    return Boolean(((_errorsRef$current = errorsRef.current) === null || _errorsRef$current === void 0 ? void 0 : _errorsRef$current[path]) !== undefined || valuesWithErrorRef.current.includes(path));
+  }, []);
+  const hasErrors = useCallback(() => Boolean(mountedFieldPathsRef.current.find(mountedFieldPath => hasFieldError(mountedFieldPath))), [hasFieldError]);
+  const setValueWithError = useCallback((path, withError) => {
+    if (withError !== valuesWithErrorRef.current.includes(path)) {
+      valuesWithErrorRef.current = withError ? addListPath(valuesWithErrorRef.current, path) : removeListPath(valuesWithErrorRef.current, path);
       forceUpdate();
     }
   }, []);
+  const filterDataHandler = useCallback(function (data) {
+    let filter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : filterData;
+    if (filter) {
+      const filtered = _objectSpread({}, data);
+      Object.entries(fieldPropsRef.current).forEach(_ref2 => {
+        let [path, props] = _ref2;
+        const exists = pointer.has(data, path);
+        const result = filter(path, exists ? pointer.get(data, path) : undefined, props);
+        if (result === false && exists) {
+          pointer.remove(filtered, path);
+        }
+      });
+      return filtered;
+    }
+    return data;
+  }, [filterData]);
+  const fieldPropsRef = useRef({});
+  const setProps = useCallback((path, props) => {
+    fieldPropsRef.current[path] = props;
+  }, []);
+  const sharedData = useSharedState(id);
+  const sharedAtachments = useSharedState(id + '-attachments');
+  const updateSharedData = sharedData.update;
+  const extendSharedData = sharedData.extend;
+  const extendAtachment = sharedAtachments.extend;
+  const rerenderUseDataHook = (_sharedAtachments$dat = sharedAtachments.data) === null || _sharedAtachments$dat === void 0 ? void 0 : _sharedAtachments$dat.rerenderUseDataHook;
+  useMemo(() => {
+    if (id && sharedData.data && !initialData) {
+      internalDataRef.current = sharedData.data;
+    }
+  }, [id, initialData, sharedData.data]);
+  useLayoutEffect(() => {
+    if (id && !sharedData.data && initialData) {
+      extendSharedData === null || extendSharedData === void 0 ? void 0 : extendSharedData(initialData);
+    }
+  }, [id, initialData, extendSharedData, sharedData.data]);
+  useLayoutEffect(() => {
+    if (id && sharedData.data && sharedData.data !== internalDataRef.current) {
+      internalDataRef.current = sharedData.data;
+    }
+  }, [id, sharedData.data]);
+  useLayoutEffect(() => {
+    if (id) {
+      extendAtachment === null || extendAtachment === void 0 ? void 0 : extendAtachment({
+        filterDataHandler,
+        hasErrors
+      });
+      if (filterData) {
+        rerenderUseDataHook === null || rerenderUseDataHook === void 0 ? void 0 : rerenderUseDataHook();
+      }
+    }
+  }, [filterData, filterDataHandler, rerenderUseDataHook, hasErrors, id, extendAtachment]);
   const updateDataValue = useCallback((path, value) => {
     var _internalDataRef$curr;
     if (!path) {
@@ -110,8 +160,10 @@ export default function Provider(_ref) {
       pointer.set(newData, path, value);
     }
     if (id) {
-      var _sharedState$update;
-      (_sharedState$update = sharedState.update) === null || _sharedState$update === void 0 ? void 0 : _sharedState$update.call(sharedState, newData);
+      updateSharedData === null || updateSharedData === void 0 ? void 0 : updateSharedData(newData);
+      if (filterData) {
+        rerenderUseDataHook === null || rerenderUseDataHook === void 0 ? void 0 : rerenderUseDataHook();
+      }
     }
     internalDataRef.current = newData;
     if (sessionStorageId && typeof window !== 'undefined') {
@@ -120,7 +172,7 @@ export default function Provider(_ref) {
     }
     forceUpdate();
     return newData;
-  }, [id, sessionStorageId, sharedState]);
+  }, [filterData, id, sessionStorageId, rerenderUseDataHook, updateSharedData]);
   const handlePathChange = useCallback((path, value) => {
     if (!path) {
       return;
@@ -135,7 +187,20 @@ export default function Provider(_ref) {
     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') {
+      var _window, _window$scrollTo;
+      (_window = window) === null || _window === void 0 ? void 0 : (_window$scrollTo = _window.scrollTo) === null || _window$scrollTo === void 0 ? void 0 : _window$scrollTo.call(_window, {
+        top: 0,
+        behavior: 'smooth'
+      });
+    }
   }, []);
   const handleSubmit = useCallback(function () {
     let {
@@ -156,44 +221,54 @@ export default function Provider(_ref) {
         internalDataRef.current = {};
         forceUpdate();
       };
-      onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(internalDataRef.current, {
+      onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(filterDataHandler(internalDataRef.current), {
         resetForm,
         clearData
       });
-      if (typeof window !== 'undefined') {
-        if (scrollTopOnSubmit) {
-          var _window;
-          (_window = window) === null || _window === void 0 ? void 0 : _window.scrollTo({
-            top: 0,
-            behavior: 'smooth'
-          });
-        }
+      if (scrollTopOnSubmit) {
+        scrollToTop();
       }
     } else {
-      showAllErrorsRef.current = true;
+      setShowAllErrors(true);
       onSubmitRequest === null || onSubmitRequest === void 0 ? void 0 : onSubmitRequest();
-      forceUpdate();
     }
     return internalDataRef.current;
-  }, [scrollTopOnSubmit, hasErrors, onSubmit, onSubmitRequest, sessionStorageId]);
+  }, [hasErrors, onSubmit, filterDataHandler, scrollTopOnSubmit, sessionStorageId, scrollToTop, setShowAllErrors, onSubmitRequest]);
   useMountEffect(() => {
+    if (schema) {
+      var _ajvRef$current;
+      ajvValidatorRef.current = (_ajvRef$current = ajvRef.current) === null || _ajvRef$current === void 0 ? void 0 : _ajvRef$current.compile(schema);
+    }
     validateData();
   });
   useUpdateEffect(() => {
-    if (data !== dataCacheRef.current) {
-      dataCacheRef.current = data;
+    let hadChanges = false;
+    if (data !== cacheRef.current.data) {
       internalDataRef.current = data;
+      hadChanges = true;
+      cacheRef.current.data = data;
     }
-    validateData();
-    forceUpdate();
-  }, [data, validateData, forceUpdate]);
+    if (schema && schema !== cacheRef.current.schema) {
+      var _ajvRef$current2;
+      ajvValidatorRef.current = (_ajvRef$current2 = ajvRef.current) === null || _ajvRef$current2 === void 0 ? void 0 : _ajvRef$current2.compile(schema);
+      hadChanges = true;
+      cacheRef.current.schema = schema;
+    }
+    if (hadChanges) {
+      validateData();
+      forceUpdate();
+    }
+  }, [data, schema, validateData, forceUpdate]);
   return React.createElement(Context.Provider, {
     value: _objectSpread(_objectSpread({
+      hasContext: true,
       data: internalDataRef.current
     }, rest), {}, {
       handlePathChange,
       updateDataValue,
+      validateData,
       handleSubmit,
+      scrollToTop,
       errors: errorsRef.current,
       showAllErrors: showAllErrorsRef.current,
       setShowAllErrors,
@@ -201,7 +276,12 @@ export default function Provider(_ref) {
       handleMountField,
       handleUnMountField,
       hasErrors,
-      setValueWithError
+      hasFieldError,
+      setValueWithError,
+      setProps,
+      ajvInstance: ajvRef.current,
+      schema,
+      contextErrorMessages
     })
   }, children);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","names":["React","useEffect","useRef","useMemo","useCallback","useReducer","pointer","ajv","ajvErrorsToFormErrors","useMountEffect","useUpdateEffect","useSharedState","Context","structuredClone","addListPath","paths","path","includes","concat","removeListPath","filter","thisPath","isArrayJsonPointer","Provider","_ref","id","defaultData","data","schema","onChange","onPathChange","onSubmit","onSubmitRequest","scrollTopOnSubmit","sessionStorageId","children","rest","_objectWithoutProperties","_excluded","forceUpdate","undefined","console","error","mountedFieldPathsRef","errorsRef","showAllErrorsRef","setShowAllErrors","showAllErrors","current","valuesWithErrorRef","initialData","window","_window$sessionStorag","sessionDataJSON","sessionStorage","getItem","JSON","parse","internalDataRef","dataCacheRef","ajvSchemaValidatorRef","sharedState","validateData","errors","compile","hasErrors","Boolean","find","mountedFieldPath","_errorsRef$current","setValueWithError","identifier","withError","updateDataValue","value","_internalDataRef$curr","givenData","match","newData","e","set","_sharedState$update","update","call","_window$sessionStorag2","setItem","stringify","handlePathChange","handleMountField","handleUnMountField","handleSubmit","formElement","arguments","length","resetForm","_formElement$reset","reset","removeItem","clearData","_window","scrollTo","top","behavior","createElement","_objectSpread","mountedFieldPaths"],"sources":["../../../../../../src/extensions/forms/DataContext/Provider/Provider.tsx"],"sourcesContent":["import React, {\n  useEffect,\n  useRef,\n  useMemo,\n  useCallback,\n  useReducer,\n} from 'react'\nimport pointer, { JsonObject } from 'json-pointer'\nimport { ValidateFunction } from 'ajv'\nimport ajv, { ajvErrorsToFormErrors } from '../../utils/ajv'\nimport { FormError, JSONSchema } from '../../types'\nimport useMountEffect from '../../hooks/useMountEffect'\nimport useUpdateEffect from '../../hooks/useUpdateEffect'\nimport { useSharedState } from '../../../../shared/helpers/useSharedState'\nimport Context, { ContextState } from '../Context'\n\n/**\n * Deprecated, as it is supported by all major browsers and Node.js >=v18\n * So its a question of time, when we will remove this polyfill\n */\nimport structuredClone from '@ungap/structured-clone'\n\nexport type Path = string\nexport type UpdateDataValue = (path: Path, data: unknown) => void\n\nexport interface Props<Data extends JsonObject> {\n  /** Unique ID to communicate with the hook Form.useData */\n  id?: string\n  /** Default source data, only used if no other source is available, and not leading to updates if changed after mount */\n  defaultData?: Partial<Data>\n  /** Dynamic source data used as both initial data, and updates internal data if changed after mount */\n  data?: Partial<Data>\n  /** JSON Schema for validating the data, like during input or after attempting submit */\n  schema?: JSONSchema\n  /** Change handler for the whole data set */\n  onChange?: (data: Data) => void\n  /** Change handler for each value  */\n  onPathChange?: (path: Path, value: any) => void\n  /** Submit called, data was valid (if validation available) */\n  onSubmit?: (\n    data: Data,\n    {\n      resetForm,\n      clearData,\n    }: {\n      /** Will remove browser-side stored autocomplete data  */\n      resetForm: () => void\n      /** Will empty the whole internal data set of the form  */\n      clearData: () => void\n    }\n  ) => void\n  /** Submit was requested, but data was invalid */\n  onSubmitRequest?: () => void\n  scrollTopOnSubmit?: boolean\n  /** Key for caching the data in session storage */\n  sessionStorageId?: string\n  children: React.ReactNode\n}\n\ntype PathList = string[]\n\nfunction addListPath(paths: PathList, path: Path): PathList {\n  return paths.includes(path) ? paths : paths.concat(path)\n}\n\nfunction removeListPath(paths: PathList, path: Path): PathList {\n  return paths.filter((thisPath) => thisPath !== path)\n}\n\nconst isArrayJsonPointer = /^\\/\\d+(\\/|$)/\n\nexport default function Provider<Data extends JsonObject>({\n  id,\n  defaultData,\n  data,\n  schema,\n  onChange,\n  onPathChange,\n  onSubmit,\n  onSubmitRequest,\n  scrollTopOnSubmit,\n  sessionStorageId,\n  children,\n  ...rest\n}: Props<Data>) {\n  const [, forceUpdate] = useReducer(() => ({}), {})\n  // Prop error handling\n  if (data !== undefined && sessionStorageId !== undefined) {\n    console.error(\n      'Providing both data and sessionStorageId could lead to competing data sources. To provide default data to use only before anything is changed in the interface, use defaultData.'\n    )\n  }\n\n  // State\n  const mountedFieldPathsRef = useRef<string[]>([])\n  // - Errors from provider validation (the whole data set)\n  const errorsRef = useRef<Record<string, FormError> | undefined>()\n  const showAllErrorsRef = useRef<boolean>(false)\n  const setShowAllErrors = useCallback((showAllErrors: boolean) => {\n    showAllErrorsRef.current = showAllErrors\n  }, [])\n  // - Errors reported by fields, based on their direct validation rules\n  const valuesWithErrorRef = useRef<string[]>([])\n  // - Data\n  const initialData = useMemo(() => {\n    if (sessionStorageId && typeof window !== 'undefined') {\n      const sessionDataJSON =\n        window.sessionStorage?.getItem(sessionStorageId)\n      if (sessionDataJSON) {\n        return JSON.parse(sessionDataJSON)\n      }\n    }\n    return data ?? defaultData\n    // eslint-disable-next-line react-hooks/exhaustive-deps -- Avoid triggering code that should only run initially\n  }, [])\n  const internalDataRef = useRef<Partial<Data>>(initialData)\n  const dataCacheRef = useRef<Partial<Data>>(data)\n  // - Validator\n  const ajvSchemaValidatorRef = useRef<ValidateFunction>()\n  // - Shared state\n  const sharedState = useSharedState(id, initialData)\n  useMemo(() => {\n    if (sharedState?.data && !initialData) {\n      internalDataRef.current = sharedState.data\n    }\n  }, [initialData, sharedState.data])\n\n  const validateData = useCallback(() => {\n    if (!ajvSchemaValidatorRef.current) {\n      // No schema-based validator. Assume data is valid.\n      return\n    }\n\n    if (!ajvSchemaValidatorRef.current(internalDataRef.current)) {\n      // Errors found\n      const errors = ajvErrorsToFormErrors(\n        ajvSchemaValidatorRef.current.errors\n      )\n      errorsRef.current = errors\n    } else {\n      errorsRef.current = undefined\n    }\n    forceUpdate()\n  }, [])\n\n  useEffect(() => {\n    if (!schema) {\n      return\n    }\n    ajvSchemaValidatorRef.current = ajv.compile(schema)\n    validateData()\n  }, [schema, validateData])\n\n  // Error handling\n  const hasErrors = useCallback(\n    () =>\n      Boolean(\n        mountedFieldPathsRef.current.find(\n          (mountedFieldPath) =>\n            errorsRef.current?.[mountedFieldPath] !== undefined ||\n            valuesWithErrorRef.current.includes(mountedFieldPath)\n        )\n      ),\n    []\n  )\n\n  const setValueWithError = useCallback(\n    (identifier: string, withError: boolean) => {\n      if (withError !== valuesWithErrorRef.current.includes(identifier)) {\n        // The boolean error state for the target value was changed\n        valuesWithErrorRef.current = withError\n          ? addListPath(valuesWithErrorRef.current, identifier)\n          : removeListPath(valuesWithErrorRef.current, identifier)\n        forceUpdate()\n      }\n    },\n    []\n  )\n\n  const updateDataValue: UpdateDataValue = useCallback(\n    (path, value) => {\n      if (!path) {\n        return\n      }\n\n      const givenData =\n        path === '/'\n          ? // When setting the root of the data, the whole data set should be the new value\n            value\n          : // For sub paths, use the the existing data set (or empty array/object), but modify it below (since pointer.set is not immutable)\n            internalDataRef.current ??\n            (path.match(isArrayJsonPointer) ? [] : {})\n\n      let newData = null\n      try {\n        // Update the data even if it contains errors. Submit/SubmitRequest will be called accordingly\n        newData = structuredClone(givenData)\n      } catch (e) {\n        newData = givenData\n      }\n\n      if (path !== '/') {\n        pointer.set(newData as Data, path, value)\n      }\n\n      if (id) {\n        sharedState.update?.(newData)\n      }\n\n      internalDataRef.current = newData\n\n      if (sessionStorageId && typeof window !== 'undefined') {\n        window.sessionStorage?.setItem(\n          sessionStorageId,\n          JSON.stringify(newData)\n        )\n      }\n\n      forceUpdate()\n\n      return newData\n    },\n    [id, sessionStorageId, sharedState]\n  )\n\n  const handlePathChange: UpdateDataValue = useCallback(\n    (path, value) => {\n      if (!path) {\n        return\n      }\n\n      onPathChange?.(path, value)\n\n      const newData = updateDataValue(path, value)\n\n      onChange?.(newData as Data)\n\n      showAllErrorsRef.current = false\n\n      validateData()\n    },\n    [onPathChange, updateDataValue, onChange, validateData]\n  )\n\n  // Mounted fields\n  const handleMountField = useCallback((path: Path) => {\n    mountedFieldPathsRef.current = addListPath(\n      mountedFieldPathsRef.current,\n      path\n    )\n  }, [])\n\n  const handleUnMountField = useCallback((path: Path) => {\n    mountedFieldPathsRef.current = removeListPath(\n      mountedFieldPathsRef.current,\n      path\n    )\n  }, [])\n\n  /**\n   * Request to submit the whole form\n   */\n  const handleSubmit = useCallback<ContextState['handleSubmit']>(\n    ({ formElement = null } = {}) => {\n      if (!hasErrors()) {\n        const resetForm = () => {\n          formElement?.reset?.()\n\n          if (typeof window !== 'undefined') {\n            if (sessionStorageId) {\n              window.sessionStorage.removeItem(sessionStorageId)\n            }\n          }\n\n          forceUpdate() // in order to fill \"empty fields\" again with their internal states\n        }\n        const clearData = () => {\n          internalDataRef.current = {}\n          forceUpdate()\n        }\n\n        onSubmit?.(internalDataRef.current as Data, {\n          resetForm,\n          clearData,\n        })\n\n        if (typeof window !== 'undefined') {\n          if (scrollTopOnSubmit) {\n            window?.scrollTo({ top: 0, behavior: 'smooth' })\n          }\n        }\n      } else {\n        showAllErrorsRef.current = true\n        onSubmitRequest?.()\n        forceUpdate()\n      }\n      return internalDataRef.current\n    },\n    [\n      scrollTopOnSubmit,\n      hasErrors,\n      onSubmit,\n      onSubmitRequest,\n      sessionStorageId,\n    ]\n  )\n\n  useMountEffect(() => {\n    // Validate the initial data\n    validateData()\n  })\n\n  useUpdateEffect(() => {\n    // Update and validate changes to the external data set,\n    // And avoid \"resetting\" the data with the originally given data (React.StrictMode)\n    if (data !== dataCacheRef.current) {\n      dataCacheRef.current = data\n      internalDataRef.current = data\n    }\n    validateData()\n    forceUpdate()\n  }, [data, validateData, forceUpdate])\n\n  return (\n    <Context.Provider\n      value={{\n        data: internalDataRef.current,\n        ...rest,\n        handlePathChange,\n        updateDataValue,\n        handleSubmit,\n        errors: errorsRef.current,\n        showAllErrors: showAllErrorsRef.current,\n        setShowAllErrors,\n        mountedFieldPaths: mountedFieldPathsRef.current,\n        handleMountField,\n        handleUnMountField,\n        hasErrors,\n        setValueWithError,\n      }}\n    >\n      {children}\n    </Context.Provider>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"Provider.js","names":["React","useRef","useMemo","useCallback","useReducer","pointer","makeAjvInstance","ajvErrorsToFormErrors","useMountEffect","useUpdateEffect","useSharedState","Context","structuredClone","useLayoutEffect","window","useEffect","addListPath","paths","path","includes","concat","removeListPath","filter","thisPath","isArrayJsonPointer","Provider","_ref","_sharedAtachments$dat","id","defaultData","data","schema","onChange","onPathChange","onSubmit","onSubmitRequest","scrollTopOnSubmit","sessionStorageId","ajvInstance","filterData","errorMessages","contextErrorMessages","children","rest","_objectWithoutProperties","_excluded","forceUpdate","undefined","console","error","ajvRef","mountedFieldPathsRef","errorsRef","showAllErrorsRef","setShowAllErrors","showAllErrors","current","valuesWithErrorRef","initialData","_window$sessionStorag","sessionDataJSON","sessionStorage","getItem","JSON","parse","internalDataRef","cacheRef","ajvValidatorRef","validateData","_ajvValidatorRef$curr","call","errors","hasFieldError","_errorsRef$current","Boolean","hasErrors","find","mountedFieldPath","setValueWithError","withError","filterDataHandler","arguments","length","filtered","_objectSpread","Object","entries","fieldPropsRef","forEach","_ref2","props","exists","has","result","get","remove","setProps","sharedData","sharedAtachments","updateSharedData","update","extendSharedData","extend","extendAtachment","rerenderUseDataHook","updateDataValue","value","_internalDataRef$curr","givenData","match","newData","e","set","_window$sessionStorag2","setItem","stringify","handlePathChange","handleMountField","handleUnMountField","_fieldPropsRef$curren","scrollToTop","_window","_window$scrollTo","scrollTo","top","behavior","handleSubmit","formElement","resetForm","_formElement$reset","reset","removeItem","clearData","_ajvRef$current","compile","hadChanges","_ajvRef$current2","createElement","hasContext","mountedFieldPaths"],"sources":["../../../../../../src/extensions/forms/DataContext/Provider/Provider.tsx"],"sourcesContent":["import React, { useRef, useMemo, useCallback, useReducer } from 'react'\nimport pointer, { JsonObject } from 'json-pointer'\nimport { ValidateFunction } from 'ajv/dist/2020'\nimport {\n  Ajv,\n  makeAjvInstance,\n  ajvErrorsToFormErrors,\n} from '../../utils/ajv'\nimport {\n  FormError,\n  CustomErrorMessagesWithPaths,\n  AllJSONSchemaVersions,\n  FieldProps,\n} from '../../types'\nimport useMountEffect from '../../hooks/useMountEffect'\nimport useUpdateEffect from '../../hooks/useUpdateEffect'\nimport { useSharedState } from '../../../../shared/helpers/useSharedState'\nimport Context, { ContextState, Path } from '../Context'\n\n/**\n * Deprecated, as it is supported by all major browsers and Node.js >=v18\n * So its a question of time, when we will remove this polyfill\n */\nimport structuredClone from '@ungap/structured-clone'\n\n// SSR warning fix: https://gist.github.com/gaearon/e7d97cdf38a2907924ea12e4ebdf3c85\nconst useLayoutEffect =\n  typeof window === 'undefined' ? React.useEffect : React.useLayoutEffect\n\nexport type UpdateDataValue = (path: Path, data: unknown) => void\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) => boolean | undefined\n\nexport type OnSubmitReturn = {\n  /** Will remove browser-side stored autocomplete data  */\n  resetForm: () => void\n  /** Will empty the whole internal data set of the form  */\n  clearData: () => void\n}\n\nexport type OnSubmit<Data = JsonObject> = (\n  data: Partial<Data>,\n  { resetForm, clearData }: OnSubmitReturn\n) => void\n\nexport interface Props<Data extends JsonObject> {\n  /**\n   * Unique ID to communicate with the hook Form.useData\n   */\n  id?: string\n  /**\n   * Default source data, only used if no other source is available, and not leading to updates if changed after mount\n   */\n  defaultData?: Partial<Data>\n  /**\n   * Source data, will be used instead of defaultData, and leading to updates if changed after mount\n   */\n  data?: Partial<Data>\n  /**\n   * JSON Schema to validate the data against.\n   */\n  schema?: AllJSONSchemaVersions\n  /**\n   * Custom Ajv instance, if you want to use your own\n   */\n  ajvInstance?: Ajv\n  /**\n   * Custom error messages for the whole data set\n   */\n  errorMessages?: CustomErrorMessagesWithPaths\n  /**\n   * Filter the internal data context based on your criteria: `(path, value, props) => !props?.disabled`. It will iterate on each data entry.\n   */\n  filterData?: FilterData\n  /**\n   * Change handler for the whole data set\n   */\n  onChange?: (data: Data) => void\n  /**\n   * Change handler for each value\n   */\n  onPathChange?: (path: Path, value: any) => void\n  /**\n   * Submit called, data was valid (if validation available)\n   */\n  onSubmit?: OnSubmit\n  /**\n   * Submit was requested, but data was invalid\n   */\n  onSubmitRequest?: () => void\n  /**\n   * Scroll to top on submit\n   */\n  scrollTopOnSubmit?: boolean\n  /**\n   * Key for caching the data in session storage\n   */\n  sessionStorageId?: string\n  children: React.ReactNode\n}\n\ntype PathList = string[]\n\nfunction addListPath(paths: PathList, path: Path): PathList {\n  return paths.includes(path) ? paths : paths.concat(path)\n}\n\nfunction removeListPath(paths: PathList, path: Path): PathList {\n  return paths.filter((thisPath) => thisPath !== path)\n}\n\nconst isArrayJsonPointer = /^\\/\\d+(\\/|$)/\n\nexport default function Provider<Data extends JsonObject>({\n  id,\n  defaultData,\n  data,\n  schema,\n  onChange,\n  onPathChange,\n  onSubmit,\n  onSubmitRequest,\n  scrollTopOnSubmit,\n  sessionStorageId,\n  ajvInstance,\n  filterData,\n  errorMessages: contextErrorMessages,\n  children,\n  ...rest\n}: Props<Data>) {\n  const [, forceUpdate] = useReducer(() => ({}), {})\n  // Prop error handling\n  if (data !== undefined && sessionStorageId !== undefined) {\n    console.error(\n      'Providing both data and sessionStorageId could lead to competing data sources. To provide default data to use only before anything is changed in the interface, use defaultData.'\n    )\n  }\n\n  // - Ajv\n  const ajvRef = useRef<Ajv>(makeAjvInstance(ajvInstance))\n  // - Paths\n  const mountedFieldPathsRef = useRef<string[]>([])\n  // - Errors from provider validation (the whole data set)\n  const errorsRef = useRef<Record<string, FormError> | undefined>()\n  const showAllErrorsRef = useRef<boolean>(false)\n  const setShowAllErrors = useCallback((showAllErrors: boolean) => {\n    showAllErrorsRef.current = showAllErrors\n    forceUpdate()\n  }, [])\n\n  // - Errors reported by fields, based on their direct validation rules\n  const valuesWithErrorRef = useRef<string[]>([])\n\n  // - Data\n  const initialData = useMemo(() => {\n    if (sessionStorageId && typeof window !== 'undefined') {\n      const sessionDataJSON =\n        window.sessionStorage?.getItem(sessionStorageId)\n      if (sessionDataJSON) {\n        return JSON.parse(sessionDataJSON)\n      }\n    }\n    return data ?? defaultData\n    // eslint-disable-next-line react-hooks/exhaustive-deps -- Avoid triggering code that should only run initially\n  }, [])\n  const internalDataRef = useRef<Partial<Data>>(initialData)\n  const cacheRef = useRef({ data, schema })\n\n  // - Validator\n  const ajvValidatorRef = useRef<ValidateFunction>()\n\n  const validateData = useCallback(() => {\n    if (!ajvValidatorRef.current) {\n      // No schema-based validator. Assume data is valid.\n      return\n    }\n\n    if (!ajvValidatorRef.current?.(internalDataRef.current)) {\n      // Errors found\n      errorsRef.current = ajvErrorsToFormErrors(\n        ajvValidatorRef.current.errors\n      )\n    } else {\n      errorsRef.current = undefined\n    }\n\n    forceUpdate()\n  }, [])\n\n  // - Error handling\n  const hasFieldError = useCallback(\n    (path: string) =>\n      Boolean(\n        errorsRef.current?.[path] !== undefined ||\n          valuesWithErrorRef.current.includes(path)\n      ),\n    []\n  )\n  const hasErrors = useCallback(\n    () =>\n      Boolean(\n        mountedFieldPathsRef.current.find((mountedFieldPath) =>\n          hasFieldError(mountedFieldPath)\n        )\n      ),\n    [hasFieldError]\n  )\n\n  /**\n   * Sets the error state for a specific path\n   */\n  const setValueWithError = useCallback(\n    (path: Path, withError: boolean) => {\n      if (withError !== valuesWithErrorRef.current.includes(path)) {\n        // The boolean error state for the target value was changed\n        valuesWithErrorRef.current = withError\n          ? addListPath(valuesWithErrorRef.current, path)\n          : removeListPath(valuesWithErrorRef.current, path)\n        forceUpdate()\n      }\n    },\n    []\n  )\n\n  /**\n   * Filter the data set based on the filterData function\n   */\n  const filterDataHandler = useCallback(\n    (data: Data, filter = filterData) => {\n      if (filter) {\n        const filtered = { ...data }\n        Object.entries(fieldPropsRef.current).forEach(([path, props]) => {\n          const exists = pointer.has(data, path)\n          const result = filter(\n            path,\n            exists ? pointer.get(data, path) : undefined,\n            props\n          )\n          if (result === false && exists) {\n            pointer.remove(filtered, path)\n          }\n        })\n\n        return filtered\n      }\n\n      return data\n    },\n    [filterData]\n  )\n  const fieldPropsRef = useRef<Record<string, FieldProps>>({})\n  const setProps = useCallback(\n    (path: Path, props: Record<string, unknown>) => {\n      fieldPropsRef.current[path] = props\n    },\n    []\n  )\n\n  // - Shared state\n  const sharedData = useSharedState<Data>(id)\n  const sharedAtachments = useSharedState<{\n    filterDataHandler?: Props<Data>['filterData']\n    hasErrors?: () => boolean\n    rerenderUseDataHook?: () => void\n  }>(id + '-attachments')\n\n  const updateSharedData = sharedData.update\n  const extendSharedData = sharedData.extend\n  const extendAtachment = sharedAtachments.extend\n  const rerenderUseDataHook = sharedAtachments.data?.rerenderUseDataHook\n\n  useMemo(() => {\n    // Update the internal data set, if the shared state changes\n    if (id && sharedData.data && !initialData) {\n      internalDataRef.current = sharedData.data\n    }\n  }, [id, initialData, sharedData.data])\n\n  useLayoutEffect(() => {\n    // Update the shared state, if initialData is given\n    if (id && !sharedData.data && initialData) {\n      extendSharedData?.(initialData)\n    }\n  }, [id, initialData, extendSharedData, sharedData.data])\n\n  useLayoutEffect(() => {\n    // If the shared state changes, update the internal data set\n    if (\n      id &&\n      sharedData.data &&\n      sharedData.data !== internalDataRef.current\n    ) {\n      internalDataRef.current = sharedData.data\n    }\n  }, [id, sharedData.data])\n\n  useLayoutEffect(() => {\n    if (id) {\n      extendAtachment?.({ filterDataHandler, hasErrors })\n      if (filterData) {\n        rerenderUseDataHook?.()\n      }\n    }\n  }, [\n    filterData,\n    filterDataHandler,\n    rerenderUseDataHook,\n    hasErrors,\n    id,\n    extendAtachment,\n  ])\n\n  /**\n   * Update the data set\n   */\n  const updateDataValue: UpdateDataValue = useCallback(\n    (path, value) => {\n      if (!path) {\n        return\n      }\n\n      const givenData = (\n        path === '/'\n          ? // When setting the root of the data, the whole data set should be the new value\n            value\n          : // For sub paths, use the the existing data set (or empty array/object), but modify it below (since pointer.set is not immutable)\n            internalDataRef.current ??\n            (path.match(isArrayJsonPointer) ? [] : {})\n      ) as Data\n\n      let newData: Data = null\n      try {\n        // Update the data even if it contains errors. Submit/SubmitRequest will be called accordingly\n        newData = structuredClone(givenData)\n      } catch (e) {\n        newData = givenData\n      }\n\n      if (path !== '/') {\n        pointer.set(newData, path, value)\n      }\n\n      if (id) {\n        updateSharedData?.(newData)\n        if (filterData) {\n          rerenderUseDataHook?.()\n        }\n      }\n\n      internalDataRef.current = newData\n\n      if (sessionStorageId && typeof window !== 'undefined') {\n        window.sessionStorage?.setItem(\n          sessionStorageId,\n          JSON.stringify(newData)\n        )\n      }\n\n      forceUpdate()\n\n      return newData\n    },\n    [\n      filterData,\n      id,\n      sessionStorageId,\n      rerenderUseDataHook,\n      updateSharedData,\n    ]\n  )\n\n  /**\n   * Update the data set on user interaction\n   */\n  const handlePathChange: UpdateDataValue = useCallback(\n    (path, value) => {\n      if (!path) {\n        return\n      }\n\n      onPathChange?.(path, value)\n\n      const newData = updateDataValue(path, value)\n\n      onChange?.(newData as Data)\n\n      showAllErrorsRef.current = false\n\n      validateData()\n    },\n    [onPathChange, updateDataValue, onChange, validateData]\n  )\n\n  // - Mounted fields\n  const handleMountField = useCallback((path: Path) => {\n    mountedFieldPathsRef.current = addListPath(\n      mountedFieldPathsRef.current,\n      path\n    )\n  }, [])\n\n  const handleUnMountField = useCallback((path: Path) => {\n    mountedFieldPathsRef.current = removeListPath(\n      mountedFieldPathsRef.current,\n      path\n    )\n    if (fieldPropsRef.current?.[path]) {\n      delete fieldPropsRef.current[path]\n    }\n  }, [])\n\n  // - Features\n  const scrollToTop = useCallback(() => {\n    if (typeof window !== 'undefined') {\n      window?.scrollTo?.({ top: 0, behavior: 'smooth' })\n    }\n  }, [])\n\n  /**\n   * Request to submit the whole form\n   */\n  const handleSubmit = useCallback<ContextState['handleSubmit']>(\n    ({ formElement = null } = {}) => {\n      if (!hasErrors()) {\n        const resetForm = () => {\n          formElement?.reset?.()\n\n          if (typeof window !== 'undefined') {\n            if (sessionStorageId) {\n              window.sessionStorage.removeItem(sessionStorageId)\n            }\n          }\n\n          forceUpdate() // in order to fill \"empty fields\" again with their internal states\n        }\n        const clearData = () => {\n          internalDataRef.current = {}\n          forceUpdate()\n        }\n\n        onSubmit?.(filterDataHandler(internalDataRef.current as Data), {\n          resetForm,\n          clearData,\n        })\n\n        if (scrollTopOnSubmit) {\n          scrollToTop()\n        }\n      } else {\n        setShowAllErrors(true)\n        onSubmitRequest?.()\n      }\n\n      return internalDataRef.current\n    },\n    [\n      hasErrors,\n      onSubmit,\n      filterDataHandler,\n      scrollTopOnSubmit,\n      sessionStorageId,\n      scrollToTop,\n      setShowAllErrors,\n      onSubmitRequest,\n    ]\n  )\n\n  // - ajv validator routines\n\n  useMountEffect(() => {\n    if (schema) {\n      ajvValidatorRef.current = ajvRef.current?.compile(schema)\n    }\n\n    // Validate the initial data\n    validateData()\n  })\n\n  useUpdateEffect(() => {\n    let hadChanges = false\n\n    // Update and validate changes to the external data set,\n    // And avoid \"resetting\" the data with the originally given data (React.StrictMode)\n    if (data !== cacheRef.current.data) {\n      internalDataRef.current = data\n\n      hadChanges = true\n      cacheRef.current.data = data\n    }\n\n    if (schema && schema !== cacheRef.current.schema) {\n      ajvValidatorRef.current = ajvRef.current?.compile(schema)\n\n      hadChanges = true\n      cacheRef.current.schema = schema\n    }\n\n    if (hadChanges) {\n      validateData()\n      forceUpdate()\n    }\n  }, [data, schema, validateData, forceUpdate])\n\n  return (\n    <Context.Provider\n      value={{\n        hasContext: true,\n        data: internalDataRef.current,\n        ...rest,\n        handlePathChange,\n        updateDataValue,\n        validateData,\n        handleSubmit,\n        scrollToTop,\n        errors: errorsRef.current,\n        showAllErrors: showAllErrorsRef.current,\n        setShowAllErrors,\n        mountedFieldPaths: mountedFieldPathsRef.current,\n        handleMountField,\n        handleUnMountField,\n        hasErrors,\n        hasFieldError,\n        setValueWithError,\n        setProps,\n        ajvInstance: ajvRef.current,\n        schema,\n        contextErrorMessages,\n      }}\n    >\n      {children}\n    </Context.Provider>\n  )\n}\n"],"mappings":"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"}

package/extensions/forms/Field/ArraySelection/ArraySelection.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React, { useMemo } from 'react';
 import { Checkbox, ToggleButton } from '../../../../components';
 import classnames from 'classnames';
-import Option from '../Option';
+import OptionField from '../Option';
 import FieldBlock from '../../FieldBlock';
 import { useDataValue } from '../../hooks';
 import { pickSpacingProps } from '../../../../components/flex/utils';
@@ -17,6 +17,7 @@ function ArraySelection(props) {
     layout = 'vertical',
     optionsLayout = 'vertical',
     label,
+    labelDescription,
     value,
     error,
     hasError,
@@ -35,9 +36,10 @@ function ArraySelection(props) {
     warning,
     error,
     layout,
-    label
+    label,
+    labelDescription
   }, pickSpacingProps(props));
-  const options = useMemo(() => React.Children.toArray(children).filter(child => React.isValidElement(child) && child.type === Option).map(option => {
+  const options = useMemo(() => React.Children.toArray(children).filter(child => React.isValidElement(child) && child.type === OptionField).map(option => {
     var _option$props$title;
     return {
       title: (_option$props$title = option.props.title) !== null && _option$props$title !== void 0 ? _option$props$title : option.props.children,