multi move

Author: odeimaiz

services/static-webserver/client/source/class/osparc/workbench/NodeUI.js

@@ -709,10 +709,14 @@ qx.Class.define("osparc.workbench.NodeUI", {
       };
     },
 
+    moveNodeTo: function(pos) {
+      this.moveTo(pos.x, pos.y);
+    },
+
     setPosition: function(pos) {
       const node = this.getNode();
       node.setPosition(pos);
-      this.moveTo(node.getPosition().x, node.getPosition().y);
+      this.moveNodeTo(pos);
     },
 
     snapToGrid: function() {
@@ -724,11 +728,10 @@ qx.Class.define("osparc.workbench.NodeUI", {
       const snapGrid = 20;
       const snapX = Math.round(x/snapGrid)*snapGrid;
       const snapY = Math.round(y/snapGrid)*snapGrid;
-      node.setPosition({
+      this.setPosition({
         x: snapX,
         y: snapY
       });
-      this.moveTo(node.getPosition().x, node.getPosition().y);
     },
 
     __applyThumbnail: function(thumbnailSrc) {

services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js

@@ -443,7 +443,8 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
     __itemMoving: function(itemId, xDiff, yDiff) {
       this.getSelectedNodeUIs().forEach(selectedNodeUI => {
         if (itemId !== selectedNodeUI.getNodeId()) {
-          selectedNodeUI.setPosition({
+          // do not touch the position, just move the node, this will happen in __itemStoppedMoving
+          selectedNodeUI.moveNodeTo({
             x: selectedNodeUI.initPos.x + xDiff,
             y: selectedNodeUI.initPos.y + yDiff
           });
@@ -464,10 +465,24 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       this.getSelectedNodeUIs().forEach(selectedNodeUI => delete selectedNodeUI["initPos"]);
       this.getSelectedAnnotations().forEach(selectedAnnotation => delete selectedAnnotation["initPos"]);
 
-      if (nodeUI && osparc.Preferences.getInstance().isSnapNodeToGrid()) {
-        this.getSelectedNodeUIs().forEach(selectedNodeUI => selectedNodeUI.snapToGrid());
-        // make sure nodeUI is moved, then update edges
-        setTimeout(() => this.__updateNodeUIPos(nodeUI), 10);
+        // the moving item could be an annotation, so we need to check if it is a nodeUI
+      if (nodeUI) {
+        this.getSelectedNodeUIs().forEach(selectedNodeUI => {
+          if (nodeUI !== selectedNodeUI) {
+            // now set the position
+            const layoutProps = selectedNodeUI.getLayoutProperties();
+            selectedNodeUI.setPosition({
+              x: layoutProps.left,
+              y: layoutProps.top,
+            });
+          }
+        });
+
+        if (osparc.Preferences.getInstance().isSnapNodeToGrid()) {
+          this.getSelectedNodeUIs().forEach(selectedNodeUI => selectedNodeUI.snapToGrid());
+          // make sure nodeUI is moved, then update edges
+          setTimeout(() => this.__updateNodeUIPos(nodeUI), 10);
+        }
       }
 
       this.__updateWorkbenchBounds();