primevue 3.15.0 → 3.16.2

package/cascadeselect/CascadeSelect.vue

@@ -1,27 +1,34 @@
 <template>
-    <div ref="container" :class="containerClass" @click="onClick($event)">
+    <div ref="container" :class="containerClass" @click="onContainerClick($event)">
         <div class="p-hidden-accessible">
-            <input ref="focusInput" type="text" :id="inputId" readonly :disabled="disabled" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" :tabindex="tabindex"
-                aria-haspopup="listbox" :aria-expanded="overlayVisible" :aria-labelledby="ariaLabelledBy" />
+            <input ref="focusInput" :id="inputId" type="text" :style="inputStyle" :class="inputClass" readonly :disabled="disabled" :placeholder="placeholder" :tabindex="!disabled ? tabindex : -1"
+                role="combobox" :aria-label="ariaLabel" :aria-labelledby="ariaLabelledby" aria-haspopup="tree" :aria-expanded="overlayVisible" :aria-controls="id + '_tree'" :aria-activedescendant="focused ? focusedOptionId : undefined"
+                @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" v-bind="inputProps" />
         </div>
         <span :class="labelClass">
             <slot name="value" :value="modelValue" :placeholder="placeholder">
                 {{label}}
             </slot>
         </span>
-        <div class="p-cascadeselect-trigger" role="button" aria-haspopup="listbox" :aria-expanded="overlayVisible">
+        <div class="p-cascadeselect-trigger" role="button" tabindex="-1" aria-hidden="true">
             <slot name="indicator">
                 <span :class="dropdownIconClass"></span>
             </slot>
         </div>
+        <span role="status" aria-live="polite" class="p-hidden-accessible">
+            {{searchResultMessageText}}
+        </span>
         <Portal :appendTo="appendTo">
-            <transition name="p-connected-overlay" @enter="onOverlayEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave">
-                <div :ref="overlayRef" :class="panelStyleClass" v-if="overlayVisible" @click="onOverlayClick">
+            <transition name="p-connected-overlay" @enter="onOverlayEnter" @after-enter="onOverlayAfterEnter" @leave="onOverlayLeave" @after-leave="onOverlayAfterLeave">
+                <div v-if="overlayVisible" :ref="overlayRef" :style="panelStyle" :class="panelStyleClass" @click="onOverlayClick" @keydown="onOverlayKeyDown" v-bind="panelProps">
                     <div class="p-cascadeselect-items-wrapper">
-                        <CascadeSelectSub :options="options" :selectionPath="selectionPath"
-                            :optionLabel="optionLabel" :optionValue="optionValue" :level="0" :templates="$slots"
-                            :optionGroupLabel="optionGroupLabel" :optionGroupChildren="optionGroupChildren"
-                            @option-select="onOptionSelect" @optiongroup-select="onOptionGroupSelect" :dirty="dirty" :root="true" />
+                        <CascadeSelectSub :id="id + '_tree'" role="tree" aria-orientation="horizontal" :selectId="id" :focusedOptionId="focused ? focusedOptionId : undefined"
+                            :options="processedOptions" :activeOptionPath="activeOptionPath" :level="0" :templates="$slots" :optionLabel="optionLabel" :optionValue="optionValue" :optionDisabled="optionDisabled"
+                            :optionGroupLabel="optionGroupLabel" :optionGroupChildren="optionGroupChildren" @option-change="onOptionChange" />
+
+                        <span role="status" aria-live="polite" class="p-hidden-accessible">
+                            {{selectedMessageText}}
+                        </span>
                     </div>
                 </div>
             </transition>
@@ -30,40 +37,36 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,ZIndexUtils} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,ZIndexUtils,UniqueComponentId} from 'primevue/utils';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import CascadeSelectSub from './CascadeSelectSub.vue';
 import Portal from 'primevue/portal';
 
 export default {
     name: 'CascadeSelect',
-    emits: ['update:modelValue','change','group-change', 'before-show','before-hide','hide','show'],
-    data() {
-        return {
-            selectionPath: null,
-            focused: false,
-            overlayVisible: false,
-            dirty: false
-        };
-    },
+    emits: ['update:modelValue', 'change', 'focus', 'blur', 'click', 'group-change', 'before-show', 'before-hide', 'hide', 'show'],
     props: {
         modelValue: null,
         options: Array,
-        optionLabel: String,
-        optionValue: String,
-        optionGroupLabel: String,
-        optionGroupChildren: Array,
+        optionLabel: null,
+        optionValue: null,
+        optionDisabled: null,
+        optionGroupLabel: null,
+        optionGroupChildren: null,
         placeholder: String,
 		disabled: Boolean,
         dataKey: null,
-        inputId: String,
-        tabindex: String,
-        ariaLabelledBy: null,
+        inputId: null,
+        inputStyle: null,
+        inputClass: null,
+        inputProps: null,
+        panelStyle: null,
+        panelClass: null,
+        panelProps: null,
         appendTo: {
             type: String,
             default: 'body'
         },
-        panelClass: null,
         loading: {
             type: Boolean,
             default: false
@@ -71,12 +74,74 @@ export default {
         loadingIcon: {
             type: String,
             default: 'pi pi-spinner pi-spin'
+        },
+        autoOptionFocus: {
+            type: Boolean,
+            default: true
+        },
+        searchLocale: {
+            type: String,
+            default: undefined
+        },
+        searchMessage: {
+            type: String,
+            default: null
+        },
+        selectionMessage: {
+            type: String,
+            default: null
+        },
+        emptySelectionMessage: {
+            type: String,
+            default: null
+        },
+        emptySearchMessage: {
+            type: String,
+            default: null
+        },
+        emptyMessage: {
+            type: String,
+            default: null
+        },
+        tabindex: {
+            type: Number,
+            default: 0
+        },
+        'aria-labelledby': {
+            type: String,
+			default: null
+        },
+        'aria-label': {
+            type: String,
+            default: null
         }
     },
     outsideClickListener: null,
     scrollHandler: null,
     resizeListener: null,
     overlay: null,
+    searchTimeout: null,
+    searchValue: null,
+    selectOnFocus: false,
+    focusOnHover: false,
+    data() {
+        return {
+            id: UniqueComponentId(),
+            focused: false,
+            focusedOptionInfo: { index: -1, level: 0, parentKey: '' },
+            activeOptionPath: [],
+            overlayVisible: false,
+            dirty: false
+        }
+    },
+    watch: {
+        options() {
+            this.autoUpdateModel();
+        }
+    },
+    mounted() {
+        this.id = this.$attrs.id || this.id;
+    },
     beforeUnmount() {
         this.unbindOutsideClickListener();
         this.unbindResizeListener();
@@ -91,107 +156,317 @@ export default {
             this.overlay = null;
         }
     },
-    mounted() {
-        this.updateSelectionPath();
-    },
-    watch: {
-        modelValue() {
-            this.updateSelectionPath();
-        }
-    },
     methods: {
-        onOptionSelect(event) {
-            this.$emit('update:modelValue', event.value);
-            this.$emit('change', event);
-            this.hide();
-            this.$refs.focusInput.focus();
-        },
-        onOptionGroupSelect(event) {
-            this.dirty = true;
-            this.$emit('group-change', event);
-        },
         getOptionLabel(option) {
             return this.optionLabel ? ObjectUtils.resolveFieldData(option, this.optionLabel) : option;
         },
         getOptionValue(option) {
             return this.optionValue ? ObjectUtils.resolveFieldData(option, this.optionValue) : option;
         },
+        isOptionDisabled(option) {
+            return this.optionDisabled ? ObjectUtils.resolveFieldData(option, this.optionDisabled) : false;
+        },
+        getOptionGroupLabel(optionGroup) {
+            return this.optionGroupLabel ? ObjectUtils.resolveFieldData(optionGroup, this.optionGroupLabel) : null;
+        },
         getOptionGroupChildren(optionGroup, level) {
             return ObjectUtils.resolveFieldData(optionGroup, this.optionGroupChildren[level]);
         },
         isOptionGroup(option, level) {
             return Object.prototype.hasOwnProperty.call(option, this.optionGroupChildren[level]);
         },
-        updateSelectionPath() {
-            let path;
-            if (this.modelValue != null && this.options) {
-                for (let option of this.options) {
-                    path = this.findModelOptionInGroup(option, 0);
-                    if (path) {
-                        break;
-                    }
-                }
-            }
-
-            this.selectionPath = path;
+        getProccessedOptionLabel(processedOption) {
+            const grouped = this.isProccessedOptionGroup(processedOption);
+            return grouped ? this.getOptionGroupLabel(processedOption.option, processedOption.level) : this.getOptionLabel(processedOption.option);
         },
-        findModelOptionInGroup(option, level) {
-            if (this.isOptionGroup(option, level)) {
-                let selectedOption;
-                for (let childOption of this.getOptionGroupChildren(option, level)) {
-                    selectedOption = this.findModelOptionInGroup(childOption, level + 1);
-                    if (selectedOption) {
-                        selectedOption.unshift(option);
-                        return selectedOption;
-                    }
-                }
-            }
-            else if ((ObjectUtils.equals(this.modelValue, this.getOptionValue(option), this.dataKey))) {
-                return [option];
-            }
-
-            return null;
+        isProccessedOptionGroup(processedOption) {
+            return ObjectUtils.isNotEmpty(processedOption.children);
         },
-        show() {
+        show(isFocus) {
             this.$emit('before-show');
             this.overlayVisible = true;
+            this.activeOptionPath = this.findOptionPathByValue(this.modelValue);
+
+            if (this.hasSelectedOption && ObjectUtils.isNotEmpty(this.activeOptionPath)) {
+                const processedOption = this.activeOptionPath[this.activeOptionPath.length - 1];
+                this.focusedOptionInfo = { index: (this.autoOptionFocus ? processedOption.index : -1), level: processedOption.level, parentKey: processedOption.parentKey };
+            }
+            else {
+                this.focusedOptionInfo = { index: (this.autoOptionFocus ? this.findFirstFocusedOptionIndex() : -1), level: 0, parentKey: '' };
+            }
+
+            isFocus && this.$refs.focusInput.focus();
         },
-        hide() {
-            this.$emit('before-hide');
-            this.overlayVisible = false;
+        hide(isFocus) {
+            const _hide = () => {
+                this.$emit('before-hide');
+                this.overlayVisible = false;
+                this.activeOptionPath = [];
+                this.focusedOptionInfo = { index: -1, level: 0, parentKey: '' };
+
+                isFocus && this.$refs.focusInput.focus();
+            }
+
+            setTimeout(() => { _hide() }, 0); // For ScreenReaders
         },
-        onFocus() {
+        onFocus(event) {
             this.focused = true;
+            this.$emit('focus', event);
         },
-        onBlur() {
+        onBlur(event) {
             this.focused = false;
+            this.focusedOptionInfo = { index: -1, level: 0, parentKey: '' };
+            this.searchValue = '';
+            this.$emit('blur', event);
         },
-        onClick(event) {
+        onKeyDown(event) {
             if (this.disabled || this.loading) {
+                event.preventDefault();
                 return;
             }
 
-            if (!this.overlay || !this.overlay.contains(event.target)) {
-                if (this.overlayVisible)
-                    this.hide();
-                else
-                    this.show();
+            switch (event.code) {
+                case 'ArrowDown':
+                    this.onArrowDownKey(event);
+                    break;
+
+                case 'ArrowUp':
+                    this.onArrowUpKey(event);
+                    break;
+
+                case 'ArrowLeft':
+                    this.onArrowLeftKey(event);
+                    break;
+
+                case 'ArrowRight':
+                    this.onArrowRightKey(event);
+                    break;
+
+                case 'Home':
+                    this.onHomeKey(event);
+                    break;
+
+                case 'End':
+                    this.onEndKey(event);
+                    break;
+
+                case 'Space':
+                    this.onSpaceKey(event);
+                    break;
+
+                case 'Enter':
+                    this.onEnterKey(event);
+                    break;
+
+                case 'Escape':
+                    this.onEscapeKey(event);
+                    break;
+
+                case 'Tab':
+                    this.onTabKey(event);
+                    break;
+
+                case 'PageDown':
+                case 'PageUp':
+                case 'Backspace':
+                case 'ShiftLeft':
+                case 'ShiftRight':
+                    //NOOP
+                    break;
+
+                default:
+                    if (ObjectUtils.isPrintableCharacter(event.key)) {
+                        !this.overlayVisible && this.show();
+                        this.searchOptions(event, event.key);
+                    }
+
+                    break;
+            }
+        },
+        onOptionChange(event) {
+            const { originalEvent, processedOption, isFocus } = event;
+            const { index, level, parentKey, children } = processedOption;
+            const grouped = ObjectUtils.isNotEmpty(children);
+
+            const activeOptionPath = this.activeOptionPath.filter(p => p.parentKey !== parentKey);
+            activeOptionPath.push(processedOption);
+
+            this.focusedOptionInfo = { index, level, parentKey };
+            this.activeOptionPath = activeOptionPath;
+
+            grouped ? this.onOptionGroupSelect(originalEvent, processedOption) : this.onOptionSelect(originalEvent, processedOption);
+            isFocus && this.$refs.focusInput.focus();
+        },
+        onOptionSelect(event, processedOption) {
+            const value = this.getOptionValue(processedOption.option);
 
+            this.activeOptionPath.forEach(p => p.selected = true);
+            this.updateModel(event, value);
+            this.hide(true);
+        },
+        onOptionGroupSelect(event, processedOption) {
+            this.dirty = true;
+            this.$emit('group-change', { originalEvent: event, value: processedOption.option });
+        },
+        onContainerClick(event) {
+            if (this.disabled || this.loading) {
+                return;
+            }
+
+            if (!this.overlay || !this.overlay.contains(event.target)) {
+                this.overlayVisible ? this.hide() : this.show();
                 this.$refs.focusInput.focus();
             }
+
+            this.$emit('click', event);
+        },
+        onOverlayClick(event) {
+            OverlayEventBus.emit('overlay-click', {
+                originalEvent: event,
+                target: this.$el
+            });
+        },
+        onOverlayKeyDown(event) {
+            switch (event.code) {
+                case 'Escape':
+                    this.onEscapeKey(event);
+                    break;
+
+                default:
+                    break;
+            }
+        },
+        onArrowDownKey(event) {
+            const optionIndex = this.focusedOptionInfo.index !== -1 ? this.findNextOptionIndex(this.focusedOptionInfo.index) : this.findFirstFocusedOptionIndex();
+
+            this.changeFocusedOptionIndex(event, optionIndex);
+
+            !this.overlayVisible && this.show();
+            event.preventDefault();
+        },
+        onArrowUpKey(event) {
+            if (event.altKey) {
+                if (this.focusedOptionInfo.index !== -1) {
+                    const processedOption = this.visibleOptions[this.focusedOptionInfo.index];
+                    const grouped = this.isProccessedOptionGroup(processedOption);
+                    !grouped && this.onOptionChange({ originalEvent: event, processedOption });
+                }
+
+                this.overlayVisible && this.hide();
+                event.preventDefault();
+            }
+            else {
+                const optionIndex = this.focusedOptionInfo.index !== -1 ? this.findPrevOptionIndex(this.focusedOptionInfo.index) : this.findLastFocusedOptionIndex();
+
+                this.changeFocusedOptionIndex(event, optionIndex);
+
+                !this.overlayVisible && this.show();
+                event.preventDefault();
+            }
+        },
+        onArrowLeftKey(event) {
+            if (this.overlayVisible) {
+                const processedOption = this.visibleOptions[this.focusedOptionInfo.index];
+                const parentOption = this.activeOptionPath.find(p => p.key === processedOption.parentKey);
+                const matched = this.focusedOptionInfo.parentKey === '' || (parentOption && parentOption.key === this.focusedOptionInfo.parentKey);
+                const root = ObjectUtils.isEmpty(processedOption.parent);
+
+                if (matched) {
+                    this.activeOptionPath = this.activeOptionPath.filter(p => p.parentKey !== this.focusedOptionInfo.parentKey);
+                }
+
+                if (!root) {
+                    this.focusedOptionInfo = { index: -1, parentKey: parentOption ? parentOption.parentKey : '' };
+                    this.searchValue = '';
+                    this.onArrowDownKey(event);
+                }
+
+                event.preventDefault();
+            }
+        },
+        onArrowRightKey(event) {
+            if (this.overlayVisible) {
+                const processedOption = this.visibleOptions[this.focusedOptionInfo.index];
+                const grouped = this.isProccessedOptionGroup(processedOption);
+
+                if (grouped) {
+                    const matched = this.activeOptionPath.some(p => processedOption.key === p.key);
+
+                    if (matched) {
+                        this.focusedOptionInfo = { index: -1, parentKey: processedOption.key };
+                        this.searchValue = '';
+                        this.onArrowDownKey(event);
+                    }
+                    else {
+                        this.onOptionChange({ originalEvent: event, processedOption });
+                    }
+                }
+
+                event.preventDefault();
+            }
+        },
+        onHomeKey(event) {
+            this.changeFocusedOptionIndex(event, this.findFirstOptionIndex());
+
+            !this.overlayVisible && this.show();
+            event.preventDefault();
+        },
+        onEndKey(event) {
+            this.changeFocusedOptionIndex(event, this.findLastOptionIndex());
+
+            !this.overlayVisible && this.show();
+            event.preventDefault();
+        },
+        onEnterKey(event) {
+            if (!this.overlayVisible) {
+                this.onArrowDownKey(event);
+            }
+            else {
+                if (this.focusedOptionInfo.index !== -1) {
+                    const processedOption = this.visibleOptions[this.focusedOptionInfo.index];
+                    const grouped = this.isProccessedOptionGroup(processedOption);
+
+                    this.onOptionChange({ originalEvent: event, processedOption });
+                    !grouped && this.hide();
+                }
+            }
+
+            event.preventDefault();
+        },
+        onSpaceKey(event) {
+            this.onEnterKey(event);
+        },
+        onEscapeKey(event) {
+            this.overlayVisible && this.hide(true);
+            event.preventDefault();
+        },
+        onTabKey(event) {
+            if (this.focusedOptionInfo.index !== -1) {
+                const processedOption = this.visibleOptions[this.focusedOptionInfo.index];
+                const grouped = this.isProccessedOptionGroup(processedOption);
+
+                !grouped && this.onOptionChange({ originalEvent: event, processedOption });
+            }
+
+            this.overlayVisible && this.hide();
         },
         onOverlayEnter(el) {
             ZIndexUtils.set('overlay', el, this.$primevue.config.zIndex.overlay);
             this.alignOverlay();
+            this.scrollInView();
+        },
+        onOverlayAfterEnter() {
             this.bindOutsideClickListener();
             this.bindScrollListener();
             this.bindResizeListener();
+
             this.$emit('show');
         },
         onOverlayLeave() {
             this.unbindOutsideClickListener();
             this.unbindScrollListener();
             this.unbindResizeListener();
+
             this.$emit('hide');
             this.overlay = null;
             this.dirty = false;
@@ -256,67 +531,168 @@ export default {
                 this.resizeListener = null;
             }
         },
-        overlayRef(el) {
-            this.overlay = el;
+        isOptionMatched(processedOption) {
+            return this.isValidOption(processedOption) && this.getProccessedOptionLabel(processedOption).toLocaleLowerCase(this.searchLocale).startsWith(this.searchValue.toLocaleLowerCase(this.searchLocale));
         },
-        onKeyDown(event) {
-            switch(event.key) {
-                case 'Down':
-                case 'ArrowDown':
-                    if (this.overlayVisible) {
-                        DomHandler.findSingle(this.overlay, '.p-cascadeselect-item').children[0].focus();
-                    }
-                    else if (event.altKey && this.options && this.options.length) {
-                        this.show();
-                    }
-                    event.preventDefault();
-                break;
+        isValidOption(processedOption) {
+            return !!processedOption && !this.isOptionDisabled(processedOption.option);
+        },
+        isValidSelectedOption(processedOption) {
+            return this.isValidOption(processedOption) && this.isSelected(processedOption);
+        },
+        isSelected(processedOption) {
+            return this.activeOptionPath.some(p => p.key === processedOption.key);
+        },
+        findFirstOptionIndex() {
+            return this.visibleOptions.findIndex(processedOption => this.isValidOption(processedOption));
+        },
+        findLastOptionIndex() {
+            return ObjectUtils.findLastIndex(this.visibleOptions, processedOption => this.isValidOption(processedOption));
+        },
+        findNextOptionIndex(index) {
+            const matchedOptionIndex = index < (this.visibleOptions.length - 1) ? this.visibleOptions.slice(index + 1).findIndex(processedOption => this.isValidOption(processedOption)) : -1;
+            return matchedOptionIndex > -1 ? matchedOptionIndex + index + 1 : index;
+        },
+        findPrevOptionIndex(index) {
+            const matchedOptionIndex = index > 0 ? ObjectUtils.findLastIndex(this.visibleOptions.slice(0, index), processedOption => this.isValidOption(processedOption)) : -1;
+            return matchedOptionIndex > -1 ? matchedOptionIndex : index;
+        },
+        findSelectedOptionIndex() {
+            return this.visibleOptions.findIndex(processedOption => this.isValidSelectedOption(processedOption));
+        },
+        findFirstFocusedOptionIndex() {
+            const selectedIndex = this.findSelectedOptionIndex();
+            return selectedIndex < 0 ? this.findFirstOptionIndex() : selectedIndex;
+        },
+        findLastFocusedOptionIndex() {
+            const selectedIndex = this.findSelectedOptionIndex();
+            return selectedIndex < 0 ? this.findLastOptionIndex() : selectedIndex;
+        },
+        findOptionPathByValue(value, processedOptions, level = 0) {
+            processedOptions = processedOptions || (level === 0 && this.processedOptions);
 
-                case 'Escape':
-                    if (this.overlayVisible) {
-                        this.hide();
-                        event.preventDefault();
-                    }
-                break;
+            if (!processedOptions) return null;
+            if (ObjectUtils.isEmpty(value)) return [];
 
-                case 'Tab':
-                    this.hide();
-                break;
+            for (let i = 0; i < processedOptions.length; i++) {
+                const processedOption = processedOptions[i];
+
+                if (ObjectUtils.equals(value, this.getOptionValue(processedOption.option), this.equalityKey)) {
+                    return [processedOption];
+                }
+
+                const matchedOptions = this.findOptionPathByValue(value, processedOption.children, level + 1);
+                if (matchedOptions) {
+                    matchedOptions.unshift(processedOption);
+
+                    return matchedOptions;
+                }
             }
         },
-        onOverlayClick(event) {
-            OverlayEventBus.emit('overlay-click', {
-                originalEvent: event,
-                target: this.$el
+        searchOptions(event, char) {
+            this.searchValue = (this.searchValue || '') + char;
+
+            let optionIndex = -1;
+            let matched = false;
+
+            if (this.focusedOptionInfo.index !== -1) {
+                optionIndex = this.visibleOptions.slice(this.focusedOptionInfo.index).findIndex(processedOption => this.isOptionMatched(processedOption));
+                optionIndex = optionIndex === -1 ? this.visibleOptions.slice(0, this.focusedOptionInfo.index).findIndex(processedOption => this.isOptionMatched(processedOption)) : optionIndex + this.focusedOptionInfo.index;
+            }
+            else {
+                optionIndex = this.visibleOptions.findIndex(processedOption => this.isOptionMatched(processedOption));
+            }
+
+            if (optionIndex !== -1) {
+                matched = true;
+            }
+
+            if (optionIndex === -1 && this.focusedOptionInfo.index === -1) {
+                optionIndex = this.findFirstFocusedOptionIndex();
+            }
+
+            if (optionIndex !== -1) {
+                this.changeFocusedOptionIndex(event, optionIndex);
+            }
+
+            if (this.searchTimeout) {
+                clearTimeout(this.searchTimeout);
+            }
+
+            this.searchTimeout = setTimeout(() => {
+                this.searchValue = '';
+                this.searchTimeout = null;
+            }, 500);
+
+            return matched;
+        },
+        changeFocusedOptionIndex(event, index) {
+            if (this.focusedOptionInfo.index !== index) {
+                this.focusedOptionInfo.index = index;
+                this.scrollInView();
+
+                if (this.selectOnFocus) {
+                    this.updateModel(event, this.getOptionValue(this.visibleOptions[index]));
+                }
+            }
+        },
+        scrollInView(index = -1) {
+            const id = index !== -1 ? `${this.id}_${index}` : this.focusedOptionId;
+            const element = DomHandler.findSingle(this.list, `li[id="${id}"]`);
+            if (element) {
+                element.scrollIntoView && element.scrollIntoView({ block: 'nearest', inline: 'start' });
+            }
+        },
+        autoUpdateModel() {
+            if (this.selectOnFocus && this.autoOptionFocus && !this.hasSelectedOption) {
+                this.focusedOptionInfo.index = this.findFirstFocusedOptionIndex();
+                const value = this.getOptionValue(this.visibleOptions[this.focusedOptionInfo.index]);
+                this.updateModel(null, value);
+            }
+        },
+        updateModel(event, value) {
+            this.$emit('update:modelValue', value);
+            this.$emit('change', { originalEvent: event, value });
+        },
+        createProcessedOptions(options, level = 0, parent = {}, parentKey = '') {
+            const processedOptions = [];
+
+            options && options.forEach((option, index) => {
+                const key = (parentKey !== '' ? parentKey + '_' : '') + index;
+                const newOption = {
+                    option,
+                    index,
+                    level,
+                    key,
+                    parent,
+                    parentKey
+                }
+
+                newOption['children'] = this.createProcessedOptions(this.getOptionGroupChildren(option, level), level + 1, newOption, key);
+                processedOptions.push(newOption);
             });
+
+            return processedOptions;
+        },
+        overlayRef(el) {
+            this.overlay = el;
         }
     },
     computed: {
         containerClass() {
-            return [
-                'p-cascadeselect p-component p-inputwrapper',
-                {
-                    'p-disabled': this.disabled,
-                    'p-focus': this.focused,
-                    'p-inputwrapper-filled': this.modelValue,
-                    'p-inputwrapper-focus': this.focused || this.overlayVisible
-                }
-            ];
+            return ['p-cascadeselect p-component p-inputwrapper', {
+                'p-disabled': this.disabled,
+                'p-focus': this.focused,
+                'p-inputwrapper-filled': this.modelValue,
+                'p-inputwrapper-focus': this.focused || this.overlayVisible,
+                'p-overlay-open': this.overlayVisible
+            }];
         },
         labelClass() {
-            return [
-                'p-cascadeselect-label',
-                {
-                    'p-placeholder': this.label === this.placeholder,
-                    'p-cascadeselect-label-empty': !this.$slots['value'] && (this.label === 'p-emptylabel' || this.label.length === 0)
-                }
-            ];
-        },
-        label() {
-            if (this.selectionPath)
-                return this.getOptionLabel(this.selectionPath[this.selectionPath.length - 1]);
-            else
-                return this.placeholder||'p-emptylabel';
+            return ['p-cascadeselect-label', {
+                'p-placeholder': this.label === this.placeholder,
+                'p-cascadeselect-label-empty': !this.$slots['value'] && (this.label === 'p-emptylabel' || this.label.length === 0)
+            }];
         },
         panelStyleClass() {
             return ['p-cascadeselect-panel p-component', this.panelClass, {
@@ -326,6 +702,55 @@ export default {
         },
         dropdownIconClass() {
             return ['p-cascadeselect-trigger-icon', this.loading ? this.loadingIcon : 'pi pi-chevron-down'];
+        },
+        hasSelectedOption() {
+            return ObjectUtils.isNotEmpty(this.modelValue);
+        },
+        label() {
+            const label = this.placeholder || 'p-emptylabel';
+
+            if (this.hasSelectedOption) {
+                const activeOptionPath = this.findOptionPathByValue(this.modelValue);
+                const processedOption = activeOptionPath.length ? activeOptionPath[activeOptionPath.length - 1] : null;
+
+                return processedOption ? this.getOptionLabel(processedOption.option) : label;
+            }
+
+            return label;
+        },
+        processedOptions() {
+            return this.createProcessedOptions(this.options || []);
+        },
+        visibleOptions() {
+            const processedOption = this.activeOptionPath.find(p => p.key === this.focusedOptionInfo.parentKey);
+            return processedOption ? processedOption.children : this.processedOptions;
+        },
+        equalityKey() {
+            return this.optionValue ? null : this.dataKey;
+        },
+        searchResultMessageText() {
+            return ObjectUtils.isNotEmpty(this.visibleOptions) ? this.searchMessageText.replaceAll('{0}', this.visibleOptions.length) : this.emptySearchMessageText;
+        },
+        searchMessageText() {
+            return this.searchMessage || this.$primevue.config.locale.searchMessage || '';
+        },
+        emptySearchMessageText() {
+            return this.emptySearchMessage || this.$primevue.config.locale.emptySearchMessage || '';
+        },
+        emptyMessageText() {
+            return this.emptyMessage || this.$primevue.config.locale.emptyMessage || '';
+        },
+        selectionMessageText() {
+            return this.selectionMessage || this.$primevue.config.locale.selectionMessage || '';
+        },
+        emptySelectionMessageText() {
+            return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage || '';
+        },
+        selectedMessageText() {
+            return this.hasSelectedOption ? this.selectionMessageText.replaceAll('{0}', '1') : this.emptySelectionMessageText;
+        },
+        focusedOptionId() {
+            return this.focusedOptionInfo.index !== -1 ? `${this.id}${ObjectUtils.isNotEmpty(this.focusedOptionInfo.parentKey) ? '_' + this.focusedOptionInfo.parentKey : ''}_${this.focusedOptionInfo.index}` : null;
         }
     },
     components: {