From 86458bc1c59af1f70928fee876e9093bd8dde61f Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 16 Aug 2021 14:21:36 +0300
Subject: [PATCH] Refactor #1451

---
 src/components/dropdown/Dropdown.vue               | 9 +++------
 src/components/listbox/Listbox.vue                 | 9 +++------
 src/components/virtualscroller/VirtualScroller.vue | 2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/components/dropdown/Dropdown.vue b/src/components/dropdown/Dropdown.vue
index 6d1930cb9..70902eb2d 100755
--- a/src/components/dropdown/Dropdown.vue
+++ b/src/components/dropdown/Dropdown.vue
@@ -28,13 +28,13 @@
                             <template v-slot:content="{ styleClass, contentRef, items, getItemOptions }">
                                 <ul :ref="contentRef" :class="['p-dropdown-items', styleClass]" role="listbox">
                                     <template v-if="!optionGroupLabel">
-                                        <li v-for="(option, i) of getVisibleOptions(items)" :class="['p-dropdown-item', {'p-highlight': isSelected(option), 'p-disabled': isOptionDisabled(option)}]" v-ripple
+                                        <li v-for="(option, i) of items" :class="['p-dropdown-item', {'p-highlight': isSelected(option), 'p-disabled': isOptionDisabled(option)}]" v-ripple
                                             :key="getOptionRenderKey(option)" @click="onOptionSelect($event, option)" role="option" :aria-label="getOptionLabel(option)" :aria-selected="isSelected(option)">
                                             <slot name="option" :option="option" :index="getOptionIndex(i, getItemOptions)">{{getOptionLabel(option)}}</slot>
                                         </li>
                                     </template>
                                     <template v-else>
-                                        <template v-for="(optionGroup, i) of getVisibleOptions(items)" :key="getOptionGroupRenderKey(optionGroup)">
+                                        <template v-for="(optionGroup, i) of items" :key="getOptionGroupRenderKey(optionGroup)">
                                             <li  class="p-dropdown-item-group">
                                                 <slot name="optiongroup" :option="optionGroup" :index="getOptionIndex(i, getItemOptions)">{{getOptionGroupLabel(optionGroup)}}</slot>
                                             </li>
@@ -44,7 +44,7 @@
                                             </li>
                                         </template>
                                     </template>
-                                    <li v-if="filterValue && (!getVisibleOptions(items) || (getVisibleOptions(items) && getVisibleOptions(items).length === 0))" class="p-dropdown-empty-message">
+                                    <li v-if="filterValue && (!items || (items && items.length === 0))" class="p-dropdown-empty-message">
                                         <slot name="emptyfilter">{{emptyFilterMessageText}}</slot>
                                     </li>
                                     <li v-else-if="(!options || (options && options.length === 0))" class="p-dropdown-empty-message">
@@ -165,9 +165,6 @@ export default {
         }
     },
     methods: {
-        getVisibleOptions(items) {
-            return items || this.visibleOptions;
-        },
         getOptionIndex(index, fn) {
             return this.virtualScrollerDisabled ? index : (fn && fn(index)['index']);
         },
diff --git a/src/components/listbox/Listbox.vue b/src/components/listbox/Listbox.vue
index 35512fba3..3bed4cf46 100755
--- a/src/components/listbox/Listbox.vue
+++ b/src/components/listbox/Listbox.vue
@@ -12,13 +12,13 @@
                 <template v-slot:content="{ styleClass, contentRef, items, getItemOptions }">
                     <ul :ref="contentRef" :class="['p-listbox-list', styleClass]" role="listbox" aria-multiselectable="multiple">
                         <template v-if="!optionGroupLabel">
-                            <li v-for="(option, i) of getVisibleOptions(items)" :tabindex="isOptionDisabled(option) ? null : '0'" :class="['p-listbox-item', {'p-highlight': isSelected(option), 'p-disabled': isOptionDisabled(option)}]" v-ripple
+                            <li v-for="(option, i) of items" :tabindex="isOptionDisabled(option) ? null : '0'" :class="['p-listbox-item', {'p-highlight': isSelected(option), 'p-disabled': isOptionDisabled(option)}]" v-ripple
                                 :key="getOptionRenderKey(option)" @click="onOptionSelect($event, option)" @touchend="onOptionTouchEnd()" @keydown="onOptionKeyDown($event, option)" role="option" :aria-label="getOptionLabel(option)" :aria-selected="isSelected(option)" >
                                 <slot name="option" :option="option" :index="getOptionIndex(i, getItemOptions)">{{getOptionLabel(option)}} </slot>
                             </li>
                         </template>
                         <template v-else>
-                            <template v-for="(optionGroup, i) of getVisibleOptions(items)" :key="getOptionGroupRenderKey(optionGroup)">
+                            <template v-for="(optionGroup, i) of items" :key="getOptionGroupRenderKey(optionGroup)">
                                 <li  class="p-listbox-item-group">
                                     <slot name="optiongroup" :option="optionGroup" :index="getOptionIndex(i, getItemOptions)">{{getOptionGroupLabel(optionGroup)}}</slot>
                                 </li>
@@ -28,7 +28,7 @@
                                 </li>
                             </template>
                         </template>
-                        <li v-if="filterValue && (!getVisibleOptions(items) || (getVisibleOptions(items) && getVisibleOptions(items).length === 0))" class="p-listbox-empty-message">
+                        <li v-if="filterValue && (!items || (items && items.length === 0))" class="p-listbox-empty-message">
                             <slot name="emptyfilter">{{emptyFilterMessageText}}</slot>
                         </li>
                         <li v-else-if="(!options || (options && options.length === 0))" class="p-listbox-empty-message">
@@ -100,9 +100,6 @@ export default {
         };
     },
     methods: {
-        getVisibleOptions(items) {
-            return items || this.visibleOptions;
-        },
         getOptionIndex(index, fn) {
             return this.virtualScrollerDisabled ? index : (fn && fn(index)['index']);
         },
diff --git a/src/components/virtualscroller/VirtualScroller.vue b/src/components/virtualscroller/VirtualScroller.vue
index 490c748ef..1c32302ca 100644
--- a/src/components/virtualscroller/VirtualScroller.vue
+++ b/src/components/virtualscroller/VirtualScroller.vue
@@ -20,7 +20,7 @@
     </template>
     <template v-else>
         <slot></slot>
-        <slot name="content"></slot>
+        <slot name="content" :items="items"></slot>
     </template>
 </template>