@dxc-technology/halstack-react 11.0.0 → 12.0.0

package/resultset-table/ResultsetTable.js

@@ -12,14 +12,15 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _variables = require("../common/variables");
-var _Table = _interopRequireDefault(require("../table/Table"));
 var _Paginator = _interopRequireDefault(require("../paginator/Paginator"));
+var _Table = _interopRequireWildcard(require("../table/Table"));
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 var _Icons = _interopRequireDefault(require("./Icons"));
 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;
 };
@@ -49,6 +50,8 @@ var getMaxItemsPerPageIndex = function getMaxItemsPerPageIndex(minItemsPerPageIn
 var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var columns = _ref.columns,
     rows = _ref.rows,
+    _ref$hidePaginator = _ref.hidePaginator,
+    hidePaginator = _ref$hidePaginator === void 0 ? false : _ref$hidePaginator,
     _ref$showGoToPage = _ref.showGoToPage,
     showGoToPage = _ref$showGoToPage === void 0 ? true : _ref$showGoToPage,
     _ref$itemsPerPage = _ref.itemsPerPage,
@@ -57,7 +60,9 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     itemsPerPageFunction = _ref.itemsPerPageFunction,
     margin = _ref.margin,
     _ref$tabIndex = _ref.tabIndex,
-    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? "default" : _ref$mode;
   var colorsTheme = (0, _useTheme["default"])();
   var _useState = (0, _react.useState)(1),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -92,13 +97,17 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     changeSortOrder(sortColumnIndex === -1 || sortColumnIndex !== columnIndex ? "ascending" : sortOrder === "ascending" ? "descending" : "ascending");
   };
   (0, _react.useEffect)(function () {
-    rows.length > 0 ? changePage(1) : changePage(0);
+    if (!hidePaginator) {
+      rows.length > 0 ? changePage(1) : changePage(0);
+    }
   }, [rows]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.table
   }, /*#__PURE__*/_react["default"].createElement(DxcResultsetTableContainer, {
     margin: margin
-  }, /*#__PURE__*/_react["default"].createElement(_Table["default"], null, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, columns.map(function (column, index) {
+  }, /*#__PURE__*/_react["default"].createElement(_Table["default"], {
+    mode: mode
+  }, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, columns.map(function (column, index) {
     return /*#__PURE__*/_react["default"].createElement("th", {
       key: "tableHeader_".concat(index),
       "aria-sort": column.isSortable ? sortColumnIndex === index ? sortOrder : "none" : undefined
@@ -109,17 +118,19 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
         column.isSortable && changeSorting(index);
       },
       tabIndex: column.isSortable ? tabIndex : -1,
-      isSortable: column.isSortable
+      isSortable: column.isSortable,
+      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, index) {
+  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, filteredResultset.map(function (cells, rowIndex) {
     return /*#__PURE__*/_react["default"].createElement("tr", {
-      key: "resultSetTableCell_".concat(index)
-    }, cells.map(function (cellContent, index) {
+      key: "resultSetTableCell_".concat(page, "_").concat(rowIndex)
+    }, cells.map(function (cellContent, cellIndex) {
       return /*#__PURE__*/_react["default"].createElement("td", {
-        key: "resultSetTableCellContent_".concat(index)
+        key: "resultSetTableCellContent_".concat(cellIndex)
       }, cellContent.displayValue);
     }));
-  }))), /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+  }))), !hidePaginator && /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
     totalItems: rows.length,
     itemsPerPage: itemsPerPage,
     itemsPerPageOptions: itemsPerPageOptions,
@@ -146,9 +157,9 @@ var DxcResultsetTableContainer = _styledComponents["default"].div(_templateObjec
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
-var HeaderContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: ", ";\n  gap: 8px;\n  width: fit-content;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  padding: 3px;\n  cursor: ", ";\n\n  ", "\n"])), function (props) {
+var HeaderContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: ", ";\n  gap: ", ";\n  width: fit-content;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  cursor: ", ";\n\n  ", "\n"])), function (props) {
   return props.theme.headerTextAlign === "center" ? "center" : props.theme.headerTextAlign === "right" ? "flex-end" : "flex-start";
-}, function (props) {
+}, _coreTokens["default"].spacing_8, function (props) {
   return props.isSortable ? "pointer" : "default";
 }, function (props) {
   return props.isSortable && "&:focus {\n      outline: #0095ff solid 2px;\n    }";
@@ -156,4 +167,5 @@ var HeaderContainer = _styledComponents["default"].span(_templateObject2 || (_te
 var SortIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 14px;\n  width: 14px;\n  color: ", ";\n\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
   return props.theme.sortIconColor;
 });
+DxcResultsetTable.ActionsCell = _Table.DxcActionsCell;
 var _default = exports["default"] = DxcResultsetTable;

package/resultset-table/ResultsetTable.stories.tsx

@@ -1,19 +1,31 @@
 import React from "react";
 import DxcResultsetTable from "./ResultsetTable";
-import DxcButton from "../button/Button";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import { userEvent, within } from "@storybook/testing-library";
 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 = (
   <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
-    <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />
+    <path fill="currentColor" d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />
     <path d="M0 0h24v24H0z" fill="none" />
   </svg>
 );
@@ -29,17 +41,77 @@ const rows = [
   [{ displayValue: "006" }, { displayValue: "Cris" }, { displayValue: "Paris" }],
 ];
 
+const advancedTheme = {
+  table: {
+    actionIconColor: "#1B75BB",
+    hoverActionIconColor: "#1B75BB",
+    activeActionIconColor: "#1B75BB",
+    focusActionIconColor: "#1B75BB",
+    disabledActionIconColor: "#666666",
+    hoverButtonBackgroundColor: "#cccccc",
+  },
+};
+
+const actions = [
+  {
+    title: "icon",
+    onClick: (value?) => {
+      console.log(value);
+    },
+    options: [
+      {
+        value: "1",
+        label: "Amazon with a very long text",
+      },
+      {
+        value: "2",
+        label: "Ebay",
+      },
+      {
+        value: "3",
+        label: "Apple",
+      },
+    ],
+  },
+  {
+    icon: "filled_edit",
+    title: "icon",
+    onClick: () => {},
+  },
+  {
+    icon: deleteIcon,
+    title: "icon",
+    onClick: () => {},
+    disabled: true,
+  },
+  {
+    icon: deleteIcon,
+    title: "icon",
+    onClick: () => {},
+  },
+];
+
 const rowsIcon = [
   [
     { displayValue: "001", sortValue: "001" },
     { displayValue: "Peter" },
-    { displayValue: <DxcButton icon={deleteIcon} /> },
+    {
+      displayValue: <DxcResultsetTable.ActionsCell actions={actions} />,
+    },
+  ],
+  [
+    { displayValue: "002", sortValue: "002" },
+    { displayValue: "Louis" },
+    {
+      displayValue: <DxcResultsetTable.ActionsCell actions={actions} />,
+    },
   ],
-  [{ displayValue: "002", sortValue: "002" }, { displayValue: "Louis" }, { displayValue: "" }],
   [
     { displayValue: "003", sortValue: "003" },
     { displayValue: "Mark" },
-    { displayValue: <DxcButton icon={deleteIcon} /> },
+    {
+      displayValue: <DxcResultsetTable.ActionsCell actions={actions} />,
+    },
   ],
 ];
 
@@ -200,12 +272,35 @@ export const Chromatic = () => (
       <Title title="Scroll resultset table" theme="light" level={4} />
       <DxcResultsetTable columns={longColumns} rows={longRows} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Without paginator" theme="light" level={4} />
+      <DxcResultsetTable columns={columns} rows={rows} hidePaginator />
+    </ExampleContainer>
     <ExampleContainer>
       <SmallContainer>
         <Title title="Small container and text overflow" theme="light" level={4} />
         <DxcResultsetTable columns={columnsSortable} rows={longValues} />
       </SmallContainer>
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Reduced sortable table" theme="light" level={4} />
+      <DxcResultsetTable columns={columnsSortable} rows={rowsSortable} mode="reduced" />
+    </ExampleContainer>
+    {/* PENDING SMALL ICON VERSION */}
+    <ExampleContainer>
+      <Title title="Reduced with items per page option" theme="light" level={4} />
+      <DxcResultsetTable columns={columns} rows={rows} itemsPerPage={2} itemsPerPageOptions={[2, 3]} mode="reduced" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Reduced scroll resultset table" theme="light" level={4} />
+      <DxcResultsetTable columns={longColumns} rows={longRows} mode="reduced" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <SmallContainer>
+        <Title title="Reduced small container and text overflow" theme="light" level={4} />
+        <DxcResultsetTable columns={columnsSortable} rows={longValues} mode="reduced" />
+      </SmallContainer>
+    </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall" theme="light" level={4} />
@@ -298,3 +393,21 @@ LastPage.play = async ({ canvasElement }) => {
   const nextButton = canvas.getAllByRole("button")[3];
   await userEvent.click(nextButton);
 };
+
+const ResultsetActionsCellDropdown = () => (
+  <ExampleContainer>
+    <Title title="Dropdown Action" theme="light" level={4} />
+    <DxcResultsetTable columns={columns} rows={rowsIcon} itemsPerPage={2} />
+    <Title title="Custom theme actions cell" theme="light" level={4} />
+    <HalstackProvider advancedTheme={advancedTheme}>
+      <DxcResultsetTable columns={columns} rows={rowsIcon} itemsPerPage={2} />
+    </HalstackProvider>
+  </ExampleContainer>
+);
+
+export const DropdownAction = ResultsetActionsCellDropdown.bind({});
+DropdownAction.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  const dropdown = canvas.getAllByRole("button")[5];
+  await userEvent.click(dropdown);
+};

package/resultset-table/ResultsetTable.test.js

@@ -39,6 +39,18 @@ global.ResizeObserver = /*#__PURE__*/function () {
   }]);
   return ResizeObserver;
 }();
+var icon = /*#__PURE__*/_react["default"].createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  height: "24px",
+  viewBox: "0 0 24 24",
+  width: "24px",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0V0zm0 0h24v24H0V0z",
+  fill: "none"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76 10 0l2-2C15.14 9.14 8.87 9.14 5 13z"
+}));
 var columns = [{
   displayValue: "Id",
   isSortable: false
@@ -302,4 +314,68 @@ describe("Resultset table component tests", function () {
     _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"], {
+        columns: columns,
+        rows: rows,
+        hidePaginator: true
+      })),
+      getAllByRole = _render8.getAllByRole;
+    var nextButton = getAllByRole("button")[3];
+    expect(nextButton).not.toBeTruthy();
+  });
+  test("Resultset table with ActionsCell", function () {
+    var onSelectOption = jest.fn();
+    var onClick = jest.fn();
+    var actions = [{
+      icon: icon,
+      title: "icon1",
+      onClick: onSelectOption,
+      options: [{
+        value: "1",
+        label: "Amazon"
+      }, {
+        value: "2",
+        label: "Ebay"
+      }, {
+        value: "3",
+        label: "Aliexpress"
+      }]
+    }, {
+      icon: icon,
+      title: "icon2",
+      onClick: onClick
+    }];
+    var actionRows = [[{
+      displayValue: "001",
+      sortValue: "001"
+    }, {
+      displayValue: "Peter",
+      sortValue: "Peter"
+    }, {
+      displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+        actions: actions
+      }),
+      sortValue: "Actions"
+    }]];
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+        columns: columns,
+        rows: actionRows,
+        itemsPerPage: 3
+      })),
+      getAllByRole = _render9.getAllByRole,
+      getByRole = _render9.getByRole,
+      getByText = _render9.getByText;
+    var dropdown = getAllByRole("button")[2];
+    (0, _react2.act)(function () {
+      _userEvent["default"].click(dropdown);
+    });
+    expect(getByRole("menu")).toBeTruthy();
+    var option = getByText("Aliexpress");
+    _userEvent["default"].click(option);
+    expect(onSelectOption).toHaveBeenCalledWith("3");
+    var action = getAllByRole("button")[1];
+    _userEvent["default"].click(action);
+    expect(onClick).toHaveBeenCalled();
+  });
 });

package/resultset-table/types.d.ts

@@ -16,7 +16,7 @@ export type Column = {
      */
     isSortable?: boolean;
 };
-type Row = {
+export type Row = {
     /**
      * Value to be displayed in the cell.
      */
@@ -27,7 +27,7 @@ type Row = {
      */
     sortValue?: string;
 };
-type Props = {
+type CommonProps = {
     /**
      * An array of objects representing the columns of the table.
      */
@@ -37,6 +37,24 @@ type Props = {
      * as many objects as columns in the table.
      */
     rows: Row[][];
+    /**
+     * Size of the margin to be applied to the component. You can pass an object with 'top',
+     * 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
+     */
+    margin?: Space | Margin;
+    /**
+     * Value of the tabindex attribute applied to the sortable icon.
+     */
+    tabIndex?: number;
+    /**
+     * Determines the visual style and layout
+     * - "default": The default mode with big spacing
+     * - "reduced": A reduced mode with minimal spacing for dense tables
+     */
+    mode?: "default" | "reduced";
+};
+type PaginatedProps = CommonProps & {
+    hidePaginator?: false;
     /**
      * If true, a select component for navigation between pages will be displayed.
      */
@@ -54,14 +72,29 @@ type Props = {
      * option. The value selected will be passed as a parameter.
      */
     itemsPerPageFunction?: (value: number) => void;
+};
+type NonPaginatedProps = CommonProps & {
     /**
-     * Size of the margin to be applied to the component. You can pass an object with 'top',
-     * 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
+     * If true, paginator will not be displayed.
      */
-    margin?: Space | Margin;
+    hidePaginator: true;
     /**
-     * Value of the tabindex attribute applied to the sortable icon.
+     * If true, a select component for navigation between pages will be displayed.
      */
-    tabIndex?: number;
+    showGoToPage?: never;
+    /**
+     * Number of items per page.
+     */
+    itemsPerPage?: never;
+    /**
+     * An array of numbers representing the items per page options.
+     */
+    itemsPerPageOptions?: never;
+    /**
+     * This function will be called when the user selects an item per page
+     * option. The value selected will be passed as a parameter.
+     */
+    itemsPerPageFunction?: never;
 };
+type Props = PaginatedProps | NonPaginatedProps;
 export default Props;

package/select/Listbox.js

@@ -7,14 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 _uuid = require("uuid");
+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 +37,17 @@ var Listbox = function Listbox(_ref) {
     styles = _ref.styles;
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var listboxRef = (0, _react.useRef)(null);
+  var _useState = (0, _react.useState)("select-".concat((0, _uuid.v4)())),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
+    listBoxId = _useState2[0];
   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 +55,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 +69,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 +98,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 +111,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 +147,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,
@@ -21,6 +21,11 @@ var Option = function Option(_ref) {
     isGroupedOption = _ref$isGroupedOption === void 0 ? false : _ref$isGroupedOption,
     isLastOption = _ref.isLastOption,
     isSelected = _ref.isSelected;
+  var handleOnMouseEnter = function handleOnMouseEnter(event) {
+    var label = event.currentTarget;
+    var optionElement = document.getElementById(id);
+    if (optionElement.title === "" && label.scrollWidth > label.clientWidth) optionElement.title = option.label;
+  };
   return /*#__PURE__*/_react["default"].createElement(OptionItem, {
     id: id,
     onClick: function onClick() {
@@ -29,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,
@@ -41,15 +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, null, option.label), !multiple && isSelected && /*#__PURE__*/_react["default"].createElement(OptionSelectedIndicator, null, _Icons["default"].selected))));
+  }, /*#__PURE__*/_react["default"].createElement(OptionLabel, {
+    onMouseEnter: handleOnMouseEnter
+  }, 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, ";");
@@ -60,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;
@@ -74,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);