vscroll 1.5.4 → 1.5.6

package/dist/bundles/vscroll.esm6.js

@@ -1,6 +1,6 @@
 /**
  * vscroll (https://github.com/dhilt/vscroll) FESM2015
- * Version: 1.5.4 (2023-05-08T20:10:13.982Z)
+ * Version: 1.5.6 (2023-11-22T18:32:00.656Z)
  * Author: Denis Hilt
  * License: MIT
  */
@@ -330,7 +330,7 @@ const reactiveConfigStorage = new Map();
 
 var core = {
   name: 'vscroll',
-  version: '1.5.4'
+  version: '1.5.6'
 };
 
 const getBox = (id) => {
@@ -1472,17 +1472,6 @@ class Reload extends BaseAdapterProcessFactory(AdapterProcess.reload) {
 }
 
 class Item {
-  constructor($index, data, routines) {
-    this.container = {
-      $index,
-      data
-    };
-    this.nodeId = String($index);
-    this.routines = routines;
-    this.invisible = true;
-    this.toRemove = false;
-    this.toInsert = false;
-  }
   get $index() {
     return this.container.$index;
   }
@@ -1501,6 +1490,17 @@ class Item {
   set element(value) {
     this.container.element = value;
   }
+  constructor($index, data, routines) {
+    this.container = {
+      $index,
+      data
+    };
+    this.nodeId = String($index);
+    this.routines = routines;
+    this.invisible = true;
+    this.toRemove = false;
+    this.toInsert = false;
+  }
   dispose() {
     delete this.container.element;
   }
@@ -2254,7 +2254,8 @@ class Fetch extends BaseProcessFactory(CommonProcess.fetch) {
         return getResult;
       }
       else if (typeof getResult.subscribe === 'function') {
-        const sub = getResult.subscribe(done, fail, () => {
+        let sub = void 0;
+        sub = getResult.subscribe(done, fail, () => {
           if (sub && typeof sub === 'object' && typeof sub.unsubscribe === 'function') {
             sub.unsubscribe();
           }
@@ -2329,8 +2330,9 @@ class PostFetch extends BaseProcessFactory(CommonProcess.postFetch) {
         // let's treat initial poor fetch as startIndex-bof
         fetchIndex = buffer.startIndex;
       }
-      else if (fetch.first.index < buffer.minIndex) { // normal bof
-        fetchIndex = buffer.minIndex - items.length;
+      else if (fetch.first.index < buffer.minIndex) {
+        // normal bof
+        fetchIndex = buffer.firstIndex - items.length;
       }
     }
     fetch.items = items.map((item, index) => new Item(fetchIndex + index, item, scroller.routines));
@@ -3971,14 +3973,14 @@ class Buffer {
 }
 
 class InnerLoopModel {
+  get first() {
+    return this.count === 0;
+  }
   constructor(total) {
     this.total = total;
     this.isInitial = false;
     this.busy = new Reactive(false);
   }
-  get first() {
-    return this.count === 0;
-  }
   done() {
     this.isInitial = false;
     this.count++;
@@ -3993,6 +3995,12 @@ class InnerLoopModel {
   }
 }
 class WorkflowCycleModel {
+  get loopId() {
+    return `${this.instanceIndex}-${this.count}-${this.innerLoop.total}`;
+  }
+  get loopIdNext() {
+    return `${this.instanceIndex}-${this.count}-${this.innerLoop.total + 1}`;
+  }
   constructor(instanceIndex, cycle) {
     const cycleCount = cycle ? cycle.count : 1;
     const loopCount = cycle ? cycle.innerLoop.count : 0;
@@ -4002,12 +4010,6 @@ class WorkflowCycleModel {
     this.busy = new Reactive(false);
     this.end(cycleCount);
   }
-  get loopId() {
-    return `${this.instanceIndex}-${this.count}-${this.innerLoop.total}`;
-  }
-  get loopIdNext() {
-    return `${this.instanceIndex}-${this.count}-${this.innerLoop.total + 1}`;
-  }
   start(isInitial, initiator) {
     this.isInitial = isInitial;
     this.initiator = initiator;
@@ -4153,13 +4155,13 @@ class FetchModel {
 }
 
 class ClipModel {
+  get force() {
+    return this.forceForward || this.forceBackward;
+  }
   constructor() {
     this.callCount = 0;
     this.reset();
   }
-  get force() {
-    return this.forceForward || this.forceBackward;
-  }
   reset(force) {
     this.doClip = false;
     if (!force) {
@@ -4170,12 +4172,12 @@ class ClipModel {
 }
 
 class RenderModel {
-  constructor() {
-    this.reset();
-  }
   get noSize() {
     return this.sizeBefore === this.sizeAfter;
   }
+  constructor() {
+    this.reset();
+  }
   reset() {
     this.sizeBefore = 0;
     this.sizeAfter = 0;
@@ -4216,6 +4218,9 @@ class ScrollModel {
 }
 
 class State {
+  get time() {
+    return Number(new Date()) - this.initTime;
+  }
   constructor(packageInfo, settings, state) {
     this.packageInfo = packageInfo;
     this.settings = settings;
@@ -4226,9 +4231,6 @@ class State {
     this.render = new RenderModel();
     this.scroll = new ScrollModel();
   }
-  get time() {
-    return Number(new Date()) - this.initTime;
-  }
   startWorkflowCycle(isInitial, initiator) {
     this.cycle.start(isInitial, initiator);
   }
@@ -4288,6 +4290,25 @@ const convertRemoveArgs = (options) => {
   return options;
 };
 class Adapter {
+  get workflow() {
+    return this.getWorkflow();
+  }
+  get reloadCount() {
+    return this.reloadCounter;
+  }
+  get reloadId() {
+    return this.id + '.' + this.reloadCounter;
+  }
+  getPromisifiedMethod(method, defaultMethod) {
+    return (...args) => this.relax$
+      ? new Promise(resolve => {
+        if (this.relax$) {
+          this.relax$.once(value => resolve(value));
+        }
+        method.apply(this, args);
+      })
+      : defaultMethod.apply(this, args);
+  }
   constructor(context, getWorkflow, logger) {
     this.source = {}; // for Reactive props
     this.box = {}; // for Scalars over Reactive props
@@ -4431,25 +4452,6 @@ class Adapter {
     this.externalContext = context;
     wantedUtils.setBlock(false, contextId);
   }
-  get workflow() {
-    return this.getWorkflow();
-  }
-  get reloadCount() {
-    return this.reloadCounter;
-  }
-  get reloadId() {
-    return this.id + '.' + this.reloadCounter;
-  }
-  getPromisifiedMethod(method, defaultMethod) {
-    return (...args) => this.relax$
-      ? new Promise(resolve => {
-        if (this.relax$) {
-          this.relax$.once(value => resolve(value));
-        }
-        method.apply(this, args);
-      })
-      : defaultMethod.apply(this, args);
-  }
   initialize({ buffer, state, viewport, logger, adapterRun$, getWorkflow }) {
     // buffer
     Object.defineProperty(this.demand, AdapterPropName.itemsCount, {
@@ -4777,6 +4779,7 @@ class Scroller {
     });
   }
   dispose(forever) {
+    this.logger.log(() => 'disposing scroller' + (forever ? ' (forever)' : ''));
     if (forever) { // Adapter is not re-instantiated on reset
       this.adapter.dispose();
     }
@@ -5000,6 +5003,7 @@ const runStateMachine = ({ input: { process, status, payload = {} }, methods: {
 class Workflow {
   constructor({ element, datasource, consumer, run, Routines }) {
     this.isInitialized = false;
+    this.disposed = false;
     this.initTimer = null;
     this.adapterRun$ = new Reactive();
     this.cyclesDone = 0;
@@ -5028,12 +5032,6 @@ class Workflow {
   }
   init() {
     this.scroller.init(this.adapterRun$);
-    this.isInitialized = true;
-    // run the Workflow
-    this.callWorkflow({
-      process: CommonProcess.init,
-      status: ProcessStatus.start
-    });
     // set up scroll event listener
     const { routines } = this.scroller;
     const onScrollHandler = event => this.callWorkflow({
@@ -5042,6 +5040,12 @@ class Workflow {
       payload: { event }
     });
     this.offScroll = routines.onScroll(onScrollHandler);
+    // run the Workflow
+    this.isInitialized = true;
+    this.callWorkflow({
+      process: CommonProcess.init,
+      status: ProcessStatus.start
+    });
   }
   changeItems(items) {
     this.propagateChanges(items);
@@ -5138,6 +5142,7 @@ class Workflow {
     this.finalize();
   }
   dispose() {
+    this.scroller.logger.log(() => 'disposing workflow');
     if (this.initTimer) {
       clearTimeout(this.initTimer);
     }
@@ -5147,6 +5152,7 @@ class Workflow {
     Object.getOwnPropertyNames(this).forEach(prop => {
       delete this[prop];
     });
+    this.disposed = true;
   }
   finalize() {
   }