From 2361042facb7017fd4631c0da388dcc1eb1c9fe3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 25 May 2024 11:38:27 +0200
Subject: [PATCH] fix it?

---
 src/components/common/VnSelect.vue | 61 ++++++++++++++----------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 9a9bdb365..b4f31799f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -92,18 +92,18 @@ const value = computed({
 });
 
 function setOptions(data, append = false) {
-    if (isLoading.value) {
-        data.unshift(...myOptions.value);
-    }
-    if (arrayData.store) {
-        //     arrayData.store.data = data;
-        arrayData.store.hasMoreData = data.length === +$props.limit;
-        append && myOptions.value.concat(data);
-        // myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-    } else {
-        myOptions.value = JSON.parse(JSON.stringify(data));
-        myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-    }
+    // if (isLoading.value) {
+    //     data.unshift(...myOptions.value);
+    // }
+    // if (arrayData.store) {
+    //     //     arrayData.store.data = data;
+    //     arrayData.store.hasMoreData = data.length === +$props.limit;
+    //     append && myOptions.value.concat(data);
+    //     // myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+    // } else {
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+    // }
 }
 const useURL = computed(() => $props.url?.length > 0);
 const arrayData = useURL.value
@@ -115,11 +115,22 @@ const arrayData = useURL.value
           limit: $props.limit,
       })
     : ref(null);
-onMounted(() => {
+onMounted(async () => {
     setOptions(options.value);
     if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
+    else {
+        const { data } = await arrayData.fetch({ append: true });
+        setOptions(data);
+    }
 });
 
+watch(modelValue, (newValue) => {
+    if (useURL.value) return;
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
+const isLoading = ref(false);
+
 function filter(val, options) {
     const search = val.toString().toLowerCase();
 
@@ -156,9 +167,7 @@ async function filterHandler(val, update) {
     if (!$props.defaultFilter) return update();
     let newOptions;
     if ($props.url && !isLoading.value) {
-        isLoading.value = true;
-        newOptions = await fetchFilter(val);
-        isLoading.value = false;
+        return;
     } else newOptions = filter(val, myOptionsOriginal.value);
     update(
         () => {
@@ -173,16 +182,6 @@ async function filterHandler(val, update) {
     );
 }
 
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-watch(modelValue, (newValue) => {
-    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
-        fetchFilter(newValue);
-});
-const isLoading = ref(false);
-
 async function onScroll(scrollEv) {
     const { to, direction, from, index } = scrollEv;
     const lastIndex = myOptions.value.length - 1;
@@ -194,13 +193,9 @@ async function onScroll(scrollEv) {
         isLoading.value = true;
         !$props.url && (await $props.fetchRef.paginate());
         $props.url && (await arrayData.loadMore());
-        setOptions(
-            arrayData.store.data.slice(
-                myOptions.value.length,
-                myOptions.value.length + 5
-            ),
-            true
-        );
+        setOptions(arrayData.store.data);
+        vnSelectRef.value.scrollTo(lastIndex);
+
         isLoading.value = false;
     }
 }