@node-red/editor-client 3.1.0-beta.2 → 3.1.0-beta.3

package/public/red/red.js

@@ -354,6 +354,7 @@ var RED = (function() {
                                     setTimeout(() => {
                                         RED.view.reveal(nodeToShow.id)
                                         window.location.hash = currentHash
+                                        RED.view.select(nodeToShow.id)
                                         if (showEditDialog) {
                                             RED.editor.edit(nodeToShow)
                                         }
@@ -364,6 +365,7 @@ var RED = (function() {
                                 if (nodeToShow) {
                                     RED.view.reveal(nodeToShow.id)
                                     window.location.hash = currentHash
+                                    RED.view.select(nodeToShow.id)
                                     if (showEditDialog) {
                                         RED.editor.editGroup(nodeToShow)
                                     }
@@ -1380,8 +1382,8 @@ RED.settings = (function () {
         if (!hasLocalStorage()) {
             return;
         }
-        if (key === "auth-tokens") {
-            localStorage.setItem(key, JSON.stringify(value));
+        if (key.startsWith("auth-tokens")) {
+            localStorage.setItem(key+this.authTokensSuffix, JSON.stringify(value));
         } else {
             RED.utils.setMessageProperty(userSettings,key,value);
             saveUserSettings();
@@ -1399,8 +1401,8 @@ RED.settings = (function () {
         if (!hasLocalStorage()) {
             return undefined;
         }
-        if (key === "auth-tokens") {
-            return JSON.parse(localStorage.getItem(key));
+        if (key.startsWith("auth-tokens")) {
+            return JSON.parse(localStorage.getItem(key+this.authTokensSuffix));
         } else {
             var v;
             try { v = RED.utils.getMessageProperty(userSettings,key); } catch(err) {}
@@ -1418,8 +1420,8 @@ RED.settings = (function () {
         if (!hasLocalStorage()) {
             return;
         }
-        if (key === "auth-tokens") {
-            localStorage.removeItem(key);
+        if (key.startsWith("auth-tokens")) {
+            localStorage.removeItem(key+this.authTokensSuffix);
         } else {
             delete userSettings[key];
             saveUserSettings();
@@ -1446,6 +1448,8 @@ RED.settings = (function () {
 
     var init = function (options, done) {
         var accessTokenMatch = /[?&]access_token=(.*?)(?:$|&)/.exec(window.location.search);
+        var path=window.location.pathname.slice(0,-1);
+        RED.settings.authTokensSuffix=path.replace(/\//g, '-');
         if (accessTokenMatch) {
             var accessToken = accessTokenMatch[1];
             RED.settings.set("auth-tokens",{access_token: accessToken});
@@ -5160,7 +5164,7 @@ RED.nodes = (function() {
                 }
             }
             if (node.type !== "subflow") {
-                var convertedNode = RED.nodes.convertNode(node);
+                var convertedNode = RED.nodes.convertNode(node, { credentials: false });
                 for (var d in node._def.defaults) {
                     if (node._def.defaults[d].type) {
                         var nodeList = node[d];
@@ -5193,7 +5197,7 @@ RED.nodes = (function() {
                     nns = nns.concat(createExportableNodeSet(node.nodes, exportedIds, exportedSubflows, exportedConfigNodes));
                 }
             } else {
-                var convertedSubflow = convertSubflow(node);
+                var convertedSubflow = convertSubflow(node, { credentials: false });
                 nns.push(convertedSubflow);
             }
         }
@@ -5893,16 +5897,27 @@ RED.nodes = (function() {
                     } else if (n.type.substring(0,7) === "subflow") {
                         var parentId = n.type.split(":")[1];
                         var subflow = subflow_denylist[parentId]||subflow_map[parentId]||getSubflow(parentId);
-                        if (createNewIds || options.importMap[n.id] === "copy") {
-                            parentId = subflow.id;
-                            node.type = "subflow:"+parentId;
-                            node._def = registry.getNodeType(node.type);
-                            delete node.i;
-                        }
-                        node.name = n.name;
-                        node.outputs = subflow.out.length;
-                        node.inputs = subflow.in.length;
-                        node.env = n.env;
+                        if (!subflow){
+                            node._def = {
+                                color:"#fee",
+                                defaults: {},
+                                label: "unknown: "+n.type,
+                                labelStyle: "red-ui-flow-node-label-italic",
+                                outputs: n.outputs|| (n.wires && n.wires.length) || 0,
+                                set: registry.getNodeSet("node-red/unknown")
+                            }
+                        } else {
+                            if (createNewIds || options.importMap[n.id] === "copy") {
+                                parentId = subflow.id;
+                                node.type = "subflow:"+parentId;
+                                node._def = registry.getNodeType(node.type);
+                                delete node.i;
+                            }
+                            node.name = n.name;
+                            node.outputs = subflow.out.length;
+                            node.inputs = subflow.in.length;
+                            node.env = n.env;
+                        }
                     } else if (n.type === 'junction') {
                          node._def = {defaults:{}}
                          node._config.x = node.x
@@ -19150,7 +19165,11 @@ RED.keyboard = (function() {
                 okButton.attr("disabled",!valid);
             });
 
-            var scopeSelect = $('<select><option value="*" data-i18n="keyboard.global"></option><option value="red-ui-workspace" data-i18n="keyboard.workspace"></option></select>').appendTo(scope);
+            var scopeSelect = $('<select>'+
+                '<option value="*" data-i18n="keyboard.global"></option>'+
+                '<option value="red-ui-workspace" data-i18n="keyboard.workspace"></option>'+
+                '<option value="red-ui-editor-stack" data-i18n="keyboard.editor"></option>'+
+                '</select>').appendTo(scope);
             scopeSelect.i18n();
             if (object.scope === "workspace") {
                 object.scope = "red-ui-workspace";
@@ -19407,7 +19426,11 @@ RED.keyboard = (function() {
         var new_env = [];
         var items = list.editableList('items');
         var credentials = gconf ? gconf.credentials : null;
-
+        if (!gconf && list.editableList('length') === 0) {
+            // No existing global-config node and nothing in the list,
+            // so no need to do anything more
+            return
+        }
         if (!credentials) {
             credentials = {
                 _ : {},
@@ -19435,6 +19458,12 @@ RED.keyboard = (function() {
         if (gconf === null) {
             gconf = getGlobalConf(true);
         }
+        if (!gconf.credentials) {
+            gconf.credentials = {
+                _ : {},
+                map: {}
+            };
+        }
         if ((JSON.stringify(new_env) !== JSON.stringify(gconf.env)) ||
             (JSON.stringify(credentials) !== JSON.stringify(gconf.credentials))) {
             gconf.env = new_env;
@@ -20679,7 +20708,13 @@ RED.view = (function() {
                     set.unshift(...removed)
                 }
             },
-            find: function(func) { return set.find(func) }
+            find: function(func) { return set.find(func) },
+            dump: function () {
+                console.log('MovingSet Contents')
+                api.forEach((n, i) => {
+                    console.log(`${i+1}\t${n.n.id}\t${n.n.type}`)
+                })
+            }
         }
         return api;
     })();
@@ -20716,6 +20751,63 @@ RED.view = (function() {
         return api
     })();
 
+    const selectedGroups = (function() {
+        let groups = new Set()
+        const api = {
+            add: function(g, includeNodes, addToMovingSet) {
+                groups.add(g)
+                if (!g.selected) {
+                    g.selected = true;
+                    g.dirty = true;
+                }
+                if (addToMovingSet !== false) {
+                    movingSet.add(g);
+                }
+                if (includeNodes) {
+                    var currentSet = new Set(movingSet.nodes());
+                    var allNodes = RED.group.getNodes(g,true);
+                    allNodes.forEach(function(n) {
+                        if (!currentSet.has(n)) {
+                            movingSet.add(n)
+                        }
+                        n.dirty = true;
+                    })
+                }
+                selectedLinks.clearUnselected()
+            },
+            remove: function(g) {
+                groups.delete(g)
+                if (g.selected) {
+                    g.selected = false;
+                    g.dirty = true;
+                }
+                const allNodes = RED.group.getNodes(g,true);
+                const nodeSet = new Set(allNodes);
+                nodeSet.add(g);
+                for (let i = movingSet.length()-1; i >= 0; i -= 1) {
+                    const msn = movingSet.get(i);
+                    if (nodeSet.has(msn.n) || msn.n === g) {
+                        msn.n.selected = false;
+                        msn.n.dirty = true;
+                        movingSet.remove(msn.n,i)
+                    }
+                }
+                selectedLinks.clearUnselected()
+            },
+            length: () => groups.length,
+            forEach: (func) => { groups.forEach(func) },
+            toArray: () => [...groups],
+            clear: function () {
+                groups.forEach(g => {
+                    g.selected = false
+                    g.dirty = true
+                })
+                groups.clear()
+            }
+        }
+        return api
+    })()
+
 
     function init() {
 
@@ -21620,7 +21712,7 @@ RED.view = (function() {
         var touchTrigger = options.touchTrigger;
 
         if (targetGroup) {
-            selectGroup(targetGroup,false);
+            selectedGroups.add(targetGroup,false);
             RED.view.redraw();
         }
 
@@ -21946,7 +22038,7 @@ RED.view = (function() {
                 clearSelection();
                 nn.selected = true;
                 if (targetGroup) {
-                    selectGroup(targetGroup,false);
+                    selectedGroups.add(targetGroup,false);
                 }
                 movingSet.add(nn);
                 updateActiveNodes();
@@ -22410,10 +22502,7 @@ RED.view = (function() {
                 if (!movingSet.has(n) && !n.selected) {
                     // group entirely within lasso
                     if (n.x > x && n.y > y && n.x + n.w < x2 && n.y + n.h < y2) {
-                        n.selected = true
-                        n.dirty = true
-                        var groupNodes = RED.group.getNodes(n,true);
-                        groupNodes.forEach(gn => movingSet.add(gn))
+                        selectedGroups.add(n, true)
                     }
                 }
             })
@@ -22763,7 +22852,7 @@ RED.view = (function() {
         clearSelection();
         activeGroups.forEach(function(g) {
             if (!g.g) {
-                selectGroup(g, true);
+                selectedGroups.add(g, true);
                 if (!g.selected) {
                     g.selected = true;
                     g.dirty = true;
@@ -22833,10 +22922,7 @@ RED.view = (function() {
         }
         movingSet.clear();
         selectedLinks.clear();
-        activeGroups.forEach(function(g) {
-            g.selected = false;
-            g.dirty = true;
-        })
+        selectedGroups.clear();
     }
 
     var lastSelection = null;
@@ -23093,6 +23179,16 @@ RED.view = (function() {
                         var result = RED.nodes.removeJunction(node)
                         removedJunctions.push(node);
                         removedLinks = removedLinks.concat(result.links);
+                        if (node.g) {
+                            var group = RED.nodes.group(node.g);
+                            if (selectedGroups.indexOf(group) === -1) {
+                                // Don't use RED.group.removeFromGroup as that emits
+                                // a change event on the node - but we're deleting it
+                                var index = group.nodes.indexOf(node);
+                                group.nodes.splice(index,1);
+                                RED.group.markDirty(group);
+                            }
+                        }
                     } else {
                         if (node.direction === "out") {
                             removedSubflowOutputs.push(node);
@@ -23915,7 +24011,7 @@ RED.view = (function() {
             if (!groupNodeSelectPrimed && !d.selected && d.g && RED.nodes.group(d.g).selected) {
                 clearSelection();
 
-                selectGroup(RED.nodes.group(d.g), false);
+                selectedGroups.add(RED.nodes.group(d.g), false);
 
                 mousedown_node.selected = true;
                 movingSet.add(mousedown_node);
@@ -24336,14 +24432,14 @@ RED.view = (function() {
         lastClickNode = g;
 
         if (g.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
-            deselectGroup(g);
+            selectedGroups.remove(g);
             d3.event.stopPropagation();
         } else {
             if (!g.selected) {
                 if (!d3.event.ctrlKey && !d3.event.metaKey) {
                     clearSelection();
                 }
-                selectGroup(g,true);//!wasSelected);
+                selectedGroups.add(g,true);//!wasSelected);
             }
 
             if (d3.event.button != 2) {
@@ -24359,45 +24455,6 @@ RED.view = (function() {
         d3.event.stopPropagation();
     }
 
-    function selectGroup(g, includeNodes, addToMovingSet) {
-        if (!g.selected) {
-            g.selected = true;
-            g.dirty = true;
-        }
-        if (addToMovingSet !== false) {
-            movingSet.add(g);
-        }
-        if (includeNodes) {
-            var currentSet = new Set(movingSet.nodes());
-            var allNodes = RED.group.getNodes(g,true);
-            allNodes.forEach(function(n) {
-                if (!currentSet.has(n)) {
-                    movingSet.add(n)
-                }
-                n.dirty = true;
-            })
-        }
-        selectedLinks.clearUnselected()
-    }
-
-    function deselectGroup(g) {
-        if (g.selected) {
-            g.selected = false;
-            g.dirty = true;
-        }
-        const allNodes = RED.group.getNodes(g,true);
-        const nodeSet = new Set(allNodes);
-        nodeSet.add(g);
-        for (let i = movingSet.length()-1; i >= 0; i -= 1) {
-            const msn = movingSet.get(i);
-            if (nodeSet.has(msn.n) || msn.n === g) {
-                msn.n.selected = false;
-                msn.n.dirty = true;
-                movingSet.remove(msn.n,i)
-            }
-        }
-        selectedLinks.clearUnselected()
-    }
     function getGroupAt(x, y, ignoreSelected) {
         // x,y expected to be in node-co-ordinate space
         var candidateGroups = {};
@@ -24836,6 +24893,7 @@ RED.view = (function() {
                             this.__port__.setAttribute("transform","translate(-5,"+((d.h/2)-5)+")");
                             this.__outputOutput__.setAttribute("transform","translate(20,"+((d.h/2)-8)+")");
                             this.__outputNumber__.setAttribute("transform","translate(20,"+((d.h/2)+7)+")");
+                            this.__outputNumber__.textContent = d.i+1;
                         }
                         d.dirty = false;
                     }
@@ -26378,11 +26436,10 @@ RED.view = (function() {
         if (movingSet.length() > 0) {
             movingSet.forEach(function(n) {
                 if (n.n.type !== 'group') {
-                allNodes.add(n.n);
+                    allNodes.add(n.n);
                 }
             });
         }
-        var selectedGroups = activeGroups.filter(function(g) { return g.selected });
         selectedGroups.forEach(function(g) {
             var groupNodes = RED.group.getNodes(g,true);
             groupNodes.forEach(function(n) {
@@ -26576,6 +26633,13 @@ RED.view = (function() {
                         selectedNode.dirty = true;
                         movingSet.clear();
                         movingSet.add(selectedNode);
+                    } else {
+                        selectedNode = RED.nodes.group(selection);
+                        if (selectedNode) {
+                            movingSet.clear();
+                            selectedGroups.clear()
+                            selectedGroups.add(selectedNode)
+                        }
                     }
                 } else if (selection) {
                     if (selection.nodes) {
@@ -26591,7 +26655,7 @@ RED.view = (function() {
                                 n.dirty = true;
                                 movingSet.add(n);
                             } else {
-                                selectGroup(n,true);
+                                selectedGroups.add(n,true);
                             }
                         })
                     }
@@ -26759,8 +26823,12 @@ RED.view = (function() {
             })
         },
         scroll: function(x,y) {
-            chart.scrollLeft(chart.scrollLeft()+x);
-            chart.scrollTop(chart.scrollTop()+y)
+            if (x !== undefined && y !== undefined) {
+                chart.scrollLeft(chart.scrollLeft()+x);
+                chart.scrollTop(chart.scrollTop()+y)
+            } else {
+                return [chart.scrollLeft(), chart.scrollTop()]
+            }
         },
         clickNodeButton: function(n) {
             if (n._def.button) {
@@ -28946,23 +29014,15 @@ RED.palette = (function() {
                 }
                 metaData += type;
 
+                const safeType = type.replace(/'/g,"\\'");
+                const searchType = type.indexOf(' ') > -1 ? '&quot;' + type + '&quot;' : type
+
                 if (/^subflow:/.test(type)) {
                     $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
                 }
 
-                const safeType = type.replace(/'/g,"\\'");
-                const wrapStr = function (str) {
-                    if(str.indexOf(' ') >= 0) {
-                        return '"' + str + '"'
-                    }
-                    return str
-                }
+                $('<button type="button" onclick="RED.search.show(\'type:'+searchType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
 
-                $('<button type="button"; return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>')
-                    .appendTo(popOverContent)
-                    .on('click', function() {
-                        RED.search.show('type:' + wrapStr(safeType))
-                    })
                 $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
 
                 $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
@@ -33339,11 +33399,13 @@ RED.editor = (function() {
         var hasChanged;
         if (node.type.indexOf("subflow:")===0) {
             subflow = RED.nodes.subflow(node.type.substring(8));
-            isValid = subflow.valid;
-            hasChanged = subflow.changed;
-            if (isValid === undefined) {
-                isValid = validateNode(subflow);
+            if (subflow){
+                isValid = subflow.valid;
                 hasChanged = subflow.changed;
+                if (isValid === undefined) {
+                    isValid = validateNode(subflow);
+                    hasChanged = subflow.changed;
+                }
             }
             validationErrors = validateNodeProperties(node, node._def.defaults, node);
             node.valid = isValid && validationErrors.length === 0;
@@ -37975,7 +38037,7 @@ RED.editor = (function() {
                         }
 
                         try {
-                            expr.evaluate(legacyMode?{msg:parsedData}:parsedData, (err, result) => {
+                            expr.evaluate(legacyMode?{msg:parsedData}:parsedData, null, (err, result) => {
                                 if (err) {
                                     testResultEditor.setValue(RED._("expressionEditor.errors.eval",{message:err.message}),-1);
                                 } else {
@@ -39621,7 +39683,7 @@ RED.editor.codeEditor.monaco = (function() {
         "node-red-util": {package: "node-red", module: "util", path: "node-red/util.d.ts" },
         "node-red-func": {package: "node-red", module: "func", path: "node-red/func.d.ts" },
     }
-    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] , knownModules["util"] ];
+    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"], knownModules["timers"] , knownModules["util"] ];
 
     const modulesCache = {};
 
@@ -40681,19 +40743,19 @@ RED.editor.codeEditor.monaco = (function() {
         // Warning: 4
         // Error: 8
         ed.getAnnotations = function getAnnotations() {
-            var aceCompatibleMarkers = [];
+            let aceCompatibleMarkers;
             try {
-                var _model = ed.getModel();
+                const _model = ed.getModel();
                 if (_model !== null) {
-                    var id = _model._languageId; // e.g. javascript
-                    var ra = _model._associatedResource.authority;  //e.g.  model
-                    var rp = _model._associatedResource.path;   //e.g.      /18
-                    var rs = _model._associatedResource.scheme; //e.g.      inmemory
-                    var modelMarkers = monaco.editor.getModelMarkers(_model) || [];
-                    var thisEditorsMarkers = modelMarkers.filter(function (marker) {
-                        var _ra = marker.resource.authority;  //e.g.  model
-                        var _rp = marker.resource.path;   //e.g.      /18
-                        var _rs = marker.resource.scheme; //e.g.      inmemory
+                    const id = _model.getLanguageId(); // e.g.  javascript
+                    const ra = _model.uri.authority; //   e.g.  model
+                    const rp = _model.uri.path; //        e.g.  /18
+                    const rs = _model.uri.scheme; //      e.g.  inmemory
+                    const modelMarkers = monaco.editor.getModelMarkers(_model) || [];
+                    const thisEditorsMarkers = modelMarkers.filter(function (marker) {
+                        const _ra = marker.resource.authority; // e.g.  model
+                        const _rp = marker.resource.path; //      e.g.  /18
+                        const _rs = marker.resource.scheme; //    e.g.  inmemory
                         return marker.owner == id && _ra === ra && _rp === rp && _rs === rs;
                     })
                     aceCompatibleMarkers = thisEditorsMarkers.map(function (marker) {
@@ -41469,13 +41531,13 @@ RED.clipboard = (function() {
             // IE11 workaround
             // IE does not support data uri scheme for downloading data
             var blob = new Blob([data], {
-                type: "data:text/plain;charset=utf-8"
+                type: "data:application/json;charset=utf-8"
             });
             navigator.msSaveBlob(blob, file);
         }
         else {
             var element = document.createElement('a');
-            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data));
+            element.setAttribute('href', 'data:application/json;charset=utf-8,' + encodeURIComponent(data));
             element.setAttribute('download', file);
             element.style.display = 'none';
             document.body.appendChild(element);
@@ -42163,7 +42225,7 @@ RED.clipboard = (function() {
                 nodes.unshift(parentNode);
                 nodes = RED.nodes.createExportableNodeSet(nodes);
             } else if (type === 'full') {
-                nodes = RED.nodes.createCompleteNodeSet(false);
+                nodes = RED.nodes.createCompleteNodeSet({ credentials: false });
             }
             if (nodes !== null) {
                 if (format === "red-ui-clipboard-dialog-export-fmt-full") {
@@ -44942,7 +45004,7 @@ RED.actionList = (function() {
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
         searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
             change: function() {
-                filterTerm = $(this).val().trim();
+                filterTerm = $(this).val().trim().toLowerCase();
                 filterTerms = filterTerm.split(" ");
                 searchResults.editableList('filter');
                 searchResults.find("li.selected").removeClass("selected");
@@ -45595,7 +45657,9 @@ RED.subflow = (function() {
         '</script>';
 
     function findAvailableSubflowIOPosition(subflow,isInput) {
-        var pos = {x:50,y:30};
+        const scrollPos = RED.view.scroll()
+        const scaleFactor = RED.view.scale()
+        var pos = { x: (scrollPos[0]/scaleFactor)+50, y: (scrollPos[1]/scaleFactor)+30 };
         if (!isInput) {
             pos.x += 110;
         }
@@ -46230,24 +46294,23 @@ RED.subflow = (function() {
         var candidateOutputs = [];
         var candidateInputNodes = {};
 
-        var boundingBox = [nodeList[0].x,
-            nodeList[0].y,
-            nodeList[0].x,
-            nodeList[0].y];
+        var boundingBox = [nodeList[0].x-(nodeList[0].w/2),
+            nodeList[0].y-(nodeList[0].h/2),
+            nodeList[0].x+(nodeList[0].w/2),
+            nodeList[0].y+(nodeList[0].h/2)];
 
         for (i=0;i<nodeList.length;i++) {
             n = nodeList[i];
             nodes[n.id] = {n:n,outputs:{}};
             boundingBox = [
-                Math.min(boundingBox[0],n.x),
-                Math.min(boundingBox[1],n.y),
-                Math.max(boundingBox[2],n.x),
-                Math.max(boundingBox[3],n.y)
+                Math.min(boundingBox[0],n.x-(n.w/2)),
+                Math.min(boundingBox[1],n.y-(n.h/2)),
+                Math.max(boundingBox[2],n.x+(n.w/2)),
+                Math.max(boundingBox[3],n.y+(n.h/2))
             ]
         }
-        var offsetX = snapToGrid(boundingBox[0] - 200);
-        var offsetY = snapToGrid(boundingBox[1] - 80);
-
+        var offsetX = snapToGrid(boundingBox[0] - 140);
+        var offsetY = snapToGrid(boundingBox[1] - 60);
 
         var center = [
             snapToGrid((boundingBox[2]+boundingBox[0]) / 2),
@@ -47315,7 +47378,7 @@ RED.group = (function() {
                 }
             }
             var existingGroup;
-
+            var mergedEnv = {}
             // Second pass, ungroup any groups in the selection and add their contents
             // to the selection
             for (var i=0; i<selection.nodes.length; i++) {
@@ -47324,6 +47387,11 @@ RED.group = (function() {
                     if (!existingGroup) {
                         existingGroup = n;
                     }
+                    if (n.env && n.env.length > 0) {
+                        n.env.forEach(env => {
+                            mergedEnv[env.name] = env
+                        })
+                    }
                     ungroupHistoryEvent.groups.push(n);
                     nodes = nodes.concat(ungroup(n));
                 } else {
@@ -47341,6 +47409,7 @@ RED.group = (function() {
                     group.style = existingGroup.style;
                     group.name = existingGroup.name;
                 }
+                group.env = Object.values(mergedEnv)
                 RED.view.select({nodes:[group]})
             }
             historyEvent.events.push({