devexpress-diagram 2.1.44 → 2.1.45

package/dist/dx-diagram.css

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram)
- * Version: 2.1.44
- * Build date: Wed Jan 12 2022
+ * Version: 2.1.45
+ * Build date: Thu Jan 13 2022
  * 
  * Copyright (c) 2012 - 2022 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs

package/dist/dx-diagram.js

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram)
- * Version: 2.1.44
- * Build date: Wed Jan 12 2022
+ * Version: 2.1.45
+ * Build date: Thu Jan 13 2022
  * 
  * Copyright (c) 2012 - 2022 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs
@@ -1170,9 +1170,19 @@ var Shape_1 = __webpack_require__(13);
 var ModelUtils = /** @class */ (function () {
     function ModelUtils() {
     }
-    ModelUtils.setShapePosition = function (history, model, shape, newPosition) {
-        if (!shape.position.equals(newPosition))
+    ModelUtils.setShapePosition = function (history, model, shape, newPosition, includeChildren) {
+        if (includeChildren === void 0) { includeChildren = true; }
+        if (!shape.position.equals(newPosition)) {
+            var delta_1 = newPosition.clone().offset(-shape.position.x, -shape.position.y);
             history.addAndRedo(new MoveShapeHistoryItem_1.MoveShapeHistoryItem(shape.key, newPosition));
+            if (includeChildren)
+                shape.children.forEach(function (child) {
+                    if (child instanceof Shape_1.Shape) {
+                        var childPosition = child.position.clone().offset(delta_1.x, delta_1.y);
+                        ModelUtils.setShapePosition(history, model, child, childPosition);
+                    }
+                });
+        }
     };
     ModelUtils.setShapeSize = function (history, model, shape, newPosition, newSize) {
         if (!shape.size.equals(newSize) || !shape.position.equals(newPosition))
@@ -1885,7 +1895,7 @@ var ModelUtils = /** @class */ (function () {
     ModelUtils.applyLayoutToNode = function (history, model, shape, position, connectorsSet) {
         var _this = this;
         var delta = position.clone().offset(-shape.position.x, -shape.position.y);
-        ModelUtils.setShapePosition(history, model, shape, position);
+        ModelUtils.setShapePosition(history, model, shape, position, false);
         if (delta.x !== 0 || delta.y !== 0) {
             shape.attachedConnectors
                 .filter(function (c) { return !connectorsSet[c.key]; })
@@ -17894,7 +17904,16 @@ var MouseHandlerDragDiagramItemStateBase = /** @class */ (function (_super) {
         var _this = this;
         this.calculateFixedPosition(evt);
         if (this.draggingShapes.length) {
-            this.draggingShapes.forEach(function (ds) { return _this.moveShape(ds, evt); });
+            var selectedShapes_1 = this.draggingShapes.map(function (ds) { return ds.shape; });
+            this.draggingShapes.forEach(function (ds) {
+                var shape = ds.shape;
+                while (shape.container) {
+                    if (selectedShapes_1.indexOf(shape.container) !== -1)
+                        return false;
+                    shape = shape.container;
+                }
+                _this.moveShape(ds, evt);
+            });
             var firstDraggingShape = this.draggingShapes[0];
             var offset_1 = vector_1.Vector.fromPoints(firstDraggingShape.startPosition.clone(), firstDraggingShape.shape.position.clone());
             if (offset_1.x || offset_1.y)
@@ -27585,7 +27604,17 @@ var MoveCommand = /** @class */ (function (_super) {
         var _this = this;
         this.control.history.beginTransaction();
         var selection = this.control.selection;
-        selection.getSelectedShapes().forEach(function (shape) {
+        var selectedShapes = selection.getSelectedShapes();
+        var selectedShapesWithoutDuplicates = selectedShapes.filter(function (shape) {
+            if (!shape.container)
+                return true;
+            while (shape.container) {
+                if (selectedShapes.indexOf(shape.container) !== -1)
+                    return false;
+                shape = shape.container;
+            }
+        });
+        selectedShapesWithoutDuplicates.forEach(function (shape) {
             _this.permissionsProvider.addInteractingItem(shape, __1.DiagramModelOperation.MoveShape);
             var pos = _this.getPosition(shape.position);
             ModelUtils_1.ModelUtils.setShapePosition(_this.control.history, _this.control.model, shape, pos);
@@ -33751,7 +33780,7 @@ var Selection = /** @class */ (function () {
     Selection.prototype.getSelectedItemsCore = function (includeLocked) {
         var _this = this;
         return this.keys.map(function (key) { return _this.model.findItem(key); })
-            .filter(function (conn) { return conn && (includeLocked || !conn.isLocked); });
+            .filter(function (item) { return item && (includeLocked || !item.isLocked); });
     };
     Selection.prototype.getSelectedItems = function (includeLocked, includeInsideContainers) {
         if (includeInsideContainers)
@@ -33768,7 +33797,7 @@ var Selection = /** @class */ (function () {
         }
         else
             return this.keys.map(function (key) { return _this.model.findShape(key); })
-                .filter(function (conn) { return conn && (includeLocked || !conn.isLocked); });
+                .filter(function (shape) { return shape && (includeLocked || !shape.isLocked); });
     };
     Selection.prototype.getSelectedConnectors = function (includeLocked, includeInsideContainers) {
         var _this = this;
@@ -37524,7 +37553,7 @@ var DataSource = /** @class */ (function () {
             point.x = ModelUtils_1.ModelUtils.getTwipsValue(model.units, node.left);
         if (node.top !== undefined)
             point.y = ModelUtils_1.ModelUtils.getTwipsValue(model.units, node.top);
-        ModelUtils_1.ModelUtils.setShapePosition(history, model, shape, point);
+        ModelUtils_1.ModelUtils.setShapePosition(history, model, shape, point, false);
         var size = shape.size.clone();
         if (node.width !== undefined)
             size.width = ModelUtils_1.ModelUtils.getTwipsValue(model.units, node.width);

package/dist/dx-diagram.min.css

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram.min)
- * Version: 2.1.44
- * Build date: Wed Jan 12 2022
+ * Version: 2.1.45
+ * Build date: Thu Jan 13 2022
  * 
  * Copyright (c) 2012 - 2022 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs