@dxc-technology/halstack-react 0.0.0-e1386cf → 0.0.0-e19ca5f

package/{resultsetTable → resultset-table}/types.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type Column = {
+export type Column = {
     /**
      * Column display value.
      */
@@ -16,7 +16,7 @@ declare type Column = {
      */
     isSortable?: boolean;
 };
-declare type Row = {
+export type Row = {
     /**
      * Value to be displayed in the cell.
      */
@@ -27,7 +27,7 @@ declare type Row = {
      */
     sortValue?: string;
 };
-declare type Props = {
+type CommonProps = {
     /**
      * An array of objects representing the columns of the table.
      */
@@ -37,6 +37,24 @@ declare 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.
      */
@@ -53,15 +71,30 @@ declare type Props = {
      * This function will be called when the user selects an item per page
      * option. The value selected will be passed as a parameter.
      */
-    itemsPerPageFunction?: (newValue: number) => void;
+    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 given 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/resultset-table/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/select/Listbox.d.ts

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

package/select/Listbox.js

@@ -1,74 +1,53 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 = _interopRequireWildcard(require("styled-components"));
-
-var _useTheme = _interopRequireDefault(require("../useTheme"));
-
+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(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+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 && {}.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;
 };
-
 var Listbox = function Listbox(_ref) {
   var id = _ref.id,
-      currentValue = _ref.currentValue,
-      options = _ref.options,
-      visualFocusIndex = _ref.visualFocusIndex,
-      lastOptionIndex = _ref.lastOptionIndex,
-      multiple = _ref.multiple,
-      optional = _ref.optional,
-      optionalItem = _ref.optionalItem,
-      searchable = _ref.searchable,
-      handleOptionOnClick = _ref.handleOptionOnClick,
-      getSelectWidth = _ref.getSelectWidth;
-  var colorsTheme = (0, _useTheme["default"])();
+    currentValue = _ref.currentValue,
+    options = _ref.options,
+    visualFocusIndex = _ref.visualFocusIndex,
+    lastOptionIndex = _ref.lastOptionIndex,
+    multiple = _ref.multiple,
+    optional = _ref.optional,
+    optionalItem = _ref.optionalItem,
+    searchable = _ref.searchable,
+    handleOptionOnClick = _ref.handleOptionOnClick,
+    styles = _ref.styles;
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var listboxRef = (0, _react.useRef)(null);
-
-  var _useState = (0, _react.useState)(null),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      styles = _useState2[0],
-      setStyles = _useState2[1];
-
-  var globalIndex = optional && !multiple ? 0 : -1; // index for options, starting from 0 to options.length -1
-
+  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",
@@ -76,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,
@@ -90,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,
@@ -101,11 +80,9 @@ var Listbox = function Listbox(_ref) {
       });
     }
   };
-
   (0, _react.useLayoutEffect)(function () {
     if (currentValue && !multiple) {
       var _listEl$scrollTo;
-
       var listEl = listboxRef === null || listboxRef === void 0 ? void 0 : listboxRef.current;
       var selectedListOptionEl = listEl === null || listEl === void 0 ? void 0 : listEl.querySelector("[aria-selected='true']");
       listEl === null || listEl === void 0 ? void 0 : (_listEl$scrollTo = listEl.scrollTo) === null || _listEl$scrollTo === void 0 ? void 0 : _listEl$scrollTo.call(listEl, {
@@ -115,32 +92,17 @@ var Listbox = function Listbox(_ref) {
   }, [currentValue, multiple]);
   (0, _react.useLayoutEffect)(function () {
     var _listboxRef$current, _visualFocusedOptionE;
-
     var visualFocusedOptionEl = listboxRef === null || listboxRef === void 0 ? void 0 : (_listboxRef$current = listboxRef.current) === null || _listboxRef$current === void 0 ? void 0 : _listboxRef$current.querySelectorAll("[role='option']")[visualFocusIndex];
     visualFocusedOptionEl === null || visualFocusedOptionEl === void 0 ? void 0 : (_visualFocusedOptionE = visualFocusedOptionEl.scrollIntoView) === null || _visualFocusedOptionE === void 0 ? void 0 : _visualFocusedOptionE.call(visualFocusedOptionEl, {
       block: "nearest",
       inline: "start"
     });
   }, [visualFocusIndex]);
-
-  var handleResize = function handleResize() {
-    setStyles({
-      width: getSelectWidth()
-    });
-  };
-
-  (0, _react.useLayoutEffect)(function () {
-    handleResize();
-  }, [getSelectWidth]);
-  (0, _react.useEffect)(function () {
-    window.addEventListener("resize", handleResize);
-    return function () {
-      window.removeEventListener("resize", handleResize);
-    };
-  }, [getSelectWidth]);
-  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.select
-  }, /*#__PURE__*/_react["default"].createElement(ListboxContainer, {
+  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) {
       event.stopPropagation();
@@ -149,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,
@@ -162,9 +127,8 @@ var Listbox = function Listbox(_ref) {
     isGroupedOption: false,
     isLastOption: lastOptionIndex === 0,
     isSelected: multiple ? currentValue.includes(optionalItem.value) : currentValue === optionalItem.value
-  }), options.map(mapOptionFunc)));
+  }), 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) {
   return props.theme.listDialogBackgroundColor;
 }, function (props) {
@@ -180,19 +144,12 @@ var ListboxContainer = _styledComponents["default"].ul(_templateObject || (_temp
 }, function (props) {
   return props.theme.listOptionFontWeight;
 });
-
 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;
 });
-
-var _default = /*#__PURE__*/_react["default"].memo(Listbox);
-
-exports["default"] = _default;
+var _default = exports["default"] = /*#__PURE__*/_react["default"].memo(Listbox);

package/select/Option.js

@@ -1,46 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _react = _interopRequireDefault(require("react"));
-
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _useTheme = _interopRequireDefault(require("../useTheme"));
-
+var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
-
-var _Icons = _interopRequireDefault(require("./Icons"));
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 var Option = function Option(_ref) {
   var id = _ref.id,
-      option = _ref.option,
-      _onClick = _ref.onClick,
-      multiple = _ref.multiple,
-      visualFocused = _ref.visualFocused,
-      _ref$isGroupedOption = _ref.isGroupedOption,
-      isGroupedOption = _ref$isGroupedOption === void 0 ? false : _ref$isGroupedOption,
-      isLastOption = _ref.isLastOption,
-      isSelected = _ref.isSelected;
-  var colorsTheme = (0, _useTheme["default"])();
-  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.select
-  }, /*#__PURE__*/_react["default"].createElement(OptionItem, {
+    option = _ref.option,
+    _onClick = _ref.onClick,
+    multiple = _ref.multiple,
+    visualFocused = _ref.visualFocused,
+    _ref$isGroupedOption = _ref.isGroupedOption,
+    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() {
       _onClick(option);
@@ -48,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,
@@ -60,17 +47,19 @@ 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(OptionIconImg, {
-    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, ";");
 }, function (props) {
@@ -80,31 +69,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  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  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  ", "\n  color: ", ";\n"])), function (props) {
-  return props.grouped && !props.multiple ? "padding-left: 16px;" : "padding-left: 8px;";
+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;
 });
-
-var OptionContent = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n  overflow: hidden;\n  ", "\n"])), function (props) {
-  return props.grouped && !props.multiple && !props.hasIcon ? "padding-left: 16px;" : "padding-left: 8px;";
+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) {
+  return props.grouped && !props.multiple && !props.hasIcon ? "16px" : "8px";
 });
-
-var OptionIconImg = _styledComponents["default"].img(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 16px;\n  height: 16px;\n"])));
-
-var OptionLabel = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n"])));
-
-var OptionSelectedIndicator = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 16px;\n  width: 16px;\n  margin-left: 4px;\n  color: ", ";\n"])), function (props) {
+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  font-size: 16px;\n"])), function (props) {
   return props.theme.selectedListOptionIconColor;
 });
-
-var _default = /*#__PURE__*/_react["default"].memo(Option);
-
-exports["default"] = _default;
+var _default = exports["default"] = /*#__PURE__*/_react["default"].memo(Option);