From 05f816fc5d26af31313acbde4615c7b29f468033 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Mon, 25 May 2020 08:46:35 +0900
Subject: [PATCH] not emit change event on group delete

---
 .../src/js/ui/tab-info-outliner.js              |  7 +------
 .../@node-red/editor-client/src/js/ui/view.js   | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
index f57d676ab..ccecfd043 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@@ -362,9 +362,6 @@ RED.sidebar.info.outliner = (function() {
         var existingObject = objects[n.id];
         var parent = n.g||n.z;
 
-        if (!existingObject) {
-            return;
-        }
         var nodeLabelText = getNodeLabelText(n);
         if (nodeLabelText) {
             existingObject.element.find(".red-ui-info-outline-item-label").text(nodeLabelText);
@@ -373,9 +370,7 @@ RED.sidebar.info.outliner = (function() {
         }
 
         if (parent !== existingObject.parent.id) {
-            if (existingObject.treeList) {
-                existingObject.treeList.remove();
-            }
+            existingObject.treeList.remove();
             if (!parent) {
                 globalConfigNodes.treeList.addChild(existingObject);
             } else {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 414bf7c17..dc9dce958 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -1943,10 +1943,14 @@ if (DEBUG_EVENTS) { console.warn("clearSelection", mouse_mode); }
             if (moving_set.length > 0) {
                 for (var i=0;i<moving_set.length;i++) {
                     var node = moving_set[i].n;
-                    node.selected = false;
                     if (node.type === "group") {
                         selectedGroups.push(node);
-                    } else if (node.type != "subflow") {
+                    }
+                }
+                for (var i=0;i<moving_set.length;i++) {
+                    var node = moving_set[i].n;
+                    node.selected = false;
+                    if ((node.type !== "group") && (node.type != "subflow")) {
                         if (node.x < 0) {
                             node.x = 25
                         }
@@ -1957,8 +1961,13 @@ if (DEBUG_EVENTS) { console.warn("clearSelection", mouse_mode); }
                         if (node.g) {
                             var group = RED.nodes.group(node.g);
                             if (!group.selected || group.active) {
-                                RED.group.removeFromGroup(group,node);
-                                node.g = group.id;
+                                var isSelectedGroup = selectedGroups.find(function (ng) {
+                                    return (ng.id === node.g);
+                                });
+                                if (!isSelectedGroup) {
+                                    RED.group.removeFromGroup(group,node);
+                                    node.g = group.id;
+                                }
                             }
                         }
                     } else {