@entur/dropdown 4.0.0-beta.0 → 4.0.0-beta.2

package/dist/dropdown.esm.js

@@ -1,5 +1,5 @@
 import { mergeRefs, debounce, useRandomId, warnAboutMissingStyles } from '@entur/utils';
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef } from 'react';
 import Downshift, { useSelect, useCombobox } from 'downshift';
 import classNames from 'classnames';
 import { BaseFormControl, VariantProvider, FeedbackText } from '@entur/form';
@@ -1775,7 +1775,7 @@ function SelectedItemsLabel(items) {
   }).toString() : items.length + " elementer valgt";
 }
 
-var _excluded = ["items", "value", "onChange", "label", "placeholder", "clearable", "openOnFocus", "className"];
+var _excluded = ["items", "selectedItem", "onChange", "label", "placeholder", "clearable", "openOnFocus", "readonly", "feedback", "variant", "className", "listStyle"];
 
 function lowerCaseFilterTest(item, input) {
   if (!input) {
@@ -1785,22 +1785,28 @@ function lowerCaseFilterTest(item, input) {
   var sanitizeEscapeCharacters = input.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
   var inputRegex = new RegExp(sanitizeEscapeCharacters, 'i');
   return inputRegex.test(item.label);
-}
+} // TODO Husk å @deprecate searchable-prop-en til Dropdown når denne komponenten skal ha official release
+
 
 var SearchableDropdownBeta = function SearchableDropdownBeta(_ref) {
   var _selectedItem$label;
 
   var items = _ref.items,
-      value = _ref.value,
+      value = _ref.selectedItem,
       onChange = _ref.onChange,
-      _ref$label = _ref.label,
-      label = _ref$label === void 0 ? '!MANGLER LABEL!' : _ref$label,
+      label = _ref.label,
       placeholder = _ref.placeholder,
       _ref$clearable = _ref.clearable,
       clearable = _ref$clearable === void 0 ? false : _ref$clearable,
       _ref$openOnFocus = _ref.openOnFocus,
       openOnFocus = _ref$openOnFocus === void 0 ? false : _ref$openOnFocus,
+      _ref$readonly = _ref.readonly,
+      readonly = _ref$readonly === void 0 ? false : _ref$readonly,
+      feedback = _ref.feedback,
+      _ref$variant = _ref.variant,
+      variant = _ref$variant === void 0 ? 'info' : _ref$variant,
       className = _ref.className,
+      listStyle = _ref.listStyle,
       rest = _objectWithoutPropertiesLoose(_ref, _excluded);
 
   var _React$useState = React.useState(items),
@@ -1839,13 +1845,14 @@ var SearchableDropdownBeta = function SearchableDropdownBeta(_ref) {
     },
     items: filteredItems,
     itemToString: function itemToString(item) {
-      return item ? item.value : '';
+      if (item) return item.value;
+      return '';
     },
     stateReducer: stateReducer,
     selectedItem: value,
     onSelectedItemChange: function onSelectedItemChange(_ref3) {
       var newSelectedItem = _ref3.selectedItem;
-      return onChange(newSelectedItem);
+      return onChange(newSelectedItem != null ? newSelectedItem : null);
     }
   }, rest)),
       isOpen = _useCombobox.isOpen,
@@ -1858,26 +1865,28 @@ var SearchableDropdownBeta = function SearchableDropdownBeta(_ref) {
       getItemProps = _useCombobox.getItemProps,
       selectedItem = _useCombobox.selectedItem,
       openMenu = _useCombobox.openMenu,
-      inputValue = _useCombobox.inputValue,
-      setInputValue = _useCombobox.setInputValue;
+      inputValue = _useCombobox.inputValue; // TODO Husk å generelt legge inn støtte for typeof value === string
 
-  useEffect(function () {
-    if (inputValue.toLowerCase() === (value == null ? void 0 : value.label.toLowerCase()) || inputValue.toLowerCase() === (value == null ? void 0 : value.value.toLowerCase())) setInputValue('');
-  }, [value]);
-  return React.createElement("div", null, React.createElement(BaseFormControl, _extends({
+
+  return React.createElement("div", {
+    className: "eds-searchable-dropdown__wrapper"
+  }, React.createElement(BaseFormControl, _extends({
     append: React.createElement(Appendix, {
       selectedItem: selectedItem,
       isOpen: isOpen,
       clearable: clearable,
       loading: false,
       loadingText: '',
-      readOnly: false,
+      readOnly: readonly,
       onChange: onChange,
       getToggleButtonProps: getToggleButtonProps
     }),
     className: classNames('eds-searchable-dropdown', className),
     label: label,
     isFilled: selectedItem ? true : false,
+    feedback: feedback,
+    variant: variant,
+    readOnly: readonly,
     labelProps: getLabelProps()
   }, getComboboxProps(), rest), !hideSelectedItem && selectedItem && !inputValue && React.createElement("span", {
     className: "eds-searchable-dropdown__selected-item__wrapper"
@@ -1895,22 +1904,23 @@ var SearchableDropdownBeta = function SearchableDropdownBeta(_ref) {
     onFocus: function onFocus() {
       if (!isOpen && openOnFocus) openMenu();
       setHideSelectedItem(true);
-    }
-  }), {
+    },
     onBlur: function onBlur() {
       setHideSelectedItem(false);
     },
     ref: inputRef
-  }))), React.createElement("ul", _extends({
-    className: classNames('eds-dropdown-list', {
-      'eds-dropdown-list--open': isOpen
+  })))), React.createElement("ul", _extends({
+    className: classNames('eds-searchable-dropdown__list', {
+      'eds-searchable-dropdown__list--open': isOpen
     })
-  }, getMenuProps(), rest), isOpen ? filteredItems.map(function (item, index) {
+  }, getMenuProps(), {
+    style: _extends({}, rest.style, listStyle)
+  }), isOpen ? filteredItems.map(function (item, index) {
     return (// eslint-disable-next-line react/jsx-key
       React.createElement("li", _extends({
-        className: classNames('eds-dropdown-list__item', {
-          'eds-dropdown-list__item--highlighted': highlightedIndex === index,
-          'eds-dropdown-list__item--selected': selectedItem === item
+        className: classNames('eds-searchable-dropdown__list__item', {
+          'eds-searchable-dropdown__list__item--highlighted': highlightedIndex === index,
+          'eds-searchable-dropdown__list__item--selected': (selectedItem == null ? void 0 : selectedItem.value) === item.value
         })
       }, getItemProps({
         key: "" + index + item.value,
@@ -1920,27 +1930,25 @@ var SearchableDropdownBeta = function SearchableDropdownBeta(_ref) {
         return React.createElement(Icon, {
           key: index,
           inline: true,
-          className: "eds-dropdown-list__item-icon"
+          className: "eds-searchable-dropdown__list__item-icon"
         });
-      })), selectedItem === item && React.createElement(CheckIcon, null))
+      })), (selectedItem == null ? void 0 : selectedItem.value) === item.value && React.createElement(CheckIcon, null))
     );
   }) : null));
 };
 
 var Appendix = function Appendix(_ref4) {
   var clearable = _ref4.clearable,
-      loading = _ref4.loading,
-      loadingText = _ref4.loadingText,
       readOnly = _ref4.readOnly,
       getToggleButtonProps = _ref4.getToggleButtonProps,
       selectedItem = _ref4.selectedItem,
       isOpen = _ref4.isOpen,
       onChange = _ref4.onChange;
 
-  if (loading) {
-    return React.createElement(DropdownLoadingDots, null, loadingText);
-  }
-
+  // TODO implement loading / async
+  // if (loading) {
+  //   return <DropdownLoadingDots>{loadingText}</DropdownLoadingDots>;
+  // }
   if (readOnly) {
     return null;
   }
@@ -1951,17 +1959,17 @@ var Appendix = function Appendix(_ref4) {
       alignItems: 'center'
     }
   }, clearable && selectedItem && React.createElement(React.Fragment, null, React.createElement("button", {
-    className: "eds-dropdown__clear-button",
+    className: "eds-searchable-dropdown-appendix__clear-button",
     type: "button",
     tabIndex: -1,
     onClick: function onClick() {
       return onChange(null);
     }
   }, React.createElement(CloseSmallIcon, null)), React.createElement("div", {
-    className: "eds-dropdown__divider"
+    className: "eds-searchable-dropdown-appendix__divider"
   })), React.createElement("button", _extends({}, getToggleButtonProps({
-    className: classNames('eds-dropdown__toggle-button', {
-      'eds-dropdown__toggle-button--open': isOpen
+    className: classNames('eds-searchable-dropdown-appendix__toggle-button', {
+      'eds-searchable-dropdown-appendix__toggle-button--open': isOpen
     })
   }), {
     tabIndex: "-1",