@checksub_team/peaks_timeline 1.9.2 → 1.9.3

package/package.json

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

package/peaks.js

@@ -15743,15 +15743,17 @@ module.exports = function (Utils, Source, SourceGroup, Konva) {
         const sources = [];
         const segments = [];
         const self = this;
-        this.deselectAll(true);
+        this.deselectDifference(elements, true);
         elements.forEach(function (element) {
-            self._selectedElements[element.id] = element;
-            element.setSelected(true);
-            if (notify) {
-                if (element instanceof Source) {
-                    sources.push(element);
-                } else {
-                    segments.push(element);
+            if (!self._selectedElements[element.id]) {
+                self._selectedElements[element.id] = element;
+                element.setSelected(true);
+                if (notify) {
+                    if (element instanceof Source) {
+                        sources.push(element);
+                    } else {
+                        segments.push(element);
+                    }
                 }
             }
         });
@@ -15764,10 +15766,14 @@ module.exports = function (Utils, Source, SourceGroup, Konva) {
             }
         }
     };
-    ModeLayer.prototype.deselectAll = function (notify) {
+    ModeLayer.prototype.deselectDifference = function (newElements, notify) {
         const sources = [];
         const segments = [];
-        for (var id in this._selectedElements) {
+        const selectedElementsToDeselect = Object.assign({}, this._selectedElements);
+        newElements.forEach(function (element) {
+            delete selectedElementsToDeselect[element.id];
+        });
+        for (var id in selectedElementsToDeselect) {
             if (Utils.objectHasProperty(this._selectedElements, id)) {
                 const element = this._selectedElements[id];
                 element.setSelected(false);
@@ -15850,7 +15856,7 @@ module.exports = function (Utils, Source, SourceGroup, Konva) {
                 this.selectElements([hoveredKonvaElement.getSegment()], true);
             }
         } else {
-            this.deselectAll(true);
+            this.deselectDifference([], true);
             this._view.drawSourcesLayer();
         }
     };
@@ -15858,7 +15864,7 @@ module.exports = function (Utils, Source, SourceGroup, Konva) {
         const selectedElements = Object.values(this._selectedElements);
         if (selectedElements.length) {
             var selectedElement = selectedElements[0];
-            this.deselectAll(true);
+            this.deselectDifference([], true);
             if (selectedElement instanceof Source) {
                 if (selectedElement.isDeletable()) {
                     this._peaks.destroySource(selectedElement.id);
@@ -16004,7 +16010,7 @@ module.exports = function (Utils, Source, SourceGroup, Konva) {
             this._peaks.off('keyboard.delete', this._onKeyboardDelete);
             break;
         }
-        this.deselectAll(true);
+        this.deselectDifference([], true);
         switch (mode) {
         case 'cut':
             this._stage.on('mouseover', this._onMouseEnterInCutMode);
@@ -20230,7 +20236,7 @@ module.exports = function (MouseDragHandler, PlayheadLayer, SourcesLayer, ModeLa
         }
     };
     TimelineZoomView.prototype.deselectAll = function () {
-        this._modeLayer.deselectAll(false);
+        this._modeLayer.deselectDifference([], false);
     };
     TimelineZoomView.prototype.isListening = function () {
         return this._stage.listening();

package/src/mode-layer.js

@@ -72,17 +72,19 @@ define([
     const segments = [];
     const self = this;
 
-    this.deselectAll(true);
+    this.deselectDifference(elements, true);
 
     elements.forEach(function(element) {
-      self._selectedElements[element.id] = element;
-      element.setSelected(true);
-      if (notify) {
-        if (element instanceof Source) {
-          sources.push(element);
-        }
-        else {
-          segments.push(element);
+      if (!self._selectedElements[element.id]) {
+        self._selectedElements[element.id] = element;
+        element.setSelected(true);
+        if (notify) {
+          if (element instanceof Source) {
+            sources.push(element);
+          }
+          else {
+            segments.push(element);
+          }
         }
       }
     });
@@ -97,11 +99,16 @@ define([
     }
   };
 
-  ModeLayer.prototype.deselectAll = function(notify) {
+  ModeLayer.prototype.deselectDifference = function(newElements, notify) {
     const sources = [];
     const segments = [];
+    const selectedElementsToDeselect = Object.assign({}, this._selectedElements);
+
+    newElements.forEach(function(element) {
+      delete selectedElementsToDeselect[element.id];
+    });
 
-    for (var id in this._selectedElements) {
+    for (var id in selectedElementsToDeselect) {
       if (Utils.objectHasProperty(this._selectedElements, id)) {
         const element = this._selectedElements[id];
 
@@ -198,7 +205,7 @@ define([
       }
     }
     else {
-      this.deselectAll(true);
+      this.deselectDifference([], true);
       this._view.drawSourcesLayer();  // Redraw sources layer to remove selection
     }
   };
@@ -210,7 +217,7 @@ define([
     if (selectedElements.length) {
       var selectedElement = selectedElements[0];
 
-      this.deselectAll(true);
+      this.deselectDifference([], true);
 
       if (selectedElement instanceof Source) {
         if (selectedElement.isDeletable()) {
@@ -426,7 +433,7 @@ define([
         break;
     }
 
-    this.deselectAll(true);
+    this.deselectDifference([], true);
 
     // Set new mode
     switch (mode) {

package/src/timeline-zoomview.js

@@ -401,7 +401,7 @@ define([
   };
 
   TimelineZoomView.prototype.deselectAll = function() {
-    this._modeLayer.deselectAll(false);
+    this._modeLayer.deselectDifference([], false);
   };
 
   TimelineZoomView.prototype.isListening = function() {