@dxc-technology/halstack-react 0.0.0-4d1e793 → 0.0.0-5145b03

package/dist/spinner/Spinner.js

@@ -15,20 +15,100 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+
+function _templateObject12() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0;\n  width: 100%;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  display: ", ";\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n    color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\n"]);
+
+  _templateObject12 = function _templateObject12() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject11() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0;\n  width: 100%;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\n"]);
+
+  _templateObject11 = function _templateObject11() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject10() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: block;\n  margin: 0 auto;\n  position: absolute;\n  text-align: center;\n  width: 110px;\n"]);
+
+  _templateObject10 = function _templateObject10() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject9() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  fill: transparent;\n  stroke-linecap: initial;\n  vector-effect: non-scaling-stroke;\n  animation: ", ";\n  stroke: ", ";\n  transform-origin: ", ";\n  stroke-dasharray: ", ";\n  stroke-width: ", ";\n  stroke-dashoffset: ", ";\n"]);
+
+  _templateObject9 = function _templateObject9() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject8() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  transform: rotate(-90deg);\n  top: 0;\n  left: 0;\n  transform-origin: center;\n  overflow: visible;\n  animation: ", ";\n"]);
+
+  _templateObject8 = function _templateObject8() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject7() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: relative;\n  z-index: 2;\n"]);
+
+  _templateObject7 = function _templateObject7() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject6() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  animation: none;\n  fill: transparent;\n  stroke: ", ";\n  stroke-dasharray: ", ";\n  stroke-linecap: initial;\n  stroke-width: ", ";\n  transform-origin: 50% 50%;\n  vector-effect: non-scaling-stroke;\n"]);
+
+  _templateObject6 = function _templateObject6() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject5() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n"]);
+
+  _templateObject5 = function _templateObject5() {
+    return data;
+  };
+
+  return data;
+}
+
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  margin-top: ", ";\n  display: ", ";\n  color: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: inherit;\n  width: inherit;\n  position: absolute;\n  z-index: 1;\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -38,7 +118,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-weight: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  margin-top: ", ";\n  color: ", ";\n  text-transform: ", ";\n  text-align: ", ";\n  letter-spacing: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100vw;\n  height: 100vh;\n  opacity: 1;\n  transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;\n  position: fixed;\n  top: 0;\n  left: 0;\n  background-color: ", ";\n  opacity: ", ";\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -48,7 +128,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: unset;\n  border-radius: 80px;\n  border: ", ";\n  width: ", ";\n  height: ", ";\n  z-index: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  .MuiCircularProgress-colorPrimary {\n    color: ", ";\n    width: ", ";\n    height: ", ";\n    margin-top: ", ";\n    margin-left: ", ";\n  }\n\n  .MuiCircularProgress-circle {\n    stroke-width: ", ";\n    r: ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  align-items: center;\n  display: flex;\n  height: ", ";\n  width: ", ";\n  justify-content: center;\n  position: relative;\n  background-color: transparent;\n\n  @keyframes spinner-svg {\n    0% {\n      transform: rotateZ(0deg);\n    }\n    100% {\n      transform: rotateZ(360deg);\n    }\n  }\n  @keyframes svg-circle-large {\n    0% {\n      stroke-dashoffset: 400;\n      transform: rotate(0);\n    }\n\n    50% {\n      stroke-dashoffset: 75;\n      transform: rotate(45deg);\n    }\n\n    100% {\n      stroke-dashoffset: 400;\n      transform: rotate(360deg);\n    }\n  }\n  @keyframes svg-circle-small {\n    0% {\n      stroke-dashoffset: 35;\n      transform: rotate(0);\n    }\n\n    50% {\n      stroke-dashoffset: 8;\n      transform: rotate(45deg);\n    }\n\n    100% {\n      stroke-dashoffset: 35;\n      transform: rotate(360deg);\n    }\n  }\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -58,7 +138,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  opacity: ", ";\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: ", ";\n  align-items: ", ";\n  position: ", ";\n  top: ", ";\n  left: ", ";\n  right: ", ";\n  bottom: ", ";\n  z-index: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  display: ", ";\n  position: ", ";\n  top: ", ";\n  left: ", ";\n  justify-content: ", ";\n  align-items: ", ";\n  z-index: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -77,28 +157,101 @@ var DxcSpinner = function DxcSpinner(_ref) {
       mode = _ref$mode === void 0 ? "large" : _ref$mode,
       margin = _ref.margin;
   var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.spinner
-  }, _react["default"].createElement(BackgroundSpinner, {
-    mode: mode
   }, _react["default"].createElement(DXCSpinner, {
     margin: margin,
-    showValue: showValue,
-    label: label,
     mode: mode
-  }, label && mode !== "small" && _react["default"].createElement(SpinnerLabel, {
-    showValue: showValue,
+  }, _react["default"].createElement(SpinnerContainer, {
+    backgroundType: backgroundType,
+    mode: mode
+  }, mode === "overlay" && _react["default"].createElement(BackOverlay, null), _react["default"].createElement(BackgroundSpinner, {
+    mode: mode
+  }, mode !== "small" && _react["default"].createElement(SVGBackground, {
+    viewBox: "0 0 140 140"
+  }, _react["default"].createElement(CircleBackground, {
+    cx: "70",
+    cy: "70",
+    r: "65",
     mode: mode
-  }, label), value && mode !== "small" && _react["default"].createElement(SpinnerProgress, {
+  })), mode === "small" && _react["default"].createElement(SVGBackground, {
+    viewBox: "0 0 16 16"
+  }, _react["default"].createElement(CircleBackground, {
+    cx: "8",
+    cy: "8",
+    r: "6",
+    mode: mode
+  }))), value >= 0 && value <= 100 ? _react["default"].createElement(Spinner, {
+    role: "progressbar",
+    mode: mode
+  }, mode !== "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 140 140",
+    isDeterminated: true
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "70",
+    cy: "70",
+    r: "65",
+    backgroundType: backgroundType,
     mode: mode,
-    showValue: showValue,
-    label: label
-  }, value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100, "%"), _react["default"].createElement(_CircularProgress["default"], {
-    variant: showValue ? "static" : "indeterminate",
-    value: value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100,
+    isDeterminated: true,
+    value: value
+  })), mode === "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 16 16",
+    isDeterminated: true
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "8",
+    cy: "8",
+    r: "6",
+    backgroundType: backgroundType,
+    mode: mode,
+    isDeterminated: true,
+    value: value
+  }))) : _react["default"].createElement(Spinner, {
+    role: "progressbar",
+    mode: mode
+  }, mode !== "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 140 140",
+    isDeterminated: false
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "70",
+    cy: "70",
+    r: "65",
+    backgroundType: backgroundType,
     mode: mode,
-    label: label
-  }))));
+    isDeterminated: false
+  })), mode === "small" && _react["default"].createElement(SVGSpinner, {
+    viewBox: "0 0 16 16",
+    isDeterminated: false
+  }, _react["default"].createElement(CircleSpinner, {
+    cx: "8",
+    cy: "8",
+    r: "6",
+    backgroundType: backgroundType,
+    mode: mode,
+    isDeterminated: false
+  }))), mode !== "small" && _react["default"].createElement(LabelsContainer, {
+    label: label,
+    value: value,
+    showValue: showValue
+  }, _react["default"].createElement(SpinnerLabel, {
+    backgroundType: backgroundType,
+    mode: mode
+  }, label), (value || value === 0) && showValue && _react["default"].createElement(SpinnerProgress, {
+    backgroundType: backgroundType,
+    mode: mode,
+    showValue: showValue
+  }, value, "%")))));
+};
+
+var determinatedValue = function determinatedValue(props, strokeDashArray) {
+  var val = 0;
+
+  if (props.value >= 0 && props.value <= 100) {
+    val = strokeDashArray * (1 - props.value / 100);
+  }
+
+  return val;
 };
 
 DxcSpinner.propTypes = {
@@ -114,14 +267,12 @@ DxcSpinner.propTypes = {
   }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
 };
 
-var BackgroundSpinner = _styledComponents["default"].div(_templateObject(), function (props) {
-  return props.mode === "overlay" ? "".concat(props.theme.overlayBackgroundColor) : "transparent";
+var DXCSpinner = _styledComponents["default"].div(_templateObject(), function (props) {
+  return props.mode === "overlay" ? "100vh" : "";
 }, function (props) {
-  return props.mode === "overlay" && "".concat(props.theme.overlayOpacity);
+  return props.mode === "overlay" ? "100vw" : "";
 }, function (props) {
-  return props.mode === "overlay" ? "center" : "";
-}, function (props) {
-  return props.mode === "overlay" ? "center" : "";
+  return props.mode === "overlay" ? "flex" : "";
 }, function (props) {
   return props.mode === "overlay" ? "fixed" : "";
 }, function (props) {
@@ -129,21 +280,11 @@ var BackgroundSpinner = _styledComponents["default"].div(_templateObject(), func
 }, function (props) {
   return props.mode === "overlay" ? 0 : "";
 }, function (props) {
-  return props.mode === "overlay" ? 0 : "";
+  return props.mode === "overlay" ? "center" : "";
 }, function (props) {
-  return props.mode === "overlay" ? 0 : "";
+  return props.mode === "overlay" ? "center" : "";
 }, function (props) {
   return props.mode === "overlay" ? 1300 : "";
-});
-
-var DXCSpinner = _styledComponents["default"].div(_templateObject2(), function (props) {
-  return props.mode === "small" && "6px solid ".concat(props.theme.totalCircleColor) || "8.5px solid ".concat(props.theme.totalCircleColor);
-}, function (props) {
-  return props.mode === "small" && "30px" || "120px";
-}, function (props) {
-  return props.mode === "small" && "30px" || "120px";
-}, function (props) {
-  return props.mode === "overlay" ? "100" : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -154,23 +295,55 @@ var DXCSpinner = _styledComponents["default"].div(_templateObject2(), 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] : "";
+});
+
+var SpinnerContainer = _styledComponents["default"].div(_templateObject2(), function (props) {
+  return props.mode === "small" ? "16px" : "140px";
 }, function (props) {
-  return props.theme.trackCircleColor;
+  return props.mode === "small" ? "16px" : "140px";
+});
+
+var BackOverlay = _styledComponents["default"].div(_templateObject3(), function (props) {
+  return "".concat(props.theme.overlayBackgroundColor);
 }, function (props) {
-  return props.mode === "small" && "44px !important" || "141px !important";
+  return "".concat(props.theme.overlayOpacity);
+});
+
+var BackgroundSpinner = _styledComponents["default"].div(_templateObject4());
+
+var SVGBackground = _styledComponents["default"].svg(_templateObject5());
+
+var CircleBackground = _styledComponents["default"].circle(_templateObject6(), function (props) {
+  return "".concat(props.theme.totalCircleColor);
 }, function (props) {
-  return props.mode === "small" && "44px !important" || "141px !important";
+  return props.mode !== "small" ? "409" : "38";
 }, function (props) {
-  return props.label === "" && props.showValue === false && props.mode === "large" ? "-10px" : props.mode === "small" ? "-7px" : props.label !== "" && props.showValue === false ? "-80px" : props.label === "" && props.showValue === true && props.mode === "overlay" ? "-10.75px" : props.label === "" && props.showValue === true && props.mode !== "overlay" ? "-79.75px" : props.label !== "" && props.showValue === true && props.mode === "overlay" ? "-72.5px" : "-89.5px";
+  return props.mode !== "small" ? "8.5px" : "2px";
+});
+
+var Spinner = _styledComponents["default"].div(_templateObject7());
+
+var SVGSpinner = _styledComponents["default"].svg(_templateObject8(), function (props) {
+  return !props.isDeterminated ? "1.4s linear infinite both spinner-svg" : "";
+});
+
+var CircleSpinner = _styledComponents["default"].circle(_templateObject9(), function (props) {
+  return props.isDeterminated ? "none" : props.mode !== "small" ? "1.4s ease-in-out infinite both svg-circle-large" : "1.4s ease-in-out infinite both svg-circle-small";
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.trackCircleColorOnDark : props.theme.trackCircleColor;
 }, function (props) {
-  return props.mode === "small" && "-7px !important" || "-11px !important";
+  return !props.isDeterminated ? "50% 50%" : "";
 }, function (props) {
-  return props.mode === "small" && "6.2px" || "2.7px";
+  return props.mode !== "small" ? "409" : "38";
 }, function (props) {
-  return props.mode === "small" && "18.2" || "20.2";
+  return props.mode !== "small" ? "8.5px" : "2px";
+}, function (props) {
+  return props.isDeterminated ? props.mode !== "small" ? determinatedValue(props, 409) : determinatedValue(props, 38) : "";
 });
 
-var SpinnerLabel = _styledComponents["default"].div(_templateObject3(), function (props) {
+var LabelsContainer = _styledComponents["default"].div(_templateObject10());
+
+var SpinnerLabel = _styledComponents["default"].p(_templateObject11(), function (props) {
   return props.mode === "overlay" ? props.theme.overlayLabelFontFamily : props.theme.labelFontFamily;
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayLabelFontWeight : props.theme.labelFontWeight;
@@ -179,18 +352,16 @@ var SpinnerLabel = _styledComponents["default"].div(_templateObject3(), function
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayLabelFontStyle : props.theme.labelFontStyle;
 }, function (props) {
-  return props.showValue === false && "52px" || "45px";
-}, function (props) {
-  return props.mode === "overlay" ? props.theme.overlayLabelFontColor : props.theme.labelFontColor;
-}, function (props) {
-  return props.mode === "overlay" ? props.theme.overlayLabelFontTextTransform : props.theme.labelFontTextTransform;
+  return props.mode === "overlay" ? props.theme.overlayLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayLabelTextAlign : props.theme.labelTextAlign;
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayLabelLetterSpacing : props.theme.labelLetterSpacing;
 });
 
-var SpinnerProgress = _styledComponents["default"].div(_templateObject4(), function (props) {
+var SpinnerProgress = _styledComponents["default"].p(_templateObject12(), function (props) {
+  return props.value !== "" && props.showValue === true && "block" || "none";
+}, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontFamily : props.theme.progressValueFontFamily;
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontWeight : props.theme.progressValueFontWeight;
@@ -199,11 +370,7 @@ var SpinnerProgress = _styledComponents["default"].div(_templateObject4(), funct
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueFontStyle : props.theme.progressValueFontStyle;
 }, function (props) {
-  return props.label === "" && "52px" || "";
-}, function (props) {
-  return props.value !== "" && props.showValue === true && "block" || "none";
-}, function (props) {
-  return props.mode === "overlay" ? props.theme.overlayProgressValueFontColor : props.theme.progressValueFontColor;
+  return props.mode === "overlay" ? props.theme.overlayProgressValueFontColor : props.backgroundType === "dark" ? props.theme.progressValueFontColorOnDark : props.theme.progressValueFontColor;
 }, function (props) {
   return props.mode === "overlay" ? props.theme.overlayProgressValueTextAlign : props.theme.progressValueTextAlign;
 }, function (props) {

package/dist/table/Table.js

@@ -23,6 +23,8 @@ var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
+var _BackgroundColorContext = require("../BackgroundColorContext.js");
+
 function _templateObject2() {
   var data = (0, _taggedTemplateLiteral2["default"])(["\n  border-collapse: collapse;\n  width: 100%;\n\n  & tr {\n    border-bottom: ", ";\n  }\n  & td {\n    background-color: ", ";\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    text-transform: ", ";\n    text-align: ", ";\n    line-height: ", ";\n    padding: ", ";\n  }\n  & th {\n    background-color: ", ";\n    font-family: ", ";\n    font-size: ", ";\n    font-style: ", ";\n    font-weight: ", ";\n    color: ", ";\n    text-transform: ", ";\n    text-align: ", ";\n    line-height: ", ";\n    padding: ", ";\n  }\n  & th:first-child {\n    border-top-left-radius: ", ";\n  }\n  & th:last-child {\n    border-top-right-radius: ", ";\n  }\n"]);
 
@@ -34,7 +36,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  overflow-y: auto;\n  &::-webkit-scrollbar {\n    width: 8px;\n  }\n  &::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 6px;\n  }\n  &::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 6px;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  overflow: hidden auto;\n  &::-webkit-scrollbar {\n    width: 8px;\n  }\n  &::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 6px;\n  }\n  &::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 6px;\n  }\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -51,7 +53,9 @@ var DxcTable = function DxcTable(_ref) {
     theme: colorsTheme.table
   }, _react["default"].createElement(DxcTableContainer, {
     margin: margin
-  }, _react["default"].createElement(DxcTableContent, null, children)));
+  }, _react["default"].createElement(DxcTableContent, null, _react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
+    color: colorsTheme.table.dataBackgroundColor
+  }, children))));
 };
 
 var calculateWidth = function calculateWidth(margin) {

package/dist/tag/Tag.js

@@ -30,7 +30,7 @@ var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 var _Box = _interopRequireDefault(require("../box/Box"));
 
 function _templateObject8() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0px 30px;\n  text-transform: ", ";\n  letter-spacing: 0.025em;\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n"]);
+  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;
@@ -40,7 +40,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: ", ";\n  justify-content: center;\n  align-items: center;\n  color: ", ";\n  height: ", ";\n"]);
+  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;
@@ -50,7 +50,7 @@ function _templateObject7() {
 }
 
 function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  height: 43px;\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  overflow: hidden;\n  img,\n  svg {\n    height: ", ";\n    width: ", ";\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;
@@ -60,7 +60,7 @@ function _templateObject6() {
 }
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 10px 12px;\n  height: ", ";\n  width: ", ";\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;
@@ -70,7 +70,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background: none;\n  border: none;\n  padding: 0;\n  cursor: pointer;\n  outline: 0;\n  font-family: inherit;\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;
@@ -80,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;
@@ -100,7 +100,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-style: ", ";\n  display: inline-flex;\n  cursor: ", ";\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;
@@ -117,7 +117,7 @@ var DxcTag = function DxcTag(_ref) {
       linkHref = _ref.linkHref,
       onClick = _ref.onClick,
       _ref$iconBgColor = _ref.iconBgColor,
-      iconBgColor = _ref$iconBgColor === void 0 ? "#6f2c91" : _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,
@@ -125,7 +125,7 @@ var DxcTag = function DxcTag(_ref) {
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fitContent" : _ref$size,
       _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 1 : _ref$tabIndex;
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
 
   var _useState = (0, _react.useState)(false),
@@ -134,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"], {
@@ -144,7 +142,6 @@ 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
@@ -185,9 +182,7 @@ var calculateWidth = function calculateWidth(size) {
   return sizes[size];
 };
 
-var StyledDxcTag = _styledComponents["default"].div(_templateObject(), function (props) {
-  return props.theme.fontStyle;
-}, function (_ref2) {
+var StyledDxcTag = _styledComponents["default"].div(_templateObject(), function (_ref2) {
   var hasAction = _ref2.hasAction;
   return hasAction && "pointer" || "unset";
 }, function (_ref3) {
@@ -216,20 +211,24 @@ var TagContent = _styledComponents["default"].div(_templateObject2(), function (
   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());
+var StyledButton = _styledComponents["default"].button(_templateObject4(), function (props) {
+  return props.theme.focusColor;
+});
 
 var TagIcon = _styledComponents["default"].img(_templateObject5(), function (props) {
-  return props.theme.iconHeight;
-}, function (props) {
   return props.theme.iconWidth;
+}, function (props) {
+  return props.theme.iconHeight;
 });
 
 var TagIconContainer = _styledComponents["default"].div(_templateObject6(), function (props) {
-  return props.theme.iconHeight;
-}, function (props) {
   return props.theme.iconWidth;
+}, function (props) {
+  return props.theme.iconHeight;
 });
 
 var IconContainer = _styledComponents["default"].div(_templateObject7(), function (_ref9) {
@@ -239,12 +238,26 @@ var IconContainer = _styledComponents["default"].div(_templateObject7(), functio
   return props.theme.iconSectionWidth;
 }, function (props) {
   return props.theme.iconColor;
-}, function (props) {
-  return props.theme.height;
 });
 
 var TagLabel = _styledComponents["default"].div(_templateObject8(), function (props) {
-  return props.theme.fontTextTransform;
+  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 = {
@@ -265,16 +278,5 @@ DxcTag.propTypes = {
   }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
   tabIndex: _propTypes["default"].number
 };
-DxcTag.defaultProps = {
-  icon: null,
-  iconSrc: null,
-  label: null,
-  margin: null,
-  linkHref: null,
-  onClick: null,
-  iconBgColor: "#6f2c91",
-  labelPosition: "after",
-  newWindow: false
-};
 var _default = DxcTag;
 exports["default"] = _default;