@dxc-technology/halstack-react 0.0.0-f2bad31 → 0.0.0-f319e71

package/radio-group/RadioGroup.test.js

@@ -6,7 +6,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
-var _RadioGroup = _interopRequireDefault(require("./RadioGroup.tsx"));
+var _RadioGroup = _interopRequireDefault(require("./RadioGroup"));
 var options = [{
   label: "Option 01",
   value: "1"
@@ -55,12 +55,10 @@ describe("Radio Group component tests", function () {
       })),
       getByRole = _render.getByRole,
       getAllByRole = _render.getAllByRole,
-      getByText = _render.getByText,
-      container = _render.container;
+      getByText = _render.getByText;
     var radioGroup = getByRole("radiogroup");
     var radios = getAllByRole("radio");
-    var errorId = "error-".concat(getByText("test-radioGroup-label").id.replace("label-", ""));
-    var error = container.querySelector("#".concat(errorId));
+    var error = getByRole("alert");
     expect(radioGroup.getAttribute("aria-disabled")).toBe("false");
     expect(radioGroup.getAttribute("aria-labelledby")).toBe(getByText("test-radioGroup-label").id);
     expect(radioGroup.getAttribute("aria-invalid")).toBe("false");

package/resultset-table/ResultsetTable.accessibility.test.d.ts

@@ -0,0 +1 @@
+export {};

package/resultset-table/ResultsetTable.accessibility.test.js

@@ -7,8 +7,19 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
-var _jestAxe = require("jest-axe");
-var _ResultsetTable = _interopRequireDefault(require("./ResultsetTable.tsx"));
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _ResultsetTable = _interopRequireDefault(require("./ResultsetTable"));
+var _disabledRules = require("../../test/accessibility/rules/specific/resultset-table/disabledRules.js");
+// TODO: REMOVE
+
+var disabledRules = {
+  rules: _disabledRules.disabledRules.reduce(function (rulesObj, rule) {
+    rulesObj[rule] = {
+      enabled: false
+    };
+    return rulesObj;
+  }, {})
+};
 var deleteIcon = /*#__PURE__*/_react["default"].createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
   height: "24",
@@ -40,7 +51,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -50,7 +61,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 var actions = [{
   title: "icon",
@@ -236,7 +246,7 @@ describe("Resultset Table input component accessibility tests", function () {
             showGoToPage: true
           })), container = _render.container;
           _context.next = 3;
-          return (0, _jestAxe.axe)(container);
+          return (0, _axeHelper.axe)(container, disabledRules);
         case 3:
           results = _context.sent;
           expect(results).toHaveNoViolations();
@@ -261,7 +271,7 @@ describe("Resultset Table input component accessibility tests", function () {
             showGoToPage: true
           })), container = _render2.container;
           _context2.next = 3;
-          return (0, _jestAxe.axe)(container);
+          return (0, _axeHelper.axe)(container, disabledRules);
         case 3:
           results = _context2.sent;
           expect(results).toHaveNoViolations();

package/resultset-table/ResultsetTable.js

@@ -20,14 +20,14 @@ var _utils = require("../common/utils");
 var _coreTokens = _interopRequireDefault(require("../common/coreTokens"));
 var _templateObject, _templateObject2, _templateObject3;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var normalizeSortValue = function normalizeSortValue(sortValue) {
   return typeof sortValue === "string" ? sortValue.toUpperCase() : sortValue;
 };
 var sortArray = function sortArray(index, order, resultset) {
   return resultset.slice().sort(function (element1, element2) {
-    var sortValueA = normalizeSortValue(element1[index].sortValue || element1[index].displayValue);
-    var sortValueB = normalizeSortValue(element2[index].sortValue || element2[index].displayValue);
+    var sortValueA = normalizeSortValue(element1.cells[index].sortValue || element1[index].displayValue);
+    var sortValueB = normalizeSortValue(element2.cells[index].sortValue || element2[index].displayValue);
     var comparison = 0;
     if ((0, _typeof2["default"])(sortValueA) === "object") {
       comparison = -1;
@@ -47,6 +47,17 @@ var getMinItemsPerPageIndex = function getMinItemsPerPageIndex(currentPageIntern
 var getMaxItemsPerPageIndex = function getMaxItemsPerPageIndex(minItemsPerPageIndex, itemsPerPage, resultset, page) {
   return minItemsPerPageIndex + itemsPerPage > resultset.length ? resultset.length : itemsPerPage * page - 1;
 };
+var assignIdsToRows = function assignIdsToRows(resultset) {
+  if (resultset.length > 0) {
+    return resultset.map(function (row, index) {
+      return {
+        cells: row,
+        id: "row_".concat(index)
+      };
+    });
+  }
+  return [];
+};
 var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var columns = _ref.columns,
     rows = _ref.rows,
@@ -76,6 +87,10 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     sortOrder = _useState6[0],
     changeSortOrder = _useState6[1];
+  var prevRowCountRef = (0, _react.useRef)(rows.length);
+  var rowsWithIds = (0, _react.useMemo)(function () {
+    return assignIdsToRows(rows);
+  }, [rows]);
   var minItemsPerPageIndex = (0, _react.useMemo)(function () {
     return getMinItemsPerPageIndex(page, itemsPerPage, page);
   }, [itemsPerPage, page]);
@@ -83,8 +98,8 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     return getMaxItemsPerPageIndex(minItemsPerPageIndex, itemsPerPage, rows, page);
   }, [itemsPerPage, minItemsPerPageIndex, page, rows]);
   var sortedResultset = (0, _react.useMemo)(function () {
-    return sortColumnIndex !== -1 ? sortArray(sortColumnIndex, sortOrder, rows) : rows;
-  }, [sortColumnIndex, sortOrder, rows]);
+    return sortColumnIndex !== -1 ? sortArray(sortColumnIndex, sortOrder, rowsWithIds) : rowsWithIds;
+  }, [sortColumnIndex, sortOrder, rowsWithIds]);
   var filteredResultset = (0, _react.useMemo)(function () {
     return sortedResultset && sortedResultset.slice(minItemsPerPageIndex, maxItemsPerPageIndex + 1);
   }, [sortedResultset, minItemsPerPageIndex, maxItemsPerPageIndex]);
@@ -98,9 +113,18 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
   };
   (0, _react.useEffect)(function () {
     if (!hidePaginator) {
-      rows.length > 0 ? changePage(1) : changePage(0);
+      if (rows.length === 0) {
+        changePage(0);
+      } else if (rows.length < prevRowCountRef.current) {
+        var lastPage = Math.ceil(rows.length / itemsPerPage);
+        var prevLastPage = Math.ceil(prevRowCountRef.current / itemsPerPage);
+        if (lastPage < prevLastPage) {
+          changePage(Math.min(lastPage, page));
+        }
+      }
+      prevRowCountRef.current = rows.length;
     }
-  }, [rows]);
+  }, [rows.length]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.table
   }, /*#__PURE__*/_react["default"].createElement(DxcResultsetTableContainer, {
@@ -119,12 +143,13 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
       },
       tabIndex: column.isSortable ? tabIndex : -1,
       isSortable: column.isSortable,
-      mode: mode
+      mode: mode,
+      "aria-label": column.isSortable ? "Sort column" : undefined
     }, /*#__PURE__*/_react["default"].createElement("span", null, column.displayValue), column.isSortable && /*#__PURE__*/_react["default"].createElement(SortIcon, null, sortColumnIndex === index ? sortOrder === "ascending" ? _Icons["default"].arrowUp : _Icons["default"].arrowDown : _Icons["default"].bothArrows)));
-  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, filteredResultset.map(function (cells, rowIndex) {
+  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, filteredResultset.map(function (row) {
     return /*#__PURE__*/_react["default"].createElement("tr", {
-      key: "resultSetTableCell_".concat(page, "_").concat(rowIndex)
-    }, cells.map(function (cellContent, cellIndex) {
+      key: "resultSetTableCell_".concat(row.id)
+    }, row.cells.map(function (cellContent, cellIndex) {
       return /*#__PURE__*/_react["default"].createElement("td", {
         key: "resultSetTableCellContent_".concat(cellIndex)
       }, cellContent.displayValue);

package/resultset-table/ResultsetTable.stories.tsx

@@ -2,13 +2,25 @@ import React from "react";
 import DxcResultsetTable from "./ResultsetTable";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import { userEvent, within } from "@storybook/testing-library";
+import { userEvent, within } from "@storybook/test";
 import styled from "styled-components";
 import { HalstackProvider } from "../HalstackContext";
+import { disabledRules } from "../../test/accessibility/rules/specific/resultset-table/disabledRules";
+import preview from "../../.storybook/preview";
 
 export default {
   title: "Resultset Table",
   component: DxcResultsetTable,
+  parameters: {
+    a11y: {
+      config: {
+        rules: [
+          ...disabledRules.map((ruleId) => ({ id: ruleId, reviewOnFail: true })),
+          ...preview?.parameters?.a11y?.config?.rules,
+        ],
+      },
+    },
+  },
 };
 
 const deleteIcon = (
@@ -397,5 +409,5 @@ export const DropdownAction = ResultsetActionsCellDropdown.bind({});
 DropdownAction.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const dropdown = canvas.getAllByRole("button")[5];
-  await userEvent.click(dropdown);
+  userEvent.click(dropdown);
 };

package/resultset-table/ResultsetTable.test.d.ts

@@ -0,0 +1 @@
+export {};

package/resultset-table/ResultsetTable.test.js

@@ -8,7 +8,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
-var _ResultsetTable = _interopRequireDefault(require("./ResultsetTable.tsx"));
+var _ResultsetTable = _interopRequireDefault(require("./ResultsetTable"));
+var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
 global.DOMRect = {
@@ -27,7 +28,7 @@ global.ResizeObserver = /*#__PURE__*/function () {
   function ResizeObserver() {
     (0, _classCallCheck2["default"])(this, ResizeObserver);
   }
-  (0, _createClass2["default"])(ResizeObserver, [{
+  return (0, _createClass2["default"])(ResizeObserver, [{
     key: "observe",
     value: function observe() {}
   }, {
@@ -37,7 +38,6 @@ global.ResizeObserver = /*#__PURE__*/function () {
     key: "disconnect",
     value: function disconnect() {}
   }]);
-  return ResizeObserver;
 }();
 var icon = /*#__PURE__*/_react["default"].createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg",
@@ -152,36 +152,55 @@ var rows = [[{
   displayValue: "Barcelona",
   sortValue: "Barcelona"
 }]];
-var rows2 = [[{
-  displayValue: "546",
-  sortValue: "465"
+var columnsWithCheckbox = [{
+  displayValue: "Id",
+  isSortable: true
+}, {
+  displayValue: "Checkbox",
+  isSortable: false
+}, {
+  displayValue: "Name",
+  isSortable: false
+}, {
+  displayValue: "City",
+  isSortable: false
+}];
+var rowsWithCheckbox = [[{
+  displayValue: "001",
+  sortValue: "001"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    size: "fillParent",
+    defaultChecked: true
+  })
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "Peter"
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "Miami"
 }], [{
-  displayValue: "978",
-  sortValue: "465"
+  displayValue: "002",
+  sortValue: "002"
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    size: "fillParent"
+  })
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "Louis"
 }, {
-  displayValue: ""
+  displayValue: "London"
 }], [{
-  displayValue: "678",
-  sortValue: "344"
+  displayValue: "003",
+  sortValue: "003"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    size: "fillParent"
+  })
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "Lana"
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "Amsterdam"
 }]];
+var rows2 = [].concat(rows).slice(0, -1);
 describe("Resultset table component tests", function () {
   test("Resultset table rendered correctly", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
@@ -285,42 +304,93 @@ describe("Resultset table component tests", function () {
     expect(component.queryByText("Tina")).toBeTruthy();
     expect(component.queryByText("Cosmin")).not.toBeTruthy();
   });
-  test("Resultset table change rows should go to first page", function () {
+  test("Resultset table should go one page back when removing the last page data", function () {
     var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
         columns: columns,
         rows: rows,
         itemsPerPage: 3
       })),
+      getAllByRole = _render6.getAllByRole,
       queryByText = _render6.queryByText,
       rerender = _render6.rerender;
+    expect(queryByText("1 to 3 of 10")).toBeTruthy();
+    var lastButton = getAllByRole("button")[4];
     expect(queryByText("Peter")).toBeTruthy();
+    _react2.fireEvent.click(lastButton);
+    expect(queryByText("10 to 10 of 10")).toBeTruthy();
     rerender( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows2,
       itemsPerPage: 3
     }));
-    expect(queryByText("1 to 3 of 3")).toBeTruthy();
+    expect(queryByText("7 to 9 of 9")).toBeTruthy();
   });
-  test("Resultset table change itemsPerPage should go to first page", function () {
+  test("Resultset table shouldn't go one page back when there is data left in the last page", function () {
     var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+        columns: columns,
+        rows: rows,
+        itemsPerPage: 2
+      })),
+      getAllByRole = _render7.getAllByRole,
+      queryByText = _render7.queryByText,
+      rerender = _render7.rerender;
+    expect(queryByText("1 to 2 of 10")).toBeTruthy();
+    var lastButton = getAllByRole("button")[4];
+    expect(queryByText("Peter")).toBeTruthy();
+    _react2.fireEvent.click(lastButton);
+    expect(queryByText("9 to 10 of 10")).toBeTruthy();
+    rerender( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+      columns: columns,
+      rows: rows2,
+      itemsPerPage: 2
+    }));
+    expect(queryByText("9 to 9 of 9")).toBeTruthy();
+  });
+  test("Resultset table uncontrolled components maintain its value when sorting", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render8, getAllByRole, columnHeader, sortButton;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+            columns: columnsWithCheckbox,
+            rows: rowsWithCheckbox,
+            itemsPerPage: 3
+          })), getAllByRole = _render8.getAllByRole;
+          columnHeader = getAllByRole("columnheader")[0];
+          sortButton = getAllByRole("button")[0];
+          expect(getAllByRole("checkbox")[0].getAttribute("aria-checked")).toBe("true");
+          expect(columnHeader.getAttribute("aria-sort")).toBe("none");
+          _react2.fireEvent.click(sortButton);
+          expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
+          _react2.fireEvent.click(sortButton);
+          expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
+          expect(getAllByRole("checkbox")[0].getAttribute("aria-checked")).toBe("false");
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  test("Resultset table change itemsPerPage should go to first page", function () {
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
         columns: columns,
         rows: rows,
         itemsPerPage: 3,
         itemsPerPageOptions: [2, 3]
       })),
-      getAllByRole = _render7.getAllByRole;
+      getAllByRole = _render9.getAllByRole;
     var lastButton = getAllByRole("button")[4];
     expect(getAllByRole("row").length - 1).toEqual(3);
     _react2.fireEvent.click(lastButton);
     expect(getAllByRole("row").length - 1).toEqual(1);
   });
   test("Resultset table may not use the paginator", function () {
-    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
         columns: columns,
         rows: rows,
         hidePaginator: true
       })),
-      getAllByRole = _render8.getAllByRole;
+      getAllByRole = _render10.getAllByRole;
     var nextButton = getAllByRole("button")[3];
     expect(nextButton).not.toBeTruthy();
   });
@@ -328,7 +398,6 @@ describe("Resultset table component tests", function () {
     var onSelectOption = jest.fn();
     var onClick = jest.fn();
     var actions = [{
-      icon: icon,
       title: "icon1",
       onClick: onSelectOption,
       options: [{
@@ -358,14 +427,14 @@ describe("Resultset table component tests", function () {
       }),
       sortValue: "Actions"
     }]];
-    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+    var _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
         columns: columns,
         rows: actionRows,
         itemsPerPage: 3
       })),
-      getAllByRole = _render9.getAllByRole,
-      getByRole = _render9.getByRole,
-      getByText = _render9.getByText;
+      getAllByRole = _render11.getAllByRole,
+      getByRole = _render11.getByRole,
+      getByText = _render11.getByText;
     var dropdown = getAllByRole("button")[2];
     (0, _react2.act)(function () {
       _userEvent["default"].click(dropdown);

package/select/Listbox.js

@@ -11,10 +11,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 var _Option = _interopRequireDefault(require("./Option"));
-var _Icons = _interopRequireDefault(require("./Icons"));
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var groupsHaveOptions = function groupsHaveOptions(options) {
   return options !== null && options !== void 0 && options[0].options ? options.some(function (groupOption) {
     var _groupOption$options;
@@ -35,14 +35,15 @@ var Listbox = function Listbox(_ref) {
     styles = _ref.styles;
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var listboxRef = (0, _react.useRef)(null);
+  var listboxId = "select-".concat((0, _react.useId)());
   var globalIndex = optional && !multiple ? 0 : -1;
   var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
+    var groupId = "".concat(listboxId, "-group-").concat(mapIndex);
     if (option.options) {
-      var groupId = "group-".concat(mapIndex);
       return option.options.length > 0 && /*#__PURE__*/_react["default"].createElement("li", {
-        key: "group-".concat(mapIndex)
+        key: groupId
       }, /*#__PURE__*/_react["default"].createElement(GroupList, {
-        role: "group",
+        role: "listbox",
         "aria-labelledby": groupId
       }, /*#__PURE__*/_react["default"].createElement(GroupLabel, {
         role: "presentation",
@@ -50,8 +51,8 @@ var Listbox = function Listbox(_ref) {
       }, option.label), option.options.map(function (singleOption) {
         globalIndex++;
         return /*#__PURE__*/_react["default"].createElement(_Option["default"], {
-          key: "option-".concat(singleOption.value),
-          id: "option-".concat(globalIndex),
+          key: "".concat(listboxId, "-option-").concat(singleOption.value),
+          id: "".concat(listboxId, "-option-").concat(globalIndex),
           option: singleOption,
           onClick: handleOptionOnClick,
           multiple: multiple,
@@ -64,8 +65,8 @@ var Listbox = function Listbox(_ref) {
     } else {
       globalIndex++;
       return /*#__PURE__*/_react["default"].createElement(_Option["default"], {
-        key: "option-".concat(option.value),
-        id: "option-".concat(globalIndex),
+        key: "".concat(listboxId, "-option-").concat(option.value),
+        id: "".concat(listboxId, "-option-").concat(globalIndex),
         option: option,
         onClick: handleOptionOnClick,
         multiple: multiple,
@@ -93,6 +94,10 @@ var Listbox = function Listbox(_ref) {
       inline: "start"
     });
   }, [visualFocusIndex]);
+  var hasOptionGroups = options.some(function (option) {
+    var _option$options;
+    return ((_option$options = option.options) === null || _option$options === void 0 ? void 0 : _option$options.length) > 0;
+  });
   return /*#__PURE__*/_react["default"].createElement(ListboxContainer, {
     id: id,
     onClick: function onClick(event) {
@@ -102,12 +107,15 @@ var Listbox = function Listbox(_ref) {
       event.preventDefault();
     },
     ref: listboxRef,
-    role: "listbox",
-    "aria-multiselectable": multiple,
-    style: styles
-  }, searchable && (options.length === 0 || !groupsHaveOptions(options)) ? /*#__PURE__*/_react["default"].createElement(OptionsSystemMessage, null, /*#__PURE__*/_react["default"].createElement(NoMatchesFoundIcon, null, _Icons["default"].searchOff), translatedLabels.select.noMatchesErrorMessage) : optional && !multiple && /*#__PURE__*/_react["default"].createElement(_Option["default"], {
-    key: "option-".concat(optionalItem.value),
-    id: "option-".concat(0),
+    "aria-multiselectable": !hasOptionGroups ? multiple : undefined,
+    style: styles,
+    role: hasOptionGroups ? "list" : "listbox",
+    "aria-label": "List of options"
+  }, searchable && (options.length === 0 || !groupsHaveOptions(options)) ? /*#__PURE__*/_react["default"].createElement(OptionsSystemMessage, null, /*#__PURE__*/_react["default"].createElement(NoMatchesFoundIcon, null, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "search_off"
+  })), translatedLabels.select.noMatchesErrorMessage) : optional && !multiple && /*#__PURE__*/_react["default"].createElement(_Option["default"], {
+    key: "".concat(id, "-option-").concat(optionalItem.value),
+    id: "".concat(id, "-option-", 0),
     option: optionalItem,
     onClick: handleOptionOnClick,
     multiple: multiple,
@@ -135,7 +143,7 @@ var ListboxContainer = _styledComponents["default"].ul(_templateObject || (_temp
 var OptionsSystemMessage = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 4px 16px;\n  color: ", ";\n  font-size: 0.875rem;\n  line-height: 1.715em;\n"])), function (props) {
   return props.theme.systemMessageFontColor;
 });
-var NoMatchesFoundIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-right: 0.25rem;\n"])));
+var NoMatchesFoundIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 16px;\n  width: 16px;\n  padding: 4px;\n  margin-right: 0.25rem;\n  font-size: 16px;\n"])));
 var GroupList = _styledComponents["default"].ul(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0;\n"])));
 var GroupLabel = _styledComponents["default"].li(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  font-weight: ", ";\n  line-height: 1.715em;\n"])), function (props) {
   return props.theme.listGroupLabelFontWeight;

package/select/Option.js

@@ -9,7 +9,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
-var _Icons = _interopRequireDefault(require("./Icons"));
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 var Option = function Option(_ref) {
   var id = _ref.id,
@@ -34,7 +34,8 @@ var Option = function Option(_ref) {
     visualFocused: visualFocused,
     selected: isSelected,
     role: "option",
-    "aria-selected": isSelected
+    "aria-selected": !multiple ? isSelected : undefined,
+    tabIndex: 0
   }, /*#__PURE__*/_react["default"].createElement(StyledOption, {
     visualFocused: visualFocused,
     selected: isSelected,
@@ -46,17 +47,18 @@ var Option = function Option(_ref) {
     tabIndex: -1
   }), option.icon && /*#__PURE__*/_react["default"].createElement(OptionIcon, {
     grouped: isGroupedOption,
-    multiple: multiple,
-    role: !(typeof option.icon === "string") ? "img" : undefined
-  }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
-    src: option.icon
+    multiple: multiple
+  }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: option.icon
   }) : option.icon), /*#__PURE__*/_react["default"].createElement(OptionContent, {
     grouped: isGroupedOption,
     hasIcon: option.icon ? true : false,
     multiple: multiple
   }, /*#__PURE__*/_react["default"].createElement(OptionLabel, {
     onMouseEnter: handleOnMouseEnter
-  }, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, _Icons["default"].selected))));
+  }, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "done"
+  })))));
 };
 var OptionItem = _styledComponents["default"].li(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 0 0.5rem;\n  box-shadow: inset 0 0 0 2px transparent;\n  ", "\n  ", ";\n  line-height: 1.715em;\n  cursor: pointer;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n"])), function (props) {
   return props.visualFocused && "box-shadow: inset 0 0 0 2px ".concat(props.theme.focusListOptionBorderColor, ";");
@@ -67,12 +69,12 @@ var OptionItem = _styledComponents["default"].li(_templateObject || (_templateOb
 }, function (props) {
   return props.selected ? "background-color: ".concat(props.theme.selectedActiveListOptionBackgroundColor, ";") : "background-color: ".concat(props.theme.unselectedActiveListOptionBackgroundColor, ";");
 });
-var StyledOption = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0.25rem 0.5rem 0.188rem 0;\n  min-height: 24px;\n  ", "\n  ", ";\n"])), function (props) {
+var StyledOption = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0.25rem 0.5rem 0.188rem 0;\n  min-height: 24px;\n  align-items: center;\n  ", "\n  ", ";\n"])), function (props) {
   return props.grouped && props.multiple && "padding-left: 16px;";
 }, function (props) {
   return props.last || props.visualFocused || props.selected ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionDividerColor);
 });
-var OptionIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0.125rem;\n  margin-left: ", ";\n  color: ", ";\n\n  svg,\n  img {\n    height: 20px;\n    width: 20px;\n  }\n"])), function (props) {
+var OptionIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0.125rem;\n  margin-left: ", ";\n  color: ", ";\n\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n  font-size: 24px;\n"])), function (props) {
   return props.grouped && !props.multiple ? "16px" : "8px";
 }, function (props) {
   return props.theme.listOptionIconColor;
@@ -81,7 +83,7 @@ var OptionContent = _styledComponents["default"].span(_templateObject4 || (_temp
   return props.grouped && !props.multiple && !props.hasIcon ? "16px" : "8px";
 });
 var OptionLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
-var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  color: ", ";\n\n  svg {\n    width: 16px;\n    height: 16px;\n  }\n"])), function (props) {
+var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  color: ", ";\n  font-size: 16px;\n"])), function (props) {
   return props.theme.selectedListOptionIconColor;
 });
 var _default = exports["default"] = /*#__PURE__*/_react["default"].memo(Option);

package/select/Select.accessibility.test.d.ts

@@ -0,0 +1 @@
+export {};