@dxc-technology/halstack-react 0.0.0-f64ebd5 → 0.0.0-f77ec3a

package/dist/checkbox/Checkbox.js

@@ -27,16 +27,16 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _RequiredComponent = _interopRequireDefault(require("../common/RequiredComponent"));
 
-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"));
+
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  width: 17px;\n  height: 17px;\n  position: absolute;\n  left: ", ";\n  right: ", ";\n  z-index: 0;\n  opacity: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  width: 16px;\n  height: 16px;\n  position: absolute;\n  left: ", ";\n  right: ", ";\n  z-index: 0;\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -46,7 +46,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  width: ", ";\n\n  opacity: ", ";\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n  position: relative;\n  flex-direction: ", ";\n  .MuiCheckbox-colorSecondary {\n    &.Mui-checked {\n      color: ", ";\n      &.Mui-disabled {\n        color: ", ";\n      }\n      &:hover {\n        background-color: transparent;\n      }\n    }\n    &.Mui-disabled {\n      color: ", ";\n    }\n  }\n  .MuiIconButton-colorSecondary {\n    &:hover {\n      background-color: transparent;\n    }\n  }\n  .MuiButtonBase-root {\n    &.Mui-focusVisible {\n      .MuiIconButton-label {\n        outline: ", " auto 1px;\n      }\n    }\n    z-index: 1;\n    padding: 10px 10px;\n    margin: 0px 2px;\n    color: ", "};\n    &.Mui-checked {\n      color: ", ";\n      &:hover {\n        background-color: transparent;\n      }\n    }\n    &.Mui-disabled {\n      opacity: ", ";\n    }\n    .MuiSvgIcon-root {\n      width: 26.6px;\n      height: 26.6px;\n    }\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n  cursor: ", ";\n  position: relative;\n  flex-direction: ", ";\n  .MuiCheckbox-colorSecondary {\n    .MuiIconButton-label {\n      & > .MuiSvgIcon-root {\n        color: ", ";\n      }\n    }\n    &.Mui-disabled {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n          opacity: 0.34;\n        }\n      }\n    }\n    &.Mui-checked {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n        }\n      }\n\n      &:hover {\n        background-color: transparent;\n        .MuiIconButton-label {\n          & > .MuiSvgIcon-root {\n            background-color: transparent;\n            color: ", ";\n          }\n        }\n      }\n    }\n    .MuiIconButton-label {\n      & > .MuiSvgIcon-root {\n        width: 24px;\n        height: 24px;\n      }\n    }\n  }\n\n  .MuiIconButton-colorSecondary {\n    &:hover {\n      background-color: transparent;\n    }\n  }\n  .MuiButtonBase-root {\n    &:hover {\n      .MuiIconButton-label {\n        & > .MuiSvgIcon-root {\n          color: ", ";\n        }\n      }\n    }\n\n    &.Mui-focusVisible {\n      .MuiIconButton-label {\n        box-shadow: 0 0 0 2px\n          ", ";\n      }\n    }\n    z-index: 1;\n    margin-left: ", ";\n    margin-right: ", ";\n    padding: 0px;\n    left: ", ";\n    right: ", ";\n  }\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -56,7 +56,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: black;\n  cursor: ", ";\n  font-family: \"Open Sans\", sans-serif;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  cursor: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -81,17 +81,22 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
       required = _ref$required === void 0 ? false : _ref$required,
       margin = _ref.margin,
       _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "fitContent" : _ref$size;
+      size = _ref$size === void 0 ? "fitContent" : _ref$size,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       innerChecked = _useState2[0],
       setInnerChecked = _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 _useState3 = (0, _react.useState)(false),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      isLabelHovered = _useState4[0],
+      setIsLabelHovered = _useState4[1];
+
+  var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
 
   var handlerCheckboxChange = function handlerCheckboxChange(checkboxValue) {
     if (checked === undefined) {
@@ -108,34 +113,49 @@ var DxcCheckbox = function DxcCheckbox(_ref) {
     }
   };
 
+  var handleLabelHover = function handleLabelHover() {
+    setIsLabelHovered(!isLabelHovered);
+  };
+
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.checkbox
   }, _react["default"].createElement(CheckboxContainer, {
     id: name,
-    brightness: _variables.theme,
+    brightness: _variables.componentTokens,
+    label: label,
     labelPosition: labelPosition,
     disabled: disabled,
     margin: margin,
-    size: size
+    size: size,
+    backgroundType: backgroundType,
+    isLabelHovered: isLabelHovered
   }, _react["default"].createElement(_Checkbox["default"], {
     checked: checked != undefined ? checked : innerChecked,
-    inputProps: name = {
-      name: name
+    inputProps: {
+      name: name,
+      "aria-label": label,
+      role: "checkbox",
+      "aria-checked": checked != undefined ? checked : innerChecked
     },
     onChange: handlerCheckboxChange,
     value: value,
     disabled: disabled,
     disableRipple: true,
-    className: "test"
+    className: "test",
+    tabIndex: tabIndex
   }), _react["default"].createElement(CheckboxBlackBack, {
     labelPosition: labelPosition,
     disabled: disabled,
-    checked: checked != undefined ? checked : innerChecked
+    checked: checked != undefined ? checked : innerChecked,
+    backgroundType: backgroundType
   }), required && _react["default"].createElement(_RequiredComponent["default"], null), label && _react["default"].createElement(LabelContainer, {
     labelPosition: labelPosition,
     onClick: disabled === true ? function (e) {} : handlerCheckboxChange,
     disabled: disabled,
-    className: "labelContainer"
+    className: "labelContainer",
+    backgroundType: backgroundType,
+    onMouseOver: handleLabelHover,
+    onMouseOut: handleLabelHover
   }, label)));
 };
 
@@ -155,8 +175,56 @@ var calculateWidth = function calculateWidth(margin, size) {
   return sizes[size];
 };
 
+var getDisabledColor = function getDisabledColor(props, element) {
+  switch (element) {
+    case "check":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledCheckColorOnDark : props.theme.disabledCheckColor;
+      break;
+
+    case "background":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledBackgroundColorCheckedOnDark : props.theme.disabledBackgroundColorChecked;
+      break;
+
+    case "border":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledBorderColorOnDark : props.theme.disabledBorderColor;
+      break;
+
+    case "label":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledFontColorOnDark : props.theme.disabledFontColor;
+      break;
+  }
+};
+
+var getNotDisabledColor = function getNotDisabledColor(props, element) {
+  switch (element) {
+    case "check":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.checkColorOnDark : props.theme.checkColor;
+      break;
+
+    case "background":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.backgroundColorCheckedOnDark : props.theme.backgroundColorChecked;
+      break;
+
+    case "border":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.borderColorOnDark : props.theme.borderColor;
+      break;
+
+    case "label":
+      return props.backgroundType && props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;
+      break;
+  }
+};
+
 var LabelContainer = _styledComponents["default"].span(_templateObject(), function (props) {
+  return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
+}, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
+}, function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontWeight;
 });
 
 var CheckboxContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
@@ -171,36 +239,42 @@ var CheckboxContainer = _styledComponents["default"].span(_templateObject2(), fu
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
   return calculateWidth(props.margin, props.size);
-}, function (props) {
-  return props.disabled ? props.theme.disabled : "1";
 }, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
   return props.labelPosition === "before" ? "row-reverse" : "row";
 }, function (props) {
-  return props.theme.color;
+  return props.isLabelHovered ? props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor : getNotDisabledColor(props, "border");
+}, function (props) {
+  return getDisabledColor(props, "border");
 }, function (props) {
-  return props.theme.color;
+  return props.disabled ? getDisabledColor(props, "background") : getNotDisabledColor(props, "background");
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.hoverBackgroundColorCheckedOnDark : props.theme.hoverBackgroundColorChecked;
 }, function (props) {
-  return props.theme.focusColor;
+  return props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
 }, function (props) {
-  return props.theme.color;
+  return props.labelPosition === "before" && props.label ? props.theme.checkLabelSpacing : "0";
 }, function (props) {
-  return props.theme.disabled;
+  return props.labelPosition === "after" && props.label ? props.theme.checkLabelSpacing : "0";
+}, function (props) {
+  return props.labelPosition === "before" ? "unset" : "1px";
+}, function (props) {
+  return props.labelPosition === "before" ? "1px" : "unset";
 });
 
 var CheckboxBlackBack = _styledComponents["default"].span(_templateObject3(), function (props) {
-  return props.checked !== true ? "transparent" : props.theme.checkColor;
+  return !props.checked ? "transparent" : props.disabled ? getDisabledColor(props, "check") : getNotDisabledColor(props, "check");
+}, function (props) {
+  return props.labelPosition === "before" ? "unset" : "5px";
 }, function (props) {
-  return props.labelPosition === "before" ? "unset" : "17px";
+  return props.labelPosition === "before" ? "5px" : "unset";
 }, function (props) {
-  return props.labelPosition === "before" ? "17px" : "unset";
+  return props.labelPosition === "after" ? "0px" : "";
 }, function (props) {
-  return props.disabled ? props.theme.disabled : "1";
+  return props.labelPosition === "before" ? "0px" : "";
 });
 
 DxcCheckbox.propTypes = {
@@ -218,7 +292,8 @@ DxcCheckbox.propTypes = {
     bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcCheckbox;
 exports["default"] = _default;

package/dist/checkbox/index.d.ts

@@ -0,0 +1,24 @@
+type Size = "small" | "medium" | "large" | "fillParent" | "fitContent";
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
+  top?: Space;
+  bottom?: Space;
+  left?: Space;
+  right?: Space;
+};
+
+type Props = {
+  checked?: boolean;
+  value?: any;
+  label?: string;
+  labelPosition?: "before" | "after";
+  name?: string,
+  disabled?: boolean;
+  onChange?: void;
+  required?: boolean;
+  margin?: Space | Margin;
+  size?: Size;
+  tabIndex?: number;
+};
+
+export default function DxcCheckbox(props: Props): JSX.Element;

package/dist/chip/Chip.js

@@ -11,11 +11,11 @@ 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 _react = _interopRequireWildcard(require("react"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -23,14 +23,22 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+var _utils = require("../common/utils.js");
 
-require("../common/OpenSans.css");
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
-var _utils = require("../common/utils.js");
+function _templateObject5() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  ", "\n  width: ", ";\n  height: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n  &:focus {\n    outline-color: ", ";\n    outline-width: 2px;\n    ", "\n  }\n"]);
+
+  _templateObject5 = function _templateObject5() {
+    return data;
+  };
+
+  return data;
+}
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: ", ";\n  margin-right: ", ";\n  max-width: 24px;\n  max-height: 24px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  margin-right: ", ";\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -40,7 +48,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: ", ";\n  margin-left: ", ";\n  max-width: 24px;\n  max-height: 24px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  margin-left: ", ";\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -50,7 +58,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: 16px;\n  font-family: \"Open Sans\";\n  line-height: 24px;\n  color: ", ";\n  cursor: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  font-family: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  color: ", ";\n  cursor: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -60,7 +68,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  border-radius: 50px;\n  margin: 2px;\n  max-width: ", ";\n  background-color: ", ";\n  ", ";\n  height: ", ";\n\n  padding: 10px 20px;\n  cursor: ", ";\n  opacity: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  min-height: 40px;\n  max-width: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -71,56 +79,100 @@ function _templateObject() {
 
 var DxcChip = function DxcChip(_ref) {
   var label = _ref.label,
+      suffixIcon = _ref.suffixIcon,
+      prefixIcon = _ref.prefixIcon,
       suffixIconSrc = _ref.suffixIconSrc,
       onClickSuffix = _ref.onClickSuffix,
       prefixIconSrc = _ref.prefixIconSrc,
       onClickPrefix = _ref.onClickPrefix,
       disabled = _ref.disabled,
-      margin = _ref.margin;
-  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]);
+      margin = _ref.margin,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+  var colorsTheme = (0, _useTheme["default"])();
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.chip
   }, _react["default"].createElement(StyledDxcChip, {
     disabled: disabled,
     margin: margin
-  }, prefixIconSrc && _react["default"].createElement(PrefixIconContainer, {
+  }, prefixIcon ? _react["default"].createElement(IconContainer, {
+    disabled: disabled,
+    prefixIcon: true,
+    label: label,
+    mode: "prefix",
+    tabIndex: typeof onClickPrefix === "function" && !disabled ? tabIndex : -1,
+    onClick: function onClick() {
+      return onClickPrefix && !disabled && onClickPrefix(label);
+    },
+    interactuable: typeof onClickPrefix === "function" && !disabled
+  }, (0, _typeof2["default"])(prefixIcon) === "object" ? prefixIcon : _react["default"].createElement(prefixIcon)) : prefixIconSrc && _react["default"].createElement(PrefixIconContainer, {
     disabled: disabled,
     src: prefixIconSrc,
     label: label,
+    tabIndex: typeof onClickPrefix === "function" && !disabled ? tabIndex : -1,
     onClick: function onClick() {
       return onClickPrefix && !disabled && onClickPrefix(label);
-    }
+    },
+    interactuable: typeof onClickPrefix === "function" && !disabled
   }), label && _react["default"].createElement(ChipTextContainer, {
     disabled: disabled,
     prefixIconSrc: prefixIconSrc,
     suffixIconSrc: suffixIconSrc
-  }, label), suffixIconSrc && _react["default"].createElement(SuffixIconContainer, {
+  }, label), suffixIcon ? _react["default"].createElement(IconContainer, {
+    disabled: disabled,
+    suffixIcon: true,
+    mode: "suffix",
+    label: label,
+    tabIndex: typeof onClickSuffix === "function" && !disabled ? tabIndex : -1,
+    onClick: function onClick() {
+      return onClickSuffix && !disabled && onClickSuffix(label);
+    },
+    interactuable: typeof onClickSuffix === "function" && !disabled
+  }, (0, _typeof2["default"])(suffixIcon) === "object" ? suffixIcon : _react["default"].createElement(suffixIcon)) : suffixIconSrc && _react["default"].createElement(SuffixIconContainer, {
     disabled: disabled,
     src: suffixIconSrc,
     label: label,
+    tabIndex: typeof onClickSuffix === "function" && !disabled ? tabIndex : -1,
     onClick: function onClick() {
       return onClickSuffix && !disabled && onClickSuffix(label);
-    }
+    },
+    interactuable: typeof onClickSuffix === "function" && !disabled
   })));
 };
 
+var getCursor = function getCursor(interactuable, disabled) {
+  if (disabled) {
+    return "cursor:not-allowed;";
+  }
+
+  if (interactuable) {
+    return "cursor:pointer;";
+  }
+
+  return "cursor:default; outline:none;";
+};
+
 var StyledDxcChip = _styledComponents["default"].div(_templateObject(), function (_ref2) {
   var margin = _ref2.margin;
   return "calc(100% - 40px - ".concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
 }, function (props) {
-  return props.theme.backgroundColor;
+  return props.disabled && props.theme.disabledBackgroundColor || props.theme.backgroundColor;
 }, function (props) {
-  return props.theme.outlinedColor !== "" ? "border: 2px solid ".concat(props.theme.outlinedColor) : "";
+  return props.theme.borderRadius;
 }, function (props) {
-  return props.theme.outlinedColor !== "" ? "18px" : "22px";
-}, function (_ref3) {
-  var disabled = _ref3.disabled;
-  return disabled && "not-allowed";
+  return props.theme.borderThickness;
 }, function (props) {
-  return props.disabled && props.theme.disabled || "initial";
+  return props.theme.borderStyle;
+}, function (props) {
+  return props.theme.borderColor;
+}, function (props) {
+  return props.theme.contentPaddingTop;
+}, function (props) {
+  return props.theme.contentPaddingBottom;
+}, function (props) {
+  return props.theme.contentPaddingLeft;
+}, function (props) {
+  return props.theme.contentPaddingRight;
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -131,33 +183,72 @@ var StyledDxcChip = _styledComponents["default"].div(_templateObject(), function
   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 (_ref3) {
+  var disabled = _ref3.disabled;
+  return disabled && "not-allowed";
 });
 
 var ChipTextContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
-  return props.theme.fontColor;
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontWeight;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.disabled ? props.theme.disabledFontColor : props.theme.fontColor;
 }, function (_ref4) {
   var disabled = _ref4.disabled;
   return disabled && "not-allowed" || "default";
 });
 
-var SuffixIconContainer = _styledComponents["default"].img(_templateObject3(), function (_ref5) {
-  var disabled = _ref5.disabled;
-  return disabled && "not-allowed" || "pointer";
+var SuffixIconContainer = _styledComponents["default"].img(_templateObject3(), function (props) {
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+}, function (props) {
+  return getCursor(props.interactuable, props.disabled);
+}, function (props) {
+  return (props.label || props.suffixIconSrc) && props.theme.iconSpacing || props.prefixIconSrc && "5px";
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.iconSize;
+});
+
+var PrefixIconContainer = _styledComponents["default"].img(_templateObject4(), function (props) {
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+}, function (props) {
+  return getCursor(props.interactuable, props.disabled);
+}, function (props) {
+  return (props.label || props.suffixIconSrc) && props.theme.iconSpacing || props.prefixIconSrc && "5px";
 }, function (props) {
-  return (props.label || props.suffixIconSrc) && "10px" || props.prefixIconSrc && "5px";
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.iconSize;
 });
 
-var PrefixIconContainer = _styledComponents["default"].img(_templateObject4(), function (_ref6) {
-  var disabled = _ref6.disabled;
-  return disabled && "not-allowed" || "pointer";
+var IconContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
+  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+}, function (props) {
+  return props.prefixIcon ? "margin-right: ".concat((props.label || props.suffixIcon || props.suffixIconSrc) && props.theme.iconSpacing || (props.prefixIcon || props.prefixIconSrc) && "0", ";") : "margin-left: ".concat((props.label || props.prefixIcon || props.prefixIconSrc) && props.theme.iconSpacing || (props.prefixIcon || props.prefixIconSrc) && "0", ";");
+}, function (props) {
+  return getCursor(props.interactuable, props.disabled);
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.iconSize;
+}, function (props) {
+  return props.theme.focusColor;
 }, function (props) {
-  return (props.label || props.suffixIconSrc) && "10px" || props.prefixIconSrc && "5px";
+  return props.disabled && "outline: none;";
 });
 
 DxcChip.propTypes = {
   label: _propTypes["default"].string,
   disabled: _propTypes["default"].bool,
   theme: _propTypes["default"].oneOf(["dark", "light"]),
+  suffixIcon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
+  prefixIcon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
   suffixIconSrc: _propTypes["default"].string,
   prefixIconSrc: _propTypes["default"].string,
   onClickSuffix: _propTypes["default"].func,
@@ -167,7 +258,8 @@ DxcChip.propTypes = {
     bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcChip;
 exports["default"] = _default;

package/dist/chip/index.d.ts

@@ -0,0 +1,22 @@
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
+  top?: Space;
+  bottom?: Space;
+  left?: Space;
+  right?: Space;
+};
+
+type Props = {
+  label?: string;
+  suffixIcon?: any;
+  preffixIcon?: any;
+  suffixIconSrc?: string;
+  onClickSuffix?: void;
+  prefixIconSrc?: string;
+  onClickPrefix?: void;
+  disabled?: boolean;
+  margin?: Space | Margin;
+  tabIndex?: number;
+};
+
+export default function DxcChip(props: Props): JSX.Element;

package/dist/common/RequiredComponent.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -11,16 +9,12 @@ exports["default"] = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _variables = require("./variables.js");
-
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
-
 function _templateObject() {
   var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: #d0011b;\n  margin-right: 1px;\n  cursor: default;\n"]);
 

package/dist/common/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCustomTheme = exports.getMargin = void 0;
+exports.getMargin = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -19,24 +19,4 @@ var getMargin = function getMargin(marginProp, side) {
   }
 };
 
-exports.getMargin = getMargin;
-
-var getCustomTheme = function getCustomTheme(defaultTheme, customTheme) {
-  var newTheme = defaultTheme;
-
-  if (customTheme) {
-    Object.keys(newTheme).map(function (component) {
-      if (customTheme[component]) {
-        Object.keys(newTheme[component]).map(function (objectKey) {
-          if (customTheme[component][objectKey]) {
-            newTheme[component][objectKey] = customTheme[component][objectKey];
-          }
-        });
-      }
-    });
-  }
-
-  return newTheme;
-};
-
-exports.getCustomTheme = getCustomTheme;
+exports.getMargin = getMargin;