@dxc-technology/halstack-react 0.0.0-afd5470 → 0.0.0-b1729d7

package/dist/dropdown/Dropdown.js

@@ -11,10 +11,10 @@ exports["default"] = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -35,16 +35,44 @@ var _Paper = _interopRequireDefault(require("@material-ui/core/Paper"));
 
 var _MenuList = _interopRequireDefault(require("@material-ui/core/MenuList"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
+function _templateObject10() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  margin-left: ", ";\n  color: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"]);
+
+  _templateObject10 = function _templateObject10() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject9() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\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  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
+
+  _templateObject8 = function _templateObject8() {
+    return data;
+  };
+
+  return data;
+}
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  margin-left: 10px;\n  margin-right: 10px;\n  & > svg {\n    fill: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
 
   _templateObject7 = function _templateObject7() {
     return data;
@@ -54,7 +82,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-right: ", ";\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject6 = function _templateObject6() {
     return data;
@@ -84,7 +112,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: pointer;\n  font-family: \"Open Sans\", sans-serif;\n  font-size: 16px;\n  width: 100%;\n  height: auto;\n  min-height: 46px;\n  display: inline-flex;\n  justify-content: space-between;\n  align-items: center;\n  min-width: ", ";\n\n  padding: ", ";\n  &:focus {\n    outline: none;\n  }\n\n  background-color: ", ";\n\n  color: ", ";\n\n  border: none;\n  border-radius: 2px;\n  border-bottom-right-radius: ", ";\n  border-bottom-left-radius: ", ";\n  &:hover {\n    background-color: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: space-between;\n  align-items: center;\n  width: 100%;\n  height: auto;\n  min-height: 40px;\n  cursor: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  min-width: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  background-color: ", ";\n  color: ", ";\n  border-bottom-right-radius: ", ";\n  border-bottom-left-radius: ", ";\n\n  ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -94,7 +122,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: 1;\n\n  .MuiMenuItem-gutters {\n    width: ", ";\n  }\n  .MuiMenuItem-root {\n    min-height: 46px;\n    height: auto;\n  }\n\n  .MuiPaper-root {\n    min-width: ", ";\n\n    background-color: ", ";\n\n    color: ", ";\n\n    border-bottom-left-radius: 2px;\n    border-bottom-right-radius: 2px;\n    border-top-left-radius: 0px;\n    border-top-right-radius: 0px;\n    max-height: 230px;\n    overflow: auto;\n    .MuiList-padding {\n      padding-top: 0px;\n      padding-bottom: 0px;\n    }\n    .MuiListItem-button {\n      display: flex;\n      flex-direction: ", ";\n      justify-content: ", ";\n      font-size: 16px;\n      font-family: \"Open Sans\", sans-serif;\n      cursor: pointer;\n    }\n    .MuiListItem-button:hover {\n      background-color: ", ";\n      color: ", ";\n    }\n\n    ::-webkit-scrollbar {\n      width: 3px;\n    }\n\n    ::-webkit-scrollbar-track {\n      background-color: ", ";\n      border-radius: 3px;\n    }\n\n    ::-webkit-scrollbar-thumb {\n      background-color: ", ";\n      border-radius: 3px;\n    }\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: 1;\n\n  .MuiMenuItem-gutters {\n    width: ", ";\n  }\n  .MuiMenuItem-root {\n    min-height: 36px;\n    padding-top: ", ";\n    padding-bottom: ", ";\n    padding-left: ", ";\n    padding-right: ", ";\n    height: auto;\n  }\n  .MuiPaper-root {\n    min-width: ", ";\n    border-width: ", ";\n    border-style: ", ";\n    border-color: ", ";\n    border-bottom-left-radius: ", ";\n    border-bottom-right-radius: ", ";\n    border-top-left-radius: 0px;\n    border-top-right-radius: 0px;\n    max-height: 230px;\n    overflow-y: auto;\n\n    ::-webkit-scrollbar {\n      width: 3px;\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\n    .MuiList-padding {\n      padding-top: 0px;\n      padding-bottom: 0px;\n    }\n    .MuiListItem-button {\n      display: flex;\n      flex-direction: ", ";\n      justify-content: ", ";\n      background-color: ", ";\n      font-family: ", ";\n      font-size: ", ";\n      font-style: ", ";\n      font-weight: ", ";\n      color: ", ";\n      cursor: pointer;\n    }\n    .MuiListItem-button:focus {\n      outline: ", " solid 2px;\n      outline-offset: -2px;\n    }\n    .MuiListItem-button:hover {\n      background-color: ", ";\n    }\n    .MuiListItem-button:active {\n      background-color: ", ";\n      outline: ", " solid 2px;\n      outline-offset: -2px;\n    }\n  }\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -104,7 +132,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: inline-block;\n\n  &:focus {\n    outline: ", " auto 1px;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: inline-block;\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -118,12 +146,15 @@ var DxcDropdown = function DxcDropdown(_ref) {
       options = _ref$options === void 0 ? [] : _ref$options,
       _ref$optionsIconPosit = _ref.optionsIconPosition,
       optionsIconPosition = _ref$optionsIconPosit === void 0 ? "before" : _ref$optionsIconPosit,
+      icon = _ref.icon,
       _ref$iconSrc = _ref.iconSrc,
       iconSrc = _ref$iconSrc === void 0 ? "" : _ref$iconSrc,
       _ref$iconPosition = _ref.iconPosition,
       iconPosition = _ref$iconPosition === void 0 ? "before" : _ref$iconPosition,
       _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       _ref$caretHidden = _ref.caretHidden,
       caretHidden = _ref$caretHidden === void 0 ? false : _ref$caretHidden,
       onSelectOption = _ref.onSelectOption,
@@ -131,28 +162,30 @@ var DxcDropdown = function DxcDropdown(_ref) {
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fitContent" : _ref$size,
       _ref$expandOnHover = _ref.expandOnHover,
-      expandOnHover = _ref$expandOnHover === void 0 ? false : _ref$expandOnHover;
+      expandOnHover = _ref$expandOnHover === void 0 ? false : _ref$expandOnHover,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
   var _useState = (0, _react.useState)(),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       width = _useState2[0],
       setWidth = _useState2[1];
 
-  var customTheme = (0, _react.useContext)(_ThemeContext["default"]);
-  var colorsTheme = (0, _react.useMemo)(function () {
-    return (0, _utils.getCustomTheme)(_variables.theme, (0, _utils.getCustomTheme)(_variables.defaultTheme, customTheme));
-  }, [customTheme]);
+  var colorsTheme = (0, _useTheme["default"])();
   var ref = (0, _react.useRef)(null);
 
   var handleResize = function handleResize() {
-    setWidth(ref.current.offsetWidth);
+    if (ref.current) setWidth(ref.current.offsetWidth);
   };
 
   (0, _react.useEffect)(function () {
-    if (ref.current) ref.current.addEventListener("resize", handleResize);
-    handleResize();
+    if (ref.current) {
+      ref.current.addEventListener("resize", handleResize);
+      handleResize();
+    }
+
     return function () {
-      ref.current.removeEventListener("resize", handleResize);
+      if (ref.current) ref.current.removeEventListener("resize", handleResize);
     };
   }, []);
 
@@ -184,7 +217,8 @@ var DxcDropdown = function DxcDropdown(_ref) {
       xmlns: "http://www.w3.org/2000/svg",
       width: "24",
       height: "24",
-      viewBox: "0 0 24 24"
+      viewBox: "0 0 24 24",
+      fill: "currentColor"
     }, _react["default"].createElement("path", {
       d: "M7 14l5-5 5 5z"
     }), _react["default"].createElement("path", {
@@ -198,7 +232,8 @@ var DxcDropdown = function DxcDropdown(_ref) {
       xmlns: "http://www.w3.org/2000/svg",
       width: "24",
       height: "24",
-      viewBox: "0 0 24 24"
+      viewBox: "0 0 24 24",
+      fill: "currentColor"
     }, _react["default"].createElement("path", {
       d: "M7 10l5 5 5-5z"
     }), _react["default"].createElement("path", {
@@ -209,40 +244,43 @@ var DxcDropdown = function DxcDropdown(_ref) {
 
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.dropdown
-  }, _react["default"].createElement(DxCDropdownContainer, {
+  }, _react["default"].createElement(DXCDropdownContainer, {
     margin: margin,
     size: size,
-    tabIndex: "0"
+    disabled: disabled
   }, _react["default"].createElement("div", {
-    onMouseOver: expandOnHover ? handleClickListItem : undefined,
+    onMouseOver: expandOnHover && !disabled ? handleClickListItem : undefined,
     onMouseOut: handleCloseOver,
     onFocus: handleCloseOver,
     onBlur: handleCloseOver
   }, _react["default"].createElement(DropdownTrigger, {
     opened: anchorEl === null ? false : true,
     onClick: handleClickListItem,
+    disabled: disabled,
     label: label,
     caretHidden: caretHidden,
     margin: margin,
     size: size,
-    ref: ref
+    ref: ref,
+    tabIndex: tabIndex
   }, _react["default"].createElement(DropdownTriggerContainer, {
     iconPosition: iconPosition,
     caretHidden: caretHidden
-  }, iconSrc && _react["default"].createElement(ListIcon, {
+  }, icon ? _react["default"].createElement(ButtonIconContainer, {
+    label: label,
+    iconPosition: iconPosition,
+    disabled: disabled
+  }, (0, _typeof2["default"])(icon) === "object" ? icon : _react["default"].createElement(icon)) : iconSrc && _react["default"].createElement(ButtonIcon, {
     label: label,
     src: iconSrc,
     iconPosition: iconPosition
   }), _react["default"].createElement(DropdownTriggerLabel, {
     iconPosition: iconPosition,
     label: label
-  }, label)), _react["default"].createElement(CaretIcon, null, anchorEl === null ? _react["default"].createElement(DownArrowIcon, {
+  }, label)), _react["default"].createElement(CaretIconContainer, {
     caretHidden: caretHidden,
-    margin: margin
-  }) : _react["default"].createElement(UpArrowIcon, {
-    caretHidden: caretHidden,
-    margin: margin
-  }))), _react["default"].createElement(DxcMenu, {
+    disabled: disabled
+  }, !caretHidden && (anchorEl === null ? _react["default"].createElement(DownArrowIcon, null) : _react["default"].createElement(UpArrowIcon, null)))), _react["default"].createElement(DXCMenu, {
     anchorEl: anchorEl,
     open: Boolean(anchorEl),
     onClose: handleClose,
@@ -268,8 +306,7 @@ var DxcDropdown = function DxcDropdown(_ref) {
       onClickAway: handleClose
     }, _react["default"].createElement(_MenuList["default"], {
       autoFocusItem: Boolean(anchorEl),
-      id: "menu-list-grow",
-      onKeyDown: handleClose
+      id: "menu-list-grow"
     }, options.map(function (option) {
       return _react["default"].createElement(_MenuItem["default"], {
         key: option.value,
@@ -278,7 +315,10 @@ var DxcDropdown = function DxcDropdown(_ref) {
         onClick: function onClick(event) {
           return handleMenuItemClick(option);
         }
-      }, option.iconSrc && _react["default"].createElement(ListIcon, {
+      }, option.icon ? _react["default"].createElement(ListIconContainer, {
+        label: option.label,
+        iconPosition: optionsIconPosition
+      }, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : _react["default"].createElement(option.icon)) : option.iconSrc && _react["default"].createElement(ListIcon, {
         label: option.label,
         src: option.iconSrc,
         iconPosition: optionsIconPosition
@@ -305,7 +345,7 @@ var calculateWidth = function calculateWidth(margin, size) {
   return sizes[size];
 };
 
-var DxCDropdownContainer = _styledComponents["default"].div(_templateObject(), function (props) {
+var DXCDropdownContainer = _styledComponents["default"].div(_templateObject(), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -317,50 +357,98 @@ var DxCDropdownContainer = _styledComponents["default"].div(_templateObject(), f
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
-}, function (props) {
-  return props.theme.focusColor;
 });
 
-var DxcMenu = (0, _styledComponents["default"])(_Popper["default"])(_templateObject2(), function (props) {
+var DXCMenu = (0, _styledComponents["default"])(_Popper["default"])(_templateObject2(), function (props) {
   return calculateWidth(props.margin, props.size);
+}, function (props) {
+  return props.theme.optionPaddingTop;
+}, function (props) {
+  return props.theme.optionPaddingBottom;
+}, function (props) {
+  return props.theme.optionPaddingLeft;
+}, function (props) {
+  return props.theme.optionPaddingRight;
 }, function (props) {
   return "".concat(props.width, "px");
 }, function (props) {
-  return props.theme.dropdownBackgroundColor;
+  return props.theme.borderThickness;
+}, function (props) {
+  return props.theme.borderStyle;
+}, function (props) {
+  return props.theme.borderColor;
+}, function (props) {
+  return props.theme.borderRadius;
 }, function (props) {
-  return props.theme.dropdownFontColor;
+  return props.theme.borderRadius;
+}, function (props) {
+  return props.theme.scrollBarTrackColor;
+}, function (props) {
+  return props.theme.scrollBarThumbColor;
 }, function (props) {
   return props.optionsIconPosition === "after" && "row-reverse" || "row";
 }, function (props) {
   return props.optionsIconPosition === "after" && "flex-end" || "";
 }, function (props) {
-  return props.theme.backgroundColor + props.theme.hoverBackgroundOption;
+  return props.theme.optionBackgroundColor;
 }, function (props) {
-  return props.theme.dropdownFontColor;
+  return props.theme.optionFontFamily;
 }, function (props) {
-  return props.theme.scrollBarTrackColor;
+  return props.theme.optionFontSize;
 }, function (props) {
-  return props.theme.scrollBarThumbColor;
+  return props.theme.optionFontStyle;
+}, function (props) {
+  return props.theme.optionFontWeight;
+}, function (props) {
+  return props.theme.optionFontColor;
+}, function (props) {
+  return props.theme.focusColor;
+}, function (props) {
+  return props.theme.hoverOptionBackgroundColor;
+}, function (props) {
+  return props.theme.activeOptionBackgroundColor;
+}, function (props) {
+  return props.theme.focusColor;
 });
 
 var DropdownTrigger = _styledComponents["default"].button(_templateObject3(), function (props) {
+  return props.disabled ? "not-allowed" : "pointer";
+}, function (props) {
+  return props.theme.buttonFontFamily;
+}, function (props) {
+  return props.theme.buttonFontSize;
+}, function (props) {
+  return props.theme.buttonFontStyle;
+}, function (props) {
+  return props.theme.buttonFontWeight;
+}, function (props) {
+  return props.theme.borderRadius;
+}, function (props) {
+  return props.theme.borderThickness;
+}, function (props) {
+  return props.theme.borderStyle;
+}, function (props) {
+  return props.disabled ? props.theme.disabledBorderColor : props.theme.borderColor;
+}, function (props) {
   return props.label === "" ? "0px" : calculateWidth(props.margin, props.size);
 }, function (props) {
-  if (props.caretHidden === true && props.label === "") {
-    return "10px 15px";
-  } else {
-    return "10px 15px 10px 20px";
-  }
+  return props.theme.buttonPaddingTop;
+}, function (props) {
+  return props.theme.buttonPaddingBottom;
+}, function (props) {
+  return props.theme.buttonPaddingLeft;
 }, function (props) {
-  return props.opened === true ? props.theme.backgroundColor + props.theme.hoverBackgroundColor : props.theme.backgroundColor;
+  return props.theme.buttonPaddingRight;
 }, function (props) {
-  return props.theme.fontColor;
+  return props.disabled ? props.theme.disabledButtonBackgroundColor : props.theme.buttonBackgroundColor;
 }, function (props) {
-  return props.opened === true ? "0px" : "2px";
+  return props.disabled ? props.theme.disabledColor : props.theme.buttonFontColor;
 }, function (props) {
-  return props.opened === true ? "0px" : "2px";
+  return props.opened ? "0px" : props.theme.borderRadius;
 }, function (props) {
-  return props.theme.backgroundColor + props.theme.hoverBackgroundColor;
+  return props.opened ? "0px" : props.theme.borderRadius;
+}, function (props) {
+  return !props.disabled && "  \n      &:focus {\n        outline: none;\n      }\n      &:focus-visible {\n        outline: ".concat(props.theme.focusColor, " solid 2px;\n        outline-offset: -2px;\n      }\n      &:hover {\n        background-color: ").concat(props.theme.hoverButtonBackgroundColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeButtonBackgroundColor, ";\n      }\n  ");
 });
 
 var DropdownTriggerLabel = _styledComponents["default"].span(_templateObject4());
@@ -368,27 +456,63 @@ var DropdownTriggerLabel = _styledComponents["default"].span(_templateObject4())
 var DropdownTriggerContainer = _styledComponents["default"].span(_templateObject5(), function (props) {
   return props.iconPosition === "after" && "row-reverse" || "row";
 }, function (props) {
-  return props.caretHidden ? "100%" : "calc(100% - 44px)";
+  return props.caretHidden ? "100%" : "calc(100% - 36px)";
 });
 
-var ListIcon = _styledComponents["default"].img(_templateObject6(), function (props) {
-  if (props.iconPosition === "before" && props.label !== "") {
-    return "10px";
-  } else {
-    return "0px";
-  }
+var ButtonIcon = _styledComponents["default"].img(_templateObject6(), function (props) {
+  return props.theme.buttonIconSize;
 }, function (props) {
-  if (props.iconPosition === "after" && props.label !== "") {
-    return "10px";
-  } else {
-    return "0px";
-  }
+  return props.theme.buttonIconSize;
+}, function (props) {
+  return props.iconPosition === "after" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+}, function (props) {
+  return props.iconPosition === "before" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+});
+
+var ButtonIconContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
+  return props.theme.buttonIconSize;
+}, function (props) {
+  return props.theme.buttonIconSize;
+}, function (props) {
+  return props.iconPosition === "after" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+}, function (props) {
+  return props.iconPosition === "before" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+}, function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.buttonIconColor;
 });
 
-var CaretIcon = _styledComponents["default"].div(_templateObject7(), function (props) {
-  return props.caretHidden === true ? "none" : "inline-flex";
+var ListIcon = _styledComponents["default"].img(_templateObject8(), 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 ListIconContainer = _styledComponents["default"].div(_templateObject9(), 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";
+}, function (props) {
+  return props.theme.optionIconColor;
+});
+
+var CaretIconContainer = _styledComponents["default"].div(_templateObject10(), function (props) {
+  return props.caretHidden ? "none" : "inline-flex";
+}, function (props) {
+  return props.theme.caretIconSpacing;
+}, function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.caretIconColor;
+}, function (props) {
+  return props.theme.caretIconSize;
 }, function (props) {
-  return props.theme.fontColor;
+  return props.theme.caretIconSize;
 });
 
 DxcDropdown.propTypes = {
@@ -400,17 +524,21 @@ DxcDropdown.propTypes = {
     right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
   }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
   optionsIconPosition: _propTypes["default"].oneOf(["after", "before", ""]),
+  icon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
   iconSrc: _propTypes["default"].string,
   iconPosition: _propTypes["default"].oneOf(["after", "before", ""]),
   label: _propTypes["default"].string,
   caretHidden: _propTypes["default"].bool,
+  disabled: _propTypes["default"].bool,
   expandOnHover: _propTypes["default"].bool,
   onSelectOption: _propTypes["default"].func,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     value: _propTypes["default"].any.isRequired,
     label: _propTypes["default"].any.isRequired,
+    icon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
     iconSrc: _propTypes["default"].string
-  }))
+  })),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcDropdown;
 exports["default"] = _default;