@everymatrix/casino-games-category-section 1.38.0 → 1.39.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/casino-games-category-section",
-  "version": "1.38.0",
+  "version": "1.39.1",
   "main": "dist/casino-games-category-section.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7070080d10ab3c85ed4a5d2eeb2442cc9ff8fb2d"
+  "gitHead": "cc6e3a021c852cb2734662bef9ef45190de4bfa9"
 }

package/src/CasinoGamesCategorySection.svelte

@@ -91,6 +91,8 @@
   let favoriteGames:Array<Object>;
   let listOfGamesIDs:Array<string> = [];
 
+  let abortController = new AbortController();
+
   let favoriteGamesData:any = {
     items: [],
     count: 0,
@@ -195,6 +197,13 @@
 
   // @TODO categoryId type
   const getData = (categoryid:any, offset:number, limit:number) => {
+    if (abortController) {
+        abortController.abort();
+    }
+
+    abortController = new AbortController();
+    const signal = abortController.signal;
+
     isLoading = true;
     let categoryidparsed = '';
     let url:any = '';
@@ -258,27 +267,31 @@
         }
       }
       
-      fetch(url)
+      fetch(url, { signal })
         .then((res:any) => res.json())
         .then((categoryData:any) => {
-          isLoading = false;
-          if((categoryid.match(/\$/g) || []).length > 1) {
-            categoryData = categoryData.items.filter(subcategory => {
-              if(subcategory.id == categoryid) return subcategory;
-            })[0];
-          }
-
-          dataloaded = true;
-          hasErrors = false;
-          maxTotal = categoryData.games.total;
-
-          resolve(categoryData);
-        }, (err:any) => {
-          hasErrors = true;
+          if (!signal.aborted) {
+            isLoading = false;
+            if((categoryid.match(/\$/g) || []).length > 1) {
+              categoryData = categoryData.items.filter(subcategory => {
+                if(subcategory.id == categoryid) return subcategory;
+              })[0];
+            }
 
-          console.error(err);
+            dataloaded = true;
+            hasErrors = false;
+            maxTotal = categoryData.games.total;
 
-          reject(err);
+            isLazyLoading = true;
+            resolve(categoryData);
+          }
+        })
+        .catch((err) => {
+            if (err.name !== 'AbortError') {
+                hasErrors = true;
+                console.error(err);
+                reject(err);
+            }
         });
     });
   }
@@ -432,6 +445,7 @@
         lobbyView = false;
         searchItem = false;
         validObservers = true;
+        isLazyLoading = false;
         categoryid = e.data.itemId;
         if (categoryid !== 'MOSTPLAYED') {
           showLoadCategory = false;