@dxc-technology/halstack-react 0.0.0-74c93cf → 0.0.0-74dd241

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

@@ -0,0 +1,284 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+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",
+  viewBox: "0 0 24 24",
+  width: "24"
+}, /*#__PURE__*/_react["default"].createElement("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"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0z",
+  fill: "none"
+}));
+
+// Mocking DOMRect for Radix Primitive Popover
+global.globalThis = global;
+global.DOMRect = {
+  fromRect: function fromRect() {
+    return {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 0,
+      width: 0,
+      height: 0
+    };
+  }
+};
+global.ResizeObserver = /*#__PURE__*/function () {
+  function ResizeObserver() {
+    (0, _classCallCheck2["default"])(this, ResizeObserver);
+  }
+  return (0, _createClass2["default"])(ResizeObserver, [{
+    key: "observe",
+    value: function observe() {}
+  }, {
+    key: "unobserve",
+    value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
+  }]);
+}();
+var actions = [{
+  title: "icon",
+  onClick: function onClick() {},
+  options: [{
+    value: "1",
+    label: "Amazon with a very long text"
+  }, {
+    value: "2",
+    label: "Ebay"
+  }, {
+    value: "3",
+    label: "Apple"
+  }]
+}, {
+  icon: "https://www.freepnglogos.com/uploads/facebook-logo-design-1.png",
+  title: "icon",
+  onClick: function onClick() {}
+}, {
+  icon: deleteIcon,
+  title: "icon",
+  onClick: function onClick() {},
+  disabled: true
+}, {
+  icon: deleteIcon,
+  title: "icon",
+  onClick: function onClick() {}
+}];
+var columns = [{
+  displayValue: "Id",
+  isSortable: false
+}, {
+  displayValue: "Name",
+  isSortable: true
+}, {
+  displayValue: "City",
+  isSortable: false
+}];
+var rows = [[{
+  displayValue: "001",
+  sortValue: "001"
+}, {
+  displayValue: "Peter",
+  sortValue: "Peter"
+}, {
+  displayValue: "Oviedo",
+  sortValue: "Oviedo"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "002",
+  sortValue: "002"
+}, {
+  displayValue: "Louis",
+  sortValue: "Louis"
+}, {
+  displayValue: "Oviedo",
+  sortValue: "Oviedo"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "003",
+  sortValue: "003"
+}, {
+  displayValue: "Lana",
+  sortValue: "Lana"
+}, {
+  displayValue: "Albacete",
+  sortValue: "Albacete"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "004",
+  sortValue: "004"
+}, {
+  displayValue: "Rick",
+  sortValue: "Rick"
+}, {
+  displayValue: "Albacete",
+  sortValue: "Albacete"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "005",
+  sortValue: "005"
+}, {
+  displayValue: "Mark",
+  sortValue: "Mark"
+}, {
+  displayValue: "Madrid",
+  sortValue: "Madrid"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "006",
+  sortValue: "006"
+}, {
+  displayValue: "Cris",
+  sortValue: "Cris"
+}, {
+  displayValue: "Barcelona",
+  sortValue: "Barcelona"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "007",
+  sortValue: "007"
+}, {
+  displayValue: "Susan",
+  sortValue: "Susan"
+}, {
+  displayValue: "Madrid",
+  sortValue: "Madrid"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "008",
+  sortValue: "008"
+}, {
+  displayValue: "Tina",
+  sortValue: "Tina"
+}, {
+  displayValue: "Barcelona",
+  sortValue: "Barcelona"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "009",
+  sortValue: "009"
+}, {
+  displayValue: "Kevin",
+  sortValue: "Kevin"
+}, {
+  displayValue: "Oviedo",
+  sortValue: "Oviedo"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}], [{
+  displayValue: "010",
+  sortValue: "010"
+}, {
+  displayValue: "Cosmin",
+  sortValue: "Cosmin"
+}, {
+  displayValue: "Barcelona",
+  sortValue: "Barcelona"
+}, {
+  displayValue: /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"].ActionsCell, {
+    actions: actions
+  })
+}]];
+describe("Resultset Table input component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+            columns: columns,
+            rows: rows,
+            itemsPerPage: 2,
+            margin: "medium",
+            mode: "default",
+            itemsPerPageOptions: [2, 3],
+            showGoToPage: true
+          })), container = _render.container;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(container, disabledRules);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for reduced mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+            columns: columns,
+            rows: rows,
+            itemsPerPage: 2,
+            margin: "medium",
+            mode: "reduced",
+            itemsPerPageOptions: [2, 3],
+            showGoToPage: true
+          })), container = _render2.container;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(container, disabledRules);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+});

package/resultset-table/ResultsetTable.js

@@ -20,7 +20,7 @@ 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;
 };
@@ -119,7 +119,8 @@ 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) {
     return /*#__PURE__*/_react["default"].createElement("tr", {

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 = (

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

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

package/resultset-table/ResultsetTable.test.js

@@ -8,7 +8,7 @@ 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"));
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
 global.DOMRect = {
@@ -27,7 +27,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 +37,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",
@@ -328,7 +327,6 @@ describe("Resultset table component tests", function () {
     var onSelectOption = jest.fn();
     var onClick = jest.fn();
     var actions = [{
-      icon: icon,
       title: "icon1",
       onClick: onSelectOption,
       options: [{

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 {};