@dnb/eufemia 10.17.0 → 10.19.0

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

@@ -1,17 +1,21 @@
 import React from 'react';
 import { JsonObject } from 'json-pointer';
-import { JSONSchema7 } from 'json-schema';
+import { JSONSchema } from '../../types';
+export type Path = string;
+export type UpdateDataValue = (path: Path, data: unknown) => void;
 export interface Props<Data extends JsonObject> {
+    /** 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 */
     defaultData?: Partial<Data>;
     /** Dynamic source data used as both initial data, and updates internal data if changed after mount */
     data?: Partial<Data>;
     /** JSON Schema for validating the data, like during input or after attempting submit */
-    schema?: JSONSchema7;
+    schema?: JSONSchema;
     /** Change handler for the whole data set */
     onChange?: (data: Data) => void;
     /** Change handler for each value  */
-    onPathChange?: (path: string, value: any) => void;
+    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  */
@@ -26,4 +30,4 @@ export interface Props<Data extends JsonObject> {
     sessionStorageId?: string;
     children: React.ReactNode;
 }
-export default function Provider<Data extends JsonObject>({ 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, children, ...rest }: Props<Data>): import("react/jsx-runtime").JSX.Element;

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

@@ -2,7 +2,7 @@
 
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["defaultData", "data", "schema", "onChange", "onPathChange", "onSubmit", "onSubmitRequest", "scrollTopOnSubmit", "sessionStorageId", "children"];
+const _excluded = ["id", "defaultData", "data", "schema", "onChange", "onPathChange", "onSubmit", "onSubmitRequest", "scrollTopOnSubmit", "sessionStorageId", "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';
@@ -10,8 +10,10 @@ import pointer from 'json-pointer';
 import ajv, { 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 +23,7 @@ function removeListPath(paths, path) {
 const isArrayJsonPointer = /^\/\d+(\/|$)/;
 export default function Provider(_ref) {
   let {
+      id,
       defaultData,
       data,
       schema,
@@ -57,6 +60,21 @@ export default function Provider(_ref) {
   const internalDataRef = useRef(initialData);
   const dataCacheRef = useRef(data);
   const ajvSchemaValidatorRef = useRef();
+  const sharedState = useSharedState(id);
+  useMemo(() => {
+    if (id && sharedState !== null && sharedState !== void 0 && sharedState.data && !initialData) {
+      internalDataRef.current = sharedState.data;
+    }
+  }, [id, initialData, sharedState.data]);
+  useLayoutEffect(() => {
+    if (id && !(sharedState !== null && sharedState !== void 0 && sharedState.data) && initialData) {
+      var _sharedState$set;
+      (_sharedState$set = sharedState.set) === null || _sharedState$set === void 0 ? void 0 : _sharedState$set.call(sharedState, initialData);
+    }
+    if (id && sharedState !== null && sharedState !== void 0 && sharedState.data && (sharedState === null || sharedState === void 0 ? void 0 : sharedState.data) !== internalDataRef.current) {
+      internalDataRef.current = sharedState === null || sharedState === void 0 ? void 0 : sharedState.data;
+    }
+  }, [id, initialData, sharedState, sharedState === null || sharedState === void 0 ? void 0 : sharedState.data]);
   const validateData = useCallback(() => {
     if (!ajvSchemaValidatorRef.current) {
       return;
@@ -91,18 +109,28 @@ export default function Provider(_ref) {
     if (!path) {
       return;
     }
-    const newData = structuredClone(path === '/' ? value : (_internalDataRef$curr = internalDataRef.current) !== null && _internalDataRef$curr !== void 0 ? _internalDataRef$curr : path.match(isArrayJsonPointer) ? [] : {});
+    const givenData = path === '/' ? value : (_internalDataRef$curr = internalDataRef.current) !== null && _internalDataRef$curr !== void 0 ? _internalDataRef$curr : path.match(isArrayJsonPointer) ? [] : {};
+    let newData = null;
+    try {
+      newData = structuredClone(givenData);
+    } catch (e) {
+      newData = givenData;
+    }
     if (path !== '/') {
       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);
+    }
+    internalDataRef.current = newData;
     if (sessionStorageId && typeof window !== 'undefined') {
       var _window$sessionStorag2;
       (_window$sessionStorag2 = window.sessionStorage) === null || _window$sessionStorag2 === void 0 ? void 0 : _window$sessionStorag2.setItem(sessionStorageId, JSON.stringify(newData));
     }
-    internalDataRef.current = newData;
     forceUpdate();
     return newData;
-  }, [sessionStorageId]);
+  }, [id, sessionStorageId, sharedState]);
   const handlePathChange = useCallback((path, value) => {
     if (!path) {
       return;

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","Context","structuredClone","addListPath","paths","path","includes","concat","removeListPath","filter","thisPath","isArrayJsonPointer","Provider","_ref","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","validateData","errors","compile","hasErrors","Boolean","find","mountedFieldPath","_errorsRef$current","setValueWithError","identifier","withError","updateDataValue","value","_internalDataRef$curr","newData","match","set","_window$sessionStorag2","setItem","stringify","handlePathChange","handleMountField","handleUnMountField","handleSubmit","formElement","arguments","length","resetForm","_formElement$reset","reset","call","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 { JSONSchema7 } from 'json-schema'\nimport { ValidateFunction } from 'ajv'\nimport ajv, { ajvErrorsToFormErrors } from '../../utils/ajv'\nimport { FormError } from '../../types'\nimport useMountEffect from '../../hooks/useMountEffect'\nimport useUpdateEffect from '../../hooks/useUpdateEffect'\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 interface Props<Data extends JsonObject> {\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?: JSONSchema7\n  /** Change handler for the whole data set */\n  onChange?: (data: Data) => void\n  /** Change handler for each value  */\n  onPathChange?: (path: string, 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: string): PathList {\n  return paths.includes(path) ? paths : paths.concat(path)\n}\n\nfunction removeListPath(paths: PathList, path: string): PathList {\n  return paths.filter((thisPath) => thisPath !== path)\n}\n\nconst isArrayJsonPointer = /^\\/\\d+(\\/|$)/\n\nexport default function Provider<Data extends JsonObject>({\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\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 = useCallback(\n    (path, value) => {\n      if (!path) {\n        return\n      }\n\n      // Update the data even if it contains errors. Submit/SubmitRequest will be called accordingly\n      const newData = structuredClone(\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\n      if (path !== '/') {\n        pointer.set(newData as Data, path, value)\n      }\n\n      if (sessionStorageId && typeof window !== 'undefined') {\n        window.sessionStorage?.setItem(\n          sessionStorageId,\n          JSON.stringify(newData)\n        )\n      }\n\n      internalDataRef.current = newData\n\n      forceUpdate()\n\n      return newData\n    },\n    [sessionStorageId]\n  )\n\n  const handlePathChange = 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: string) => {\n    mountedFieldPathsRef.current = addListPath(\n      mountedFieldPathsRef.current,\n      path\n    )\n  }, [])\n\n  const handleUnMountField = useCallback((path: string) => {\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","useEffect","useRef","useMemo","useCallback","useReducer","pointer","ajv","ajvErrorsToFormErrors","useMountEffect","useUpdateEffect","useSharedState","Context","structuredClone","useLayoutEffect","window","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$sessionStorag","sessionDataJSON","sessionStorage","getItem","JSON","parse","internalDataRef","dataCacheRef","ajvSchemaValidatorRef","sharedState","_sharedState$set","set","call","validateData","errors","compile","hasErrors","Boolean","find","mountedFieldPath","_errorsRef$current","setValueWithError","identifier","withError","updateDataValue","value","_internalDataRef$curr","givenData","match","newData","e","_sharedState$update","update","_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\n// SSR warning fix: https://gist.github.com/gaearon/e7d97cdf38a2907924ea12e4ebdf3c85\nconst useLayoutEffect =\n  typeof window === 'undefined' ? React.useEffect : React.useLayoutEffect\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<Data>(id)\n  useMemo(() => {\n    // Update the internal data set, if the shared state changes\n    if (id && sharedState?.data && !initialData) {\n      internalDataRef.current = sharedState.data\n    }\n  }, [id, initialData, sharedState.data])\n  useLayoutEffect(() => {\n    // Update the shared state, if initialData is given\n    if (id && !sharedState?.data && initialData) {\n      sharedState.set?.(initialData)\n    }\n\n    // If the shared state changes, update the internal data set\n    if (\n      id &&\n      sharedState?.data &&\n      sharedState?.data !== internalDataRef.current\n    ) {\n      internalDataRef.current = sharedState?.data\n    }\n  }, [id, initialData, sharedState, 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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"}

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

@@ -2,13 +2,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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, { useMemo } from 'react';
-import { Checkbox, Button } from '../../../../components';
-import ButtonRow from '../../Form/ButtonRow';
+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';
+import ToggleButtonGroupContext from '../../../../components/toggle-button/ToggleButtonGroupContext';
 function ArraySelection(props) {
   const {
     id,
@@ -18,9 +18,9 @@ function ArraySelection(props) {
     optionsLayout = 'vertical',
     label,
     labelDescription,
-    labelSecondary,
     value,
     error,
+    hasError,
     info,
     warning,
     disabled,
@@ -30,17 +30,16 @@ function ArraySelection(props) {
   } = useDataValue(props);
   const fieldBlockProps = _objectSpread({
     forId: id,
-    className: classnames(`dnb-forms-field-array-selection dnb-forms-field-array-selection--options-layout-${optionsLayout}`, className),
+    className: classnames(`dnb-forms-field-array-selection dnb-forms-field-array-selection--layout-${optionsLayout}`, className),
     contentClassName: 'dnb-forms-field-array-selection__options',
     info,
     warning,
     error,
     layout,
     label,
-    labelDescription,
-    labelSecondary
+    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,
@@ -54,14 +53,16 @@ function ArraySelection(props) {
   }), [children, value, emptyValue, handleChange]);
   switch (variant) {
     case 'button':
-      return React.createElement(FieldBlock, fieldBlockProps, React.createElement(ButtonRow, null, options.map((option, i) => React.createElement(Button, {
+      return React.createElement(FieldBlock, fieldBlockProps, React.createElement(ToggleButtonGroupContext.Provider, {
+        value: {
+          status: hasError ? 'error' : undefined,
+          disabled
+        }
+      }, options.map((option, i) => React.createElement(ToggleButton, {
         key: `option-${i}-${option.value}`,
-        id: id,
         text: option.title,
-        on_click: option.handleSelect,
-        variant: value !== null && value !== void 0 && value.includes(option.value) ? undefined : 'secondary',
-        status: error ? 'error' : undefined,
-        disabled: disabled
+        checked: value === null || value === void 0 ? void 0 : value.includes(option.value),
+        on_change: option.handleSelect
       }))));
     case 'checkbox':
       return React.createElement(FieldBlock, fieldBlockProps, options.map((option, i) => React.createElement(Checkbox, {
@@ -70,7 +71,8 @@ function ArraySelection(props) {
         label: option.title,
         checked: value === null || value === void 0 ? void 0 : value.includes(option.value),
         disabled: disabled,
-        on_change: option.handleSelect
+        on_change: option.handleSelect,
+        status: hasError ? 'error' : undefined
       })));
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ArraySelection.js","names":["React","useMemo","Checkbox","Button","ButtonRow","classnames","Option","FieldBlock","useDataValue","pickSpacingProps","ArraySelection","props","id","className","variant","layout","optionsLayout","label","labelDescription","labelSecondary","value","error","info","warning","disabled","emptyValue","handleChange","children","fieldBlockProps","_objectSpread","forId","contentClassName","options","Children","toArray","filter","child","isValidElement","type","map","option","_option$props$title","title","handleSelect","selected","newValue","includes","length","createElement","i","key","text","on_click","undefined","status","checked","on_change","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/ArraySelection/ArraySelection.tsx"],"sourcesContent":["import React, { useMemo } from 'react'\nimport { Checkbox, Button } from '../../../../components'\nimport ButtonRow from '../../Form/ButtonRow'\nimport classnames from 'classnames'\nimport Option from '../Option'\nimport FieldBlock from '../../FieldBlock'\nimport { useDataValue } from '../../hooks'\nimport { FieldProps } from '../../types'\nimport { pickSpacingProps } from '../../../../components/flex/utils'\n\ninterface IOption {\n  title: string\n  value: number | string\n  handleSelect: () => void\n}\n\nexport type Props = FieldProps<Array<string | number>> & {\n  children?: React.ReactNode\n  variant?: 'checkbox' | 'button'\n  optionsLayout?: 'horizontal' | 'vertical'\n}\n\nfunction ArraySelection(props: Props) {\n  const {\n    id,\n    className,\n    variant = 'checkbox',\n    layout = 'vertical',\n    optionsLayout = 'vertical',\n    label,\n    labelDescription,\n    labelSecondary,\n    value,\n    error,\n    info,\n    warning,\n    disabled,\n    emptyValue,\n    handleChange,\n    children,\n  } = useDataValue(props)\n\n  const fieldBlockProps = {\n    forId: id,\n    className: classnames(\n      'dnb-forms-field-array-selection',\n      `dnb-forms-field-array-selection--options-layout-${optionsLayout}`,\n      className\n    ),\n    contentClassName: 'dnb-forms-field-array-selection__options',\n    info,\n    warning,\n    error,\n    layout,\n    label,\n    labelDescription,\n    labelSecondary,\n    ...pickSpacingProps(props),\n  }\n\n  const options: IOption[] = useMemo(\n    () =>\n      React.Children.toArray(children)\n        .filter(\n          (child) => React.isValidElement(child) && child.type === Option\n        )\n        .map((option: React.ReactElement) => ({\n          title: option.props.title ?? option.props.children,\n          value: option.props.value,\n          handleSelect: () => {\n            const selected = option.props.value\n\n            const newValue = value?.includes(selected)\n              ? value.filter((value) => value !== selected)\n              : [...(value ?? []), selected]\n\n            handleChange?.(newValue.length === 0 ? emptyValue : newValue)\n          },\n        })),\n    [children, value, emptyValue, handleChange]\n  )\n\n  switch (variant) {\n    case 'button':\n      return (\n        <FieldBlock {...fieldBlockProps}>\n          <ButtonRow>\n            {options.map((option, i) => (\n              <Button\n                key={`option-${i}-${option.value}`}\n                id={id}\n                text={option.title}\n                on_click={option.handleSelect}\n                variant={\n                  value?.includes(option.value) ? undefined : 'secondary'\n                }\n                status={error ? 'error' : undefined}\n                disabled={disabled}\n              />\n            ))}\n          </ButtonRow>\n        </FieldBlock>\n      )\n    case 'checkbox':\n      return (\n        <FieldBlock {...fieldBlockProps}>\n          {options.map((option, i) => (\n            <Checkbox\n              key={`option-${i}-${option.value}`}\n              className=\"dnb-forms-field-array-selection__checkbox\"\n              label={option.title}\n              checked={value?.includes(option.value)}\n              disabled={disabled}\n              on_change={option.handleSelect}\n            />\n          ))}\n        </FieldBlock>\n      )\n  }\n}\n\nArraySelection._supportsSpacingProps = true\nexport default ArraySelection\n"],"mappings":"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"}
+{"version":3,"file":"ArraySelection.js","names":["React","useMemo","Checkbox","ToggleButton","classnames","OptionField","FieldBlock","useDataValue","pickSpacingProps","ToggleButtonGroupContext","ArraySelection","props","id","className","variant","layout","optionsLayout","label","labelDescription","value","error","hasError","info","warning","disabled","emptyValue","handleChange","children","fieldBlockProps","_objectSpread","forId","contentClassName","options","Children","toArray","filter","child","isValidElement","type","map","option","_option$props$title","title","handleSelect","selected","newValue","includes","length","createElement","Provider","status","undefined","i","key","text","checked","on_change","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/ArraySelection/ArraySelection.tsx"],"sourcesContent":["import React, { useMemo } from 'react'\nimport { Checkbox, ToggleButton } from '../../../../components'\nimport classnames from 'classnames'\nimport OptionField from '../Option'\nimport FieldBlock from '../../FieldBlock'\nimport { useDataValue } from '../../hooks'\nimport { FieldProps } from '../../types'\nimport { pickSpacingProps } from '../../../../components/flex/utils'\nimport ToggleButtonGroupContext from '../../../../components/toggle-button/ToggleButtonGroupContext'\n\ninterface IOption {\n  title: string\n  value: number | string\n  handleSelect: () => void\n}\n\nexport type Props = FieldProps<Array<string | number>> & {\n  children?: React.ReactNode\n  variant?: 'checkbox' | 'button'\n  optionsLayout?: 'horizontal' | 'vertical'\n}\n\nfunction ArraySelection(props: Props) {\n  const {\n    id,\n    className,\n    variant = 'checkbox',\n    layout = 'vertical',\n    optionsLayout = 'vertical',\n    label,\n    labelDescription,\n    value,\n    error,\n    hasError,\n    info,\n    warning,\n    disabled,\n    emptyValue,\n    handleChange,\n    children,\n  } = useDataValue(props)\n\n  const fieldBlockProps = {\n    forId: id,\n    className: classnames(\n      'dnb-forms-field-array-selection',\n      `dnb-forms-field-array-selection--layout-${optionsLayout}`,\n      className\n    ),\n    contentClassName: 'dnb-forms-field-array-selection__options',\n    info,\n    warning,\n    error,\n    layout,\n    label,\n    labelDescription,\n    ...pickSpacingProps(props),\n  }\n\n  const options: IOption[] = useMemo(\n    () =>\n      React.Children.toArray(children)\n        .filter(\n          (child) =>\n            React.isValidElement(child) && child.type === OptionField\n        )\n        .map((option: React.ReactElement) => ({\n          title: option.props.title ?? option.props.children,\n          value: option.props.value,\n          handleSelect: () => {\n            const selected = option.props.value\n\n            const newValue = value?.includes(selected)\n              ? value.filter((value) => value !== selected)\n              : [...(value ?? []), selected]\n\n            handleChange?.(newValue.length === 0 ? emptyValue : newValue)\n          },\n        })),\n    [children, value, emptyValue, handleChange]\n  )\n\n  switch (variant) {\n    case 'button':\n      return (\n        <FieldBlock {...fieldBlockProps}>\n          <ToggleButtonGroupContext.Provider\n            value={{\n              status: hasError ? 'error' : undefined,\n              disabled,\n            }}\n          >\n            {options.map((option, i) => (\n              <ToggleButton\n                key={`option-${i}-${option.value}`}\n                text={option.title}\n                checked={value?.includes(option.value)}\n                on_change={option.handleSelect}\n              />\n            ))}\n          </ToggleButtonGroupContext.Provider>\n        </FieldBlock>\n      )\n    case 'checkbox':\n      return (\n        <FieldBlock {...fieldBlockProps}>\n          {options.map((option, i) => (\n            <Checkbox\n              key={`option-${i}-${option.value}`}\n              className=\"dnb-forms-field-array-selection__checkbox\"\n              label={option.title}\n              checked={value?.includes(option.value)}\n              disabled={disabled}\n              on_change={option.handleSelect}\n              status={hasError ? 'error' : undefined}\n            />\n          ))}\n        </FieldBlock>\n      )\n  }\n}\n\nArraySelection._supportsSpacingProps = true\nexport default ArraySelection\n"],"mappings":"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"}

package/extensions/forms/Field/ArraySelection/style/dnb-array-selection.css

@@ -1,11 +1,21 @@
-.dnb-forms-field-array-selection--options-layout-vertical .dnb-forms-field-array-selection__options {
+/*
+ * Utilities
+ */
+.dnb-forms-field-array-selection--layout-vertical .dnb-forms-field-array-selection__options {
   display: flex;
   flex-flow: column;
   row-gap: var(--spacing-x-small);
 }
-.dnb-forms-field-array-selection--options-layout-horizontal .dnb-forms-field-array-selection__options {
+.dnb-forms-field-array-selection--layout-horizontal .dnb-forms-field-array-selection__options {
   display: flex;
   flex-flow: row wrap;
   -moz-column-gap: var(--spacing-small);
        column-gap: var(--spacing-small);
+  row-gap: var(--spacing-x-small);
+}
+@media screen and (min-width: 40em) {
+  .dnb-forms-field-array-selection .dnb-forms-field-block--layout-horizontal .dnb-form-label {
+    line-height: 2.5rem;
+    margin-bottom: 0;
+  }
 }

package/extensions/forms/Field/ArraySelection/style/dnb-array-selection.min.css

@@ -1 +1 @@
-.dnb-forms-field-array-selection--options-layout-vertical .dnb-forms-field-array-selection__options{display:flex;flex-flow:column;row-gap:var(--spacing-x-small)}.dnb-forms-field-array-selection--options-layout-horizontal .dnb-forms-field-array-selection__options{-moz-column-gap:var(--spacing-small);column-gap:var(--spacing-small);display:flex;flex-flow:row wrap}
+.dnb-forms-field-array-selection--layout-vertical .dnb-forms-field-array-selection__options{display:flex;flex-flow:column;row-gap:var(--spacing-x-small)}.dnb-forms-field-array-selection--layout-horizontal .dnb-forms-field-array-selection__options{-moz-column-gap:var(--spacing-small);column-gap:var(--spacing-small);display:flex;flex-flow:row wrap;row-gap:var(--spacing-x-small)}@media screen and (min-width:40em){.dnb-forms-field-array-selection .dnb-forms-field-block--layout-horizontal .dnb-form-label{line-height:2.5rem;margin-bottom:0}}

package/extensions/forms/Field/ArraySelection/style/dnb-array-selection.scss

@@ -1,13 +1,23 @@
+@import '../../../../../style/core/utilities.scss';
+
 .dnb-forms-field-array-selection {
-  &--options-layout-vertical &__options {
+  &--layout-vertical &__options {
     display: flex;
     flex-flow: column;
     row-gap: var(--spacing-x-small);
   }
 
-  &--options-layout-horizontal &__options {
+  &--layout-horizontal &__options {
     display: flex;
     flex-flow: row wrap;
     column-gap: var(--spacing-small);
+    row-gap: var(--spacing-x-small); // for when wrapped
+  }
+
+  @include allAbove(small) {
+    .dnb-forms-field-block--layout-horizontal .dnb-form-label {
+      line-height: 2.5rem;
+      margin-bottom: 0;
+    }
   }
 }

package/extensions/forms/Field/BankAccountNumber/BankAccountNumber.d.ts

@@ -1,5 +1,5 @@
-import { Props as StringComponentProps } from '../String';
-export type Props = StringComponentProps & {
+import { Props as StringFieldProps } from '../String';
+export type Props = StringFieldProps & {
     validate?: boolean;
     omitMask?: boolean;
 };

package/extensions/forms/Field/BankAccountNumber/BankAccountNumber.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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, { useContext, useMemo } from 'react';
-import StringComponent from '../String';
+import StringField from '../String';
 import SharedContext from '../../../../shared/Context';
 function BankAccountNumber(props) {
   var _props$pattern, _props$label, _props$width;
@@ -19,7 +19,7 @@ function BankAccountNumber(props) {
     pattern: tr.bankAccountNumberErrorPattern
   }, props.errorMessages), [tr, props.errorMessages]);
   const mask = useMemo(() => omitMask ? [/\d/, /\d/, /\d/, /\d/, /\d/, /\d/, /\d/, /\d/, /\d/, /\d/, /\d/] : [/\d/, /\d/, /\d/, /\d/, ' ', /\d/, /\d/, ' ', /\d/, /\d/, /\d/, /\d/, /\d/], [omitMask]);
-  const stringComponentProps = _objectSpread(_objectSpread({}, props), {}, {
+  const StringFieldProps = _objectSpread(_objectSpread({}, props), {}, {
     className: 'dnb-forms-field-bank-account-number',
     pattern: (_props$pattern = props.pattern) !== null && _props$pattern !== void 0 ? _props$pattern : validate ? '^[0-9]{11}$' : undefined,
     label: (_props$label = props.label) !== null && _props$label !== void 0 ? _props$label : sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms.bankAccountNumberLabel,
@@ -28,7 +28,7 @@ function BankAccountNumber(props) {
     width: (_props$width = props.width) !== null && _props$width !== void 0 ? _props$width : 'medium',
     inputMode: 'numeric'
   });
-  return React.createElement(StringComponent, stringComponentProps);
+  return React.createElement(StringField, StringFieldProps);
 }
 BankAccountNumber._supportsSpacingProps = true;
 export default BankAccountNumber;

package/extensions/forms/Field/BankAccountNumber/BankAccountNumber.js.map

@@ -1 +1 @@
-{"version":3,"file":"BankAccountNumber.js","names":["React","useContext","useMemo","StringComponent","SharedContext","BankAccountNumber","props","_props$pattern","_props$label","_props$width","sharedContext","tr","translation","Forms","validate","omitMask","errorMessages","_objectSpread","required","bankAccountNumberErrorRequired","pattern","bankAccountNumberErrorPattern","mask","stringComponentProps","className","undefined","label","bankAccountNumberLabel","width","inputMode","createElement","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/BankAccountNumber/BankAccountNumber.tsx"],"sourcesContent":["import React, { useContext, useMemo } from 'react'\nimport StringComponent, { Props as StringComponentProps } from '../String'\nimport SharedContext from '../../../../shared/Context'\n\nexport type Props = StringComponentProps & {\n  validate?: boolean\n  omitMask?: boolean\n}\n\nfunction BankAccountNumber(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n  const { validate = true, omitMask } = props\n\n  const errorMessages = useMemo(\n    () => ({\n      required: tr.bankAccountNumberErrorRequired,\n      pattern: tr.bankAccountNumberErrorPattern,\n      ...props.errorMessages,\n    }),\n    [tr, props.errorMessages]\n  )\n  const mask = useMemo(\n    () =>\n      omitMask\n        ? [\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n          ]\n        : [\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            ' ',\n            /\\d/,\n            /\\d/,\n            ' ',\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n          ],\n    [omitMask]\n  )\n\n  const stringComponentProps: Props = {\n    ...props,\n    className: 'dnb-forms-field-bank-account-number',\n    pattern: props.pattern ?? (validate ? '^[0-9]{11}$' : undefined),\n    label:\n      props.label ??\n      sharedContext?.translation.Forms.bankAccountNumberLabel,\n    errorMessages,\n    mask,\n    width: props.width ?? 'medium',\n    inputMode: 'numeric',\n  }\n\n  return <StringComponent {...stringComponentProps} />\n}\n\nBankAccountNumber._supportsSpacingProps = true\nexport default BankAccountNumber\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,OAAOC,eAAe,MAAyC,WAAW;AAC1E,OAAOC,aAAa,MAAM,4BAA4B;AAOtD,SAASC,iBAAiBA,CAACC,KAAY,EAAE;EAAA,IAAAC,cAAA,EAAAC,YAAA,EAAAC,YAAA;EACvC,MAAMC,aAAa,GAAGT,UAAU,CAACG,aAAa,CAAC;EAC/C,MAAMO,EAAE,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK;EAC3C,MAAM;IAAEC,QAAQ,GAAG,IAAI;IAAEC;EAAS,CAAC,GAAGT,KAAK;EAE3C,MAAMU,aAAa,GAAGd,OAAO,CAC3B,MAAAe,aAAA;IACEC,QAAQ,EAAEP,EAAE,CAACQ,8BAA8B;IAC3CC,OAAO,EAAET,EAAE,CAACU;EAA6B,GACtCf,KAAK,CAACU,aAAa,CACtB,EACF,CAACL,EAAE,EAAEL,KAAK,CAACU,aAAa,CAC1B,CAAC;EACD,MAAMM,IAAI,GAAGpB,OAAO,CAClB,MACEa,QAAQ,GACJ,CACE,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,GACD,CACE,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,EACP,CAACA,QAAQ,CACX,CAAC;EAED,MAAMQ,oBAA2B,GAAAN,aAAA,CAAAA,aAAA,KAC5BX,KAAK;IACRkB,SAAS,EAAE,qCAAqC;IAChDJ,OAAO,GAAAb,cAAA,GAAED,KAAK,CAACc,OAAO,cAAAb,cAAA,cAAAA,cAAA,GAAKO,QAAQ,GAAG,aAAa,GAAGW,SAAU;IAChEC,KAAK,GAAAlB,YAAA,GACHF,KAAK,CAACoB,KAAK,cAAAlB,YAAA,cAAAA,YAAA,GACXE,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK,CAACc,sBAAsB;IACzDX,aAAa;IACbM,IAAI;IACJM,KAAK,GAAAnB,YAAA,GAAEH,KAAK,CAACsB,KAAK,cAAAnB,YAAA,cAAAA,YAAA,GAAI,QAAQ;IAC9BoB,SAAS,EAAE;EAAS,EACrB;EAED,OAAO7B,KAAA,CAAA8B,aAAA,CAAC3B,eAAe,EAAKoB,oBAAuB,CAAC;AACtD;AAEAlB,iBAAiB,CAAC0B,qBAAqB,GAAG,IAAI;AAC9C,eAAe1B,iBAAiB"}
+{"version":3,"file":"BankAccountNumber.js","names":["React","useContext","useMemo","StringField","SharedContext","BankAccountNumber","props","_props$pattern","_props$label","_props$width","sharedContext","tr","translation","Forms","validate","omitMask","errorMessages","_objectSpread","required","bankAccountNumberErrorRequired","pattern","bankAccountNumberErrorPattern","mask","StringFieldProps","className","undefined","label","bankAccountNumberLabel","width","inputMode","createElement","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/BankAccountNumber/BankAccountNumber.tsx"],"sourcesContent":["import React, { useContext, useMemo } from 'react'\nimport StringField, { Props as StringFieldProps } from '../String'\nimport SharedContext from '../../../../shared/Context'\n\nexport type Props = StringFieldProps & {\n  validate?: boolean\n  omitMask?: boolean\n}\n\nfunction BankAccountNumber(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n  const { validate = true, omitMask } = props\n\n  const errorMessages = useMemo(\n    () => ({\n      required: tr.bankAccountNumberErrorRequired,\n      pattern: tr.bankAccountNumberErrorPattern,\n      ...props.errorMessages,\n    }),\n    [tr, props.errorMessages]\n  )\n  const mask = useMemo(\n    () =>\n      omitMask\n        ? [\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n          ]\n        : [\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            ' ',\n            /\\d/,\n            /\\d/,\n            ' ',\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\n          ],\n    [omitMask]\n  )\n\n  const StringFieldProps: Props = {\n    ...props,\n    className: 'dnb-forms-field-bank-account-number',\n    pattern: props.pattern ?? (validate ? '^[0-9]{11}$' : undefined),\n    label:\n      props.label ??\n      sharedContext?.translation.Forms.bankAccountNumberLabel,\n    errorMessages,\n    mask,\n    width: props.width ?? 'medium',\n    inputMode: 'numeric',\n  }\n\n  return <StringField {...StringFieldProps} />\n}\n\nBankAccountNumber._supportsSpacingProps = true\nexport default BankAccountNumber\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,OAAOC,WAAW,MAAqC,WAAW;AAClE,OAAOC,aAAa,MAAM,4BAA4B;AAOtD,SAASC,iBAAiBA,CAACC,KAAY,EAAE;EAAA,IAAAC,cAAA,EAAAC,YAAA,EAAAC,YAAA;EACvC,MAAMC,aAAa,GAAGT,UAAU,CAACG,aAAa,CAAC;EAC/C,MAAMO,EAAE,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK;EAC3C,MAAM;IAAEC,QAAQ,GAAG,IAAI;IAAEC;EAAS,CAAC,GAAGT,KAAK;EAE3C,MAAMU,aAAa,GAAGd,OAAO,CAC3B,MAAAe,aAAA;IACEC,QAAQ,EAAEP,EAAE,CAACQ,8BAA8B;IAC3CC,OAAO,EAAET,EAAE,CAACU;EAA6B,GACtCf,KAAK,CAACU,aAAa,CACtB,EACF,CAACL,EAAE,EAAEL,KAAK,CAACU,aAAa,CAC1B,CAAC;EACD,MAAMM,IAAI,GAAGpB,OAAO,CAClB,MACEa,QAAQ,GACJ,CACE,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,GACD,CACE,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,EACP,CAACA,QAAQ,CACX,CAAC;EAED,MAAMQ,gBAAuB,GAAAN,aAAA,CAAAA,aAAA,KACxBX,KAAK;IACRkB,SAAS,EAAE,qCAAqC;IAChDJ,OAAO,GAAAb,cAAA,GAAED,KAAK,CAACc,OAAO,cAAAb,cAAA,cAAAA,cAAA,GAAKO,QAAQ,GAAG,aAAa,GAAGW,SAAU;IAChEC,KAAK,GAAAlB,YAAA,GACHF,KAAK,CAACoB,KAAK,cAAAlB,YAAA,cAAAA,YAAA,GACXE,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK,CAACc,sBAAsB;IACzDX,aAAa;IACbM,IAAI;IACJM,KAAK,GAAAnB,YAAA,GAAEH,KAAK,CAACsB,KAAK,cAAAnB,YAAA,cAAAA,YAAA,GAAI,QAAQ;IAC9BoB,SAAS,EAAE;EAAS,EACrB;EAED,OAAO7B,KAAA,CAAA8B,aAAA,CAAC3B,WAAW,EAAKoB,gBAAmB,CAAC;AAC9C;AAEAlB,iBAAiB,CAAC0B,qBAAqB,GAAG,IAAI;AAC9C,eAAe1B,iBAAiB"}

package/extensions/forms/Field/Boolean/Boolean.d.ts

@@ -1,5 +1,5 @@
-import { Props as ToggleProps } from '../Toggle';
-export type Props = Omit<ToggleProps, 'valueOn' | 'valueOff' | 'textOn' | 'textOff'> & {
+import { Props as ToggleFieldProps } from '../Toggle';
+export type Props = Omit<ToggleFieldProps, 'valueOn' | 'valueOff' | 'textOn' | 'textOff'> & {
     trueText?: string;
     falseText?: string;
 };

package/extensions/forms/Field/Boolean/Boolean.js

@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["trueText", "falseText"];
 import React, { useContext } from 'react';
-import Toggle from '../Toggle';
+import ToggleField from '../Toggle';
 import SharedContext from '../../../../shared/Context';
 function BooleanComponent(props) {
   const sharedContext = useContext(SharedContext);
@@ -13,7 +13,7 @@ function BooleanComponent(props) {
       falseText
     } = props,
     restProps = _objectWithoutProperties(props, _excluded);
-  return React.createElement(Toggle, _extends({}, restProps, {
+  return React.createElement(ToggleField, _extends({}, restProps, {
     valueOn: true,
     valueOff: false,
     textOn: trueText !== null && trueText !== void 0 ? trueText : sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms.booleanYes,

package/extensions/forms/Field/Boolean/Boolean.js.map

@@ -1 +1 @@
-{"version":3,"file":"Boolean.js","names":["React","useContext","Toggle","SharedContext","BooleanComponent","props","sharedContext","trueText","falseText","restProps","_objectWithoutProperties","_excluded","createElement","_extends","valueOn","valueOff","textOn","translation","Forms","booleanYes","textOff","booleanNo","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Boolean/Boolean.tsx"],"sourcesContent":["import React, { useContext } from 'react'\nimport Toggle, { Props as ToggleProps } from '../Toggle'\nimport SharedContext from '../../../../shared/Context'\n\nexport type Props = Omit<\n  ToggleProps,\n  'valueOn' | 'valueOff' | 'textOn' | 'textOff'\n> & {\n  trueText?: string\n  falseText?: string\n}\n\nfunction BooleanComponent(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const { trueText, falseText, ...restProps } = props\n  return (\n    <Toggle\n      {...restProps}\n      valueOn={true}\n      valueOff={false}\n      textOn={trueText ?? sharedContext?.translation.Forms.booleanYes}\n      textOff={falseText ?? sharedContext?.translation.Forms.booleanNo}\n    />\n  )\n}\n\nBooleanComponent._supportsSpacingProps = true\nexport default BooleanComponent\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,OAAOC,MAAM,MAAgC,WAAW;AACxD,OAAOC,aAAa,MAAM,4BAA4B;AAUtD,SAASC,gBAAgBA,CAACC,KAAY,EAAE;EACtC,MAAMC,aAAa,GAAGL,UAAU,CAACE,aAAa,CAAC;EAC/C,MAAM;MAAEI,QAAQ;MAAEC;IAAwB,CAAC,GAAGH,KAAK;IAAnBI,SAAS,GAAAC,wBAAA,CAAKL,KAAK,EAAAM,SAAA;EACnD,OACEX,KAAA,CAAAY,aAAA,CAACV,MAAM,EAAAW,QAAA,KACDJ,SAAS;IACbK,OAAO,EAAE,IAAK;IACdC,QAAQ,EAAE,KAAM;IAChBC,MAAM,EAAET,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAID,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEW,WAAW,CAACC,KAAK,CAACC,UAAW;IAChEC,OAAO,EAAEZ,SAAS,aAATA,SAAS,cAATA,SAAS,GAAIF,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEW,WAAW,CAACC,KAAK,CAACG;EAAU,EAClE,CAAC;AAEN;AAEAjB,gBAAgB,CAACkB,qBAAqB,GAAG,IAAI;AAC7C,eAAelB,gBAAgB"}
+{"version":3,"file":"Boolean.js","names":["React","useContext","ToggleField","SharedContext","BooleanComponent","props","sharedContext","trueText","falseText","restProps","_objectWithoutProperties","_excluded","createElement","_extends","valueOn","valueOff","textOn","translation","Forms","booleanYes","textOff","booleanNo","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Boolean/Boolean.tsx"],"sourcesContent":["import React, { useContext } from 'react'\nimport ToggleField, { Props as ToggleFieldProps } from '../Toggle'\nimport SharedContext from '../../../../shared/Context'\n\nexport type Props = Omit<\n  ToggleFieldProps,\n  'valueOn' | 'valueOff' | 'textOn' | 'textOff'\n> & {\n  trueText?: string\n  falseText?: string\n}\n\nfunction BooleanComponent(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const { trueText, falseText, ...restProps } = props\n  return (\n    <ToggleField\n      {...restProps}\n      valueOn={true}\n      valueOff={false}\n      textOn={trueText ?? sharedContext?.translation.Forms.booleanYes}\n      textOff={falseText ?? sharedContext?.translation.Forms.booleanNo}\n    />\n  )\n}\n\nBooleanComponent._supportsSpacingProps = true\nexport default BooleanComponent\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,OAAOC,WAAW,MAAqC,WAAW;AAClE,OAAOC,aAAa,MAAM,4BAA4B;AAUtD,SAASC,gBAAgBA,CAACC,KAAY,EAAE;EACtC,MAAMC,aAAa,GAAGL,UAAU,CAACE,aAAa,CAAC;EAC/C,MAAM;MAAEI,QAAQ;MAAEC;IAAwB,CAAC,GAAGH,KAAK;IAAnBI,SAAS,GAAAC,wBAAA,CAAKL,KAAK,EAAAM,SAAA;EACnD,OACEX,KAAA,CAAAY,aAAA,CAACV,WAAW,EAAAW,QAAA,KACNJ,SAAS;IACbK,OAAO,EAAE,IAAK;IACdC,QAAQ,EAAE,KAAM;IAChBC,MAAM,EAAET,QAAQ,aAARA,QAAQ,cAARA,QAAQ,GAAID,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEW,WAAW,CAACC,KAAK,CAACC,UAAW;IAChEC,OAAO,EAAEZ,SAAS,aAATA,SAAS,cAATA,SAAS,GAAIF,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEW,WAAW,CAACC,KAAK,CAACG;EAAU,EAClE,CAAC;AAEN;AAEAjB,gBAAgB,CAACkB,qBAAqB,GAAG,IAAI;AAC7C,eAAelB,gBAAgB"}

package/extensions/forms/Field/Currency/Currency.d.ts

@@ -1,5 +1,5 @@
-import { Props as NumberProps } from '../Number';
-export type Props = NumberProps;
+import { Props as NumberFieldProps } from '../Number';
+export type Props = NumberFieldProps;
 declare function Currency(props: Props): import("react/jsx-runtime").JSX.Element;
 declare namespace Currency {
     var _supportsSpacingProps: boolean;

package/extensions/forms/Field/Currency/Currency.js

@@ -9,7 +9,7 @@ import classnames from 'classnames';
 import { Context } from '../../../../shared';
 import { getCurrencySymbol } from '../../../../components/number-format/NumberUtils';
 import { CURRENCY } from '../../../../shared/defaults';
-import NumberComponent from '../Number';
+import NumberField from '../Number';
 function Currency(props) {
   var _props$currency, _props$placeholder;
   const context = React.useContext(Context);
@@ -17,7 +17,7 @@ function Currency(props) {
     currency: (_props$currency = props.currency) !== null && _props$currency !== void 0 ? _props$currency : CURRENCY,
     placeholder: (_props$placeholder = props.placeholder) !== null && _props$placeholder !== void 0 ? _props$placeholder : getCurrencySymbol(context === null || context === void 0 ? void 0 : context.locale, props.currency)
   });
-  return React.createElement(NumberComponent, _extends({}, preparedProps, {
+  return React.createElement(NumberField, _extends({}, preparedProps, {
     className: classnames('dnb-forms-field-currency', props.className)
   }));
 }

package/extensions/forms/Field/Currency/Currency.js.map

@@ -1 +1 @@
-{"version":3,"file":"Currency.js","names":["React","classnames","Context","getCurrencySymbol","CURRENCY","NumberComponent","Currency","props","_props$currency","_props$placeholder","context","useContext","preparedProps","_objectSpread","currency","placeholder","locale","createElement","_extends","className","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Currency/Currency.tsx"],"sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\nimport { Context } from '../../../../shared'\nimport { getCurrencySymbol } from '../../../../components/number-format/NumberUtils'\nimport { CURRENCY } from '../../../../shared/defaults'\nimport NumberComponent, { Props as NumberProps } from '../Number'\n\nexport type Props = NumberProps\n\nfunction Currency(props: Props) {\n  const context = React.useContext(Context)\n  const preparedProps = {\n    ...props,\n    currency: props.currency ?? CURRENCY,\n    placeholder:\n      props.placeholder ??\n      getCurrencySymbol(context?.locale, props.currency),\n  }\n\n  return (\n    <NumberComponent\n      {...preparedProps}\n      className={classnames('dnb-forms-field-currency', props.className)}\n    />\n  )\n}\n\nCurrency._supportsSpacingProps = true\nexport default Currency\n"],"mappings":";;;;;;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,UAAU,MAAM,YAAY;AACnC,SAASC,OAAO,QAAQ,oBAAoB;AAC5C,SAASC,iBAAiB,QAAQ,kDAAkD;AACpF,SAASC,QAAQ,QAAQ,6BAA6B;AACtD,OAAOC,eAAe,MAAgC,WAAW;AAIjE,SAASC,QAAQA,CAACC,KAAY,EAAE;EAAA,IAAAC,eAAA,EAAAC,kBAAA;EAC9B,MAAMC,OAAO,GAAGV,KAAK,CAACW,UAAU,CAACT,OAAO,CAAC;EACzC,MAAMU,aAAa,GAAAC,aAAA,CAAAA,aAAA,KACdN,KAAK;IACRO,QAAQ,GAAAN,eAAA,GAAED,KAAK,CAACO,QAAQ,cAAAN,eAAA,cAAAA,eAAA,GAAIJ,QAAQ;IACpCW,WAAW,GAAAN,kBAAA,GACTF,KAAK,CAACQ,WAAW,cAAAN,kBAAA,cAAAA,kBAAA,GACjBN,iBAAiB,CAACO,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,MAAM,EAAET,KAAK,CAACO,QAAQ;EAAC,EACrD;EAED,OACEd,KAAA,CAAAiB,aAAA,CAACZ,eAAe,EAAAa,QAAA,KACVN,aAAa;IACjBO,SAAS,EAAElB,UAAU,CAAC,0BAA0B,EAAEM,KAAK,CAACY,SAAS;EAAE,EACpE,CAAC;AAEN;AAEAb,QAAQ,CAACc,qBAAqB,GAAG,IAAI;AACrC,eAAed,QAAQ"}
+{"version":3,"file":"Currency.js","names":["React","classnames","Context","getCurrencySymbol","CURRENCY","NumberField","Currency","props","_props$currency","_props$placeholder","context","useContext","preparedProps","_objectSpread","currency","placeholder","locale","createElement","_extends","className","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Currency/Currency.tsx"],"sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\nimport { Context } from '../../../../shared'\nimport { getCurrencySymbol } from '../../../../components/number-format/NumberUtils'\nimport { CURRENCY } from '../../../../shared/defaults'\nimport NumberField, { Props as NumberFieldProps } from '../Number'\n\nexport type Props = NumberFieldProps\n\nfunction Currency(props: Props) {\n  const context = React.useContext(Context)\n  const preparedProps = {\n    ...props,\n    currency: props.currency ?? CURRENCY,\n    placeholder:\n      props.placeholder ??\n      getCurrencySymbol(context?.locale, props.currency),\n  }\n\n  return (\n    <NumberField\n      {...preparedProps}\n      className={classnames('dnb-forms-field-currency', props.className)}\n    />\n  )\n}\n\nCurrency._supportsSpacingProps = true\nexport default Currency\n"],"mappings":";;;;;;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,UAAU,MAAM,YAAY;AACnC,SAASC,OAAO,QAAQ,oBAAoB;AAC5C,SAASC,iBAAiB,QAAQ,kDAAkD;AACpF,SAASC,QAAQ,QAAQ,6BAA6B;AACtD,OAAOC,WAAW,MAAqC,WAAW;AAIlE,SAASC,QAAQA,CAACC,KAAY,EAAE;EAAA,IAAAC,eAAA,EAAAC,kBAAA;EAC9B,MAAMC,OAAO,GAAGV,KAAK,CAACW,UAAU,CAACT,OAAO,CAAC;EACzC,MAAMU,aAAa,GAAAC,aAAA,CAAAA,aAAA,KACdN,KAAK;IACRO,QAAQ,GAAAN,eAAA,GAAED,KAAK,CAACO,QAAQ,cAAAN,eAAA,cAAAA,eAAA,GAAIJ,QAAQ;IACpCW,WAAW,GAAAN,kBAAA,GACTF,KAAK,CAACQ,WAAW,cAAAN,kBAAA,cAAAA,kBAAA,GACjBN,iBAAiB,CAACO,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,MAAM,EAAET,KAAK,CAACO,QAAQ;EAAC,EACrD;EAED,OACEd,KAAA,CAAAiB,aAAA,CAACZ,WAAW,EAAAa,QAAA,KACNN,aAAa;IACjBO,SAAS,EAAElB,UAAU,CAAC,0BAA0B,EAAEM,KAAK,CAACY,SAAS;EAAE,EACpE,CAAC;AAEN;AAEAb,QAAQ,CAACc,qBAAqB,GAAG,IAAI;AACrC,eAAed,QAAQ"}

package/extensions/forms/Field/Date/Date.js

@@ -52,7 +52,6 @@ function DateComponent(props) {
     className,
     label,
     labelDescription,
-    labelSecondary,
     value,
     help,
     info,
@@ -60,6 +59,7 @@ function DateComponent(props) {
     error,
     hasError,
     disabled,
+    ariaAttributes,
     handleFocus,
     handleBlur,
     handleChange
@@ -69,7 +69,6 @@ function DateComponent(props) {
     forId: id,
     label: label !== null && label !== void 0 ? label : sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms.dateLabel,
     labelDescription: labelDescription,
-    labelSecondary: labelSecondary,
     info: info,
     warning: warning,
     disabled: disabled,
@@ -81,15 +80,15 @@ function DateComponent(props) {
     show_input: true,
     show_cancel_button: true,
     show_reset_button: true,
-    status: error || hasError ? 'error' : undefined,
+    status: hasError ? 'error' : undefined,
     suffix: help ? React.createElement(HelpButton, {
       title: help.title
-    }, help.contents) : undefined,
+    }, help.content) : undefined,
     on_change: handleChange,
     on_reset: handleChange,
     onFocus: handleFocus,
     onBlur: handleBlur
-  }, pickSpacingProps(props))));
+  }, ariaAttributes, pickSpacingProps(props))));
 }
 DateComponent._supportsSpacingProps = true;
 export default DateComponent;