primevue 3.16.2 → 3.18.0

package/dropdown/dropdown.cjs.js

@@ -1,19 +1,19 @@
 'use strict';
 
-var utils = require('primevue/utils');
-var OverlayEventBus = require('primevue/overlayeventbus');
 var api = require('primevue/api');
+var OverlayEventBus = require('primevue/overlayeventbus');
+var Portal = require('primevue/portal');
 var Ripple = require('primevue/ripple');
+var utils = require('primevue/utils');
 var VirtualScroller = require('primevue/virtualscroller');
-var Portal = require('primevue/portal');
 var vue = require('vue');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var OverlayEventBus__default = /*#__PURE__*/_interopDefaultLegacy(OverlayEventBus);
+var Portal__default = /*#__PURE__*/_interopDefaultLegacy(Portal);
 var Ripple__default = /*#__PURE__*/_interopDefaultLegacy(Ripple);
 var VirtualScroller__default = /*#__PURE__*/_interopDefaultLegacy(VirtualScroller);
-var Portal__default = /*#__PURE__*/_interopDefaultLegacy(Portal);
 
 var script = {
     name: 'Dropdown',
@@ -26,11 +26,11 @@ var script = {
         optionDisabled: null,
         optionGroupLabel: null,
         optionGroupChildren: null,
-		scrollHeight: {
-			type: String,
-			default: '200px'
-		},
-		filter: Boolean,
+        scrollHeight: {
+            type: String,
+            default: '200px'
+        },
+        filter: Boolean,
         filterPlaceholder: String,
         filterLocale: String,
         filterMatchMode: {
@@ -41,20 +41,56 @@ var script = {
             type: Array,
             default: null
         },
-		editable: Boolean,
-		placeholder: String,
-		disabled: Boolean,
+        editable: Boolean,
+        placeholder: {
+            type: String,
+            default: null
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
         dataKey: null,
-        showClear: Boolean,
-        inputId: String,
-        inputStyle: null,
-        inputClass: null,
-        inputProps: null,
-        panelStyle: null,
-        panelClass: null,
-        panelProps: null,
-        filterInputProps: null,
-        clearIconProps: null,
+        showClear: {
+            type: Boolean,
+            default: false
+        },
+        inputId: {
+            type: String,
+            default: null
+        },
+        inputClass: {
+            type: String,
+            default: null
+        },
+        inputStyle: {
+            type: null,
+            default: null
+        },
+        inputProps: {
+            type: null,
+            default: null
+        },
+        panelClass: {
+            type: String,
+            default: null
+        },
+        panelStyle: {
+            type: null,
+            default: null
+        },
+        panelProps: {
+            type: null,
+            default: null
+        },
+        filterInputProps: {
+            type: null,
+            default: null
+        },
+        clearIconProps: {
+            type: null,
+            default: null
+        },
         appendTo: {
             type: String,
             default: 'body'
@@ -63,10 +99,26 @@ var script = {
             type: Boolean,
             default: false
         },
+        clearIcon: {
+            type: String,
+            default: 'pi pi-times'
+        },
+        dropdownIcon: {
+            type: String,
+            default: 'pi pi-chevron-down'
+        },
+        filterIcon: {
+            type: String,
+            default: 'pi pi-search'
+        },
         loadingIcon: {
             type: String,
             default: 'pi pi-spinner pi-spin'
         },
+        resetFilterOnHide: {
+            type: Boolean,
+            default: false
+        },
         virtualScrollerOptions: {
             type: Object,
             default: null
@@ -75,6 +127,14 @@ var script = {
             type: Boolean,
             default: true
         },
+        autoFilterFocus: {
+            type: Boolean,
+            default: false
+        },
+        selectOnFocus: {
+            type: Boolean,
+            default: false
+        },
         filterMessage: {
             type: String,
             default: null
@@ -117,16 +177,14 @@ var script = {
     searchTimeout: null,
     searchValue: null,
     isModelValueChanged: false,
-    selectOnFocus: false,
     focusOnHover: false,
     data() {
         return {
-            id: utils.UniqueComponentId(),
             focused: false,
             focusedOptionIndex: -1,
             filterValue: null,
             overlayVisible: false
-        }
+        };
     },
     watch: {
         modelValue() {
@@ -137,8 +195,6 @@ var script = {
         }
     },
     mounted() {
-        this.id = this.$attrs.id || this.id;
-
         this.autoUpdateModel();
     },
     updated() {
@@ -164,7 +220,7 @@ var script = {
     },
     methods: {
         getOptionIndex(index, fn) {
-            return this.virtualScrollerDisabled ? index : (fn && fn(index)['index']);
+            return this.virtualScrollerDisabled ? index : fn && fn(index)['index'];
         },
         getOptionLabel(option) {
             return this.optionLabel ? utils.ObjectUtils.resolveFieldData(option, this.optionLabel) : option;
@@ -188,14 +244,14 @@ var script = {
             return utils.ObjectUtils.resolveFieldData(optionGroup, this.optionGroupChildren);
         },
         getAriaPosInset(index) {
-            return (this.optionGroupLabel ? index - this.visibleOptions.slice(0, index).filter(option => this.isOptionGroup(option)).length : index) + 1;
+            return (this.optionGroupLabel ? index - this.visibleOptions.slice(0, index).filter((option) => this.isOptionGroup(option)).length : index) + 1;
         },
         show(isFocus) {
             this.$emit('before-show');
             this.overlayVisible = true;
-            this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : (this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1);
+            this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1;
 
-            isFocus && this.$refs.focusInput.focus();
+            isFocus && utils.DomHandler.focus(this.$refs.focusInput);
         },
         hide(isFocus) {
             const _hide = () => {
@@ -204,14 +260,17 @@ var script = {
                 this.focusedOptionIndex = -1;
                 this.searchValue = '';
 
-                isFocus && this.$refs.focusInput.focus();
+                this.resetFilterOnHide && (this.filterValue = null);
+                isFocus && utils.DomHandler.focus(this.$refs.focusInput);
             };
 
-            setTimeout(() => { _hide(); }, 0); // For ScreenReaders
+            setTimeout(() => {
+                _hide();
+            }, 0); // For ScreenReaders
         },
         onFocus(event) {
             this.focused = true;
-            this.focusedOptionIndex = this.overlayVisible && this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1;
+            this.focusedOptionIndex = this.focusedOptionIndex !== -1 ? this.focusedOptionIndex : this.overlayVisible && this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1;
             this.overlayVisible && this.scrollInView(this.focusedOptionIndex);
             this.$emit('focus', event);
         },
@@ -222,6 +281,8 @@ var script = {
             this.$emit('blur', event);
         },
         onKeyDown(event) {
+            const metaKey = event.metaKey || event.ctrlKey;
+
             switch (event.code) {
                 case 'ArrowDown':
                     this.onArrowDownKey(event);
@@ -278,7 +339,7 @@ var script = {
                     break;
 
                 default:
-                    if (utils.ObjectUtils.isPrintableCharacter(event.key)) {
+                    if (!metaKey && utils.ObjectUtils.isPrintableCharacter(event.key)) {
                         !this.overlayVisible && this.show();
                         !this.editable && this.searchOptions(event, event.key);
                     }
@@ -291,6 +352,7 @@ var script = {
 
             this.searchValue = '';
             const matched = this.searchOptions(event, value);
+
             !matched && (this.focusedOptionIndex = -1);
 
             this.$emit('update:modelValue', value);
@@ -302,8 +364,7 @@ var script = {
 
             if (utils.DomHandler.hasClass(event.target, 'p-dropdown-clear-icon') || event.target.tagName === 'INPUT') {
                 return;
-            }
-            else if (!this.overlay || !this.overlay.contains(event.target)) {
+            } else if (!this.overlay || !this.overlay.contains(event.target)) {
                 this.overlayVisible ? this.hide(true) : this.show(true);
             }
         },
@@ -315,20 +376,20 @@ var script = {
 
             if (relatedTarget === this.$refs.focusInput) {
                 const firstFocusableEl = utils.DomHandler.getFirstFocusableElement(this.overlay, ':not(.p-hidden-focusable)');
-                firstFocusableEl && firstFocusableEl.focus();
-            }
-            else {
-                this.$refs.focusInput.focus();
+
+                utils.DomHandler.focus(firstFocusableEl);
+            } else {
+                utils.DomHandler.focus(this.$refs.focusInput);
             }
         },
         onLastHiddenFocus() {
-            this.$refs.firstHiddenFocusableElementOnOverlay.focus();
+            utils.DomHandler.focus(this.$refs.firstHiddenFocusableElementOnOverlay);
         },
-        onOptionSelect(event, option) {
+        onOptionSelect(event, option, isHide = true) {
             const value = this.getOptionValue(option);
 
             this.updateModel(event, value);
-            this.hide(true);
+            isHide && this.hide(true);
         },
         onOptionMouseMove(event, index) {
             if (this.focusOnHover) {
@@ -417,8 +478,7 @@ var script = {
 
                 this.overlayVisible && this.hide();
                 event.preventDefault();
-            }
-            else {
+            } else {
                 const optionIndex = this.focusedOptionIndex !== -1 ? this.findPrevOptionIndex(this.focusedOptionIndex) : this.findLastFocusedOptionIndex();
 
                 this.changeFocusedOptionIndex(event, optionIndex);
@@ -434,8 +494,7 @@ var script = {
             if (pressedInInputText) {
                 event.currentTarget.setSelectionRange(0, 0);
                 this.focusedOptionIndex = -1;
-            }
-            else {
+            } else {
                 this.changeFocusedOptionIndex(event, this.findFirstOptionIndex());
 
                 !this.overlayVisible && this.show();
@@ -447,10 +506,10 @@ var script = {
             if (pressedInInputText) {
                 const target = event.currentTarget;
                 const len = target.value.length;
+
                 target.setSelectionRange(len, len);
                 this.focusedOptionIndex = -1;
-            }
-            else {
+            } else {
                 this.changeFocusedOptionIndex(event, this.findLastOptionIndex());
 
                 !this.overlayVisible && this.show();
@@ -469,8 +528,7 @@ var script = {
         onEnterKey(event) {
             if (!this.overlayVisible) {
                 this.onArrowDownKey(event);
-            }
-            else {
+            } else {
                 if (this.focusedOptionIndex !== -1) {
                     this.onOptionSelect(event, this.visibleOptions[this.focusedOptionIndex]);
                 }
@@ -490,11 +548,10 @@ var script = {
         onTabKey(event, pressedInInputText = false) {
             if (!pressedInInputText) {
                 if (this.overlayVisible && this.hasFocusableElements()) {
-                    this.$refs.firstHiddenFocusableElementOnOverlay.focus();
+                    utils.DomHandler.focus(this.$refs.firstHiddenFocusableElementOnOverlay);
 
                     event.preventDefault();
-                }
-                else {
+                } else {
                     if (this.focusedOptionIndex !== -1) {
                         this.onOptionSelect(event, this.visibleOptions[this.focusedOptionIndex]);
                     }
@@ -512,6 +569,8 @@ var script = {
             utils.ZIndexUtils.set('overlay', el, this.$primevue.config.zIndex.overlay);
             this.alignOverlay();
             this.scrollInView();
+
+            this.autoFilterFocus && utils.DomHandler.focus(this.$refs.filterInput);
         },
         onOverlayAfterEnter() {
             this.bindOutsideClickListener();
@@ -534,8 +593,7 @@ var script = {
         alignOverlay() {
             if (this.appendTo === 'self') {
                 utils.DomHandler.relativePosition(this.overlay, this.$el);
-            }
-            else {
+            } else {
                 this.overlay.style.minWidth = utils.DomHandler.getOuterWidth(this.$el) + 'px';
                 utils.DomHandler.absolutePosition(this.overlay, this.$el);
             }
@@ -547,6 +605,7 @@ var script = {
                         this.hide();
                     }
                 };
+
                 document.addEventListener('click', this.outsideClickListener);
             }
         },
@@ -579,6 +638,7 @@ var script = {
                         this.hide();
                     }
                 };
+
                 window.addEventListener('resize', this.resizeListener);
             }
         },
@@ -604,28 +664,32 @@ var script = {
             return utils.ObjectUtils.equals(this.modelValue, this.getOptionValue(option), this.equalityKey);
         },
         findFirstOptionIndex() {
-            return this.visibleOptions.findIndex(option => this.isValidOption(option));
+            return this.visibleOptions.findIndex((option) => this.isValidOption(option));
         },
         findLastOptionIndex() {
-            return utils.ObjectUtils.findLastIndex(this.visibleOptions, option => this.isValidOption(option));
+            return utils.ObjectUtils.findLastIndex(this.visibleOptions, (option) => this.isValidOption(option));
         },
         findNextOptionIndex(index) {
-            const matchedOptionIndex = index < (this.visibleOptions.length - 1) ? this.visibleOptions.slice(index + 1).findIndex(option => this.isValidOption(option)) : -1;
+            const matchedOptionIndex = index < this.visibleOptions.length - 1 ? this.visibleOptions.slice(index + 1).findIndex((option) => this.isValidOption(option)) : -1;
+
             return matchedOptionIndex > -1 ? matchedOptionIndex + index + 1 : index;
         },
         findPrevOptionIndex(index) {
-            const matchedOptionIndex = index > 0 ? utils.ObjectUtils.findLastIndex(this.visibleOptions.slice(0, index), option => this.isValidOption(option)) : -1;
+            const matchedOptionIndex = index > 0 ? utils.ObjectUtils.findLastIndex(this.visibleOptions.slice(0, index), (option) => this.isValidOption(option)) : -1;
+
             return matchedOptionIndex > -1 ? matchedOptionIndex : index;
         },
         findSelectedOptionIndex() {
-            return this.hasSelectedOption ? this.visibleOptions.findIndex(option => this.isValidSelectedOption(option)) : -1;
+            return this.hasSelectedOption ? this.visibleOptions.findIndex((option) => this.isValidSelectedOption(option)) : -1;
         },
         findFirstFocusedOptionIndex() {
             const selectedIndex = this.findSelectedOptionIndex();
+
             return selectedIndex < 0 ? this.findFirstOptionIndex() : selectedIndex;
         },
         findLastFocusedOptionIndex() {
             const selectedIndex = this.findSelectedOptionIndex();
+
             return selectedIndex < 0 ? this.findLastOptionIndex() : selectedIndex;
         },
         searchOptions(event, char) {
@@ -635,11 +699,10 @@ var script = {
             let matched = false;
 
             if (this.focusedOptionIndex !== -1) {
-                optionIndex = this.visibleOptions.slice(this.focusedOptionIndex).findIndex(option => this.isOptionMatched(option));
-                optionIndex = optionIndex === -1 ? this.visibleOptions.slice(0, this.focusedOptionIndex).findIndex(option => this.isOptionMatched(option)) : optionIndex + this.focusedOptionIndex;
-            }
-            else {
-                optionIndex = this.visibleOptions.findIndex(option => this.isOptionMatched(option));
+                optionIndex = this.visibleOptions.slice(this.focusedOptionIndex).findIndex((option) => this.isOptionMatched(option));
+                optionIndex = optionIndex === -1 ? this.visibleOptions.slice(0, this.focusedOptionIndex).findIndex((option) => this.isOptionMatched(option)) : optionIndex + this.focusedOptionIndex;
+            } else {
+                optionIndex = this.visibleOptions.findIndex((option) => this.isOptionMatched(option));
             }
 
             if (optionIndex !== -1) {
@@ -671,17 +734,17 @@ var script = {
                 this.scrollInView();
 
                 if (this.selectOnFocus) {
-                    this.updateModel(event, this.getOptionValue(this.visibleOptions[index]));
+                    this.onOptionSelect(event, this.visibleOptions[index], false);
                 }
             }
         },
         scrollInView(index = -1) {
             const id = index !== -1 ? `${this.id}_${index}` : this.focusedOptionId;
             const element = utils.DomHandler.findSingle(this.list, `li[id="${id}"]`);
+
             if (element) {
                 element.scrollIntoView && element.scrollIntoView({ block: 'nearest', inline: 'start' });
-            }
-            else if (!this.virtualScrollerDisabled) {
+            } else if (!this.virtualScrollerDisabled) {
                 setTimeout(() => {
                     this.virtualScroller && this.virtualScroller.scrollToIndex(index !== -1 ? index : this.focusedOptionIndex);
                 }, 0);
@@ -690,8 +753,7 @@ var script = {
         autoUpdateModel() {
             if (this.selectOnFocus && this.autoOptionFocus && !this.hasSelectedOption) {
                 this.focusedOptionIndex = this.findFirstFocusedOptionIndex();
-                const value = this.getOptionValue(this.visibleOptions[this.focusedOptionIndex]);
-                this.updateModel(null, value);
+                this.onOptionSelect(null, this.visibleOptions[this.focusedOptionIndex], false);
             }
         },
         updateModel(event, value) {
@@ -703,7 +765,8 @@ var script = {
                 result.push({ optionGroup: option, group: true, index });
 
                 const optionGroupChildren = this.getOptionGroupChildren(option);
-                optionGroupChildren && optionGroupChildren.forEach(o => result.push(o));
+
+                optionGroupChildren && optionGroupChildren.forEach((o) => result.push(o));
 
                 return result;
             }, []);
@@ -721,32 +784,43 @@ var script = {
     },
     computed: {
         containerClass() {
-            return ['p-dropdown p-component p-inputwrapper', {
-                'p-disabled': this.disabled,
-                'p-dropdown-clearable': this.showClear && !this.disabled,
-                'p-focus': this.focused,
-                'p-inputwrapper-filled': this.modelValue,
-                'p-inputwrapper-focus': this.focused || this.overlayVisible,
-                'p-overlay-open': this.overlayVisible
-            }];
+            return [
+                'p-dropdown p-component p-inputwrapper',
+                {
+                    'p-disabled': this.disabled,
+                    'p-dropdown-clearable': this.showClear && !this.disabled,
+                    'p-focus': this.focused,
+                    'p-inputwrapper-filled': this.modelValue,
+                    'p-inputwrapper-focus': this.focused || this.overlayVisible,
+                    'p-overlay-open': this.overlayVisible
+                }
+            ];
         },
         inputStyleClass() {
-            return ['p-dropdown-label p-inputtext', this.inputClass, {
-                'p-placeholder': !this.editable && this.label === this.placeholder,
-                'p-dropdown-label-empty': !this.editable && !this.$slots['value'] && (this.label === 'p-emptylabel' || this.label.length === 0)
-            }];
+            return [
+                'p-dropdown-label p-inputtext',
+                this.inputClass,
+                {
+                    'p-placeholder': !this.editable && this.label === this.placeholder,
+                    'p-dropdown-label-empty': !this.editable && !this.$slots['value'] && (this.label === 'p-emptylabel' || this.label.length === 0)
+                }
+            ];
         },
         panelStyleClass() {
-            return ['p-dropdown-panel p-component', this.panelClass, {
-                'p-input-filled': this.$primevue.config.inputStyle === 'filled',
-                'p-ripple-disabled': this.$primevue.config.ripple === false
-            }];
+            return [
+                'p-dropdown-panel p-component',
+                this.panelClass,
+                {
+                    'p-input-filled': this.$primevue.config.inputStyle === 'filled',
+                    'p-ripple-disabled': this.$primevue.config.ripple === false
+                }
+            ];
         },
         dropdownIconClass() {
-            return ['p-dropdown-trigger-icon', (this.loading ? this.loadingIcon : 'pi pi-chevron-down')];
+            return ['p-dropdown-trigger-icon', this.loading ? this.loadingIcon : this.dropdownIcon];
         },
         visibleOptions() {
-            const options = this.optionGroupLabel ? this.flatOptions(this.options) : (this.options || []);
+            const options = this.optionGroupLabel ? this.flatOptions(this.options) : this.options || [];
 
             return this.filterValue ? api.FilterService.filter(options, this.searchFields, this.filterValue, this.filterMatchMode, this.filterLocale) : options;
         },
@@ -755,11 +829,13 @@ var script = {
         },
         label() {
             const selectedOptionIndex = this.findSelectedOptionIndex();
-            return selectedOptionIndex !== -1 ? this.getOptionLabel(this.visibleOptions[selectedOptionIndex]) : (this.placeholder || 'p-emptylabel');
+
+            return selectedOptionIndex !== -1 ? this.getOptionLabel(this.visibleOptions[selectedOptionIndex]) : this.placeholder || 'p-emptylabel';
         },
         editableInputValue() {
             const selectedOptionIndex = this.findSelectedOptionIndex();
-            return selectedOptionIndex !== -1 ? this.getOptionLabel(this.visibleOptions[selectedOptionIndex]) : (this.modelValue || '');
+
+            return selectedOptionIndex !== -1 ? this.getOptionLabel(this.visibleOptions[selectedOptionIndex]) : this.modelValue || '';
         },
         equalityKey() {
             return this.optionValue ? null : this.dataKey;
@@ -788,22 +864,25 @@ var script = {
         selectedMessageText() {
             return this.hasSelectedOption ? this.selectionMessageText.replaceAll('{0}', '1') : this.emptySelectionMessageText;
         },
+        id() {
+            return this.$attrs.id || utils.UniqueComponentId();
+        },
         focusedOptionId() {
             return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null;
         },
         ariaSetSize() {
-            return this.visibleOptions.filter(option => !this.isOptionGroup(option)).length;
+            return this.visibleOptions.filter((option) => !this.isOptionGroup(option)).length;
         },
         virtualScrollerDisabled() {
             return !this.virtualScrollerOptions;
         }
     },
     directives: {
-        'ripple': Ripple__default["default"]
+        ripple: Ripple__default["default"]
     },
     components: {
-        'VirtualScroller': VirtualScroller__default["default"],
-        'Portal': Portal__default["default"]
+        VirtualScroller: VirtualScroller__default["default"],
+        Portal: Portal__default["default"]
     }
 };
 
@@ -817,32 +896,31 @@ const _hoisted_5 = {
 };
 const _hoisted_6 = { class: "p-dropdown-filter-container" };
 const _hoisted_7 = ["value", "placeholder", "aria-owns", "aria-activedescendant"];
-const _hoisted_8 = /*#__PURE__*/vue.createElementVNode("span", { class: "p-dropdown-filter-icon pi pi-search" }, null, -1);
-const _hoisted_9 = {
+const _hoisted_8 = {
   role: "status",
   "aria-live": "polite",
   class: "p-hidden-accessible"
 };
+const _hoisted_9 = ["id"];
 const _hoisted_10 = ["id"];
-const _hoisted_11 = ["id"];
-const _hoisted_12 = ["id", "aria-label", "aria-selected", "aria-disabled", "aria-setsize", "aria-posinset", "onClick", "onMousemove"];
-const _hoisted_13 = {
+const _hoisted_11 = ["id", "aria-label", "aria-selected", "aria-disabled", "aria-setsize", "aria-posinset", "onClick", "onMousemove"];
+const _hoisted_12 = {
   key: 0,
   class: "p-dropdown-empty-message",
   role: "option"
 };
-const _hoisted_14 = {
+const _hoisted_13 = {
   key: 1,
   class: "p-dropdown-empty-message",
   role: "option"
 };
-const _hoisted_15 = {
+const _hoisted_14 = {
   key: 0,
   role: "status",
   "aria-live": "polite",
   class: "p-hidden-accessible"
 };
-const _hoisted_16 = {
+const _hoisted_15 = {
   role: "status",
   "aria-live": "polite",
   class: "p-hidden-accessible"
@@ -855,7 +933,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
 
   return (vue.openBlock(), vue.createElementBlock("div", {
     ref: "container",
-    id: $data.id,
+    id: $options.id,
     class: vue.normalizeClass($options.containerClass),
     onClick: _cache[16] || (_cache[16] = (...args) => ($options.onContainerClick && $options.onContainerClick(...args)))
   }, [
@@ -877,7 +955,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
           "aria-labelledby": _ctx.ariaLabelledby,
           "aria-haspopup": "listbox",
           "aria-expanded": $data.overlayVisible,
-          "aria-controls": $data.id + '_list',
+          "aria-controls": $options.id + '_list',
           "aria-activedescendant": $data.focused ? $options.focusedOptionId : undefined,
           onFocus: _cache[0] || (_cache[0] = (...args) => ($options.onFocus && $options.onFocus(...args))),
           onBlur: _cache[1] || (_cache[1] = (...args) => ($options.onBlur && $options.onBlur(...args))),
@@ -896,7 +974,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
           "aria-labelledby": _ctx.ariaLabelledby,
           "aria-haspopup": "listbox",
           "aria-expanded": $data.overlayVisible,
-          "aria-controls": $data.id + '_list',
+          "aria-controls": $options.id + '_list',
           "aria-activedescendant": $data.focused ? $options.focusedOptionId : undefined,
           "aria-disabled": $props.disabled,
           onFocus: _cache[4] || (_cache[4] = (...args) => ($options.onFocus && $options.onFocus(...args))),
@@ -913,7 +991,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
     ($props.showClear && $props.modelValue != null)
       ? (vue.openBlock(), vue.createElementBlock("i", vue.mergeProps({
           key: 2,
-          class: "p-dropdown-clear-icon pi pi-times",
+          class: ['p-dropdown-clear-icon', $props.clearIcon],
           onClick: _cache[7] || (_cache[7] = (...args) => ($options.onClearClick && $options.onClearClick(...args)))
         }, $props.clearIconProps), null, 16))
       : vue.createCommentVNode("", true),
@@ -960,39 +1038,41 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                     ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
                         vue.createElementVNode("div", _hoisted_6, [
                           vue.createElementVNode("input", vue.mergeProps({
-                            type: "text",
                             ref: "filterInput",
+                            type: "text",
                             value: $data.filterValue,
                             onVnodeUpdated: _cache[9] || (_cache[9] = (...args) => ($options.onFilterUpdated && $options.onFilterUpdated(...args))),
                             class: "p-dropdown-filter p-inputtext p-component",
                             placeholder: $props.filterPlaceholder,
                             role: "searchbox",
                             autocomplete: "off",
-                            "aria-owns": $data.id + '_list',
+                            "aria-owns": $options.id + '_list',
                             "aria-activedescendant": $options.focusedOptionId,
                             onKeydown: _cache[10] || (_cache[10] = (...args) => ($options.onFilterKeyDown && $options.onFilterKeyDown(...args))),
                             onBlur: _cache[11] || (_cache[11] = (...args) => ($options.onFilterBlur && $options.onFilterBlur(...args))),
                             onInput: _cache[12] || (_cache[12] = (...args) => ($options.onFilterChange && $options.onFilterChange(...args)))
                           }, $props.filterInputProps), null, 16, _hoisted_7),
-                          _hoisted_8
+                          vue.createElementVNode("span", {
+                            class: vue.normalizeClass(['p-dropdown-filter-icon', $props.filterIcon])
+                          }, null, 2)
                         ]),
-                        vue.createElementVNode("span", _hoisted_9, vue.toDisplayString($options.filterResultMessageText), 1)
+                        vue.createElementVNode("span", _hoisted_8, vue.toDisplayString($options.filterResultMessageText), 1)
                       ]))
                     : vue.createCommentVNode("", true),
                   vue.createElementVNode("div", {
                     class: "p-dropdown-items-wrapper",
-                    style: vue.normalizeStyle({'max-height': $options.virtualScrollerDisabled ? $props.scrollHeight : ''})
+                    style: vue.normalizeStyle({ 'max-height': $options.virtualScrollerDisabled ? $props.scrollHeight : '' })
                   }, [
                     vue.createVNode(_component_VirtualScroller, vue.mergeProps({ ref: $options.virtualScrollerRef }, $props.virtualScrollerOptions, {
                       items: $options.visibleOptions,
-                      style: {'height': $props.scrollHeight},
+                      style: { height: $props.scrollHeight },
                       tabindex: -1,
                       disabled: $options.virtualScrollerDisabled
                     }), vue.createSlots({
                       content: vue.withCtx(({ styleClass, contentRef, items, getItemOptions, contentStyle, itemSize }) => [
                         vue.createElementVNode("ul", {
                           ref: (el) => $options.listRef(el, contentRef),
-                          id: $data.id + '_list',
+                          id: $options.id + '_list',
                           class: vue.normalizeClass(['p-dropdown-items', styleClass]),
                           style: vue.normalizeStyle(contentStyle),
                           role: "listbox"
@@ -1004,8 +1084,8 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                               ($options.isOptionGroup(option))
                                 ? (vue.openBlock(), vue.createElementBlock("li", {
                                     key: 0,
-                                    id: $data.id + '_' + $options.getOptionIndex(i, getItemOptions),
-                                    style: vue.normalizeStyle({height: itemSize ? itemSize + 'px' : undefined}),
+                                    id: $options.id + '_' + $options.getOptionIndex(i, getItemOptions),
+                                    style: vue.normalizeStyle({ height: itemSize ? itemSize + 'px' : undefined }),
                                     class: "p-dropdown-item-group",
                                     role: "option"
                                   }, [
@@ -1015,12 +1095,12 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                                     }, () => [
                                       vue.createTextVNode(vue.toDisplayString($options.getOptionGroupLabel(option.optionGroup)), 1)
                                     ])
-                                  ], 12, _hoisted_11))
+                                  ], 12, _hoisted_10))
                                 : vue.withDirectives((vue.openBlock(), vue.createElementBlock("li", {
                                     key: 1,
-                                    id: $data.id + '_' + $options.getOptionIndex(i, getItemOptions),
-                                    style: vue.normalizeStyle({height: itemSize ? itemSize + 'px' : undefined}),
-                                    class: vue.normalizeClass(['p-dropdown-item', {'p-highlight': $options.isSelected(option), 'p-focus': $data.focusedOptionIndex === $options.getOptionIndex(i, getItemOptions), 'p-disabled': $options.isOptionDisabled(option)}]),
+                                    id: $options.id + '_' + $options.getOptionIndex(i, getItemOptions),
+                                    style: vue.normalizeStyle({ height: itemSize ? itemSize + 'px' : undefined }),
+                                    class: vue.normalizeClass(['p-dropdown-item', { 'p-highlight': $options.isSelected(option), 'p-focus': $data.focusedOptionIndex === $options.getOptionIndex(i, getItemOptions), 'p-disabled': $options.isOptionDisabled(option) }]),
                                     role: "option",
                                     "aria-label": $options.getOptionLabel(option),
                                     "aria-selected": $options.isSelected(option),
@@ -1036,29 +1116,29 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                                     }, () => [
                                       vue.createTextVNode(vue.toDisplayString($options.getOptionLabel(option)), 1)
                                     ])
-                                  ], 46, _hoisted_12)), [
+                                  ], 46, _hoisted_11)), [
                                     [_directive_ripple]
                                   ])
                             ], 64))
                           }), 128)),
                           ($data.filterValue && (!items || (items && items.length === 0)))
-                            ? (vue.openBlock(), vue.createElementBlock("li", _hoisted_13, [
+                            ? (vue.openBlock(), vue.createElementBlock("li", _hoisted_12, [
                                 vue.renderSlot(_ctx.$slots, "emptyfilter", {}, () => [
                                   vue.createTextVNode(vue.toDisplayString($options.emptyFilterMessageText), 1)
                                 ])
                               ]))
-                            : ((!$props.options || ($props.options && $props.options.length === 0)))
-                              ? (vue.openBlock(), vue.createElementBlock("li", _hoisted_14, [
+                            : (!$props.options || ($props.options && $props.options.length === 0))
+                              ? (vue.openBlock(), vue.createElementBlock("li", _hoisted_13, [
                                   vue.renderSlot(_ctx.$slots, "empty", {}, () => [
                                     vue.createTextVNode(vue.toDisplayString($options.emptyMessageText), 1)
                                   ])
                                 ]))
                               : vue.createCommentVNode("", true)
-                        ], 14, _hoisted_10),
-                        ((!$props.options || ($props.options && $props.options.length === 0)))
-                          ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_15, vue.toDisplayString($options.emptyMessageText), 1))
+                        ], 14, _hoisted_9),
+                        (!$props.options || ($props.options && $props.options.length === 0))
+                          ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_14, vue.toDisplayString($options.emptyMessageText), 1))
                           : vue.createCommentVNode("", true),
-                        vue.createElementVNode("span", _hoisted_16, vue.toDisplayString($options.selectedMessageText), 1)
+                        vue.createElementVNode("span", _hoisted_15, vue.toDisplayString($options.selectedMessageText), 1)
                       ]),
                       _: 2
                     }, [
@@ -1067,7 +1147,8 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                             name: "loader",
                             fn: vue.withCtx(({ options }) => [
                               vue.renderSlot(_ctx.$slots, "loader", { options: options })
-                            ])
+                            ]),
+                            key: "0"
                           }
                         : undefined
                     ]), 1040, ["items", "style", "disabled"])
@@ -1122,7 +1203,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = "\n.p-dropdown {\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    cursor: pointer;\n    position: relative;\n    -webkit-user-select: none;\n       -moz-user-select: none;\n        -ms-user-select: none;\n            user-select: none;\n}\n.p-dropdown-clear-icon {\n    position: absolute;\n    top: 50%;\n    margin-top: -.5rem;\n}\n.p-dropdown-trigger {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -ms-flex-negative: 0;\n        flex-shrink: 0;\n}\n.p-dropdown-label {\n    display: block;\n    white-space: nowrap;\n    overflow: hidden;\n    -webkit-box-flex: 1;\n        -ms-flex: 1 1 auto;\n            flex: 1 1 auto;\n    width: 1%;\n    text-overflow: ellipsis;\n    cursor: pointer;\n}\n.p-dropdown-label-empty {\n    overflow: hidden;\n    opacity: 0;\n}\ninput.p-dropdown-label  {\n    cursor: default;\n}\n.p-dropdown .p-dropdown-panel {\n    min-width: 100%;\n}\n.p-dropdown-panel {\n    position: absolute;\n    top: 0;\n    left: 0;\n}\n.p-dropdown-items-wrapper {\n    overflow: auto;\n}\n.p-dropdown-item {\n    cursor: pointer;\n    font-weight: normal;\n    white-space: nowrap;\n    position: relative;\n    overflow: hidden;\n}\n.p-dropdown-item-group {\n    cursor: auto;\n}\n.p-dropdown-items {\n    margin: 0;\n    padding: 0;\n    list-style-type: none;\n}\n.p-dropdown-filter {\n    width: 100%;\n}\n.p-dropdown-filter-container {\n    position: relative;\n}\n.p-dropdown-filter-icon {\n    position: absolute;\n    top: 50%;\n    margin-top: -.5rem;\n}\n.p-fluid .p-dropdown {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n.p-fluid .p-dropdown .p-dropdown-label {\n    width: 1%;\n}\n";
+var css_248z = "\n.p-dropdown {\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    cursor: pointer;\n    position: relative;\n    -webkit-user-select: none;\n       -moz-user-select: none;\n        -ms-user-select: none;\n            user-select: none;\n}\n.p-dropdown-clear-icon {\n    position: absolute;\n    top: 50%;\n    margin-top: -0.5rem;\n}\n.p-dropdown-trigger {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -ms-flex-negative: 0;\n        flex-shrink: 0;\n}\n.p-dropdown-label {\n    display: block;\n    white-space: nowrap;\n    overflow: hidden;\n    -webkit-box-flex: 1;\n        -ms-flex: 1 1 auto;\n            flex: 1 1 auto;\n    width: 1%;\n    text-overflow: ellipsis;\n    cursor: pointer;\n}\n.p-dropdown-label-empty {\n    overflow: hidden;\n    opacity: 0;\n}\ninput.p-dropdown-label {\n    cursor: default;\n}\n.p-dropdown .p-dropdown-panel {\n    min-width: 100%;\n}\n.p-dropdown-panel {\n    position: absolute;\n    top: 0;\n    left: 0;\n}\n.p-dropdown-items-wrapper {\n    overflow: auto;\n}\n.p-dropdown-item {\n    cursor: pointer;\n    font-weight: normal;\n    white-space: nowrap;\n    position: relative;\n    overflow: hidden;\n}\n.p-dropdown-item-group {\n    cursor: auto;\n}\n.p-dropdown-items {\n    margin: 0;\n    padding: 0;\n    list-style-type: none;\n}\n.p-dropdown-filter {\n    width: 100%;\n}\n.p-dropdown-filter-container {\n    position: relative;\n}\n.p-dropdown-filter-icon {\n    position: absolute;\n    top: 50%;\n    margin-top: -0.5rem;\n}\n.p-fluid .p-dropdown {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n.p-fluid .p-dropdown .p-dropdown-label {\n    width: 1%;\n}\n";
 styleInject(css_248z);
 
 script.render = render;