@dnb/eufemia 10.18.0 → 10.20.0

package/es/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/es/extensions/forms/Field/Date/Date.js

@@ -12,13 +12,14 @@ import SharedContext from '../../../../shared/Context';
 import classnames from 'classnames';
 import FieldBlock from '../../FieldBlock';
 import { parseISO, isValid } from 'date-fns';
+import useErrorMessage from '../../hooks/useErrorMessage';
 function DateComponent(props) {
   const sharedContext = useContext(SharedContext);
   const tr = sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms;
-  const errorMessages = useMemo(() => _objectSpread({
+  const errorMessages = useErrorMessage(props.path, props.errorMessages, {
     required: tr.dateErrorRequired,
     pattern: tr.inputErrorPattern
-  }, props.errorMessages), [tr, props.errorMessages]);
+  });
   const schema = useMemo(() => {
     var _props$schema;
     return (_props$schema = props.schema) !== null && _props$schema !== void 0 ? _props$schema : {
@@ -49,6 +50,7 @@ function DateComponent(props) {
     id,
     className,
     label,
+    labelDescription,
     value,
     help,
     info,
@@ -56,6 +58,7 @@ function DateComponent(props) {
     error,
     hasError,
     disabled,
+    ariaAttributes,
     handleFocus,
     handleBlur,
     handleChange
@@ -64,6 +67,7 @@ function DateComponent(props) {
     className: classnames('dnb-forms-field-string', className),
     forId: id,
     label: label !== null && label !== void 0 ? label : sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms.dateLabel,
+    labelDescription: labelDescription,
     info: info,
     warning: warning,
     disabled: disabled,
@@ -78,12 +82,12 @@ function DateComponent(props) {
     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)));
 }
 DateComponent._supportsSpacingProps = true;
 export default DateComponent;

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

@@ -1 +1 @@
-{"version":3,"file":"Date.js","names":["React","useCallback","useContext","useMemo","DatePicker","HelpButton","useDataValue","pickSpacingProps","SharedContext","classnames","FieldBlock","parseISO","isValid","DateComponent","props","sharedContext","tr","translation","Forms","errorMessages","_objectSpread","required","dateErrorRequired","pattern","inputErrorPattern","schema","_props$schema","type","validateRequired","value","error","undefined","preparedProps","fromInput","date","id","className","label","help","info","warning","hasError","disabled","handleFocus","handleBlur","handleChange","createElement","_extends","forId","dateLabel","show_input","show_cancel_button","show_reset_button","status","suffix","title","contents","on_change","on_reset","onFocus","onBlur","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Date/Date.tsx"],"sourcesContent":["import React, { useCallback, useContext, useMemo } from 'react'\nimport { DatePicker, HelpButton } from '../../../../components'\nimport { useDataValue } from '../../hooks'\nimport { FieldProps, FieldHelpProps, JSONSchema } from '../../types'\nimport { pickSpacingProps } from '../../../../components/flex/utils'\nimport SharedContext from '../../../../shared/Context'\nimport classnames from 'classnames'\nimport FieldBlock from '../../FieldBlock'\nimport { parseISO, isValid } from 'date-fns'\n\nexport type Props = FieldHelpProps &\n  FieldProps<string> & {\n    // Validation\n    pattern?: string\n  }\n\nfunction DateComponent(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n\n  const errorMessages = useMemo(\n    () => ({\n      required: tr.dateErrorRequired,\n      pattern: tr.inputErrorPattern,\n      ...props.errorMessages,\n    }),\n    [tr, props.errorMessages]\n  )\n\n  const schema = useMemo<JSONSchema>(\n    () =>\n      props.schema ?? {\n        type: 'string',\n        pattern: props.pattern,\n      },\n    [props.schema, props.pattern]\n  )\n\n  const validateRequired = useCallback(\n    (value: string, { required, error }) => {\n      if (required && (!value || !isValid(parseISO(value)))) {\n        return error\n      }\n\n      return undefined\n    },\n    []\n  )\n\n  const preparedProps: Props = {\n    ...props,\n    errorMessages,\n    schema,\n    fromInput: ({ date }: { date: string }) => {\n      return date\n    },\n    validateRequired,\n  }\n\n  const {\n    id,\n    className,\n    label,\n    value,\n    help,\n    info,\n    warning,\n    error,\n    hasError,\n    disabled,\n    handleFocus,\n    handleBlur,\n    handleChange,\n  } = useDataValue(preparedProps)\n\n  return (\n    <FieldBlock\n      className={classnames('dnb-forms-field-string', className)}\n      forId={id}\n      label={label ?? sharedContext?.translation.Forms.dateLabel}\n      info={info}\n      warning={warning}\n      disabled={disabled}\n      error={error}\n      {...pickSpacingProps(props)}\n    >\n      <DatePicker\n        id={id}\n        date={value}\n        disabled={disabled}\n        show_input={true}\n        show_cancel_button={true}\n        show_reset_button={true}\n        status={hasError ? 'error' : undefined}\n        suffix={\n          help ? (\n            <HelpButton title={help.title}>{help.contents}</HelpButton>\n          ) : undefined\n        }\n        on_change={handleChange}\n        on_reset={handleChange}\n        onFocus={handleFocus}\n        onBlur={handleBlur}\n        {...pickSpacingProps(props)}\n      />\n    </FieldBlock>\n  )\n}\n\nDateComponent._supportsSpacingProps = true\nexport default DateComponent\n"],"mappings":"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"}
+{"version":3,"file":"Date.js","names":["React","useCallback","useContext","useMemo","DatePicker","HelpButton","useDataValue","pickSpacingProps","SharedContext","classnames","FieldBlock","parseISO","isValid","useErrorMessage","DateComponent","props","sharedContext","tr","translation","Forms","errorMessages","path","required","dateErrorRequired","pattern","inputErrorPattern","schema","_props$schema","type","validateRequired","value","error","undefined","preparedProps","_objectSpread","fromInput","date","id","className","label","labelDescription","help","info","warning","hasError","disabled","ariaAttributes","handleFocus","handleBlur","handleChange","createElement","_extends","forId","dateLabel","show_input","show_cancel_button","show_reset_button","status","suffix","title","content","on_change","on_reset","onFocus","onBlur","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Date/Date.tsx"],"sourcesContent":["import React, { useCallback, useContext, useMemo } from 'react'\nimport { DatePicker, HelpButton } from '../../../../components'\nimport { useDataValue } from '../../hooks'\nimport {\n  FieldProps,\n  FieldHelpProps,\n  AllJSONSchemaVersions,\n} from '../../types'\nimport { pickSpacingProps } from '../../../../components/flex/utils'\nimport SharedContext from '../../../../shared/Context'\nimport classnames from 'classnames'\nimport FieldBlock from '../../FieldBlock'\nimport { parseISO, isValid } from 'date-fns'\nimport useErrorMessage from '../../hooks/useErrorMessage'\n\nexport type Props = FieldHelpProps &\n  FieldProps<string> & {\n    // Validation\n    pattern?: string\n  }\n\nfunction DateComponent(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n\n  const errorMessages = useErrorMessage(props.path, props.errorMessages, {\n    required: tr.dateErrorRequired,\n    pattern: tr.inputErrorPattern,\n  })\n\n  const schema = useMemo<AllJSONSchemaVersions>(\n    () =>\n      props.schema ?? {\n        type: 'string',\n        pattern: props.pattern,\n      },\n    [props.schema, props.pattern]\n  )\n\n  const validateRequired = useCallback(\n    (value: string, { required, error }) => {\n      if (required && (!value || !isValid(parseISO(value)))) {\n        return error\n      }\n\n      return undefined\n    },\n    []\n  )\n\n  const preparedProps: Props = {\n    ...props,\n    errorMessages,\n    schema,\n    fromInput: ({ date }: { date: string }) => {\n      return date\n    },\n    validateRequired,\n  }\n\n  const {\n    id,\n    className,\n    label,\n    labelDescription,\n    value,\n    help,\n    info,\n    warning,\n    error,\n    hasError,\n    disabled,\n    ariaAttributes,\n    handleFocus,\n    handleBlur,\n    handleChange,\n  } = useDataValue(preparedProps)\n\n  return (\n    <FieldBlock\n      className={classnames('dnb-forms-field-string', className)}\n      forId={id}\n      label={label ?? sharedContext?.translation.Forms.dateLabel}\n      labelDescription={labelDescription}\n      info={info}\n      warning={warning}\n      disabled={disabled}\n      error={error}\n      {...pickSpacingProps(props)}\n    >\n      <DatePicker\n        id={id}\n        date={value}\n        disabled={disabled}\n        show_input={true}\n        show_cancel_button={true}\n        show_reset_button={true}\n        status={hasError ? 'error' : undefined}\n        suffix={\n          help ? (\n            <HelpButton title={help.title}>{help.content}</HelpButton>\n          ) : undefined\n        }\n        on_change={handleChange}\n        on_reset={handleChange}\n        onFocus={handleFocus}\n        onBlur={handleBlur}\n        {...ariaAttributes}\n      />\n    </FieldBlock>\n  )\n}\n\nDateComponent._supportsSpacingProps = true\nexport default DateComponent\n"],"mappings":"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"}

package/es/extensions/forms/Field/Email/Email.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;
 declare function Email(props: Props): import("react/jsx-runtime").JSX.Element;
 declare namespace Email {
     var _supportsSpacingProps: boolean;

package/es/extensions/forms/Field/Email/Email.js

@@ -3,17 +3,18 @@
 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 React, { useContext } from 'react';
+import StringField from '../String';
 import SharedContext from '../../../../shared/Context';
+import useErrorMessage from '../../hooks/useErrorMessage';
 function Email(props) {
   const sharedContext = useContext(SharedContext);
   const tr = sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms;
-  const errorMessages = useMemo(() => _objectSpread({
+  const errorMessages = useErrorMessage(props.path, props.errorMessages, {
     required: tr.emailErrorRequired,
     pattern: tr.emailErrorPattern
-  }, props.errorMessages), [tr, props.errorMessages]);
-  const stringComponentProps = _objectSpread(_objectSpread({
+  });
+  const StringFieldProps = _objectSpread(_objectSpread({
     label: sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms.emailLabel,
     autoComplete: 'email',
     inputMode: 'email',
@@ -22,7 +23,7 @@ function Email(props) {
   }, props), {}, {
     errorMessages
   });
-  return React.createElement(StringComponent, stringComponentProps);
+  return React.createElement(StringField, StringFieldProps);
 }
 Email._supportsSpacingProps = true;
 export default Email;

package/es/extensions/forms/Field/Email/Email.js.map

@@ -1 +1 @@
-{"version":3,"file":"Email.js","names":["React","useContext","useMemo","StringComponent","SharedContext","Email","props","sharedContext","tr","translation","Forms","errorMessages","_objectSpread","required","emailErrorRequired","pattern","emailErrorPattern","stringComponentProps","label","emailLabel","autoComplete","inputMode","trim","createElement","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Email/Email.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\nfunction Email(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n\n  const errorMessages = useMemo(\n    () => ({\n      required: tr.emailErrorRequired,\n      pattern: tr.emailErrorPattern,\n      ...props.errorMessages,\n    }),\n    [tr, props.errorMessages]\n  )\n\n  const stringComponentProps: Props = {\n    label: sharedContext?.translation.Forms.emailLabel,\n    autoComplete: 'email',\n    inputMode: 'email',\n    pattern:\n      \"^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:.[a-zA-Z0-9-]+)*$\",\n    trim: true,\n    ...props,\n    errorMessages,\n  }\n\n  return <StringComponent {...stringComponentProps} />\n}\n\nEmail._supportsSpacingProps = true\nexport default Email\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,OAAOC,eAAe,MAAyC,WAAW;AAC1E,OAAOC,aAAa,MAAM,4BAA4B;AAItD,SAASC,KAAKA,CAACC,KAAY,EAAE;EAC3B,MAAMC,aAAa,GAAGN,UAAU,CAACG,aAAa,CAAC;EAC/C,MAAMI,EAAE,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK;EAE3C,MAAMC,aAAa,GAAGT,OAAO,CAC3B,MAAAU,aAAA;IACEC,QAAQ,EAAEL,EAAE,CAACM,kBAAkB;IAC/BC,OAAO,EAAEP,EAAE,CAACQ;EAAiB,GAC1BV,KAAK,CAACK,aAAa,CACtB,EACF,CAACH,EAAE,EAAEF,KAAK,CAACK,aAAa,CAC1B,CAAC;EAED,MAAMM,oBAA2B,GAAAL,aAAA,CAAAA,aAAA;IAC/BM,KAAK,EAAEX,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK,CAACS,UAAU;IAClDC,YAAY,EAAE,OAAO;IACrBC,SAAS,EAAE,OAAO;IAClBN,OAAO,EACL,qEAAqE;IACvEO,IAAI,EAAE;EAAI,GACPhB,KAAK;IACRK;EAAa,EACd;EAED,OAAOX,KAAA,CAAAuB,aAAA,CAACpB,eAAe,EAAKc,oBAAuB,CAAC;AACtD;AAEAZ,KAAK,CAACmB,qBAAqB,GAAG,IAAI;AAClC,eAAenB,KAAK"}
+{"version":3,"file":"Email.js","names":["React","useContext","StringField","SharedContext","useErrorMessage","Email","props","sharedContext","tr","translation","Forms","errorMessages","path","required","emailErrorRequired","pattern","emailErrorPattern","StringFieldProps","_objectSpread","label","emailLabel","autoComplete","inputMode","trim","createElement","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Email/Email.tsx"],"sourcesContent":["import React, { useContext } from 'react'\nimport StringField, { Props as StringFieldProps } from '../String'\nimport SharedContext from '../../../../shared/Context'\nimport useErrorMessage from '../../hooks/useErrorMessage'\n\nexport type Props = StringFieldProps\n\nfunction Email(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n\n  const errorMessages = useErrorMessage(props.path, props.errorMessages, {\n    required: tr.emailErrorRequired,\n    pattern: tr.emailErrorPattern,\n  })\n\n  const StringFieldProps: Props = {\n    label: sharedContext?.translation.Forms.emailLabel,\n    autoComplete: 'email',\n    inputMode: 'email',\n    pattern:\n      \"^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:.[a-zA-Z0-9-]+)*$\",\n    trim: true,\n    ...props,\n    errorMessages,\n  }\n\n  return <StringField {...StringFieldProps} />\n}\n\nEmail._supportsSpacingProps = true\nexport default Email\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AACzC,OAAOC,WAAW,MAAqC,WAAW;AAClE,OAAOC,aAAa,MAAM,4BAA4B;AACtD,OAAOC,eAAe,MAAM,6BAA6B;AAIzD,SAASC,KAAKA,CAACC,KAAY,EAAE;EAC3B,MAAMC,aAAa,GAAGN,UAAU,CAACE,aAAa,CAAC;EAC/C,MAAMK,EAAE,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK;EAE3C,MAAMC,aAAa,GAAGP,eAAe,CAACE,KAAK,CAACM,IAAI,EAAEN,KAAK,CAACK,aAAa,EAAE;IACrEE,QAAQ,EAAEL,EAAE,CAACM,kBAAkB;IAC/BC,OAAO,EAAEP,EAAE,CAACQ;EACd,CAAC,CAAC;EAEF,MAAMC,gBAAuB,GAAAC,aAAA,CAAAA,aAAA;IAC3BC,KAAK,EAAEZ,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK,CAACU,UAAU;IAClDC,YAAY,EAAE,OAAO;IACrBC,SAAS,EAAE,OAAO;IAClBP,OAAO,EACL,qEAAqE;IACvEQ,IAAI,EAAE;EAAI,GACPjB,KAAK;IACRK;EAAa,EACd;EAED,OAAOX,KAAA,CAAAwB,aAAA,CAACtB,WAAW,EAAKe,gBAAmB,CAAC;AAC9C;AAEAZ,KAAK,CAACoB,qBAAqB,GAAG,IAAI;AAClC,eAAepB,KAAK"}

package/es/extensions/forms/Field/Expiry/Expiry.js

@@ -4,8 +4,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 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, { useCallback, useContext, useMemo, useRef } from 'react';
-import { makeUniqueId } from '../../../../shared/component-helper';
+import React, { useCallback, useContext } from 'react';
 import SharedContext from '../../../../shared/Context';
 import { pickSpacingProps } from '../../../../components/flex/utils';
 import { useDataValue } from '../../hooks';
@@ -13,14 +12,15 @@ import classnames from 'classnames';
 import FieldBlock from '../../FieldBlock';
 import { MultiInputMask } from '../../../../components/input-masked';
 import { HelpButton } from '../../../../components';
+import useErrorMessage from '../../hooks/useErrorMessage';
 function Expiry(props) {
   var _value$substring;
   const sharedContext = useContext(SharedContext);
   const translations = sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.Forms;
   const placeholders = sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.DatePicker.placeholder_characters;
-  const errorMessages = useMemo(() => _objectSpread({
+  const errorMessages = useErrorMessage(props.path, props.errorMessages, {
     required: translations.dateErrorRequired
-  }, props.errorMessages), [translations, props.errorMessages]);
+  });
   const validateRequired = useCallback((value, {
     required,
     error
@@ -33,63 +33,65 @@ function Expiry(props) {
     validateRequired
   });
   const {
-    id: propsId,
+    id,
     className,
     label = translations.expiryLabel,
     error,
+    hasError,
     info,
     warning,
     help,
     disabled,
     value = '',
+    labelDescription,
     layout = 'vertical',
-    required,
+    ariaAttributes,
     handleFocus,
     handleBlur,
     handleChange
-  } = useDataValue(_objectSpread({}, preparedProps));
+  } = useDataValue(preparedProps);
   const expiry = {
     month: ensureValidMonth(value === null || value === void 0 ? void 0 : value.substring(0, 2)),
     year: (_value$substring = value === null || value === void 0 ? void 0 : value.substring(2, 4)) !== null && _value$substring !== void 0 ? _value$substring : ''
   };
-  const idRef = useRef(propsId || makeUniqueId()).current;
-  const status = error ? 'error' : warning ? 'warn' : info ? 'info' : null;
+  const status = hasError ? 'error' : warning ? 'warn' : info ? 'info' : null;
   return React.createElement(FieldBlock, _extends({
     className: classnames('dnb-forms-field-expiry', className),
+    forId: `${id}-input-month`,
+    label: label,
+    layout: layout,
+    labelDescription: labelDescription,
     info: info,
     warning: warning,
     error: error
   }, pickSpacingProps(props)), React.createElement(MultiInputMask, {
     stretch: true,
-    id: `${idRef}__input`,
-    label: label,
-    labelDirection: layout,
+    id: `${id}-input`,
     values: expiry,
     status: status,
     statusState: disabled ? 'disabled' : undefined,
     disabled: disabled,
-    required: required,
     onChange: handleChange,
     onBlur: handleBlur,
     onFocus: handleFocus,
     delimiter: "/",
     inputMode: "numeric",
-    inputs: [{
+    inputs: [_objectSpread({
       id: 'month',
       label: sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.DatePicker['month'],
       mask: getMonthMask(expiry === null || expiry === void 0 ? void 0 : expiry.month),
       placeholderCharacter: placeholders['month'],
       autoComplete: 'cc-exp-month'
-    }, {
+    }, ariaAttributes), _objectSpread({
       id: 'year',
       label: sharedContext === null || sharedContext === void 0 ? void 0 : sharedContext.translation.DatePicker['year'],
       mask: [/[0-9]/, /[0-9]/],
       placeholderCharacter: placeholders['year'],
       autoComplete: 'cc-exp-year'
-    }],
+    }, ariaAttributes)],
     suffix: help ? React.createElement(HelpButton, {
       title: help.title
-    }, help.contents) : undefined
+    }, help.content) : undefined
   }));
   function toExpiryString(values) {
     return Object.values(values).join('');

package/es/extensions/forms/Field/Expiry/Expiry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Expiry.js","names":["React","useCallback","useContext","useMemo","useRef","makeUniqueId","SharedContext","pickSpacingProps","useDataValue","classnames","FieldBlock","MultiInputMask","HelpButton","Expiry","props","_value$substring","sharedContext","translations","translation","Forms","placeholders","DatePicker","placeholder_characters","errorMessages","_objectSpread","required","dateErrorRequired","validateRequired","value","error","undefined","preparedProps","fromInput","toExpiryString","id","propsId","className","label","expiryLabel","info","warning","help","disabled","layout","handleFocus","handleBlur","handleChange","expiry","month","ensureValidMonth","substring","year","idRef","current","status","createElement","_extends","stretch","labelDirection","values","statusState","onChange","onBlur","onFocus","delimiter","inputMode","inputs","mask","getMonthMask","placeholderCharacter","autoComplete","suffix","title","contents","Object","join","firstMask","secondMask","firstDigit","charAt","isFirstDigitValid","test","seconDigit","isSecondDigitValid","_supportsEufemiaSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Expiry/Expiry.tsx"],"sourcesContent":["import React, { useCallback, useContext, useMemo, useRef } from 'react'\nimport { makeUniqueId } from '../../../../shared/component-helper'\nimport SharedContext from '../../../../shared/Context'\nimport { FieldHelpProps, FieldProps } from '../../types'\nimport { pickSpacingProps } from '../../../../components/flex/utils'\nimport { useDataValue } from '../../hooks'\nimport classnames from 'classnames'\nimport FieldBlock from '../../FieldBlock'\nimport { MultiInputMask } from '../../../../components/input-masked'\nimport type { MultiInputMaskValue } from '../../../../components/input-masked'\nimport { HelpButton } from '../../../../components'\n\ntype ExpiryValue = MultiInputMaskValue<'month' | 'year'>\n\nexport type ExpiryProps = FieldHelpProps & FieldProps<string>\n\nfunction Expiry(props: ExpiryProps) {\n  const sharedContext = useContext(SharedContext)\n  const translations = sharedContext?.translation.Forms\n  const placeholders =\n    sharedContext?.translation.DatePicker.placeholder_characters\n\n  const errorMessages = useMemo(\n    () => ({\n      required: translations.dateErrorRequired,\n      ...props.errorMessages,\n    }),\n    [translations, props.errorMessages]\n  )\n\n  const validateRequired = useCallback(\n    (value: string, { required, error }) => {\n      return required && !value ? error : undefined\n    },\n    []\n  )\n\n  const preparedProps: ExpiryProps = {\n    ...props,\n    errorMessages,\n    fromInput: toExpiryString,\n    validateRequired,\n  }\n\n  const {\n    id: propsId,\n    className,\n    label = translations.expiryLabel,\n    error,\n    info,\n    warning,\n    help,\n    disabled,\n    value = '',\n    layout = 'vertical',\n    required,\n    handleFocus,\n    handleBlur,\n    handleChange,\n  } = useDataValue({\n    ...preparedProps,\n  })\n\n  const expiry: ExpiryValue = {\n    month: ensureValidMonth(value?.substring(0, 2)),\n    year: value?.substring(2, 4) ?? '',\n  }\n\n  const idRef = useRef(propsId || makeUniqueId()).current\n\n  const status = error ? 'error' : warning ? 'warn' : info ? 'info' : null\n\n  return (\n    <FieldBlock\n      className={classnames('dnb-forms-field-expiry', className)}\n      info={info}\n      warning={warning}\n      error={error}\n      {...pickSpacingProps(props)}\n    >\n      <MultiInputMask\n        stretch\n        id={`${idRef}__input`}\n        label={label}\n        labelDirection={layout}\n        values={expiry}\n        status={status}\n        statusState={disabled ? 'disabled' : undefined}\n        disabled={disabled}\n        required={required}\n        onChange={handleChange}\n        onBlur={handleBlur}\n        onFocus={handleFocus}\n        delimiter=\"/\"\n        inputMode=\"numeric\"\n        inputs={[\n          {\n            id: 'month',\n            label: sharedContext?.translation.DatePicker['month'],\n            mask: getMonthMask(expiry?.month),\n            placeholderCharacter: placeholders['month'],\n            autoComplete: 'cc-exp-month',\n          },\n          {\n            id: 'year',\n            label: sharedContext?.translation.DatePicker['year'],\n            mask: [/[0-9]/, /[0-9]/],\n            placeholderCharacter: placeholders['year'],\n            autoComplete: 'cc-exp-year',\n          },\n        ]}\n        suffix={\n          help ? (\n            <HelpButton title={help.title}>{help.contents}</HelpButton>\n          ) : undefined\n        }\n      />\n    </FieldBlock>\n  )\n\n  function toExpiryString(values: ExpiryValue) {\n    return Object.values(values).join('')\n  }\n\n  function ensureValidMonth(month: string) {\n    // Return empty value if no month is given\n    if (!month) {\n      return ''\n    }\n\n    const [firstMask, secondMask] = getMonthMask(month)\n\n    const firstDigit = month?.charAt(0)\n    const isFirstDigitValid = firstMask.test(firstDigit)\n\n    if (firstDigit && !isFirstDigitValid) {\n      // Return empty value if the first digit is invalid\n      return ''\n    }\n\n    const seconDigit = month?.charAt(1)\n    const isSecondDigitValid = secondMask.test(seconDigit)\n\n    if (seconDigit && !isSecondDigitValid) {\n      // Return empty value if the second digit is invalid\n      return ''\n    }\n\n    // Return given month of month value is valid\n    return month\n  }\n\n  function getMonthMask(month: string) {\n    const firstDigit = month?.charAt(0)\n\n    return [\n      /[0-1]/,\n      firstDigit === '0' || firstDigit === '' ? /[1-9]/ : /[0-2]/,\n    ]\n  }\n}\n\nExpiry._supportsEufemiaSpacingProps = true\nexport default Expiry\n"],"mappings":"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"}
+{"version":3,"file":"Expiry.js","names":["React","useCallback","useContext","SharedContext","pickSpacingProps","useDataValue","classnames","FieldBlock","MultiInputMask","HelpButton","useErrorMessage","Expiry","props","_value$substring","sharedContext","translations","translation","Forms","placeholders","DatePicker","placeholder_characters","errorMessages","path","required","dateErrorRequired","validateRequired","value","error","undefined","preparedProps","_objectSpread","fromInput","toExpiryString","id","className","label","expiryLabel","hasError","info","warning","help","disabled","labelDescription","layout","ariaAttributes","handleFocus","handleBlur","handleChange","expiry","month","ensureValidMonth","substring","year","status","createElement","_extends","forId","stretch","values","statusState","onChange","onBlur","onFocus","delimiter","inputMode","inputs","mask","getMonthMask","placeholderCharacter","autoComplete","suffix","title","content","Object","join","firstMask","secondMask","firstDigit","charAt","isFirstDigitValid","test","seconDigit","isSecondDigitValid","_supportsEufemiaSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/Expiry/Expiry.tsx"],"sourcesContent":["import React, { useCallback, useContext } from 'react'\nimport SharedContext from '../../../../shared/Context'\nimport { FieldHelpProps, FieldProps } from '../../types'\nimport { pickSpacingProps } from '../../../../components/flex/utils'\nimport { useDataValue } from '../../hooks'\nimport classnames from 'classnames'\nimport FieldBlock from '../../FieldBlock'\nimport { MultiInputMask } from '../../../../components/input-masked'\nimport type { MultiInputMaskValue } from '../../../../components/input-masked'\nimport { HelpButton } from '../../../../components'\nimport useErrorMessage from '../../hooks/useErrorMessage'\n\ntype ExpiryValue = MultiInputMaskValue<'month' | 'year'>\n\nexport type ExpiryProps = FieldHelpProps & FieldProps<string>\n\nfunction Expiry(props: ExpiryProps) {\n  const sharedContext = useContext(SharedContext)\n  const translations = sharedContext?.translation.Forms\n  const placeholders =\n    sharedContext?.translation.DatePicker.placeholder_characters\n\n  const errorMessages = useErrorMessage(props.path, props.errorMessages, {\n    required: translations.dateErrorRequired,\n  })\n\n  const validateRequired = useCallback(\n    (value: string, { required, error }) => {\n      return required && !value ? error : undefined\n    },\n    []\n  )\n\n  const preparedProps: ExpiryProps = {\n    ...props,\n    errorMessages,\n    fromInput: toExpiryString,\n    validateRequired,\n  }\n\n  const {\n    id,\n    className,\n    label = translations.expiryLabel,\n    error,\n    hasError,\n    info,\n    warning,\n    help,\n    disabled,\n    value = '',\n    labelDescription,\n    layout = 'vertical',\n    ariaAttributes,\n    handleFocus,\n    handleBlur,\n    handleChange,\n  } = useDataValue(preparedProps)\n\n  const expiry: ExpiryValue = {\n    month: ensureValidMonth(value?.substring(0, 2)),\n    year: value?.substring(2, 4) ?? '',\n  }\n\n  const status = hasError\n    ? 'error'\n    : warning\n    ? 'warn'\n    : info\n    ? 'info'\n    : null\n\n  return (\n    <FieldBlock\n      className={classnames('dnb-forms-field-expiry', className)}\n      forId={`${id}-input-month`}\n      label={label}\n      layout={layout}\n      labelDescription={labelDescription}\n      info={info}\n      warning={warning}\n      error={error}\n      {...pickSpacingProps(props)}\n    >\n      <MultiInputMask\n        stretch\n        id={`${id}-input`}\n        values={expiry}\n        status={status}\n        statusState={disabled ? 'disabled' : undefined}\n        disabled={disabled}\n        onChange={handleChange}\n        onBlur={handleBlur}\n        onFocus={handleFocus}\n        delimiter=\"/\"\n        inputMode=\"numeric\"\n        inputs={[\n          {\n            id: 'month',\n            label: sharedContext?.translation.DatePicker['month'],\n            mask: getMonthMask(expiry?.month),\n            placeholderCharacter: placeholders['month'],\n            autoComplete: 'cc-exp-month',\n            ...ariaAttributes,\n          },\n          {\n            id: 'year',\n            label: sharedContext?.translation.DatePicker['year'],\n            mask: [/[0-9]/, /[0-9]/],\n            placeholderCharacter: placeholders['year'],\n            autoComplete: 'cc-exp-year',\n            ...ariaAttributes,\n          },\n        ]}\n        suffix={\n          help ? (\n            <HelpButton title={help.title}>{help.content}</HelpButton>\n          ) : undefined\n        }\n      />\n    </FieldBlock>\n  )\n\n  function toExpiryString(values: ExpiryValue) {\n    return Object.values(values).join('')\n  }\n\n  function ensureValidMonth(month: string) {\n    // Return empty value if no month is given\n    if (!month) {\n      return ''\n    }\n\n    const [firstMask, secondMask] = getMonthMask(month)\n\n    const firstDigit = month?.charAt(0)\n    const isFirstDigitValid = firstMask.test(firstDigit)\n\n    if (firstDigit && !isFirstDigitValid) {\n      // Return empty value if the first digit is invalid\n      return ''\n    }\n\n    const seconDigit = month?.charAt(1)\n    const isSecondDigitValid = secondMask.test(seconDigit)\n\n    if (seconDigit && !isSecondDigitValid) {\n      // Return empty value if the second digit is invalid\n      return ''\n    }\n\n    // Return given month of month value is valid\n    return month\n  }\n\n  function getMonthMask(month: string) {\n    const firstDigit = month?.charAt(0)\n\n    return [\n      /[0-1]/,\n      firstDigit === '0' || firstDigit === '' ? /[1-9]/ : /[0-2]/,\n    ]\n  }\n}\n\nExpiry._supportsEufemiaSpacingProps = true\nexport default Expiry\n"],"mappings":"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"}

package/es/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.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 & {
     omitMask?: boolean;
     validate?: boolean;
 };

package/es/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.js

@@ -4,8 +4,9 @@ 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';
+import useErrorMessage from '../../hooks/useErrorMessage';
 function NationalIdentityNumber(props) {
   var _props$pattern, _props$label, _props$width;
   const sharedContext = useContext(SharedContext);
@@ -15,12 +16,12 @@ function NationalIdentityNumber(props) {
     validate = true,
     omitMask
   } = props;
-  const errorMessages = useMemo(() => _objectSpread({
+  const errorMessages = useErrorMessage(props.path, props.errorMessages, {
     required: errorMessage,
     pattern: errorMessage
-  }, props.errorMessages), [errorMessage, props.errorMessages]);
+  });
   const mask = useMemo(() => omitMask ? Array(11).fill(/\d/) : [/\d/, /\d/, /\d/, /\d/, /\d/, /\d/, ' ', /\d/, /\d/, /\d/, /\d/, /\d/], [omitMask]);
-  const stringComponentProps = _objectSpread(_objectSpread({}, props), {}, {
+  const StringFieldProps = _objectSpread(_objectSpread({}, props), {}, {
     pattern: (_props$pattern = props.pattern) !== null && _props$pattern !== void 0 ? _props$pattern : validate && !props.validator ? '^[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.nationalIdentityNumberLabel,
     errorMessages,
@@ -28,7 +29,7 @@ function NationalIdentityNumber(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);
 }
 NationalIdentityNumber._supportsSpacingProps = true;
 export default NationalIdentityNumber;

package/es/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.js.map

@@ -1 +1 @@
-{"version":3,"file":"NationalIdentityNumber.js","names":["React","useContext","useMemo","StringComponent","SharedContext","NationalIdentityNumber","props","_props$pattern","_props$label","_props$width","sharedContext","tr","translation","Forms","errorMessage","nationalIdentityNumberErrorRequired","validate","omitMask","errorMessages","_objectSpread","required","pattern","mask","Array","fill","stringComponentProps","validator","undefined","label","nationalIdentityNumberLabel","width","inputMode","createElement","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.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  omitMask?: boolean\n  validate?: boolean\n}\n\nfunction NationalIdentityNumber(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n  const errorMessage = tr.nationalIdentityNumberErrorRequired\n\n  const { validate = true, omitMask } = props\n\n  const errorMessages = useMemo(\n    () => ({\n      required: errorMessage,\n      pattern: errorMessage,\n      ...props.errorMessages,\n    }),\n    [errorMessage, props.errorMessages]\n  )\n  const mask = useMemo(\n    () =>\n      omitMask\n        ? Array(11).fill(/\\d/)\n        : [\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\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    pattern:\n      props.pattern ??\n      (validate && !props.validator ? '^[0-9]{11}$' : undefined),\n    label:\n      props.label ??\n      sharedContext?.translation.Forms.nationalIdentityNumberLabel,\n    errorMessages,\n    mask,\n    width: props.width ?? 'medium',\n    inputMode: 'numeric',\n  }\n\n  return <StringComponent {...stringComponentProps} />\n}\n\nNationalIdentityNumber._supportsSpacingProps = true\nexport default NationalIdentityNumber\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,OAAOC,eAAe,MAAyC,WAAW;AAC1E,OAAOC,aAAa,MAAM,4BAA4B;AAOtD,SAASC,sBAAsBA,CAACC,KAAY,EAAE;EAAA,IAAAC,cAAA,EAAAC,YAAA,EAAAC,YAAA;EAC5C,MAAMC,aAAa,GAAGT,UAAU,CAACG,aAAa,CAAC;EAC/C,MAAMO,EAAE,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK;EAC3C,MAAMC,YAAY,GAAGH,EAAE,CAACI,mCAAmC;EAE3D,MAAM;IAAEC,QAAQ,GAAG,IAAI;IAAEC;EAAS,CAAC,GAAGX,KAAK;EAE3C,MAAMY,aAAa,GAAGhB,OAAO,CAC3B,MAAAiB,aAAA;IACEC,QAAQ,EAAEN,YAAY;IACtBO,OAAO,EAAEP;EAAY,GAClBR,KAAK,CAACY,aAAa,CACtB,EACF,CAACJ,YAAY,EAAER,KAAK,CAACY,aAAa,CACpC,CAAC;EACD,MAAMI,IAAI,GAAGpB,OAAO,CAClB,MACEe,QAAQ,GACJM,KAAK,CAAC,EAAE,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC,GACpB,CACE,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,EACP,CAACP,QAAQ,CACX,CAAC;EAED,MAAMQ,oBAA2B,GAAAN,aAAA,CAAAA,aAAA,KAC5Bb,KAAK;IACRe,OAAO,GAAAd,cAAA,GACLD,KAAK,CAACe,OAAO,cAAAd,cAAA,cAAAA,cAAA,GACZS,QAAQ,IAAI,CAACV,KAAK,CAACoB,SAAS,GAAG,aAAa,GAAGC,SAAU;IAC5DC,KAAK,GAAApB,YAAA,GACHF,KAAK,CAACsB,KAAK,cAAApB,YAAA,cAAAA,YAAA,GACXE,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK,CAACgB,2BAA2B;IAC9DX,aAAa;IACbI,IAAI;IACJQ,KAAK,GAAArB,YAAA,GAAEH,KAAK,CAACwB,KAAK,cAAArB,YAAA,cAAAA,YAAA,GAAI,QAAQ;IAC9BsB,SAAS,EAAE;EAAS,EACrB;EAED,OAAO/B,KAAA,CAAAgC,aAAA,CAAC7B,eAAe,EAAKsB,oBAAuB,CAAC;AACtD;AAEApB,sBAAsB,CAAC4B,qBAAqB,GAAG,IAAI;AACnD,eAAe5B,sBAAsB"}
+{"version":3,"file":"NationalIdentityNumber.js","names":["React","useContext","useMemo","StringField","SharedContext","useErrorMessage","NationalIdentityNumber","props","_props$pattern","_props$label","_props$width","sharedContext","tr","translation","Forms","errorMessage","nationalIdentityNumberErrorRequired","validate","omitMask","errorMessages","path","required","pattern","mask","Array","fill","StringFieldProps","_objectSpread","validator","undefined","label","nationalIdentityNumberLabel","width","inputMode","createElement","_supportsSpacingProps"],"sources":["../../../../../../src/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.tsx"],"sourcesContent":["import React, { useContext, useMemo } from 'react'\nimport StringField, { Props as StringFieldProps } from '../String'\n\nimport SharedContext from '../../../../shared/Context'\nimport useErrorMessage from '../../hooks/useErrorMessage'\n\nexport type Props = StringFieldProps & {\n  omitMask?: boolean\n  validate?: boolean\n}\n\nfunction NationalIdentityNumber(props: Props) {\n  const sharedContext = useContext(SharedContext)\n  const tr = sharedContext?.translation.Forms\n  const errorMessage = tr.nationalIdentityNumberErrorRequired\n\n  const { validate = true, omitMask } = props\n\n  const errorMessages = useErrorMessage(props.path, props.errorMessages, {\n    required: errorMessage,\n    pattern: errorMessage,\n  })\n\n  const mask = useMemo(\n    () =>\n      omitMask\n        ? Array(11).fill(/\\d/)\n        : [\n            /\\d/,\n            /\\d/,\n            /\\d/,\n            /\\d/,\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    pattern:\n      props.pattern ??\n      (validate && !props.validator ? '^[0-9]{11}$' : undefined),\n    label:\n      props.label ??\n      sharedContext?.translation.Forms.nationalIdentityNumberLabel,\n    errorMessages,\n    mask,\n    width: props.width ?? 'medium',\n    inputMode: 'numeric',\n  }\n\n  return <StringField {...StringFieldProps} />\n}\n\nNationalIdentityNumber._supportsSpacingProps = true\nexport default NationalIdentityNumber\n"],"mappings":";;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,OAAOC,WAAW,MAAqC,WAAW;AAElE,OAAOC,aAAa,MAAM,4BAA4B;AACtD,OAAOC,eAAe,MAAM,6BAA6B;AAOzD,SAASC,sBAAsBA,CAACC,KAAY,EAAE;EAAA,IAAAC,cAAA,EAAAC,YAAA,EAAAC,YAAA;EAC5C,MAAMC,aAAa,GAAGV,UAAU,CAACG,aAAa,CAAC;EAC/C,MAAMQ,EAAE,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK;EAC3C,MAAMC,YAAY,GAAGH,EAAE,CAACI,mCAAmC;EAE3D,MAAM;IAAEC,QAAQ,GAAG,IAAI;IAAEC;EAAS,CAAC,GAAGX,KAAK;EAE3C,MAAMY,aAAa,GAAGd,eAAe,CAACE,KAAK,CAACa,IAAI,EAAEb,KAAK,CAACY,aAAa,EAAE;IACrEE,QAAQ,EAAEN,YAAY;IACtBO,OAAO,EAAEP;EACX,CAAC,CAAC;EAEF,MAAMQ,IAAI,GAAGrB,OAAO,CAClB,MACEgB,QAAQ,GACJM,KAAK,CAAC,EAAE,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC,GACpB,CACE,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,EACP,CAACP,QAAQ,CACX,CAAC;EAED,MAAMQ,gBAAuB,GAAAC,aAAA,CAAAA,aAAA,KACxBpB,KAAK;IACRe,OAAO,GAAAd,cAAA,GACLD,KAAK,CAACe,OAAO,cAAAd,cAAA,cAAAA,cAAA,GACZS,QAAQ,IAAI,CAACV,KAAK,CAACqB,SAAS,GAAG,aAAa,GAAGC,SAAU;IAC5DC,KAAK,GAAArB,YAAA,GACHF,KAAK,CAACuB,KAAK,cAAArB,YAAA,cAAAA,YAAA,GACXE,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEE,WAAW,CAACC,KAAK,CAACiB,2BAA2B;IAC9DZ,aAAa;IACbI,IAAI;IACJS,KAAK,GAAAtB,YAAA,GAAEH,KAAK,CAACyB,KAAK,cAAAtB,YAAA,cAAAA,YAAA,GAAI,QAAQ;IAC9BuB,SAAS,EAAE;EAAS,EACrB;EAED,OAAOjC,KAAA,CAAAkC,aAAA,CAAC/B,WAAW,EAAKuB,gBAAmB,CAAC;AAC9C;AAEApB,sBAAsB,CAAC6B,qBAAqB,GAAG,IAAI;AACnD,eAAe7B,sBAAsB"}

package/es/extensions/forms/Field/Number/Number.d.ts

@@ -1,7 +1,7 @@
 import { InputMaskedProps } from '../../../../components/InputMasked';
 import type { InputAlign, InputSize } from '../../../../components/Input';
-import { FieldProps, FieldHelpProps } from '../../types';
-interface ErrorMessages {
+import { FieldProps, FieldHelpProps, CustomErrorMessages } from '../../types';
+interface ErrorMessages extends CustomErrorMessages {
     required?: string;
     schema?: string;
     minimum?: string;
@@ -16,8 +16,6 @@ export type Props = FieldHelpProps & FieldProps<number, undefined, ErrorMessages
     percent?: InputMaskedProps['as_percent'];
     mask?: InputMaskedProps['mask'];
     step?: number;
-    thousandSeparator?: string | true;
-    decimalSymbol?: string;
     decimalLimit?: number;
     prefix?: string;
     suffix?: string;

package/es/extensions/forms/Field/Number/Number.js

@@ -12,6 +12,7 @@ import FieldBlock from '../../FieldBlock';
 import { useDataValue } from '../../hooks';
 import { pickSpacingProps } from '../../../../components/flex/utils';
 import { clamp } from '../../../../components/slider/SliderHelpers';
+import useErrorMessage from '../../hooks/useErrorMessage';
 function NumberComponent(props) {
   var _props$width, _sharedContext$transl, _sharedContext$transl2;
   const sharedContext = useContext(SharedContext);
@@ -21,21 +22,19 @@ function NumberComponent(props) {
     percent,
     mask,
     step = 1,
-    thousandSeparator,
-    decimalSymbol,
     decimalLimit = 12,
     prefix,
     suffix,
     showStepControls
   } = props;
-  const errorMessages = useMemo(() => _objectSpread({
+  const errorMessages = useErrorMessage(props.path, props.errorMessages, {
     required: tr.inputErrorRequired,
     minimum: tr.numberFieldErrorMinimum,
     maximum: tr.numberFieldErrorMaximum,
     exclusiveMinimum: tr.numberFieldErrorExclusiveMinimum,
     exclusiveMaximum: tr.numberFieldErrorExclusiveMaximum,
     multipleOf: tr.numberFieldErrorMultipleOf
-  }, props.errorMessages), [tr, props.errorMessages]);
+  });
   const schema = useMemo(() => {
     var _props$schema;
     return (_props$schema = props.schema) !== null && _props$schema !== void 0 ? _props$schema : {
@@ -69,29 +68,29 @@ function NumberComponent(props) {
     return value;
   }, []);
   const maskProps = useMemo(() => {
+    const mask_options = {
+      prefix,
+      suffix,
+      decimalLimit
+    };
     if (currency) {
       return {
-        as_currency: currency
+        as_currency: currency,
+        mask_options
       };
     }
     if (percent) {
       return {
-        as_percent: percent
+        as_percent: percent,
+        mask_options
       };
     }
     return {
       as_number: true,
       mask,
-      number_mask: {
-        decimalLimit,
-        decimalSymbol,
-        includeThousandsSeparator: thousandSeparator !== undefined,
-        thousandsSeparatorSymbol: thousandSeparator === true ? ' ' : thousandSeparator,
-        prefix,
-        suffix
-      }
+      number_mask: _objectSpread({}, mask_options)
     };
-  }, [currency, percent, mask, decimalLimit, decimalSymbol, thousandSeparator, prefix, suffix]);
+  }, [currency, decimalLimit, mask, percent, prefix, suffix]);
   const preparedProps = _objectSpread(_objectSpread({}, props), {}, {
     errorMessages,
     schema,
@@ -109,13 +108,16 @@ function NumberComponent(props) {
     layout,
     placeholder,
     label,
+    labelDescription,
     value,
     minimum = Number.MIN_SAFE_INTEGER,
     maximum = Number.MAX_SAFE_INTEGER,
     disabled,
+    ariaAttributes,
     info,
     warning,
     error,
+    hasError,
     help,
     size,
     width,
@@ -150,23 +152,24 @@ function NumberComponent(props) {
   }, [handleChange, maximum, minimum, showStepControls, step, value]);
   const fieldBlockProps = _objectSpread({
     className: classnames('dnb-forms-field-number', className),
-    contentClassName: classnames('dnb-forms-field-number__contents', showStepControls && 'dnb-forms-field-number__contents--has-controls', disabled && 'dnb-forms-field-number__contents--is-disabled', error && 'dnb-forms-field-number__contents--has-error'),
+    contentClassName: classnames('dnb-forms-field-number__contents', showStepControls && 'dnb-forms-field-number__contents--has-controls', disabled && 'dnb-forms-field-number__contents--is-disabled', hasError && 'dnb-forms-field-number__contents--has-error'),
     forId: id,
     layout,
     label,
+    labelDescription,
     info,
     warning,
     error,
     disabled,
     width: width === 'stretch' ? width : undefined,
-    contentsWidth: width !== false ? width : undefined
+    contentWidth: width !== false ? width : undefined
   }, pickSpacingProps(props));
   const increaseProps = showStepControls && {
     'aria-hidden': true,
     className: 'dnb-button--control-after',
     variant: 'secondary',
     icon: 'add',
-    size: convertInputSizeToButtonSize(size),
+    size: size || 'small',
     tabIndex: -1,
     disabled: disabled || value >= maximum,
     onClick: () => {
@@ -179,6 +182,7 @@ function NumberComponent(props) {
   const decreaseProps = showStepControls && _objectSpread(_objectSpread({}, increaseProps), {}, {
     className: 'dnb-button--control-before',
     icon: 'subtract',
+    size: size || 'small',
     disabled: disabled || value <= minimum,
     onClick: () => {
       handleChange({
@@ -194,7 +198,7 @@ function NumberComponent(props) {
     'aria-valuenow': String(value),
     'aria-valuetext': String(value)
   };
-  const inputProps = _objectSpread(_objectSpread({
+  const inputProps = _objectSpread(_objectSpread(_objectSpread({
     id,
     name,
     autoComplete,
@@ -208,23 +212,20 @@ function NumberComponent(props) {
     onFocus: handleFocus,
     onBlur: handleBlur,
     onChange: handleChange,
-    disabled,
-    status: error ? 'error' : undefined,
+    disabled
+  }, ariaAttributes), {}, {
+    status: hasError ? 'error' : undefined,
     stretch: width !== undefined,
     suffix: help && !showStepControls ? React.createElement(HelpButton, {
       title: help.title
-    }, help.contents) : undefined
+    }, help.content) : undefined
   }, ariaParams);
   return React.createElement(FieldBlock, _extends({}, fieldBlockProps, {
     asFieldset: false
   }), showStepControls && React.createElement(Button, decreaseProps), React.createElement(InputMasked, inputProps), showStepControls && React.createElement(Button, increaseProps), help && showStepControls && React.createElement(HelpButton, {
     title: help.title
-  }, help.contents));
+  }, help.content));
 }
-const convertInputSizeToButtonSize = inputSize => {
-  const buttonSize = ['small', 'medium', 'large'].indexOf(inputSize) > -1 ? inputSize : 'medium';
-  return buttonSize;
-};
 NumberComponent._supportsSpacingProps = true;
 export default NumberComponent;
 //# sourceMappingURL=Number.js.map