frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Allow lasso selection to be restricted to active group

Browse Source
This commit is contained in:
Nick O'Leary 2020-08-05 11:16:53 +01:00
parent 1aa494a97a
commit 85edee288f
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@ -1558,13 +1558,23 @@ RED.view = (function() {
var y = parseInt(lasso.attr("y")); var y = parseInt(lasso.attr("y"));
var x2 = x+parseInt(lasso.attr("width")); var x2 = x+parseInt(lasso.attr("width"));
var y2 = y+parseInt(lasso.attr("height")); var y2 = y+parseInt(lasso.attr("height"));
var ag = activeGroup;
if (!d3.event.shiftKey) { if (!d3.event.shiftKey) {
clearSelection(); clearSelection();
if (ag) {
if (x < ag.x+ag.w && x2 > ag.x && y < ag.y+ag.h && y2 > ag.y) {
// There was an active group and the lasso intersects with it,
// so reenter the group
enterActiveGroup(ag);
activeGroup.selected = true;
}
}
} }
activeGroups.forEach(function(g) { activeGroups.forEach(function(g) {
if (!g.selected) { if (!g.selected) {
if (g.x > x && g.x+g.w < x2 && g.y > y && g.y+g.h < y2) { if (g.x > x && g.x+g.w < x2 && g.y > y && g.y+g.h < y2) {
while (g.g) { if (!activeGroup || RED.group.contains(activeGroup,g)) {
while (g.g && (!activeGroup || g.g !== activeGroup.id)) {
g = RED.nodes.group(g.g); g = RED.nodes.group(g.g);
} }
if (!g.selected) { if (!g.selected) {
@ -1572,14 +1582,17 @@ RED.view = (function() {
} }
} }
} }
}
}) })
activeNodes.forEach(function(n) { activeNodes.forEach(function(n) {
if (!n.selected) { if (!n.selected) {
if (n.x > x && n.x < x2 && n.y > y && n.y < y2) { if (n.x > x && n.x < x2 && n.y > y && n.y < y2) {
if (n.g) { if (!activeGroup || RED.group.contains(activeGroup,n)) {
if (n.g && (!activeGroup || n.g !== activeGroup.id)) {
console.log("HERE")
var group = RED.nodes.group(n.g); var group = RED.nodes.group(n.g);
while (group.g) { while (group.g && (!activeGroup || group.g !== activeGroup.id)) {
group = RED.nodes.group(group.g); group = RED.nodes.group(group.g);
} }
if (!group.selected) { if (!group.selected) {
@ -1592,6 +1605,7 @@ RED.view = (function() {
} }
} }
} }
}
}); });