@elyra/canvas 12.33.0 → 12.35.0

package/src/object-model/config-utils.js

@@ -68,6 +68,7 @@ export default class CanvasUtils {
 			enableHighlightNodeOnNewLinkDrag: false,
 			enableHighlightUnavailableNodes: false,
 			enableMoveNodesOnSupernodeResize: true,
+			enableRaiseNodesToTopOnHover: true,
 			enableExternalPipelineFlows: true,
 			enableEditingActions: true,
 			enableDisplayFullLabelOnHover: false,

package/src/object-model/layout-dimensions.js

@@ -37,7 +37,7 @@ const portsHorizontalDefaultLayout = {
 		bodyPath: null,
 		selectionPath: null,
 
-		// Displays the external object specified as the body of the node
+		// Displays the external object specified, as the body of the node
 		nodeExternalObject: false,
 
 		// Display image
@@ -226,6 +226,11 @@ const portsHorizontalDefaultLayout = {
 		// If output port guide object is "image" use this image.
 		outputPortGuideImage: "",
 
+		// Automatically increases the node size to accommodate its ports so both
+		// input and output ports can be shown within the dimensions of
+		// the node.
+		autoSizeNode: true,
+
 		// Radius of the either the input or output ports when they are set to "circle"
 		portRadius: 3,
 
@@ -447,7 +452,7 @@ const portsVerticalDefaultLayout = {
 		bodyPath: null,
 		selectionPath: null,
 
-		// Displays the external object specified as the body of the node
+		// Displays the external object specified, as the body of the node
 		nodeExternalObject: false,
 
 		// Display image
@@ -636,6 +641,11 @@ const portsVerticalDefaultLayout = {
 		// If output port guide object is "image" use this image.
 		outputPortGuideImage: "",
 
+		// Automatically increases the node size to accommodate its ports so both
+		// input and output ports can be shown within the dimensions of
+		// the node.
+		autoSizeNode: true,
+
 		// Radius of the either the input or output ports when they are set to "circle"
 		portRadius: 6,
 

package/src/object-model/object-model.js

@@ -794,7 +794,13 @@ export default class ObjectModel {
 			? (node.outputs.length * (node.layout.portArcRadius * 2)) + ((node.outputs.length - 1) * node.layout.portArcSpacing) + (node.layout.portArcOffset * 2)
 			: 0;
 
-		node.height = Math.max(node.inputPortsHeight, node.outputPortsHeight, node.layout.defaultNodeHeight);
+		if (node.layout.autoSizeNode) {
+			node.height = Math.max(node.inputPortsHeight, node.outputPortsHeight, node.layout.defaultNodeHeight);
+
+		} else {
+			node.height = node.layout.defaultNodeHeight;
+		}
+
 		node.width = node.layout.defaultNodeWidth;
 
 		if (node.type === SUPER_NODE && node.is_expanded) {
@@ -808,7 +814,7 @@ export default class ObjectModel {
 			node.width = CanvasUtils.getSupernodeExpandedWidth(node, canvasLayout);
 			node.height = CanvasUtils.getSupernodeExpandedHeight(node, canvasLayout);
 
-		} else {
+		} else if (node.isResized) {
 			node.height = node.resizeHeight ? node.resizeHeight : node.height;
 			node.width = node.resizeWidth ? node.resizeWidth : node.width;
 		}
@@ -817,8 +823,8 @@ export default class ObjectModel {
 	}
 
 	// Returns the node passed in with additional fields which contains
-	// the height occupied by the input ports and output ports, based on the
-	// layout info passed in, as well as the node width.
+	// the width occupied by the input ports and output ports, based on the
+	// layout info passed in, as well as the node height.
 	setNodeDimensionAttributesVertical(node, canvasLayout) {
 		node.inputPortsWidth = node.inputs
 			? (node.inputs.length * (node.layout.portArcRadius * 2)) + ((node.inputs.length - 1) * node.layout.portArcSpacing) + (node.layout.portArcOffset * 2)
@@ -829,7 +835,13 @@ export default class ObjectModel {
 			: 0;
 
 		node.height = node.layout.defaultNodeHeight;
-		node.width = Math.max(node.inputPortsWidth, node.outputPortsWidth, node.layout.defaultNodeWidth);
+
+		if (node.layout.autoSizeNode) {
+			node.width = Math.max(node.inputPortsWidth, node.outputPortsWidth, node.layout.defaultNodeWidth);
+
+		} else {
+			node.width = node.layout.defaultNodeWidth;
+		}
 
 		if (node.type === SUPER_NODE && node.is_expanded) {
 			node.width += (2 * canvasLayout.supernodeSVGAreaPadding);
@@ -842,7 +854,7 @@ export default class ObjectModel {
 			node.width = CanvasUtils.getSupernodeExpandedWidth(node, canvasLayout);
 			node.height = CanvasUtils.getSupernodeExpandedHeight(node, canvasLayout);
 
-		} else {
+		} else if (node.isResized) {
 			node.height = node.resizeHeight ? node.resizeHeight : node.height;
 			node.width = node.resizeWidth ? node.resizeWidth : node.width;
 		}

package/src/object-model/redux/reducers/canvasinfo.js

@@ -181,6 +181,7 @@ export default (state = {}, action) => {
 	case "MOVE_OBJECTS":
 	case "DELETE_OBJECT":
 	case "ADD_LINK":
+	case "SET_LINKS":
 	case "SET_LINK_PROPERTIES":
 	case "SET_LINK_SRC_INFO":
 	case "SET_LINK_TRG_INFO":

package/src/object-model/redux/reducers/links.js

@@ -67,12 +67,16 @@ export default (state = [], action) => {
 		];
 	}
 
-	case "ADD_LINKS": {
+	case "ADD_LINKS":
 		return [
 			...state,
 			...action.data.linksToAdd
 		];
-	}
+
+	case "SET_LINKS":
+		return [
+			...action.data,
+		];
 
 	case "MOVE_OBJECTS":
 		return state.map((link) => {

package/src/toolbar/toolbar-action-item.jsx

@@ -267,7 +267,7 @@ class ToolbarActionItem extends React.Component {
 		const chevronIcon = this.generateChevronIcon(actionObj);
 
 		let buttonContent = (
-			<div id={"open-action-item"} className={itemContentClassName}>
+			<div className={itemContentClassName}>
 				{labelBefore}
 				{icon}
 				{labelAfter}