@dxc-technology/halstack-react 0.0.0-4e1277a → 0.0.0-4e3dbad

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: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "City",
+  isSortable: false
+}];
+var rowsWithCheckbox = [[{
+  displayValue: "001",
+  sortValue: "001"
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    size: "fillParent",
+    defaultChecked: true
+  })
+}, {
+  displayValue: "Peter"
+}, {
+  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: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    size: "fillParent"
+  })
 }, {
-  displayValue: "OtherValue",
-  sortValue: "OtherValue"
+  displayValue: "Lana"
+}, {
+  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,40 +304,100 @@ 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 _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
+        columns: columns,
+        rows: rows,
+        hidePaginator: true
+      })),
+      getAllByRole = _render10.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: [{
@@ -348,14 +427,14 @@ describe("Resultset table component tests", function () {
       }),
       sortValue: "Actions"
     }]];
-    var _render8 = (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 = _render8.getAllByRole,
-      getByRole = _render8.getByRole,
-      getByText = _render8.getByText;
+      getAllByRole = _render11.getAllByRole,
+      getByRole = _render11.getByRole,
+      getByText = _render11.getByText;
     var dropdown = getAllByRole("button")[2];
     (0, _react2.act)(function () {
       _userEvent["default"].click(dropdown);

package/resultset-table/types.d.ts

@@ -16,7 +16,7 @@ export type Column = {
      */
     isSortable?: boolean;
 };
-type Row = {
+type Cell = {
     /**
      * Value to be displayed in the cell.
      */
@@ -25,9 +25,10 @@ type Row = {
      * Value to be used when sorting the table by that
      * column. If not indicated displayValue will be used for sorting.
      */
-    sortValue?: string;
+    sortValue?: string | number | Date;
 };
-type Props = {
+export type Row = Cell[];
+type CommonProps = {
     /**
      * An array of objects representing the columns of the table.
      */
@@ -36,7 +37,25 @@ type Props = {
      * An array of objects representing the rows of the table, you will have
      * as many objects as columns in the table.
      */
-    rows: Row[][];
+    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,20 +73,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;
     /**
-     * Determines the visual style and layout
-     * - "default": The default mode with big spacing
-     * - "reduced": A reduced mode with minimal spacing for dense tables
+     * Number of items per page.
      */
-    mode?: "default" | "reduced";
+    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.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { ListboxProps } from "./types";
-declare const _default: React.MemoExoticComponent<({ id, currentValue, options, visualFocusIndex, lastOptionIndex, multiple, optional, optionalItem, searchable, handleOptionOnClick, styles, }: ListboxProps) => JSX.Element>;
-export default _default;
+declare const Listbox: ({ id, currentValue, options, visualFocusIndex, lastOptionIndex, multiple, optional, optionalItem, searchable, handleOptionOnClick, styles, }: ListboxProps) => JSX.Element;
+export default Listbox;

package/select/Listbox.js

@@ -11,16 +11,11 @@ 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 _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _selectUtils = require("./selectUtils");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 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; }
-var groupsHaveOptions = function groupsHaveOptions(options) {
-  return options !== null && options !== void 0 && options[0].options ? options.some(function (groupOption) {
-    var _groupOption$options;
-    return ((_groupOption$options = groupOption.options) === null || _groupOption$options === void 0 ? void 0 : _groupOption$options.length) > 0;
-  }) : true;
-};
+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 Listbox = function Listbox(_ref) {
   var id = _ref.id,
     currentValue = _ref.currentValue,
@@ -37,21 +32,24 @@ var Listbox = function Listbox(_ref) {
   var listboxRef = (0, _react.useRef)(null);
   var globalIndex = optional && !multiple ? 0 : -1;
   var mapOptionFunc = function mapOptionFunc(option, mapIndex) {
+    var groupId = "".concat(id, "-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)
-      }, /*#__PURE__*/_react["default"].createElement(GroupList, {
-        role: "group",
-        "aria-labelledby": groupId
+        key: groupId
+      }, /*#__PURE__*/_react["default"].createElement("ul", {
+        role: "listbox",
+        "aria-labelledby": groupId,
+        style: {
+          padding: 0
+        }
       }, /*#__PURE__*/_react["default"].createElement(GroupLabel, {
         role: "presentation",
         id: groupId
       }, 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(id, "-option-").concat(singleOption.value),
+          id: "".concat(id, "-option-").concat(globalIndex),
           option: singleOption,
           onClick: handleOptionOnClick,
           multiple: multiple,
@@ -64,8 +62,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(id, "-option-").concat(option.value),
+        id: "".concat(id, "-option-").concat(globalIndex),
         option: option,
         onClick: handleOptionOnClick,
         multiple: multiple,
@@ -93,6 +91,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 +104,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 || !(0, _selectUtils.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,
@@ -117,7 +122,7 @@ var Listbox = function Listbox(_ref) {
     isSelected: multiple ? currentValue.includes(optionalItem.value) : currentValue === optionalItem.value
   }), options.map(mapOptionFunc));
 };
-var ListboxContainer = _styledComponents["default"].ul(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  max-height: 304px;\n  overflow-y: auto;\n  margin: 0;\n  padding: 0.25rem 0;\n  background-color: ", ";\n  border: 1px solid ", ";\n  border-radius: 0.25rem;\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  cursor: default;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"])), function (props) {
+var ListboxContainer = _styledComponents["default"].ul(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  max-height: 304px;\n  overflow-y: auto;\n  margin: 0;\n  padding: 0.25rem 0;\n  background-color: ", ";\n  border: 1px solid ", ";\n  border-radius: 0.25rem;\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: 24px;\n  cursor: default;\n"])), function (props) {
   return props.theme.listDialogBackgroundColor;
 }, function (props) {
   return props.theme.listDialogBorderColor;
@@ -135,9 +140,8 @@ 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 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) {
+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 GroupLabel = _styledComponents["default"].li(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: 4px 16px;\n  font-weight: ", ";\n  line-height: 1.715em;\n"])), function (props) {
   return props.theme.listGroupLabelFontWeight;
 });
-var _default = exports["default"] = /*#__PURE__*/_react["default"].memo(Listbox);
+var _default = exports["default"] = Listbox;

package/select/Option.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { OptionProps } from "../select/types";
-declare const _default: React.MemoExoticComponent<({ id, option, onClick, multiple, visualFocused, isGroupedOption, isLastOption, isSelected, }: OptionProps) => JSX.Element>;
-export default _default;
+declare const Option: ({ id, option, onClick, multiple, visualFocused, isGroupedOption, isLastOption, isSelected, }: OptionProps) => JSX.Element;
+export default Option;

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,31 +34,37 @@ var Option = function Option(_ref) {
     visualFocused: visualFocused,
     selected: isSelected,
     role: "option",
-    "aria-selected": isSelected
+    "aria-selected": !multiple ? isSelected : undefined
   }, /*#__PURE__*/_react["default"].createElement(StyledOption, {
     visualFocused: visualFocused,
     selected: isSelected,
     last: isLastOption,
     grouped: isGroupedOption,
     multiple: multiple
-  }, multiple && /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+  }, multiple && /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: "flex",
+      pointerEvents: "none"
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
     checked: isSelected,
     tabIndex: -1
-  }), option.icon && /*#__PURE__*/_react["default"].createElement(OptionIcon, {
+  })), 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) {
+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  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, ";");
 }, function (props) {
   return props.selected && "background-color: ".concat(props.theme.selectedListOptionBackgroundColor);
@@ -67,21 +73,21 @@ 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  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  height: 32px;\n  padding: 4px 8px 4px 0;\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  margin-left: ", ";\n  display: grid;\n  place-items: center;\n  color: ", ";\n  font-size: 24px;\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])), function (props) {
   return props.grouped && !props.multiple ? "16px" : "8px";
 }, function (props) {
   return props.theme.listOptionIconColor;
 });
-var OptionContent = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  gap: 0.25rem;\n  width: 100%;\n  overflow: hidden;\n  margin-left: ", ";\n"])), function (props) {
+var OptionContent = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: ", ";\n  display: flex;\n  justify-content: space-between;\n  gap: 0.25rem;\n  width: 100%;\n  overflow: hidden;\n"])), function (props) {
   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);
+var _default = exports["default"] = Option;

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

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