@twab/visualization 1.5.2 → 1.5.3

package/dist/visualization.js

@@ -1205,6 +1205,7 @@ FramesManager.prototype.getSmallBlock = async function (
 
       response = response.data;
       const images = response.frames;
+      images[0].blockStart = true;
       this.requests[`block_${ENUM.Direction.Next}_${response.end}`] = true;
 
       this.getBlock(time, this.channel, 1, ENUM.Direction.Self, true, true);
@@ -1286,6 +1287,7 @@ FramesManager.prototype.getBlock = async function (
         // response.data.frames = this.fillEmptyBlock(time, direction)
       }
 
+      response.data.frames[0].blockStart = true;
       this.orderFramesBlock(response.data.frames);
       this.currentPosition = this.findFrameIndexByTime(this.currentTime);
 
@@ -1354,12 +1356,11 @@ FramesManager.prototype.orderFramesBlock = function (images) {
     image.time += this.shiftFrames;
   }
   if (this.buffer.length > 0) {
-    const bufferFistTime = this.buffer[0].time;
-    const bufferLastTime = this.buffer[this.buffer.length - 1].time;
-    const beforeImages = images.filter((image) => image.time < bufferFistTime);
-    const afterImages = images.filter((image) => image.time > bufferLastTime);
-
-    this.buffer = [...beforeImages, ...this.buffer, ...afterImages];
+    this.buffer = [...this.buffer, ...images]
+      .filter(
+        (f, i, array) => array.findIndex((ff) => ff.time === f.time) === i
+      )
+      .sort((fa, fb) => fa.time - fb.time);
   } else {
     this.buffer = images;
   }
@@ -1430,11 +1431,29 @@ FramesManager.prototype.getBufferSlice = function (start, end) {
 
 FramesManager.prototype.next = function () {
   const newPosition = this.currentPosition + this.currentStep * this.size;
-  this.currentPosition =
-    newPosition < this.buffer.length ? newPosition : this.currentPosition;
-  this.currentTime = this.buffer[this.currentPosition]?.time || this.currentTime;
 
-  this.checkMinBlockSize(true);
+  const blockStartTime = this.buffer
+    .slice(0, this.currentPosition)
+    .reverse()
+    .find((f) => f.blockStart)?.time;
+
+  if (
+    (this.buffer[this.currentPosition]?.time + this.currentStep * this.size ===
+      this.buffer[newPosition]?.time &&
+      this.buffer[newPosition + this.size]?.time -
+        this.buffer[newPosition]?.time ===
+        this.currentStep * this.size) ||
+    !this.requests[`block__${blockStartTime}`]
+  ) {
+    this.currentPosition =
+      newPosition < this.buffer.length ? newPosition : this.currentPosition;
+    this.currentTime =
+      this.buffer[this.currentPosition]?.time || this.currentTime;
+
+    this.checkMinBlockSize(true);
+    return true
+  }
+  return false
 };
 
 FramesManager.prototype.previous = function () {
@@ -1513,6 +1532,7 @@ function FramesInterface(
   this.startAudienceTime = startAudienceTime;
   this.useCache = useCache;
   this.shiftFrames = shiftFrames;
+  this.forceCurrent = false;
 }
 
 FramesInterface.prototype.init = async function () {
@@ -1557,16 +1577,27 @@ FramesInterface.prototype.loadFrames = async function () {
 
 FramesInterface.prototype.loadNextFrames = async function () {
   return new Promise((resolve) => {
-    this.framesManager.next();
-
-    this.constructImagesComponent(
-      this.framesManager.getNextImages() || []
-    ).then((next) => {
-      this.frames.prev = this.frames.current;
-      this.frames.current = this.frames.next;
-      this.frames.next = next;
+    if (this.framesManager.next()) {
+      Promise.all([
+        this.constructImagesComponent(this.framesManager.getNextImages() || []),
+        ...(this.forceCurrent
+          ? [
+              this.constructImagesComponent(
+                this.framesManager.getCurrentImages() || []
+              ),
+            ]
+          : []),
+      ]).then((frames) => {
+        this.frames.prev = this.frames.current;
+        this.frames.current = frames[1] || this.frames.next;
+        this.frames.next = frames[0];
+        this.forceCurrent = false;
+        resolve();
+      });
+    } else {
+      this.forceCurrent = true;
       resolve();
-    });
+    }
   })
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twab/visualization",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "main": "dist/visualization.js",
   "files": [
     "dist"