@dxc-technology/halstack-react 0.0.0-e904570 → 0.0.0-e961efe

package/dist/tabs/Tabs.js

@@ -11,13 +11,15 @@ 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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _Tabs = _interopRequireDefault(require("@material-ui/core/Tabs"));
 
@@ -27,15 +29,75 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+var _Badge = _interopRequireDefault(require("../badge/Badge"));
 
-function _templateObject3() {
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
+function _templateObject9() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 22px;\n  max-width: 22px;\n  margin-bottom: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  display: flex;\n  align-items: center;\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  max-height: 22px;\n  max-width: 22px;\n"]);
 
+  _templateObject8 = function _templateObject8() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject7() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  .MuiTabs-root {\n    background: white;\n    min-height: ", ";\n\n    .MuiTabs-scroller {\n      .MuiTabs-flexContainer + span {\n        z-index: 4;\n      }\n    }\n    .MuiTab-root {\n      text-transform: ", " !important;\n    }\n    .MuiButtonBase-root {\n      font-family: ", ";\n      font-size: ", ";\n      font-style: ", ";\n      font-weight: ", ";\n\n      padding: ", ";\n      height: ", ";\n      min-width: 90px;\n      max-width: 360px;\n      min-height: ", ";\n\n      &:hover {\n        background-color: ", ";\n      }\n      &:active {\n        background-color: ", ";\n        font-weight: ", ";\n      }\n      &:not(.Mui-selected) {\n        background-color: ", ";\n        color: ", ";\n        svg {\n          color: ", ";\n        }\n      }\n      &.Mui-selected {\n        background-color: ", ";\n        color: ", ";\n        svg {\n          color: ", ";\n        }\n      }\n      &.Mui-disabled {\n        cursor: not-allowed !important;\n        pointer-events: all;\n        color: ", ";\n        font-style: ", ";\n        svg {\n          color: ", ";\n        }\n      }\n      &:focus {\n        outline: ", " auto 1px;\n      }\n    }\n    .MuiTabs-indicator {\n      background-color: ", ";\n      height: ", ";\n    }\n    .MuiTabs-scrollButtons {\n      min-width: ", ";\n      width: ", ";\n      padding: 0;\n    }\n    @media (max-width: 599.95px) {\n      .MuiTabs-scrollButtonsDesktop {\n        display: flex;\n      }\n    }\n  }\n"]);
+
+  _templateObject7 = function _templateObject7() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject6() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  left: 0px;\n  bottom: 0;\n  width: 100%;\n  height: ", ";\n  position: absolute;\n  background-color: ", ";\n"]);
+
+  _templateObject6 = function _templateObject6() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject5() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
+
+  _templateObject5 = function _templateObject5() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject4() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  right: 0;\n  top: ", ";\n  width: 23px;\n  height: 17px;\n"]);
+
+  _templateObject4 = function _templateObject4() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject3() {
+  var data = (0, _taggedTemplateLiteral2["default"])([""]);
+
   _templateObject3 = function _templateObject3() {
     return data;
   };
@@ -44,7 +106,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  .MuiTabs-root {\n    background: white;\n    .MuiTabs-scroller {\n      .MuiTabs-flexContainer + span {\n        z-index: 4;\n      }\n    }\n    .MuiButtonBase-root {\n      padding: 12px;\n      min-height: 48px;\n      height: auto;\n      font-family: \"Open Sans\", sans-serif;\n      font-size: 14px;\n      /* height: 64px cuando vengan con icono y texto */\n      min-width: 180px;\n      background-color: ", ";\n      color: ", ";\n      opacity: ", ";\n      &:hover:not(.Mui-selected):not(.Mui-disabled) {\n        opacity: ", ";\n        background-color: ", ";\n        color: ", ";\n      }\n\n      &.Mui-selected {\n        background-color: ", ";\n        color: ", ";\n        opacity: 1;\n      }\n      &.Mui-disabled {\n        cursor: not-allowed !important;\n        pointer-events: all;\n        opacity: ", ";\n      }\n    }\n    .MuiTabs-indicator {\n      background-color: ", ";\n    }\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  align-items: center;\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -54,7 +116,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  left: 0px;\n  bottom: 0;\n  width: 100%;\n  height: 2px;\n  position: absolute;\n  background-color: #d9d9d9;\n  z-index: 2;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -64,24 +126,26 @@ function _templateObject() {
 }
 
 var DxcTabs = function DxcTabs(_ref) {
-  var _ref$mode = _ref.mode,
-      mode = _ref$mode === void 0 ? "filled" : _ref$mode,
-      _ref$theme = _ref.theme,
-      theme = _ref$theme === void 0 ? "light" : _ref$theme,
-      _ref$disableRipple = _ref.disableRipple,
-      disableRipple = _ref$disableRipple === void 0 ? false : _ref$disableRipple,
-      activeTabIndex = _ref.activeTabIndex,
+  var activeTabIndex = _ref.activeTabIndex,
       _ref$tabs = _ref.tabs,
       tabs = _ref$tabs === void 0 ? [] : _ref$tabs,
       onTabClick = _ref.onTabClick,
-      margin = _ref.margin;
+      onTabHover = _ref.onTabHover,
+      margin = _ref.margin,
+      _ref$iconPosition = _ref.iconPosition,
+      iconPosition = _ref$iconPosition === void 0 ? "left" : _ref$iconPosition,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
   var _React$useState = _react["default"].useState(0),
       _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
       innerActiveTabIndex = _React$useState2[0],
       setInnerActiveTabIndex = _React$useState2[1];
 
-  var colorsTheme = (0, _react.useContext)(_ThemeContext["default"]) || _variables.colors;
+  var colorsTheme = (0, _useTheme["default"])();
+  var hasLabelAndIcon = tabs && tabs.filter(function (tab) {
+    return tab.label && tab.icon;
+  }).length > 0;
 
   var handleChange = function handleChange(event, newValue) {
     if (activeTabIndex == null) {
@@ -93,33 +157,90 @@ var DxcTabs = function DxcTabs(_ref) {
     }
   };
 
+  var getTabIndex = function getTabIndex(index, disabled) {
+    return (activeTabIndex === index || innerActiveTabIndex === index) && !disabled ? tabIndex : -1;
+  };
+
+  var getLabelForTab = function getLabelForTab(tab) {
+    return _react["default"].createElement(ParentLabelSpan, null, _react["default"].createElement(MainLabelContainer, {
+      hasBadge: tab.notificationNumber
+    }, _react["default"].createElement(TabLabelContainer, {
+      hasLabelAndIcon: hasLabelAndIcon,
+      iconPosition: iconPosition
+    }, tab.icon ? _react["default"].createElement(TabIconContainer, {
+      hasLabelAndIcon: hasLabelAndIcon,
+      iconPosition: iconPosition
+    }, (0, _typeof2["default"])(tab.icon) === "object" ? tab.icon : _react["default"].createElement(tab.icon)) : tab.iconSrc && _react["default"].createElement(TabIcon, {
+      src: tab.iconSrc
+    }), _react["default"].createElement(LabelTextContainer, null, tab.label))), tab.notificationNumber && tab.notificationNumber !== false && _react["default"].createElement(BadgeContainer, {
+      hasLabelAndIcon: hasLabelAndIcon,
+      iconPosition: iconPosition
+    }, _react["default"].createElement(_Badge["default"], {
+      notificationText: tab.notificationNumber > 99 ? "+99" : tab.notificationNumber
+    })));
+  };
+
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme
+    theme: colorsTheme.tabs
   }, _react["default"].createElement(DxCTabs, {
-    mode: mode,
-    brightness: theme,
-    margin: margin
+    margin: margin,
+    hasLabelAndIcon: hasLabelAndIcon,
+    iconPosition: iconPosition
   }, _react["default"].createElement(Underline, null), _react["default"].createElement(_Tabs["default"], {
     value: activeTabIndex != null ? activeTabIndex : innerActiveTabIndex,
     onChange: handleChange,
     variant: "scrollable",
-    scrollButtons: "off"
+    scrollButtons: "auto"
   }, tabs.map(function (tab, i) {
+    var tabContent = _react["default"].forwardRef(function (props, ref) {
+      return _react["default"].createElement("div", (0, _extends2["default"])({
+        role: "button"
+      }, props, {
+        ref: ref
+      }));
+    });
+
     return _react["default"].createElement(_Tab["default"], {
+      tabIndex: (activeTabIndex === i || innerActiveTabIndex === i) && !tab.isDisabled ? tabIndex : -1,
       key: "tab".concat(i).concat(tab.label),
-      label: tab.label,
-      icon: tab.iconSrc && _react["default"].createElement(TabIcon, {
-        src: tab.iconSrc
-      }),
+      label: getLabelForTab(tab),
       disabled: tab.isDisabled,
-      disableRipple: disableRipple
+      disableRipple: true,
+      onMouseEnter: function onMouseEnter() {
+        onTabHover(i);
+      },
+      onMouseLeave: function onMouseLeave() {
+        onTabHover(null);
+      }
     });
   }))));
 };
 
-var Underline = _styledComponents["default"].div(_templateObject());
+var ParentLabelSpan = _styledComponents["default"].div(_templateObject());
+
+var TabLabelContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
+  return props.hasLabelAndIcon && props.iconPosition === "top" && "column" || "row";
+});
+
+var LabelTextContainer = _styledComponents["default"].div(_templateObject3());
 
-var DxCTabs = _styledComponents["default"].div(_templateObject2(), function (props) {
+var BadgeContainer = _styledComponents["default"].div(_templateObject4(), function (props) {
+  return props.hasLabelAndIcon && props.iconPosition === "top" && "0" || "5px";
+});
+
+var MainLabelContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
+  return props.hasBadge && "35px" || "unset";
+}, function (props) {
+  return props.hasBadge && "35px" || "unset";
+});
+
+var Underline = _styledComponents["default"].div(_templateObject6(), function (props) {
+  return props.theme.dividerThickness;
+}, function (props) {
+  return props.theme.dividerColor;
+});
+
+var DxCTabs = _styledComponents["default"].div(_templateObject7(), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
@@ -130,54 +251,93 @@ var DxCTabs = _styledComponents["default"].div(_templateObject2(), function (pro
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 }, function (props) {
-  return props.mode === "filled" ? props.brightness === "dark" ? props.theme.darkGrey : props.theme.lightGrey : "transparent";
+  return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "48px" || "72px";
+}, function (props) {
+  return props.theme.fontTextTransform;
+}, function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.theme.fontWeight;
+}, function (props) {
+  return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "12px 16px" || "8px 16px";
+}, function (props) {
+  return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "48px" || "72px";
+}, function (props) {
+  return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "48px" || "72px";
+}, function (props) {
+  return "".concat(props.theme.hoverBackgroundColor, " !important");
 }, function (props) {
-  return props.mode === "filled" ? props.brightness === "dark" ? props.theme.white : props.theme.darkGrey : props.theme.darkGrey;
+  return "".concat(props.theme.pressedBackgroundColor, " !important");
 }, function (props) {
-  return props.mode === "filled" ? props.brightness === "dark" ? 0.8 : 0.5 : 0.5;
+  return "".concat(props.theme.pressedFontWeight, " !important");
 }, function (props) {
-  return props.mode === "filled" ? props.brightness === "light" ? 0.8 : 1 : 1;
+  return props.theme.unselectedBackgroundColor;
 }, function (props) {
-  return props.mode === "filled" ? props.theme.darkGrey : "transparent";
+  return props.theme.unselectedFontColor;
 }, function (props) {
-  return props.mode === "filled" ? props.theme.white : props.theme.darkGrey;
+  return props.theme.unselectedIconColor;
 }, function (props) {
-  return props.mode === "filled" ? props.brightness === "dark" ? props.theme.white : props.theme.black : "transparent";
+  return props.theme.selectedBackgroundColor;
 }, function (props) {
-  return props.mode === "filled" ? props.brightness === "dark" ? props.theme.black : props.theme.white : props.theme.black;
+  return props.theme.selectedFontColor;
 }, function (props) {
-  return props.mode === "underlined" ? "0.4" : "";
+  return props.theme.selectedIconColor;
 }, function (props) {
-  return props.mode === "filled" ? props.theme.yellow : props.theme.black;
+  return props.theme.disabledFontColor;
+}, function (props) {
+  return props.theme.disabledFontStyle;
+}, function (props) {
+  return props.theme.disabledIconColor;
+}, function (props) {
+  return props.theme.focusOutline;
+}, function (props) {
+  return props.theme.selectedUnderlineColor;
+}, function (props) {
+  return props.theme.selectedUnderlineThickness;
+}, function (props) {
+  return props.theme.scrollButtonsWidth;
+}, function (props) {
+  return props.theme.scrollButtonsWidth;
 });
 
-var TabIcon = _styledComponents["default"].img(_templateObject3());
+var TabIcon = _styledComponents["default"].img(_templateObject8());
+
+var TabIconContainer = _styledComponents["default"].div(_templateObject9(), function (props) {
+  return props.hasLabelAndIcon && props.iconPosition === "top" && "8px" || "";
+}, function (props) {
+  return props.hasLabelAndIcon && props.iconPosition === "left" && "12px" || "";
+});
 
 DxcTabs.propTypes = {
-  mode: _propTypes["default"].oneOf(["filled", "underlined"]),
-  theme: _propTypes["default"].oneOf(["light", "dark"]),
-  disableRipple: _propTypes["default"].bool,
   activeTabIndex: _propTypes["default"].number,
   onTabClick: _propTypes["default"].func,
+  onTabHover: _propTypes["default"].func,
   tabs: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     label: _propTypes["default"].string,
+    icon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
     iconSrc: _propTypes["default"].string,
-    isDisabled: _propTypes["default"]["boolean"]
+    isDisabled: _propTypes["default"].bool,
+    notificationNumber: _propTypes["default"].oneOfType([_propTypes["default"].bool, _propTypes["default"].string, _propTypes["default"].number])
   })),
   margin: _propTypes["default"].oneOfType([_propTypes["default"].shape({
     top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     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)))]),
+  iconPosition: _propTypes["default"].oneOf(["top", "left"]),
+  tabIndex: _propTypes["default"].number
 };
 DxcTabs.defaultProps = {
-  mode: "filled",
-  theme: "light",
-  disableRipple: false,
   activeTabIndex: null,
   tabs: [],
-  onTabClick: function onTabClick() {}
+  onTabClick: function onTabClick() {},
+  onTabHover: function onTabHover() {},
+  iconPosition: "top"
 };
 var _default = DxcTabs;
 exports["default"] = _default;

package/dist/tabs/index.d.ts

@@ -0,0 +1,19 @@
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
+  top?: Space;
+  bottom?: Space;
+  left?: Space;
+  right?: Space;
+};
+
+type Props = {
+  activeTabIndex?: number;
+  tabs?: any;
+  onTabClick?: void;
+  onTabHover?: void;
+  iconPosition?: "top" | "left";
+  margin?: Space | Margin;
+  tabIndex?: number;
+};
+
+export default function DxcTabs(props: Props): JSX.Element;

package/dist/tag/Tag.js

@@ -11,24 +11,46 @@ 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"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
 var _Box = _interopRequireDefault(require("../box/Box"));
 
+function _templateObject8() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n"]);
+
+  _templateObject8 = function _templateObject8() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject7() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: ", ";\n  height: 100%;\n  justify-content: center;\n  align-items: center;\n  color: ", ";\n"]);
+
+  _templateObject7 = function _templateObject7() {
+    return data;
+  };
+
+  return data;
+}
+
 function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0px 30px;\n  font-size: 14px;\n  text-transform: uppercase;\n  letter-spacing: 1px;\n  color: black;\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n  \n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  overflow: hidden;\n\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"]);
 
   _templateObject6 = function _templateObject6() {
     return data;
@@ -38,7 +60,7 @@ function _templateObject6() {
 }
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: 48px;\n  justify-content: center;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -48,7 +70,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 10px 12px;\n  height: 23px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background: none;\n  border-radius: 4px;\n  border: none;\n  padding: 0;\n  cursor: pointer;\n  font-family: inherit;\n\n  :focus {\n    outline: 2px solid ", ";\n  }\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -58,7 +80,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: none;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: none;\n  border-radius: 4px;\n\n  :focus {\n    outline: 2px solid ", ";\n    outline-offset: 0px;\n  }\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -68,7 +90,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  background-color: white;\n  flex-direction: ", ";\n  width: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  flex-direction: ", ";\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -78,7 +100,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  cursor: ", ";\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  cursor: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -88,17 +110,23 @@ function _templateObject() {
 }
 
 var DxcTag = function DxcTag(_ref) {
-  var iconSrc = _ref.iconSrc,
+  var icon = _ref.icon,
+      iconSrc = _ref.iconSrc,
       label = _ref.label,
       margin = _ref.margin,
       linkHref = _ref.linkHref,
       onClick = _ref.onClick,
       _ref$iconBgColor = _ref.iconBgColor,
-      iconBgColor = _ref$iconBgColor === void 0 ? "black" : _ref$iconBgColor,
+      iconBgColor = _ref$iconBgColor === void 0 ? "#5f249f" : _ref$iconBgColor,
       _ref$labelPosition = _ref.labelPosition,
       labelPosition = _ref$labelPosition === void 0 ? "after" : _ref$labelPosition,
+      _ref$newWindow = _ref.newWindow,
+      newWindow = _ref$newWindow === void 0 ? false : _ref$newWindow,
       _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 colorsTheme = (0, _useTheme["default"])();
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -106,9 +134,7 @@ var DxcTag = function DxcTag(_ref) {
       changeIsHovered = _useState2[1];
 
   var clickHandler = function clickHandler() {
-    if (onClick) {
-      onClick();
-    }
+    onClick && onClick();
   };
 
   var tagContent = _react["default"].createElement(_Box["default"], {
@@ -116,15 +142,16 @@ var DxcTag = function DxcTag(_ref) {
     shadowDepth: isHovered && (onClick || linkHref) && 2 || 1
   }, _react["default"].createElement(TagContent, {
     labelPosition: labelPosition,
-    margin: margin,
     size: size
   }, _react["default"].createElement(IconContainer, {
     iconBgColor: iconBgColor
-  }, _react["default"].createElement(TagIcon, {
+  }, icon ? _react["default"].createElement(TagIconContainer, null, (0, _typeof2["default"])(icon) === "object" ? icon : _react["default"].createElement(icon)) : _react["default"].createElement(TagIcon, {
     src: iconSrc
   })), size !== "small" && _react["default"].createElement(TagLabel, null, label)));
 
-  return _react["default"].createElement(StyledDxcTag, {
+  return _react["default"].createElement(_styledComponents.ThemeProvider, {
+    theme: colorsTheme.tag
+  }, _react["default"].createElement(StyledDxcTag, {
     margin: margin,
     onMouseEnter: function onMouseEnter() {
       return changeIsHovered(true);
@@ -134,9 +161,13 @@ var DxcTag = function DxcTag(_ref) {
     },
     onClick: clickHandler,
     hasAction: onClick || linkHref
-  }, linkHref && _react["default"].createElement(StyledLink, {
-    href: linkHref
-  }, tagContent) || tagContent);
+  }, onClick ? _react["default"].createElement(StyledButton, {
+    tabIndex: tabIndex
+  }, tagContent) : linkHref ? _react["default"].createElement(StyledLink, {
+    tabIndex: tabIndex,
+    href: linkHref,
+    target: newWindow ? "_blank" : "_self"
+  }, tagContent) : tagContent));
 };
 
 var sizes = {
@@ -176,42 +207,76 @@ var TagContent = _styledComponents["default"].div(_templateObject2(), function (
   return labelPosition === "before" && "row-reverse" || "row";
 }, function (props) {
   return calculateWidth(props.size);
+}, function (props) {
+  return props.theme.height;
 });
 
-var StyledLink = _styledComponents["default"].a(_templateObject3());
+var StyledLink = _styledComponents["default"].a(_templateObject3(), function (props) {
+  return props.theme.focusColor;
+});
+
+var StyledButton = _styledComponents["default"].button(_templateObject4(), function (props) {
+  return props.theme.focusColor;
+});
+
+var TagIcon = _styledComponents["default"].img(_templateObject5(), function (props) {
+  return props.theme.iconWidth;
+}, function (props) {
+  return props.theme.iconHeight;
+});
 
-var TagIcon = _styledComponents["default"].img(_templateObject4());
+var TagIconContainer = _styledComponents["default"].div(_templateObject6(), function (props) {
+  return props.theme.iconWidth;
+}, function (props) {
+  return props.theme.iconHeight;
+});
 
-var IconContainer = _styledComponents["default"].div(_templateObject5(), function (_ref9) {
+var IconContainer = _styledComponents["default"].div(_templateObject7(), function (_ref9) {
   var iconBgColor = _ref9.iconBgColor;
   return iconBgColor;
+}, function (props) {
+  return props.theme.iconSectionWidth;
+}, function (props) {
+  return props.theme.iconColor;
 });
 
-var TagLabel = _styledComponents["default"].div(_templateObject6());
+var TagLabel = _styledComponents["default"].div(_templateObject8(), function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.theme.fontWeight;
+}, function (props) {
+  return props.theme.fontColor;
+}, function (props) {
+  return props.theme.labelPaddingTop;
+}, function (props) {
+  return props.theme.labelPaddingBottom;
+}, function (props) {
+  return props.theme.labelPaddingLeft;
+}, function (props) {
+  return props.theme.labelPaddingRight;
+});
 
 DxcTag.propTypes = {
   size: _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(sizes))),
+  icon: _propTypes["default"].oneOfType([_propTypes["default"].element, _propTypes["default"].func]),
   iconSrc: _propTypes["default"].string,
   iconBgColor: _propTypes["default"].string,
   label: _propTypes["default"].string,
   labelPosition: _propTypes["default"].oneOf(["before", "after"]),
   linkHref: _propTypes["default"].string,
   onClick: _propTypes["default"].func,
+  newWindow: _propTypes["default"].bool,
   margin: _propTypes["default"].oneOfType([_propTypes["default"].shape({
     top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     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)))])
-};
-DxcTag.defaultProps = {
-  iconSrc: null,
-  label: null,
-  margin: null,
-  linkHref: null,
-  onClick: null,
-  iconBgColor: "black",
-  labelPosition: "after"
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcTag;
 exports["default"] = _default;