From ae2737673db7e18d1f56bf02747236787feaa022 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 19 Apr 2024 14:43:38 +0200
Subject: [PATCH] fix: hasMoreData

---
 src/components/ui/VnPaginate.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 489861ef4..86918e545 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, watch, computed } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -77,7 +77,6 @@ const arrayData = useArrayData(props.dataKey, {
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
 });
-const hasMoreData = computed(() => arrayData.hasMoreData);
 const store = arrayData.store;
 
 onMounted(() => {
@@ -97,7 +96,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!hasMoreData.value) {
+    if (!arrayData.hasMoreData.value) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -110,8 +109,8 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-    if (!hasMoreData.value) {
-        if (store.userParamsChanged) hasMoreData.value = true;
+    if (!arrayData.hasMoreData.value) {
+        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
         store.userParamsChanged = false;
         endPagination();
         return;
@@ -142,7 +141,7 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !hasMoreData.value;
+    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
     done(isDone);
 }
 
@@ -187,7 +186,7 @@ defineExpose({ fetch, addFilter });
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !hasMoreData.value"
+        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
         class="full-width"
         v-bind="$attrs"
     >
@@ -197,7 +196,7 @@ defineExpose({ fetch, addFilter });
         </div>
     </QInfiniteScroll>
     <div
-        v-if="!isLoading && hasMoreData.value"
+        v-if="!isLoading && arrayData.hasMoreData.value"
         class="w-full flex justify-center q-mt-md"
     >
         <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />