From 4b166dc23078964931c2c9c486f1d0bd5d1a32f8 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 15 Jan 2025 12:11:16 +0530
Subject: [PATCH 1/3] Improved: performance while scrolling in the count (#608)

---
 src/views/CountDetail.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index 0d2cf458..87f2537d 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -63,7 +63,7 @@
         <!--Product details-->
         <main :class="itemsList?.length ? 'product-detail' : ''">
           <template v-if="itemsList?.length">
-            <div class="product" @scroll="onScroll">
+            <div class="product" ref="scrollingContainerRef">
               <div class="image ion-padding-top" v-for="item in itemsList" :key="item.importItemSeqId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="`${item.productId}-${item.importItemSeqId}`">
                 <Image :src="getProduct(item.productId)?.mainImageUrl" />
               </div>
@@ -294,6 +294,7 @@ let previousItem = {};
 let hasUnsavedChanges = ref(false);
 const barcodeInput = ref();
 let isScanningInProgress = ref(false);
+const scrollingContainerRef = ref();
 
 onIonViewDidEnter(async() => {  
   emitter.emit("presentLoader");
@@ -303,6 +304,7 @@ onIonViewDidEnter(async() => {
   previousItem = itemsList.value[0]
   await store.dispatch("product/currentProduct", itemsList.value[0])
   barcodeInput.value?.$el?.setFocus();
+  initializeObserver()
   emitter.emit("dismissLoader")
 })  
 
@@ -440,10 +442,8 @@ function updateFilteredItems() {
   }
 }
 
-// This function observes the scroll event on the main element, creates an IntersectionObserver to track when products come into view, 
-// and updates the current product state and navigation when a product intersects with the main element.
-const onScroll = (event) => {
-  const main = event.target;
+function initializeObserver() {
+  const main = scrollingContainerRef.value;
   const products = Array.from(main.querySelectorAll('.image'));
 
   const observer = new IntersectionObserver((entries) => {
@@ -472,7 +472,7 @@ const onScroll = (event) => {
   products.forEach((product) => {
     observer.observe(product);
   });
-};
+}
 
 async function changeProduct(direction) {
   if (isScrolling.value) return;

From 72fd7b4f1d4bb14988822246c1416beb97cf3f8b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 15 Jan 2025 13:01:07 +0530
Subject: [PATCH 2/3] Improved: performance while scrolling in hard count
 (#608)

---
 src/views/HardCountDetail.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/HardCountDetail.vue b/src/views/HardCountDetail.vue
index 867bf0ab..0a4e240f 100644
--- a/src/views/HardCountDetail.vue
+++ b/src/views/HardCountDetail.vue
@@ -41,7 +41,7 @@
         <!--Product details-->
         <main :class="itemsList?.length ? 'product-detail' : ''">
           <template v-if="itemsList?.length && Object.keys(currentProduct)?.length">
-            <div class="product" @scroll="onScroll">
+            <div class="product" @scroll="onScroll" ref="scrollingContainerRef">
               <div class="image ion-padding-top" v-for="item in itemsList" :key="item.importItemSeqId || item.scannedId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="isItemAlreadyAdded(item) ? `${item.productId}-${item.importItemSeqId}` :  item.scannedId" :data-isMatching="item.isMatching" :data-scanned-id="item.scannedId">
                 <Image :src="getProduct(item.productId)?.mainImageUrl" />
               </div>
@@ -250,6 +250,7 @@ const inputCount = ref("") as any;
 const selectedCountUpdateType = ref("add");
 const isScrolling = ref(false);
 let isScanningInProgress = ref(false);
+const scrollingContainerRef = ref();
 
 
 onIonViewDidEnter(async() => {  
@@ -260,6 +261,7 @@ onIonViewDidEnter(async() => {
   barcodeInputRef.value?.$el?.setFocus();
   selectedCountUpdateType.value = defaultRecountUpdateBehaviour.value
   window.addEventListener('beforeunload', handleBeforeUnload);
+  initializeObserver()
   emitter.emit("dismissLoader")
 })
 
@@ -425,6 +427,7 @@ async function addProductToItemsList() {
   const items = JSON.parse(JSON.stringify(cycleCountItems.value.itemList))
   items.push(newItem);
   await store.dispatch("count/updateCycleCountItems", items);
+  initializeObserver()
   findProductFromIdentifier(queryString.value);
   return newItem;
 }
@@ -545,7 +548,11 @@ async function readyForReview() {
 // This function observes the scroll event on the main element, creates an IntersectionObserver to track when products come into view, 
 // and updates the current product state and navigation when a product intersects with the main element.
 const onScroll = (event: any) => {
-  const main = event.target;
+  selectedCountUpdateType.value = defaultRecountUpdateBehaviour.value
+};
+
+function initializeObserver() {
+  const main = scrollingContainerRef.value;
   const products = Array.from(main.querySelectorAll('.image'));
   const observer = new IntersectionObserver((entries) => {  
     entries.forEach((entry: any) => {
@@ -561,8 +568,8 @@ const onScroll = (event: any) => {
           if(inputCount.value) saveCount(previousItem, true);
         }
 
-        previousItem = currentProduct.value  // Update the previousItem variable with the current item
         if(product) {
+          previousItem = product  // Update the previousItem variable with the current item
           store.dispatch("product/currentProduct", product);
         }
       }
@@ -573,9 +580,8 @@ const onScroll = (event: any) => {
   });
   products.forEach((product: any) => {
     observer.observe(product);
-  });
-  selectedCountUpdateType.value = defaultRecountUpdateBehaviour.value
-};
+  }); 
+}
 
 async function saveCount(currentProduct: any, isScrollEvent = false) {
   if (!inputCount.value && inputCount.value !== 0) {

From fa7e3d0ab20a90334f1fe82b264c869af80d85ba Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 15 Jan 2025 14:22:12 +0530
Subject: [PATCH 3/3] Improved: removed unused event argument in onScroll
 method (#608)

---
 src/views/HardCountDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/HardCountDetail.vue b/src/views/HardCountDetail.vue
index 0a4e240f..6152ef43 100644
--- a/src/views/HardCountDetail.vue
+++ b/src/views/HardCountDetail.vue
@@ -547,7 +547,7 @@ async function readyForReview() {
 
 // This function observes the scroll event on the main element, creates an IntersectionObserver to track when products come into view, 
 // and updates the current product state and navigation when a product intersects with the main element.
-const onScroll = (event: any) => {
+const onScroll = () => {
   selectedCountUpdateType.value = defaultRecountUpdateBehaviour.value
 };