@dxc-technology/halstack-react 0.0.0-e30cba6 → 0.0.0-e832ef8

package/dist/select/Select.js

@@ -15,8 +15,6 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -33,8 +31,6 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
 
-var _styles = require("@material-ui/core/styles");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
@@ -49,8 +45,28 @@ var _RequiredComponent = _interopRequireDefault(require("../common/RequiredCompo
 
 var _BackgroundColorContext = _interopRequireWildcard(require("../BackgroundColorContext.js"));
 
+function _templateObject10() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: inline-block;\n\n  .MuiFormControl-root {\n    width: 100%;\n  }\n\n  .MuiFormHelperText-root {\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    margin-top: 6px;\n\n    &.Mui-disabled {\n      color: ", ";\n      cursor: not-allowed;\n    }\n  }\n\n  .MuiFormLabel-root {\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    margin-top: -3px;\n    text-overflow: ellipsis;\n    overflow: hidden;\n    white-space: nowrap;\n    height: 22px;\n    display: flex;\n    align-items: center;\n\n    &.Mui-disabled {\n      color: ", ";\n    }\n    &.Mui-focused {\n      font-size: ", ";\n      font-style: ", ";\n      font-weight: ", ";\n      color: ", ";\n    }\n  }\n\n  .MuiSelect-select.MuiSelect-select {\n    padding-right: unset;\n  }\n\n  .MuiSelect-select {\n    width: 100%;\n    height: 20px;\n    display: flex;\n    padding-right: 10px;\n    align-items: center;\n\n    :focus {\n      background-color: transparent;\n      outline: ", "\n        auto 2px;\n    }\n    & > *:last-child::after {\n      content: unset;\n    }\n    & > *:last-child::before {\n      content: unset;\n    }\n    &.Mui-disabled {\n      color: ", ";\n      cursor: not-allowed;\n      &:focus {\n        outline: none;\n      }\n    }\n  }\n  .MuiInputBase-input {\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n  }\n  .MuiInput-underline {\n    &.Mui-focused {\n      border-bottom-width: ", ";\n      border-bottom-color: ", ";\n    }\n    &.Mui-disabled:before {\n      border-bottom-style: solid;\n    }\n  }\n  .MuiInput-underline:hover:not(.Mui-disabled):before {\n    border-bottom: ", " solid;\n    border-bottom-color: ", ";\n  }\n  .MuiInput-underline:after {\n    border-bottom: ", " solid;\n    border-bottom-color: ", ";\n  }\n  .MuiInput-underline:before {\n    border-bottom: ", " solid;\n    border-bottom-color: ", ";\n  }\n  .MuiSelect-icon {\n    color: ", " !important;\n  }\n  & label {\n    text-overflow: ellipsis;\n    overflow: hidden;\n    width: calc(100% - 24px);\n  }\n\n  .MuiMenu-paper {\n    background-color: ", ";\n    box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.3);\n    min-width: auto;\n    width: auto;\n    max-height: 250px;\n    border-color: ", ";\n    border-width: ", ";\n    border-style: ", ";\n\n    &::-webkit-scrollbar {\n      width: 3px;\n      margin: 5px;\n    }\n    &::-webkit-scrollbar-track {\n      border-radius: 3px;\n      background-color: ", ";\n    }\n    &::-webkit-scrollbar-thumb {\n      border-radius: 3px;\n      background-color: ", ";\n    }\n  }\n  .MuiList-root {\n    width: auto !important;\n    padding-right: 0 !important;\n  }\n  .MuiList-padding {\n    padding-bottom: 0px;\n    padding-top: 0px;\n  }\n  .MuiMenuItem-root {\n    padding-bottom: ", ";\n    padding-top: ", ";\n\n    &:hover {\n      background-color: ", ";\n    }\n    &:active {\n      background-color: ", ";\n    }\n    &:focus {\n      outline: ", "\n        auto 2px;\n      outline-offset: -1px;\n    }\n    &.MuiListItem-root.Mui-selected {\n      background-color: ", ";\n    }\n    & span.MuiButtonBase-root {\n      // multiple checkbox\n      padding: 0px;\n      margin: 5px 0px;\n    }\n  }\n"]);
+
+  _templateObject10 = function _templateObject10() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject9() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
+
+  _templateObject9 = function _templateObject9() {
+    return data;
+  };
+
+  return data;
+}
+
 function _templateObject8() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: inline-block;\n\n  .MuiFormControl-root {\n    width: 100%;\n  }\n\n  .MuiFormHelperText-root {\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    margin-top: 6px;\n\n    &.Mui-disabled {\n      color: ", ";\n      cursor: not-allowed;\n    }\n  }\n\n  .MuiFormLabel-root {\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    margin-top: -3px;\n    text-overflow: ellipsis;\n    overflow: hidden;\n    white-space: nowrap;\n    height: 22px;\n    display: flex;\n    align-items: center;\n\n    &.Mui-disabled {\n      color: ", ";\n    }\n    &.Mui-focused {\n      font-size: ", ";\n      font-style: ", ";\n      font-weight: ", ";\n      color: ", ";\n    }\n  }\n\n  .MuiSelect-select.MuiSelect-select {\n    padding-right: unset;\n  }\n\n  .MuiSelect-select {\n    width: 100%;\n    height: 20px;\n    display: flex;\n    padding-right: 10px;\n    align-items: center;\n    :focus {\n      background-color: transparent;\n      outline: ", "\n        auto 1px;\n    }\n    & > *:last-child::after {\n      content: unset;\n    }\n    & > *:last-child::before {\n      content: unset;\n    }\n    &.Mui-disabled {\n      color: ", ";\n      cursor: not-allowed;\n      &:focus {\n        outline: none;\n      }\n    }\n  }\n  .MuiInputBase-input {\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n\n    svg {\n      color: ", ";\n    }\n  }\n  .MuiInput-underline {\n    &.Mui-focused {\n      border-bottom-width: ", ";\n      border-bottom-color: ", ";\n    }\n    &.Mui-disabled:before {\n      border-bottom-style: solid;\n    }\n  }\n  .MuiInput-underline:hover:not(.Mui-disabled):before {\n    border-bottom: ", " solid;\n    border-bottom-color: ", ";\n  }\n  .MuiInput-underline:after {\n    border-bottom: ", " solid;\n    border-bottom-color: ", ";\n  }\n  .MuiInput-underline:before {\n    border-bottom: ", " solid;\n    border-bottom-color: ", ";\n  }\n  .MuiSelect-icon {\n    color: ", " !important;\n  }\n  & label {\n    text-overflow: ellipsis;\n    overflow: hidden;\n    width: calc(100% - 24px);\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject8 = function _templateObject8() {
     return data;
@@ -60,7 +76,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  opacity: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n"]);
 
   _templateObject7 = function _templateObject7() {
     return data;
@@ -70,7 +86,7 @@ function _templateObject7() {
 }
 
 function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  justify-content: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  width: ", ";\n\n  &::before {\n    margin: 0 4px;\n    ", ";\n  }\n  &::after {\n    margin: 0 4px;\n    ", ";\n  }\n"]);
 
   _templateObject6 = function _templateObject6() {
     return data;
@@ -80,7 +96,7 @@ function _templateObject6() {
 }
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  display: flex;\n  align-items: center;\n  flex-direction: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  ", "\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -90,7 +106,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -100,7 +116,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  justify-content: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  width: ", ";\n\n  &::before {\n    margin: 0 4px;\n    ", ";\n  }\n  &::after {\n    margin: 0 4px;\n    ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -110,7 +126,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  color: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  display: flex;\n  align-items: center;\n  flex-direction: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  ", "\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -129,93 +145,6 @@ function _templateObject() {
   return data;
 }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var useStyles = (0, _styles.makeStyles)(function () {
-  return {
-    root: function root(props) {
-      return {
-        minWidth: props.width
-      };
-    },
-    dropdownStyle: function dropdownStyle(props) {
-      return {
-        backgroundColor: props.optionBackgroundColor,
-        boxShadow: "0px 2px 10px 0px rgba(0, 0, 0, 0.3)",
-        minWidth: props.width,
-        width: props.width,
-        maxHeight: "250px",
-        borderColor: props.optionBorderColor,
-        borderWidth: props.optionBorderThickness,
-        borderStyle: props.optionBorderStyle,
-        "&::-webkit-scrollbar": {
-          width: "3px",
-          margin: "5px"
-        },
-        "&::-webkit-scrollbar-track": {
-          borderRadius: "3px",
-          backgroundColor: props.scrollBarTrackColor
-        },
-        "&::-webkit-scrollbar-thumb": {
-          borderRadius: "3px",
-          backgroundColor: props.scrollBarThumbColor
-        },
-        "& .MuiList-root": {
-          width: "auto !important",
-          paddingRight: "0 !important"
-        }
-      };
-    },
-    itemList: function itemList(props) {
-      return {
-        "&.MuiList-padding": {
-          paddingBottom: "0px",
-          paddingTop: "0px"
-        },
-        "& li": {
-          fontSize: props.optionFontSize,
-          fontStyle: props.optionFontStyle,
-          fontWeight: props.optionFontWeight,
-          paddingBottom: props.optionPaddingBottom,
-          paddingTop: props.optionPaddingTop,
-          "&:hover": {
-            backgroundColor: "".concat(props.backgroundType === "dark" ? props.hoverOptionBackgroundColorOnDark : props.hoverOptionBackgroundColor, " !important"),
-            color: "".concat(props.optionFontColor)
-          },
-          "&:active": {
-            backgroundColor: "".concat(props.backgroundType === "dark" ? props.activeOptionBackgroundColorOnDark : props.activeOptionBackgroundColor, " !important")
-          },
-          "&:focus": {
-            outline: "".concat(props.backgroundType === "dark" ? props.focusColorOnDark : props.focusColor, " auto 2px")
-          },
-          "&.MuiListItem-root.Mui-selected": {
-            backgroundColor: "".concat(props.backgroundType === "dark" ? props.selectedOptionBackgroundColorOnDark : props.selectedOptionBackgroundColor, " !important")
-          },
-          "&.MuiListItem-root.Mui-focusVisible": {
-            backgroundColor: "unset"
-          },
-          "& span.MuiButtonBase-root": {
-            padding: "0px",
-            margin: "5px 0px",
-            "& span.MuiIconButton-label > svg": {
-              width: "26px",
-              height: "26px"
-            },
-            "&:hover": {
-              color: "".concat(props.backgroundType === "dark" ? props.borderColorOnDark : props.borderColor)
-            },
-            "&.Mui-checked:hover": {
-              color: "".concat(props.backgroundType === "dark" ? props.backgroundColorCheckedOnDark : props.backgroundColorChecked)
-            }
-          }
-        }
-      };
-    }
-  };
-});
-
 var DxcSelect = function DxcSelect(_ref) {
   var value = _ref.value,
       name = _ref.name,
@@ -247,14 +176,6 @@ var DxcSelect = function DxcSelect(_ref) {
       selectedValue = _useState2[0],
       setSelectedValue = _useState2[1];
 
-  var selectValues = _objectSpread({
-    width: "auto"
-  }, colorsTheme.select, {}, colorsTheme.checkbox, {
-    backgroundType: backgroundType
-  });
-
-  var classes = useStyles(selectValues);
-
   var handleSelectChange = function handleSelectChange(selectedOption) {
     if (multiple) {
       setSelectedValue(selectedOption.target.value);
@@ -275,16 +196,21 @@ var DxcSelect = function DxcSelect(_ref) {
     var selectedItem = options.filter(function (option) {
       return option.value === selected;
     })[0];
-    return _react["default"].createElement(SelectedIconContainer, {
+    return _react["default"].createElement(SelectedOptionContainer, {
       iconPosition: iconPosition,
       multiple: multiple,
       label: selectedItem && selectedItem.label,
       key: selectedItem && selectedItem.label
-    }, selectedItem && selectedItem.icon ? _react["default"].createElement(ListIconContainer, {
-      disabled: disabled
-    }, (0, _typeof2["default"])(selectedItem.icon) === "object" ? selectedItem.icon : _react["default"].createElement(selectedItem.icon)) : selectedItem && selectedItem.iconSrc && _react["default"].createElement(ListIcon, {
-      src: selectedItem && selectedItem.iconSrc
-    }), selectedItem && selectedItem.label && _react["default"].createElement(SelectedLabelContainer, {
+    }, selectedItem && selectedItem.icon ? _react["default"].createElement(SelectedOptionIconContainer, {
+      backgroundType: backgroundType,
+      disabled: disabled,
+      label: selectedItem.label,
+      iconPosition: iconPosition
+    }, (0, _typeof2["default"])(selectedItem.icon) === "object" ? selectedItem.icon : _react["default"].createElement(selectedItem.icon)) : selectedItem && selectedItem.iconSrc && _react["default"].createElement(SelectedOptionIcon, {
+      src: selectedItem && selectedItem.iconSrc,
+      label: selectedItem.label,
+      iconPosition: iconPosition
+    }), selectedItem && selectedItem.label && _react["default"].createElement(SelectedOptionLabelContainer, {
       iconSrc: selectedItem && selectedItem.iconSrc && selectedItem.icon,
       iconPosition: iconPosition,
       disabled: disabled
@@ -300,7 +226,7 @@ var DxcSelect = function DxcSelect(_ref) {
   };
 
   var getSelectedValuesWithIcons = function getSelectedValuesWithIcons(optionsList, selected) {
-    return options.filter(function (x) {
+    return optionsList.filter(function (x) {
       return selected.includes(x.value);
     }).map(function (optionToRender) {
       return getLabelForSingleSelect(optionToRender.value);
@@ -339,18 +265,19 @@ var DxcSelect = function DxcSelect(_ref) {
     return _react["default"].createElement(_react["default"].Fragment, null, multiple && _react["default"].createElement(_Checkbox["default"], {
       size: "fitContent",
       checked: isChecked(selectedValue, value, option)
-    }), _react["default"].createElement(OptionContainer, {
+    }), _react["default"].createElement(OptionListContainer, {
       iconPosition: iconPosition,
       multiple: multiple
-    }, option.icon ? _react["default"].createElement(ListIconContainer, {
+    }, option.icon ? _react["default"].createElement(OptionListIconContainer, {
       backgroundType: backgroundType,
+      disabled: disabled,
       label: option.label,
       iconPosition: iconPosition
-    }, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : _react["default"].createElement(option.icon)) : option.iconSrc && _react["default"].createElement(ListIcon, {
+    }, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : _react["default"].createElement(option.icon)) : option.iconSrc && _react["default"].createElement(OptionListIcon, {
       src: option.iconSrc,
       label: option.label,
       iconPosition: iconPosition
-    }), " ", _react["default"].createElement(LabelContainer, {
+    }), " ", _react["default"].createElement(OptionListLabelContainer, {
       backgroundType: backgroundType
     }, option.label)));
   };
@@ -373,15 +300,12 @@ var DxcSelect = function DxcSelect(_ref) {
     value: value !== undefined ? value : selectedValue,
     disabled: disabled,
     MenuProps: {
-      classes: {
-        paper: classes.dropdownStyle,
-        list: classes.itemList
-      },
       getContentAnchorEl: null,
       anchorOrigin: {
         vertical: "bottom",
         horizontal: "left"
-      }
+      },
+      disablePortal: true
     },
     inputProps: {
       tabIndex: disabled ? -1 : tabIndex
@@ -410,20 +334,52 @@ var sizes = {
 };
 
 var calculateWidth = function calculateWidth(margin, size) {
-  if (size === "fillParent") {
-    return "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
-  }
-
-  return sizes[size];
+  return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
 
 var MultipleLabelSelected = _styledComponents["default"].div(_templateObject());
 
-var LabelContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
+var OptionListContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.iconPosition === "before" && "row" || "row-reverse";
+}, function (props) {
+  return props.multiple && "margin-left: ".concat(props.theme.optionCheckboxSpacing, ";");
+});
+
+var OptionListIconContainer = _styledComponents["default"].div(_templateObject3(), function (props) {
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledColorOnDark : props.theme.disabledColor : props.backgroundType === "dark" ? props.theme.optionIconColorOnDark : props.theme.optionIconColor;
+}, function (props) {
+  return props.theme.optionIconSize;
+}, function (props) {
+  return props.theme.optionIconSize;
+}, function (props) {
+  return props.iconPosition === "after" && props.label && props.theme.optionIconSpacing || "0px";
+}, function (props) {
+  return props.iconPosition === "before" && props.label && props.theme.optionIconSpacing || "0px";
+});
+
+var OptionListIcon = _styledComponents["default"].img(_templateObject4(), function (props) {
+  return props.theme.optionIconSize;
+}, function (props) {
+  return props.theme.optionIconSize;
+}, function (props) {
+  return props.iconPosition === "after" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+}, function (props) {
+  return props.iconPosition === "before" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+});
+
+var OptionListLabelContainer = _styledComponents["default"].span(_templateObject5(), function (props) {
+  return props.theme.optionFontSize;
+}, function (props) {
+  return props.theme.optionFontStyle;
+}, function (props) {
+  return props.theme.optionFontWeight;
+}, function (props) {
   return props.backgroundType === "dark" ? props.theme.optionFontColorOnDark : props.theme.optionFontColor;
 });
 
-var SelectedIconContainer = _styledComponents["default"].div(_templateObject3(), function (props) {
+var SelectedOptionContainer = _styledComponents["default"].div(_templateObject6(), function (props) {
   return props.iconPosition === "before" && "row" || "row-reverse";
 }, function (props) {
   return props.iconPosition === "before" && "flex-start" || "flex-end";
@@ -437,47 +393,33 @@ var SelectedIconContainer = _styledComponents["default"].div(_templateObject3(),
   return props.iconPosition === "before" && (props.label !== "" || props.label === undefined) && "content:','";
 });
 
-var SelectedLabelContainer = _styledComponents["default"].span(_templateObject4(), function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
-  return (props.iconPosition === "after" || !props.iconSrc) && "0px" || "10px";
-}, function (props) {
-  return (props.iconPosition === "before" || !props.iconSrc) && "0px" || "10px";
-});
-
-var OptionContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
+var SelectedOptionLabelContainer = _styledComponents["default"].span(_templateObject7(), function (props) {
   return props.theme.fontFamily;
-}, function (props) {
-  return props.iconPosition === "before" && "row" || "row-reverse";
-}, function (props) {
-  return props.multiple && "margin-left: ".concat(props.theme.optionCheckboxSpacing, ";");
 });
 
-var ListIcon = _styledComponents["default"].img(_templateObject6(), function (props) {
-  return props.theme.iconSize;
+var SelectedOptionIcon = _styledComponents["default"].img(_templateObject8(), function (props) {
+  return props.theme.valueIconSize;
 }, function (props) {
-  return props.theme.iconSize;
+  return props.theme.valueIconSize;
 }, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+  return props.iconPosition === "after" && props.label !== "" && props.theme.valueIconSpacing || "0px";
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+  return props.iconPosition === "before" && props.label !== "" && props.theme.valueIconSpacing || "0px";
 });
 
-var ListIconContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
-  return props.backgroundType === "dark" ? props.theme.optionIconColorOnDark : props.theme.optionIconColor;
+var SelectedOptionIconContainer = _styledComponents["default"].div(_templateObject9(), function (props) {
+  return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledColorOnDark : props.theme.disabledColor : props.backgroundType === "dark" ? props.theme.valueIconColorOnDark : props.theme.valueIconColor;
 }, function (props) {
-  return props.theme.optionIconSize;
+  return props.theme.valueIconSize;
 }, function (props) {
-  return props.theme.optionIconSize;
-}, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+  return props.theme.valueIconSize;
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+  return props.iconPosition === "after" && props.label !== "" && props.theme.valueIconSpacing || "0px";
 }, function (props) {
-  return props.disabled && "0.34";
+  return props.iconPosition === "before" && props.label !== "" && props.theme.valueIconSpacing || "0px";
 });
 
-var SelectContainer = _styledComponents["default"].div(_templateObject8(), function (props) {
+var SelectContainer = _styledComponents["default"].div(_templateObject10(), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -533,8 +475,6 @@ var SelectContainer = _styledComponents["default"].div(_templateObject8(), funct
   return props.theme.valueFontWeight;
 }, function (props) {
   return props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.theme.valueFontColor;
-}, function (props) {
-  return props.backgroundType === "dark" ? props.theme.optionIconColorOnDark : props.theme.optionIconColor;
 }, function (props) {
   return props.theme.underlineThickness;
 }, function (props) {
@@ -553,6 +493,30 @@ var SelectContainer = _styledComponents["default"].div(_templateObject8(), funct
   return props.backgroundType === "dark" ? props.invalid === true && props.theme.errorColorOnDark || props.disabled && props.theme.disabledColorOnDark || props.theme.underlineColorOnDark : props.invalid === true && props.theme.errorColor || props.disabled && props.theme.disabledColor || props.theme.underlineColor;
 }, function (props) {
   return props.backgroundType === "dark" ? props.disabled && props.theme.disabledColorOnDark || props.theme.arrowColorOnDark : props.disabled && props.theme.disabledColor || props.theme.arrowColor;
+}, function (props) {
+  return props.theme.optionBackgroundColor;
+}, function (props) {
+  return props.theme.optionBorderColor;
+}, function (props) {
+  return props.theme.optionBorderThickness;
+}, function (props) {
+  return props.theme.optionBorderStyle;
+}, function (props) {
+  return props.theme.scrollBarTrackColor;
+}, function (props) {
+  return props.theme.scrollBarThumbColor;
+}, function (props) {
+  return props.theme.optionPaddingBottom;
+}, function (props) {
+  return props.theme.optionPaddingTop;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.hoverOptionBackgroundColorOnDark : props.theme.hoverOptionBackgroundColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.activeOptionBackgroundColorOnDark : props.theme.activeOptionBackgroundColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.selectedOptionBackgroundColorOnDark : props.theme.selectedOptionBackgroundColor;
 });
 
 DxcSelect.propTypes = {

package/dist/sidenav/Sidenav.js

@@ -26,7 +26,7 @@ var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 var _BackgroundColorContext = require("../BackgroundColorContext.js");
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  margin: ", ";\n  cursor: pointer;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  margin: ", ";\n  cursor: pointer;\n\n  :focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: 1px;\n  }\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -36,7 +36,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-top: 15px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 4px;\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -46,7 +46,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin: 15px 0;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 16px;\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -56,7 +56,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  max-width: 300px;\n  width: ", ";\n  padding: ", ";\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  display: flex;\n  flex-direction: column;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  max-width: 300px;\n  width: ", ";\n  padding: ", ";\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -160,6 +160,8 @@ var SideNavMenuLink = _styledComponents["default"].a(_templateObject4(), functio
   return props.theme.linkTextDecoration;
 }, function (props) {
   return "".concat(props.theme.linkMarginTop, " ").concat(props.theme.linkMarginRight, " ").concat(props.theme.linkMarginBottom, " ").concat(props.theme.linkMarginLeft);
+}, function (props) {
+  return props.theme.linkFocusColor;
 });
 
 DxcSidenav.propTypes = {