Merge branch 'main' into Accessibility-Violations-Fix

srikant-ch5 · Jan 21, 2025 · 7618951 · 7618951
2 parents fc8fc7c + c0dfa10
commit 7618951
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/canvas_modules/common-canvas/src/common-canvas/canvas-controller.js b/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();
 		}
 	}
 

diff --git a/canvas_modules/common-canvas/src/common-canvas/svg-canvas-renderer.js b/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);

diff --git a/canvas_modules/common-canvas/src/common-canvas/svg-canvas-utils-textarea.js b/canvas_modules/common-canvas/src/common-canvas/svg-canvas-utils-textarea.js
@@ -880,7 +880,7 @@ 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) => {
 				d3Event.stopPropagation(); // Allow default behavior to show system contenxt menu
 			});
 	}

diff --git a/canvas_modules/common-canvas/src/common-properties/controls/controls.scss b/canvas_modules/common-canvas/src/common-properties/controls/controls.scss
@@ -44,7 +44,7 @@
 		display: flex;
 		> div:first-child {
 			width: 100%;
-			overflow-x: auto;
+			min-width: 0; // Prevent overflow issues
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1683,7 +1683,6 @@ export default class CanvasController { @@
     		} else if (!this.mouseInContextToolbar && !this.mouseInObject) {
     			this.objectModel.closeContextMenu();
-    			this.setFocusOnCanvas();
     		}
     	}
@@ Expand Down @@