@digigov/ui 0.32.2 → 0.33.0

package/core/Table/index.js

@@ -1,37 +1,77 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {};
-exports["default"] = void 0;
+var _exportNames = {
+  TableHeadCellSortBase: true,
+  TableHeadCellSort: true,
+  useSortableData: true
+};
+exports.useSortableData = exports["default"] = exports.TableHeadCellSortBase = exports.TableHeadCellSort = void 0;
 
-var _TableContainer = require("@digigov/react-core/TableContainer");
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-Object.keys(_TableContainer).forEach(function (key) {
+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 _react = _interopRequireWildcard(require("react"));
+
+var _Table = _interopRequireWildcard(require("@digigov/react-core/Table"));
+
+Object.keys(_Table).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _TableContainer[key]) return;
+  if (key in exports && exports[key] === _Table[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _TableContainer[key];
+      return _Table[key];
     }
   });
 });
 
-var _Table = _interopRequireWildcard(require("@digigov/react-core/Table"));
+var _Dropdown = require("@digigov/ui/admin/Dropdown");
 
-Object.keys(_Table).forEach(function (key) {
+var _NavVertical = require("@digigov/ui/core/NavList/NavVertical");
+
+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] === _Table[key]) return;
+  if (key in exports && exports[key] === _TableHeadCell[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _Table[key];
+      return _TableHeadCell[key];
+    }
+  });
+});
+
+var _CaretContainer = _interopRequireDefault(require("@digigov/ui/core/CaretContainer"));
+
+var _TableContainer = require("@digigov/react-core/TableContainer");
+
+Object.keys(_TableContainer).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _TableContainer[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _TableContainer[key];
     }
   });
 });
@@ -92,20 +132,6 @@ 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) {
@@ -147,10 +173,170 @@ Object.keys(_TableFloatingScroll).forEach(function (key) {
     }
   });
 });
+var _excluded = ["sortedAscDesc", "sortedField", "sortedDirectionValue", "headerItems", "sortedData", "children"];
 
 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));
+});
+
+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 _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, {
+    variant: "link",
+    underline: sortedField === name ? true : false
+  }, 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: obj.value == 1 ? 'up' : 'down',
+      marginRight: 1,
+      marginTop: 1,
+      size: "m"
+    }), obj.label));
+  }))));
+});
+
+exports.TableHeadCellSortBase = TableHeadCellSortBase;
 var _default = _Table["default"];
 exports["default"] = _default;

package/core/index.d.ts

@@ -6,6 +6,7 @@ export * from '@digigov/ui/core/Accordion';
 export * from '@digigov/ui/core/Blockquote';
 export * from '@digigov/ui/core/Breadcrumbs';
 export * from '@digigov/ui/core/Card';
+export * from '@digigov/ui/core/CaretContainer';
 export * from '@digigov/ui/core/Checkbox';
 export * from '@digigov/ui/core/DateInputContainer';
 export * from '@digigov/ui/core/Details';

package/core/index.js

@@ -95,6 +95,19 @@ Object.keys(_Card).forEach(function (key) {
   });
 });
 
+var _CaretContainer = require("@digigov/ui/core/CaretContainer");
+
+Object.keys(_CaretContainer).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _CaretContainer[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _CaretContainer[key];
+    }
+  });
+});
+
 var _Checkbox = require("@digigov/ui/core/Checkbox");
 
 Object.keys(_Checkbox).forEach(function (key) {

package/es/admin/Drawer/__stories__/Default.js

@@ -77,7 +77,9 @@ export var Default = function Default() {
 
   var layout = 'vertical';
   var border = false;
+  var fixed = false;
   return /*#__PURE__*/React.createElement(Drawer, {
+    upRelative: "m",
     direction: "left",
     open: open
   }, /*#__PURE__*/React.createElement(DrawerHeading, {
@@ -88,6 +90,7 @@ export var Default = function Default() {
     layout: layout,
     links: links,
     border: border,
+    fixed: fixed,
     "aria-label": "Nav list"
   }, links.map(function (item, key) {
     var _item$subMenu;

package/es/admin/Dropdown/index.js

@@ -9,15 +9,22 @@ export * from '@digigov/react-extensions/admin/DropdownContent';
 /**
  * Dropdown component is used for showing more options with a button.
  */
-export var Dropdown = function Dropdown(_ref) {
+export var Dropdown = /*#__PURE__*/React.forwardRef(function Dropdown(_ref, ref) {
   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 = useRef();
+  var innerRef = ref || useRef();
   useEffect(function () {
+    var keyDownHandler = function keyDownHandler(event) {
+      if (event.key === 'Escape') {
+        innerRef.current.open = false;
+        event.preventDefault();
+      }
+    };
+
     var handleClickOutside = function handleClickOutside(event) {
       if (innerRef.current && !innerRef.current.contains(event.target)) {
         innerRef.current.open = false;
@@ -28,6 +35,8 @@ export var Dropdown = function Dropdown(_ref) {
       document.addEventListener('click', handleClickOutside, true);
     }
 
+    document.addEventListener('keydown', keyDownHandler);
+
     var toggleFloat = function toggleFloat() {
       var _innerRef$current;
 
@@ -75,6 +84,8 @@ export var Dropdown = function Dropdown(_ref) {
       if (_float) {
         innerRef.current.removeEventListener('toggle', toggleFloat);
       }
+
+      document.removeEventListener('keydown', keyDownHandler);
     };
   }, []); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
@@ -82,6 +93,6 @@ export var Dropdown = function Dropdown(_ref) {
   return /*#__PURE__*/React.createElement(DropdownBase, _extends({
     ref: innerRef
   }, props));
-};
+});
 export { DropdownBase };
 export default Dropdown;

package/es/core/CaretContainer/index.js

@@ -0,0 +1,3 @@
+import CaretContainer from '@digigov/react-core/CaretContainer';
+export * from '@digigov/react-core/CaretContainer';
+export default CaretContainer;

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

@@ -20,5 +20,6 @@ export * from './__stories__/WithLoader';
 export * from './__stories__/DefinedWidth';
 export * from './__stories__/Densed';
 export * from './__stories__/MultipleProps';
+export * from './__stories__/WithSortFilters';
 export * from './__stories__/WithFloatingScroll';
 export * from './__stories__/Full';

package/es/core/Table/Table.stories.playwright.json

@@ -16,6 +16,22 @@
           "title": "Toggle Loading"
         }
       ]
+    },
+    "digigov-ui-core-table--with-sort-filters": {
+      "actionSets": [
+        {
+          "actions": [
+            {
+              "name": "click",
+              "args": {
+                "selector": "html>body>div:nth-child(5)>div>div>table>thead>tr>th:nth-child(2)>details>summary"
+              }
+            }
+          ],
+          "id": "Gdm_Fpollj7d",
+          "title": "Table with filter action"
+        }
+      ]
     }
   }
 }

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

@@ -0,0 +1,126 @@
+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 = [{
+  name: 'product',
+  label: 'Προϊόν',
+  sortLabels: [{
+    label: 'Αλφαβητική σειρά (Α -> Ω)',
+    direction: 'asc',
+    value: 1
+  }, {
+    label: 'Αλφαβητική σειρά (Ω -> Α)',
+    direction: 'desc',
+    value: -1
+  }]
+}, {
+  name: 'price',
+  label: 'Τιμή',
+  sortLabels: [{
+    label: 'Αύξουσα σειρά',
+    direction: 'ascending',
+    value: 1
+  }, {
+    label: 'Φθίνουσα σειρά',
+    direction: 'descending',
+    value: -1
+  }]
+}, {
+  name: 'stock',
+  label: 'Στοκ',
+  sortLabels: [{
+    label: 'Αύξουσα σειρά',
+    direction: 'ascending',
+    value: 1
+  }, {
+    label: 'Φθίνουσα σειρά',
+    direction: 'descending',
+    value: -1
+  }]
+}, {
+  name: 'date',
+  label: 'Ημερομηνία',
+  sortLabels: [{
+    label: 'Αύξουσα σειρά',
+    direction: 'ascending',
+    value: 1
+  }, {
+    label: 'Φθίνουσα σειρά',
+    direction: 'descending',
+    value: -1
+  }]
+}];
+var data = [{
+  id: 1,
+  product: 'Τυρί',
+  price: '4.9€',
+  stock: 20,
+  date: '2013-04-01'
+}, {
+  id: 2,
+  product: 'Γάλα',
+  price: '1.9€',
+  stock: 32,
+  date: '2013-01-01'
+}, {
+  id: 3,
+  product: 'Γιαούρτι',
+  price: '2.4€',
+  stock: 12,
+  date: '2002-04-12'
+}, {
+  id: 4,
+  product: 'Κρέμα',
+  price: '3.9€',
+  stock: 8,
+  date: '2011-12-12'
+}, {
+  id: 5,
+  product: 'Βούτυρο',
+  price: '0.9€',
+  stock: 99,
+  date: '2019-06-01'
+}, {
+  id: 6,
+  product: 'Καφές',
+  price: '2.9€',
+  stock: 86,
+  date: '2023-02-11'
+}, {
+  id: 7,
+  product: 'Ψωμί',
+  price: '99€',
+  stock: 12,
+  date: '2000-12-12'
+}];
+
+var _ref = /*#__PURE__*/React.createElement(TableCaption, null, "Table of products");
+
+var _ref2 = /*#__PURE__*/React.createElement(TableNoDataRow, null, "No data");
+
+export var WithSortFilters = function WithSortFilters() {
+  var _useSortableData = useSortableData(data),
+      sortedData = _useSortableData.sortedData,
+      sortedProps = _useSortableData.sortedProps;
+
+  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({
+      key: index
+    }, sortedProps, {
+      headerItems: header
+    }), header.label);
+  }))), /*#__PURE__*/React.createElement(TableBody, null, sortedData && 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')));
+  }) : _ref2))));
+};
+export default WithSortFilters;