devexpress-diagram 2.0.10 → 2.0.11

package/dist/dx-diagram.css

@@ -1,9 +1,9 @@
 /*!
  * DevExpress Diagram (dx-diagram)
- * Version: 2.0.10
- * Build date: Thu Dec 24 2020
+ * Version: 2.0.11
+ * Build date: Thu Jan 14 2021
  * 
- * Copyright (c) 2012 - 2020 Developer Express Inc. ALL RIGHTS RESERVED
+ * Copyright (c) 2012 - 2021 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs
  */
 .dxdi-control {

package/dist/dx-diagram.js

@@ -1,9 +1,9 @@
 /*!
  * DevExpress Diagram (dx-diagram)
- * Version: 2.0.10
- * Build date: Thu Dec 24 2020
+ * Version: 2.0.11
+ * Build date: Thu Jan 14 2021
  * 
- * Copyright (c) 2012 - 2020 Developer Express Inc. ALL RIGHTS RESERVED
+ * Copyright (c) 2012 - 2021 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs
  */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -11727,7 +11727,7 @@ var CommandManager = /** @class */ (function () {
     CommandManager.prototype.processPaste = function (clipboardData) {
         var command = this.getCommand(DiagramCommand.Paste);
         if (command && command.isEnabled())
-            command.performPaste(clipboardData);
+            command.execute(clipboardData);
         return true;
     };
     // ISelectionChangesListener
@@ -16533,23 +16533,17 @@ var PasteSelectionCommandBase = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     PasteSelectionCommandBase.prototype.isEnabled = function () {
-        var result = _super.prototype.isEnabled.call(this) && (this.isPasteSupportedByBrowser() || ClipboardCommand_1.ClipboardCommand.clipboardData !== undefined);
-        if (result) {
-            var items = this.parseClipboardData(ClipboardCommand_1.ClipboardCommand.clipboardData);
-            result = result && (items.length > 1 || this.permissionsProvider.canAddItems(items));
-        }
-        return result;
+        return _super.prototype.isEnabled.call(this) && (this.isPasteSupportedByBrowser() || ClipboardCommand_1.ClipboardCommand.clipboardData !== undefined);
     };
     PasteSelectionCommandBase.prototype.isVisible = function () {
         return this.isPasteSupportedByBrowser() || ClipboardCommand_1.ClipboardCommand.clipboardData !== undefined;
     };
-    PasteSelectionCommandBase.prototype.parseClipboardData = function (data, position) {
+    PasteSelectionCommandBase.prototype.parseClipboardData = function (data) {
         var items = [];
         var importer = new Importer_1.Importer(this.control.shapeDescriptionManager, data);
         items = importer.importItems(this.control.model);
-        var pastePosition = this.control.getPastePosition() || position;
-        if (pastePosition)
-            this.calculateSelectionOffset(items, pastePosition);
+        if (this.control.contextMenuPosition)
+            this.calculateSelectionOffset(items, this.control.contextMenuPosition);
         for (var i = 0; i < items.length; i++) {
             var item = items[i];
             if (item instanceof Shape_1.Shape)
@@ -16561,10 +16555,14 @@ var PasteSelectionCommandBase = /** @class */ (function (_super) {
     };
     PasteSelectionCommandBase.prototype.executeCore = function (state, parameter) {
         var _this = this;
-        this.getClipboardData(function (data) {
-            _this.performPaste(data, parameter);
-        });
-        return true;
+        var ret = true;
+        if (parameter)
+            this.performPaste(parameter);
+        else
+            this.getClipboardData(function (data) {
+                ret = _this.execute(data); // may be async
+            });
+        return ret;
     };
     PasteSelectionCommandBase.prototype.addItemForSortingRecursive = function (itemsHashtable, item) {
         if (itemsHashtable[item.key])
@@ -16605,11 +16603,11 @@ var PasteSelectionCommandBase = /** @class */ (function (_super) {
         connectors.sort(function (a, b) { return itemsHashtable[b.key] - itemsHashtable[a.key]; });
         return sortedItems.concat(connectors);
     };
-    PasteSelectionCommandBase.prototype.performPaste = function (data, parameter) {
+    PasteSelectionCommandBase.prototype.performPaste = function (data) {
         this.control.beginUpdateCanvas();
         this.control.history.beginTransaction();
         var ids = [];
-        var items = this.parseClipboardData(data, parameter);
+        var items = this.parseClipboardData(data);
         items = this.getSortedPasteItems(items);
         for (var i = 0; i < items.length; i++) {
             var item = items[i];
@@ -28031,7 +28029,7 @@ var CloneCommand = /** @class */ (function (_super) {
     }
     CloneCommand.prototype.isEnabled = function () {
         var items = this.control.selection.getSelectedItems();
-        return _super.prototype.isEnabled.call(this) && items.length && (items.length > 1 || this.permissionsProvider.canAddItems(items));
+        return _super.prototype.isEnabled.call(this) && items.length && items.length > 0 && this.permissionsProvider.canAddItems(items);
     };
     CloneCommand.prototype.executeCore = function (state, parameter) {
         var selectionRect = Model_1.DiagramModel.getRectangle(this.control.selection.getSelectedItems());
@@ -29653,9 +29651,6 @@ var DiagramControl = /** @class */ (function () {
         if (this.onToggleFullscreen)
             this.onToggleFullscreen(value);
     };
-    DiagramControl.prototype.getPastePosition = function () {
-        return this.contextMenuPosition;
-    };
     DiagramControl.prototype.notifyShowContextMenu = function (eventPoint, modelPoint) {
         if (this.onShowContextMenu && this.render) {
             var selection = void 0;
@@ -29698,9 +29693,48 @@ var DiagramControl = /** @class */ (function () {
         this.barManager.updateItemsState();
     };
     DiagramControl.prototype.notifyRequestOperation = function (operation, args) {
+        if (this.requestOperationByDataSource(operation, args))
+            return;
         if (this.onRequestOperation)
             this.onRequestOperation(operation, args);
     };
+    DiagramControl.prototype.requestOperationByDataSource = function (operation, args) {
+        if (!(this.documentDataSource && (this.documentDataSource.IsNodeParentIdMode() || this.documentDataSource.IsNodeItemsMode())))
+            return false;
+        if (operation === ModelOperationSettings_1.DiagramModelOperation.ChangeConnection) {
+            var e = args;
+            var shape = e.shape && this.model.findItem(e.shape.id);
+            var connector = e.connector && this.model.findItem(e.connector.id);
+            if (!(shape && connector))
+                return;
+            // shape can have only one incoming connection
+            if (e.position === Connector_1.ConnectorPosition.End)
+                for (var i = 0; i < shape.attachedConnectors.length; i++) {
+                    var attachedConnector = shape.attachedConnectors[i];
+                    if (attachedConnector !== connector && attachedConnector.endItem && attachedConnector.endItem === shape) {
+                        e.allowed = false;
+                        break;
+                    }
+                }
+            // circular reference is not allowed
+            if (e.allowed && connector.beginItem && connector.endItem && this.isShapeParent(connector.endItem, connector.beginItem))
+                e.allowed = false;
+        }
+        return !args.allowed;
+    };
+    DiagramControl.prototype.isShapeParent = function (parentShape, shape) {
+        if (parentShape === shape)
+            return true;
+        for (var i = 0; i < parentShape.attachedConnectors.length; i++) {
+            var attachedConnector = parentShape.attachedConnectors[i];
+            if (attachedConnector.beginItem === parentShape && attachedConnector.endItem) {
+                var childShape = attachedConnector.endItem;
+                if (childShape === shape || this.isShapeParent(childShape, shape))
+                    return true;
+            }
+        }
+        return false;
+    };
     return DiagramControl;
 }());
 exports.DiagramControl = DiagramControl;
@@ -35283,6 +35317,12 @@ var DocumentDataSource = /** @class */ (function (_super) {
             this.updateNodeObjectChildren(nodeObj, containerItem, changesListener);
         }
     };
+    DocumentDataSource.prototype.IsNodeParentIdMode = function () {
+        return (this.useNodeParentId && this.nodeDataImporter.setParentKey !== undefined);
+    };
+    DocumentDataSource.prototype.IsNodeItemsMode = function () {
+        return (this.useNodeItems && this.nodeDataImporter.setItems !== undefined);
+    };
     DocumentDataSource.prototype.updateNodeObjectParentKey = function (nodeObj, parentNodeObj, changesListener) {
         var parentKey = this.nodeDataImporter.getParentKey(nodeObj.dataObj);
         var newParentKey = parentNodeObj ? this.nodeDataImporter.getKey(parentNodeObj.dataObj) : undefined;

package/dist/dx-diagram.min.css

@@ -1,8 +1,8 @@
 /*!
  * DevExpress Diagram (dx-diagram.min)
- * Version: 2.0.10
- * Build date: Thu Dec 24 2020
+ * Version: 2.0.11
+ * Build date: Thu Jan 14 2021
  * 
- * Copyright (c) 2012 - 2020 Developer Express Inc. ALL RIGHTS RESERVED
+ * Copyright (c) 2012 - 2021 Developer Express Inc. ALL RIGHTS RESERVED
  * Read about DevExpress licensing here: https://www.devexpress.com/Support/EULAs
  */.dxdi-control{overflow:visible;box-sizing:border-box;position:relative}.dxdi-control.dxdi-read-only .dxdi-canvas .shape,.dxdi-control.dxdi-read-only .dxdi-canvas .shape-expand-btn,.dxdi-control.dxdi-read-only .dxdi-canvas text{cursor:default}.dxdi-control .dxdi-canvas{display:block;background-color:#d9d9d9;transform-origin:0 0;overflow:hidden}.dxdi-canvas.dxdi-drag-scroll{cursor:grab!important}.dxdi-canvas *{user-select:none}.dxdi-canvas text{font-family:arial;font-size:10pt}.dxdi-canvas .page{fill:#fff}.dxdi-canvas .pages-grid-line{fill:none;stroke:rgba(0,0,0,.15);stroke-dasharray:8;stroke-width:2}.dxdi-canvas .grid-inner-line,.dxdi-canvas .grid-outer-line{fill:none}.dxdi-canvas .grid-outer-line{stroke:rgba(0,0,0,.1)}.dxdi-canvas .grid-inner-line{stroke:rgba(0,0,0,.05)}.dxdi-canvas .shape,.dxdi-canvas .toolbox-item{pointer-events:bounding-box}.dxdi-canvas .shape ellipse,.dxdi-canvas .shape line,.dxdi-canvas .shape path,.dxdi-canvas .shape rect,.dxdi-canvas .toolbox-item ellipse,.dxdi-canvas .toolbox-item line,.dxdi-canvas .toolbox-item path,.dxdi-canvas .toolbox-item rect{fill:#fff;stroke-width:2;stroke:#000}.dxdi-canvas .shape text,.dxdi-canvas .toolbox-item text{fill:#000;text-anchor:middle}.dxdi-canvas .shape rect.selector,.dxdi-canvas .toolbox-item rect.selector{stroke-width:48;stroke:transparent;fill:transparent;pointer-events:auto}.dxdi-canvas .shape.not-valid ellipse,.dxdi-canvas .shape.not-valid line,.dxdi-canvas .shape.not-valid path,.dxdi-canvas .shape.not-valid rect{stroke:red}.dxdi-canvas .shape{cursor:move}.dxdi-canvas .shape.text-input>text{display:none}.dxdi-canvas .shape.container>rect:first-child{fill:none}.dxdi-canvas .shape .shape-expand-btn{cursor:pointer}.dxdi-canvas .shape .shape-expand-btn>path,.dxdi-canvas .shape .shape-expand-btn>rect{stroke-dasharray:initial!important}.dxdi-canvas .shape .shape-expand-btn>path{stroke-width:2!important}.dxdi-canvas .shape .dxdi-image .dxdi-spinner{animation:loading-spinner 1s linear infinite}.dxdi-canvas .shape .dxdi-image .dxdi-spinner ellipse{stroke:#000;stroke-opacity:.2}.dxdi-canvas .shape .dxdi-image .dxdi-spinner path{stroke:#fd7010;stroke-linecap:round}.dxdi-canvas .shape .dxdi-image .dxdi-spinner ellipse,.dxdi-canvas .shape .dxdi-image .dxdi-spinner path{fill:none;stroke-width:5}@keyframes loading-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.dxdi-canvas .shape .dxdi-image .dxdi-user .dxdi-background{fill:#000;opacity:.2;stroke:none}.dxdi-canvas .shape .dxdi-image .dxdi-user ellipse,.dxdi-canvas .shape .dxdi-image .dxdi-user path{fill:#fff;stroke:none}.dxdi-canvas .shape .dxdi-image .dxdi-warning ellipse{stroke:none;fill:#ee1616}.dxdi-canvas .shape .dxdi-image .dxdi-warning rect{stroke:none;fill:#fff}.dxdi-canvas .shape.locked,.dxdi-canvas .shape.locked+.container-children .shape,.dxdi-canvas .shape.locked+.container-children .shape .shape-expand-btn,.dxdi-canvas .shape.locked .shape-expand-btn{cursor:inherit!important}.dxdi-canvas .container-children .shape .selector{stroke-width:8}.dxdi-canvas .toolbox-item{cursor:pointer}.dxdi-canvas .toolbox-item .selector{stroke-width:0!important}.dxdi-canvas .connector line,.dxdi-canvas .connector path{stroke-width:2;stroke:#000;stroke-linejoin:round;pointer-events:stroke}.dxdi-canvas .connector path:not(.outlined-line-ending):not(.filled-line-ending){fill:none!important}.dxdi-canvas .connector path.outlined-line-ending{fill:#fff}.dxdi-canvas .connector path.filled-line-ending{fill:#000}.dxdi-canvas .connector line.selector,.dxdi-canvas .connector path.selector{stroke-width:16;stroke:transparent}.dxdi-canvas .connector text{cursor:move;fill:#000;text-anchor:middle}.dxdi-canvas .connector .text-filter-flood{flood-color:#fff}.dxdi-canvas .connector.not-valid line,.dxdi-canvas .connector.not-valid path{stroke:red}.dxdi-canvas .connector.can-move{cursor:move}.dxdi-canvas .connection-mark,.dxdi-canvas .connection-point,.dxdi-canvas .connector-point-mark,.dxdi-canvas .connector-side-mark,.dxdi-canvas .geometry-mark,.dxdi-canvas .selection-mark{fill:#fff;stroke-width:2}.dxdi-canvas .selection-mark{stroke:#1e90ff}.dxdi-canvas .selection-mark[data-type="9"][data-value="1"]{cursor:nw-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="2"]{cursor:ne-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="3"]{cursor:se-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="4"]{cursor:sw-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="5"]{cursor:n-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="6"]{cursor:e-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="7"]{cursor:s-resize}.dxdi-canvas .selection-mark[data-type="9"][data-value="8"]{cursor:w-resize}.dxdi-canvas .selection-mark[data-type="4"],.dxdi-canvas .selection-mark[data-type="5"]{cursor:move}.dxdi-canvas .locked-selection-mark{fill:#fff;stroke-width:1;stroke:#666}.dxdi-canvas .geometry-mark{cursor:pointer;stroke:#daa520}.dxdi-canvas .connection-target,.dxdi-canvas .container-target{fill:transparent;stroke:orchid;stroke-width:2;pointer-events:none}.dxdi-canvas .connection-point{cursor:crosshair;stroke:orchid}.dxdi-canvas .connection-point.not-valid{stroke:grey;display:none}.dxdi-canvas .connection-mark{cursor:crosshair;stroke:orchid}.dxdi-canvas .connection-mark.selector,.dxdi-canvas .connection-point.selector{stroke-width:10px;stroke:transparent;fill:transparent}.dxdi-canvas .connection-mark.active,.dxdi-canvas .connection-point.active{fill:orchid}.dxdi-canvas .connector-point-mark,.dxdi-canvas .connector-side-mark{cursor:move;stroke:#1e90ff}.dxdi-canvas .connector-point-mark.disabled{cursor:default;display:none}.dxdi-canvas .connector-side-mark{fill:#1e90ff}.dxdi-canvas .connector-side-mark.vertical{cursor:col-resize}.dxdi-canvas .connector-side-mark.horizontal{cursor:row-resize}.dxdi-canvas .item-selection-rect,.dxdi-canvas .items-selection-rect{fill:transparent;stroke-width:1;stroke:#1e90ff;stroke-dasharray:2px;pointer-events:none}.dxdi-canvas .items-selection-rect{fill:rgba(30,144,255,.02)}.dxdi-canvas .item-multi-selection-rect{fill:rgba(30,144,255,.02);stroke-width:1;stroke:#1e90ff;pointer-events:none}.dxdi-canvas .selection-rect{fill:rgba(30,144,255,.2);stroke-width:1;stroke:#1e90ff;pointer-events:none}.dxdi-canvas .connector-multi-selection,.dxdi-canvas .connector-selection{fill:transparent;stroke-width:1;stroke:#1e90ff;pointer-events:none}.dxdi-canvas .connector-multi-selection.text,.dxdi-canvas .connector-selection.text{fill:transparent;stroke-width:1}.dxdi-canvas .connector-selection{stroke-dasharray:2px}.dxdi-canvas .connector-selection-mask rect{fill:#000}.dxdi-canvas .connector-selection-mask rect.background{fill:#fff}.dxdi-canvas .connector-selection-mask line,.dxdi-canvas .connector-selection-mask path{fill:#fff;stroke:#000;stroke-width:4}.dxdi-canvas .connector-selection-mask text{text-anchor:middle}.dxdi-canvas .extension-line path{stroke:#1e90ff;stroke-width:1}.dxdi-canvas .extension-line path.size-line{stroke-dasharray:4px}.dxdi-canvas .extension-line text{fill:#1e90ff;font-size:.8em;text-anchor:middle}.dxdi-canvas .extension-line.center>path.size-line,.dxdi-canvas .extension-line.page>path.size-line{stroke-dasharray:0}.dxdi-canvas .extension-line:not(.center)>path:not(:first-child){display:none}.dxdi-canvas .resize-info text{fill:rgba(0,0,0,.8);font-size:.8em;text-anchor:middle}.dxdi-canvas .resize-info rect{fill:#fff;stroke:rgba(0,0,0,.3);stroke-width:1}.dxdi-canvas .dxdi-active-selection .shape{cursor:default}.dxdi-control:not(.focused) .dxdi-canvas .geometry-mark,.dxdi-control:not(.focused) .dxdi-canvas .selection-mark{stroke:#666}.dxdi-control:not(.focused) .dxdi-canvas .item-selection-rect,.dxdi-control:not(.focused) .dxdi-canvas .items-selection-rect{fill:transparent;stroke:#666}.dxdi-control:not(.focused) .dxdi-canvas .items-selection-rect{fill:hsla(0,0%,56.5%,.02)}.dxdi-control:not(.focused) .dxdi-canvas .item-multi-selection-rect{fill:hsla(0,0%,56.5%,.02);stroke:#666}.dxdi-control:not(.focused) .dxdi-canvas .connection-mark,.dxdi-control:not(.focused) .dxdi-canvas .connection-mark.selector,.dxdi-control:not(.focused) .dxdi-canvas .connection-point,.dxdi-control:not(.focused) .dxdi-canvas .connection-point.selector{display:none}.dxdi-control:not(.focused) .dxdi-canvas .connector-multi-selection,.dxdi-control:not(.focused) .dxdi-canvas .connector-point-mark,.dxdi-control:not(.focused) .dxdi-canvas .connector-selection,.dxdi-control:not(.focused) .dxdi-canvas .connector-side-mark{stroke:#666}.dxdi-control:not(.focused) .dxdi-canvas .connector-side-mark{fill:#666}.dxdi-dragging,.dxdi-dragging *{user-select:none}.dxdi-canvas.export *{cursor:inherit!important;pointer-events:all!important}.dxdi-toolbox,.dxdi-toolbox svg{user-select:none;outline:none}.dxdi-toolbox,.dxdi-toolbox-drag-item .dxdi-canvas,.dxdi-toolbox .dxdi-canvas{width:100%;height:100%}.dxdi-toolbox .dxdi-canvas .toolbox-item ellipse,.dxdi-toolbox .dxdi-canvas .toolbox-item line,.dxdi-toolbox .dxdi-canvas .toolbox-item path,.dxdi-toolbox .dxdi-canvas .toolbox-item rect{fill:transparent;stroke:currentColor}.dxdi-toolbox .dxdi-canvas .toolbox-item .dxdi-image-placeholder{opacity:.75;fill:currentColor;stroke:none}.dxdi-toolbox .dxdi-canvas .toolbox-item .dxdi-shape-text{opacity:.25}.dxdi-toolbox-drag-item .dxdi-canvas text,.dxdi-toolbox .dxdi-canvas .toolbox-item text{font-weight:700;font-family:Segoe UI,Helvetica Neue,Helvetica,arial,sans-serif;fill:currentColor}.dxdi-toolbox-drag-item .dxdi-canvas .dxdi-image-placeholder{opacity:.75;fill:currentColor;stroke:none}.dxdi-toolbox-drag-item .dxdi-canvas .dxdi-shape-text{display:none}.dxdi-toolbox .toolbox-text-item{cursor:pointer;user-select:none;margin:0 0 .6em}.dxdi-toolbox-drag-item,.dxdi-toolbox-drag-text-item{font-family:arial;font-size:10pt;color:#000;position:absolute;z-index:10000;pointer-events:none!important}.dxdi-toolbox-drag-item *,.dxdi-toolbox-drag-text-item *{pointer-events:none!important}.dxdi-toolbox-drag-item text{pointer-events:none}.dxdi-toolbox-drag-text-item{background-color:#fff;border:2px solid #000;padding:.5em}.dxdi-tb-drag-captured{display:none}.dxdi-focus-input,.dxdi-text-input,.dxdi-text-input-container{padding:0;outline:none;border:none;resize:none}.dxdi-clipboard-input,.dxdi-focus-input{position:fixed;overflow:hidden;left:-1000px!important;top:-1000px!important}.dxdi-text-input-container{display:none}.dxdi-text-input-container.connector-text,.dxdi-text-input-container.shape-text{display:inherit;position:absolute;overflow:hidden;background-color:transparent;transform-origin:0 0}.dxdi-text-input-container.shape-text .dxdi-text-input{display:table-cell;overflow:hidden;padding:1px 0 0;outline:none;background-color:transparent;font-family:arial;font-size:10pt;color:#000;line-height:1.1em;text-align:center;vertical-align:middle}.dxdi-text-input-container.connector-text{overflow:visible}.dxdi-text-input-container.connector-text .dxdi-text-input{padding:2px;outline:none;height:calc(1.1em + 6px);width:calc(8em + 6px);margin-top:calc(-.55em - 3px);margin-left:calc(-4em - 3px);background-color:#fff;border:1px solid #1e90ff;font-family:arial;font-size:10pt;color:#000;line-height:1.1em;text-align:center;vertical-align:middle;overflow:hidden}.dxdi-page-shadow{fill:grey}