@dnb/eufemia 9.17.2 → 9.21.0

package/components/input-masked/InputMaskedHooks.js

@@ -27,7 +27,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';
@@ -68,9 +67,9 @@ export var useInputElementRef = function useInputElementRef() {
 };
 export var useLocale = function useLocale() {
   var _React$useContext3 = React.useContext(InputMaskedContext),
-      props = _React$useContext3.props;
+      props = _React$useContext3.props,
+      context = _React$useContext3.context;
 
-  var context = React.useContext(Context);
   var locale = props.locale;
 
   if (!locale && context !== null && context !== void 0 && context.locale) {
@@ -81,17 +80,16 @@ export var useLocale = function useLocale() {
 };
 export var useLocalValue = function useLocalValue() {
   var _React$useContext4 = React.useContext(InputMaskedContext),
-      props = _React$useContext4.props;
+      props = _React$useContext4.props,
+      context = _React$useContext4.context;
 
-  var context = React.useContext(Context);
   var maskParams = useNumberMaskParams() || {};
   var locale = useLocale();
 
   var _React$useState = React.useState(function () {
     return correctNumberValue({
-      props: props,
-      context: context,
       locale: locale,
+      props: props,
       maskParams: maskParams
     });
   }),
@@ -102,9 +100,8 @@ export var useLocalValue = function useLocalValue() {
   React.useEffect(function () {
     var value = correctNumberValue({
       localValue: localValue,
-      props: props,
-      context: context,
       locale: locale,
+      props: props,
       maskParams: maskParams
     });
     setLocalValue(value);
@@ -117,7 +114,10 @@ export var useLocalValue = function useLocalValue() {
 export var useNumberMask = function useNumberMask() {
   var maskParams = useNumberMaskParams();
 
-  if (!maskParams) {
+  var _React$useContext5 = React.useContext(InputMaskedContext),
+      props = _React$useContext5.props;
+
+  if (!maskParams || !isRequestingNumberMask(props)) {
     return null;
   }
 
@@ -125,9 +125,9 @@ export var useNumberMask = function useNumberMask() {
   mask.maskParams = maskParams;
   return mask;
 };
-export var useInternalMask = function useInternalMask() {
-  var _React$useContext5 = React.useContext(InputMaskedContext),
-      props = _React$useContext5.props;
+export var useMask = function useMask() {
+  var _React$useContext6 = React.useContext(InputMaskedContext),
+      props = _React$useContext6.props;
 
   var numberMask = useNumberMask();
 
@@ -138,15 +138,15 @@ export var useInternalMask = function useInternalMask() {
   return props.mask;
 };
 export var useMaskParams = function useMaskParams() {
-  var _React$useContext6 = React.useContext(InputMaskedContext),
-      props = _React$useContext6.props;
+  var _React$useContext7 = React.useContext(InputMaskedContext),
+      props = _React$useContext7.props;
 
   var keep_char_positions = props.keep_char_positions,
       show_guide = props.show_guide,
       show_mask = props.show_mask,
       placeholder_char = props.placeholder_char,
       placeholder = props.placeholder;
-  var mask = useInternalMask();
+  var mask = useMask();
   var maskParams = useNumberMaskParams() || {};
   maskParams.showMask = !placeholder && isTrue(show_mask);
   maskParams.placeholderChar = placeholder_char;
@@ -170,11 +170,11 @@ export var useMaskParams = function useMaskParams() {
 export var useInputElement = function useInputElement() {
   var ref = useInputElementRef();
 
-  var _React$useContext7 = React.useContext(InputMaskedContext),
-      props = _React$useContext7.props;
+  var _React$useContext8 = React.useContext(InputMaskedContext),
+      props = _React$useContext8.props;
 
   var pipe = props.pipe;
-  var mask = useInternalMask();
+  var mask = useMask();
 
   var _useMaskParams = useMaskParams(),
       showMask = _useMaskParams.showMask,
@@ -251,8 +251,8 @@ export var useEventMapping = function useEventMapping(_ref) {
 var useCallEvent = function useCallEvent(_ref2) {
   var setLocalValue = _ref2.setLocalValue;
 
-  var _React$useContext8 = React.useContext(InputMaskedContext),
-      props = _React$useContext8.props;
+  var _React$useContext9 = React.useContext(InputMaskedContext),
+      props = _React$useContext9.props;
 
   var maskParams = useMaskParams();
   var isNumberMask = useNumberMask();
@@ -281,7 +281,6 @@ var useCallEvent = function useCallEvent(_ref2) {
 
       if (/^0/.test(testValue)) {
         event.preventDefault();
-        return;
       }
     }
 
@@ -359,14 +358,13 @@ var useCallEvent = function useCallEvent(_ref2) {
 var useNumberMaskParams = function useNumberMaskParams() {
   var _currency_mask;
 
-  var _React$useContext9 = React.useContext(InputMaskedContext),
-      props = _React$useContext9.props;
+  var _React$useContext10 = React.useContext(InputMaskedContext),
+      props = _React$useContext10.props;
 
-  var context = React.useContext(Context);
   var locale = useLocale();
 
   if (!isRequestingNumberMask(props)) {
-    return null;
+    return _objectSpread({}, fromJSON(props.mask_options));
   }
 
   var number_mask = props.number_mask,
@@ -407,7 +405,6 @@ var useNumberMaskParams = function useNumberMaskParams() {
 
   if (number_mask) {
     maskParams = handleNumberMask({
-      context: context,
       mask_options: mask_options,
       number_mask: number_mask
     });
@@ -421,7 +418,6 @@ var useNumberMaskParams = function useNumberMaskParams() {
     }
   } else if (currency_mask) {
     maskParams = handleCurrencyMask({
-      context: context,
       mask_options: mask_options,
       currency_mask: currency_mask
     });

package/components/input-masked/InputMaskedUtils.js

@@ -48,12 +48,9 @@ export var isRequestingNumberMask = function isRequestingNumberMask(props) {
   });
 };
 export var correctNumberValue = function correctNumberValue(_ref5) {
-  var _context$InputMasked;
-
   var _ref5$localValue = _ref5.localValue,
       localValue = _ref5$localValue === void 0 ? null : _ref5$localValue,
       props = _ref5.props,
-      context = _ref5.context,
       locale = _ref5.locale,
       maskParams = _ref5.maskParams;
   var value = String(props.value);
@@ -72,13 +69,11 @@ export var correctNumberValue = function correctNumberValue(_ref5) {
     }
   }
 
-  var 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) {
-    var options = _objectSpread(_objectSpread({
+  if (props.number_format) {
+    var options = _objectSpread({
       locale: locale,
       decimals: 0
-    }, fromJSON(props.number_format)), numberFormatFromContext);
+    }, props.number_format);
 
     if (shouldHaveDecimals) {
       options.decimals = maskParams.decimalLimit;
@@ -181,34 +176,28 @@ export var handlePercentMask = function handlePercentMask(_ref6) {
   return maskParams;
 };
 export var handleCurrencyMask = function handleCurrencyMask(_ref7) {
-  var _context$InputMasked2, _context$InputMasked3;
-
-  var context = _ref7.context,
-      mask_options = _ref7.mask_options,
+  var mask_options = _ref7.mask_options,
       currency_mask = _ref7.currency_mask;
 
-  var maskParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  var 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);
 
   var fix = typeof currency_mask === 'string' ? currency_mask : typeof maskParams.currency === 'string' ? maskParams.currency : 'kr';
   maskParams.suffix = " ".concat(fix);
   return maskParams;
 };
 export var handleNumberMask = function handleNumberMask(_ref8) {
-  var _context$InputMasked4, _context$InputMasked5;
-
-  var context = _ref8.context,
-      mask_options = _ref8.mask_options,
+  var mask_options = _ref8.mask_options,
       number_mask = _ref8.number_mask;
 
-  var maskParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  var 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/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 var getComponents = function getComponents() {
   return {
     Accordion: Accordion,
     Autocomplete: Autocomplete,
+    Avatar: Avatar,
     Breadcrumb: Breadcrumb,
     Button: Button,
     Checkbox: Checkbox,
@@ -54,6 +59,7 @@ export var getComponents = function getComponents() {
     HelpButton: HelpButton,
     Icon: Icon,
     IconPrimary: IconPrimary,
+    InfoCard: InfoCard,
     Input: Input,
     InputMasked: InputMasked,
     Logo: Logo,
@@ -69,7 +75,9 @@ export var getComponents = function getComponents() {
     StepIndicator: StepIndicator,
     Switch: Switch,
     Tabs: Tabs,
+    Tag: Tag,
     Textarea: Textarea,
+    Timeline: Timeline,
     ToggleButton: ToggleButton,
     Tooltip: Tooltip
   };