@digigov/ui 0.33.0 → 0.34.0

package/core/Table/index.js

@@ -8,19 +8,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  TableHeadCellSortBase: true,
-  TableHeadCellSort: true,
-  useSortableData: true
+  TableSortLabel: true
 };
-exports.useSortableData = exports["default"] = exports.TableHeadCellSortBase = exports.TableHeadCellSort = void 0;
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+exports["default"] = exports.TableSortLabel = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -46,20 +40,6 @@ var _NavVerticalItem = require("@digigov/ui/core/NavList/NavVerticalItem");
 
 var _SvgIcon = require("@digigov/ui/core/SvgIcon");
 
-var _TableHeadCell = _interopRequireWildcard(require("@digigov/react-core/TableHeadCell"));
-
-Object.keys(_TableHeadCell).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _TableHeadCell[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _TableHeadCell[key];
-    }
-  });
-});
-
 var _CaretContainer = _interopRequireDefault(require("@digigov/ui/core/CaretContainer"));
 
 var _TableContainer = require("@digigov/react-core/TableContainer");
@@ -132,6 +112,20 @@ Object.keys(_TableHead).forEach(function (key) {
   });
 });
 
+var _TableHeadCell = require("@digigov/react-core/TableHeadCell");
+
+Object.keys(_TableHeadCell).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _TableHeadCell[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _TableHeadCell[key];
+    }
+  });
+});
+
 var _TableRow = require("@digigov/react-core/TableRow");
 
 Object.keys(_TableRow).forEach(function (key) {
@@ -173,170 +167,87 @@ Object.keys(_TableFloatingScroll).forEach(function (key) {
     }
   });
 });
-var _excluded = ["sortedAscDesc", "sortedField", "sortedDirectionValue", "headerItems", "sortedData", "children"];
+var _excluded = ["labels", "disabled", "children", "direction", "onSort"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var useSortableData = function useSortableData(items) {
-  var _useState = (0, _react.useState)(''),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      field = _useState2[0],
-      setField = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(0),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      directionValue = _useState4[0],
-      setDirectionValue = _useState4[1];
-
-  var sortedItems = (0, _react.useMemo)(function () {
-    var sortableItems = (0, _toConsumableArray2["default"])(items);
-
-    if (sortableItems.length === 0) {
-      return;
-    }
-
-    if (field) {
-      sortableItems.sort(function (a, b) {
-        if (a[field] === null) return 1;
-        if (b[field] === null) return -1;
-        if (a[field] === null && b[field] === null) return 0;
-        return a[field].toString().localeCompare(b[field].toString(), undefined, {
-          numeric: true
-        }) * (directionValue > 0 ? 1 : -1);
-      });
-    }
-
-    return sortableItems;
-  }, [items, directionValue, field]);
-
-  var sortAscDesc = function sortAscDesc(item, value) {
-    setDirectionValue(value);
-    setField(item);
-  };
-
-  return {
-    sortedData: sortedItems,
-    sortedProps: {
-      sortedData: sortedItems,
-      sortedDirectionValue: directionValue,
-      sortedField: field,
-      sortedAscDesc: sortAscDesc
-    }
-  };
-};
-
-exports.useSortableData = useSortableData;
-
-var TableHeadCellSort = /*#__PURE__*/_react["default"].forwardRef(function TableHeadCellSort(_ref, ref) {
-  var props = (0, _extends2["default"])({}, _ref);
-  return /*#__PURE__*/_react["default"].createElement(TableHeadCellSortBase, (0, _extends2["default"])({
-    ref: ref
-  }, props));
+var _ref2 = /*#__PURE__*/_react["default"].createElement(_SvgIcon.CaretIcon, {
+  direction: 'up',
+  marginRight: 1,
+  marginTop: 1,
+  size: "m"
 });
 
-exports.TableHeadCellSort = TableHeadCellSort;
-
-var TableHeadCellSortBase = /*#__PURE__*/_react["default"].forwardRef(function TableHeadCellSortBase(_ref2, ref) {
-  var sortedAscDesc = _ref2.sortedAscDesc,
-      sortedField = _ref2.sortedField,
-      sortedDirectionValue = _ref2.sortedDirectionValue,
-      headerItems = _ref2.headerItems,
-      sortedData = _ref2.sortedData,
-      children = _ref2.children,
-      props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
-  var innerRef = (0, _react.useRef)();
-
-  var _ref3 = headerItems || {},
-      name = _ref3.name,
-      sortLabels = _ref3.sortLabels;
-
-  var _useState5 = (0, _react.useState)(0),
-      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-      sortDirection = _useState6[0],
-      setSortDirection = _useState6[1];
-
-  var setSortAscDesc = (0, _react.useCallback)(function (name, value) {
-    if (sortedAscDesc) {
-      if (sortedField !== name) {
-        sortedAscDesc('', 0);
-        setSortDirection(value);
-        sortedAscDesc(name, value);
-      } else {
-        if (value !== sortDirection) {
-          setSortDirection(value);
-          sortedAscDesc(name, value);
-        } else {
-          setSortDirection(0);
-          sortedAscDesc('', 0);
-        }
-      }
-    }
-  }, [sortedField, sortedDirectionValue, sortDirection]);
+var _ref3 = /*#__PURE__*/_react["default"].createElement(_SvgIcon.CaretIcon, {
+  direction: 'down',
+  marginRight: 1,
+  marginTop: 1,
+  size: "m"
+});
 
-  var _onKeyDown = (0, _react.useCallback)(function (e, name, value) {
-    if (e.key === 'Enter' && innerRef.current.contains(e.target)) {
-      if (innerRef.current.open) {
-        setSortAscDesc(name, value);
-        innerRef.current.open = false;
-      }
-    }
-  }, [name, sortDirection]);
-
-  var setDisabled = (0, _react.useCallback)(function (sortedData) {
-    return sortedData === undefined || sortedData.length === 0 ? true : false;
-  }, [sortedData]);
-  var setCaretColor = (0, _react.useCallback)(function (value) {
-    if (sortedField === name) {
-      return sortedDirectionValue === value ? 'dark' : 'gray';
-    } else {
-      return 'gray';
-    }
-  }, [sortedDirectionValue, sortedField]);
-  return /*#__PURE__*/_react["default"].createElement(_TableHeadCell["default"], (0, _extends2["default"])({}, props, {
-    ref: ref
-  }), /*#__PURE__*/_react["default"].createElement(_Dropdown.Dropdown, {
-    tabIndex: 0,
-    disabled: setDisabled(sortedData),
-    ref: innerRef
-  }, /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownButton, {
+var TableSortLabel = /*#__PURE__*/_react["default"].forwardRef(function TableSortLabel(_ref, _ref4) {
+  var labels = _ref.labels,
+      disabled = _ref.disabled,
+      children = _ref.children,
+      _ref$direction = _ref.direction,
+      direction = _ref$direction === void 0 ? 0 : _ref$direction,
+      onSort = _ref.onSort,
+      props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  // TODO: this is a workaround for the dropdown component
+  // https://itnext.io/reusing-the-ref-from-forwardref-with-react-hooks-4ce9df693dd
+  var dropdownRef = (0, _react.useRef)(null);
+  var active = [-1, 1].includes(direction);
+  return /*#__PURE__*/_react["default"].createElement(_Dropdown.Dropdown, (0, _extends2["default"])({
+    ref: function ref(el) {
+      dropdownRef.current = el;
+      typeof _ref4 === 'function' && _ref4(el);
+    },
+    disabled: disabled
+  }, props), /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownButton, {
     variant: "link",
-    underline: sortedField === name ? true : false
+    tabIndex: 0,
+    underline: active
   }, children, /*#__PURE__*/_react["default"].createElement(_CaretContainer["default"], {
     marginLeft: 1
-  }, sortLabels && sortLabels.length > 0 && sortLabels.map(function (obj, index) {
-    return /*#__PURE__*/_react["default"].createElement(_SvgIcon.CaretIcon, {
-      key: index,
-      direction: obj.value == 1 ? 'up' : 'down',
-      size: "m",
-      variant: setCaretColor(obj.value)
-    });
-  }))), /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownContent, null, sortLabels && sortLabels.length > 0 && sortLabels.map(function (obj, index) {
-    return /*#__PURE__*/_react["default"].createElement(_NavVertical.NavVertical, {
-      key: index
-    }, /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, (0, _extends2["default"])({}, sortedField === name && sortedDirectionValue === obj.value && {
-      active: true
-    }, {
-      tabIndex: 0,
-      onClick: function onClick() {
-        if (setSortAscDesc) {
-          setSortAscDesc(name, obj.value);
-          innerRef.current.open = false;
-        }
-      },
-      onKeyDown: function onKeyDown(e) {
-        _onKeyDown(e, name, obj.value);
+  }, /*#__PURE__*/_react["default"].createElement(_SvgIcon.CaretIcon, {
+    direction: 'up',
+    size: "m",
+    variant: direction === 1 ? 'dark' : 'gray'
+  }), /*#__PURE__*/_react["default"].createElement(_SvgIcon.CaretIcon, {
+    direction: 'down',
+    size: "m",
+    variant: direction === -1 ? 'dark' : 'gray'
+  }))), /*#__PURE__*/_react["default"].createElement(_Dropdown.DropdownContent, null, /*#__PURE__*/_react["default"].createElement(_NavVertical.NavVertical, null, /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+    active: direction === 1,
+    tabIndex: 0,
+    onClick: function onClick() {
+      onSort(1);
+      dropdownRef.current && (dropdownRef.current.open = false);
+    },
+    onKeyDown: function onKeyDown(e) {
+      if (e.key === 'Enter') {
+        onSort(1);
+        dropdownRef.current && (dropdownRef.current.open = false);
+      }
+    }
+  }, _ref2, labels.asc), /*#__PURE__*/_react["default"].createElement(_NavVerticalItem.NavVerticalItem, {
+    active: direction === -1,
+    tabIndex: 0,
+    onClick: function onClick() {
+      onSort(-1);
+      dropdownRef.current && (dropdownRef.current.open = false);
+    },
+    onKeyDown: function onKeyDown(e) {
+      if (e.key === 'Enter') {
+        onSort(-1);
+        dropdownRef.current && (dropdownRef.current.open = false);
       }
-    }), /*#__PURE__*/_react["default"].createElement(_SvgIcon.CaretIcon, {
-      direction: obj.value == 1 ? 'up' : 'down',
-      marginRight: 1,
-      marginTop: 1,
-      size: "m"
-    }), obj.label));
-  }))));
+    }
+  }, _ref3, labels.desc))));
 });
 
-exports.TableHeadCellSortBase = TableHeadCellSortBase;
+exports.TableSortLabel = TableSortLabel;
 var _default = _Table["default"];
 exports["default"] = _default;

package/es/admin/Dropdown/index.js

@@ -9,25 +9,31 @@ export * from '@digigov/react-extensions/admin/DropdownContent';
 /**
  * Dropdown component is used for showing more options with a button.
  */
-export var Dropdown = /*#__PURE__*/React.forwardRef(function Dropdown(_ref, ref) {
+export var Dropdown = /*#__PURE__*/React.forwardRef(function Dropdown(_ref, _ref2) {
   var _ref$closeBehaviour = _ref.closeBehaviour,
       closeBehaviour = _ref$closeBehaviour === void 0 ? 'clickOutside' : _ref$closeBehaviour,
       _ref$float = _ref["float"],
       _float = _ref$float === void 0 ? false : _ref$float,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  var innerRef = ref || useRef();
+  var innerRef = useRef(null);
   useEffect(function () {
+    var element = innerRef.current;
+
+    if (!element) {
+      return;
+    }
+
     var keyDownHandler = function keyDownHandler(event) {
       if (event.key === 'Escape') {
-        innerRef.current.open = false;
+        element.open = false;
         event.preventDefault();
       }
     };
 
     var handleClickOutside = function handleClickOutside(event) {
-      if (innerRef.current && !innerRef.current.contains(event.target)) {
-        innerRef.current.open = false;
+      if (element && !element.contains(event.target)) {
+        element.open = false;
       }
     };
 
@@ -38,42 +44,37 @@ export var Dropdown = /*#__PURE__*/React.forwardRef(function Dropdown(_ref, ref)
     document.addEventListener('keydown', keyDownHandler);
 
     var toggleFloat = function toggleFloat() {
-      var _innerRef$current;
-
-      var tbody = innerRef.current.closest('tbody');
-      var parentElement = (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 ? void 0 : _innerRef$current.parentElement;
-
-      if (innerRef.current.open) {
-        var _innerRef$current2;
+      var tbody = element.closest('tbody');
+      var parentElement = element === null || element === void 0 ? void 0 : element.parentElement;
 
+      if (element.open) {
         tbody.style.position = 'static';
-        var rect = (_innerRef$current2 = innerRef.current) === null || _innerRef$current2 === void 0 ? void 0 : _innerRef$current2.getBoundingClientRect();
+        var rect = element === null || element === void 0 ? void 0 : element.getBoundingClientRect();
         var parentRect = parentElement.getBoundingClientRect();
-        innerRef.current.style.position = 'static'; // arbitrary spacing of 12 pixels because CSS
+        element.style.position = 'static'; // arbitrary spacing of 12 pixels because CSS
 
         var top = rect.top + window.pageYOffset;
         var left = rect.left + window.pageXOffset;
         parentElement.style.height = "".concat(parentRect.height, "px");
         parentElement.style.width = "".concat(parentRect.width, "px");
-        innerRef.current.style.top = "".concat(top, "px");
-        innerRef.current.style.left = "".concat(left, "px");
-        innerRef.current.style.position = "absolute";
-        innerRef.current.style.display = "block";
-        innerRef.current.style.background = 'white';
+        element.style.top = "".concat(top, "px");
+        element.style.left = "".concat(left, "px");
+        element.style.position = "absolute";
+        element.style.display = "block";
+        element.style.background = 'white';
       } else {
         tbody.style.position = 'relative';
         parentElement.style.height = '';
         parentElement.style.width = '';
-        innerRef.current.style.top = "0";
-        innerRef.current.style.left = "0";
-        innerRef.current.style.position = "relative";
-        innerRef.current.style.display = "table-cell";
-        innerRef.current.style.background = 'transparent';
+        element.style.top = "0";
+        element.style.left = "0";
+        element.style.position = "relative";
+        element.style.display = "table-cell"; // element.style.background = 'transparent';
       }
     };
 
     if (_float) {
-      innerRef.current.addEventListener('toggle', toggleFloat);
+      element.addEventListener('toggle', toggleFloat);
     }
 
     return function () {
@@ -82,7 +83,7 @@ export var Dropdown = /*#__PURE__*/React.forwardRef(function Dropdown(_ref, ref)
       }
 
       if (_float) {
-        innerRef.current.removeEventListener('toggle', toggleFloat);
+        element.removeEventListener('toggle', toggleFloat);
       }
 
       document.removeEventListener('keydown', keyDownHandler);
@@ -91,7 +92,13 @@ export var Dropdown = /*#__PURE__*/React.forwardRef(function Dropdown(_ref, ref)
   // @ts-ignore
 
   return /*#__PURE__*/React.createElement(DropdownBase, _extends({
-    ref: innerRef
+    ref: function ref(el) {
+      innerRef.current = el;
+
+      if (typeof _ref2 === 'function') {
+        _ref2(el);
+      }
+    }
   }, props));
 });
 export { DropdownBase };

package/es/core/Table/Table.stories.js

@@ -14,6 +14,7 @@ export * from './__stories__/VerticalHeaders';
 export * from './__stories__/ZebraProp';
 export * from './__stories__/NumericDataType';
 export * from './__stories__/VerticalBorders';
+export * from './__stories__/Stacked';
 export * from './__stories__/DarkVariant';
 export * from './__stories__/DarkVariantWithVerticalHeaders';
 export * from './__stories__/WithLoader';

package/es/core/Table/__stories__/Stacked.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import { TableContainer, Table, TableCaption, TableHead, TableRow, TableBody, TableHeadCell, TableDataCell } from '@digigov/ui/core/Table';
+
+var _ref = /*#__PURE__*/React.createElement(TableContainer, null, /*#__PURE__*/React.createElement(Table, {
+  stacked: "always"
+}, /*#__PURE__*/React.createElement(TableCaption, null, "\u03A0\u03B5\u03C1\u03AF\u03BF\u03B4\u03BF\u03C2 \u03BA\u03B1\u03B9 \u03C0\u03BF\u03C3\u03AC"), /*#__PURE__*/React.createElement(TableHead, null, /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableHeadCell, null, "\u03A0\u03B5\u03C1\u03AF\u03BF\u03B4\u03BF\u03C2"), /*#__PURE__*/React.createElement(TableHeadCell, null, "\u039A\u03B1\u03BD\u03BF\u03BD\u03B9\u03BA\u03CC \u03C0\u03BF\u03C3\u03CC"), /*#__PURE__*/React.createElement(TableHeadCell, null, "\u039C\u03B5\u03B9\u03C9\u03BC\u03AD\u03BD\u03BF \u03C0\u03BF\u03C3\u03CC"))), /*#__PURE__*/React.createElement(TableBody, null, /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u03A0\u03B5\u03C1\u03AF\u03BF\u03B4\u03BF\u03C2"
+}, "\u03A0\u03C1\u03CE\u03C4\u03B5\u03C2 6 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B5\u03C2"), /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u039A\u03B1\u03BD\u03BF\u03BD\u03B9\u03BA\u03CC \u03C0\u03BF\u03C3\u03CC"
+}, "\u20AC109.80 / \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1"), /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u039C\u03B5\u03B9\u03C9\u03BC\u03AD\u03BD\u03BF \u03C0\u03BF\u03C3\u03CC"
+}, "\u20AC69.80 / \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1")), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u03A0\u03B5\u03C1\u03AF\u03BF\u03B4\u03BF\u03C2"
+}, "\u0395\u03C0\u03CC\u03BC\u03B5\u03BD\u03B5\u03C2 33 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B5\u03C2"), /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u039A\u03B1\u03BD\u03BF\u03BD\u03B9\u03BA\u03CC \u03C0\u03BF\u03C3\u03CC"
+}, "\u20AC99.80 / \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1"), /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u039C\u03B5\u03B9\u03C9\u03BC\u03AD\u03BD\u03BF \u03C0\u03BF\u03C3\u03CC"
+}, "\u20AC64.80 / \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1")), /*#__PURE__*/React.createElement(TableRow, null, /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u03A0\u03B5\u03C1\u03AF\u03BF\u03B4\u03BF\u03C2"
+}, "\u03A3\u03C5\u03BD\u03BF\u03BB\u03B9\u03BA\u03CC \u03C0\u03BF\u03C3\u03CC "), /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u039A\u03B1\u03BD\u03BF\u03BD\u03B9\u03BA\u03CC \u03C0\u03BF\u03C3\u03CC"
+}, "\u20AC4.282,20 "), /*#__PURE__*/React.createElement(TableDataCell, {
+  "data-label": "\u039C\u03B5\u03B9\u03C9\u03BC\u03AD\u03BD\u03BF \u03C0\u03BF\u03C3\u03CC"
+}, " \u20AC3.282,20")))));
+
+export var Stacked = function Stacked() {
+  return _ref;
+};
+export default Stacked;

package/es/core/Table/__stories__/WithSortFilters.js

@@ -1,54 +1,34 @@
-import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { TableContainer, Table, TableCaption, TableHead, TableRow, TableBody, TableHeadCellSort, TableDataCell, TableNoDataRow, useSortableData } from '@digigov/ui/core/Table';
-var headerItems = [{
+import { TableContainer, Table, TableCaption, TableHead, TableRow, TableBody, TableHeadCell, TableDataCell, TableNoDataRow, TableSortLabel } from '@digigov/ui/core/Table';
+import { useSort } from '@digigov/ui/hooks/useSort';
+var headerConfig = [{
   name: 'product',
   label: 'Προϊόν',
-  sortLabels: [{
-    label: 'Αλφαβητική σειρά (Α -> Ω)',
-    direction: 'asc',
-    value: 1
-  }, {
-    label: 'Αλφαβητική σειρά (Ω -> Α)',
-    direction: 'desc',
-    value: -1
-  }]
+  sortLabels: {
+    asc: 'Αλφαβητική σειρά (Α -> Ω)',
+    desc: 'Αλφαβητική σειρά (Ω -> Α)'
+  }
 }, {
   name: 'price',
   label: 'Τιμή',
-  sortLabels: [{
-    label: 'Αύξουσα σειρά',
-    direction: 'ascending',
-    value: 1
-  }, {
-    label: 'Φθίνουσα σειρά',
-    direction: 'descending',
-    value: -1
-  }]
+  sortLabels: {
+    asc: 'Αύξουσα σειρά',
+    desc: 'Φθίνουσα σειρά'
+  }
 }, {
   name: 'stock',
   label: 'Στοκ',
-  sortLabels: [{
-    label: 'Αύξουσα σειρά',
-    direction: 'ascending',
-    value: 1
-  }, {
-    label: 'Φθίνουσα σειρά',
-    direction: 'descending',
-    value: -1
-  }]
+  sortLabels: {
+    asc: 'Αύξουσα σειρά',
+    desc: 'Φθίνουσα σειρά'
+  }
 }, {
   name: 'date',
   label: 'Ημερομηνία',
-  sortLabels: [{
-    label: 'Αύξουσα σειρά',
-    direction: 'ascending',
-    value: 1
-  }, {
-    label: 'Φθίνουσα σειρά',
-    direction: 'descending',
-    value: -1
-  }]
+  sortLabels: {
+    asc: 'Αύξουσα σειρά',
+    desc: 'Φθίνουσα σειρά'
+  }
 }];
 var data = [{
   id: 1,
@@ -99,25 +79,25 @@ var _ref = /*#__PURE__*/React.createElement(TableCaption, null, "Table of produc
 var _ref2 = /*#__PURE__*/React.createElement(TableNoDataRow, null, "No data");
 
 export var WithSortFilters = function WithSortFilters() {
-  var _useSortableData = useSortableData(data),
-      sortedData = _useSortableData.sortedData,
-      sortedProps = _useSortableData.sortedProps;
+  var _useSort = useSort(data),
+      sortedData = _useSort.sortedData,
+      setSortedField = _useSort.setSortedField,
+      field = _useSort.field,
+      direction = _useSort.direction;
 
   return /*#__PURE__*/React.createElement("div", {
     className: "example"
-  }, /*#__PURE__*/React.createElement(TableContainer
-  /* Possible style solution in order to display dropdown properly when we have only one table row
-   * style={{
-   *   overflow: 'inherit',
-   *  }}
-   */
-  , null, /*#__PURE__*/React.createElement(Table, null, _ref, /*#__PURE__*/React.createElement(TableHead, null, /*#__PURE__*/React.createElement(TableRow, null, headerItems && headerItems.length > 0 && headerItems.map(function (header, index) {
-    return /*#__PURE__*/React.createElement(TableHeadCellSort, _extends({
+  }, /*#__PURE__*/React.createElement(TableContainer, null, /*#__PURE__*/React.createElement(Table, null, _ref, /*#__PURE__*/React.createElement(TableHead, null, /*#__PURE__*/React.createElement(TableRow, null, headerConfig.map(function (header, index) {
+    return /*#__PURE__*/React.createElement(TableHeadCell, {
       key: index
-    }, sortedProps, {
-      headerItems: header
-    }), header.label);
-  }))), /*#__PURE__*/React.createElement(TableBody, null, sortedData && sortedData.length > 0 ? sortedData.map(function (d, index) {
+    }, /*#__PURE__*/React.createElement(TableSortLabel, {
+      labels: header.sortLabels,
+      onSort: function onSort(dir) {
+        return setSortedField(header.name, dir);
+      },
+      direction: header.name === field ? direction : 0
+    }, header.label));
+  }))), /*#__PURE__*/React.createElement(TableBody, null, sortedData.length > 0 ? sortedData.map(function (d, index) {
     return /*#__PURE__*/React.createElement(TableRow, {
       key: index
     }, /*#__PURE__*/React.createElement(TableDataCell, null, d.product), /*#__PURE__*/React.createElement(TableDataCell, null, d.price), /*#__PURE__*/React.createElement(TableDataCell, null, d.stock), /*#__PURE__*/React.createElement(TableDataCell, null, new Date(d.date).toLocaleDateString('en-GB')));