@dnb/eufemia 9.17.0 → 9.19.0

package/es/components/input-masked/InputMaskedHooks.js

@@ -11,7 +11,6 @@ import React from 'react';
 import classnames from 'classnames';
 import { cleanNumber, getCurrencySymbol } from '../number-format/NumberUtils';
 import { isTrue, dispatchCustomElementEvent } from '../../shared/component-helper';
-import Context from '../../shared/Context';
 import TextMask from './TextMask';
 import createNumberMask from './addons/createNumberMask';
 import keycode from 'keycode';
@@ -55,9 +54,9 @@ export const useInputElementRef = () => {
 };
 export const useLocale = () => {
   const {
-    props
+    props,
+    context
   } = React.useContext(InputMaskedContext);
-  const context = React.useContext(Context);
   let {
     locale
   } = props;
@@ -70,23 +69,21 @@ export const useLocale = () => {
 };
 export const useLocalValue = () => {
   const {
-    props
+    props,
+    context
   } = React.useContext(InputMaskedContext);
-  const context = React.useContext(Context);
-  const maskParams = useNumberMaskParams();
+  const maskParams = useNumberMaskParams() || {};
   const locale = useLocale();
   const [localValue, setLocalValue] = React.useState(() => correctNumberValue({
-    props,
-    context,
     locale,
+    props,
     maskParams
   }));
   React.useEffect(() => {
     const value = correctNumberValue({
       localValue,
-      props,
-      context,
       locale,
+      props,
       maskParams
     });
     setLocalValue(value);
@@ -98,8 +95,11 @@ export const useLocalValue = () => {
 };
 export const useNumberMask = () => {
   const maskParams = useNumberMaskParams();
+  const {
+    props
+  } = React.useContext(InputMaskedContext);
 
-  if (!maskParams) {
+  if (!maskParams || !isRequestingNumberMask(props)) {
     return null;
   }
 
@@ -107,7 +107,7 @@ export const useNumberMask = () => {
   mask.maskParams = maskParams;
   return mask;
 };
-export const useInternalMask = () => {
+export const useMask = () => {
   const {
     props
   } = React.useContext(InputMaskedContext);
@@ -130,7 +130,7 @@ export const useMaskParams = () => {
     placeholder_char,
     placeholder
   } = props;
-  const mask = useInternalMask();
+  const mask = useMask();
   const maskParams = useNumberMaskParams() || {};
   maskParams.showMask = !placeholder && isTrue(show_mask);
   maskParams.placeholderChar = placeholder_char;
@@ -159,7 +159,7 @@ export const useInputElement = () => {
   const {
     pipe
   } = props;
-  const mask = useInternalMask();
+  const mask = useMask();
   const {
     showMask,
     showGuide,
@@ -203,14 +203,19 @@ export const useEventMapping = ({
     onBeforeInput: event => callEvent({
       event
     }, 'on_before_input'),
+    onFocus: params => callEvent(params, 'on_focus'),
+    onBlur: params => callEvent(params, 'on_blur'),
     onMouseUp: event => callEvent({
       event
     }, 'on_mouse_up'),
-    on_focus: params => callEvent(params, 'on_focus'),
-    on_key_down: params => callEvent(params, 'on_key_down'),
-    on_submit: params => callEvent(params, 'on_submit'),
-    on_blur: params => callEvent(params, 'on_blur'),
-    on_change: params => callEvent(params, 'on_change')
+    onKeyDown: params => callEvent(params, 'on_key_down'),
+    onSubmit: params => callEvent(params, 'on_submit'),
+    onChange: params => callEvent(params, 'on_change'),
+    on_focus: undefined,
+    on_blur: undefined,
+    on_key_down: undefined,
+    on_submit: undefined,
+    on_change: undefined
   };
 };
 
@@ -221,11 +226,7 @@ const useCallEvent = ({
     props
   } = React.useContext(InputMaskedContext);
   const maskParams = useMaskParams();
-
-  if (!maskParams) {
-    return () => {};
-  }
-
+  const isNumberMask = useNumberMask();
   const decimalSeparators = /[,.'·]/;
   let isUnidentified = false;
 
@@ -247,16 +248,15 @@ const useCallEvent = ({
       isUnidentified = false;
     }
 
-    if (name === 'on_key_down' && !isUnidentified && !(maskParams !== null && maskParams !== void 0 && maskParams.allowLeadingZeroes) && (keyCode === '0' || value.replace(/[^\d]/g, '') === '' && decimalSeparators.test(keyCode))) {
+    if (name === 'on_key_down' && !isUnidentified && (isNumberMask && !(maskParams !== null && maskParams !== void 0 && maskParams.allowLeadingZeroes) || !isNumberMask && (maskParams === null || maskParams === void 0 ? void 0 : maskParams.allowLeadingZeroes) === false) && (keyCode === '0' || keyCode === 'numpad 0' || value.replace(/[^\d]/g, '') === '' && decimalSeparators.test(keyCode))) {
       const testValue = (value.slice(0, selStart) + '0' + value.slice(selStart + 1, value.length)).replace(/[^\d]/g, '');
 
       if (/^0/.test(testValue)) {
         event.preventDefault();
-        return;
       }
     }
 
-    if (name === 'on_key_down' && !isUnidentified && maskParams !== null && maskParams !== void 0 && maskParams.decimalSymbol) {
+    if (name === 'on_key_down' && isNumberMask && !isUnidentified && maskParams !== null && maskParams !== void 0 && maskParams.decimalSymbol) {
       const hasDecimalSymbol = value.includes(maskParams.decimalSymbol);
       const allowedDecimals = maskParams.decimalLimit > 0 || maskParams.allowDecimal !== false;
 
@@ -333,11 +333,10 @@ const useNumberMaskParams = () => {
   const {
     props
   } = React.useContext(InputMaskedContext);
-  const context = React.useContext(Context);
   const locale = useLocale();
 
   if (!isRequestingNumberMask(props)) {
-    return null;
+    return _objectSpread({}, fromJSON(props.mask_options));
   }
 
   let {
@@ -382,7 +381,6 @@ const useNumberMaskParams = () => {
 
   if (number_mask) {
     maskParams = handleNumberMask({
-      context,
       mask_options,
       number_mask
     });
@@ -396,7 +394,6 @@ const useNumberMaskParams = () => {
     }
   } else if (currency_mask) {
     maskParams = handleCurrencyMask({
-      context,
       mask_options,
       currency_mask
     });

package/es/components/input-masked/InputMaskedUtils.js

@@ -19,12 +19,9 @@ export const isRequestingNumberMask = props => {
 export const correctNumberValue = ({
   localValue = null,
   props,
-  context,
   locale,
   maskParams
 }) => {
-  var _context$InputMasked;
-
   let value = String(props.value);
 
   if (isNaN(parseFloat(value))) {
@@ -41,13 +38,11 @@ export const correctNumberValue = ({
     }
   }
 
-  const numberFormatFromContext = context === null || context === void 0 ? void 0 : (_context$InputMasked = context.InputMasked) === null || _context$InputMasked === void 0 ? void 0 : _context$InputMasked.number_format;
-
-  if (props.number_format || numberFormatFromContext) {
-    const options = _objectSpread(_objectSpread({
+  if (props.number_format) {
+    const options = _objectSpread({
       locale,
       decimals: 0
-    }, fromJSON(props.number_format)), numberFormatFromContext);
+    }, props.number_format);
 
     if (shouldHaveDecimals) {
       options.decimals = maskParams.decimalLimit;
@@ -151,34 +146,28 @@ export const handlePercentMask = ({
   return maskParams;
 };
 export const handleCurrencyMask = ({
-  context,
   mask_options,
   currency_mask
 }) => {
-  var _context$InputMasked2, _context$InputMasked3;
-
-  const maskParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  const maskParams = _objectSpread(_objectSpread({
     showMask: true,
     placeholderChar: null,
     allowDecimal: true,
     decimalLimit: 2,
     decimalSymbol: ','
-  }, context === null || context === void 0 ? void 0 : (_context$InputMasked2 = context.InputMasked) === null || _context$InputMasked2 === void 0 ? void 0 : _context$InputMasked2.mask_options), context === null || context === void 0 ? void 0 : (_context$InputMasked3 = context.InputMasked) === null || _context$InputMasked3 === void 0 ? void 0 : _context$InputMasked3.currency_mask), mask_options), currency_mask);
+  }, mask_options), currency_mask);
 
   const fix = typeof currency_mask === 'string' ? currency_mask : typeof maskParams.currency === 'string' ? maskParams.currency : 'kr';
   maskParams.suffix = ` ${fix}`;
   return maskParams;
 };
 export const handleNumberMask = ({
-  context,
   mask_options,
   number_mask
 }) => {
-  var _context$InputMasked4, _context$InputMasked5;
-
-  const maskParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  const maskParams = _objectSpread(_objectSpread({
     decimalSymbol: ','
-  }, context === null || context === void 0 ? void 0 : (_context$InputMasked4 = context.InputMasked) === null || _context$InputMasked4 === void 0 ? void 0 : _context$InputMasked4.mask_options), context === null || context === void 0 ? void 0 : (_context$InputMasked5 = context.InputMasked) === null || _context$InputMasked5 === void 0 ? void 0 : _context$InputMasked5.number_mask), mask_options), number_mask);
+  }, mask_options), number_mask);
 
   if (typeof maskParams.allowDecimal === 'undefined') {
     maskParams.allowDecimal = maskParams.decimalLimit > 0;

package/es/components/lib.js

@@ -1,6 +1,7 @@
 import { registerElement } from '../shared/component-helper';
 import Accordion from './accordion/Accordion';
 import Autocomplete from './autocomplete/Autocomplete';
+import Avatar from './avatar/Avatar';
 import Breadcrumb from './breadcrumb/Breadcrumb';
 import Button from './button/Button';
 import Checkbox from './checkbox/Checkbox';
@@ -16,6 +17,7 @@ import Heading from './heading/Heading';
 import HelpButton from './help-button/HelpButton';
 import Icon from './icon/Icon';
 import IconPrimary from './icon-primary/IconPrimary';
+import InfoCard from './info-card/InfoCard';
 import Input from './input/Input';
 import InputMasked from './input-masked/InputMasked';
 import Logo from './logo/Logo';
@@ -31,14 +33,17 @@ import Space from './space/Space';
 import StepIndicator from './step-indicator/StepIndicator';
 import Switch from './switch/Switch';
 import Tabs from './tabs/Tabs';
+import Tag from './tag/Tag';
 import Textarea from './textarea/Textarea';
+import Timeline from './timeline/Timeline';
 import ToggleButton from './toggle-button/ToggleButton';
 import Tooltip from './tooltip/Tooltip';
-export { Accordion, Autocomplete, Breadcrumb, Button, Checkbox, DatePicker, Dropdown, FormLabel, FormRow, FormSet, FormStatus, GlobalError, GlobalStatus, Heading, HelpButton, Icon, IconPrimary, Input, InputMasked, Logo, Modal, NumberFormat, Pagination, ProgressIndicator, Radio, Section, Skeleton, Slider, Space, StepIndicator, Switch, Tabs, Textarea, ToggleButton, Tooltip };
+export { Accordion, Autocomplete, Avatar, Breadcrumb, Button, Checkbox, DatePicker, Dropdown, FormLabel, FormRow, FormSet, FormStatus, GlobalError, GlobalStatus, Heading, HelpButton, Icon, IconPrimary, InfoCard, Input, InputMasked, Logo, Modal, NumberFormat, Pagination, ProgressIndicator, Radio, Section, Skeleton, Slider, Space, StepIndicator, Switch, Tabs, Tag, Textarea, Timeline, ToggleButton, Tooltip };
 export const getComponents = () => {
   return {
     Accordion,
     Autocomplete,
+    Avatar,
     Breadcrumb,
     Button,
     Checkbox,
@@ -54,6 +59,7 @@ export const getComponents = () => {
     HelpButton,
     Icon,
     IconPrimary,
+    InfoCard,
     Input,
     InputMasked,
     Logo,
@@ -69,7 +75,9 @@ export const getComponents = () => {
     StepIndicator,
     Switch,
     Tabs,
+    Tag,
     Textarea,
+    Timeline,
     ToggleButton,
     Tooltip
   };