@dxc-technology/halstack-react 0.0.0-67a8cc5 → 0.0.0-6bc7b92

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"));
@@ -27,18 +25,16 @@ var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")
 
 var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl"));
 
+var _FormHelperText = _interopRequireDefault(require("@material-ui/core/FormHelperText"));
+
 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"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
@@ -47,8 +43,30 @@ var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
 var _RequiredComponent = _interopRequireDefault(require("../common/RequiredComponent"));
 
+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  .MuiFormControl-root {\n    width: 100%;\n  }\n  .MuiFormLabel-root {\n    font-size: ", ";\n    font-family: ", ";\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      color: ", ";\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: unset;\n    color: ", ";\n    align-items: center;\n    :focus {\n      background-color: transparent;\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    }\n  }\n  .MuiInputBase-root {\n    width: 100%;\n    &.Mui-focused {\n      outline: ", " auto 1px;\n    }\n    &.Mui-disabled {\n      opacity: ", ";\n      cursor: not-allowed;\n      &:focus {\n        outline: none;\n      }\n    }\n  }\n  .MuiInput-underline {\n    &:focus {\n      border-bottom: ", ";;\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: 1px solid;\n    border-bottom-color: ", "};\n  }\n  .MuiInput-underline:after {\n    border-bottom: 1px solid;\n    border-bottom-color: ", ";\n  }\n  .MuiInput-underline:before {\n    border-bottom: 1px solid;\n    border-bottom-color: ", ";\n  }\n  .MuiSelect-icon {\n    color: ", ";\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;
@@ -58,7 +76,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 20px;\n  max-width: 20px;\n  width: 20px;\n  height: 20px;\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;
@@ -68,7 +86,7 @@ function _templateObject7() {
 }
 
 function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 20px;\n  max-width: 20px;\n  width: 20px;\n  height: 20px;\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;
@@ -78,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"]);
+  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;
@@ -88,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;
@@ -98,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;
@@ -108,7 +126,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\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;
@@ -127,73 +145,12 @@ 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 {
-        boxShadow: "0px 2px 10px 0px rgba(0, 0, 0, 0.3)",
-        minWidth: props.width,
-        width: props.width,
-        maxHeight: "250px",
-        "&::-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 {
-        color: props.color,
-        "&.MuiList-padding": {
-          paddingBottom: "0px",
-          paddingTop: "0px"
-        },
-        "& li": {
-          fontSize: "16px",
-          "&:hover": {
-            backgroundColor: props.hoveredOptionBackgroundColor,
-            color: props.color
-          },
-          "&:active": {
-            backgroundColor: props.selectedOptionBackgroundColor + props.hoverOptionBackgroundColor,
-            color: props.color
-          },
-          "&.MuiListItem-root.Mui-selected": {
-            backgroundColor: props.selectedOptionBackgroundColor,
-            color: props.color
-          }
-        }
-      };
-    }
-  };
-});
-
 var DxcSelect = function DxcSelect(_ref) {
   var value = _ref.value,
       name = _ref.name,
       onChange = _ref.onChange,
       label = _ref.label,
+      assistiveText = _ref.assistiveText,
       _ref$required = _ref.required,
       required = _ref$required === void 0 ? false : _ref$required,
       _ref$disabled = _ref.disabled,
@@ -212,18 +169,13 @@ var DxcSelect = function DxcSelect(_ref) {
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
 
   var _useState = (0, _react.useState)(multiple && [] || ""),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       selectedValue = _useState2[0],
       setSelectedValue = _useState2[1];
 
-  var selectValues = _objectSpread({
-    width: "auto"
-  }, colorsTheme.select);
-
-  var classes = useStyles(selectValues);
-
   var handleSelectChange = function handleSelectChange(selectedOption) {
     if (multiple) {
       setSelectedValue(selectedOption.target.value);
@@ -244,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
@@ -269,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);
@@ -302,13 +259,37 @@ var DxcSelect = function DxcSelect(_ref) {
     }
   };
 
+  var ThemedOption = function ThemedOption(_ref2) {
+    var option = _ref2.option;
+    var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+    return _react["default"].createElement(_react["default"].Fragment, null, multiple && _react["default"].createElement(_Checkbox["default"], {
+      size: "fitContent",
+      checked: isChecked(selectedValue, value, option)
+    }), _react["default"].createElement(OptionListContainer, {
+      iconPosition: iconPosition,
+      multiple: multiple
+    }, 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(OptionListIcon, {
+      src: option.iconSrc,
+      label: option.label,
+      iconPosition: iconPosition
+    }), " ", _react["default"].createElement(OptionListLabelContainer, {
+      backgroundType: backgroundType
+    }, option.label)));
+  };
+
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.select
   }, _react["default"].createElement(SelectContainer, {
     margin: margin,
     size: size,
     invalid: invalid,
-    disabled: disabled
+    disabled: disabled,
+    backgroundType: backgroundType
   }, _react["default"].createElement(_FormControl["default"], null, _react["default"].createElement(_InputLabel["default"], {
     disabled: disabled
   }, required && _react["default"].createElement(_RequiredComponent["default"], null), label), _react["default"].createElement(_Select["default"], {
@@ -319,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
@@ -338,20 +316,14 @@ var DxcSelect = function DxcSelect(_ref) {
       value: option.value,
       disableRipple: true,
       key: option.value
-    }, multiple && _react["default"].createElement(_Checkbox["default"], {
-      size: "fitContent",
-      checked: isChecked(selectedValue, value, option)
-    }), _react["default"].createElement(OptionContainer, {
-      iconPosition: iconPosition
-    }, option.icon ? _react["default"].createElement(ListIconContainer, {
-      label: option.label,
-      iconPosition: iconPosition
-    }, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : _react["default"].createElement(option.icon)) : option.iconSrc && _react["default"].createElement(ListIcon, {
-      src: option.iconSrc,
-      label: option.label,
-      iconPosition: iconPosition
-    }), " ", _react["default"].createElement(LabelCont, null, option.label)));
-  })))));
+    }, _react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
+      color: colorsTheme.select.optionBackgroundColor
+    }, _react["default"].createElement(ThemedOption, {
+      option: option
+    })));
+  })), assistiveText && _react["default"].createElement(_FormHelperText["default"], {
+    disabled: disabled
+  }, assistiveText))));
 };
 
 var sizes = {
@@ -362,18 +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 LabelCont = _styledComponents["default"].span(_templateObject2());
+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";
@@ -387,35 +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) {
+var SelectedOptionLabelContainer = _styledComponents["default"].span(_templateObject7(), 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) {
-  return props.theme.fontFamily;
+var SelectedOptionIcon = _styledComponents["default"].img(_templateObject8(), function (props) {
+  return props.theme.valueIconSize;
 }, function (props) {
-  return props.iconPosition === "before" && "row" || "row-reverse";
-});
-
-var ListIcon = _styledComponents["default"].img(_templateObject6(), function (props) {
-  return props.iconPosition === "after" && props.label !== "" && "10px" || "0px";
+  return props.theme.valueIconSize;
+}, function (props) {
+  return props.iconPosition === "after" && props.label !== "" && props.theme.valueIconSpacing || "0px";
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && "10px" || "0px";
+  return props.iconPosition === "before" && props.label !== "" && props.theme.valueIconSpacing || "0px";
 });
 
-var ListIconContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
-  return props.iconPosition === "after" && props.label !== "" && "10px" || "0px";
+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.valueIconSize;
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && "10px" || "0px";
+  return props.theme.valueIconSize;
 }, function (props) {
-  return props.disabled && "0.34";
+  return props.iconPosition === "after" && props.label !== "" && props.theme.valueIconSpacing || "0px";
+}, function (props) {
+  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";
@@ -428,42 +432,97 @@ var SelectContainer = _styledComponents["default"].div(_templateObject8(), funct
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
-  return props.theme.fontSize;
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.assistiveTextFontSize;
+}, function (props) {
+  return props.theme.assistiveTextFontStyle;
+}, function (props) {
+  return props.theme.assistiveTextFontWeight;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.invalid === true ? props.theme.errorColorOnDark : props.theme.assistiveTextFontColorOnDark : props.invalid === true ? props.theme.errorColor : props.theme.assistiveTextFontColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.disabledColorOnDark : props.theme.disabledColor;
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
-  return props.invalid === true ? props.theme.error : props.theme.color;
+  return props.theme.labelFontSize;
+}, function (props) {
+  return props.theme.labelFontStyle;
+}, function (props) {
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.invalid === true ? props.theme.errorColorOnDark : props.theme.labelFontColorOnDark : props.invalid === true ? props.theme.errorColor : props.theme.labelFontColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.disabledColorOnDark : props.theme.disabledColor;
+}, function (props) {
+  return props.theme.labelFontSize;
+}, function (props) {
+  return props.theme.labelFontStyle;
+}, function (props) {
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.invalid === true ? props.theme.errorColorOnDark : props.theme.labelFontColorOnDark : props.invalid === true ? props.theme.errorColor : props.theme.labelFontColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.disabledColorOnDark : props.theme.disabledColor;
+}, function (props) {
+  return props.theme.valueFontSize;
+}, function (props) {
+  return props.theme.valueFontStyle;
+}, function (props) {
+  return props.theme.valueFontWeight;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.theme.valueFontColor;
+}, function (props) {
+  return props.theme.underlineThickness;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.invalid === true && props.theme.errorColorOnDark || props.disabled && props.theme.disabledColorOnDark || props.theme.underlineFocusColorOnDark : props.invalid === true && props.theme.errorColor || props.disabled && props.theme.disabledColor || props.theme.underlineFocusColor;
+}, function (props) {
+  return props.theme.underlineThickness;
+}, function (props) {
+  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.theme.underlineThickness;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.invalid === true ? props.theme.errorColorOnDark : props.theme.underlineFocusColorOnDark : props.invalid === true ? props.theme.errorColor : props.theme.underlineFocusColor;
+}, function (props) {
+  return props.theme.underlineThickness;
+}, function (props) {
+  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.theme.disabledColor;
+  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.fontSize;
+  return props.theme.optionBackgroundColor;
 }, function (props) {
-  return props.invalid === true ? props.theme.error : props.theme.color;
+  return props.theme.optionBorderColor;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.optionBorderThickness;
 }, function (props) {
-  return props.theme.disabledColor;
+  return props.theme.optionBorderStyle;
 }, function (props) {
-  return props.theme.focusColor;
+  return props.theme.scrollBarTrackColor;
 }, function (props) {
-  return props.theme.disabled;
+  return props.theme.scrollBarThumbColor;
 }, function (props) {
-  return props.disabled && "0px solid" || "2px solid";
+  return props.theme.optionPaddingBottom;
 }, function (props) {
-  return props.invalid === true && props.theme.error || props.disabled && props.theme.disabledColor || props.theme.color;
+  return props.theme.optionPaddingTop;
 }, function (props) {
-  return props.invalid === true && props.theme.error || props.disabled && props.theme.disabledColor || props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.hoverOptionBackgroundColorOnDark : props.theme.hoverOptionBackgroundColor;
 }, function (props) {
-  return props.invalid === true ? props.theme.error : props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.activeOptionBackgroundColorOnDark : props.theme.activeOptionBackgroundColor;
 }, function (props) {
-  return props.invalid === true && props.theme.error || props.disabled && props.theme.disabledColor || props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.selectedOptionBackgroundColorOnDark : props.theme.selectedOptionBackgroundColor;
 });
 
 DxcSelect.propTypes = {
   size: _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(sizes))),
   label: _propTypes["default"].string,
+  assistiveText: _propTypes["default"].string,
   name: _propTypes["default"].string,
   value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number, _propTypes["default"].arrayOf(_propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]))]),
   disabled: _propTypes["default"].bool,