24.0.6 release

ChangeLog

@@ -1,3 +1,11 @@
+13-MAR-2024: 24.0.6
+
+- Moves subtree when tree is collapsed [drawio-3113]
+- Fixes ignored given local filename [drawio-3555]
+- Fixes possible NPE in Graph.executeCustomActions
+- Fixes event handling on background pages
+- Fixes %length% placeholder in child edge labels [drawio-1677]
+
 11-MAR-2024: 24.0.5
 
 - Adds checkbox for text shadow [drawio-4247]

VERSION

@@ -1 +1 @@
-24.0.5
+24.0.6

src/main/mxgraph/view/mxGraphView.js

@@ -2520,17 +2520,14 @@ mxGraphView.prototype.getDecoratorPane = function()
 mxGraphView.prototype.isContainerEvent = function(evt)
 {
 	var source = mxEvent.getSource(evt);
-
-	return (source == this.graph.container ||
-		source.parentNode == this.backgroundPane ||
-		(source.parentNode != null &&
-		source.parentNode.parentNode == this.backgroundPane) ||
+
+	return source == this.graph.container ||
+		this.backgroundPane.contains(source) ||
 		source == this.canvas.parentNode ||
 		source == this.canvas ||
-		source == this.backgroundPane ||
 		source == this.drawPane ||
 		source == this.overlayPane ||
-		source == this.decoratorPane);
+		source == this.decoratorPane;
 };
 
 /**

src/main/webapp/js/diagramly/App.js

@@ -3944,8 +3944,7 @@ App.prototype.createFileSystemOptions = function(name)
 		}
 	}
 
-	// TODO: Specify default filename
-	return {types: ext, fileName: name};
+	return {types: ext, suggestedName: name};
 };
 
 /**

src/main/webapp/js/diagramly/Editor.js

@@ -7378,6 +7378,11 @@
 
 						if (action.tags.hidden != null)
 						{
+							if (hidden == null)
+							{
+								hidden = [];
+							}
+
 							hidden = hidden.concat(action.tags.hidden);
 						}
 

src/main/webapp/js/diagramly/Trees.js

@@ -493,6 +493,24 @@
 		graph.moveCells = function(cells, dx, dy, clone, target, evt, mapping)
 		{
 			var result = null;
+
+			// Adds collapsed subtrees
+			var allCells = [];
+
+			for (var i = 0; i < cells.length; i++)
+			{
+				if (((isTreeMoving(cells[i]) || isTreeVertex(cells[i])) &&
+					!hasLayoutParent(cells[i])) && this.isCellCollapsed(cells[i])	)
+				{
+					allCells = allCells.concat(this.getSubtree(cells[i]));
+				}
+				else
+				{
+					allCells.push(cells[i]);
+				}
+			}
+
+			cells = mxUtils.removeDuplicates(allCells);
 
 			this.model.beginUpdate();
 			try
@@ -1224,36 +1242,44 @@
 			return cells;
 		};
 
-		var vertexHandlerInit = mxVertexHandler.prototype.init;
+		var vertexHandlerRefresh = mxVertexHandler.prototype.refresh;
 
-		mxVertexHandler.prototype.init = function()
+		mxVertexHandler.prototype.refresh = function()
 		{
-			vertexHandlerInit.apply(this, arguments);
-			
+			vertexHandlerRefresh.apply(this, arguments);
+
 			if (((isTreeMoving(this.state.cell) || isTreeVertex(this.state.cell)) &&
 				!hasLayoutParent(this.state.cell)) && this.graph.getOutgoingTreeEdges(
-				this.state.cell).length > 0)
+				this.state.cell).length > 0 && !this.graph.isCellCollapsed(this.state.cell))
 			{
-				this.moveHandle = mxUtils.createImage(Editor.moveImage);
-				this.moveHandle.setAttribute('title', 'Move Subtree');
-				this.moveHandle.style.position = 'absolute';
-				this.moveHandle.style.cursor = 'pointer';
-				this.moveHandle.style.width = '24px';
-				this.moveHandle.style.height = '24px';
-				this.graph.container.appendChild(this.moveHandle);
-				this.redrawMoveHandle();
-
-				mxEvent.addGestureListeners(this.moveHandle, mxUtils.bind(this, function(evt)
+				if (this.moveHandle == null)
 				{
-					this.graph.graphHandler.start(this.state.cell,
-						mxEvent.getClientX(evt), mxEvent.getClientY(evt),
-						this.graph.getSubtree(this.state.cell));
-					this.graph.graphHandler.cellWasClicked = true;
-					this.graph.isMouseTrigger = mxEvent.isMouseEvent(evt);
-					this.graph.isMouseDown = true;
-					ui.hoverIcons.reset();
-					mxEvent.consume(evt);
-				}));
+					this.moveHandle = mxUtils.createImage(Editor.moveImage);
+					this.moveHandle.setAttribute('title', 'Move Subtree');
+					this.moveHandle.style.position = 'absolute';
+					this.moveHandle.style.cursor = 'pointer';
+					this.moveHandle.style.width = '24px';
+					this.moveHandle.style.height = '24px';
+					this.graph.container.appendChild(this.moveHandle);
+					this.redrawMoveHandle();
+
+					mxEvent.addGestureListeners(this.moveHandle, mxUtils.bind(this, function(evt)
+					{
+						this.graph.graphHandler.start(this.state.cell,
+							mxEvent.getClientX(evt), mxEvent.getClientY(evt),
+							this.graph.getSubtree(this.state.cell));
+						this.graph.graphHandler.cellWasClicked = true;
+						this.graph.isMouseTrigger = mxEvent.isMouseEvent(evt);
+						this.graph.isMouseDown = true;
+						ui.hoverIcons.reset();
+						mxEvent.consume(evt);
+					}));
+				}
+			}
+			else if (this.moveHandle != null)
+			{
+				this.moveHandle.parentNode.removeChild(this.moveHandle);
+				this.moveHandle = null;
 			}
 		};
 

src/main/webapp/js/grapheditor/Graph.js

@@ -2168,7 +2168,7 @@ Graph.exploreFromCell = function(sourceGraph, selectionCell, config)
 				}
 			}
 		};
-
+		
 		// Gets the edges from the source cell and adds the targets
 		function rootChanged(graph, cell)
 		{
@@ -2185,10 +2185,10 @@ Graph.exploreFromCell = function(sourceGraph, selectionCell, config)
 				if (edges[i].getTerminal(true) != null &&
 					edges[i].getTerminal(false) != null &&
 					sourceGraph.isCellVisible(edges[i]) &&
+					!sourceGraph.isEdgeIgnored(edges[i]) &&
 					sourceGraph.isCellVisible(edges[i].getTerminal(true)) &&
 					sourceGraph.isCellVisible(edges[i].getTerminal(false)) &&
-					sourceGraph.isCellVisible(sourceGraph.getLayerForCell(edges[i])) &&
-					mxUtils.getValue(sourceGraph.getCellStyle(edges[i]), 'ignoreEdge', '0') != '1')
+					sourceGraph.isCellVisible(sourceGraph.getLayerForCell(edges[i]))) 
 				{
 					validEdges.push(edges[i]);
 				}
@@ -5116,9 +5116,17 @@ Graph.prototype.replacePlaceholders = function(cell, str, vars, translate)
 							tmp = geo.height;
 						}
 					}
-					else if (name == 'length' && this.model.isEdge(cell))
+					else if (name == 'length')
 					{
-						var state = this.view.getState(cell);
+						// Gets ancestor edge
+						var edge = cell;
+
+						while (edge != null && !this.model.isEdge(edge))
+						{
+							edge = this.model.getParent(edge);
+						}
+
+						var state = this.view.getState(edge);
 
 						if (state != null)
 						{