Skip to content

Commit

Permalink
Fixed: infinite scroll issue when used with searchbar(hotwax#289)
Browse files Browse the repository at this point in the history
  • Loading branch information
R-Sourabh committed Apr 16, 2024
1 parent 0fba5d7 commit cf86d54
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/views/AssignPickerModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
@ionInfinite="loadMorePickers($event)"
threshold="100px"
:disabled="!isScrollable"
:key="queryString"
>
<ion-infinite-scroll-content
loading-spinner="crescent"
Expand Down
1 change: 1 addition & 0 deletions src/views/Catalog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
@ionInfinite="loadMoreProducts($event)"
threshold="100px"
:disabled="!isScrollable"
:key="queryString"
>
<ion-infinite-scroll-content
loading-spinner="crescent"
Expand Down
5 changes: 4 additions & 1 deletion src/views/Orders.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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') {
Expand Down
4 changes: 3 additions & 1 deletion src/views/ShipToStoreOrders.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit cf86d54

Please sign in to comment.