@node-red/editor-client 2.1.2 → 2.2.0-beta.1

package/public/red/red.js

@@ -566,31 +566,33 @@ var RED = (function() {
             var typeList;
             var info;
             if (topic == "notification/node/added") {
-                var addedTypes = [];
-                msg.forEach(function(m) {
-                    var id = m.id;
-                    RED.nodes.addNodeSet(m);
-                    addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadNodeCatalog(id, function() {
-                        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
-                        $.ajax({
-                            headers: {
-                                "Accept":"text/html",
-                                "Accept-Language": lang
-                            },
-                            cache: false,
-                            url: 'nodes/'+id,
-                            success: function(data) {
-                                appendNodeConfig(data);
-                            }
+                RED.settings.refreshSettings(function(err, data) {
+                    var addedTypes = [];
+                    msg.forEach(function(m) {
+                        var id = m.id;
+                        RED.nodes.addNodeSet(m);
+                        addedTypes = addedTypes.concat(m.types);
+                        RED.i18n.loadNodeCatalog(id, function() {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                }
+                            });
                         });
                     });
-                });
-                if (addedTypes.length) {
-                    typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                    RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
-                }
-                loadIconList();
+                    if (addedTypes.length) {
+                        typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                        RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
+                    }
+                    loadIconList();
+                })
             } else if (topic == "notification/node/removed") {
                 for (i=0;i<msg.length;i++) {
                     m = msg[i];
@@ -603,27 +605,29 @@ var RED = (function() {
                 loadIconList();
             } else if (topic == "notification/node/enabled") {
                 if (msg.types) {
-                    info = RED.nodes.getNodeSet(msg.id);
-                    if (info.added) {
-                        RED.nodes.enableNodeSet(msg.id);
-                        typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
-                    } else {
-                        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
-                        $.ajax({
-                            headers: {
-                                "Accept":"text/html",
-                                "Accept-Language": lang
-                            },
-                            cache: false,
-                            url: 'nodes/'+msg.id,
-                            success: function(data) {
-                                appendNodeConfig(data);
-                                typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                                RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
-                            }
-                        });
-                    }
+                    RED.settings.refreshSettings(function(err, data) {
+                        info = RED.nodes.getNodeSet(msg.id);
+                        if (info.added) {
+                            RED.nodes.enableNodeSet(msg.id);
+                            typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
+                        } else {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+msg.id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                    typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                                    RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                                }
+                            });
+                        }
+                    });
                 }
             } else if (topic == "notification/node/disabled") {
                 if (msg.types) {
@@ -677,7 +681,7 @@ var RED = (function() {
                 {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
             ]});
         }
-        menuOptions.push({id:"menu-item-edit-menu", label:"Edit", options: [
+        menuOptions.push({id:"menu-item-edit-menu", label:RED._("menu.label.edit"), options: [
             {id: "menu-item-edit-undo", label:RED._("keyboard.undoChange"), disabled: true, onselect: "core:undo"},
             {id: "menu-item-edit-redo", label:RED._("keyboard.redoChange"), disabled: true, onselect: "core:redo"},
             null,
@@ -1168,6 +1172,8 @@ RED.i18n = (function() {
                 defaultNS: "editor",
                 fallbackLng: ['en-US'],
                 returnObjects: true,
+                keySeparator: ".",
+                nsSeparator: ":",
                 interpolation: {
                     unescapeSuffix: 'HTML',
                     escapeValue: false,
@@ -1408,7 +1414,7 @@ RED.settings = (function () {
         load(done);
     }
 
-    var load = function(done) {
+    var refreshSettings = function(done) {
         $.ajax({
             headers: {
                 "Accept": "application/json"
@@ -1418,6 +1424,23 @@ RED.settings = (function () {
             url: 'settings',
             success: function (data) {
                 setProperties(data);
+                done(null, data);
+            },
+            error: function(jqXHR,textStatus,errorThrown) {
+                if (jqXHR.status === 401) {
+                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
+                        window.location.search = "";
+                    }
+                    RED.user.login(function() { refreshSettings(done); });
+                } else {
+                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
+                }
+            }
+        });
+    }
+    var load = function(done) {
+        refreshSettings(function(err, data) {
+            if (!err) {
                 if (!RED.settings.user || RED.settings.user.anonymous) {
                     RED.settings.remove("auth-tokens");
                 }
@@ -1430,18 +1453,8 @@ RED.settings = (function () {
                 console.log("D3",d3.version);
                 console.groupEnd();
                 loadUserSettings(done);
-            },
-            error: function(jqXHR,textStatus,errorThrown) {
-                if (jqXHR.status === 401) {
-                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
-                        window.location.search = "";
-                    }
-                    RED.user.login(function() { load(done); });
-                } else {
-                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
-                }
             }
-        });
+        })
     };
 
     function loadUserSettings(done) {
@@ -1517,6 +1530,7 @@ RED.settings = (function () {
         init: init,
         load: load,
         loadUserSettings: loadUserSettings,
+        refreshSettings: refreshSettings,
         set: set,
         get: get,
         remove: remove,
@@ -3525,7 +3539,9 @@ RED.state = {
     PANNING: 10,
     SELECTING_NODE: 11,
     GROUP_DRAGGING: 12,
-    GROUP_RESIZE: 13
+    GROUP_RESIZE: 13,
+    DETACHED_DRAGGING: 14,
+    SLICING: 15
 }
 ;RED.plugins = (function() {
     var plugins = {};
@@ -3590,6 +3606,9 @@ RED.state = {
  **/
 RED.nodes = (function() {
 
+    var PORT_TYPE_INPUT = 1;
+    var PORT_TYPE_OUTPUT = 0;
+
     var node_defs = {};
     var linkTabMap = {};
 
@@ -4380,7 +4399,6 @@ RED.nodes = (function() {
         var removedGroups = [];
         if (ws) {
             delete workspaces[id];
-            allNodes.removeTab(id);
             delete linkTabMap[id];
             workspacesOrder.splice(workspacesOrder.indexOf(id),1);
             var i;
@@ -4418,6 +4436,7 @@ RED.nodes = (function() {
             for (i=removedGroups.length-1; i>=0; i--) {
                 removeGroup(removedGroups[i]);
             }
+            allNodes.removeTab(id);
             RED.events.emit('flows:remove',ws);
         }
         return {nodes:removedNodes,links:removedLinks, groups: removedGroups};
@@ -4672,6 +4691,11 @@ RED.nodes = (function() {
             // Until we know how that can happen, add a filter here to remove them
             node.nodes = node.nodes.filter(function(n) { return !!n }).map(function(n) { return n.id });
         }
+        if (n.type === "tab" || n.type === "group") {
+            if (node.env && node.env.length === 0) {
+                delete node.env;
+            }
+        }
         if (n._def.category != "config") {
             node.x = n.x;
             node.y = n.y;
@@ -6028,6 +6052,144 @@ RED.nodes = (function() {
         return helpContent;
     }
 
+    function getNodeIslands(nodes) {
+        var selectedNodes = new Set(nodes);
+        // Maps node => island index
+        var nodeToIslandIndex = new Map();
+        // Maps island index => [nodes in island]
+        var islandIndexToNodes = new Map();
+        var internalLinks = new Set();
+        nodes.forEach((node, index) => {
+            nodeToIslandIndex.set(node,index);
+            islandIndexToNodes.set(index, [node]);
+            var inboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_INPUT);
+            var outboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_OUTPUT);
+            inboundLinks.forEach(l => {
+                if (selectedNodes.has(l.source)) {
+                    internalLinks.add(l)
+                }
+            })
+            outboundLinks.forEach(l => {
+                if (selectedNodes.has(l.target)) {
+                    internalLinks.add(l)
+                }
+            })
+        })
+
+        internalLinks.forEach(l => {
+            let source = l.source;
+            let target = l.target;
+            if (nodeToIslandIndex.get(source) !== nodeToIslandIndex.get(target)) {
+                let sourceIsland = nodeToIslandIndex.get(source);
+                let islandToMove = nodeToIslandIndex.get(target);
+                let nodesToMove = islandIndexToNodes.get(islandToMove);
+                nodesToMove.forEach(n => {
+                    nodeToIslandIndex.set(n,sourceIsland);
+                    islandIndexToNodes.get(sourceIsland).push(n);
+                })
+                islandIndexToNodes.delete(islandToMove);
+            }
+        })
+        const result = [];
+        islandIndexToNodes.forEach((nodes,index) => {
+            result.push(nodes);
+        })
+        return result;
+    }
+
+    function detachNodes(nodes) {
+        let allSelectedNodes = [];
+        nodes.forEach(node => {
+            if (node.type === 'group') {
+                let groupNodes = RED.group.getNodes(node,true,true);
+                allSelectedNodes = allSelectedNodes.concat(groupNodes);
+            } else {
+                allSelectedNodes.push(node);
+            }
+        })
+        if (allSelectedNodes.length > 0 ) {
+            const nodeIslands = RED.nodes.getNodeIslands(allSelectedNodes);
+            let removedLinks = [];
+            let newLinks = [];
+            let createdLinkIds = new Set();
+
+            nodeIslands.forEach(nodes => {
+                let selectedNodes = new Set(nodes);
+                let allInboundLinks = [];
+                let allOutboundLinks = [];
+                // Identify links that enter or exit this island of nodes
+                nodes.forEach(node => {
+                    var inboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_INPUT);
+                    var outboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_OUTPUT);
+                    inboundLinks.forEach(l => {
+                        if (!selectedNodes.has(l.source)) {
+                            allInboundLinks.push(l)
+                        }
+                    })
+                    outboundLinks.forEach(l => {
+                        if (!selectedNodes.has(l.target)) {
+                            allOutboundLinks.push(l)
+                        }
+                    })
+                });
+
+
+                // Identify the links to restore
+                allInboundLinks.forEach(inLink => {
+                    // For Each inbound link,
+                    //  - get source node.
+                    //  - trace through to all outbound links
+                    let sourceNode = inLink.source;
+                    let targetNodes = new Set();
+                    let visited = new Set();
+                    let stack = [inLink.target];
+                    while (stack.length > 0) {
+                        let node = stack.pop(stack);
+                        visited.add(node)
+                        let links = RED.nodes.getNodeLinks(node, PORT_TYPE_OUTPUT);
+                        links.forEach(l => {
+                            if (visited.has(l.target)) {
+                                return
+                            }
+                            visited.add(l.target);
+                            if (selectedNodes.has(l.target)) {
+                                // internal link
+                                stack.push(l.target)
+                            } else {
+                                targetNodes.add(l.target)
+                            }
+                        })
+                    }
+                    targetNodes.forEach(target => {
+                        let linkId = `${sourceNode.id}[${inLink.sourcePort}] -> ${target.id}`
+                        if (!createdLinkIds.has(linkId)) {
+                            createdLinkIds.add(linkId);
+                            let link = {
+                                source: sourceNode,
+                                sourcePort: inLink.sourcePort,
+                                target: target
+                            }
+                            let existingLinks = RED.nodes.filterLinks(link)
+                            if (existingLinks.length === 0) {
+                                newLinks.push(link);
+                            }
+                        }
+                    })
+                })
+
+                // 2. delete all those links
+                allInboundLinks.forEach(l => { RED.nodes.removeLink(l); removedLinks.push(l)})
+                allOutboundLinks.forEach(l => { RED.nodes.removeLink(l); removedLinks.push(l)})
+            })
+
+            newLinks.forEach(l => RED.nodes.addLink(l));
+            return {
+                newLinks,
+                removedLinks
+            }
+        }
+    }
+
     return {
         init: function() {
             RED.events.on("registry:node-type-added",function(type) {
@@ -6109,7 +6271,7 @@ RED.nodes = (function() {
         add: addNode,
         remove: removeNode,
         clear: clear,
-
+        detachNodes: detachNodes,
         moveNodesForwards: moveNodesForwards,
         moveNodesBackwards: moveNodesBackwards,
         moveNodesToFront: moveNodesToFront,
@@ -6121,7 +6283,20 @@ RED.nodes = (function() {
 
         addLink: addLink,
         removeLink: removeLink,
-
+        getNodeLinks: function(id, portType) {
+            if (typeof id !== 'string') {
+                id = id.id;
+            }
+            if (nodeLinks[id]) {
+                if (portType === 1) {
+                    // Return cloned arrays so they can be safely modified by caller
+                    return [].concat(nodeLinks[id].in)
+                } else {
+                    return [].concat(nodeLinks[id].out)
+                }
+            }
+            return [];
+        },
         addWorkspace: addWorkspace,
         removeWorkspace: removeWorkspace,
         getWorkspaceOrder: function() { return workspacesOrder },
@@ -6195,6 +6370,7 @@ RED.nodes = (function() {
         getAllFlowNodes: getAllFlowNodes,
         getAllUpstreamNodes: getAllUpstreamNodes,
         getAllDownstreamNodes: getAllDownstreamNodes,
+        getNodeIslands: getNodeIslands,
         createExportableNodeSet: createExportableNodeSet,
         createCompleteNodeSet: createCompleteNodeSet,
         updateConfigNodeUsers: updateConfigNodeUsers,
@@ -7715,6 +7891,13 @@ RED.history = (function() {
         peek: function() {
             return undoHistory[undoHistory.length-1];
         },
+        replace: function(ev) {
+            if (undoHistory.length === 0) {
+                RED.history.push(ev);
+            } else {
+                undoHistory[undoHistory.length-1] = ev;
+            }
+        },
         clear: function() {
             undoHistory = [];
             redoHistory = [];
@@ -7914,6 +8097,8 @@ RED.utils = (function() {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('function');
             } else if (value.hasOwnProperty('type') && (value.type === 'number' || value.type === 'bigint')) {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-number"></span>').text(value.data);
+            } else if (value.hasOwnProperty('type') && value.type === 'regexp') {
+                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-string"></span>').text(value.data);
             } else {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta">object</span>');
             }
@@ -8212,6 +8397,8 @@ RED.utils = (function() {
             $('<span class="red-ui-debug-msg-type-null">undefined</span>').appendTo(entryObj);
         } else if (obj.__enc__ && (obj.type === 'number' || obj.type === 'bigint')) {
             e = $('<span class="red-ui-debug-msg-type-number red-ui-debug-msg-object-header"></span>').text(obj.data).appendTo(entryObj);
+        } else if (typeHint === "regexp" || (obj.__enc__ && obj.type === 'regexp')) {
+            e = $('<span class="red-ui-debug-msg-type-string red-ui-debug-msg-object-header"></span>').text((typeof obj === "string")?obj:obj.data).appendTo(entryObj);
         } else if (typeHint === "function" || (obj.__enc__ && obj.type === 'function')) {
             e = $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-header"></span>').text("function").appendTo(entryObj);
         } else if (typeHint === "internal" || (obj.__enc__ && obj.type === 'internal')) {
@@ -9925,7 +10112,7 @@ RED.utils = (function() {
             if (child.depth !== parent.depth+1) {
                 child.depth = parent.depth+1;
                 // var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20));
-                var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
+                var labelPaddingWidth = (((child.gutter&&!child.gutter.hasClass("red-ui-treeList-gutter-float"))?child.gutter.width()+2:0)+(child.depth*20));
                 child.treeList.labelPadding.width(labelPaddingWidth+'px');
                 if (child.element) {
                     $(child.element).css({
@@ -10147,8 +10334,9 @@ RED.utils = (function() {
                 }).appendTo(label)
 
             }
-            // var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
-            var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (depth * 20)
+
+            var labelPaddingWidth = ((item.gutter&&!item.gutter.hasClass("red-ui-treeList-gutter-float"))?item.gutter.width()+2:0)+(depth*20);
+
             item.treeList.labelPadding = $('<span>').css({
                 display: "inline-block",
                 "flex-shrink": 0,
@@ -12072,6 +12260,8 @@ RED.tabs = (function() {
                     menuOptions = options.menu()
                 } else if (Array.isArray(options.menu)) {
                     menuOptions = options.menu;
+                } else if (typeof options.menu === 'function') {
+                    menuOptions = options.menu();
                 }
                 menu = RED.menu.init({options: menuOptions});
                 menu.attr("id",options.id+"-menu");
@@ -12531,7 +12721,7 @@ RED.tabs = (function() {
 
         function findPreviousVisibleTab(li) {
             if (!li) {
-                li = ul.find("li.active").parent();
+                li = ul.find("li.active");
             }
             var previous = li.prev();
             while(previous.length > 0 && previous.hasClass("hide-tab")) {
@@ -12541,9 +12731,9 @@ RED.tabs = (function() {
         }
         function findNextVisibleTab(li) {
             if (!li) {
-                li = ul.find("li.active").parent();
+                li = ul.find("li.active");
             }
-            var next = ul.find("li.active").next();
+            var next = li.next();
             while(next.length > 0 && next.hasClass("hide-tab")) {
                 next = next.next();
             }
@@ -12764,15 +12954,18 @@ RED.tabs = (function() {
                         event.preventDefault();
                         removeTab(tab.id);
                     });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                 }
                 if (tab.hideable) {
                     li.addClass("red-ui-tabs-closeable")
-                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close"}).appendTo(li);
-                    closeLink.append('<i class="fa fa-times" />');
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
                     closeLink.on("click",function(event) {
                         event.preventDefault();
                         hideTab(tab.id);
                     });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                 }
 
                 var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
@@ -12781,7 +12974,8 @@ RED.tabs = (function() {
                     $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
                 }
 
-                link.attr("title",tab.label);
+                // link.attr("title",tab.label);
+                RED.popover.tooltip(link,function() { return tab.label})
 
                 if (options.onadd) {
                     options.onadd(tab);
@@ -12900,7 +13094,6 @@ RED.tabs = (function() {
             renameTab: function(id,label) {
                 tabs[id].label = label;
                 var tab = ul.find("a[href='#"+id+"']");
-                tab.attr("title",label);
                 tab.find("span.red-ui-text-bidi-aware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
                 updateTabWidths();
             },
@@ -13704,7 +13897,7 @@ RED.stack = (function() {
             this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
             this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
 
-            this.type(this.options.default||this.typeList[0].value);
+            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
             this.typeChanged = !!this.options.default;
         }catch(err) {
             console.log(err.stack);
@@ -13953,6 +14146,7 @@ RED.stack = (function() {
             var that = this;
             var currentType = this.type();
             this.typeMap = {};
+            var firstCall = (this.typeList === undefined);
             this.typeList = types.map(function(opt) {
                 var result;
                 if (typeof opt === 'string') {
@@ -13977,10 +14171,14 @@ RED.stack = (function() {
             }
             this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
-                this.type(this.typeList[0].value);
+                if (!firstCall) {
+                    this.type(this.typeList[0].value);
+                }
             } else {
                 this.propertyType = null;
-                this.type(currentType);
+                if (!firstCall) {
+                    this.type(currentType);
+                }
             }
             if (this.typeList.length === 1 && !this.typeList[0].icon && (!this.typeList[0].label || this.typeList[0].showLabel === false)) {
                 this.selectTrigger.hide()
@@ -14071,7 +14269,7 @@ RED.stack = (function() {
                     var previousType = this.typeMap[this.propertyType];
                     previousValue = this.input.val();
 
-                    if (this.typeChanged) {
+                    if (previousType && this.typeChanged) {
                         if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
                         if (previousType.options && opt.hasValue !== true) {
                             this.oldValues[previousType.value] = previousValue;
@@ -14532,7 +14730,7 @@ RED.stack = (function() {
  *      value: String : the value to insert if selected
  *      label: String|DOM Element : the label to display in the dropdown.
  *  }
- * 
+ *
  */
 
     $.widget( "nodered.autoComplete", {
@@ -14573,7 +14771,7 @@ RED.stack = (function() {
                 maxHeight: 200,
                 class: "red-ui-autoComplete-container",
                 options: completions,
-                onselect: (opt) => { this.element.val(opt.value); this.element.focus() },
+                onselect: (opt) => { this.element.val(opt.value); this.element.focus(); this.element.trigger("change") },
                 onclose: () => { this.completionMenuShown = false; delete this.menu; this.element.focus()}
             });
             this.menu.show({
@@ -15013,6 +15211,16 @@ RED.deploy = (function() {
                 var unknownNodes = [];
                 var invalidNodes = [];
 
+                RED.nodes.eachConfig(function(node) {
+                    if (!node.valid && !node.d) {
+                        invalidNodes.push(getNodeInfo(node));
+                    }
+                    if (node.type === "unknown") {
+                        if (unknownNodes.indexOf(node.name) == -1) {
+                            unknownNodes.push(node.name);
+                        }
+                    }                    
+                });
                 RED.nodes.eachNode(function(node) {
                     if (!node.valid && !node.d) {
                         invalidNodes.push(getNodeInfo(node));
@@ -15750,6 +15958,8 @@ RED.deploy = (function() {
                     color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
+            } else if (node.type === "group") {
+                def = RED.group.def;
             } else {
                 def = {};
             }
@@ -15959,16 +16169,15 @@ RED.deploy = (function() {
             }
         }
 
-
         if (node.hasOwnProperty('x')) {
             if (localNode) {
-                if (localNode.x !== node.x || localNode.y !== node.y) {
+                if (localNode.x !== node.x || localNode.y !== node.y || localNode.w !== node.w || localNode.h !== node.h ) {
                     localChanged = true;
                     localChanges++;
                 }
             }
             if (remoteNode) {
-                if (remoteNode.x !== node.x || remoteNode.y !== node.y) {
+                if (remoteNode.x !== node.x || remoteNode.y !== node.y|| remoteNode.w !== node.w || remoteNode.h !== node.h) {
                     remoteChanged = true;
                     remoteChanges++;
                 }
@@ -15986,7 +16195,12 @@ RED.deploy = (function() {
                 localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
                 $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                 element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
-                propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y},
+                var localPosition = {x:localNode.x,y:localNode.y};
+                if (localNode.hasOwnProperty('w')) {
+                    localPosition.w = localNode.w;
+                    localPosition.h = localNode.h;
+                }
+                propertyElements['local.position'] = RED.utils.createObjectElement(localPosition,
                     {
                         path: "position",
                         exposeApi: true,
@@ -16007,7 +16221,12 @@ RED.deploy = (function() {
                 if (remoteNode) {
                     $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                     element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
-                    propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y},
+                    var remotePosition = {x:remoteNode.x,y:remoteNode.y};
+                    if (remoteNode.hasOwnProperty('w')) {
+                        remotePosition.w = remoteNode.w;
+                        remotePosition.h = remoteNode.h;
+                    }
+                    propertyElements['remote.position'] = RED.utils.createObjectElement(remotePosition,
                         {
                             path: "position",
                             exposeApi: true,
@@ -16079,11 +16298,11 @@ RED.deploy = (function() {
                 }
             }
         }
-        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
+        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='w'&&p!=='h'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
         if (def.defaults) {
             properties = properties.concat(Object.keys(def.defaults));
         }
-        if (node.type !== 'tab') {
+        if (node.type !== 'tab' && node.type !== "group") {
             properties = properties.concat(['inputLabels','outputLabels']);
         }
         if ( ((localNode && localNode.hasOwnProperty('icon')) || (remoteNode && remoteNode.hasOwnProperty('icon'))) &&
@@ -18184,7 +18403,7 @@ RED.workspaces = (function() {
             var tabId = RED.nodes.id();
             do {
                 workspaceIndex += 1;
-            } while ($("#red-ui-workspace-tabs a[title='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
+            } while ($("#red-ui-workspace-tabs li[flowname='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
 
             ws = {
                 type: "tab",
@@ -18197,12 +18416,15 @@ RED.workspaces = (function() {
             };
             RED.nodes.addWorkspace(ws,targetIndex);
             workspace_tabs.addTab(ws,targetIndex);
+
             workspace_tabs.activateTab(tabId);
             if (!skipHistoryEntry) {
                 RED.history.push({t:'add',workspaces:[ws],dirty:RED.nodes.dirty()});
                 RED.nodes.dirty(true);
             }
         }
+        $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
+
         RED.view.focus();
         return ws;
     }
@@ -18326,65 +18548,84 @@ RED.workspaces = (function() {
             },
             onhide: function(tab) {
                 hideStack.push(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                hiddenTabs[tab.id] = true;
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
                 RED.events.emit("workspace:hide",{workspace: tab.id})
             },
             onshow: function(tab) {
                 removeFromHideStack(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                delete hiddenTabs[tab.id];
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
                 RED.events.emit("workspace:show",{workspace: tab.id})
             },
             minimumActiveTabWidth: 150,
             scrollable: true,
             addButton: "core:add-flow",
             addButtonCaption: RED._("workspace.addFlow"),
-            menu: [
-                {
-                    id:"red-ui-tabs-menu-option-search-flows",
-                    label: RED._("workspace.listFlows"),
-                    onselect: "core:list-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-search-subflows",
-                    label: RED._("workspace.listSubflows"),
-                    onselect: "core:list-subflows"
-                },
-                null,
-                {
-                    id:"red-ui-tabs-menu-option-add-flow",
-                    label: RED._("workspace.addFlow"),
-                    onselect: "core:add-flow"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-flow-right",
-                    label: RED._("workspace.addFlowToRight"),
-                    onselect: "core:add-flow-to-right"
-                },
-                null,
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-flows",
-                    label: RED._("workspace.hideFlow"),
-                    onselect: "core:hide-flow"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-other-flows",
-                    label: RED._("workspace.hideOtherFlows"),
-                    onselect: "core:hide-other-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-show-all-flows",
-                    label: RED._("workspace.showAllFlows"),
-                    onselect: "core:show-all-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-all-flows",
-                    label: RED._("workspace.hideAllFlows"),
-                    onselect: "core:hide-all-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-show-last-flow",
-                    label: RED._("workspace.showLastHiddenFlow"),
-                    onselect: "core:show-last-hidden-flow"
+            menu: function() {
+                var menuItems = [
+                    {
+                        id:"red-ui-tabs-menu-option-search-flows",
+                        label: RED._("workspace.listFlows"),
+                        onselect: "core:list-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-search-subflows",
+                        label: RED._("workspace.listSubflows"),
+                        onselect: "core:list-subflows"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow",
+                        label: RED._("workspace.addFlow"),
+                        onselect: "core:add-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow-right",
+                        label: RED._("workspace.addFlowToRight"),
+                        onselect: "core:add-flow-to-right"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-flows",
+                        label: RED._("workspace.hideFlow"),
+                        onselect: "core:hide-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-other-flows",
+                        label: RED._("workspace.hideOtherFlows"),
+                        onselect: "core:hide-other-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-all-flows",
+                        label: RED._("workspace.showAllFlows"),
+                        onselect: "core:show-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-all-flows",
+                        label: RED._("workspace.hideAllFlows"),
+                        onselect: "core:hide-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-last-flow",
+                        label: RED._("workspace.showLastHiddenFlow"),
+                        onselect: "core:show-last-hidden-flow"
+                    }
+                ]
+                if (hideStack.length > 0) {
+                    menuItems.unshift({
+                        label: RED._("workspace.hiddenFlows",{count: hideStack.length}),
+                        onselect: "core:list-hidden-flows"
+                    })
                 }
-            ]
+                return menuItems;
+            }
         });
         workspaceTabCount = 0;
     }
@@ -18524,7 +18765,9 @@ RED.workspaces = (function() {
                 }
             }
         })
-
+        RED.actions.add("core:list-hidden-flows",function() {
+            RED.actions.invoke("core:search","is:hidden ");
+        })
         RED.actions.add("core:list-flows",function() {
             RED.actions.invoke("core:search","type:tab ");
         })
@@ -18568,7 +18811,7 @@ RED.workspaces = (function() {
             var changes = { disabled: workspace.disabled };
             workspace.disabled = disabled;
             $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
-            if (id || activeWorkspace) {
+            if (!id || (id === activeWorkspace)) {
                 $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
             }
             var historyEvent = {
@@ -18649,11 +18892,11 @@ RED.workspaces = (function() {
             }
             if (workspace_tabs.contains(id)) {
                 workspace_tabs.hideTab(id);
-                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-                hiddenTabs[id] = true;
-                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
             }
         },
+        isHidden: function(id) {
+            return hideStack.includes(id)
+        },
         show: function(id,skipStack,unhideOnly) {
             if (!workspace_tabs.contains(id)) {
                 var sf = RED.nodes.subflow(id);
@@ -18676,14 +18919,11 @@ RED.workspaces = (function() {
                 }
                 workspace_tabs.activateTab(id);
             }
-            var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-            delete hiddenTabs[id];
-            RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
         },
         refresh: function() {
             RED.nodes.eachWorkspace(function(ws) {
                 workspace_tabs.renameTab(ws.id,ws.label);
-
+                $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
             })
             RED.nodes.eachSubflow(function(sf) {
                 if (workspace_tabs.contains(sf.id)) {
@@ -18814,7 +19054,6 @@ RED.view = (function() {
     var activeGroups = [];
     var dirtyGroups = {};
 
-    var selected_link = null;
     var mousedown_link = null;
     var mousedown_node = null;
     var mousedown_group = null;
@@ -18826,6 +19065,8 @@ RED.view = (function() {
     var mouse_mode = 0;
     var mousedown_group_handle = null;
     var lasso = null;
+    var slicePath = null;
+    var slicePathLast = null;
     var ghostNode = null;
     var showStatus = false;
     var lastClickNode = null;
@@ -18880,6 +19121,14 @@ RED.view = (function() {
                     if (!setIds.has(node.id)) {
                         set.push({n:node});
                         setIds.add(node.id);
+                        var links = RED.nodes.getNodeLinks(node.id,PORT_TYPE_INPUT).concat(RED.nodes.getNodeLinks(node.id,PORT_TYPE_OUTPUT))
+                        for (var i=0,l=links.length;i<l;i++) {
+                            var link = links[i]
+                            if (link.source === node && setIds.has(link.target.id) ||
+                                link.target === node && setIds.has(link.source.id)) {
+                                selectedLinks.add(link)
+                            }
+                        }
                     }
                 }
             },
@@ -18896,6 +19145,10 @@ RED.view = (function() {
                             }
                         }
                     }
+                    var links = RED.nodes.getNodeLinks(node.id,PORT_TYPE_INPUT).concat(RED.nodes.getNodeLinks(node.id,PORT_TYPE_OUTPUT))
+                    for (var i=0,l=links.length;i<l;i++) {
+                        selectedLinks.remove(links[i]);
+                    }
                 }
             },
             clear: function() {
@@ -18910,6 +19163,31 @@ RED.view = (function() {
         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() {
 
         chart = $("#red-ui-workspace-chart");
@@ -18944,6 +19222,12 @@ RED.view = (function() {
                     }
                 } else if (mouse_mode === RED.state.PANNING && d3.event.buttons !== 4) {
                     resetMouseVars();
+                } else if (slicePath) {
+                    if (d3.event.buttons !== 2) {
+                        slicePath.remove();
+                        slicePath = null;
+                        resetMouseVars()
+                    }
                 }
             })
             .on("touchend", function() {
@@ -19163,26 +19447,56 @@ RED.view = (function() {
                 var historyEvent = result.historyEvent;
                 var nn = result.node;
 
+                RED.nodes.add(nn);
+
                 var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
                 if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
                     nn.l = showLabel;
                 }
 
                 var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
+                var helperWidth = ui.helper.width();
+                var helperHeight = ui.helper.height();
                 var mousePos = d3.touches(this)[0]||d3.mouse(this);
 
-                mousePos[1] += this.scrollTop + ((nn.h/2)-helperOffset[1]);
-                mousePos[0] += this.scrollLeft + ((nn.w/2)-helperOffset[0]);
+                try {
+                    var isLink = (nn.type === "link in" || nn.type === "link out")
+                    var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;
+
+                    var label = RED.utils.getNodeLabel(nn, nn.type);
+                    var labelParts = getLabelParts(label, "red-ui-flow-node-label");
+                    if (hideLabel) {
+                        nn.w = node_height;
+                        nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
+                    } else {
+                        nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
+                        nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
+                    }
+                } catch(err) {
+                }
+
+                mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
+                mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
                 mousePos[1] /= scaleFactor;
                 mousePos[0] /= scaleFactor;
 
-                if (snapGrid) {
-                    mousePos[0] = gridSize*(Math.ceil(mousePos[0]/gridSize));
-                    mousePos[1] = gridSize*(Math.ceil(mousePos[1]/gridSize));
-                }
                 nn.x = mousePos[0];
                 nn.y = mousePos[1];
 
+                if (snapGrid) {
+                    var gridOffset = [0,0];
+                    var offsetLeft = nn.x-(gridSize*Math.round((nn.x-nn.w/2)/gridSize)+nn.w/2);
+                    var offsetRight = nn.x-(gridSize*Math.round((nn.x+nn.w/2)/gridSize)-nn.w/2);
+                    if (Math.abs(offsetLeft) < Math.abs(offsetRight)) {
+                        gridOffset[0] = offsetLeft
+                    } else {
+                        gridOffset[0] = offsetRight
+                    }
+                    gridOffset[1] = nn.y-(gridSize*Math.round(nn.y/gridSize));
+                    nn.x -= gridOffset[0];
+                    nn.y -= gridOffset[1];
+                }
+
                 var spliceLink = $(ui.helper).data("splice");
                 if (spliceLink) {
                     // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp/showQuickAddDialog
@@ -19203,7 +19517,6 @@ RED.view = (function() {
                     historyEvent.removedLinks = [spliceLink];
                 }
 
-                RED.nodes.add(nn);
 
                 var group = $(ui.helper).data("group");
                 if (group) {
@@ -19253,6 +19566,8 @@ RED.view = (function() {
         RED.actions.add("core:cut-selection-to-internal-clipboard",function(){copySelection();deleteSelection();});
         RED.actions.add("core:paste-from-internal-clipboard",function(){importNodes(clipboard,{generateIds: true});});
 
+        RED.actions.add("core:detach-selected-nodes", function() { detachSelectedNodes() })
+
         RED.events.on("view:selection-changed", function(selection) {
             var hasSelection = (selection.nodes && selection.nodes.length > 0);
             var hasMultipleSelection = hasSelection && selection.nodes.length > 1;
@@ -19275,6 +19590,7 @@ RED.view = (function() {
         })
 
         RED.actions.add("core:delete-selection",deleteSelection);
+        RED.actions.add("core:delete-selection-and-reconnect",function() { deleteSelection(true) });
         RED.actions.add("core:edit-selected-node",editSelection);
         RED.actions.add("core:go-to-selection",function() {
             if (movingSet.length() > 0) {
@@ -19660,7 +19976,7 @@ RED.view = (function() {
             return;
         }
         if (!mousedown_node && !mousedown_link && !mousedown_group) {
-            selected_link = null;
+            selectedLinks.clear();
             updateSelection();
         }
         if (mouse_mode === 0) {
@@ -19669,19 +19985,18 @@ RED.view = (function() {
                 lasso = null;
             }
         }
-        if (mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) {
-            if (d3.event.metaKey || d3.event.ctrlKey) {
-                d3.event.stopPropagation();
-                clearSelection();
-                point = d3.mouse(this);
-                var clickedGroup = getGroupAt(point[0],point[1]);
-                if (drag_lines.length > 0) {
-                    clickedGroup = clickedGroup || RED.nodes.group(drag_lines[0].node.g)
-                }
-                showQuickAddDialog({position:point, group:clickedGroup});
+        if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && (d3.event.touches || d3.event.button === 0) && (d3.event.metaKey || d3.event.ctrlKey)) {
+            // Trigger quick add dialog
+            d3.event.stopPropagation();
+            clearSelection();
+            point = d3.mouse(this);
+            var clickedGroup = getGroupAt(point[0],point[1]);
+            if (drag_lines.length > 0) {
+                clickedGroup = clickedGroup || RED.nodes.group(drag_lines[0].node.g)
             }
-        }
-        if (mouse_mode === 0 && !(d3.event.metaKey || d3.event.ctrlKey)) {
+            showQuickAddDialog({position:point, group:clickedGroup});
+        } else if (mouse_mode === 0 && (d3.event.touches || d3.event.button === 0) && !(d3.event.metaKey || d3.event.ctrlKey)) {
+            // Tigger lasso
             if (!touchStartTime) {
                 point = d3.mouse(this);
                 lasso = eventLayer.append("rect")
@@ -19696,6 +20011,13 @@ RED.view = (function() {
                 .attr("class","nr-ui-view-lasso");
                 d3.event.preventDefault();
             }
+        } else if (mouse_mode === 0 && d3.event.button === 2 && (d3.event.metaKey || d3.event.ctrlKey)) {
+            clearSelection();
+            mouse_mode = RED.state.SLICING;
+            point = d3.mouse(this);
+            slicePath = eventLayer.append("path").attr("class","nr-ui-view-slice").attr("d",`M${point[0]} ${point[1]}`)
+            slicePathLast = point;
+            RED.view.redraw();
         }
     }
 
@@ -20092,6 +20414,17 @@ RED.view = (function() {
                 .attr("height",h)
             ;
             return;
+        } else if (mouse_mode === RED.state.SLICING) {
+            if (slicePath) {
+                var delta = Math.max(1,Math.abs(slicePathLast[0]-mouse_position[0]))*Math.max(1,Math.abs(slicePathLast[1]-mouse_position[1]))
+                if (delta > 20) {
+                    var currentPath = slicePath.attr("d")
+                    currentPath += " L"+mouse_position[0]+" "+mouse_position[1]
+                    slicePath.attr("d",currentPath);
+                    slicePathLast = mouse_position
+                }
+            }
+            return
         }
 
         if (mouse_mode === RED.state.SELECTING_NODE) {
@@ -20099,7 +20432,7 @@ RED.view = (function() {
             return;
         }
 
-        if (mouse_mode != RED.state.QUICK_JOINING && mouse_mode != RED.state.IMPORT_DRAGGING && !mousedown_node && !mousedown_group && selected_link == null) {
+        if (mouse_mode != RED.state.QUICK_JOINING && mouse_mode != RED.state.IMPORT_DRAGGING && mouse_mode != RED.state.DETACHED_DRAGGING && !mousedown_node && !mousedown_group && selectedLinks.length() === 0) {
             return;
         }
 
@@ -20123,16 +20456,18 @@ RED.view = (function() {
                     // Get all the wires we need to detach.
                     var links = [];
                     var existingLinks = [];
-                    if (selected_link &&
-                        ((mousedown_port_type === PORT_TYPE_OUTPUT &&
-                            selected_link.source === mousedown_node &&
-                            selected_link.sourcePort === mousedown_port_index
-                        ) ||
-                        (mousedown_port_type === PORT_TYPE_INPUT &&
-                            selected_link.target === mousedown_node
-                        ))
-                    ) {
-                        existingLinks = [selected_link];
+                    if (selectedLinks.length() > 0) {
+                        selectedLinks.forEach(function(link) {
+                            if (((mousedown_port_type === PORT_TYPE_OUTPUT &&
+                                link.source === mousedown_node &&
+                                link.sourcePort === mousedown_port_index
+                            ) ||
+                            (mousedown_port_type === PORT_TYPE_INPUT &&
+                                link.target === mousedown_node
+                            ))) {
+                                existingLinks.push(link);
+                            }
+                        })
                     } else {
                         var filter;
                         if (mousedown_port_type === PORT_TYPE_OUTPUT) {
@@ -20170,7 +20505,7 @@ RED.view = (function() {
                 } else if (mousedown_node && !quickAddLink) {
                     showDragLines([{node:mousedown_node,port:mousedown_port_index,portType:mousedown_port_type}]);
                 }
-                selected_link = null;
+                selectedLinks.clear();
             }
             mousePos = mouse_position;
             for (i=0;i<drag_lines.length;i++) {
@@ -20202,7 +20537,7 @@ RED.view = (function() {
                                    RED.nodes.filterLinks({ target: node.n }).length === 0;
                 }
             }
-        } else if (mouse_mode == RED.state.MOVING_ACTIVE || mouse_mode == RED.state.IMPORT_DRAGGING) {
+        } else if (mouse_mode == RED.state.MOVING_ACTIVE || mouse_mode == RED.state.IMPORT_DRAGGING || mouse_mode == RED.state.DETACHED_DRAGGING) {
             mousePos = mouse_position;
             var minX = 0;
             var minY = 0;
@@ -20266,8 +20601,16 @@ RED.view = (function() {
                     gridOffset[0] = node.n.x-(gridSize*Math.floor(node.n.x/gridSize))-gridSize/2;
                     gridOffset[1] = node.n.y-(gridSize*Math.floor(node.n.y/gridSize))-gridSize/2;
                 } else {
-                    gridOffset[0] = node.n.x-(gridSize*Math.floor((node.n.x-node.n.w/2)/gridSize)+node.n.w/2);
-                    gridOffset[1] = node.n.y-(gridSize*Math.floor(node.n.y/gridSize));
+                    var offsetLeft = node.n.x-(gridSize*Math.round((node.n.x-node.n.w/2)/gridSize)+node.n.w/2);
+                    var offsetRight = node.n.x-(gridSize*Math.round((node.n.x+node.n.w/2)/gridSize)-node.n.w/2);
+                    // gridOffset[0] = node.n.x-(gridSize*Math.floor((node.n.x-node.n.w/2)/gridSize)+node.n.w/2);
+                    if (Math.abs(offsetLeft) < Math.abs(offsetRight)) {
+                        gridOffset[0] = offsetLeft
+                    } else {
+                        gridOffset[0] = offsetRight
+                    }
+                    gridOffset[1] = node.n.y-(gridSize*Math.round(node.n.y/gridSize));
+                    // console.log(offsetLeft, offsetRight);
                 }
                 if (gridOffset[0] !== 0 || gridOffset[1] !== 0) {
                     for (i = 0; i<movingSet.length(); i++) {
@@ -20487,6 +20830,11 @@ RED.view = (function() {
         } else if (mouse_mode == RED.state.DEFAULT && mousedown_link == null && !d3.event.ctrlKey && !d3.event.metaKey ) {
             clearSelection();
             updateSelection();
+        } else if (slicePath) {
+            deleteSelection();
+            slicePath.remove();
+            slicePath = null;
+            RED.view.redraw(true);
         }
         if (mouse_mode == RED.state.MOVING_ACTIVE) {
             if (movingSet.length() > 0) {
@@ -20558,10 +20906,30 @@ RED.view = (function() {
         //         movingSet.add(mousedown_node);
         //     }
         // }
-        if (mouse_mode == RED.state.MOVING || mouse_mode == RED.state.MOVING_ACTIVE) {
+        if (mouse_mode == RED.state.MOVING || mouse_mode == RED.state.MOVING_ACTIVE || mouse_mode == RED.state.DETACHED_DRAGGING) {
             // if (mousedown_node) {
             //     delete mousedown_node.gSelected;
             // }
+            if (mouse_mode === RED.state.DETACHED_DRAGGING) {
+                var ns = [];
+                for (var j=0;j<movingSet.length();j++) {
+                    var n = movingSet.get(j);
+                    if (n.ox !== n.n.x || n.oy !== n.n.y) {
+                        ns.push({n:n.n,ox:n.ox,oy:n.oy,moved:n.n.moved});
+                        n.n.dirty = true;
+                        n.n.moved = true;
+                    }
+                }
+                var detachEvent = RED.history.peek();
+                // The last event in the stack *should* be a multi-event from
+                // where the links were added/removed
+                var historyEvent = {t:"move",nodes:ns,dirty:RED.nodes.dirty()}
+                if (detachEvent.t === "multi") {
+                    detachEvent.events.push(historyEvent)
+                } else {
+                    RED.history.push(historyEvent)
+                }
+            }
             for (i=0;i<movingSet.length();i++) {
                 var node = movingSet.get(i);
                 delete node.ox;
@@ -20606,10 +20974,29 @@ RED.view = (function() {
         if (mouse_mode === RED.state.MOVING || mouse_mode === RED.state.MOVING_ACTIVE) {
             return;
         }
-        if (mouse_mode === RED.state.IMPORT_DRAGGING) {
+        if (mouse_mode === RED.state.DETACHED_DRAGGING) {
+            for (var j=0;j<movingSet.length();j++) {
+                var n = movingSet.get(j);
+                n.n.x = n.ox;
+                n.n.y = n.oy;
+            }
+            clearSelection();
+            RED.history.pop();
+            mouse_mode = 0;
+        } else if (mouse_mode === RED.state.IMPORT_DRAGGING) {
             clearSelection();
             RED.history.pop();
             mouse_mode = 0;
+        } else if (mouse_mode === RED.state.SLICING) {
+            if (slicePath) {
+                slicePath.remove();
+                slicePath = null;
+                resetMouseVars()
+            }
+            clearSelection();
+        } else if (lasso) {
+            lasso.remove();
+            lasso = null;
         } else if (activeGroup) {
             exitActiveGroup()
         } else {
@@ -20621,6 +21008,7 @@ RED.view = (function() {
         if (mouse_mode === RED.state.SELECTING_NODE && selectNodesOptions.single) {
             return;
         }
+        selectedLinks.clear();
 
         if (activeGroup) {
             var ag = activeGroup;
@@ -20692,7 +21080,6 @@ RED.view = (function() {
                 }
             }
         }
-        selected_link = null;
         if (mouse_mode !== RED.state.SELECTING_NODE) {
             updateSelection();
         }
@@ -20707,7 +21094,7 @@ RED.view = (function() {
             n.n.selected = false;
         }
         movingSet.clear();
-        selected_link = null;
+        selectedLinks.clear();
         if (activeGroup) {
             activeGroup.active = false
             activeGroup.dirty = true;
@@ -20801,12 +21188,16 @@ RED.view = (function() {
                         }
                     }
                 }
-                if (activeFlowLinks.length === 0 && selected_link !== null && selected_link.link) {
-                    activeLinks.push(selected_link);
-                    activeLinkNodes[selected_link.source.id] = selected_link.source;
-                    selected_link.source.dirty = true;
-                    activeLinkNodes[selected_link.target.id] = selected_link.target;
-                    selected_link.target.dirty = true;
+                if (activeFlowLinks.length === 0 && selectedLinks.length() > 0) {
+                    selectedLinks.forEach(function(link) {
+                        if (link.link) {
+                            activeLinks.push(link);
+                            activeLinkNodes[link.source.id] = link.source;
+                            link.source.dirty = true;
+                            activeLinkNodes[link.target.id] = link.target;
+                            link.target.dirty = true;
+                        }
+                    })
                 }
             } else {
                 selection.flows = workspaceSelection;
@@ -20817,6 +21208,10 @@ RED.view = (function() {
                 return value.map(function(n) { return n.id })
             } else if (key === 'link') {
                 return value.source.id+":"+value.sourcePort+":"+value.target.id;
+            } else if (key === 'links') {
+                return value.map(function(link) {
+                    return link.source.id+":"+link.sourcePort+":"+link.target.id;
+                });
             }
             return value;
         });
@@ -20838,7 +21233,7 @@ RED.view = (function() {
             }
         }
     }
-    function deleteSelection() {
+    function deleteSelection(reconnectWires) {
         if (mouse_mode === RED.state.SELECTING_NODE) {
             return;
         }
@@ -20886,7 +21281,7 @@ RED.view = (function() {
             updateActiveNodes();
             updateSelection();
             redraw();
-        } else if (movingSet.length() > 0 || selected_link != null) {
+        } else if (movingSet.length() > 0 || selectedLinks.length() > 0) {
             var result;
             var node;
             var removedNodes = [];
@@ -20896,6 +21291,16 @@ RED.view = (function() {
             var removedSubflowInputs = [];
             var removedSubflowStatus;
             var subflowInstances = [];
+            var historyEvents = [];
+
+            if (reconnectWires) {
+                var reconnectResult = RED.nodes.detachNodes(movingSet.nodes())
+                var addedLinks = reconnectResult.newLinks;
+                if (addedLinks.length > 0) {
+                    historyEvents.push({ t:'add', links: addedLinks })
+                }
+                removedLinks = removedLinks.concat(reconnectResult.removedLinks)
+            }
 
             var startDirty = RED.nodes.dirty();
             var startChanged = false;
@@ -20985,71 +21390,71 @@ RED.view = (function() {
                     RED.nodes.dirty(true);
                 }
             }
-            var historyEvent;
-
-            if (selected_link && selected_link.link) {
-                var sourceId = selected_link.source.id;
-                var targetId = selected_link.target.id;
-                var sourceIdIndex = selected_link.target.links.indexOf(sourceId);
-                var targetIdIndex = selected_link.source.links.indexOf(targetId);
 
-                historyEvent = {
-                    t:"multi",
-                    events: [
-                        {
+            if (selectedLinks.length() > 0) {
+                selectedLinks.forEach(function(link) {
+                    if (link.link) {
+                        var sourceId = link.source.id;
+                        var targetId = link.target.id;
+                        var sourceIdIndex = link.target.links.indexOf(sourceId);
+                        var targetIdIndex = link.source.links.indexOf(targetId);
+                        historyEvents.push({
                             t: "edit",
-                            node: selected_link.source,
-                            changed: selected_link.source.changed,
+                            node: link.source,
+                            changed: link.source.changed,
                             changes: {
-                                links: $.extend(true,{},{v:selected_link.source.links}).v
+                                links: $.extend(true,{},{v:link.source.links}).v
                             }
-                        },
-                        {
+                        })
+                        historyEvents.push({
                             t: "edit",
-                            node: selected_link.target,
-                            changed: selected_link.target.changed,
+                            node: link.target,
+                            changed: link.target.changed,
                             changes: {
-                                links: $.extend(true,{},{v:selected_link.target.links}).v
+                                links: $.extend(true,{},{v:link.target.links}).v
                             }
-                        }
-
-                    ],
-                    dirty:RED.nodes.dirty()
-                }
-                RED.nodes.dirty(true);
-                selected_link.source.changed = true;
-                selected_link.target.changed = true;
-                selected_link.target.links.splice(sourceIdIndex,1);
-                selected_link.source.links.splice(targetIdIndex,1);
-                selected_link.source.dirty = true;
-                selected_link.target.dirty = true;
+                        })
+                        link.source.changed = true;
+                        link.target.changed = true;
+                        link.target.links.splice(sourceIdIndex,1);
+                        link.source.links.splice(targetIdIndex,1);
+                        link.source.dirty = true;
+                        link.target.dirty = true;
 
+                    } else {
+                        RED.nodes.removeLink(link);
+                        removedLinks.push(link);
+                    }
+                })
+            }
+            RED.nodes.dirty(true);
+            var historyEvent = {
+                t:"delete",
+                nodes:removedNodes,
+                links:removedLinks,
+                groups: removedGroups,
+                subflowOutputs:removedSubflowOutputs,
+                subflowInputs:removedSubflowInputs,
+                subflow: {
+                    id: activeSubflow?activeSubflow.id:undefined,
+                    instances: subflowInstances
+                },
+                dirty:startDirty
+            };
+            if (removedSubflowStatus) {
+                historyEvent.subflow.status = removedSubflowStatus;
+            }
+            if (historyEvents.length > 0) {
+                historyEvents.unshift(historyEvent);
+                RED.history.push({
+                    t:"multi",
+                    events: historyEvents
+                })
             } else {
-                if (selected_link) {
-                    RED.nodes.removeLink(selected_link);
-                    removedLinks.push(selected_link);
-                }
-                RED.nodes.dirty(true);
-                historyEvent = {
-                    t:"delete",
-                    nodes:removedNodes,
-                    links:removedLinks,
-                    groups: removedGroups,
-                    subflowOutputs:removedSubflowOutputs,
-                    subflowInputs:removedSubflowInputs,
-                    subflow: {
-                        id: activeSubflow?activeSubflow.id:undefined,
-                        instances: subflowInstances
-                    },
-                    dirty:startDirty
-                };
-                if (removedSubflowStatus) {
-                    historyEvent.subflow.status = removedSubflowStatus;
-                }
+                RED.history.push(historyEvent);
             }
-            RED.history.push(historyEvent);
 
-            selected_link = null;
+            selectedLinks.clear();
             updateActiveNodes();
             updateSelection();
             redraw();
@@ -21126,6 +21531,28 @@ RED.view = (function() {
         }
     }
 
+
+    function detachSelectedNodes() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            const {newLinks, removedLinks} = RED.nodes.detachNodes(selection.nodes);
+            if (removedLinks.length || newLinks.length) {
+                RED.history.push({
+                    t: "multi",
+                    events: [
+                        { t:'delete', links: removedLinks },
+                        { t:'add', links: newLinks }
+                    ],
+                    dirty: RED.nodes.dirty()
+                })
+                RED.nodes.dirty(true)
+            }
+            prepareDrag([selection.nodes[0].x,selection.nodes[0].y]);
+            mouse_mode = RED.state.DETACHED_DRAGGING;
+            RED.view.redraw(true);
+        }
+    }
+
     function calculateTextWidth(str, className) {
         var result = convertLineBreakCharacter(str);
         var width = 0;
@@ -21212,7 +21639,7 @@ RED.view = (function() {
             activeHoverGroup.hovered = false;
             activeHoverGroup = null;
         }
-        d3.select(".red-ui-flow-link-splice").classed("red-ui-flow-link-splice",false);
+        d3.selectAll(".red-ui-flow-link-splice").classed("red-ui-flow-link-splice",false);
         if (spliceTimer) {
             clearTimeout(spliceTimer);
             spliceTimer = null;
@@ -21460,10 +21887,13 @@ RED.view = (function() {
                     } else {
                         resetMouseVars();
                     }
-                    selected_link = select_link;
                     mousedown_link = select_link;
                     if (select_link) {
+                        selectedLinks.clear();
+                        selectedLinks.add(select_link);
                         updateSelection();
+                    } else {
+                        selectedLinks.clear();
                     }
                 }
                 redraw();
@@ -21472,7 +21902,10 @@ RED.view = (function() {
 
             resetMouseVars();
             hideDragLines();
-            selected_link = select_link;
+            if (select_link) {
+                selectedLinks.clear();
+                selectedLinks.add(select_link);
+            }
             mousedown_link = select_link;
             if (select_link) {
                 updateSelection();
@@ -21645,10 +22078,13 @@ RED.view = (function() {
             msn.dx = msn.n.x-mouse[0];
             msn.dy = msn.n.y-mouse[1];
         }
-
-        mouse_offset = d3.mouse(document.body);
-        if (isNaN(mouse_offset[0])) {
-            mouse_offset = d3.touches(document.body)[0];
+        try {
+            mouse_offset = d3.mouse(document.body);
+            if (isNaN(mouse_offset[0])) {
+                mouse_offset = d3.touches(document.body)[0];
+            }
+        } catch(err) {
+            mouse_offset = [0,0]
         }
     }
 
@@ -21729,7 +22165,7 @@ RED.view = (function() {
         //var touch0 = d3.event;
         //var pos = [touch0.pageX,touch0.pageY];
         //RED.touch.radialMenu.show(d3.select(this),pos);
-        if (mouse_mode == RED.state.IMPORT_DRAGGING) {
+        if (mouse_mode == RED.state.IMPORT_DRAGGING || mouse_mode == RED.state.DETACHED_DRAGGING) {
             var historyEvent = RED.history.peek();
             if (activeSpliceLink) {
                 // TODO: DRY - droppable/nodeMouseDown/canvasMouseUp
@@ -21767,6 +22203,18 @@ RED.view = (function() {
                 activeHoverGroup = null;
             }
 
+            if (mouse_mode == RED.state.DETACHED_DRAGGING) {
+                var ns = [];
+                for (var j=0;j<movingSet.length();j++) {
+                    var n = movingSet.get(j);
+                    if (n.ox !== n.n.x || n.oy !== n.n.y) {
+                        ns.push({n:n.n,ox:n.ox,oy:n.oy,moved:n.n.moved});
+                        n.n.dirty = true;
+                        n.n.moved = true;
+                    }
+                }
+                RED.history.replace({t:"multi",events:[historyEvent,{t:"move",nodes:ns}],dirty: historyEvent.dirty})
+            }
 
             updateSelection();
             RED.nodes.dirty(true);
@@ -21935,7 +22383,9 @@ RED.view = (function() {
             //     }
             // } else
             if (d3.event.shiftKey) {
-                clearSelection();
+                if (!(d3.event.ctrlKey||d3.event.metaKey)) {
+                    clearSelection();
+                }
                 var clickPosition = (d3.event.offsetX/scaleFactor - mousedown_node.x)
                 var edgeDelta = (mousedown_node.w/2) - Math.abs(clickPosition);
                 var cnodes;
@@ -21963,7 +22413,7 @@ RED.view = (function() {
                 mousedown_node.selected = true;
                 movingSet.add(mousedown_node);
             }
-            selected_link = null;
+            // selectedLinks.clear();
             if (d3.event.button != 2) {
                 mouse_mode = RED.state.MOVING;
                 var mouse = d3.touches(this)[0]||d3.mouse(this);
@@ -22089,19 +22539,35 @@ RED.view = (function() {
             d3.event.stopPropagation();
             return;
         }
-         mousedown_link = d;
-         clearSelection();
-         selected_link = mousedown_link;
-         updateSelection();
-         redraw();
-         focusView();
-         d3.event.stopPropagation();
-         if (d3.event.metaKey || d3.event.ctrlKey) {
-             d3.select(this).classed("red-ui-flow-link-splice",true);
-             var point = d3.mouse(this);
-             var clickedGroup = getGroupAt(point[0],point[1]);
-             showQuickAddDialog({position:point, splice:selected_link, group:clickedGroup});
-         }
+        if (d3.event.button === 2) {
+            return
+        }
+        mousedown_link = d;
+
+        if (!(d3.event.metaKey || d3.event.ctrlKey)) {
+            clearSelection();
+        }
+        if (d3.event.metaKey || d3.event.ctrlKey) {
+            if (!selectedLinks.has(mousedown_link)) {
+                selectedLinks.add(mousedown_link);
+            } else {
+                if (selectedLinks.length() !== 1) {
+                    selectedLinks.remove(mousedown_link);
+                }
+            }
+        } else {
+            selectedLinks.add(mousedown_link);
+        }
+        updateSelection();
+        redraw();
+        focusView();
+        d3.event.stopPropagation();
+        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && (d3.event.metaKey || d3.event.ctrlKey)) {
+            d3.select(this).classed("red-ui-flow-link-splice",true);
+            var point = d3.mouse(this);
+            var clickedGroup = getGroupAt(point[0],point[1]);
+            showQuickAddDialog({position:point, splice:mousedown_link, group:clickedGroup});
+        }
     }
     function linkTouchStart(d) {
         if (mouse_mode === RED.state.SELECTING_NODE) {
@@ -22110,7 +22576,8 @@ RED.view = (function() {
         }
         mousedown_link = d;
         clearSelection();
-        selected_link = mousedown_link;
+        selectedLinks.clear();
+        selectedLinks.add(mousedown_link);
         updateSelection();
         redraw();
         focusView();
@@ -22346,7 +22813,7 @@ RED.view = (function() {
     function showTouchMenu(obj,pos) {
         var mdn = mousedown_node;
         var options = [];
-        options.push({name:"delete",disabled:(movingSet.length()===0 && selected_link === null),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:"copy",disabled:(movingSet.length()===0),onselect:function() {copySelection();}});
         options.push({name:"paste",disabled:(clipboard.length===0),onselect:function() {importNodes(clipboard, {generateIds: true, touchImport: true});}});
@@ -22426,7 +22893,11 @@ RED.view = (function() {
             nodeEl = document.getElementById(d.id);
         }
         if (nodeEl) {
-            if (!showStatus || !d.status) {
+            // Do not show node status if:
+            // - global flag set
+            // - node has no status
+            // - node is disabled
+            if (!showStatus || !d.status || d.d === true) {
                 nodeEl.__statusGroup__.style.display = "none";
             } else {
                 nodeEl.__statusGroup__.style.display = "inline";
@@ -23079,6 +23550,13 @@ RED.view = (function() {
                 d3.select(pathBack)
                     .on("mousedown",linkMouseDown)
                     .on("touchstart",linkTouchStart)
+                    .on("mousemove", function(d) {
+                        if (mouse_mode === RED.state.SLICING) {
+                            selectedLinks.add(d)
+                            l.classed("red-ui-flow-link-splice",true)
+                            redraw()
+                        }
+                    })
 
                 var pathOutline = document.createElementNS("http://www.w3.org/2000/svg","path");
                 pathOutline.__data__ = d;
@@ -23099,7 +23577,7 @@ RED.view = (function() {
             link.exit().remove();
             link.each(function(d) {
                 var link = d3.select(this);
-                if (d.added || d===selected_link || 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 sourcePort = d.sourcePort || 0;
                     var y = -((numOutputs-1)/2)*13 +13*sourcePort;
@@ -23122,7 +23600,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-subflow-link", !d.link && activeSubflow);
                 }
-                this.classList.toggle("red-ui-flow-link-selected", !!(d===selected_link||d.selected));
+
+                this.classList.toggle("red-ui-flow-link-selected", !!d.selected);
 
                 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"))
@@ -23172,6 +23651,9 @@ RED.view = (function() {
                             n.selected = true;
                             n.dirty = true;
                             movingSet.add(n);
+                            if (targets.length === 1) {
+                                RED.view.reveal(n.id);
+                            }
                         });
                         updateSelection();
                         redraw();
@@ -23708,7 +24190,7 @@ RED.view = (function() {
                     counts.push(RED._("clipboard.group",{count:newGroupCount}));
                 }
                 if (newConfigNodeCount > 0) {
-                    counts.push(RED._("clipboard.configNode",{count:newNodeCount}));
+                    counts.push(RED._("clipboard.configNode",{count:newConfigNodeCount}));
                 }
                 if (new_subflows.length > 0) {
                     counts.push(RED._("clipboard.subflow",{count:new_subflows.length}));
@@ -23780,6 +24262,7 @@ RED.view = (function() {
                             delete node.d;
                         }
                         node.dirty = true;
+                        node.dirtyStatus = true;
                         node.changed = true;
                         RED.events.emit("nodes:change",node);
                     }
@@ -23826,8 +24309,9 @@ RED.view = (function() {
         if (allNodes.size > 0) {
             selection.nodes = Array.from(allNodes);
         }
-        if (selected_link != null) {
-            selection.link = selected_link;
+        if (selectedLinks.length() > 0) {
+            selection.links = selectedLinks.toArray();
+            selection.link = selection.links[0];
         }
         return selection;
     }
@@ -25128,6 +25612,90 @@ RED.view.tools = (function() {
         }
     }
 
+
+    function wireSeriesOfNodes() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var i = 0;
+                var newLinks = [];
+                while (i < selection.nodes.length - 1) {
+                    var nodeA = selection.nodes[i];
+                    var nodeB = selection.nodes[i+1];
+                    if (nodeA.outputs > 0 && nodeB.inputs > 0) {
+                        var existingLinks = RED.nodes.filterLinks({
+                            source: nodeA,
+                            target: nodeB,
+                            sourcePort: 0
+                        })
+                        if (existingLinks.length === 0) {
+                            var newLink = {
+                                source: nodeA,
+                                target: nodeB,
+                                sourcePort: 0
+                            }
+                            RED.nodes.addLink(newLink);
+                            newLinks.push(newLink);
+                        }
+                    }
+                    i++;
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
+    function wireNodeToMultiple() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var sourceNode = selection.nodes[0];
+                if (sourceNode.outputs === 0) {
+                    return;
+                }
+                var i = 1;
+                var newLinks = [];
+                while (i < selection.nodes.length) {
+                    var targetNode = selection.nodes[i];
+                    if (targetNode.inputs > 0) {
+                        var existingLinks = RED.nodes.filterLinks({
+                            source: sourceNode,
+                            target: targetNode,
+                            sourcePort: Math.min(sourceNode.outputs-1,i-1)
+                        })
+                        if (existingLinks.length === 0) {
+                            var newLink = {
+                                source: sourceNode,
+                                target: targetNode,
+                                sourcePort: Math.min(sourceNode.outputs-1,i-1)
+                            }
+                            RED.nodes.addLink(newLink);
+                            newLinks.push(newLink);
+                        }
+                    }
+                    i++;
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
     return {
         init: function() {
             RED.actions.add("core:show-selected-node-labels", function() { setSelectedNodeLabelState(true); })
@@ -25186,7 +25754,8 @@ RED.view.tools = (function() {
             RED.actions.add("core:distribute-selection-horizontally", function() { distributeSelection('h') })
             RED.actions.add("core:distribute-selection-vertically", function() { distributeSelection('v') })
 
-
+            RED.actions.add("core:wire-series-of-nodes", function() { wireSeriesOfNodes() })
+            RED.actions.add("core:wire-node-to-multiple", function() { wireNodeToMultiple() })
 
             // RED.actions.add("core:add-node", function() { addNode() })
         },
@@ -26942,6 +27511,7 @@ RED.sidebar.info = (function() {
                                     n.d = true;
                                 }
                                 n.dirty = true;
+                                n.dirtyStatus = true;
                                 n.changed = true;
                                 RED.events.emit("nodes:change",n);
                                 groupHistoryEvent.events.push(historyEvent);
@@ -26970,6 +27540,7 @@ RED.sidebar.info = (function() {
                         n.d = true;
                     }
                     n.dirty = true;
+                    n.dirtyStatus = true;
                     n.changed = true;
                     RED.events.emit("nodes:change",n);
                     RED.history.push(historyEvent);
@@ -27039,6 +27610,7 @@ RED.sidebar.info = (function() {
                 {label:RED._("sidebar.info.search.invalidNodes"), value: "is:invalid"},
                 {label:RED._("sidebar.info.search.uknownNodes"), value: "type:unknown"},
                 {label:RED._("sidebar.info.search.unusedSubflows"), value:"is:subflow is:unused"},
+                {label:RED._("sidebar.info.search.hiddenFlows"), value:"is:hidden"},
             ]
         });
 
@@ -27330,7 +27902,7 @@ RED.sidebar.info = (function() {
         }
     }
     function getGutter(n) {
-        var span = $("<span>",{class:"red-ui-info-outline-gutter"});
+        var span = $("<span>",{class:"red-ui-info-outline-gutter red-ui-treeList-gutter-float"});
         var revealButton = $('<button type="button" class="red-ui-info-outline-item-control-reveal red-ui-button red-ui-button-small"><i class="fa fa-search"></i></button>').appendTo(span).on("click",function(evt) {
             evt.preventDefault();
             evt.stopPropagation();
@@ -27831,7 +28403,7 @@ RED.sidebar.help = (function() {
                     var currentVersionParts = RED.settings.version.split(".");
                     var tourVersionParts = tour.version.split(".");
                     if (tourVersionParts[0] === currentVersionParts[0] && tourVersionParts[1] === currentVersionParts[1]) {
-                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">Take a tour</button></div>'
+                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">' + RED._("tourGuide.takeATour") + '</button></div>';
                     }
                 }
                 var aboutHeader = '<div style="text-align:center;">'+tourHeader+'</div>'
@@ -30612,7 +31184,16 @@ RED.editor = (function() {
                     delete cn.__label__;
                 });
 
-                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:type})+'</option>');
+                var label = type;
+                if (typeof node_def.paletteLabel !== "undefined") {
+                    try {
+                        label = RED.utils.sanitize((typeof node_def.paletteLabel === "function" ? node_def.paletteLabel.call(node_def) : node_def.paletteLabel)||type);
+                    } catch(err) {
+                        console.log("Definition error: "+type+".paletteLabel",err);
+                    }
+                }
+
+                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:label})+'</option>');
                 window.setTimeout(function() { select.trigger("change");},50);
             }
         }
@@ -32450,9 +33031,15 @@ RED.editor = (function() {
                         }
                     });
                 }
-                if (!isSameObj(old_env, new_env)) {
-                    node.env = new_env;
+                if (!old_env && new_env.length === 0) {
+                    delete node.env;
+                } else if (!isSameObj(old_env, new_env)) {
                     editState.changes.env = node.env;
+                    if (new_env.length === 0) {
+                        delete node.env;
+                    } else {
+                        node.env = new_env;
+                    }
                     editState.changed = true;
                 }
             }
@@ -34271,7 +34858,7 @@ RED.editor = (function() {
                         var currentExpression = expressionEditor.getValue();
                         var expr;
                         var usesContext = false;
-                        var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
+                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                         $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                         try {
                             expr = jsonata(currentExpression);
@@ -34560,7 +35147,8 @@ RED.editor = (function() {
                             clearTimeout: true,
                             setInterval: true,
                             clearInterval: true
-                        }
+                        },
+                        extraLibs: options.extraLibs
                     });
                     if (options.cursor) {
                         expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
@@ -37579,6 +38167,7 @@ RED.clipboard = (function() {
                         text: RED._("common.label.cancel"),
                         click: function() {
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-download
@@ -37589,6 +38178,7 @@ RED.clipboard = (function() {
                             var data = $("#red-ui-clipboard-dialog-export-text").val();
                             downloadData("flows.json", data);
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-export
@@ -37603,6 +38193,7 @@ RED.clipboard = (function() {
                                 $( this ).dialog( "close" );
                                 copyText(flowData);
                                 RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
+                                RED.view.focus();
                             } else {
                                 var flowToExport = $("#red-ui-clipboard-dialog-export-text").val();
                                 var selectedPath = activeLibraries[activeTab].getSelected();
@@ -37618,6 +38209,7 @@ RED.clipboard = (function() {
                                         contentType: "application/json; charset=utf-8"
                                     }).done(function() {
                                         $(dialog).dialog( "close" );
+                                        RED.view.focus();
                                         RED.notify(RED._("library.exportedToLibrary"),"success");
                                     }).fail(function(xhr,textStatus,err) {
                                         if (xhr.status === 401) {
@@ -37679,6 +38271,7 @@ RED.clipboard = (function() {
                                 }
                             }
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-import-conflict
@@ -37711,6 +38304,7 @@ RED.clipboard = (function() {
                             // console.table(pendingImportConfig.importNodes.map(function(n) { return {id:n.id,type:n.type,result:importMap[n.id]}}))
                             RED.view.importNodes(newNodes, pendingImportConfig.importOptions);
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     }
                 ],
@@ -38448,28 +39042,25 @@ RED.clipboard = (function() {
         if (truncated) {
             msg += "_truncated";
         }
-        $("#red-ui-clipboard-hidden").val(value).focus().select();
-        var result =  document.execCommand("copy");
-        if (result && element) {
-            var popover = RED.popover.create({
-                target: element,
-                direction: 'left',
-                size: 'small',
-                content: RED._(msg)
-            });
-            setTimeout(function() {
-                popover.close();
-            },1000);
-            popover.open();
-        }
-        $("#red-ui-clipboard-hidden").val("");
-        if (currentFocus) {
-            $(currentFocus).focus();
-        }
-        return result;
+        navigator.clipboard.writeText(value).then(function () {
+            if (element) {
+                var popover = RED.popover.create({
+                    target: element,
+                    direction: 'left',
+                    size: 'small',
+                    content: RED._(msg)
+                });
+                setTimeout(function() {
+                    popover.close();
+                },1000);
+                popover.open();
+            }
+            if (currentFocus) {
+                $(currentFocus).focus();
+            }
+        }).catch(err => { console.error("Failed to copy:",err) });
     }
 
-
     function importNodes(nodesStr,addFlow) {
         var newNodes = nodesStr;
         if (typeof nodesStr === 'string') {
@@ -38744,8 +39335,6 @@ RED.clipboard = (function() {
         init: function() {
             setupDialogs();
 
-            $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo("#red-ui-editor");
-
             RED.actions.add("core:show-export-dialog",showExportNodes);
             RED.actions.add("core:show-import-dialog",showImportNodes);
 
@@ -40036,6 +40625,7 @@ RED.search = (function() {
     var selected = -1;
     var visible = false;
 
+    var searchHistory = [];
     var index = {};
     var currentResults = [];
     var previousActiveElement;
@@ -40119,6 +40709,7 @@ RED.search = (function() {
         val = extractFlag(val,"unused",flags);
         val = extractFlag(val,"config",flags);
         val = extractFlag(val,"subflow",flags);
+        val = extractFlag(val,"hidden",flags);
         // uses:<node-id>
         val = extractValue(val,"uses",flags);
 
@@ -40164,7 +40755,15 @@ RED.search = (function() {
                                 continue;
                             }
                         }
-
+                        if (flags.hasOwnProperty("hidden")) {
+                            // Only tabs can be hidden
+                            if (node.node.type !== 'tab') {
+                                continue
+                            }
+                            if (!RED.workspaces.isHidden(node.node.id)) {
+                                continue
+                            }
+                        }
                         if (flags.hasOwnProperty("unused")) {
                             var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
                                            (isConfigNode && node.node.users.length === 0)
@@ -40210,6 +40809,20 @@ RED.search = (function() {
         }
     }
 
+    function populateSearchHistory() {
+        if (searchHistory.length > 0) {
+            searchResults.editableList('addItem',{
+                historyHeader: true
+            });
+            searchHistory.forEach(function(entry) {
+                searchResults.editableList('addItem',{
+                    history: true,
+                    value: entry
+                });
+            })
+        }
+
+    }
     function createDialog() {
         dialog = $("<div>",{id:"red-ui-search",class:"red-ui-search"}).appendTo("#red-ui-main-container");
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
@@ -40218,7 +40831,12 @@ RED.search = (function() {
             change: function() {
                 searchResults.editableList('empty');
                 selected = -1;
-                currentResults = search($(this).val());
+                var value = $(this).val();
+                if (value === "") {
+                    populateSearchHistory();
+                    return;
+                }
+                currentResults = search(value);
                 if (currentResults.length > 0) {
                     for (i=0;i<Math.min(currentResults.length,25);i++) {
                         searchResults.editableList('addItem',currentResults[i])
@@ -40290,7 +40908,12 @@ RED.search = (function() {
                                 })
                             }
                         }
-                    } else {
+                    } if ($(children[selected]).hasClass("red-ui-search-history")) {
+                        var object = $(children[selected]).find(".red-ui-editableList-item-content").data('data');
+                        if (object) {
+                            searchInput.searchBox('value',object.value)
+                        }
+                    } else if (!$(children[selected]).hasClass("red-ui-search-historyHeader")) {
                         if (currentResults.length > 0) {
                             reveal(currentResults[Math.max(0,selected)].node);
                         }
@@ -40306,7 +40929,32 @@ RED.search = (function() {
             addItem: function(container,i,object) {
                 var node = object.node;
                 var div;
-                if (object.more) {
+                if (object.historyHeader) {
+                    container.parent().addClass("red-ui-search-historyHeader")
+                    $('<div>',{class:"red-ui-search-empty"}).text(RED._("search.history")).appendTo(container);
+                    $('<button type="button" class="red-ui-button red-ui-button-small"></button>').text(RED._("search.clear")).appendTo(container).on("click", function(evt) {
+                        evt.preventDefault();
+                        searchHistory = [];
+                        searchResults.editableList('empty');
+                    });
+                } else if (object.history) {
+                    container.parent().addClass("red-ui-search-history")
+                    div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+                    div.text(object.value);
+                    div.on("click", function(evt) {
+                        evt.preventDefault();
+                        searchInput.searchBox('value',object.value)
+                        searchInput.focus();
+                    })
+                    $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-remove"></i></button>').appendTo(container).on("click", function(evt) {
+                        evt.preventDefault();
+                        var index = searchHistory.indexOf(object.value);
+                        searchHistory.splice(index,1);
+                        searchResults.editableList('removeItem', object);
+                    });
+
+
+                } else if (object.more) {
                     container.parent().addClass("red-ui-search-more")
                     div = $('<a>',{href:'#',class:"red-ui-search-result red-ui-search-empty"}).appendTo(container);
                     div.text(RED._("palette.editor.more",{count:object.more.results.length-object.more.start}));
@@ -40361,6 +41009,12 @@ RED.search = (function() {
     }
 
     function reveal(node) {
+        var searchVal = searchInput.val();
+        var existingIndex = searchHistory.indexOf(searchVal);
+        if (existingIndex > -1) {
+            searchHistory.splice(existingIndex,1);
+        }
+        searchHistory.unshift(searchInput.val());
         hide();
         RED.view.reveal(node.id);
     }
@@ -40379,9 +41033,14 @@ RED.search = (function() {
 
             if (dialog === null) {
                 createDialog();
+            } else {
+                searchResults.editableList('empty');
             }
             dialog.slideDown(300);
             searchInput.searchBox('value',v)
+            if (!v || v === "") {
+                populateSearchHistory();
+            }
             RED.events.emit("search:open");
             visible = true;
         }
@@ -43012,12 +43671,14 @@ RED.group = (function() {
         markDirty(group);
     }
 
-    function getNodes(group,recursive) {
+    function getNodes(group,recursive,excludeGroup) {
         var nodes = [];
         group.nodes.forEach(function(n) {
-            nodes.push(n);
+            if (n.type !== 'group' || !excludeGroup) {
+                nodes.push(n);
+            }
             if (recursive && n.type === 'group') {
-                nodes = nodes.concat(getNodes(n,recursive))
+                nodes = nodes.concat(getNodes(n,recursive,excludeGroup))
             }
         })
         return nodes;
@@ -49820,6 +50481,10 @@ RED.touch.radialMenu = (function() {
             }
             $('<div>').css("text-align","left").html(getLocaleText(step.description)).appendTo(stepDescription);
 
+            if (step.image) {
+                $(`<img src="red/tours/${step.image}" />`).appendTo(stepDescription)
+            }
+
             var stepToolbar = $('<div>',{class:"red-ui-tourGuide-toolbar"}).appendTo(stepContent);
 
             // var breadcrumbs = $('<div>',{class:"red-ui-tourGuide-breadcrumbs"}).appendTo(stepToolbar);
@@ -49928,6 +50593,8 @@ RED.touch.radialMenu = (function() {
             if (step.fallback) {
                 focus.one("mouseenter", function(evt) {
                     setTimeout(function() {
+                        var pos = targetElement[0].getBoundingClientRect();
+                        var dimension = Math.max(50, Math.max(pos.width,pos.height)*1.5);
                         focus.css({
                             width: (4*dimension)+"px",
                             height: (4*dimension)+"px"