@checksub_team/peaks_timeline 1.4.20 → 1.4.21

package/package.json

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

package/peaks.js

@@ -16563,6 +16563,7 @@ module.exports = function (Konva, SegmentMarker) {
     };
     SegmentShape.prototype._onSegmentDragStart = function () {
         this._view.setCursor('grab');
+        this._group.checkOverlapping(this._segment, 'overlapping before dragging');
         this._mouseDownX = this._view.getPointerPosition().x;
         this._initialStartTime = this._segment.startTime;
         this._initialStartPixel = this._view.timeToPixels(this._initialStartTime);
@@ -16572,6 +16573,7 @@ module.exports = function (Konva, SegmentMarker) {
     };
     SegmentShape.prototype._onSegmentDragEnd = function () {
         this._view.setCursor('pointer');
+        this._group.checkOverlapping(this._segment, 'overlapping after dragging');
         this._peaks.emit('segments.dragend', this._segment);
     };
     SegmentShape.prototype._onSegmentHandleDrag = function () {
@@ -16579,10 +16581,12 @@ module.exports = function (Konva, SegmentMarker) {
     };
     SegmentShape.prototype._onSegmentHandleDragStart = function (segmentMarker) {
         var startMarker = segmentMarker.isStartMarker();
+        this._group.checkOverlapping(this._segment, 'overlapping before dragging');
         this._peaks.emit('segments.dragstart', this._segment, startMarker);
     };
     SegmentShape.prototype._onSegmentHandleDragEnd = function (segmentMarker) {
         var startMarker = segmentMarker.isStartMarker();
+        this._group.checkOverlapping(this._segment, 'overlapping after dragging');
         this._peaks.emit('segments.dragend', this._segment, startMarker);
     };
     SegmentShape.prototype.fitToView = function () {
@@ -16624,7 +16628,7 @@ module.exports = function (Utils) {
         }
         if (options.endTime < 0) {
             options.endTime = 0;
-        } else if (options.endTime < options.startTime + peaks.options.minSegmentSize) {
+        } else if (options.endTime - options.startTime < peaks.options.minSegmentSize) {
             options.endTime = options.startTime + peaks.options.minSegmentSize;
         }
         options.startTime = Utils.roundTime(options.startTime);
@@ -17041,7 +17045,6 @@ module.exports = function (SegmentShape, Utils, Konva) {
         }
     };
     SegmentsGroup.prototype.updateSegment = function (segment, newStartX, newEndX) {
-        this.checkOverlapping(segment, 'overlapping before dragging');
         var newXs = this.manageCollision(segment, newStartX, newEndX);
         if (newXs.startX !== null) {
             segment.startTime = this._view.pixelsToTime(newXs.startX);
@@ -17050,7 +17053,6 @@ module.exports = function (SegmentShape, Utils, Konva) {
             segment.endTime = this._view.pixelsToTime(newXs.endX);
         }
         if (newXs) {
-            this.checkOverlapping(segment, 'overlapping after dragging');
             this._updateSegment(segment);
             this.addToUpdatedSegments(segment);
             this._draw();

package/src/segment-shape.js

@@ -272,6 +272,8 @@ define([
   SegmentShape.prototype._onSegmentDragStart = function() {
     this._view.setCursor('grab');
 
+    this._group.checkOverlapping(this._segment, 'overlapping before dragging');
+
     this._mouseDownX = this._view.getPointerPosition().x;
     this._initialStartTime = this._segment.startTime;
     this._initialStartPixel = this._view.timeToPixels(this._initialStartTime);
@@ -284,6 +286,8 @@ define([
   SegmentShape.prototype._onSegmentDragEnd = function() {
     this._view.setCursor('pointer');
 
+    this._group.checkOverlapping(this._segment, 'overlapping after dragging');
+
     this._peaks.emit('segments.dragend', this._segment);
   };
 
@@ -302,6 +306,8 @@ define([
   SegmentShape.prototype._onSegmentHandleDragStart = function(segmentMarker) {
     var startMarker = segmentMarker.isStartMarker();
 
+    this._group.checkOverlapping(this._segment, 'overlapping before dragging');
+
     this._peaks.emit('segments.dragstart', this._segment, startMarker);
   };
 
@@ -312,6 +318,8 @@ define([
   SegmentShape.prototype._onSegmentHandleDragEnd = function(segmentMarker) {
     var startMarker = segmentMarker.isStartMarker();
 
+    this._group.checkOverlapping(this._segment, 'overlapping after dragging');
+
     this._peaks.emit('segments.dragend', this._segment, startMarker);
   };
 

package/src/segment.js

@@ -24,7 +24,6 @@ define([
 
     options.startTime = Utils.roundTime(options.startTime);
     options.endTime = Utils.roundTime(options.endTime);
-
     if (options.startTime < 0) {
       options.startTime = 0;
     }
@@ -32,20 +31,13 @@ define([
     if (options.endTime < 0) {
       options.endTime = 0;
     }
-    else if (options.endTime < options.startTime + peaks.options.minSegmentSize) {
+    else if (options.endTime - options.startTime < peaks.options.minSegmentSize) {
       options.endTime = options.startTime + peaks.options.minSegmentSize;
     }
 
     options.startTime = Utils.roundTime(options.startTime);
     options.endTime = Utils.roundTime(options.endTime);
 
-    // if (options.endTime <= options.startTime) {
-    //   // eslint-disable-next-line max-len
-    //   throw new RangeError(
-    //     'peaks.segments.' + context + ': endTime should be greater than startTime'
-    //   );
-    // }
-
     if (options.opacity < 0 || options.opacity > 1) {
       // eslint-disable-next-line max-len
       throw new RangeError('peaks.segments.' + context + ': opacity should be between 0 and 1');

package/src/segments-group.js

@@ -445,8 +445,6 @@ define([
   };
 
   SegmentsGroup.prototype.updateSegment = function(segment, newStartX, newEndX) {
-    this.checkOverlapping(segment, 'overlapping before dragging');
-
     var newXs = this.manageCollision(segment, newStartX, newEndX);
 
     if (newXs.startX !== null) {
@@ -458,8 +456,6 @@ define([
     }
 
     if (newXs) {
-      this.checkOverlapping(segment, 'overlapping after dragging');
-
       this._updateSegment(segment);
 
       this.addToUpdatedSegments(segment);
@@ -474,7 +470,6 @@ define([
         && this._segments[this._segments[segment.id].prevSegmentId].segment.endTime > segment.startTime)
       || (this._segments[segment.id].nextSegmentId
         && this._segments[this._segments[segment.id].nextSegmentId].segment.startTime < segment.endTime)) {
-
       if (!this._overlappingSegments.includes(segment.id)) {
         this._peaks.emit('segments.overlap', {
           message: message,
@@ -484,7 +479,6 @@ define([
         });
         this._overlappingSegments.push(segment.id);
       }
-
     }
     /* eslint-enable max-len */
   };
@@ -537,7 +531,11 @@ define([
             }
 
             if (previousSegment.endTime !== newStartTime) {
-              newXs = this.manageCollision(previousSegment, this._view.timeToPixels(previousSegment.startTime), this._view.timeToPixels(newStartTime));
+              newXs = this.manageCollision(
+                previousSegment,
+                this._view.timeToPixels(previousSegment.startTime),
+                this._view.timeToPixels(newStartTime)
+              );
 
               if (newXs.startX !== null) {
                 previousSegment.startTime = this._view.pixelsToTime(newXs.startX);
@@ -591,7 +589,11 @@ define([
             }
 
             if (nextSegment.startTime !== newEndTime) {
-              newXs = this.manageCollision(nextSegment, this._view.timeToPixels(newEndTime), this._view.timeToPixels(nextSegment.endTime));
+              newXs = this.manageCollision(
+                nextSegment,
+                this._view.timeToPixels(newEndTime),
+                this._view.timeToPixels(nextSegment.endTime)
+              );
 
               if (newXs.startX !== null) {
                 nextSegment.startTime = this._view.pixelsToTime(newXs.startX);