2307 Clicking edit icon for node label causes node selection instead …

…of openeing label for edit

Signed-off-by: CTomlyn <[email protected]>

canvas_modules/common-canvas/src/common-canvas/canvas-controller.js

@@ -1683,7 +1683,6 @@ export default class CanvasController {
 
 		} else if (!this.mouseInContextToolbar && !this.mouseInObject) {
 			this.objectModel.closeContextMenu();
-			this.setFocusOnCanvas();
 		}
 	}
 

canvas_modules/common-canvas/src/common-canvas/svg-canvas-renderer.js

@@ -2206,7 +2206,7 @@ export default class SVGCanvasRenderer {
 				}
 			})
 			.on("mouseenter", (d3Event, d) => {
-				if (this.isDragging()) {
+				if (this.isDragging() || this.svgCanvasTextArea.isEditingText()) {
 					return;
 				}
 
@@ -2505,7 +2505,11 @@ export default class SVGCanvasRenderer {
 				that.mouseOverLabelEditIcon = false;
 				that.hideEditIcon(this);
 			})
+			.on("mousedown mouseup", function(d3Event) {
+				CanvasUtils.stopPropagationAndPreventDefault(d3Event);
+			})
 			.on("click", function(d3Event, d) {
+				CanvasUtils.stopPropagationAndPreventDefault(d3Event);
 				displayTextArea(d3Event, d);
 				that.mouseOverLabelEditIcon = false;
 				that.hideEditIcon(this);

canvas_modules/common-canvas/src/common-canvas/svg-canvas-utils-textarea.js

@@ -880,7 +880,8 @@ export default class SvgCanvasTextArea {
 				this.logger.log("Text area - focus");
 				data.autoSizeCallback(d3Event.target, data);
 			})
-			.on("mousedown click dblclick contextmenu", (d3Event, d) => {
+			.on("mousedown mouseenter mouseleave click dblclick contextmenu", (d3Event, d) => {
+				console.log("mouseenter etc");
 				d3Event.stopPropagation(); // Allow default behavior to show system contenxt menu
 			});
 	}