devexpress-diagram 2.0.4 → 2.0.5

package/dist/dx-diagram.css

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram)
- * Version: 2.0.4
- * Build date: Fri Nov 20 2020
+ * Version: 2.0.5
+ * Build date: Mon Nov 23 2020
  * 
  * Copyright (c) 2012 - 2020 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.0.4
- * Build date: Fri Nov 20 2020
+ * Version: 2.0.5
+ * Build date: Mon Nov 23 2020
  * 
  * Copyright (c) 2012 - 2020 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs
@@ -2532,45 +2532,6 @@ var ModelUtils = /** @class */ (function () {
                 return unit_converter_1.UnitConverter.pixelsToTwips(value);
         }
     };
-    // Key generation
-    ModelUtils.getNextItemKey = function (keys, checkKey, baseKey) {
-        if (!keys.length && baseKey === undefined)
-            return "0";
-        for (var i = keys.length - 1; i >= 0; i--) {
-            baseKey = baseKey || keys[i];
-            if (baseKey !== undefined && baseKey !== null)
-                break;
-        }
-        var key = this.generateNextItemKey(baseKey || "0");
-        while (!checkKey(key))
-            key = this.generateNextItemKey(key);
-        return key;
-    };
-    ModelUtils.generateNextItemKey = function (key) {
-        for (var i = key.length - 1; i >= 0; i--) {
-            if (!this.isDigit(key[i])) {
-                if (i === key.length - 1)
-                    key = key + "0";
-                break;
-            }
-            var code = key.charCodeAt(i);
-            var char = String.fromCharCode(code + 1);
-            if (char > "9") {
-                char = "0";
-                if (i === 0 || !this.isDigit(key[i - 1]))
-                    char = "1" + char;
-            }
-            key = key.substr(0, i) + char + key.substr(i + 1);
-            if (char !== "0" && char !== "10")
-                break;
-            else if (char === "10")
-                i--;
-        }
-        return key;
-    };
-    ModelUtils.isDigit = function (char) {
-        return "0" <= char && char <= "9";
-    };
     ModelUtils.getGuidItemKey = function () {
         return math_1.MathUtils.generateGuid();
     };
@@ -5901,7 +5862,6 @@ var Utils_1 = __webpack_require__(3);
 var rectangle_1 = __webpack_require__(12);
 var size_1 = __webpack_require__(2);
 var point_1 = __webpack_require__(1);
-var ModelUtils_1 = __webpack_require__(9);
 var ImageCache_1 = __webpack_require__(46);
 var color_1 = __webpack_require__(23);
 var Enums_1 = __webpack_require__(47);
@@ -5910,6 +5870,7 @@ var DiagramModel = /** @class */ (function () {
         if (pageSize === void 0) { pageSize = new size_1.Size(8391, 11906); }
         this.items = [];
         this.itemIndexByKey = {};
+        this.keyCounter = 0;
         this.pageSize = new size_1.Size(8391, 11906);
         this.pageLandscape = false;
         this.pageColor = DiagramModel.defaultPageColor;
@@ -5918,6 +5879,7 @@ var DiagramModel = /** @class */ (function () {
         this.pageSize = pageSize;
         this.size = this.pageSize.clone();
         this.rectangle = rectangle_1.Rectangle.fromGeometry(new point_1.Point(0, 0), new size_1.Size(0, 0));
+        this.initializeKeyCounter();
     }
     Object.defineProperty(DiagramModel.prototype, "pageWidth", {
         get: function () {
@@ -6152,9 +6114,14 @@ var DiagramModel = /** @class */ (function () {
     DiagramModel.prototype.iterateItems = function (callback) {
         this.items.forEach(callback);
     };
-    DiagramModel.prototype.getNextKey = function (baseKey) {
-        var _this = this;
-        return ModelUtils_1.ModelUtils.getNextItemKey(this.items.map(function (item) { return item.key; }), function (key) { return _this.itemIndexByKey[key] === undefined; }, baseKey);
+    DiagramModel.prototype.getNextKey = function () {
+        return (this.keyCounter++).toString();
+    };
+    DiagramModel.prototype.initializeKeyCounter = function () {
+        this.keyCounter = this.items.reduce(function (prev, cur) {
+            var num = parseInt(cur.key);
+            return Math.max(prev, isNaN(num) ? 0 : num + 1);
+        }, this.items.length);
     };
     DiagramModel.defaultPageColor = color_1.ColorUtils.LIGHT_COLOR;
     return DiagramModel;
@@ -15910,7 +15877,7 @@ var ImporterBase = /** @class */ (function () {
         for (var i = 0; i < shapes.length; i++) {
             var shape = shapes[i];
             var oldKey = shape.key;
-            key = model.getNextKey(key);
+            key = model.getNextKey();
             shape.key = key;
             itemHash[oldKey] = shape;
             if (shape.dataKey !== undefined)
@@ -15921,7 +15888,7 @@ var ImporterBase = /** @class */ (function () {
         for (var i = 0; i < connectors.length; i++) {
             var connector = connectors[i];
             var oldKey = connector.key;
-            key = model.getNextKey(key);
+            key = model.getNextKey();
             connector.key = key;
             itemHash[oldKey] = connector;
             if (connector.dataKey !== undefined)
@@ -28961,6 +28928,26 @@ var DiagramControl = /** @class */ (function () {
         removeElement = removeElement || (function (element) { Utils_2.RenderUtils.removeElement(element); });
         this.toolboxManager.clean(removeElement);
         if (this.render) {
+            this.settings.onZoomChanged.remove(this.render.view);
+            this.settings.onViewChanged.remove(this.render.page);
+            this.settings.onViewChanged.remove(this.render.view);
+            this.settings.onReadOnlyChanged.remove(this.render);
+            this.settings.onReadOnlyChanged.remove(this.render.selection);
+            this.eventManager.onTextInputOperation.remove(this.render.input);
+            this.eventManager.onTextInputOperation.remove(this.render.items);
+            this.eventManager.onTextInputOperation.remove(this.render.selection);
+            this.eventManager.onMouseOperation.remove(this.render.items);
+            this.eventManager.onMouseOperation.remove(this.render.selection);
+            this.eventManager.onMouseOperation.remove(this.render.view);
+            this.eventManager.onMouseOperation.remove(this.render);
+            this.eventManager.onVisualizersUpdate.remove(this.render.selection);
+            this.modelManipulator.onModelSizeChanged.remove(this.render.view);
+            this.modelManipulator.onModelSizeChanged.remove(this.render.page);
+            this.modelManipulator.onModelChanged.remove(this.render.items);
+            this.modelManipulator.onModelChanged.remove(this.render.page);
+            this.modelManipulator.onModelChanged.remove(this.render.selection);
+            this.selection.onChanged.remove(this.render.selection);
+            this.selection.onChanged.remove(this.render.items);
             this.render.clean(removeElement);
             this.render = undefined;
         }
@@ -29120,6 +29107,7 @@ var DiagramControl = /** @class */ (function () {
     };
     DiagramControl.prototype.importModel = function (model) {
         this.model = model;
+        this.model.initializeKeyCounter();
         this.apiController.model = model;
         this.onImportData();
     };
@@ -35702,6 +35690,7 @@ var DataSource = /** @class */ (function () {
         history.clear();
         history.beginTransaction();
         ModelUtils_1.ModelUtils.deleteAllItems(history, model, selection);
+        model.initializeKeyCounter();
         var DEFAULT_STEP = 2000;
         var rowIndex = 0;
         var colIndex = 0;

package/dist/dx-diagram.min.css

@@ -1,7 +1,7 @@
 /*!
  * DevExpress Diagram (dx-diagram.min)
- * Version: 2.0.4
- * Build date: Fri Nov 20 2020
+ * Version: 2.0.5
+ * Build date: Mon Nov 23 2020
  * 
  * Copyright (c) 2012 - 2020 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs