@entur/dropdown 7.0.2 → 7.1.0

package/dist/dropdown.esm.js

@@ -687,7 +687,7 @@ debounceTimeout) {
               _context.next = 11;
               break;
             }
-            console.warn('Avbryt den asynkrone funksjonen din med signalet fra AbortController-en for å for å unngå minnelekkasje.', 'Funksjonen bør kaste en DOMException med navnet "AbortError" når den avbrytes.', '', '\n\nSe eksempel her: https://design.entur.no/komponenter/skjemaelementer/dropdown#s%C3%B8kbar-dropdown-med-valg-fra-nettverkskall-bassert-p%C3%A5-tekstinput', '\nLes mer om AbortController her: https://developer.mozilla.org/en-US/docs/Web/API/AbortController');
+            console.warn('Avbryt den asynkrone funksjonen din med signalet fra AbortController-en for å for å unngå minnelekkasje.', 'Funksjonen bør kaste en DOMException med navnet "AbortError" når den avbrytes.', '', '\n\nSe eksempel her: https://linje.entur.no/komponenter/skjemaelementer/dropdown#s%C3%B8kbar-dropdown-med-valg-fra-nettverkskall-bassert-p%C3%A5-tekstinput', '\nLes mer om AbortController her: https://developer.mozilla.org/en-US/docs/Web/API/AbortController');
             return _context.abrupt("return");
           case 11:
             setLoading(false);
@@ -867,7 +867,7 @@ function getA11yStatusMessage(options) {
 }
 /* end a11y utils */
 
-var _excluded$3 = ["ariaLabelChosenSingular", "ariaLabelCloseList", "ariaLabelOpenList", "ariaLabelSelectedItem", "className", "clearable", "debounceTimeout", "disabled", "disableLabelAnimation", "feedback", "items", "itemFilter", "label", "labelClearSelectedItem", "labelTooltip", "listStyle", "loadingText", "noMatchesText", "onChange", "placeholder", "prepend", "readOnly", "selectedItem", "selectOnBlur", "selectOnTab", "style", "variant"];
+var _excluded$3 = ["ariaLabelChosenSingular", "ariaLabelCloseList", "ariaLabelOpenList", "ariaLabelSelectedItem", "className", "clearable", "debounceTimeout", "disabled", "disableLabelAnimation", "feedback", "items", "itemFilter", "label", "labelClearSelectedItem", "labelTooltip", "listStyle", "loading", "loadingText", "noMatchesText", "onChange", "placeholder", "prepend", "readOnly", "selectedItem", "selectOnBlur", "selectOnTab", "style", "variant"];
 var SearchableDropdown = function SearchableDropdown(_ref) {
   var _document, _selectedItem$label;
   var ariaLabelChosenSingular = _ref.ariaLabelChosenSingular,
@@ -891,6 +891,7 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
     labelClearSelectedItem = _ref$labelClearSelect === void 0 ? 'fjern valgt' : _ref$labelClearSelect,
     labelTooltip = _ref.labelTooltip,
     listStyle = _ref.listStyle,
+    loading = _ref.loading,
     loadingText = _ref.loadingText,
     noMatchesText = _ref.noMatchesText,
     _ref$onChange = _ref.onChange,
@@ -919,7 +920,7 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
   var inputRef = useRef(null);
   var _useResolvedItems = useResolvedItems(initialItems, debounceTimeout),
     normalizedItems = _useResolvedItems.items,
-    loading = _useResolvedItems.loading,
+    resolvedItemsLoading = _useResolvedItems.loading,
     fetchItems = _useResolvedItems.fetchItems;
   var _useState3 = useState(normalizedItems),
     listItems = _useState3[0],
@@ -1084,7 +1085,7 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
       focusable: false,
       getToggleButtonProps: getToggleButtonProps,
       isOpen: isOpen,
-      loading: loading,
+      loading: loading != null ? loading : resolvedItemsLoading,
       loadingText: loadingText,
       onClear: handleOnClear,
       selectedItems: [selectedItem]
@@ -1147,14 +1148,14 @@ var SearchableDropdown = function SearchableDropdown(_ref) {
     listItems: listItems,
     style: listStyle,
     setListRef: refs.setFloating,
-    loading: loading,
+    loading: loading != null ? loading : resolvedItemsLoading,
     loadingText: loadingText,
     noMatchesText: noMatchesText,
     selectedItems: selectedItem !== null ? [selectedItem] : []
   }));
 };
 
-var _excluded$2 = ["className", "clearable", "clearInputOnSelect", "debounceTimeout", "disabled", "disableLabelAnimation", "feedback", "hideSelectAll", "items", "itemFilter", "label", "labelAllItemsSelected", "labelClearAllItems", "labelSelectAll", "labelTooltip", "listStyle", "loadingText", "maxChips", "noMatchesText", "onChange", "placeholder", "readOnly", "selectedItems", "selectOnBlur", "selectOnTab", "style", "variant", "ariaLabelChosenSingular", "ariaLabelChosenPlural", "ariaLabelCloseList", "ariaLabelJumpToInput", "ariaLabelOpenList", "ariaLabelRemoveSelected", "ariaLabelSelectedItem"];
+var _excluded$2 = ["className", "clearable", "clearInputOnSelect", "debounceTimeout", "disabled", "disableLabelAnimation", "feedback", "hideSelectAll", "items", "itemFilter", "label", "labelAllItemsSelected", "labelClearAllItems", "labelSelectAll", "labelTooltip", "listStyle", "loading", "loadingText", "maxChips", "noMatchesText", "onChange", "placeholder", "readOnly", "selectedItems", "selectOnBlur", "selectOnTab", "style", "variant", "ariaLabelChosenSingular", "ariaLabelChosenPlural", "ariaLabelCloseList", "ariaLabelJumpToInput", "ariaLabelOpenList", "ariaLabelRemoveSelected", "ariaLabelSelectedItem"];
 var MultiSelect = function MultiSelect(_ref) {
   var className = _ref.className,
     _ref$clearable = _ref.clearable,
@@ -1180,6 +1181,7 @@ var MultiSelect = function MultiSelect(_ref) {
     labelSelectAll = _ref$labelSelectAll === void 0 ? 'Velg alle' : _ref$labelSelectAll,
     labelTooltip = _ref.labelTooltip,
     listStyle = _ref.listStyle,
+    loading = _ref.loading,
     loadingText = _ref.loadingText,
     _ref$maxChips = _ref.maxChips,
     maxChips = _ref$maxChips === void 0 ? 10 : _ref$maxChips,
@@ -1222,7 +1224,7 @@ var MultiSelect = function MultiSelect(_ref) {
   }, [rest.selectedItem]);
   var _useResolvedItems = useResolvedItems(initialItems, debounceTimeout),
     normalizedItems = _useResolvedItems.items,
-    loading = _useResolvedItems.loading,
+    resolvedItemsLoading = _useResolvedItems.loading,
     fetchItems = _useResolvedItems.fetchItems;
   var isAllNonAsyncItemsSelected = typeof initialItems !== 'function' && selectedItems.length === normalizedItems.length;
   // special 'item' used as Select All entry in the dropdown list
@@ -1443,7 +1445,7 @@ var MultiSelect = function MultiSelect(_ref) {
       clearable: clearable,
       labelClearSelectedItems: labelClearAllItems,
       focusable: false,
-      loading: loading,
+      loading: loading != null ? loading : resolvedItemsLoading,
       loadingText: loadingText,
       disabled: readOnly || disabled,
       onClear: handleOnClear,
@@ -1539,7 +1541,7 @@ var MultiSelect = function MultiSelect(_ref) {
     listItems: listItems,
     style: listStyle,
     setListRef: refs.setFloating,
-    loading: loading,
+    loading: loading != null ? loading : resolvedItemsLoading,
     loadingText: loadingText,
     noMatchesText: noMatchesText,
     selectAllCheckboxState: selectAllCheckboxState,
@@ -1548,7 +1550,7 @@ var MultiSelect = function MultiSelect(_ref) {
   }));
 };
 
-var _excluded$1 = ["ariaLabelChosenSingular", "ariaLabelCloseList", "ariaLabelOpenList", "ariaLabelSelectedItem", "className", "clearable", "disabled", "disableLabelAnimation", "feedback", "items", "label", "labelClearSelectedItem", "labelTooltip", "listStyle", "loadingText", "noMatchesText", "onChange", "placeholder", "prepend", "readOnly", "selectedItem", "selectOnBlur", "selectOnTab", "style", "variant"];
+var _excluded$1 = ["ariaLabelChosenSingular", "ariaLabelCloseList", "ariaLabelOpenList", "ariaLabelSelectedItem", "className", "clearable", "disabled", "disableLabelAnimation", "feedback", "items", "label", "labelClearSelectedItem", "labelTooltip", "listStyle", "loading", "loadingText", "noMatchesText", "onChange", "placeholder", "prepend", "readOnly", "selectedItem", "selectOnBlur", "selectOnTab", "style", "variant"];
 var Dropdown = function Dropdown(_ref) {
   var _ref3, _selectedItem$label;
   var ariaLabelChosenSingular = _ref.ariaLabelChosenSingular,
@@ -1568,6 +1570,7 @@ var Dropdown = function Dropdown(_ref) {
     labelClearSelectedItem = _ref$labelClearSelect === void 0 ? 'fjern valgt' : _ref$labelClearSelect,
     labelTooltip = _ref.labelTooltip,
     listStyle = _ref.listStyle,
+    loading = _ref.loading,
     loadingText = _ref.loadingText,
     _ref$noMatchesText = _ref.noMatchesText,
     noMatchesText = _ref$noMatchesText === void 0 ? 'Ingen tilgjengelige valg …' : _ref$noMatchesText,
@@ -1587,7 +1590,7 @@ var Dropdown = function Dropdown(_ref) {
     rest = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   var _useResolvedItems = useResolvedItems(initialItems),
     normalizedItems = _useResolvedItems.items,
-    loading = _useResolvedItems.loading;
+    resolvedItemsLoading = _useResolvedItems.loading;
   var toggleButtonRef = useRef(null);
   var isFilled = selectedItem !== null || placeholder !== undefined;
   var _useSelect = useSelect({
@@ -1647,7 +1650,7 @@ var Dropdown = function Dropdown(_ref) {
       focusable: false,
       getToggleButtonProps: getToggleButtonProps,
       isOpen: isOpen,
-      loading: loading,
+      loading: loading != null ? loading : resolvedItemsLoading,
       loadingText: loadingText,
       onClear: function onClear() {
         var _toggleButtonRef$curr;
@@ -1689,7 +1692,11 @@ var Dropdown = function Dropdown(_ref) {
         }
       }
     },
-    ref: toggleButtonRef
+    ref: toggleButtonRef,
+    'aria-disabled': disabled,
+    'aria-label': disabled ? 'Disabled dropdown' : '',
+    disabled: disabled,
+    tabIndex: disabled ? -1 : 0
   })), (_ref3 = (_selectedItem$label = selectedItem == null ? void 0 : selectedItem.label) != null ? _selectedItem$label : React.createElement("div", {
     className: classNames('eds-dropdown__selected-item__placeholder', {
       'eds-dropdown__selected-item__placeholder--readonly': readOnly
@@ -1706,7 +1713,7 @@ var Dropdown = function Dropdown(_ref) {
     noMatchesText: noMatchesText,
     style: listStyle,
     setListRef: refs.setFloating,
-    loading: loading,
+    loading: loading != null ? loading : resolvedItemsLoading,
     loadingText: loadingText,
     selectedItems: selectedItem !== null ? [selectedItem] : []
   }));