@dxc-technology/halstack-react 0.0.0-13e0035 → 0.0.0-1418b62

package/dist/date/Date.js

@@ -54,8 +54,6 @@ function _templateObject() {
 }
 
 var DxcDate = function DxcDate(_ref) {
-  var _colorsTheme$date, _colorsTheme$date2;
-
   var value = _ref.value,
       _ref$format = _ref.format,
       format = _ref$format === void 0 ? "dd-MM-yyyy" : _ref$format,
@@ -173,11 +171,11 @@ var DxcDate = function DxcDate(_ref) {
             width: "3px"
           },
           "&::-webkit-scrollbar-track": {
-            backgroundColor: colorsTheme.date.scrollBarTrackColor,
+            backgroundColor: "#D9D9D9",
             borderRadius: "3px"
           },
           "&::-webkit-scrollbar-thumb": {
-            backgroundColor: colorsTheme.date.scrollBarThumbColor,
+            backgroundColor: "#666666",
             borderRadius: "3px"
           }
         }
@@ -203,7 +201,7 @@ var DxcDate = function DxcDate(_ref) {
       MuiButtonBase: {
         root: {
           "&:focus": {
-            outline: colorsTheme.date.focusColor + " 2px solid"
+            outline: colorsTheme.date.focusColor + " solid 2px"
           }
         }
       },
@@ -221,8 +219,8 @@ var DxcDate = function DxcDate(_ref) {
       },
       MuiPickersToolbarText: {
         toolbarTxt: {
-          color: colorsTheme === null || colorsTheme === void 0 ? void 0 : (_colorsTheme$date = colorsTheme.date) === null || _colorsTheme$date === void 0 ? void 0 : _colorsTheme$date.pickerActualDateColor,
-          fontFamily: colorsTheme === null || colorsTheme === void 0 ? void 0 : (_colorsTheme$date2 = colorsTheme.date) === null || _colorsTheme$date2 === void 0 ? void 0 : _colorsTheme$date2.fontFamily,
+          color: colorsTheme.date.pickerActualDateColor,
+          fontFamily: colorsTheme.date.fontFamily,
           fontSize: "2rem"
         },
         toolbarBtnSelected: {

package/dist/dialog/Dialog.js

@@ -42,7 +42,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  display: flex;\n  justify-content: flex-end;\n  position: absolute;\n  top: ", ";\n  right: ", ";\n  cursor: pointer;\n  padding: 0;\n  margin: 0;\n  background: none;\n  width: ", ";\n  height: ", ";\n  border: none;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: flex-end;\n  position: absolute;\n  top: ", ";\n  right: ", ";\n  cursor: pointer;\n  padding: 0;\n  margin: 0;\n  background: none;\n  color: ", ";\n  width: ", ";\n  height: ", ";\n  border: none;\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -52,7 +52,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow-y: auto;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  color: ", ";\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  & * {\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"])([""]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -91,21 +91,15 @@ var DxcDialog = function DxcDialog(_ref) {
   var colorsTheme = (0, _useTheme["default"])();
 
   var handleClose = function handleClose() {
-    if (typeof onCloseClick === "function") {
-      onCloseClick();
-    }
+    typeof onCloseClick === "function" && onCloseClick();
   };
 
   var handleOverlayClick = function handleOverlayClick() {
-    if (typeof onBackgroundClick === "function") {
-      onBackgroundClick();
-    }
+    typeof onBackgroundClick === "function" && onBackgroundClick();
   };
 
   var handleResize = function handleResize(width) {
-    if (width) {
-      if (width <= _variables.responsiveSizes.tablet ? setIsResponsive(true) : setIsResponsive(false)) ;
-    }
+    width && width <= _variables.responsiveSizes.tablet ? setIsResponsive(true) : setIsResponsive(false);
   };
 
   var handleEventListener = function handleEventListener() {
@@ -175,30 +169,14 @@ var DialogContainer = (0, _styledComponents["default"])(_Dialog["default"])(_tem
   return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
 });
 
-var Children = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
-  return props.theme.fontSize;
-}, function (props) {
-  return props.theme.fontWeight;
-}, function (props) {
-  return props.theme.fontColor;
-}, function (props) {
-  return props.theme.scrollBarTrackColor;
-}, function (props) {
-  return props.theme.scrollBarThumbColor;
-}, function (props) {
-  return props.theme.scrollBarTrackColor;
-}, function (props) {
-  return props.theme.scrollBarThumbColor;
-});
+var Children = _styledComponents["default"].div(_templateObject2());
 
 var CloseIconContainer = _styledComponents["default"].button(_templateObject3(), function (props) {
-  return props.theme.closeIconColor;
-}, function (props) {
   return props.theme.closeIconTopPosition;
 }, function (props) {
   return props.theme.closeIconRightPosition;
+}, function (props) {
+  return props.theme.closeIconColor;
 }, function (props) {
   return props.theme.closeIconWidth;
 }, function (props) {

package/dist/dropdown/Dropdown.js

@@ -41,8 +41,28 @@ var _utils = require("../common/utils.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  display: ", ";\n  margin-top:", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  & > svg {\n    fill: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject8 = function _templateObject8() {
     return data;
@@ -52,7 +72,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  width: ", ";\n  height: ", ";\n  overflow: hidden;\n  margin-left: ", ";\n  margin-right: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\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;
@@ -92,7 +112,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0 16px;\n  cursor: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  width: 100%;\n  height: auto;\n  min-height: ", ";\n  display: inline-flex;\n  justify-content: space-between;\n  align-items: center;\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n\n  min-width: ", ";\n\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  &:focus {\n    outline: none;\n  }\n\n  background-color: ", ";\n  color: ", ";\n\n  border-bottom-right-radius: ", ";\n  border-bottom-left-radius: ", ";\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\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;
@@ -102,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: 36px;\n    padding-top: ", ";\n    padding-bottom: ", ";\n    padding-left: ", ";\n    padding-right: ", ";\n    height: auto;\n  }\n\n  .MuiPaper-root {\n    min-width: ", ";\n\n    border-width: ", ";\n    border-style: ", ";\n    border-color: ", ";\n\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: 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: ", ";\n      font-style: ", ";\n      font-weight: ", ";\n      color: ", ";\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;
@@ -112,7 +132,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  opacity: ", ";\n  height: 40px;\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;
@@ -197,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", {
@@ -211,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", {
@@ -222,7 +244,7 @@ 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,
     disabled: disabled
@@ -244,23 +266,21 @@ var DxcDropdown = function DxcDropdown(_ref) {
   }, _react["default"].createElement(DropdownTriggerContainer, {
     iconPosition: iconPosition,
     caretHidden: caretHidden
-  }, icon ? _react["default"].createElement(ListIconContainer, {
+  }, icon ? _react["default"].createElement(ButtonIconContainer, {
     label: label,
-    iconPosition: iconPosition
-  }, (0, _typeof2["default"])(icon) === "object" ? icon : _react["default"].createElement(icon)) : iconSrc && _react["default"].createElement(ListIcon, {
+    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, caretHidden !== true && (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,
@@ -325,9 +345,7 @@ var calculateWidth = function calculateWidth(margin, size) {
   return sizes[size];
 };
 
-var DxCDropdownContainer = _styledComponents["default"].div(_templateObject(), function (props) {
-  return props.disabled ? "0.34" : "unset";
-}, 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";
@@ -339,20 +357,18 @@ 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.optionsPaddingTop;
+  return props.theme.optionPaddingTop;
 }, function (props) {
-  return props.theme.optionsPaddingBottom;
+  return props.theme.optionPaddingBottom;
 }, function (props) {
-  return props.theme.optionsPaddingLeft;
+  return props.theme.optionPaddingLeft;
 }, function (props) {
-  return props.theme.optionsPaddingRight;
+  return props.theme.optionPaddingRight;
 }, function (props) {
   return "".concat(props.width, "px");
 }, function (props) {
@@ -365,40 +381,46 @@ var DxcMenu = (0, _styledComponents["default"])(_Popper["default"])(_templateObj
   return props.theme.borderRadius;
 }, function (props) {
   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.optionsFontSize;
+  return props.theme.optionBackgroundColor;
 }, function (props) {
-  return props.theme.optionsFontStyle;
+  return props.theme.optionFontFamily;
 }, function (props) {
-  return props.theme.optionsFontWeight;
+  return props.theme.optionFontSize;
 }, function (props) {
-  return props.theme.optionsListFontColor;
+  return props.theme.optionFontStyle;
 }, function (props) {
-  return props.theme.optionsListHoverBackgroundColor;
+  return props.theme.optionFontWeight;
 }, function (props) {
-  return props.theme.dropdownFontColor;
+  return props.theme.optionFontColor;
 }, function (props) {
-  return props.theme.scrollBarTrackColor;
+  return props.theme.focusColor;
 }, function (props) {
-  return props.theme.scrollBarThumbColor;
+  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.fontFamily;
+  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.minHeight;
 }, function (props) {
   return props.theme.borderRadius;
 }, function (props) {
@@ -406,29 +428,27 @@ var DropdownTrigger = _styledComponents["default"].button(_templateObject3(), fu
 }, function (props) {
   return props.theme.borderStyle;
 }, function (props) {
-  return props.theme.borderColor;
+  return props.disabled ? props.theme.disabledBorderColor : props.theme.borderColor;
 }, function (props) {
   return props.label === "" ? "0px" : calculateWidth(props.margin, props.size);
 }, function (props) {
-  return props.theme.labelPaddingTop;
+  return props.theme.buttonPaddingTop;
 }, function (props) {
-  return props.theme.labelPaddingBottom;
+  return props.theme.buttonPaddingBottom;
 }, function (props) {
-  return props.theme.labelPaddingLeft;
+  return props.theme.buttonPaddingLeft;
 }, function (props) {
-  return props.theme.labelPaddingRight;
+  return props.theme.buttonPaddingRight;
 }, function (props) {
-  return props.opened === true ? props.theme.buttonHoverBackgroundColor : props.theme.buttonBackgroundColor;
+  return props.disabled ? props.theme.disabledButtonBackgroundColor : props.theme.buttonBackgroundColor;
 }, function (props) {
-  return props.theme.buttonFontColor;
+  return props.disabled ? props.theme.disabledColor : props.theme.buttonFontColor;
 }, function (props) {
-  return props.opened === true ? "0px" : props.theme.borderRadius;
+  return props.opened ? "0px" : props.theme.borderRadius;
 }, function (props) {
-  return props.opened === true ? "0px" : props.theme.borderRadius;
+  return props.opened ? "0px" : props.theme.borderRadius;
 }, function (props) {
-  return !props.disabled ? props.theme.buttonHoverBackgroundColor : "";
-}, function (props) {
-  return !props.disabled ? "#d9d9d9" : "";
+  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());
@@ -439,40 +459,60 @@ var DropdownTriggerContainer = _styledComponents["default"].span(_templateObject
   return props.caretHidden ? "100%" : "calc(100% - 36px)";
 });
 
-var ListIcon = _styledComponents["default"].img(_templateObject6(), function (props) {
-  return props.theme.iconSize;
+var ButtonIcon = _styledComponents["default"].img(_templateObject6(), function (props) {
+  return props.theme.buttonIconSize;
 }, function (props) {
-  return props.theme.iconSize;
+  return props.theme.buttonIconSize;
 }, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.iconOptionSpacing || "0px";
+  return props.iconPosition === "after" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.iconOptionSpacing || "0px";
+  return props.iconPosition === "before" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
 });
 
-var ListIconContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
-  return props.theme.iconColor;
+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.theme.iconSize;
+  return props.iconPosition === "before" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+}, function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.buttonIconColor;
+});
+
+var ListIcon = _styledComponents["default"].img(_templateObject8(), function (props) {
+  return props.theme.optionIconSize;
 }, function (props) {
-  return props.theme.iconSize;
+  return props.theme.optionIconSize;
 }, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.iconOptionSpacing || "0px";
+  return props.iconPosition === "after" && props.label !== "" && props.theme.optionIconSpacing || "0px";
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.iconOptionSpacing || "0px";
+  return props.iconPosition === "before" && props.label !== "" && props.theme.optionIconSpacing || "0px";
 });
 
-var CaretIcon = _styledComponents["default"].div(_templateObject8(), function (props) {
-  return props.caretHidden === true ? "none" : "inline-flex";
+var ListIconContainer = _styledComponents["default"].div(_templateObject9(), function (props) {
+  return props.theme.optionIconSize;
 }, function (props) {
-  return props.theme.caretIconMarginTop;
+  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.caretIconMarginBottom;
+  return props.theme.caretIconSpacing;
 }, function (props) {
-  return props.theme.caretIconMarginLeft;
+  return props.disabled ? props.theme.disabledColor : props.theme.caretIconColor;
 }, function (props) {
-  return props.theme.caretIconMarginRight;
+  return props.theme.caretIconSize;
 }, function (props) {
-  return props.theme.fontColor;
+  return props.theme.caretIconSize;
 });
 
 DxcDropdown.propTypes = {