Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/jgraph/drawio into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Nov 16, 2023
2 parents 0d41ff8 + 0f7f63f commit c26a1ad
Show file tree
Hide file tree
Showing 11 changed files with 212 additions and 156 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
15-NOV-2023: 21.1.2

- Fixes move of child cells in groups [drawio-3967]
- [conf cloud] Fixes bugs in rendering diagrams with pageInfo param [DFCC-64]

13-NOV-2023: 21.1.1

- Reverts part of e6ea9f to restore child cell dragging behaviour [drawio-3967]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.1.1
22.1.2
51 changes: 46 additions & 5 deletions src/main/mxgraph/handler/mxGraphHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,29 @@ mxGraphHandler.prototype.setRemoveCellsFromParent = function(value)
this.removeCellsFromParent = value;
};

/**
* Function: isAncestorSelected
*
* Returns true if the given cell and parent should propagate
* selection state to the parent.
*/
mxGraphHandler.prototype.isAncestorSelected = function(cell)
{
var parent = this.graph.model.getParent(cell);

while (parent != null)
{
if (this.graph.isCellSelected(parent))
{
return true;
}

parent = this.graph.model.getParent(parent);
}

return false;
};

/**
* Function: isPropagateSelectionCell
*
Expand Down Expand Up @@ -1033,7 +1056,15 @@ mxGraphHandler.prototype.roundLength = function(length)
*/
mxGraphHandler.prototype.isValidDropTarget = function(target, me)
{
return this.graph.model.getParent(this.cell) != target;
for (var i = 0; i < this.cells.length; i++)
{
if (this.graph.model.getParent(this.cells[i]) != target)
{
return true;
}
}

return false;
};

/**
Expand Down Expand Up @@ -1082,13 +1113,22 @@ mxGraphHandler.prototype.mouseMove = function(sender, me)
this.delayedSelection = false;
this.cellWasClicked = true;

if (!mxEvent.isAltDown(me.getEvent()))
if (!this.graph.isCellSelected(this.cell) &&
!mxEvent.isAltDown(me.getEvent()))
{
graph.addSelectionCell(this.cell);
if (this.graph.isToggleEvent(me.getEvent()))
{
graph.addSelectionCell(this.cell);
}
else if (!this.isAncestorSelected(this.cell))
{
graph.setSelectionCell(this.cell);
}
}

this.start(this.cell, this.mouseDownX, this.mouseDownY,
graph.getMovableCells(graph.getSelectionCells()));
this.getCells(null, graph.getSelectionCells().
concat(me.getCell())));
}

var delta = (this.first != null) ? this.getDelta(me) : null;
Expand Down Expand Up @@ -1124,6 +1164,7 @@ mxGraphHandler.prototype.mouseMove = function(sender, me)
{
return mxUtils.indexOf(this.cells, state.cell) >= 0;
}));

var hideGuide = true;
var target = null;
this.cloning = clone;
Expand Down
20 changes: 11 additions & 9 deletions src/main/webapp/js/app.min.js

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions src/main/webapp/js/integrate.min.js

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions src/main/webapp/js/viewer-static.min.js

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions src/main/webapp/js/viewer.min.js

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions src/main/webapp/mxgraph/mxClient.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

1 comment on commit c26a1ad

@vercel
Copy link

@vercel vercel bot commented on c26a1ad Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

drawio – ./

drawio-louyongjiu.vercel.app
drawio-git-dev-louyongjiu.vercel.app
drawio.nines.center

Please sign in to comment.