@equinor/eds-core-react 0.44.0 → 0.45.1

package/dist/eds-core-react.cjs

@@ -988,6 +988,16 @@ const ButtonBase = styled__default.default.button.withConfig({
   } = states;
   return styled.css(["box-sizing:border-box;margin:0;padding:0;text-decoration:none;position:relative;cursor:pointer;display:inline-block;background:", ";height:", ";width:", ";svg{justify-self:center;}", " ", " ", " &::after{position:absolute;top:-", ";left:-", ";width:", ";height:", ";content:'';}@media (hover:hover) and (pointer:fine){&:hover{background:", ";color:", ";", ";}}&:focus{outline:none;}&[data-focus-visible-added]:focus{", "}&:focus-visible{", "}&::-moz-focus-inner{border:0;}&:disabled,&[aria-disabled='true']{cursor:not-allowed;background:", ";", ";", ";@media (hover:hover) and (pointer:fine){&:hover{background:", ";}}}"], theme.background, theme.height, theme.width, edsUtils.spacingsTemplate(theme.spacings), edsUtils.bordersTemplate(theme.border), edsUtils.typographyTemplate(theme.typography), clickbound?.offset?.top, clickbound?.offset?.left, clickbound?.width, clickbound?.height, hover.background, hover.typography?.color, edsUtils.bordersTemplate(hover?.border), edsUtils.outlineTemplate(focus.outline), edsUtils.outlineTemplate(focus.outline), disabled.background, edsUtils.bordersTemplate(disabled.border), edsUtils.typographyTemplate(disabled.typography), disabled.background);
 });
+const getElementType$1 = (disabled, customType, href) => {
+  if (disabled) return 'button';
+  if (customType) return customType;
+  if (href) return 'a';
+  return 'button';
+};
+const getButtonType = (href, customElementType) => {
+  if (href || customElementType) return undefined;
+  return 'button';
+};
 const Button$2 = /*#__PURE__*/react.forwardRef(function Button({
   color = 'primary',
   variant = 'contained',
@@ -1004,25 +1014,24 @@ const Button$2 = /*#__PURE__*/react.forwardRef(function Button({
   const token = edsUtils.useToken({
     density
   }, getToken$1(variant, color));
-  const as = href && !disabled ? 'a' : other.as ? other.as : 'button';
-  const type = href || other.as ? undefined : 'button';
-  tabIndex = disabled ? -1 : tabIndex;
+  const as = getElementType$1(disabled, other.as, href);
+  const type = getButtonType(href, other.as);
+  const adjustedTabIndex = disabled ? -1 : tabIndex;
   const buttonProps = {
     ref,
-    as,
     href,
     type,
     disabled,
-    tabIndex,
-    ...other
+    tabIndex: adjustedTabIndex,
+    ...other,
+    as
   };
+  const Container = fullWidth ? InnerFullWidth : Inner;
   return /*#__PURE__*/jsxRuntime.jsx(styled.ThemeProvider, {
     theme: token,
     children: /*#__PURE__*/jsxRuntime.jsx(ButtonBase, {
       ...buttonProps,
-      children: fullWidth ? /*#__PURE__*/jsxRuntime.jsx(InnerFullWidth, {
-        children: children
-      }) : /*#__PURE__*/jsxRuntime.jsx(Inner, {
+      children: /*#__PURE__*/jsxRuntime.jsx(Container, {
         children: children
       })
     })
@@ -1038,7 +1047,6 @@ const {
 } = edsTokens.tokens;
 const group = {
   border: {
-    type: 'border',
     radius: borderRadius$8
   }
 };
@@ -1046,7 +1054,7 @@ const group = {
 const {
   border: border$5
 } = group;
-const radius$1 = border$5.type === 'border' && border$5.radius;
+const radius$1 = border$5.radius;
 const ButtonGroupBase = styled__default.default.div.withConfig({
   displayName: "ButtonGroup__ButtonGroupBase",
   componentId: "sc-1fn8jon-0"
@@ -1109,19 +1117,9 @@ const tooltip = {
     radius: borderRadius$7
   },
   entities: {
-    tooltip: {
-      height: spacingXlarge
-    },
     arrow: {
       width: '6px',
-      height: spacingSmall$4,
-      spacings: {
-        bottom: '-6px',
-        top: '-6px',
-        left: '-6px',
-        right: '-6px'
-      }
-    }
+      height: spacingSmall$4}
   },
   spacings: {
     left: spacingSmall$4,
@@ -1878,7 +1876,7 @@ const StyledTableCell$1 = styled__default.default.th.withConfig({
 const CellInner$1 = styled__default.default.div.withConfig({
   displayName: "HeaderCell__CellInner",
   componentId: "sc-18w2o3a-1"
-})(["display:flex;align-items:center;"]);
+})(["display:flex;align-items:center;height:100%;"]);
 const TableHeaderCell = /*#__PURE__*/react.forwardRef(function TableHeaderCell({
   children,
   sort,
@@ -2261,10 +2259,7 @@ const label = {
   },
   spacings: {
     left: comfortable$5.small,
-    right: comfortable$5.small,
-    top: '6px',
-    bottom: '6px'
-  },
+    right: comfortable$5.small},
   states: {
     disabled: {
       typography: {
@@ -2322,15 +2317,11 @@ const helperText = {
     comfortable: {
       left: comfortable$4.small,
       right: comfortable$4.small,
-      top: comfortable$4.small,
-      bottom: '6px'
-    },
+      top: comfortable$4.small},
     compact: {
       left: comfortable$4.small,
       right: comfortable$4.small,
-      top: comfortable$4.xx_small,
-      bottom: '6px'
-    }
+      top: comfortable$4.xx_small}
   }
 };
 
@@ -3045,7 +3036,7 @@ const TextField = /*#__PURE__*/react.forwardRef(function TextField({
       })]
     }),
     rowsMax,
-    ref: inputRef || textareaRef,
+    ref: ref || inputRef || textareaRef,
     $multiline: multiline,
     ...other
   };
@@ -3056,7 +3047,6 @@ const TextField = /*#__PURE__*/react.forwardRef(function TextField({
     disabled
   };
   const containerProps = {
-    ref,
     className,
     style: {
       width: '100%',
@@ -5613,11 +5603,9 @@ const slider = {
           background: indicatorColor,
           states: {
             hover: {
-              background: primaryHover$1
-            },
+              },
             disabled: {
-              background: backgroundBorderDisabled
-            }
+              }
           }
         }
       },
@@ -5669,7 +5657,6 @@ const slider = {
         hover: {
           background: primaryHoverAlt$3,
           border: {
-            type: 'border',
             color: primaryHover$1
           }
         }
@@ -5694,7 +5681,6 @@ const slider = {
     disabled: {
       background: backgroundColorDisabled,
       border: {
-        type: 'border',
         color: backgroundColorMedium$1
       }
     }
@@ -5754,9 +5740,9 @@ const {
 } = slider;
 const track$1 = styled.css(["width:100%;height:100%;cursor:pointer;background:none;"]);
 const thumb = styled.css(["", " height:", ";width:", ";background:", ";cursor:pointer;position:relative;z-index:1;"], edsUtils.bordersTemplate(handle$1.border), handle$1.height, handle$1.width, handle$1.background);
-const thumbHover = styled.css(["@media (hover:hover) and (pointer:fine){box-shadow:0px 0px 0px 6px ", ";border-color:", ";}"], handle$1.states.hover.background, handle$1.states.hover.border.type === 'border' && handle$1.states.hover.border.color);
+const thumbHover = styled.css(["@media (hover:hover) and (pointer:fine){box-shadow:0px 0px 0px 6px ", ";border-color:", ";}"], handle$1.states.hover.background, handle$1.states.hover.border.color);
 const thumbHoverAndDisabled = styled.css(["@media (hover:hover) and (pointer:fine){cursor:not-allowed;box-shadow:none;}"]);
-const thumbDisabled = styled.css(["background-color:", ";border-color:", ";"], _disabled.background, _disabled.border.type === 'border' && _disabled.border.color);
+const thumbDisabled = styled.css(["background-color:", ";border-color:", ";"], _disabled.background, _disabled.border.color);
 const StyledSliderInput = styled__default.default.input.attrs(() => ({
   type: 'range'
 })).withConfig({
@@ -9663,7 +9649,8 @@ function AutocompleteInner(props, ref) {
     onInputChange,
     selectedOptions: _selectedOptions,
     multiple,
-    itemCompare,
+    itemToKey: _itemToKey,
+    itemCompare: _itemCompare,
     allowSelectAll,
     initialSelectedOptions: _initialSelectedOptions = [],
     optionDisabled = defaultOptionDisabled,
@@ -9682,6 +9669,19 @@ function AutocompleteInner(props, ref) {
     onClear,
     ...other
   } = props;
+  const itemCompare = react.useMemo(() => {
+    if (_itemCompare && _itemToKey) {
+      console.error('Error: Specifying both itemCompare and itemToKey. itemCompare is deprecated, while itemToKey should be used instead of it. Please only use one.');
+      return _itemCompare;
+    }
+    if (_itemToKey) {
+      return (o1, o2) => _itemToKey(o1) === _itemToKey(o2);
+    }
+    return _itemCompare;
+  }, [_itemCompare, _itemToKey]);
+  const itemToKey = react.useCallback(item => {
+    return _itemToKey ? _itemToKey(item) : item;
+  }, [_itemToKey]);
 
   // MARK: initializing data/setup
   const selectedOptions = _selectedOptions ? itemCompare ? options.filter(item => _selectedOptions.some(compare => itemCompare(item, compare))) : _selectedOptions : undefined;
@@ -9691,6 +9691,7 @@ function AutocompleteInner(props, ref) {
   const [_availableItems, setAvailableItems] = react.useState(inputOptions);
   const [typedInputValue, setTypedInputValue] = react.useState('');
   const inputRef = react.useRef(null);
+  react.useImperativeHandle(ref, () => inputRef.current);
   const showSelectAll = react.useMemo(() => {
     if (!multiple && allowSelectAll) {
       throw new Error(`allowSelectAll can only be used with multiple`);
@@ -9722,6 +9723,7 @@ function AutocompleteInner(props, ref) {
   const tokens = token();
   let placeholderText = placeholder;
   let multipleSelectionProps = {
+    itemToKey,
     initialSelectedItems: multiple ? initialSelectedOptions : initialSelectedOptions[0] ? [initialSelectedOptions[0]] : []
   };
   if (multiple) {
@@ -9824,6 +9826,7 @@ function AutocompleteInner(props, ref) {
     isItemDisabled(item) {
       return optionDisabled(item);
     },
+    itemToKey,
     itemToString: getLabel,
     onInputValueChange: ({
       inputValue
@@ -10233,7 +10236,6 @@ function AutocompleteInner(props, ref) {
     children: /*#__PURE__*/jsxRuntime.jsxs(Container$2, {
       className: className,
       style: style,
-      ref: ref,
       children: [/*#__PURE__*/jsxRuntime.jsx(Label$3, {
         ...getLabelProps(),
         label: label,
@@ -11884,7 +11886,8 @@ const DateFieldSegments = /*#__PURE__*/react.forwardRef((props, ref) => {
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     ...fieldProps,
     style: {
-      display: 'flex'
+      display: 'flex',
+      fontFamily: 'Equinor, Arial, sans-serif'
     },
     ref: ref,
     children: state.segments.map((segment, i) => /*#__PURE__*/jsxRuntime.jsx(DateSegment, {
@@ -11964,7 +11967,10 @@ const Toggle = ({
   showClearButton,
   readonly
 }) => {
-  return readonly || disabled ? null : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    style: {
+      visibility: readonly || disabled ? 'hidden' : 'visible'
+    },
     children: [showClearButton && /*#__PURE__*/jsxRuntime.jsx(StyledButton, {
       disabled: disabled,
       variant: 'ghost_icon',
@@ -12006,12 +12012,14 @@ const getCalendarDate = (value, timezone, showTimeInput = false) => {
 
 const useGetLocale = locale => {
   const {
-    locale: externalLocale
+    locale: currentLocale
   } = reactAria.useLocale();
-  // react-aria defaults to navigator.language if no locale is provided. If these are equal, we override by using the system default locale
-  const defaultLocale = typeof navigator !== 'undefined' && navigator.language || 'en-US';
-  const fallbackLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
-  return locale ?? (externalLocale === defaultLocale ? undefined : externalLocale) ?? fallbackLocale;
+  // Priority:
+  // 1. Explicitly passed locale prop
+  // 2. Locale from I18nProvider
+  // 3. Fallback to browser's default
+  const browserLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
+  return locale ?? currentLocale ?? browserLocale;
 };
 
 const DatePicker = /*#__PURE__*/react.forwardRef(({

package/dist/esm/components/Autocomplete/Autocomplete.js

@@ -1,23 +1,23 @@
-import { forwardRef, useState, useRef, useMemo, useEffect, useCallback } from 'react';
+import { forwardRef, useMemo, useCallback, useState, useRef, useImperativeHandle, useEffect } from 'react';
 import { useMultipleSelection, useCombobox } from 'downshift';
 import { useVirtualizer } from '@tanstack/react-virtual';
-import styled, { css, ThemeProvider } from 'styled-components';
+import styled, { ThemeProvider, css } from 'styled-components';
 import { Button } from '../Button/index.js';
 import { List } from '../List/index.js';
 import { Icon } from '../Icon/index.js';
 import { Progress } from '../Progress/index.js';
 import { close, arrow_drop_up, arrow_drop_down } from '@equinor/eds-icons';
 import { multiSelect, selectTokens } from './Autocomplete.tokens.js';
-import { bordersTemplate, useToken, useIsomorphicLayoutEffect } from '@equinor/eds-utils';
+import { useToken, useIsomorphicLayoutEffect, bordersTemplate } from '@equinor/eds-utils';
 import { AutocompleteOption } from './Option.js';
 import { useFloating, offset, flip, size, useInteractions, autoUpdate } from '@floating-ui/react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import pickBy from '../../node_modules/.pnpm/ramda@0.30.1/node_modules/ramda/es/pickBy.js';
 import mergeWith from '../../node_modules/.pnpm/ramda@0.30.1/node_modules/ramda/es/mergeWith.js';
-import { HelperText as TextfieldHelperText } from '../InputWrapper/HelperText/HelperText.js';
 import { useEds } from '../EdsProvider/eds.context.js';
 import { Label } from '../Label/Label.js';
 import { Input } from '../Input/Input.js';
+import { HelperText as TextfieldHelperText } from '../InputWrapper/HelperText/HelperText.js';
 
 const Container = styled.div.withConfig({
   displayName: "Autocomplete__Container",
@@ -169,7 +169,8 @@ function AutocompleteInner(props, ref) {
     onInputChange,
     selectedOptions: _selectedOptions,
     multiple,
-    itemCompare,
+    itemToKey: _itemToKey,
+    itemCompare: _itemCompare,
     allowSelectAll,
     initialSelectedOptions: _initialSelectedOptions = [],
     optionDisabled = defaultOptionDisabled,
@@ -188,6 +189,19 @@ function AutocompleteInner(props, ref) {
     onClear,
     ...other
   } = props;
+  const itemCompare = useMemo(() => {
+    if (_itemCompare && _itemToKey) {
+      console.error('Error: Specifying both itemCompare and itemToKey. itemCompare is deprecated, while itemToKey should be used instead of it. Please only use one.');
+      return _itemCompare;
+    }
+    if (_itemToKey) {
+      return (o1, o2) => _itemToKey(o1) === _itemToKey(o2);
+    }
+    return _itemCompare;
+  }, [_itemCompare, _itemToKey]);
+  const itemToKey = useCallback(item => {
+    return _itemToKey ? _itemToKey(item) : item;
+  }, [_itemToKey]);
 
   // MARK: initializing data/setup
   const selectedOptions = _selectedOptions ? itemCompare ? options.filter(item => _selectedOptions.some(compare => itemCompare(item, compare))) : _selectedOptions : undefined;
@@ -197,6 +211,7 @@ function AutocompleteInner(props, ref) {
   const [_availableItems, setAvailableItems] = useState(inputOptions);
   const [typedInputValue, setTypedInputValue] = useState('');
   const inputRef = useRef(null);
+  useImperativeHandle(ref, () => inputRef.current);
   const showSelectAll = useMemo(() => {
     if (!multiple && allowSelectAll) {
       throw new Error(`allowSelectAll can only be used with multiple`);
@@ -228,6 +243,7 @@ function AutocompleteInner(props, ref) {
   const tokens = token();
   let placeholderText = placeholder;
   let multipleSelectionProps = {
+    itemToKey,
     initialSelectedItems: multiple ? initialSelectedOptions : initialSelectedOptions[0] ? [initialSelectedOptions[0]] : []
   };
   if (multiple) {
@@ -330,6 +346,7 @@ function AutocompleteInner(props, ref) {
     isItemDisabled(item) {
       return optionDisabled(item);
     },
+    itemToKey,
     itemToString: getLabel,
     onInputValueChange: ({
       inputValue
@@ -739,7 +756,6 @@ function AutocompleteInner(props, ref) {
     children: /*#__PURE__*/jsxs(Container, {
       className: className,
       style: style,
-      ref: ref,
       children: [/*#__PURE__*/jsx(Label, {
         ...getLabelProps(),
         label: label,

package/dist/esm/components/Banner/Banner.js

@@ -1,12 +1,12 @@
 import { forwardRef, Children, isValidElement } from 'react';
-import styled, { css, ThemeProvider } from 'styled-components';
-import { spacingsTemplate, useToken } from '@equinor/eds-utils';
+import styled, { ThemeProvider, css } from 'styled-components';
+import { useToken, spacingsTemplate } from '@equinor/eds-utils';
 import { enabled } from './Banner.tokens.js';
 import { BannerIcon } from './BannerIcon.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { Divider } from '../Divider/Divider.js';
 import { useEds } from '../EdsProvider/eds.context.js';
 import { Paper } from '../Paper/Paper.js';
+import { Divider } from '../Divider/Divider.js';
 
 const Content = styled.div.withConfig({
   displayName: "Banner__Content",

package/dist/esm/components/Breadcrumbs/Breadcrumb.js

@@ -2,8 +2,8 @@ import { forwardRef, useMemo } from 'react';
 import styled, { css } from 'styled-components';
 import { breadcrumbs } from './Breadcrumbs.tokens.js';
 import { jsx } from 'react/jsx-runtime';
-import { Typography } from '../Typography/Typography.js';
 import { Tooltip } from '../Tooltip/Tooltip.js';
+import { Typography } from '../Typography/Typography.js';
 
 const {
   states,

package/dist/esm/components/Button/Button.js

@@ -1,7 +1,7 @@
 import { forwardRef } from 'react';
-import styled, { css, ThemeProvider } from 'styled-components';
+import styled, { ThemeProvider, css } from 'styled-components';
 import { token } from './tokens/index.js';
-import { spacingsTemplate, bordersTemplate, typographyTemplate, outlineTemplate, useToken } from '@equinor/eds-utils';
+import { useToken, spacingsTemplate, bordersTemplate, typographyTemplate, outlineTemplate } from '@equinor/eds-utils';
 import { InnerFullWidth } from './InnerFullWidth.js';
 import { jsx } from 'react/jsx-runtime';
 import { useEds } from '../EdsProvider/eds.context.js';
@@ -53,6 +53,16 @@ const ButtonBase = styled.button.withConfig({
   } = states;
   return css(["box-sizing:border-box;margin:0;padding:0;text-decoration:none;position:relative;cursor:pointer;display:inline-block;background:", ";height:", ";width:", ";svg{justify-self:center;}", " ", " ", " &::after{position:absolute;top:-", ";left:-", ";width:", ";height:", ";content:'';}@media (hover:hover) and (pointer:fine){&:hover{background:", ";color:", ";", ";}}&:focus{outline:none;}&[data-focus-visible-added]:focus{", "}&:focus-visible{", "}&::-moz-focus-inner{border:0;}&:disabled,&[aria-disabled='true']{cursor:not-allowed;background:", ";", ";", ";@media (hover:hover) and (pointer:fine){&:hover{background:", ";}}}"], theme.background, theme.height, theme.width, spacingsTemplate(theme.spacings), bordersTemplate(theme.border), typographyTemplate(theme.typography), clickbound?.offset?.top, clickbound?.offset?.left, clickbound?.width, clickbound?.height, hover.background, hover.typography?.color, bordersTemplate(hover?.border), outlineTemplate(focus.outline), outlineTemplate(focus.outline), disabled.background, bordersTemplate(disabled.border), typographyTemplate(disabled.typography), disabled.background);
 });
+const getElementType = (disabled, customType, href) => {
+  if (disabled) return 'button';
+  if (customType) return customType;
+  if (href) return 'a';
+  return 'button';
+};
+const getButtonType = (href, customElementType) => {
+  if (href || customElementType) return undefined;
+  return 'button';
+};
 const Button = /*#__PURE__*/forwardRef(function Button({
   color = 'primary',
   variant = 'contained',
@@ -69,25 +79,24 @@ const Button = /*#__PURE__*/forwardRef(function Button({
   const token = useToken({
     density
   }, getToken(variant, color));
-  const as = href && !disabled ? 'a' : other.as ? other.as : 'button';
-  const type = href || other.as ? undefined : 'button';
-  tabIndex = disabled ? -1 : tabIndex;
+  const as = getElementType(disabled, other.as, href);
+  const type = getButtonType(href, other.as);
+  const adjustedTabIndex = disabled ? -1 : tabIndex;
   const buttonProps = {
     ref,
-    as,
     href,
     type,
     disabled,
-    tabIndex,
-    ...other
+    tabIndex: adjustedTabIndex,
+    ...other,
+    as
   };
+  const Container = fullWidth ? InnerFullWidth : Inner;
   return /*#__PURE__*/jsx(ThemeProvider, {
     theme: token,
     children: /*#__PURE__*/jsx(ButtonBase, {
       ...buttonProps,
-      children: fullWidth ? /*#__PURE__*/jsx(InnerFullWidth, {
-        children: children
-      }) : /*#__PURE__*/jsx(Inner, {
+      children: /*#__PURE__*/jsx(Container, {
         children: children
       })
     })

package/dist/esm/components/Button/ButtonGroup/ButtonGroup.js

@@ -6,7 +6,7 @@ import { jsx } from 'react/jsx-runtime';
 const {
   border
 } = group;
-const radius = border.type === 'border' && border.radius;
+const radius = border.radius;
 const ButtonGroupBase = styled.div.withConfig({
   displayName: "ButtonGroup__ButtonGroupBase",
   componentId: "sc-1fn8jon-0"

package/dist/esm/components/Button/ButtonGroup/ButtonGroup.tokens.js

@@ -9,7 +9,6 @@ const {
 } = tokens;
 const group = {
   border: {
-    type: 'border',
     radius: borderRadius
   }
 };

package/dist/esm/components/Button/tokens/index.js

@@ -1,30 +1,30 @@
 import { primary, secondary, danger } from './contained.js';
-import { primary as primary$1, secondary as secondary$1, danger as danger$1 } from './outlined.js';
-import { primary as primary$2, secondary as secondary$2, danger as danger$2 } from './ghost.js';
+import { primary as primary$2, secondary as secondary$2, danger as danger$2 } from './outlined.js';
+import { primary as primary$4, secondary as secondary$4, danger as danger$4 } from './ghost.js';
 import { primary as primary$3, secondary as secondary$3, danger as danger$3 } from './icon.js';
-import { primary as primary$4, secondary as secondary$4, danger as danger$4 } from './contained_icon.js';
+import { primary as primary$1, secondary as secondary$1, danger as danger$1 } from './contained_icon.js';
 
 const token = {
   primary: {
     contained: primary,
-    outlined: primary$1,
-    ghost: primary$2,
+    outlined: primary$2,
+    ghost: primary$4,
     ghost_icon: primary$3,
-    contained_icon: primary$4
+    contained_icon: primary$1
   },
   secondary: {
     contained: secondary,
-    outlined: secondary$1,
-    ghost: secondary$2,
+    outlined: secondary$2,
+    ghost: secondary$4,
     ghost_icon: secondary$3,
-    contained_icon: secondary$4
+    contained_icon: secondary$1
   },
   danger: {
     contained: danger,
-    outlined: danger$1,
-    ghost: danger$2,
+    outlined: danger$2,
+    ghost: danger$4,
     ghost_icon: danger$3,
-    contained_icon: danger$4
+    contained_icon: danger$1
   }
 };
 

package/dist/esm/components/Checkbox/Input.js

@@ -2,7 +2,7 @@ import { forwardRef } from 'react';
 import styled, { ThemeProvider } from 'styled-components';
 import { checkbox_indeterminate, checkbox as checkbox$1, checkbox_outline } from '@equinor/eds-icons';
 import { checkbox } from './Checkbox.tokens.js';
-import { outlineTemplate, spacingsTemplate, useToken } from '@equinor/eds-utils';
+import { useToken, spacingsTemplate, outlineTemplate } from '@equinor/eds-utils';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useEds } from '../EdsProvider/eds.context.js';
 

package/dist/esm/components/Datepicker/DatePicker.js

@@ -1,7 +1,7 @@
 import { forwardRef, useState, useRef, useCallback, useEffect } from 'react';
 import { Calendar } from './calendars/Calendar.js';
 import { DateField } from './fields/DateField.js';
-import { warning_outlined, calendar } from '@equinor/eds-icons';
+import { calendar, warning_outlined } from '@equinor/eds-icons';
 import { useConvertedValidationFunctions } from './utils/useConvertedValidationFunctions.js';
 import { FieldWrapper } from './fields/FieldWrapper.js';
 import { Toggle } from './fields/Toggle.js';

package/dist/esm/components/Datepicker/DateRangePicker.js

@@ -1,6 +1,6 @@
 import { forwardRef, useState, useRef, useCallback, useEffect } from 'react';
 import { RangeCalendar } from './calendars/RangeCalendar.js';
-import { warning_outlined, calendar_date_range } from '@equinor/eds-icons';
+import { calendar_date_range, warning_outlined } from '@equinor/eds-icons';
 import { useConvertedValidationFunctions } from './utils/useConvertedValidationFunctions.js';
 import { FieldWrapper } from './fields/FieldWrapper.js';
 import { Toggle } from './fields/Toggle.js';

package/dist/esm/components/Datepicker/calendars/CalendarCell.js

@@ -3,8 +3,8 @@ import { tokens } from '@equinor/eds-tokens';
 import { useRef, useMemo } from 'react';
 import { useCalendarCell } from 'react-aria';
 import { jsx } from 'react/jsx-runtime';
-import { Typography } from '../../Typography/Typography.js';
 import { useEds } from '../../EdsProvider/eds.context.js';
+import { Typography } from '../../Typography/Typography.js';
 
 const StyledCell = styled(Typography).withConfig({
   displayName: "CalendarCell__StyledCell",

package/dist/esm/components/Datepicker/fields/DateFieldSegments.js

@@ -26,7 +26,8 @@ const DateFieldSegments = /*#__PURE__*/forwardRef((props, ref) => {
   return /*#__PURE__*/jsx("div", {
     ...fieldProps,
     style: {
-      display: 'flex'
+      display: 'flex',
+      fontFamily: 'Equinor, Arial, sans-serif'
     },
     ref: ref,
     children: state.segments.map((segment, i) => /*#__PURE__*/jsx(DateSegment, {

package/dist/esm/components/Datepicker/fields/Toggle.js

@@ -3,7 +3,7 @@ import { close } from '@equinor/eds-icons';
 import { Button } from '../../Button/Button.js';
 import styled from 'styled-components';
 import { filterDOMProps } from '@react-aria/utils';
-import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 
 const StyledButton = styled(Button).withConfig({
   displayName: "Toggle__StyledButton",
@@ -24,7 +24,10 @@ const Toggle = ({
   showClearButton,
   readonly
 }) => {
-  return readonly || disabled ? null : /*#__PURE__*/jsxs(Fragment, {
+  return /*#__PURE__*/jsxs("div", {
+    style: {
+      visibility: readonly || disabled ? 'hidden' : 'visible'
+    },
     children: [showClearButton && /*#__PURE__*/jsx(StyledButton, {
       disabled: disabled,
       variant: 'ghost_icon',

package/dist/esm/components/Datepicker/utils/get-calendar-date.js

@@ -1,4 +1,4 @@
-import { toCalendarDateTime, fromDate, toCalendarDate } from '@internationalized/date';
+import { toCalendarDateTime, toCalendarDate, fromDate } from '@internationalized/date';
 
 const getCalendarDate = (value, timezone, showTimeInput = false) => {
   if (!value) return null;

package/dist/esm/components/Datepicker/utils/useGetLocale.js

@@ -2,12 +2,14 @@ import { useLocale } from 'react-aria';
 
 const useGetLocale = locale => {
   const {
-    locale: externalLocale
+    locale: currentLocale
   } = useLocale();
-  // react-aria defaults to navigator.language if no locale is provided. If these are equal, we override by using the system default locale
-  const defaultLocale = typeof navigator !== 'undefined' && navigator.language || 'en-US';
-  const fallbackLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
-  return locale ?? (externalLocale === defaultLocale ? undefined : externalLocale) ?? fallbackLocale;
+  // Priority:
+  // 1. Explicitly passed locale prop
+  // 2. Locale from I18nProvider
+  // 3. Fallback to browser's default
+  const browserLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
+  return locale ?? currentLocale ?? browserLocale;
 };
 
 export { useGetLocale };

package/dist/esm/components/Dialog/Dialog.js

@@ -1,10 +1,10 @@
 import { forwardRef, useRef, useMemo, useEffect } from 'react';
-import styled, { css, ThemeProvider } from 'styled-components';
-import { typographyTemplate, bordersTemplate, useToken, mergeRefs, useHideBodyScroll, useGlobalKeyPress } from '@equinor/eds-utils';
+import styled, { ThemeProvider, css } from 'styled-components';
+import { useToken, mergeRefs, useHideBodyScroll, useGlobalKeyPress, bordersTemplate, typographyTemplate } from '@equinor/eds-utils';
 import { dialog } from './Dialog.tokens.js';
 import { jsx } from 'react/jsx-runtime';
-import { Paper } from '../Paper/Paper.js';
 import { useEds } from '../EdsProvider/eds.context.js';
+import { Paper } from '../Paper/Paper.js';
 
 const StyledDialog = styled(Paper).attrs({
   'aria-labelledby': 'eds-dialog-title',

package/dist/esm/components/EdsProvider/eds.context.js

@@ -1,4 +1,4 @@
-import { useState, useEffect, useContext, createContext } from 'react';
+import { useContext, useState, useEffect, createContext } from 'react';
 import { jsx } from 'react/jsx-runtime';
 
 const initalState = {