@dxc-technology/halstack-react 0.0.0-d3554d7 → 0.0.0-d3ac293

package/dropdown/Dropdown.js

@@ -19,30 +19,72 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _Popper = _interopRequireDefault(require("@material-ui/core/Popper"));
+var _variables = require("../common/variables");
 
-var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
+var _utils = require("../common/utils");
 
-var _core = require("@material-ui/core");
-
-var _Grow = _interopRequireDefault(require("@material-ui/core/Grow"));
-
-var _Paper = _interopRequireDefault(require("@material-ui/core/Paper"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _MenuList = _interopRequireDefault(require("@material-ui/core/MenuList"));
+var _uuid = require("uuid");
 
-var _variables = require("../common/variables.js");
+var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
 
-var _utils = require("../common/utils.js");
+var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
 
-var _useTheme = _interopRequireDefault(require("../useTheme"));
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 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 || _typeof3(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 upArrowIcon = /*#__PURE__*/_react["default"].createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 24 24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M7 14l5-5 5 5z"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0z",
+  fill: "none"
+}));
+
+var downArrowIcon = /*#__PURE__*/_react["default"].createElement("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 24 24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M7 10l5 5 5-5z"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0z",
+  fill: "none"
+}));
+
+var useWidth = function useWidth(target) {
+  var _useState = (0, _react.useState)(0),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      width = _useState2[0],
+      setWidth = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    if (target != null) {
+      setWidth(target.getBoundingClientRect().width);
+      var triggerObserver = new ResizeObserver(function (entries) {
+        var rect = entries[0].target.getBoundingClientRect();
+        setWidth(rect === null || rect === void 0 ? void 0 : rect.width);
+      });
+      triggerObserver.observe(target);
+      return function () {
+        triggerObserver.unobserve(target);
+      };
+    }
+  }, [target]);
+  return width;
+};
+
 var DxcDropdown = function DxcDropdown(_ref) {
   var options = _ref.options,
       _ref$optionsIconPosit = _ref.optionsIconPosition,
@@ -54,171 +96,206 @@ var DxcDropdown = function DxcDropdown(_ref) {
       label = _ref$label === void 0 ? "" : _ref$label,
       _ref$caretHidden = _ref.caretHidden,
       caretHidden = _ref$caretHidden === void 0 ? false : _ref$caretHidden,
-      onSelectOption = _ref.onSelectOption,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       _ref$expandOnHover = _ref.expandOnHover,
       expandOnHover = _ref$expandOnHover === void 0 ? false : _ref$expandOnHover,
+      onSelectOption = _ref.onSelectOption,
       margin = _ref.margin,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fitContent" : _ref$size,
       _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled;
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _useState = (0, _react.useState)(),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      width = _useState2[0],
-      setWidth = _useState2[1];
+  var _useState3 = (0, _react.useState)("trigger-".concat((0, _uuid.v4)())),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
+      triggerId = _useState4[0];
+
+  var menuId = "menu-".concat(triggerId);
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+      isOpen = _useState6[0],
+      changeIsOpen = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(0),
+      _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+      visualFocusIndex = _useState8[0],
+      setVisualFocusIndex = _useState8[1];
 
   var colorsTheme = (0, _useTheme["default"])();
-  var ref = (0, _react.useRef)(null);
+  var triggerRef = (0, _react.useRef)(null);
+  var menuRef = (0, _react.useRef)(null);
+  var width = useWidth(triggerRef.current);
 
-  var handleResize = function handleResize() {
-    if (ref.current) setWidth(ref.current.offsetWidth);
+  var handleOnOpenMenu = function handleOnOpenMenu() {
+    changeIsOpen(true);
   };
 
-  (0, _react.useEffect)(function () {
-    if (ref.current) {
-      ref.current.addEventListener("resize", handleResize);
-      handleResize();
+  var handleOnCloseMenu = function handleOnCloseMenu() {
+    changeIsOpen(false);
+    setVisualFocusIndex(0);
+  };
+
+  var handleMenuItemOnClick = (0, _react.useCallback)(function (value) {
+    var _triggerRef$current;
+
+    onSelectOption(value);
+    handleOnCloseMenu();
+    (_triggerRef$current = triggerRef.current) === null || _triggerRef$current === void 0 ? void 0 : _triggerRef$current.focus();
+  }, [onSelectOption]);
+
+  var handleOnBlur = function handleOnBlur(event) {
+    !event.currentTarget.contains(event.relatedTarget) && handleOnCloseMenu();
+  };
+
+  var handleTriggerOnClick = function handleTriggerOnClick() {
+    changeIsOpen(function (isOpen) {
+      return !isOpen;
+    });
+  };
+
+  var handleTriggerOnKeyDown = function handleTriggerOnKeyDown(event) {
+    switch (event.key) {
+      case "Up":
+      case "ArrowUp":
+        event.preventDefault();
+        setVisualFocusIndex(options.length - 1);
+        handleOnOpenMenu();
+        break;
+
+      case " ":
+      case "Down":
+      case "ArrowDown":
+      case "Enter":
+        event.preventDefault();
+        handleOnOpenMenu();
+        break;
     }
+  };
 
-    return function () {
-      if (ref.current) ref.current.removeEventListener("resize", handleResize);
-    };
-  }, []);
-
-  var _useState3 = (0, _react.useState)(null),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      anchorEl = _useState4[0],
-      setAnchorEl = _useState4[1];
-
-  function handleClickListItem(event) {
-    setAnchorEl(event.currentTarget);
-  }
-
-  function handleMenuItemClick(option) {
-    setAnchorEl(null);
-    onSelectOption(option.value);
-  }
-
-  function handleClose() {
-    setAnchorEl(null);
-  }
-
-  var handleCloseOver = expandOnHover ? handleClose : undefined;
-
-  var UpArrowIcon = function UpArrowIcon() {
-    return /*#__PURE__*/_react["default"].createElement("svg", {
-      xmlns: "http://www.w3.org/2000/svg",
-      width: "24",
-      height: "24",
-      viewBox: "0 0 24 24",
-      fill: "currentColor"
-    }, /*#__PURE__*/_react["default"].createElement("path", {
-      d: "M7 14l5-5 5 5z"
-    }), /*#__PURE__*/_react["default"].createElement("path", {
-      d: "M0 0h24v24H0z",
-      fill: "none"
-    }));
+  var setPreviousIndexFocus = function setPreviousIndexFocus() {
+    setVisualFocusIndex(function (currentFocusIndex) {
+      var index = currentFocusIndex === 0 ? options.length - 1 : currentFocusIndex - 1;
+      return index;
+    });
   };
 
-  var DownArrowIcon = function DownArrowIcon() {
-    return /*#__PURE__*/_react["default"].createElement("svg", {
-      xmlns: "http://www.w3.org/2000/svg",
-      width: "24",
-      height: "24",
-      viewBox: "0 0 24 24",
-      fill: "currentColor"
-    }, /*#__PURE__*/_react["default"].createElement("path", {
-      d: "M7 10l5 5 5-5z"
-    }), /*#__PURE__*/_react["default"].createElement("path", {
-      d: "M0 0h24v24H0z",
-      fill: "none"
-    }));
+  var setNextIndexFocus = function setNextIndexFocus() {
+    setVisualFocusIndex(function (currentFocusIndex) {
+      var index = currentFocusIndex === options.length - 1 ? 0 : currentFocusIndex + 1;
+      return index;
+    });
   };
 
+  var handleMenuOnKeyDown = (0, _react.useCallback)(function (event) {
+    var _triggerRef$current2, _triggerRef$current3;
+
+    switch (event.key) {
+      case "Up":
+      case "ArrowUp":
+        event.preventDefault();
+        setPreviousIndexFocus();
+        break;
+
+      case "Down":
+      case "ArrowDown":
+        event.preventDefault();
+        setNextIndexFocus();
+        break;
+
+      case " ":
+      case "Enter":
+        event.preventDefault();
+        handleMenuItemOnClick(options[visualFocusIndex].value);
+        break;
+
+      case "Esc":
+      case "Escape":
+        event.preventDefault();
+        handleOnCloseMenu();
+        (_triggerRef$current2 = triggerRef.current) === null || _triggerRef$current2 === void 0 ? void 0 : _triggerRef$current2.focus();
+        break;
+
+      case "Home":
+      case "PageUp":
+        event.preventDefault();
+        setVisualFocusIndex(0);
+        break;
+
+      case "End":
+      case "PageDown":
+        event.preventDefault();
+        setVisualFocusIndex(options.length - 1);
+        break;
+
+      case "Tab":
+        handleOnCloseMenu();
+        (_triggerRef$current3 = triggerRef.current) === null || _triggerRef$current3 === void 0 ? void 0 : _triggerRef$current3.focus();
+        break;
+    }
+  }, [onSelectOption, visualFocusIndex, options]);
+  (0, _react.useLayoutEffect)(function () {
+    var _menuRef$current, _visualFocusedMenuIte;
+
+    var visualFocusedMenuItem = menuRef === null || menuRef === void 0 ? void 0 : (_menuRef$current = menuRef.current) === null || _menuRef$current === void 0 ? void 0 : _menuRef$current.querySelectorAll("[role='menuitem']")[visualFocusIndex];
+    visualFocusedMenuItem === null || visualFocusedMenuItem === void 0 ? void 0 : (_visualFocusedMenuIte = visualFocusedMenuItem.scrollIntoView) === null || _visualFocusedMenuIte === void 0 ? void 0 : _visualFocusedMenuIte.call(visualFocusedMenuItem, {
+      block: "nearest",
+      inline: "start"
+    });
+  }, [visualFocusIndex]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.dropdown
-  }, /*#__PURE__*/_react["default"].createElement(DXCDropdownContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(DropdownContainer, {
+    onMouseEnter: !disabled && expandOnHover ? handleOnOpenMenu : undefined,
+    onMouseLeave: !disabled && expandOnHover ? handleOnCloseMenu : undefined,
+    onBlur: !disabled ? handleOnBlur : undefined,
     margin: margin,
-    size: size,
-    disabled: disabled
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    onMouseOver: expandOnHover && !disabled ? handleClickListItem : undefined,
-    onMouseOut: handleCloseOver,
-    onFocus: handleCloseOver,
-    onBlur: handleCloseOver
+    size: size
+  }, /*#__PURE__*/_react["default"].createElement(Popover.Root, {
+    open: isOpen
+  }, /*#__PURE__*/_react["default"].createElement(Popover.Trigger, {
+    asChild: true,
+    type: undefined
   }, /*#__PURE__*/_react["default"].createElement(DropdownTrigger, {
-    opened: anchorEl === null ? false : true,
-    onClick: handleClickListItem,
+    onClick: handleTriggerOnClick,
+    onKeyDown: handleTriggerOnKeyDown,
+    onBlur: function onBlur(event) {
+      event.stopPropagation();
+    },
     disabled: disabled,
     label: label,
-    caretHidden: caretHidden,
     margin: margin,
     size: size,
-    ref: ref,
-    tabIndex: tabIndex
-  }, /*#__PURE__*/_react["default"].createElement(DropdownTriggerContainer, {
-    iconPosition: iconPosition,
-    caretHidden: caretHidden
-  }, icon && /*#__PURE__*/_react["default"].createElement(ButtonIconContainer, {
-    label: label,
-    iconPosition: iconPosition,
-    disabled: disabled
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
+    id: triggerId,
+    "aria-haspopup": "true",
+    "aria-controls": menuId,
+    "aria-expanded": isOpen ? true : undefined,
+    tabIndex: tabIndex,
+    ref: triggerRef
+  }, /*#__PURE__*/_react["default"].createElement(DropdownTriggerContent, null, label && iconPosition === "after" && /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(DropdownTriggerIcon, {
+    disabled: disabled,
+    role: typeof icon === "string" ? undefined : "img"
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon), /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, {
-    iconPosition: iconPosition,
-    label: label
-  }, label)), /*#__PURE__*/_react["default"].createElement(CaretIconContainer, {
-    caretHidden: caretHidden,
+  }) : icon), label && iconPosition === "before" && /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, null, label)), !caretHidden && /*#__PURE__*/_react["default"].createElement(CaretIcon, {
     disabled: disabled
-  }, !caretHidden && (anchorEl === null ? /*#__PURE__*/_react["default"].createElement(DownArrowIcon, null) : /*#__PURE__*/_react["default"].createElement(UpArrowIcon, null)))), /*#__PURE__*/_react["default"].createElement(DXCMenu, {
-    anchorEl: anchorEl,
-    open: Boolean(anchorEl),
-    onClose: handleClose,
-    getContentAnchorEl: null,
-    anchorOrigin: {
-      vertical: "bottom",
-      horizontal: "left"
-    },
-    transformOrigin: {
-      vertical: "top",
-      horizontal: "left"
+  }, isOpen ? upArrowIcon : downArrowIcon))), /*#__PURE__*/_react["default"].createElement(Popover.Content, {
+    sideOffset: 1,
+    asChild: true
+  }, /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
+    id: menuId,
+    dropdownTriggerId: triggerId,
+    options: options,
+    iconsPosition: optionsIconPosition,
+    visualFocusIndex: visualFocusIndex,
+    menuItemOnClick: handleMenuItemOnClick,
+    onKeyDown: handleMenuOnKeyDown,
+    styles: {
+      width: width
     },
-    optionsIconPosition: optionsIconPosition,
-    size: size,
-    width: width,
-    role: undefined,
-    transition: true,
-    disablePortal: true,
-    placement: "bottom-start"
-  }, function (_ref2) {
-    var TransitionProps = _ref2.TransitionProps;
-    return /*#__PURE__*/_react["default"].createElement(_Grow["default"], TransitionProps, /*#__PURE__*/_react["default"].createElement(_Paper["default"], null, /*#__PURE__*/_react["default"].createElement(_core.ClickAwayListener, {
-      onClickAway: handleClose
-    }, /*#__PURE__*/_react["default"].createElement(_MenuList["default"], {
-      autoFocusItem: Boolean(anchorEl),
-      id: "menu-list-grow"
-    }, options.map(function (option) {
-      return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
-        key: option.value,
-        value: option.value,
-        disableRipple: true,
-        onClick: function onClick(event) {
-          return handleMenuItemClick(option);
-        }
-      }, option.icon && /*#__PURE__*/_react["default"].createElement(ListIconContainer, {
-        label: option.label,
-        iconPosition: optionsIconPosition
-      }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement(ListIcon, {
-        src: option.icon
-      }) : option.icon), /*#__PURE__*/_react["default"].createElement("span", {
-        className: "optionLabel"
-      }, option.label));
-    })))));
-  }))));
+    ref: menuRef
+  })))));
 };
 
 var sizes = {
@@ -226,18 +303,14 @@ var sizes = {
   medium: "240px",
   large: "480px",
   fillParent: "100%",
-  fitContent: "unset"
+  fitContent: "fit-content"
 };
 
 var calculateWidth = function calculateWidth(margin, size) {
-  if (size === "fillParent") {
-    return "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
-  }
-
-  return sizes[size];
+  return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
 
-var DXCDropdownContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: inline-block;\n"])), function (props) {
+var DropdownContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-block;\n  width: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -251,68 +324,10 @@ var DXCDropdownContainer = _styledComponents["default"].div(_templateObject || (
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
 
-var DXCMenu = (0, _styledComponents["default"])(_Popper["default"])(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: 1;\n\n  .MuiMenuItem-gutters {\n    width: ", ";\n  }\n  .MuiMenuItem-root {\n    min-height: 36px;\n    padding-top: ", ";\n    padding-bottom: ", ";\n    padding-left: ", ";\n    padding-right: ", ";\n    height: auto;\n  }\n  .MuiPaper-root {\n    min-width: ", ";\n    border-width: ", ";\n    border-style: ", ";\n    border-color: ", ";\n    border-bottom-left-radius: ", ";\n    border-bottom-right-radius: ", ";\n    border-top-left-radius: 0px;\n    border-top-right-radius: 0px;\n    max-height: 230px;\n    overflow-y: auto;\n\n    ::-webkit-scrollbar {\n      width: 3px;\n    }\n    ::-webkit-scrollbar-track {\n      background-color: ", ";\n      border-radius: 3px;\n    }\n    ::-webkit-scrollbar-thumb {\n      background-color: ", ";\n      border-radius: 3px;\n    }\n\n    .MuiList-padding {\n      padding-top: 0px;\n      padding-bottom: 0px;\n    }\n    .MuiListItem-button {\n      display: flex;\n      flex-direction: ", ";\n      justify-content: ", ";\n      background-color: ", ";\n      font-family: ", ";\n      font-size: ", ";\n      font-style: ", ";\n      font-weight: ", ";\n      color: ", ";\n      cursor: pointer;\n    }\n    .MuiListItem-button:focus {\n      outline: ", " solid 2px;\n      outline-offset: -2px;\n    }\n    .MuiListItem-button:hover {\n      background-color: ", ";\n    }\n    .MuiListItem-button:active {\n      background-color: ", ";\n      outline: ", " solid 2px;\n      outline-offset: -2px;\n    }\n  }\n"])), function (props) {
-  return calculateWidth(props.margin, props.size);
-}, function (props) {
-  return props.theme.optionPaddingTop;
-}, function (props) {
-  return props.theme.optionPaddingBottom;
-}, function (props) {
-  return props.theme.optionPaddingLeft;
-}, function (props) {
-  return props.theme.optionPaddingRight;
-}, function (props) {
-  return "".concat(props.width, "px");
-}, function (props) {
-  return props.theme.borderThickness;
-}, function (props) {
-  return props.theme.borderStyle;
-}, function (props) {
-  return props.theme.borderColor;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.borderRadius;
-}, function (props) {
-  return props.theme.scrollBarTrackColor;
-}, function (props) {
-  return props.theme.scrollBarThumbColor;
-}, function (props) {
-  return props.optionsIconPosition === "after" && "row-reverse" || "row";
-}, function (props) {
-  return props.optionsIconPosition === "after" && "flex-end" || "";
-}, function (props) {
-  return props.theme.optionBackgroundColor;
-}, function (props) {
-  return props.theme.optionFontFamily;
-}, function (props) {
-  return props.theme.optionFontSize;
-}, function (props) {
-  return props.theme.optionFontStyle;
-}, function (props) {
-  return props.theme.optionFontWeight;
-}, function (props) {
-  return props.theme.optionFontColor;
-}, function (props) {
-  return props.theme.focusColor;
-}, function (props) {
-  return props.theme.hoverOptionBackgroundColor;
-}, function (props) {
-  return props.theme.activeOptionBackgroundColor;
-}, function (props) {
-  return props.theme.focusColor;
-});
-
-var DropdownTrigger = _styledComponents["default"].button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: space-between;\n  align-items: center;\n  width: 100%;\n  height: auto;\n  min-height: 40px;\n  cursor: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  min-width: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  background-color: ", ";\n  color: ", ";\n  border-bottom-right-radius: ", ";\n  border-bottom-left-radius: ", ";\n\n  ", ";\n"])), function (props) {
-  return props.disabled ? "not-allowed" : "pointer";
-}, function (props) {
-  return props.theme.buttonFontFamily;
-}, function (props) {
-  return props.theme.buttonFontSize;
-}, function (props) {
-  return props.theme.buttonFontStyle;
+var DropdownTrigger = _styledComponents["default"].button(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  gap: ", ";\n  width: 100%;\n  min-height: 40px;\n  min-width: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  background-color: ", ";\n  color: ", ";\n  cursor: ", ";\n\n  ", ";\n"])), function (props) {
+  return props.theme.caretIconSpacing;
 }, function (props) {
-  return props.theme.buttonFontWeight;
+  return props.label === "" ? "0px" : calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.theme.borderRadius;
 }, function (props) {
@@ -321,8 +336,6 @@ var DropdownTrigger = _styledComponents["default"].button(_templateObject3 || (_
   return props.theme.borderStyle;
 }, function (props) {
   return props.disabled ? props.theme.disabledBorderColor : props.theme.borderColor;
-}, function (props) {
-  return props.label === "" ? "0px" : calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.theme.buttonPaddingTop;
 }, function (props) {
@@ -336,54 +349,34 @@ var DropdownTrigger = _styledComponents["default"].button(_templateObject3 || (_
 }, function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.buttonFontColor;
 }, function (props) {
-  return props.opened ? "0px" : props.theme.borderRadius;
-}, function (props) {
-  return props.opened ? "0px" : props.theme.borderRadius;
+  return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
-  return !props.disabled && "  \n      &:focus {\n        outline: none;\n      }\n      &:focus-visible {\n        outline: ".concat(props.theme.focusColor, " solid 2px;\n        outline-offset: -2px;\n      }\n      &:hover {\n        background-color: ").concat(props.theme.hoverButtonBackgroundColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeButtonBackgroundColor, ";\n      }\n  ");
+  return !props.disabled && "\n      &:focus {\n        outline: ".concat(props.theme.focusColor, " solid 2px;\n        outline-offset: -2px;\n      }\n      &:hover {\n        background-color: ").concat(props.theme.hoverButtonBackgroundColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeButtonBackgroundColor, ";\n      }\n  ");
 });
 
-var DropdownTriggerLabel = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  text-align: left;\n  text-overflow: ellipsis;\n  overflow: hidden;\n"])));
-
-var DropdownTriggerContainer = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  flex-direction: ", ";\n  margin-left: 0px;\n  margin-right: 0px;\n  width: ", ";\n  white-space: nowrap;\n"])), function (props) {
-  return props.iconPosition === "after" && "row-reverse" || "row";
-}, function (props) {
-  return props.caretHidden ? "100%" : "calc(100% - 36px)";
+var DropdownTriggerContent = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  gap: ", ";\n  margin-left: 0px;\n  margin-right: 0px;\n  width: 100%;\n  overflow: hidden;\n  white-space: nowrap;\n"])), function (props) {
+  return props.theme.buttonIconSpacing;
 });
 
-var ButtonIcon = _styledComponents["default"].img(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var ButtonIconContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
-  return props.theme.buttonIconSize;
-}, function (props) {
-  return props.theme.buttonIconSize;
+var DropdownTriggerLabel = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n"])), function (props) {
+  return props.theme.buttonFontFamily;
 }, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+  return props.theme.buttonFontSize;
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
+  return props.theme.buttonFontStyle;
 }, function (props) {
-  return props.disabled ? props.theme.disabledColor : props.theme.buttonIconColor;
+  return props.theme.buttonFontWeight;
 });
 
-var ListIcon = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var ListIconContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
-  return props.theme.optionIconSize;
-}, function (props) {
-  return props.theme.optionIconSize;
-}, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+var DropdownTriggerIcon = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
+  return props.disabled ? props.theme.disabledColor : props.theme.buttonIconColor;
 }, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.optionIconSpacing || "0px";
+  return props.theme.buttonIconSize;
 }, function (props) {
-  return props.theme.optionIconColor;
+  return props.theme.buttonIconSize;
 });
 
-var CaretIconContainer = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  margin-left: ", ";\n  color: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
-  return props.caretHidden ? "none" : "inline-flex";
-}, function (props) {
-  return props.theme.caretIconSpacing;
-}, function (props) {
+var CaretIcon = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.caretIconColor;
 }, function (props) {
   return props.theme.caretIconSize;