@dxc-technology/halstack-react 0.0.0-b146e44 → 0.0.0-b3da1a9

package/dist/progress-bar/ProgressBar.js

@@ -9,12 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
@@ -23,16 +23,24 @@ var _LinearProgress = _interopRequireDefault(require("@material-ui/core/LinearPr
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-require("../common/OpenSans.css");
-
 var _variables = require("../common/variables.js");
 
-var _utils = require("../common/utils.js");
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+
+function _templateObject6() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 1.5em;\n"]);
+
+  _templateObject6 = function _templateObject6() {
+    return data;
+  };
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
+  return data;
+}
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: 12px;\n  color: ", ";\n  display: ", ";\n  width: 5%;\n  text-align: right;\n  margin-bottom: 8px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-style: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  text-transform: ", ";\n  color: ", ";\n  display: ", ";\n  flex-shrink: 0;\n"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -42,7 +50,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-transform: uppercase;\n  font-size: 12px;\n  flex-grow: 1;\n  color: ", ";\n  width: 90%;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  margin-bottom: 8px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-style: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  text-transform: ", ";\n  color: ", ";\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -52,7 +60,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  width: 685px;\n  flex-wrap: wrap;\n  width: 100%;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  width: 685px;\n  flex-wrap: wrap;\n  width: 100%;\n  margin-bottom: 8px;\n  align-items: baseline;\n  justify-content: space-between;\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -62,7 +70,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: ", ";\n  width: ", ";\n  .MuiLinearProgress-root {\n    height: 9px;\n    background-color: ", ";\n    border-radius: 5px;\n  }\n  .MuiLinearProgress-bar {\n    background-color: ", ";\n  }\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: ", ";\n  width: ", ";\n  .MuiLinearProgress-root {\n    height: ", ";\n    background-color: ", ";\n    border-radius: ", ";\n    margin-bottom: ", ";\n  }\n  .MuiLinearProgress-bar {\n    background-color: ", ";\n  }\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -72,7 +80,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  width: ", ";\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: ", ";\n  height: ", ";\n  align-items: ", ";\n  min-width: 685px;\n  max-width: ", ";\n  position: ", ";\n  top: ", ";\n  bottom: ", ";\n  left: ", ";\n  right: ", ";\n  font-family: \"Open Sans\", sans-serif;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  opacity: ", ";\n  width: ", ";\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: ", ";\n  height: ", ";\n  align-items: ", ";\n  min-width: 100px;\n  max-width: ", ";\n  position: ", ";\n  top: ", ";\n  bottom: ", ";\n  left: ", ";\n  right: ", ";\n  z-index: ", ";\n  width: 100%;\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -84,49 +92,45 @@ function _templateObject() {
 var DxcProgressBar = function DxcProgressBar(_ref) {
   var _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
+      _ref$helperText = _ref.helperText,
+      helperText = _ref$helperText === void 0 ? "" : _ref$helperText,
       _ref$overlay = _ref.overlay,
       overlay = _ref$overlay === void 0 ? true : _ref$overlay,
       value = _ref.value,
       _ref$showValue = _ref.showValue,
       showValue = _ref$showValue === void 0 ? false : _ref$showValue,
       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]);
+  var colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.progressBar
   }, _react["default"].createElement(BackgroundProgressBar, {
     overlay: overlay
   }, _react["default"].createElement(DXCProgressBar, {
     overlay: overlay,
-    margin: margin
+    margin: margin,
+    backgroundType: backgroundType
   }, _react["default"].createElement(InfoProgressBar, null, _react["default"].createElement(ProgressBarLabel, {
-    overlay: overlay
+    overlay: overlay,
+    backgroundType: backgroundType
   }, label), _react["default"].createElement(ProgressBarProgress, {
     overlay: overlay,
-    showValue: showValue
+    showValue: showValue,
+    backgroundType: backgroundType
   }, value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100, " %")), _react["default"].createElement(_LinearProgress["default"], {
     variant: showValue ? "determinate" : "indeterminate",
-    value: value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100
-  }))));
-};
-
-DxcProgressBar.propTypes = {
-  label: _propTypes["default"].string,
-  overlay: _propTypes["default"].bool,
-  value: _propTypes["default"].number,
-  showValue: _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)))])
+    value: value === "" ? 0 : value >= 0 && value <= 100 ? value : value < 0 ? 0 : 100,
+    helperText: helperText
+  }), helperText && _react["default"].createElement(HelperText, {
+    overlay: overlay,
+    backgroundType: backgroundType
+  }, helperText))));
 };
 
 var BackgroundProgressBar = _styledComponents["default"].div(_templateObject(), function (props) {
-  return props.overlay === true ? "".concat(props.theme.overlayColor).concat(props.theme.overlayOpacity) : "transparent";
+  return props.overlay === true ? "".concat(props.theme.overlayColor) : "transparent";
+}, function (props) {
+  return props.overlay === true && "0.8";
 }, function (props) {
   return props.overlay === true ? "100%" : "";
 }, function (props) {
@@ -147,6 +151,8 @@ var BackgroundProgressBar = _styledComponents["default"].div(_templateObject(),
   return props.overlay === true ? "0" : "";
 }, function (props) {
   return props.overlay === true ? "0" : "";
+}, function (props) {
+  return props.overlay ? 1300 : "";
 });
 
 var DXCProgressBar = _styledComponents["default"].div(_templateObject2(), function (props) {
@@ -154,9 +160,15 @@ var DXCProgressBar = _styledComponents["default"].div(_templateObject2(), functi
 }, function (props) {
   return props.overlay === true ? "80%" : "100%";
 }, function (props) {
-  return "".concat(props.theme.totalLine).concat(props.theme.totalLineOpacity);
+  return props.theme.thickness;
+}, function (props) {
+  return props.theme.totalLineColor;
 }, function (props) {
-  return props.theme.trackLine;
+  return props.theme.borderRadius;
+}, function (props) {
+  return props.helperText !== "" && "8px";
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.trackLineColorOnDark : props.theme.trackLineColor;
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -172,14 +184,59 @@ var DXCProgressBar = _styledComponents["default"].div(_templateObject2(), functi
 var InfoProgressBar = _styledComponents["default"].div(_templateObject3());
 
 var ProgressBarLabel = _styledComponents["default"].div(_templateObject4(), function (props) {
-  return props.overlay === true ? "#FFFFFF" : props.theme.fontColor;
+  return props.theme.labelFontFamily;
+}, function (props) {
+  return props.theme.labelFontStyle;
+}, function (props) {
+  return props.theme.labelFontSize;
+}, function (props) {
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.theme.labelFontTextTransform;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.overlay === true ? "#FFFFFF" : props.theme.labelFontColor;
 });
 
 var ProgressBarProgress = _styledComponents["default"].div(_templateObject5(), function (props) {
-  return props.overlay === true ? "#FFFFFF" : props.theme.fontColor;
+  return props.theme.valueFontFamily;
+}, function (props) {
+  return props.theme.valueFontStyle;
+}, function (props) {
+  return props.theme.valueFontSize;
+}, function (props) {
+  return props.theme.valueFontWeight;
+}, function (props) {
+  return props.theme.valueFontTextTransform;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.valueFontColorOnDark : props.overlay === true ? "#FFFFFF" : props.theme.valueFontColor;
 }, function (props) {
   return props.value !== "" && props.showValue === true && "block" || "none";
 });
 
+var HelperText = _styledComponents["default"].span(_templateObject6(), function (props) {
+  return props.backgroundType === "dark" ? props.theme.helperTextFontColorOnDark : props.overlay === true ? "#FFFFFF" : props.theme.helperTextFontColor;
+}, function (props) {
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.helperTextFontSize;
+}, function (props) {
+  return props.theme.helperTextFontStyle;
+}, function (props) {
+  return props.theme.helperTextFontWeight;
+});
+
+DxcProgressBar.propTypes = {
+  label: _propTypes["default"].string,
+  helperText: _propTypes["default"].string,
+  overlay: _propTypes["default"].bool,
+  value: _propTypes["default"].number,
+  showValue: _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)))])
+};
 var _default = DxcProgressBar;
 exports["default"] = _default;

package/dist/radio/Radio.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 _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: \"Open Sans\", sans-serif;\n  color: ", ";\n  cursor: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  color: ", ";\n  cursor: ", ";\n"]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -46,7 +46,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n\n  display: inline-flex;\n  align-items: center;\n  max-height: 42px;\n  position: relative;\n  flex-direction: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n  opacity: ", ";\n  .MuiButtonBase-root {\n    padding: 0px;\n    margin: 0px 5px;\n    width: 40px;\n    height: 40px;\n    .MuiIconButton-label {\n      .MuiSvgIcon-root {\n        height: 24px;\n        width: 24px;\n      }\n      color: ", ";\n      > div > :nth-child(2) path {\n        color: ", ";\n      }\n    }\n\n    &.Mui-focusVisible {\n      background-color: transparent;\n      .MuiSvgIcon-root {\n        outline: ", " auto 1px;\n      }\n    }\n    :hover {\n      background-color: transparent;\n    }\n    .MuiTouchRipple-ripple {\n      height: 40px !important;\n      width: 40px !important;\n      top: 0px !important;\n      left: 0px !important;\n    }\n  }\n  .MuiRadio-colorSecondary.Mui-checked {\n    color: ", ";\n    :hover {\n      background-color: transparent;\n    }\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n\n  display: inline-flex;\n  align-items: center;\n  max-height: 42px;\n  position: relative;\n  flex-direction: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n  .MuiButtonBase-root {\n    width: auto;\n    height: auto;\n    padding: 10px;\n    margin: 2px;\n    ", ": ", ";\n    padding-left: ", ";\n    padding-right: ", ";\n    margin-left: ", ";\n    margin-right: ", ";\n    .MuiIconButton-label {\n      .MuiSvgIcon-root {\n        height: ", ";\n        width: ", ";\n      }\n      color: ", ";\n\n      > div > :nth-child(2) path {\n        color: ", ";\n      }\n    }\n\n    &.Mui-focusVisible {\n      background-color: transparent;\n      .MuiSvgIcon-root {\n        outline: ", "\n          auto 1px;\n      }\n    }\n    :hover {\n      background-color: transparent;\n    }\n    .MuiTouchRipple-ripple {\n      height: 40px !important;\n      width: 40px !important;\n      top: 0px !important;\n      left: 0px !important;\n    }\n  }\n  .MuiRadio-colorSecondary.Mui-checked {\n    color: ", ";\n    :hover {\n      background-color: transparent;\n    }\n  }\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -77,10 +77,8 @@ var DxcRadio = function DxcRadio(_ref) {
       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 colorsTheme = (0, _useTheme["default"])();
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
 
   var handlerRadioChange = function handlerRadioChange(value) {
     if (checked == null) {
@@ -99,7 +97,8 @@ var DxcRadio = function DxcRadio(_ref) {
     labelPosition: labelPosition,
     disabled: disabled,
     margin: margin,
-    size: size
+    size: size,
+    backgroundType: backgroundType
   }, _react["default"].createElement(_Radio["default"], {
     checked: checked != null && checked || innerChecked,
     name: name,
@@ -112,7 +111,8 @@ var DxcRadio = function DxcRadio(_ref) {
     checked: checked || innerChecked,
     labelPosition: labelPosition,
     disabled: disabled,
-    onClick: !disabled && handlerRadioChange || null
+    onClick: !disabled && handlerRadioChange || null,
+    backgroundType: backgroundType
   }, required && _react["default"].createElement(_RequiredComponent["default"], null), label)));
 };
 
@@ -149,19 +149,41 @@ var RadioContainer = _styledComponents["default"].span(_templateObject(), functi
 }, function (props) {
   return props.disabled === true ? "not-allowed" : "default";
 }, function (props) {
-  return props.disabled === true ? props.theme.disabled : "1";
+  return props.labelPosition === "after" ? "padding-right" : "padding-left";
+}, function (props) {
+  return props.theme.circleLabelSpacing;
+}, function (props) {
+  return props.labelPosition === "after" ? "0px" : "";
+}, function (props) {
+  return props.labelPosition === "before" ? "0px" : "";
+}, function (props) {
+  return props.labelPosition === "after" ? "0px" : "";
+}, function (props) {
+  return props.labelPosition === "before" ? "0px" : "";
 }, function (props) {
-  return props.theme.color;
+  return props.theme.circleSize;
 }, function (props) {
-  return props.theme.color;
+  return props.theme.circleSize;
 }, function (props) {
-  return props.theme.focusColor;
+  return props.backgroundType === "dark" ? props.disabled && props.theme.disabledColorOnDark || props.theme.colorOnDark : props.disabled && props.theme.disabledColor || props.theme.color;
 }, function (props) {
-  return props.theme.color;
+  return props.backgroundType === "dark" ? props.disabled && props.theme.disabledColorOnDark || props.theme.colorOnDark : props.disabled && props.theme.disabledColor || props.theme.color;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.disabled && props.theme.disabledColorOnDark || props.theme.colorOnDark : props.disabled && props.theme.disabledColor || props.theme.color;
 });
 
 var LabelContainer = _styledComponents["default"].span(_templateObject2(), function (props) {
-  return props.theme.fontColor;
+  return props.theme.fontFamily;
+}, function (props) {
+  return props.theme.fontSize;
+}, function (props) {
+  return props.theme.fontWeight;
+}, function (props) {
+  return props.theme.fontStyle;
+}, function (props) {
+  return props.backgroundType === "dark" ? props.disabled && props.theme.disabledFontColorOnDark || props.theme.fontColorOnDark : props.disabled && props.theme.disabledFontColor || props.theme.fontColor;
 }, function (props) {
   return props.disabled === true ? "not-allowed" : "pointer";
 });

package/dist/resultsetTable/ResultsetTable.js

@@ -25,20 +25,14 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
-var _ThemeContext = _interopRequireDefault(require("../ThemeContext.js"));
-
 var _Table = _interopRequireDefault(require("../table/Table"));
 
 var _Paginator = _interopRequireDefault(require("../paginator/Paginator"));
 
-var _arrow_upward24px_wht = _interopRequireDefault(require("./arrow_upward-24px_wht.svg"));
-
-var _arrow_downward24px_wht = _interopRequireDefault(require("./arrow_downward-24px_wht.svg"));
-
-var _unfold_more24px_wht = _interopRequireDefault(require("./unfold_more-24px_wht.svg"));
+var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
 function _templateObject9() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  overflow-x: auto;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  &::-webkit-scrollbar {\n    height: 6px;\n  }\n\n  &::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 6px;\n  }\n\n  &::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 6px;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  overflow: hidden;\n"]);
 
   _templateObject9 = function _templateObject9() {
     return data;
@@ -58,7 +52,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  width: fit-content;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: ", ";\n  width: 100%;\n"]);
 
   _templateObject7 = function _templateObject7() {
     return data;
@@ -88,7 +82,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  top: 409px;\n  left: 390px;\n  height: 14px;\n  cursor: pointer;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  top: 409px;\n  left: 390px;\n  height: 14px;\n  cursor: pointer;\n  color: ", ";\n\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -98,7 +92,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  > div:nth-child(1) {\n    position: absolute;\n    left: calc(50% - 68.5px);\n    bottom: calc(50% - 68.5px - 30px);\n  }\n  & tr {\n    height: 70px;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  > div:nth-child(1) {\n    position: absolute;\n    left: calc(50% - 68.5px);\n    bottom: calc(50% - 68.5px - 30px);\n  }\n  & tr {\n    height: ", ";\n  }\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -108,7 +102,7 @@ function _templateObject3() {
 }
 
 function _templateObject2() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  margin-right: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])([""]);
 
   _templateObject2 = function _templateObject2() {
     return data;
@@ -159,14 +153,62 @@ var getMaxItemsPerPageIndex = function getMaxItemsPerPageIndex(minItemsPerPageIn
   return minItemsPerPageIndex + itemsPerPage > resultset.length ? resultset.length : itemsPerPage * page - 1;
 };
 
+var ArrowUp = function ArrowUp() {
+  return _react["default"].createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    height: "24",
+    viewBox: "0 0 24 24",
+    width: "24",
+    fill: "currentColor"
+  }, _react["default"].createElement("path", {
+    d: "M0 0h24v24H0V0z",
+    fill: "none"
+  }), _react["default"].createElement("path", {
+    d: "M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z"
+  }));
+};
+
+var ArrowDown = function ArrowDown() {
+  return _react["default"].createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    height: "24",
+    viewBox: "0 0 24 24",
+    width: "24",
+    fill: "currentColor"
+  }, _react["default"].createElement("path", {
+    d: "M0 0h24v24H0V0z",
+    fill: "none"
+  }), _react["default"].createElement("path", {
+    d: "M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
+  }));
+};
+
+var BothArrows = function BothArrows() {
+  return _react["default"].createElement("svg", {
+    xmlns: "http://www.w3.org/2000/svg",
+    height: "24",
+    viewBox: "0 0 24 24",
+    width: "24",
+    fill: "currentColor"
+  }, _react["default"].createElement("path", {
+    d: "M0 0h24v24H0z",
+    fill: "none"
+  }), _react["default"].createElement("path", {
+    d: "M12 5.83L15.17 9l1.41-1.41L12 3 7.41 7.59 8.83 9 12 5.83zm0 12.34L8.83 15l-1.41 1.41L12 21l4.59-4.59L15.17 15 12 18.17z"
+  }));
+};
+
 var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var columns = _ref.columns,
       rows = _ref.rows,
       _ref$itemsPerPage = _ref.itemsPerPage,
       itemsPerPage = _ref$itemsPerPage === void 0 ? 5 : _ref$itemsPerPage,
-      margin = _ref.margin;
-
-  var colorsTheme = (0, _react.useContext)(_ThemeContext["default"]) || _variables.colors;
+      itemsPerPageOptions = _ref.itemsPerPageOptions,
+      itemsPerPageFunction = _ref.itemsPerPageFunction,
+      margin = _ref.margin,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+  var colorsTheme = (0, _useTheme["default"])();
 
   var _useState = (0, _react.useState)(1),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -185,25 +227,13 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
 
   var minItemsPerPageIndex = (0, _react.useMemo)(function () {
     return getMinItemsPerPageIndex(page, itemsPerPage, page);
-  }, [page]);
+  }, [itemsPerPage, page]);
   var maxItemsPerPageIndex = (0, _react.useMemo)(function () {
     return getMaxItemsPerPageIndex(minItemsPerPageIndex, itemsPerPage, rows, page);
-  }, [page]);
-
-  var next = function next() {
-    changePage(page + 1);
-  };
-
-  var previous = function previous() {
-    changePage(page - 1);
-  };
+  }, [itemsPerPage, minItemsPerPageIndex, page, rows]);
 
-  var first = function first() {
-    changePage(1);
-  };
-
-  var last = function last() {
-    changePage(Math.ceil(rows.length / itemsPerPage));
+  var goToPage = function goToPage(newPage) {
+    changePage(newPage);
   };
 
   var changeSorting = function changeSorting(columnIndex) {
@@ -213,7 +243,7 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
   };
 
   var getIconForSortableColumn = function getIconForSortableColumn(clickedColumnIndex) {
-    return sortColumnIndex === clickedColumnIndex ? sortOrder === "asc" ? _arrow_upward24px_wht["default"] : _arrow_downward24px_wht["default"] : _unfold_more24px_wht["default"];
+    return sortColumnIndex === clickedColumnIndex ? sortOrder === "asc" ? _react["default"].createElement(ArrowUp, null) : _react["default"].createElement(ArrowDown, null) : _react["default"].createElement(BothArrows, null);
   };
 
   (0, _react.useEffect)(function () {
@@ -222,37 +252,29 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     } else {
       changePage(0);
     }
-  }, [rows]);
+  }, [rows.length, itemsPerPage]);
   var sortedResultset = (0, _react.useMemo)(function () {
     return sortColumnIndex !== "" ? sortArray(sortColumnIndex, sortOrder, rows) : rows;
   }, [sortColumnIndex, sortOrder, rows]);
   var filteredResultset = (0, _react.useMemo)(function () {
     return sortedResultset && sortedResultset.slice(minItemsPerPageIndex, maxItemsPerPageIndex + 1);
-  }, [page, sortColumnIndex, sortOrder, rows]);
+  }, [sortedResultset, minItemsPerPageIndex, maxItemsPerPageIndex]);
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme
+    theme: colorsTheme.table
   }, _react["default"].createElement(DxcResultsetTableContainer, {
     margin: margin
-  }, _react["default"].createElement(TableContainer, null, _react["default"].createElement(_Table["default"], {
-    margin: {
-      top: margin,
-      right: margin,
-      bottom: "0px",
-      left: margin
-    }
-  }, _react["default"].createElement(HeaderRow, null, _react["default"].createElement("tr", null, columns.map(function (column, index) {
+  }, _react["default"].createElement(TableContainer, null, _react["default"].createElement(_Table["default"], null, _react["default"].createElement(HeaderRow, null, _react["default"].createElement("tr", null, columns.map(function (column, index) {
     return _react["default"].createElement(TableHeader, {
       key: "tableHeader_".concat(index)
     }, _react["default"].createElement(HeaderContainer, {
       key: "headerContainer_".concat(index),
       onClick: function onClick() {
         return column.isSortable && changeSorting(index);
-      }
+      },
+      tabIndex: column.isSortable ? tabIndex : -1
     }, _react["default"].createElement(TitleDiv, {
       isSortable: column.isSortable
-    }, column.displayValue), column.isSortable && _react["default"].createElement(SortIcon, {
-      src: getIconForSortableColumn(index)
-    })));
+    }, column.displayValue), column.isSortable && _react["default"].createElement(SortIcon, null, getIconForSortableColumn(index))));
   }))), _react["default"].createElement(TableRowGroup, null, filteredResultset.map(function (cells, index) {
     return _react["default"].createElement("tr", {
       key: "resultSetTableCell_".concat(index)
@@ -261,30 +283,29 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
         key: "resultSetTableCellContent_".concat(index)
       }, cellContent.displayValue);
     }));
-  })))), _react["default"].createElement(PaginatorContainer, {
-    margin: margin
-  }, _react["default"].createElement(_Paginator["default"], {
+  })))), _react["default"].createElement(PaginatorContainer, null, _react["default"].createElement(_Paginator["default"], {
     totalItems: rows.length,
     itemsPerPage: itemsPerPage,
+    itemsPerPageOptions: itemsPerPageOptions,
+    itemsPerPageFunction: itemsPerPageFunction,
     currentPage: page,
-    nextFunction: next,
-    prevFunction: previous,
-    firstFunction: first,
-    lastFunction: last
+    showGoToPage: true,
+    onPageChange: goToPage,
+    tabIndex: tabIndex
   }))));
 };
 
 var TableContainer = _styledComponents["default"].div(_templateObject());
 
-var PaginatorContainer = _styledComponents["default"].div(_templateObject2(), 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" ? _variables.spaces[props.margin] : "0px";
-});
+var PaginatorContainer = _styledComponents["default"].div(_templateObject2());
 
-var TableRowGroup = _styledComponents["default"].tbody(_templateObject3());
+var TableRowGroup = _styledComponents["default"].tbody(_templateObject3(), function (props) {
+  return props.theme.rowHeight || "70px";
+});
 
-var SortIcon = _styledComponents["default"].img(_templateObject4());
+var SortIcon = _styledComponents["default"].div(_templateObject4(), function (props) {
+  return props.theme.sortIconColor;
+});
 
 var TitleDiv = _styledComponents["default"].div(_templateObject5(), function (props) {
   return props.isSortable && "pointer" || "default";
@@ -292,11 +313,15 @@ var TitleDiv = _styledComponents["default"].div(_templateObject5(), function (pr
 
 var TableHeader = _styledComponents["default"].th(_templateObject6());
 
-var HeaderContainer = _styledComponents["default"].div(_templateObject7());
+var HeaderContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
+  return props.theme.headerTextAlign === "center" ? "center" : props.theme.headerTextAlign === "right" ? "flex-end" : "flex-start";
+});
 
 var HeaderRow = _styledComponents["default"].thead(_templateObject8());
 
 var DxcResultsetTableContainer = _styledComponents["default"].div(_templateObject9(), function (props) {
+  return props.theme.fontSizeBase;
+}, 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] : "";
@@ -306,28 +331,28 @@ var DxcResultsetTableContainer = _styledComponents["default"].div(_templateObjec
   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.darkGrey;
-}, function (props) {
-  return props.theme.lightGrey;
 });
 
 DxcResultsetTable.propTypes = {
   rows: _propTypes["default"].array,
   columns: _propTypes["default"].array,
   itemsPerPage: _propTypes["default"].number,
+  itemsPerPageOptions: _propTypes["default"].arrayOf(_propTypes["default"].number),
+  itemsPerPageFunction: _propTypes["default"].func,
   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)))]),
+  tabIndex: _propTypes["default"].number
 };
 DxcResultsetTable.defaultProps = {
   rows: [],
   columns: [],
   itemsPerPage: 5,
-  margin: "xxsmall"
+  itemsPerPageOptions: null,
+  itemsPerPageFunction: null
 };
 var _default = DxcResultsetTable;
 exports["default"] = _default;