issue-276 get rid of Datasource.reset call on destroy (vscroll v1.2.0)

dhilt · Jul 14, 2021 · 3698d77 · 3698d77
1 parent a0a3212
commit 3698d77
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/package-dist.json b/package-dist.json
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "tslib": "^1.9.0",
-    "vscroll": "^1.2.0-beta"
+    "vscroll": "^1.2.0"
   },
   "keywords": [
     "angular",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "ngx-bootstrap": "^5.6.1",
     "rxjs": "~6.6.1",
     "tslib": "^1.13.0",
-    "vscroll": "^1.2.0-beta",
+    "vscroll": "^1.2.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {

diff --git a/src/ui-scroll.component.ts b/src/ui-scroll.component.ts
@@ -63,9 +63,5 @@ export class UiScrollComponent<Data = unknown> implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.workflow.dispose();
-    const { reset } = (this.datasource as unknown as { reset?: () => void });
-    if (typeof reset === 'function') {
-      reset.call(this.datasource);
-    }
   }
 }
diff --git a/tests/adapter.reload.spec.ts b/tests/adapter.reload.spec.ts
@@ -291,10 +291,11 @@ const shouldReloadOnFirstVisibleChange: ItFuncConfig<ICustom> = config => misc =
       lastCycle = misc.workflow.cyclesDone + 1;
     }
   });
-  misc.adapter.isLoading$.pipe(filter(v => !v)).subscribe(() => {
+  const sub2 = misc.adapter.isLoading$.pipe(filter(v => !v)).subscribe(() => {
     if (!stopScroll) {
       misc.scrollMin();
     } else if (misc.workflow.cyclesDone === lastCycle) {
+      sub2.unsubscribe();
       checkExpectation(config, misc);
       done();
     }
@@ -303,8 +304,6 @@ const shouldReloadOnFirstVisibleChange: ItFuncConfig<ICustom> = config => misc =
 
 describe('Adapter Reload Spec', () => {
 
-  // configListDestructiveFilter(configList, 0);
-
   describe('simple reload', () =>
     configList.forEach(config =>
       makeTest({