From cf86d54a7f09972f62f5747f034e6815cb202c11 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Tue, 16 Apr 2024 10:57:23 +0530
Subject: [PATCH] Fixed: infinite scroll issue when used with searchbar(#289)

---
 src/views/AssignPickerModal.vue | 1 +
 src/views/Catalog.vue           | 1 +
 src/views/Orders.vue            | 5 ++++-
 src/views/ShipToStoreOrders.vue | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/AssignPickerModal.vue b/src/views/AssignPickerModal.vue
index 1ab49382b..9eaa5fc2e 100644
--- a/src/views/AssignPickerModal.vue
+++ b/src/views/AssignPickerModal.vue
@@ -29,6 +29,7 @@
       @ionInfinite="loadMorePickers($event)"
       threshold="100px"
       :disabled="!isScrollable"
+      :key="queryString"
     >
       <ion-infinite-scroll-content
         loading-spinner="crescent"
diff --git a/src/views/Catalog.vue b/src/views/Catalog.vue
index d4dbc3e10..9968a47af 100644
--- a/src/views/Catalog.vue
+++ b/src/views/Catalog.vue
@@ -25,6 +25,7 @@
         @ionInfinite="loadMoreProducts($event)"
         threshold="100px"
         :disabled="!isScrollable"
+        :key="queryString"
       >
         <ion-infinite-scroll-content
           loading-spinner="crescent"
diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index 0fe00842a..ca6d32d3c 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -157,7 +157,9 @@
       <ion-refresher slot="fixed" @ionRefresh="refreshOrders($event)">
         <ion-refresher-content pullingIcon="crescent" refreshingSpinner="crescent" />
       </ion-refresher>
-      <ion-infinite-scroll @ionInfinite="loadMoreProducts($event)" threshold="100px" :disabled="segmentSelected === 'open' ? !isOpenOrdersScrollable : segmentSelected === 'packed' ? !isPackedOrdersScrollable : !isCompletedOrdersScrollable">
+      <ion-infinite-scroll @ionInfinite="loadMoreProducts($event)" threshold="100px" 
+        :disabled="segmentSelected === 'open' ? !isOpenOrdersScrollable : segmentSelected === 'packed' ? !isPackedOrdersScrollable : !isCompletedOrdersScrollable"
+        :key="queryString">
         <ion-infinite-scroll-content loading-spinner="crescent" :loading-text="translate('Loading')" />
       </ion-infinite-scroll>
     </ion-content>
@@ -404,6 +406,7 @@ export default defineComponent({
       }
     },
     async searchOrders() {
+      console.log('serach', this.queryString);
       if(this.segmentSelected === 'open') {
         this.getPickupOrders()
       } else if(this.segmentSelected === 'packed') {
diff --git a/src/views/ShipToStoreOrders.vue b/src/views/ShipToStoreOrders.vue
index 21d9229ff..b8e8a79c5 100644
--- a/src/views/ShipToStoreOrders.vue
+++ b/src/views/ShipToStoreOrders.vue
@@ -90,7 +90,9 @@
       <ion-refresher slot="fixed" @ionRefresh="refreshOrders($event)">
         <ion-refresher-content pullingIcon="crescent" refreshingSpinner="crescent" />
       </ion-refresher>
-      <ion-infinite-scroll @ionInfinite="loadMoreOrders($event)" threshold="100px" :disabled="segmentSelected === 'incoming' ? !isIncomingOrdersScrollable : segmentSelected === 'readyForPickup' ? !isReadyForPickupOrdersScrollable : !isCompletedOrdersScrollable">
+      <ion-infinite-scroll @ionInfinite="loadMoreOrders($event)" threshold="100px" 
+        :disabled="segmentSelected === 'incoming' ? !isIncomingOrdersScrollable : segmentSelected === 'readyForPickup' ? !isReadyForPickupOrdersScrollable : !isCompletedOrdersScrollable"
+        :key="queryString">
         <ion-infinite-scroll-content loading-spinner="crescent" :loading-text="translate('Loading')" />
       </ion-infinite-scroll>
     </ion-content>