@dxc-technology/halstack-react 0.0.0-2c2ee9d → 0.0.0-2c8be25

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;
@@ -118,7 +112,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  & table {\n    table-layout: fixed;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  & table {\n    table-layout: auto;\n  }\n"]);
 
   _templateObject = function _templateObject() {
     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,26 +227,13 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
 
   var minItemsPerPageIndex = (0, _react.useMemo)(function () {
     return getMinItemsPerPageIndex(page, itemsPerPage, page);
-  }, [page]); //Merece la pena sacar a una función para usar useMemo?
-
+  }, [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) {
@@ -214,42 +243,38 @@ 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 () {
-    changePage(1);
-  }, [rows]);
+    if (rows.length > 0) {
+      changePage(1);
+    } else {
+      changePage(0);
+    }
+  }, [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)
@@ -258,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";
@@ -289,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] : "";
@@ -303,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;

package/dist/resultsetTable/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 = {
+  columns?: any;
+  rows?: any;
+  itemsPerPage?: number;
+  itemsPerPageOptions?: number[];
+  itemsPerPageFunction?: void,
+  margin?: Space | Margin;
+  tabIndex?: number;
+};
+
+export default function DxcResultsetTable(props: Props): JSX.Element;