Merge pull request #52 from dhilt/issue-51-Fast-initialization-fixes

Fast initialization fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscroll",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Virtual scroll engine",
   "main": "dist/bundles/vscroll.umd.js",
   "module": "dist/bundles/vscroll.esm5.js",

src/processes/fetch.ts

@@ -96,7 +96,8 @@ export default class Fetch extends BaseProcessFactory(CommonProcess.fetch) {
       if (typeof (getResult as PromiseLike<unknown>).then === 'function') {
         return getResult as Promise<unknown>;
       } else if (typeof (getResult as ObservableLike).subscribe === 'function') {
-        const sub = (getResult as ObservableLike).subscribe(done, fail, () => {
+        let sub: undefined | ReturnType<ObservableLike['subscribe']> = void 0;
+        sub = (getResult as ObservableLike).subscribe(done, fail, () => {
           if (sub && typeof sub === 'object' && typeof sub.unsubscribe === 'function') {
             sub.unsubscribe();
           }

src/scroller.ts

@@ -89,6 +89,7 @@ export class Scroller<Data = unknown> {
   }
 
   dispose(forever?: boolean): void {
+    this.logger.log(() => 'disposing scroller' + (forever ? ' (forever)' : ''));
     if (forever) { // Adapter is not re-instantiated on reset
       this.adapter.dispose();
     }

src/version.ts

@@ -1,4 +1,4 @@
 export default {
   name: 'vscroll',
-  version: '1.5.4'
+  version: '1.5.5'
 };

src/workflow.ts

@@ -18,6 +18,7 @@ import {
 export class Workflow<ItemData = unknown> {
 
   isInitialized: boolean;
+  disposed: boolean;
   initTimer: ReturnType<typeof setTimeout> | null;
   adapterRun$: Reactive<ProcessSubject>;
   cyclesDone: number;
@@ -32,6 +33,7 @@ export class Workflow<ItemData = unknown> {
 
   constructor({ element, datasource, consumer, run, Routines }: WorkflowParams<ItemData>) {
     this.isInitialized = false;
+    this.disposed = false;
     this.initTimer = null;
     this.adapterRun$ = new Reactive();
     this.cyclesDone = 0;
@@ -62,13 +64,6 @@ export class Workflow<ItemData = unknown> {
 
   init(): void {
     this.scroller.init(this.adapterRun$);
-    this.isInitialized = true;
-
-    // run the Workflow
-    this.callWorkflow({
-      process: CommonProcess.init,
-      status: Status.start
-    });
 
     // set up scroll event listener
     const { routines } = this.scroller;
@@ -79,6 +74,13 @@ export class Workflow<ItemData = unknown> {
         payload: { event }
       });
     this.offScroll = routines.onScroll(onScrollHandler);
+
+    // run the Workflow
+    this.isInitialized = true;
+    this.callWorkflow({
+      process: CommonProcess.init,
+      status: Status.start
+    });
   }
 
   changeItems(items: Item<ItemData>[]): void {
@@ -185,6 +187,7 @@ export class Workflow<ItemData = unknown> {
   }
 
   dispose(): void {
+    this.scroller.logger.log(() => 'disposing workflow');
     if (this.initTimer) {
       clearTimeout(this.initTimer);
     }
@@ -194,6 +197,7 @@ export class Workflow<ItemData = unknown> {
     Object.getOwnPropertyNames(this).forEach(prop => {
       delete (this as Record<string, unknown>)[prop];
     });
+    this.disposed = true;
   }
 
   finalize(): void {