@entur/dropdown 5.5.1 → 6.0.0

package/dist/dropdown.esm.js

@@ -1840,13 +1840,24 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
     });
     setShowSelectedItem(false);
   };
-  return React.createElement("div", {
-    className: classNames('eds-dropdown__wrapper', className, {
-      'eds-dropdown__wrapper--has-tooltip': labelTooltip !== undefined
+  return React.createElement(BaseFormControl, _extends({
+    append: React.createElement(FieldAppend$1, {
+      ariaLabelCloseList: ariaLabelCloseList,
+      ariaLabelOpenList: ariaLabelOpenList,
+      clearable: clearable,
+      labelClearSelectedItems: labelClearSelectedItem,
+      disabled: readOnly || disabled,
+      focusable: false,
+      getToggleButtonProps: getToggleButtonProps,
+      isOpen: isOpen,
+      loading: loading,
+      loadingText: loadingText,
+      onClear: handleOnClear,
+      selectedItems: [selectedItem]
+    }),
+    className: classNames('eds-dropdown', 'eds-dropdown--searchable', className, {
+      'eds-dropdown--has-tooltip': labelTooltip !== undefined
     }),
-    style: style
-  }, React.createElement(BaseFormControl, _extends({
-    className: classNames('eds-dropdown', 'eds-dropdown--searchable'),
     disabled: disabled,
     disableLabelAnimation: disableLabelAnimation,
     feedback: feedback,
@@ -1862,23 +1873,9 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
     prepend: prepend,
     readOnly: readOnly,
     ref: refs.setReference,
+    style: style,
     variant: variant
-  }, rest, {
-    append: React.createElement(FieldAppend$1, {
-      ariaLabelCloseList: ariaLabelCloseList,
-      ariaLabelOpenList: ariaLabelOpenList,
-      clearable: clearable,
-      labelClearSelectedItems: labelClearSelectedItem,
-      disabled: readOnly || disabled,
-      focusable: false,
-      getToggleButtonProps: getToggleButtonProps,
-      isOpen: isOpen,
-      loading: loading,
-      loadingText: loadingText,
-      onClear: handleOnClear,
-      selectedItems: [selectedItem]
-    })
-  }), React.createElement("span", {
+  }, rest), React.createElement("span", {
     className: classNames('eds-dropdown--searchable__selected-item', {
       'eds-dropdown--searchable__selected-item--hidden': !showSelectedItem
     }),
@@ -1905,7 +1902,7 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
       if (selectOnTab && isOpen && e.key === 'Tab') onChange == null ? void 0 : onChange(listItems[highlightedIndex]);
     },
     ref: inputRef
-  })))), React.createElement(DropdownList, {
+  }))), React.createElement(DropdownList, {
     ariaLabelChosenSingular: ariaLabelChosenSingular,
     ariaLabelSelectedItem: ariaLabelSelectedItem,
     isOpen: isOpen,
@@ -2207,12 +2204,7 @@ var MultiSelect = function MultiSelect(_ref) {
       inputValue: inputValue
     });
   };
-  return React.createElement("div", {
-    className: classNames('eds-dropdown__wrapper', className, {
-      'eds-dropdown__wrapper--has-tooltip': labelTooltip !== undefined
-    }),
-    style: style
-  }, React.createElement(BaseFormControl, _extends({
+  return React.createElement(BaseFormControl, _extends({
     append: React.createElement(FieldAppend$1, {
       ariaLabelCloseList: ariaLabelCloseList,
       ariaLabelOpenList: ariaLabelOpenList,
@@ -2227,7 +2219,9 @@ var MultiSelect = function MultiSelect(_ref) {
       onClear: handleOnClear,
       getToggleButtonProps: getToggleButtonProps
     }),
-    className: classNames('eds-dropdown', 'eds-dropdown--multiselect'),
+    className: classNames('eds-dropdown', 'eds-dropdown--multiselect', className, {
+      'eds-dropdown--has-tooltip': labelTooltip !== undefined
+    }),
     disabled: disabled,
     feedback: feedback,
     isFilled: hasSelectedItems || inputValue !== EMPTY_INPUT,
@@ -2241,6 +2235,7 @@ var MultiSelect = function MultiSelect(_ref) {
     },
     readOnly: readOnly,
     ref: refs.setReference,
+    style: style,
     variant: variant
   }, rest), React.createElement("div", {
     className: classNames('eds-dropdown--multiselect__selected-items-and-input', {
@@ -2303,7 +2298,7 @@ var MultiSelect = function MultiSelect(_ref) {
     preventKeyAction: isOpen,
     ref: inputRef,
     value: inputValue != null ? inputValue : EMPTY_INPUT
-  }))))))), React.createElement(DropdownList, {
+  })))))), React.createElement(DropdownList, {
     ariaLabelChosenSingular: ariaLabelChosenSingular,
     ariaLabelSelectedItem: ariaLabelSelectedItem,
     getItemProps: getItemProps,
@@ -2401,12 +2396,7 @@ var Dropdown = function Dropdown(_ref) {
     }),
     refs = _useFloating.refs,
     floatingStyles = _useFloating.floatingStyles;
-  return React.createElement("div", {
-    className: classNames('eds-dropdown__wrapper', className, {
-      'eds-dropdown__wrapper--has-tooltip': labelTooltip !== undefined
-    }),
-    style: style
-  }, React.createElement(BaseFormControl, _extends({
+  return React.createElement(BaseFormControl, _extends({
     append: React.createElement(FieldAppend$1, {
       ariaHiddenToggleButton: true,
       ariaLabelCloseList: ariaLabelCloseList,
@@ -2426,8 +2416,8 @@ var Dropdown = function Dropdown(_ref) {
       disabled: readOnly || disabled,
       selectedItems: [selectedItem]
     }),
-    className: classNames('eds-dropdown', {
-      'eds-dropdown--not-filled': !isFilled
+    className: classNames('eds-dropdown', className, {
+      'eds-dropdown--has-tooltip': labelTooltip !== undefined
     }),
     disabled: disabled,
     disableLabelAnimation: disableLabelAnimation,
@@ -2440,6 +2430,7 @@ var Dropdown = function Dropdown(_ref) {
     prepend: prepend,
     readOnly: readOnly,
     ref: refs.setReference,
+    style: style,
     variant: variant
   }, rest), React.createElement("div", _extends({
     className: "eds-dropdown__selected-item"
@@ -2459,7 +2450,7 @@ var Dropdown = function Dropdown(_ref) {
     className: classNames('eds-dropdown__selected-item__placeholder', {
       'eds-dropdown__selected-item__placeholder--readonly': readOnly
     })
-  }, placeholder)) != null ? _ref3 : '')), React.createElement(DropdownList, {
+  }, placeholder)) != null ? _ref3 : ''), React.createElement(DropdownList, {
     ariaLabelChosenSingular: ariaLabelChosenSingular,
     ariaLabelSelectedItem: ariaLabelSelectedItem,
     getItemProps: getItemProps,