devexpress-diagram 2.2.0 → 2.2.2

package/dist/dx-diagram.css

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram)
- * Version: 2.2.0
- * Build date: Fri Aug 11 2023
+ * Version: 2.2.2
+ * Build date: Wed Sep 13 2023
  *
  * Copyright (c) 2012 - 2023 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.2.0
- * Build date: Fri Aug 11 2023
+ * Version: 2.2.2
+ * Build date: Wed Sep 13 2023
  *
  * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs
@@ -9518,6 +9518,8 @@ var DataSource = (function () {
         if (node.top !== undefined)
             point.y = ModelUtils_1.ModelUtils.getTwipsValue(model.units, node.top);
         ModelUtils_1.ModelUtils.setShapePosition(history, model, shape, point, false);
+        if (node.type !== undefined)
+            ModelUtils_1.ModelUtils.changeShapeType(history, model, shape, node.type);
         var size = shape.size.clone();
         if (node.width !== undefined)
             size.width = ModelUtils_1.ModelUtils.getTwipsValue(model.units, node.width);
@@ -10614,7 +10616,7 @@ var DiagramControl = (function () {
         this.permissionsProvider = new PermissionsProvider_1.PermissionsProvider(this.apiController);
         this.permissionsProvider.onRequestOperation.add(this);
         this.routingModel = new ConnectorRoutingModel_1.ConnectorRoutingModel();
-        this.modelManipulator = new ModelManipulator_1.ModelManipulator(this.model, this.routingModel, this.permissionsProvider);
+        this.modelManipulator = new ModelManipulator_1.ModelManipulator(this.model, this.routingModel, this.permissionsProvider, this.shapeDescriptionManager);
         this.modelManipulator.onModelChanged.add(this.permissionsProvider);
         this.history = new History_1.History(this.modelManipulator, this);
         this.barManager = new BarManager_1.BarManager(this);
@@ -15998,6 +16000,52 @@ var ChangeShapeParametersHistoryItem = (function (_super) {
 exports.ChangeShapeParametersHistoryItem = ChangeShapeParametersHistoryItem;
 
 
+/***/ }),
+
+/***/ 56:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ChangeShapeTypeHistoryItem = void 0;
+var ShapeParameters_1 = __webpack_require__(6629);
+var HistoryItem_1 = __webpack_require__(4412);
+var ChangeShapeTypeHistoryItem = (function (_super) {
+    __extends(ChangeShapeTypeHistoryItem, _super);
+    function ChangeShapeTypeHistoryItem(shape, newType) {
+        var _this = _super.call(this) || this;
+        _this.shapeKey = shape.key;
+        _this.newType = newType;
+        return _this;
+    }
+    ChangeShapeTypeHistoryItem.prototype.redo = function (manipulator) {
+        var shape = manipulator.model.findShape(this.shapeKey);
+        this.oldType = shape.description.key;
+        this.oldParameters = shape.parameters.clone();
+        manipulator.updateShapeType(shape, this.newType, new ShapeParameters_1.ShapeParameters());
+    };
+    ChangeShapeTypeHistoryItem.prototype.undo = function (manipulator) {
+        var shape = manipulator.model.findShape(this.shapeKey);
+        manipulator.updateShapeType(shape, this.oldType, this.oldParameters);
+    };
+    return ChangeShapeTypeHistoryItem;
+}(HistoryItem_1.HistoryItem));
+exports.ChangeShapeTypeHistoryItem = ChangeShapeTypeHistoryItem;
+
+
 /***/ }),
 
 /***/ 8930:
@@ -24727,11 +24775,12 @@ var Connector_1 = __webpack_require__(7959);
 var ModelChange_1 = __webpack_require__(2004);
 var ModelUtils_1 = __webpack_require__(4867);
 var ModelManipulator = (function () {
-    function ModelManipulator(model, routingModel, permissionsProvider) {
+    function ModelManipulator(model, routingModel, permissionsProvider, descriptionManager) {
         this.onModelChanged = new Utils_1.EventDispatcher();
         this.onModelSizeChanged = new Utils_1.EventDispatcher();
         this.initializeCore(model, routingModel);
         this.permissionsProvider = permissionsProvider;
+        this.descriptionManager = descriptionManager;
         this.imageLoader = new ImageLoader_1.ImageLoader(this.updateShapeImage.bind(this));
     }
     ModelManipulator.prototype.initialize = function (model, routingModel) {
@@ -24917,6 +24966,13 @@ var ModelManipulator = (function () {
         var shapes = this.model.findShapesByDescription(description);
         this.commitItemsChangesCore(ModelChange_1.ItemChangeType.UpdateProperties, shapes);
     };
+    ModelManipulator.prototype.updateShapeType = function (shape, typeKey, shapeParameters) {
+        var description = this.descriptionManager.get(typeKey);
+        shape.description = description;
+        shape.parameters = shapeParameters;
+        description.createParameters(shapeParameters);
+        this.raiseModelChanged([new ModelChange_1.ItemChange(shape, ModelChange_1.ItemChangeType.UpdateStructure)]);
+    };
     ModelManipulator.prototype.addConnector = function (connector, key) {
         if (connector.beginItem || connector.endItem)
             throw Error("Creating connector should not contain begin/end items");
@@ -25185,6 +25241,7 @@ var ConnectorProperties_1 = __webpack_require__(4612);
 var ConnectorRenderPoint_1 = __webpack_require__(4717);
 var ConnectorRenderPointsContext_1 = __webpack_require__(1510);
 var Shape_1 = __webpack_require__(5503);
+var ChangeShapeTypeHistoryItem_1 = __webpack_require__(56);
 var ModelUtils = (function () {
     function ModelUtils() {
     }
@@ -26067,6 +26124,49 @@ var ModelUtils = (function () {
     ModelUtils.createRectangle = function (items) {
         return Utils_1.GeometryUtils.getCommonRectangle(items.map(function (i) { return i.rectangle; }));
     };
+    ModelUtils.changeShapeType = function (history, model, shape, shapeType) {
+        if (shape.description.key === shapeType)
+            return;
+        history.beginTransaction();
+        var oldConPts = shape.getConnectionPoints();
+        var oldConPtsSides = oldConPts.map(function (p) { return shape.getConnectionPointSide(p); });
+        history.addAndRedo(new ChangeShapeTypeHistoryItem_1.ChangeShapeTypeHistoryItem(shape, shapeType));
+        var newConPts = shape.getConnectionPoints();
+        var newConPtsSides = newConPts.map(function (p) { return shape.getConnectionPointSide(p); });
+        for (var i = 0, connector = void 0; connector = shape.attachedConnectors[i]; i++) {
+            if (connector.beginItem === shape)
+                this.updateConnectionIndexByNewShapeType(history, connector, Connector_1.ConnectorPosition.Begin, connector.beginConnectionPointIndex, oldConPts, oldConPtsSides, newConPts, newConPtsSides);
+            if (connector.endItem === shape)
+                this.updateConnectionIndexByNewShapeType(history, connector, Connector_1.ConnectorPosition.End, connector.endConnectionPointIndex, oldConPts, oldConPtsSides, newConPts, newConPtsSides);
+            this.updateConnectorAttachedPoints(history, model, connector);
+        }
+        history.endTransaction();
+    };
+    ModelUtils.updateConnectionIndexByNewShapeType = function (history, connector, position, oldPointIndex, oldConPts, oldConPtsSides, newConPts, newConPtsSides) {
+        if (oldPointIndex < 0)
+            return;
+        var oldSide = oldConPtsSides[oldPointIndex];
+        var oldPt = oldConPts[oldPointIndex];
+        if (oldPointIndex < newConPts.length && oldSide === newConPtsSides[oldPointIndex])
+            return;
+        var newIndex = this.findNearestPointIndex(newConPts, oldPt, function (i) { return newConPtsSides[i] === oldSide; });
+        if (newIndex === -1)
+            newIndex = this.findNearestPointIndex(newConPts, oldPt, function () { return true; });
+        if (newIndex !== oldPointIndex)
+            history.addAndRedo(new AddConnectionHistoryItem_1.SetConnectionPointIndexHistoryItem(connector, newIndex, position));
+    };
+    ModelUtils.findNearestPointIndex = function (points, initPoint, condition) {
+        return points.reduce(function (acc, val, index) {
+            if (condition(index)) {
+                var dist = metrics_1.Metrics.euclideanDistance(initPoint, points[index]);
+                if (acc.index === -1 || acc.distance > dist) {
+                    acc.index = index;
+                    acc.distance = dist;
+                }
+            }
+            return acc;
+        }, { distance: Number.MAX_SAFE_INTEGER, index: -1 }).index;
+    };
     ModelUtils.connectionPointActionSize = unit_converter_1.UnitConverter.pixelsToTwips(8);
     return ModelUtils;
 }());
@@ -28472,7 +28572,7 @@ var InternalStorageShapeDescription = (function (_super) {
         ]);
     };
     InternalStorageShapeDescription.prototype.createParameters = function (parameters) {
-        parameters.addRange([
+        parameters.addRangeIfNotExists([
             new ShapeParameters_1.ShapeParameter(exports.InternalStorageHorizontalEdgeParameterName, this.defaultSize.width * 0.1),
             new ShapeParameters_1.ShapeParameter(exports.InternalStorageVerticalEdgeParameterName, this.defaultSize.width * 0.1)
         ]);
@@ -29035,7 +29135,7 @@ var PredefinedProcessShapeDescription = (function (_super) {
         ]);
     };
     PredefinedProcessShapeDescription.prototype.createParameters = function (parameters) {
-        parameters.add(new ShapeParameters_1.ShapeParameter(exports.PredefinedProcessEdgeParameterName, this.defaultSize.width * 0.1));
+        parameters.addIfNotExists(new ShapeParameters_1.ShapeParameter(exports.PredefinedProcessEdgeParameterName, this.defaultSize.width * 0.1));
     };
     PredefinedProcessShapeDescription.prototype.normalizeParameters = function (shape, parameters) {
         this.changeParameterValue(parameters, exports.PredefinedProcessEdgeParameterName, function (p) { return Math.max(PredefinedProcessShapeDescription.minEdge, Math.min(shape.size.width * 0.3, p.value)); });
@@ -29492,7 +29592,7 @@ var ArrowHorizontalShapeDescription = (function (_super) {
         configurable: true
     });
     ArrowHorizontalShapeDescription.prototype.createParameters = function (parameters) {
-        parameters.addRange([
+        parameters.addRangeIfNotExists([
             new ShapeParameters_1.ShapeParameter(exports.ArrowVerticalTriangleWidthParameterName, Math.sqrt(Math.pow(this.defaultSize.height, 2) - Math.pow(this.defaultSize.height / 2, 2))),
             new ShapeParameters_1.ShapeParameter(exports.ArrowVerticalLineHeightParameterName, this.defaultSize.height / 3)
         ]);
@@ -29984,7 +30084,7 @@ var ArrowVerticalShapeDescription = (function (_super) {
         configurable: true
     });
     ArrowVerticalShapeDescription.prototype.createParameters = function (parameters) {
-        parameters.addRange([
+        parameters.addRangeIfNotExists([
             new ShapeParameters_1.ShapeParameter(exports.ArrowVerticalTriangleHeightParameterName, Math.sqrt(Math.pow(this.defaultSize.width, 2) - Math.pow(this.defaultSize.width / 2, 2))),
             new ShapeParameters_1.ShapeParameter(exports.ArrowVerticalLineWidthParameterName, this.defaultSize.width / 3)
         ]);
@@ -30084,7 +30184,7 @@ var CrossShapeDescription = (function (_super) {
         ];
     };
     CrossShapeDescription.prototype.createParameters = function (parameters) {
-        parameters.addRange([
+        parameters.addRangeIfNotExists([
             new ShapeParameters_1.ShapeParameter(exports.CrossHorizontalWidthParameterName, this.defaultSize.width * 0.2),
             new ShapeParameters_1.ShapeParameter(exports.CrossVerticalWidthParameterName, this.defaultSize.height * 0.2)
         ]);
@@ -30752,7 +30852,7 @@ var StarShapeDescription = (function (_super) {
         ];
     };
     StarShapeDescription.prototype.createParameters = function (parameters) {
-        parameters.addRange([
+        parameters.addRangeIfNotExists([
             new ShapeParameters_1.ShapeParameter(exports.StarConvexParameterName, 300)
         ]);
     };
@@ -32041,12 +32141,16 @@ var ShapeParameters = (function () {
     function ShapeParameters() {
         this.items = {};
     }
-    ShapeParameters.prototype.add = function (parameter) {
+    ShapeParameters.prototype.addIfNotExists = function (parameter) {
+        if (!(parameter.key in this.items))
+            this.set(parameter);
+    };
+    ShapeParameters.prototype.set = function (parameter) {
         this.items[parameter.key] = parameter;
     };
-    ShapeParameters.prototype.addRange = function (parameters) {
+    ShapeParameters.prototype.addRangeIfNotExists = function (parameters) {
         for (var i = 0; i < parameters.length; i++)
-            this.add(parameters[i]);
+            this.addIfNotExists(parameters[i]);
     };
     ShapeParameters.prototype.get = function (key) {
         return this.items[key];
@@ -32058,7 +32162,7 @@ var ShapeParameters = (function () {
     };
     ShapeParameters.prototype.clone = function () {
         var result = new ShapeParameters();
-        this.forEach(function (p) { result.add(new ShapeParameter(p.key, p.value)); });
+        this.forEach(function (p) { result.addIfNotExists(new ShapeParameter(p.key, p.value)); });
         return result;
     };
     ShapeParameters.prototype.toObject = function () {

package/dist/dx-diagram.min.css

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram.min)
- * Version: 2.2.0
- * Build date: Fri Aug 11 2023
+ * Version: 2.2.2
+ * Build date: Wed Sep 13 2023
  *
  * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs