vscroll 1.5.2 → 1.5.3

package/dist/bundles/vscroll.umd.js

@@ -1,6 +1,6 @@
 /**
  * vscroll (https://github.com/dhilt/vscroll) UMD
- * Version: 1.5.2 (2022-09-12T12:01:28.792Z)
+ * Version: 1.5.3 (2022-09-14T09:13:40.390Z)
  * Author: Denis Hilt
  * License: MIT
  */
@@ -94,7 +94,7 @@
 
     /**
      * vscroll (https://github.com/dhilt/vscroll) FESM5
-     * Version: 1.5.2 (2022-09-12T12:01:24.857Z)
+     * Version: 1.5.3 (2022-09-14T09:13:35.350Z)
      * Author: Denis Hilt
      * License: MIT
      */
@@ -413,12 +413,14 @@
       {
         type: Type.Reactive,
         name: Name.firstVisible$,
-        value: new Reactive(EMPTY_ITEM, { emitOnSubscribe: true })
+        value: new Reactive(EMPTY_ITEM, { emitOnSubscribe: true }),
+        wanted: true
       },
       {
         type: Type.Reactive,
         name: Name.lastVisible$,
-        value: new Reactive(EMPTY_ITEM, { emitOnSubscribe: true })
+        value: new Reactive(EMPTY_ITEM, { emitOnSubscribe: true }),
+        wanted: true
       },
       {
         type: Type.Reactive,
@@ -435,8 +437,37 @@
 
     var core = {
       name: 'vscroll',
-      version: '1.5.2'
+      version: '1.5.3'
+    };
+
+    var getBox = function (id) {
+      var _a;
+      return (_a = wantedStorage.get(id || -1)) === null || _a === void 0 ? void 0 : _a.box;
+    };
+    var setBox = function (_a, id) {
+      var name = _a.name, wanted = _a.wanted;
+      var Wanted = wantedStorage.get(id || -1);
+      if (wanted && Wanted && !Wanted.box[name] && !Wanted.block) {
+        var a = exports.AdapterPropName.firstVisible, a$ = exports.AdapterPropName.firstVisible$;
+        var b = exports.AdapterPropName.lastVisible, b$ = exports.AdapterPropName.lastVisible$;
+        Wanted.box[a] = Wanted.box[a$] = [a, a$].some(function (n) { return n === name; }) || Wanted.box[a];
+        Wanted.box[b] = Wanted.box[b$] = [b, b$].some(function (n) { return n === name; }) || Wanted.box[b];
+        return true;
+      }
+      return false;
+    };
+    var setBlock = function (value, id) {
+      var Wanted = wantedStorage.get(id || -1);
+      if (Wanted) {
+        Wanted.block = value;
+      }
+    };
+    var wantedUtils = {
+      getBox: getBox,
+      setBox: setBox,
+      setBlock: setBlock
     };
+    var wantedStorage = new Map();
 
     var instanceCount$1 = 0;
     var AdapterContext = /** @class */ (function () {
@@ -446,6 +477,7 @@
         var id = ++instanceCount$1;
         var conf = { configurable: true };
         var reactivePropsStore = {};
+        wantedStorage.set(id, { box: {}, block: false });
         // set up permanent props
         Object.defineProperty(this, exports.AdapterPropName.id, __assign({ get: function () { return id; } }, conf));
         Object.defineProperty(this, exports.AdapterPropName.mock, __assign({ get: function () { return mock; } }, conf));
@@ -457,21 +489,24 @@
           var permanent = _a.permanent;
           return !permanent;
         })
-          .forEach(function (_a) {
-          var name = _a.name, value = _a.value, type = _a.type;
+          .forEach(function (prop) {
+          var value = prop.value;
           // reactive props might be reconfigured by the vscroll consumer
-          if (reactive && type === AdapterPropType.Reactive) {
-            var react = reactive[name];
+          if (reactive && prop.type === AdapterPropType.Reactive) {
+            var react = reactive[prop.name];
             if (react) {
               // here we have a configured reactive property that came from the outer config
               // this prop must be exposed via Adapter, but at the same time we need to
               // persist the original default value as it will be used by the Adapter internally
-              reactivePropsStore[name] = __assign(__assign({}, react), { default: value // persisting the default native Reactive prop
+              reactivePropsStore[prop.name] = __assign(__assign({}, react), { default: value // persisting the default native Reactive prop
                });
               value = react.source; // exposing the configured prop instead of the default one
             }
           }
-          Object.defineProperty(_this, name, __assign({ get: function () { return value; } }, conf));
+          Object.defineProperty(_this, prop.name, __assign({ get: function () {
+              wantedUtils.setBox(prop, id);
+              return value;
+            } }, conf));
         });
         if (reactive) { // save both configured and default reactive props in the store
           reactiveConfigStorage.set(id, reactivePropsStore);
@@ -494,6 +529,7 @@
       }
       DatasourceGeneric.prototype.dispose = function () {
         reactiveConfigStorage.delete(this.adapter.id);
+        wantedStorage.delete(this.adapter.id);
       };
       return DatasourceGeneric;
     }());
@@ -2666,7 +2702,7 @@
         var workflow = scroller.workflow, interrupter = scroller.state.cycle.interrupter;
         if (!error && !interrupter) {
           // set out params accessible via Adapter
-          End.calculateParams(scroller, workflow);
+          End.calculateParams(scroller);
         }
         // explicit interruption for we don't want to go through the inner loop finalizing
         if (isInterrupted(workflow)) {
@@ -2681,21 +2717,10 @@
           payload: __assign({}, (interrupter ? { process: interrupter } : {}))
         });
       };
-      End.calculateParams = function (scroller, workflow) {
-        var adapter = scroller.adapter, viewport = scroller.viewport, items = scroller.buffer.items;
-        if (adapter.wanted.firstVisible) {
-          var item = viewport.getEdgeVisibleItem(items, exports.Direction.backward).item;
-          if (!item || item.element !== adapter.firstVisible.element) {
-            adapter.firstVisible = item ? item.get() : EMPTY_ITEM;
-          }
-        }
-        // the workflow can be interrupter on firstVisible change
-        if (adapter.wanted.lastVisible && !isInterrupted(workflow)) {
-          var item = viewport.getEdgeVisibleItem(items, exports.Direction.forward).item;
-          if (!item || item.element !== adapter.lastVisible.element) {
-            adapter.lastVisible = item ? item.get() : EMPTY_ITEM;
-          }
-        }
+      End.calculateParams = function (scroller) {
+        var adapter = scroller.adapter, workflow = scroller.workflow;
+        adapter.setFirstOrLastVisible({ first: true, workflow: workflow });
+        adapter.setFirstOrLastVisible({ last: true, workflow: workflow });
       };
       End.shouldContinueRun = function (scroller, error) {
         var _a = scroller.state, cycle = _a.cycle, fetch = _a.fetch, render = _a.render;
@@ -3201,7 +3226,7 @@
           }
         }
       };
-      // logNow(...args: any[]) {
+      // logNow(...args: unknown[]) {
       //   const immediateLog = this.immediateLog;
       //   const debug = this.debug;
       //   (this as any).debug = true;
@@ -4802,14 +4827,19 @@
         this.source = {}; // for Reactive props
         this.box = {}; // for Scalars over Reactive props
         this.demand = {}; // for Scalars on demand
-        this.wanted = {};
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        this.setFirstOrLastVisible = function (_) { };
         this.getWorkflow = getWorkflow;
         this.logger = logger;
         this.relax$ = null;
         this.relaxRun = null;
         this.reloadCounter = 0;
-        // public context (if exists) should provide access Reactive props configuration by id
+        var contextId = (context === null || context === void 0 ? void 0 : context.id) || -1;
+        // public context (if exists) should provide access to Reactive props config by id
         var reactivePropsStore = context && reactiveConfigStorage.get(context.id) || {};
+        // the Adapter initialization should not trigger "wanted" props setting;
+        // after the initialization is completed, "wanted" functionality must be unblocked
+        wantedUtils.setBlock(true, contextId);
         // make array of the original values from public context if present
         var adapterProps = context
           ? ADAPTER_PROPS_STUB.map(function (prop) {
@@ -4848,9 +4878,7 @@
             get: function () { return value; }
           });
         });
-        // Reactive props
-        // 1) store original values in "source" container, to avoid extra .get() calls on scalar twins set
-        // 2) "wanted" container is bound with scalars; get() updates it
+        // Reactive props: store original values in "source" container, to avoid extra .get() calls on scalar twins set
         adapterProps
           .filter(function (prop) { return prop.type === AdapterPropType.Reactive; })
           .forEach(function (_a) {
@@ -4858,29 +4886,30 @@
           _this.source[name] = value;
           Object.defineProperty(_this, name, {
             configurable: true,
-            get: function () {
-              var scalarWanted = ADAPTER_PROPS_STUB.find(function (_a) {
-                var wanted = _a.wanted, reactive = _a.reactive;
-                return wanted && reactive === name;
-              });
-              if (scalarWanted && _this.externalContext) {
-                _this.wanted[scalarWanted.name] = true;
-              }
-              return _this.source[name];
-            }
+            get: function () { return _this.source[name]; }
           });
         });
+        // for "wanted" props that can be explicitly requested for the first time after the Adapter initialization,
+        // an implicit calculation of the initial value is required;
+        // so this method should be called when accessing the "wanted" props through one of the following getters
+        var processWanted = function (prop) {
+          if (wantedUtils.setBox(prop, contextId)) {
+            if ([exports.AdapterPropName.firstVisible, exports.AdapterPropName.firstVisible$].some(function (n) { return n === prop.name; })) {
+              _this.setFirstOrLastVisible({ first: true });
+            }
+            else if ([exports.AdapterPropName.lastVisible, exports.AdapterPropName.lastVisible$].some(function (n) { return n === prop.name; })) {
+              _this.setFirstOrLastVisible({ last: true });
+            }
+          }
+        };
         // Scalar props that have Reactive twins
-        // 1) scalars should use "box" container
-        // 2) "wanted" should be updated on get
-        // 3) reactive props (from "source") are triggered on set
+        // 1) reactive props (from "source") should be triggered on set
+        // 2) scalars should use "box" container on get
+        // 3) "wanted" scalars should also run wanted-related logic on get
         adapterProps
           .filter(function (prop) { return prop.type === AdapterPropType.Scalar && !!prop.reactive; })
-          .forEach(function (_a) {
-          var name = _a.name, value = _a.value, reactive = _a.reactive, wanted = _a.wanted;
-          if (wanted) {
-            _this.wanted[name] = false;
-          }
+          .forEach(function (prop) {
+          var name = prop.name, value = prop.value, reactive = prop.reactive;
           _this.box[name] = value;
           Object.defineProperty(_this, name, {
             configurable: true,
@@ -4896,9 +4925,7 @@
               }
             },
             get: function () {
-              if (wanted && _this.externalContext) {
-                _this.wanted[name] = true;
-              }
+              processWanted(prop);
               return _this.box[name];
             }
           });
@@ -4921,8 +4948,8 @@
         }
         // Adapter public context augmentation
         adapterProps
-          .forEach(function (_a) {
-          var name = _a.name, type = _a.type, defaultValue = _a.value, permanent = _a.permanent;
+          .forEach(function (prop) {
+          var name = prop.name, type = prop.type, defaultValue = prop.value, permanent = prop.permanent;
           var value = _this[name];
           if (type === AdapterPropType.Function) {
             value = value.bind(_this);
@@ -4936,14 +4963,20 @@
           else if (name === exports.AdapterPropName.augmented) {
             value = true;
           }
+          var nonPermanentScalar = !permanent && type === AdapterPropType.Scalar;
           Object.defineProperty(context, name, {
             configurable: true,
-            get: function () { return !permanent && type === AdapterPropType.Scalar
-              ? _this[name] // non-permanent Scalars should be taken in runtime
-              : value; } // Reactive props and methods (Functions/WorkflowRunners) can be defined once
+            get: function () {
+              processWanted(prop); // consider accessing "wanted" Reactive props
+              if (nonPermanentScalar) {
+                return _this[name]; // non-permanent Scalars should be taken in runtime
+              }
+              return value; // other props (Reactive/Functions/WorkflowRunners) can be defined once
+            }
           });
         });
         this.externalContext = context;
+        wantedUtils.setBlock(false, contextId);
       }
       Object.defineProperty(Adapter.prototype, "workflow", {
         get: function () {
@@ -4983,7 +5016,7 @@
             : defaultMethod.apply(_this, args);
         };
       };
-      Adapter.prototype.initialize = function (buffer, state, logger, adapterRun$) {
+      Adapter.prototype.initialize = function (buffer, state, viewport, logger, adapterRun$) {
         var _this = this;
         // buffer
         Object.defineProperty(this.demand, exports.AdapterPropName.itemsCount, {
@@ -5012,6 +5045,30 @@
         state.cycle.innerLoop.busy.on(function (busy) { return _this.loopPending = busy; });
         this.isLoading = state.cycle.busy.get();
         state.cycle.busy.on(function (busy) { return _this.isLoading = busy; });
+        //viewport
+        this.setFirstOrLastVisible = function (_a) {
+          var _b, _c, _d;
+          var first = _a.first, last = _a.last, workflow = _a.workflow;
+          if ((!first && !last) || ((_b = workflow === null || workflow === void 0 ? void 0 : workflow.call) === null || _b === void 0 ? void 0 : _b.interrupted)) {
+            return;
+          }
+          var token = first ? exports.AdapterPropName.firstVisible : exports.AdapterPropName.lastVisible;
+          if (!((_d = wantedUtils.getBox((_c = _this.externalContext) === null || _c === void 0 ? void 0 : _c.id)) === null || _d === void 0 ? void 0 : _d[token])) {
+            return;
+          }
+          if (buffer.items.some(function (_a) {
+            var element = _a.element;
+            return !element;
+          })) {
+            logger.log('skipping first/lastVisible set because not all buffered items are rendered at this moment');
+            return;
+          }
+          var direction = first ? exports.Direction.backward : exports.Direction.forward;
+          var item = viewport.getEdgeVisibleItem(buffer.items, direction).item;
+          if (!item || item.element !== _this[token].element) {
+            _this[token] = (item ? item.get() : EMPTY_ITEM);
+          }
+        };
         // logger
         this.logger = logger;
         // self-pending subscription; set up only on the very first init
@@ -5058,7 +5115,8 @@
       };
       Adapter.prototype.resetContext = function () {
         var _this = this;
-        var reactiveStore = reactiveConfigStorage.get(this.externalContext.id);
+        var _a;
+        var reactiveStore = reactiveConfigStorage.get((_a = this.externalContext) === null || _a === void 0 ? void 0 : _a.id);
         ADAPTER_PROPS_STUB
           .forEach(function (_a) {
           var type = _a.type, permanent = _a.permanent, name = _a.name, value = _a.value;
@@ -5277,7 +5335,7 @@
       Scroller.prototype.init = function (adapterRun$) {
         this.viewport.reset(this.buffer.startIndex);
         this.logger.stat('initialization');
-        this.adapter.initialize(this.buffer, this.state, this.logger, adapterRun$);
+        this.adapter.initialize(this.buffer, this.state, this.viewport, this.logger, adapterRun$);
       };
       Scroller.prototype.dispose = function (forever) {
         if (forever) { // Adapter is not re-instantiated on reset