frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace selectedLinks array with wrapped Set object

This commit is contained in:
Nick O'Leary 2021-12-13 21:02:55 +00:00
parent ecaf866613
commit 43651135f3
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,8 +63,6 @@ RED.view = (function() {
var activeGroups = []; var activeGroups = [];
var dirtyGroups = {}; var dirtyGroups = {};
var selectedLinks = [];
var mousedown_link = null; var mousedown_link = null;
var mousedown_node = null; var mousedown_node = null;
var mousedown_group = null; var mousedown_group = null;
@ -160,6 +158,31 @@ RED.view = (function() {
return api; return api;
})(); })();
var selectedLinks = (function() {
var links = new Set();
return {
add: function(link) {
links.add(link);
link.selected = true;
},
remove: function(link) {
links.delete(link);
link.selected = false;
},
clear: function() {
links.forEach(function(link) { link.selected = false })
links.clear();
},
length: function() {
return links.size;
},
forEach: function(func) { links.forEach(func) },
has: function(link) { return links.has(link) },
toArray: function() { return Array.from(links) }
}
})();
function init() { function init() {
chart = $("#red-ui-workspace-chart"); chart = $("#red-ui-workspace-chart");
@ -910,7 +933,7 @@ RED.view = (function() {
return; return;
} }
if (!mousedown_node && !mousedown_link && !mousedown_group) { if (!mousedown_node && !mousedown_link && !mousedown_group) {
selectedLinks = []; selectedLinks.clear();
updateSelection(); updateSelection();
} }
if (mouse_mode === 0) { if (mouse_mode === 0) {
@ -1349,7 +1372,7 @@ RED.view = (function() {
return; return;
} }
if (mouse_mode != RED.state.QUICK_JOINING && mouse_mode != RED.state.IMPORT_DRAGGING && !mousedown_node && !mousedown_group && selectedLinks.length === 0) { if (mouse_mode != RED.state.QUICK_JOINING && mouse_mode != RED.state.IMPORT_DRAGGING && !mousedown_node && !mousedown_group && selectedLinks.length() === 0) {
return; return;
} }
@ -1373,7 +1396,7 @@ RED.view = (function() {
// Get all the wires we need to detach. // Get all the wires we need to detach.
var links = []; var links = [];
var existingLinks = []; var existingLinks = [];
if (selectedLinks.length > 0) { if (selectedLinks.length() > 0) {
selectedLinks.forEach(function(link) { selectedLinks.forEach(function(link) {
if (((mousedown_port_type === PORT_TYPE_OUTPUT && if (((mousedown_port_type === PORT_TYPE_OUTPUT &&
link.source === mousedown_node && link.source === mousedown_node &&
@ -1422,7 +1445,7 @@ RED.view = (function() {
} else if (mousedown_node && !quickAddLink) { } else if (mousedown_node && !quickAddLink) {
showDragLines([{node:mousedown_node,port:mousedown_port_index,portType:mousedown_port_type}]); showDragLines([{node:mousedown_node,port:mousedown_port_index,portType:mousedown_port_type}]);
} }
selectedLinks = []; selectedLinks.clear();
} }
mousePos = mouse_position; mousePos = mouse_position;
for (i=0;i<drag_lines.length;i++) { for (i=0;i<drag_lines.length;i++) {
@ -1944,7 +1967,7 @@ RED.view = (function() {
} }
} }
} }
selectedLinks = []; selectedLinks.clear();
if (mouse_mode !== RED.state.SELECTING_NODE) { if (mouse_mode !== RED.state.SELECTING_NODE) {
updateSelection(); updateSelection();
} }
@ -1959,7 +1982,7 @@ RED.view = (function() {
n.n.selected = false; n.n.selected = false;
} }
movingSet.clear(); movingSet.clear();
selectedLinks = []; selectedLinks.clear();
if (activeGroup) { if (activeGroup) {
activeGroup.active = false activeGroup.active = false
activeGroup.dirty = true; activeGroup.dirty = true;
@ -2053,7 +2076,7 @@ RED.view = (function() {
} }
} }
} }
if (activeFlowLinks.length === 0 && selectedLinks.length > 0) { if (activeFlowLinks.length === 0 && selectedLinks.length() > 0) {
selectedLinks.forEach(function(link) { selectedLinks.forEach(function(link) {
if (link.link) { if (link.link) {
activeLinks.push(link); activeLinks.push(link);
@ -2146,7 +2169,7 @@ RED.view = (function() {
updateActiveNodes(); updateActiveNodes();
updateSelection(); updateSelection();
redraw(); redraw();
} else if (movingSet.length() > 0 || selectedLinks.length > 0) { } else if (movingSet.length() > 0 || selectedLinks.length() > 0) {
var result; var result;
var node; var node;
var removedNodes = []; var removedNodes = [];
@ -2247,7 +2270,7 @@ RED.view = (function() {
} }
var linkRemoveHistoryEvents = []; var linkRemoveHistoryEvents = [];
if (selectedLinks.length > 0) { if (selectedLinks.length() > 0) {
selectedLinks.forEach(function(link) { selectedLinks.forEach(function(link) {
if (link.link) { if (link.link) {
var sourceId = link.source.id; var sourceId = link.source.id;
@ -2319,7 +2342,7 @@ RED.view = (function() {
RED.history.push(historyEvent); RED.history.push(historyEvent);
} }
selectedLinks = []; selectedLinks.clear();
updateActiveNodes(); updateActiveNodes();
updateSelection(); updateSelection();
redraw(); redraw();
@ -2730,12 +2753,13 @@ RED.view = (function() {
} else { } else {
resetMouseVars(); resetMouseVars();
} }
//TODO: selectedLinks
console.log("Wanted to set selected_link (1)",select_link)
// selected_link = select_link;
mousedown_link = select_link; mousedown_link = select_link;
if (select_link) { if (select_link) {
selectedLinks.clear();
selectedLinks.add(select_link);
updateSelection(); updateSelection();
} else {
selectedLinks.clear();
} }
} }
redraw(); redraw();
@ -2745,7 +2769,8 @@ RED.view = (function() {
resetMouseVars(); resetMouseVars();
hideDragLines(); hideDragLines();
if (select_link) { if (select_link) {
selectedLinks = [select_link]; selectedLinks.clear();
selectedLinks.add(select_link);
} }
mousedown_link = select_link; mousedown_link = select_link;
if (select_link) { if (select_link) {
@ -3237,7 +3262,7 @@ RED.view = (function() {
mousedown_node.selected = true; mousedown_node.selected = true;
movingSet.add(mousedown_node); movingSet.add(mousedown_node);
} }
selectedLinks = []; selectedLinks.clear();
if (d3.event.button != 2) { if (d3.event.button != 2) {
mouse_mode = RED.state.MOVING; mouse_mode = RED.state.MOVING;
var mouse = d3.touches(this)[0]||d3.mouse(this); var mouse = d3.touches(this)[0]||d3.mouse(this);
@ -3365,26 +3390,25 @@ RED.view = (function() {
} }
mousedown_link = d; mousedown_link = d;
if (selectedLinks.length === 0 || !(d3.event.metaKey || d3.event.ctrlKey)) { if (selectedLinks.length() === 0 || !(d3.event.metaKey || d3.event.ctrlKey)) {
clearSelection(); clearSelection();
} }
if (d3.event.metaKey || d3.event.ctrlKey) { if (d3.event.metaKey || d3.event.ctrlKey) {
var linkIndex = selectedLinks.indexOf(mousedown_link); if (!selectedLinks.has(mousedown_link)) {
if (linkIndex === -1) { selectedLinks.add(mousedown_link);
selectedLinks.push(mousedown_link);
} else { } else {
if (selectedLinks.length !== 1) { if (selectedLinks.length() !== 1) {
selectedLinks.splice(linkIndex,1); selectedLinks.remove(mousedown_link);
} }
} }
} else { } else {
selectedLinks.push(mousedown_link); selectedLinks.add(mousedown_link);
} }
updateSelection(); updateSelection();
redraw(); redraw();
focusView(); focusView();
d3.event.stopPropagation(); d3.event.stopPropagation();
if (selectedLinks.length === 1 && selectedLinks[0] === mousedown_link && (d3.event.metaKey || d3.event.ctrlKey)) { if (!mousedown_link.link && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && (d3.event.metaKey || d3.event.ctrlKey)) {
d3.select(this).classed("red-ui-flow-link-splice",true); d3.select(this).classed("red-ui-flow-link-splice",true);
var point = d3.mouse(this); var point = d3.mouse(this);
var clickedGroup = getGroupAt(point[0],point[1]); var clickedGroup = getGroupAt(point[0],point[1]);
@ -3398,7 +3422,8 @@ RED.view = (function() {
} }
mousedown_link = d; mousedown_link = d;
clearSelection(); clearSelection();
selectedLinks = [mousedown_link]; selectedLinks.clear();
selectedLinks.add(mousedown_link);
updateSelection(); updateSelection();
redraw(); redraw();
focusView(); focusView();
@ -3634,7 +3659,7 @@ RED.view = (function() {
function showTouchMenu(obj,pos) { function showTouchMenu(obj,pos) {
var mdn = mousedown_node; var mdn = mousedown_node;
var options = []; var options = [];
options.push({name:"delete",disabled:(movingSet.length()===0 && selectedLinks.length === 0),onselect:function() {deleteSelection();}}); options.push({name:"delete",disabled:(movingSet.length()===0 && selectedLinks.length() === 0),onselect:function() {deleteSelection();}});
options.push({name:"cut",disabled:(movingSet.length()===0),onselect:function() {copySelection();deleteSelection();}}); options.push({name:"cut",disabled:(movingSet.length()===0),onselect:function() {copySelection();deleteSelection();}});
options.push({name:"copy",disabled:(movingSet.length()===0),onselect:function() {copySelection();}}); options.push({name:"copy",disabled:(movingSet.length()===0),onselect:function() {copySelection();}});
options.push({name:"paste",disabled:(clipboard.length===0),onselect:function() {importNodes(clipboard, {generateIds: true, touchImport: true});}}); options.push({name:"paste",disabled:(clipboard.length===0),onselect:function() {importNodes(clipboard, {generateIds: true, touchImport: true});}});
@ -4391,7 +4416,7 @@ RED.view = (function() {
link.exit().remove(); link.exit().remove();
link.each(function(d) { link.each(function(d) {
var link = d3.select(this); var link = d3.select(this);
if (d.added || selectedLinks.includes(d) || d.selected || dirtyNodes[d.source.id] || dirtyNodes[d.target.id]) { if (d.added || d.selected || dirtyNodes[d.source.id] || dirtyNodes[d.target.id]) {
var numOutputs = d.source.outputs || 1; var numOutputs = d.source.outputs || 1;
var sourcePort = d.sourcePort || 0; var sourcePort = d.sourcePort || 0;
var y = -((numOutputs-1)/2)*13 +13*sourcePort; var y = -((numOutputs-1)/2)*13 +13*sourcePort;
@ -4414,7 +4439,8 @@ RED.view = (function() {
this.__pathLine__.classList.toggle("red-ui-flow-node-disabled",!!(d.source.d || d.target.d)); this.__pathLine__.classList.toggle("red-ui-flow-node-disabled",!!(d.source.d || d.target.d));
this.__pathLine__.classList.toggle("red-ui-flow-subflow-link", !d.link && activeSubflow); this.__pathLine__.classList.toggle("red-ui-flow-subflow-link", !d.link && activeSubflow);
} }
this.classList.toggle("red-ui-flow-link-selected", !!(selectedLinks.includes(d)||d.selected));
this.classList.toggle("red-ui-flow-link-selected", !!d.selected);
var connectedToUnknown = !!(d.target.type == "unknown" || d.source.type == "unknown"); var connectedToUnknown = !!(d.target.type == "unknown" || d.source.type == "unknown");
this.classList.toggle("red-ui-flow-link-unknown",!!(d.target.type == "unknown" || d.source.type == "unknown")) this.classList.toggle("red-ui-flow-link-unknown",!!(d.target.type == "unknown" || d.source.type == "unknown"))
@ -5122,10 +5148,9 @@ RED.view = (function() {
if (allNodes.size > 0) { if (allNodes.size > 0) {
selection.nodes = Array.from(allNodes); selection.nodes = Array.from(allNodes);
} }
if (selectedLinks.length > 0) { if (selectedLinks.length() > 0) {
selection.link = selectedLinks[0]; selection.links = selectedLinks.toArray();
// TODO: clone the array selection.link = selection.links[0];
selection.links = selectedLinks;
} }
return selection; return selection;
} }