Merge branch 'main' into Action-Image-Align

elyra-ai · Jan 3, 2025 · c7beac5 · c7beac5
2 parents e53c03a + 687f337
commit c7beac5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/canvas_modules/common-canvas/src/common-properties/components/control-item/control-item.scss b/canvas_modules/common-canvas/src/common-properties/components/control-item/control-item.scss
@@ -39,6 +39,10 @@
 .properties-ci-action-item {
 	display: flex;
 	justify-content: space-between;
+
+	.properties-ci-content-container {
+		flex-grow: 1;
+	}
 }
 
 .properties-label-container {

diff --git a/canvas_modules/common-canvas/src/common-properties/properties-main/properties-main.jsx b/canvas_modules/common-canvas/src/common-properties/properties-main/properties-main.jsx
@@ -101,6 +101,8 @@ class PropertiesMain extends React.Component {
 		this.detectResize = this.detectResize.bind(this);
 		// used to tracked when the resize button is clicked and ignore detectResize
 		this.resizeClicked = false;
+		// Track panel height to avoid resize calls whenever height changes
+		this.lastPanelHeight = 0;
 	}
 
 	componentDidMount() {
@@ -455,12 +457,15 @@ class PropertiesMain extends React.Component {
 		}
 	}
 
-	detectResize() {
-		// only hide resize button if resize wasn't from clicking resize button
-		if (!this.resizeClicked) {
-			this.setState({ showResizeBtn: false });
+	detectResize(_width, height) {
+		if (height === this.lastPanelHeight) {
+			// only hide resize button if resize wasn't from clicking resize button
+			if (!this.resizeClicked) {
+				this.setState({ showResizeBtn: false });
+			}
+			this.resizeClicked = false;
 		}
-		this.resizeClicked = false;
+		this.lastPanelHeight = height;
 	}
 
 	render() {