@checksub_team/peaks_timeline 1.15.3-alpha.7 → 1.15.4-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@checksub_team/peaks_timeline",
-  "version": "1.15.3-alpha.7",
+  "version": "1.15.4-alpha.0",
   "description": "JavaScript UI component for displaying audio waveforms",
   "main": "./peaks.js",
   "types": "./peaks.js.d.ts",

package/peaks.js

@@ -15425,19 +15425,20 @@ module.exports = function (Konva, Utils) {
         this._sources[source.id] = sourceObj;
     };
     Line.prototype.manageCollision = function (source, newStartX, newEndX) {
+        var originalStartTime = null;
+        var originalEndTime = null;
         var newStartTime = null;
         var newEndTime = null;
         var startLimited = false;
         var endLimited = false;
-        var timeWidth = this._view.pixelsToTime(newEndX - newStartX);
         var newXs = {
             startX: newStartX,
             endX: newEndX,
-            updateWidth: false,
             updateTimelineLength: false
         };
         if (newStartX !== null) {
-            newStartTime = this._view.pixelsToTime(newStartX);
+            originalStartTime = this._view.pixelsToTime(newStartX);
+            newStartTime = originalStartTime;
             if (source.startTime > newStartTime) {
                 if (this._sources[source.id].prevSourceId) {
                     var previousSource = this._sources[this._sources[source.id].prevSourceId].source;
@@ -15454,7 +15455,8 @@ module.exports = function (Konva, Utils) {
             }
         }
         if (newEndX !== null) {
-            newEndTime = this._view.pixelsToTime(newEndX);
+            originalEndTime = this._view.pixelsToTime(newEndX);
+            newEndTime = originalEndTime;
             if (source.endTime < newEndTime) {
                 if (this._sources[source.id].nextSourceId) {
                     var nextSource = this._sources[this._sources[source.id].nextSourceId].source;
@@ -15466,6 +15468,7 @@ module.exports = function (Konva, Utils) {
             }
         }
         if (newStartTime !== null && newEndTime !== null) {
+            var timeWidth = Utils.roundTime(originalEndTime - originalStartTime);
             if (startLimited) {
                 newEndTime = newStartTime + timeWidth;
             }
@@ -15491,18 +15494,15 @@ module.exports = function (Konva, Utils) {
                 }
             }
         }
-        if (newStartTime !== null) {
+        if (newStartTime !== null && newStartTime !== originalStartTime) {
             newXs.startX = this._view.timeToPixels(newStartTime);
         }
-        if (newEndTime !== null) {
+        if (newEndTime !== null && newEndTime !== originalEndTime) {
             newXs.endX = this._view.timeToPixels(newEndTime);
             if (this._sources[source.id].nextSourceId === null) {
                 newXs.updateTimelineLength = true;
             }
         }
-        if (newXs.startX !== null && newXs.endX === null || newXs.startX === null && newXs.endX !== null) {
-            newXs.updateWidth = true;
-        }
         return newXs;
     };
     Line.prototype.getSourcesAfter = function (time) {
@@ -20562,8 +20562,7 @@ module.exports = function (SourceGroup, Lines, DataRetriever, Utils, Invoker, Ko
     SourcesLayer.prototype.updateSource = function (source, newStartX, newEndX, newY) {
         var newXs = {
             startX: newStartX,
-            endX: newEndX,
-            updateWidth: false
+            endX: newEndX
         };
         if (this._peaks.options.canMoveSourcesBetweenLines) {
             this.manageVerticalPosition(source, newY);
@@ -20572,7 +20571,7 @@ module.exports = function (SourceGroup, Lines, DataRetriever, Utils, Invoker, Ko
         newXs = this.manageCollision(source, newXs.startX, newXs.endX);
         source.updateTimes(newXs.startX !== null ? this._view.pixelsToTime(newXs.startX) : null, newXs.endX !== null ? this._view.pixelsToTime(newXs.endX) : null);
         if (newXs) {
-            this._updateSource(source, newXs.updateWidth);
+            this._updateSource(source);
             return true;
         }
         return false;
@@ -21711,7 +21710,7 @@ module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLa
         this.updateTimeline(this.timeToPixels(time));
     };
     TimelineZoomView.prototype.timeToPixels = function (time) {
-        return Math.round(time * this._timeToPixelsScale);
+        return Utils.roundTime(time) * this._timeToPixelsScale;
     };
     TimelineZoomView.prototype.pixelsToTime = function (pixels) {
         return Utils.roundTime(pixels / this._timeToPixelsScale);

package/src/line.js

@@ -535,22 +535,23 @@ define([
   };
 
   Line.prototype.manageCollision = function(source, newStartX, newEndX) {
+    var originalStartTime = null;
+    var originalEndTime = null;
     var newStartTime = null;
     var newEndTime = null;
     var startLimited = false;
     var endLimited = false;
-    var timeWidth = this._view.pixelsToTime(newEndX - newStartX);
 
     var newXs = {
       startX: newStartX,
       endX: newEndX,
-      updateWidth: false,
       updateTimelineLength: false
     };
 
     if (newStartX !== null) {
       // startMarker changed
-      newStartTime = this._view.pixelsToTime(newStartX);
+      originalStartTime = this._view.pixelsToTime(newStartX);
+      newStartTime = originalStartTime;
 
       if (source.startTime > newStartTime) {
         // startMarker moved to the left
@@ -576,7 +577,8 @@ define([
 
     if (newEndX !== null) {
       // endMarker changed
-      newEndTime = this._view.pixelsToTime(newEndX);
+      originalEndTime = this._view.pixelsToTime(newEndX);
+      newEndTime = originalEndTime;
 
       if (source.endTime < newEndTime) {
         // endMarker moved to the right
@@ -596,6 +598,8 @@ define([
 
     // Update the other edge if dragging and collision
     if (newStartTime !== null && newEndTime !== null) {
+      var timeWidth = Utils.roundTime(originalEndTime - originalStartTime);
+
       if (startLimited) {
         newEndTime = newStartTime + timeWidth;
       }
@@ -627,11 +631,11 @@ define([
       }
     }
 
-    if (newStartTime !== null) {
+    if (newStartTime !== null && newStartTime !== originalStartTime) {
       newXs.startX = this._view.timeToPixels(newStartTime);
     }
 
-    if (newEndTime !== null) {
+    if (newEndTime !== null && newEndTime !== originalEndTime) {
       newXs.endX = this._view.timeToPixels(newEndTime);
 
       if (this._sources[source.id].nextSourceId === null) {
@@ -639,11 +643,6 @@ define([
       }
     }
 
-    if ((newXs.startX !== null && newXs.endX === null)
-      || (newXs.startX === null && newXs.endX !== null)) {
-      newXs.updateWidth = true;
-    }
-
     return newXs;
   };
 

package/src/sources-layer.js

@@ -438,8 +438,7 @@ define([
   SourcesLayer.prototype.updateSource = function(source, newStartX, newEndX, newY) {
     var newXs = {
       startX: newStartX,
-      endX: newEndX,
-      updateWidth: false
+      endX: newEndX
     };
 
     if (this._peaks.options.canMoveSourcesBetweenLines) {
@@ -457,8 +456,7 @@ define([
 
     if (newXs) {
       this._updateSource(
-        source,
-        newXs.updateWidth
+        source
       );
 
       return true;

package/src/timeline-zoomview.js

@@ -679,7 +679,7 @@ define([
    */
 
   TimelineZoomView.prototype.timeToPixels = function(time) {
-    return Math.round(time * this._timeToPixelsScale);
+    return Utils.roundTime(time) * this._timeToPixelsScale;
   };
 
   /**