@elyra/canvas 13.41.2 → 13.42.0

package/dist/lib/canvas-controller.es.js

@@ -1,2 +1,2 @@
-import"../createClass-a140e270.js";import"../en-ba70b655.js";import"../isArrayLikeObject-78364f29.js";import"../common-canvas-utils-99c8d7d1.js";export{C as default}from"../canvas-controller-8093b1c5.js";import"./command-stack.es.js";import"../canvas-logger-3584cb6d.js";import"../defineProperty-f3298a15.js";import"../inherits-860188e5.js";import"../datarecord-metadata-v3-schema-e5869fb9.js";import"uuid";import"redux";import"jsonschema";import"@elyra/pipeline-schemas";import"immutable";
+import"../createClass-a140e270.js";import"../en-ba70b655.js";import"../isArrayLikeObject-78364f29.js";import"../common-canvas-utils-99c8d7d1.js";export{C as default}from"../canvas-controller-6e8175f3.js";import"./command-stack.es.js";import"../canvas-logger-3584cb6d.js";import"../defineProperty-f3298a15.js";import"../inherits-860188e5.js";import"../datarecord-metadata-v3-schema-e5869fb9.js";import"uuid";import"redux";import"jsonschema";import"@elyra/pipeline-schemas";import"immutable";
 //# sourceMappingURL=canvas-controller.es.js.map

package/dist/lib/canvas-controller.js

@@ -1,2 +1,2 @@
-"use strict";require("../createClass-df7b07d6.js"),require("../en-412ab08a.js"),require("../isArrayLikeObject-9f61d956.js"),require("../common-canvas-utils-0422db0b.js");var e=require("../canvas-controller-73f1a168.js");require("./command-stack.js"),require("../canvas-logger-8c01664d.js"),require("../defineProperty-d68f985b.js"),require("../inherits-74e481d1.js"),require("../datarecord-metadata-v3-schema-e8c37ecf.js"),require("uuid"),require("redux"),require("jsonschema"),require("@elyra/pipeline-schemas"),require("immutable"),module.exports=e.CanvasController;
+"use strict";require("../createClass-df7b07d6.js"),require("../en-412ab08a.js"),require("../isArrayLikeObject-9f61d956.js"),require("../common-canvas-utils-0422db0b.js");var e=require("../canvas-controller-40365e79.js");require("./command-stack.js"),require("../canvas-logger-8c01664d.js"),require("../defineProperty-d68f985b.js"),require("../inherits-74e481d1.js"),require("../datarecord-metadata-v3-schema-e8c37ecf.js"),require("uuid"),require("redux"),require("jsonschema"),require("@elyra/pipeline-schemas"),require("immutable"),module.exports=e.CanvasController;
 //# sourceMappingURL=canvas-controller.js.map

package/dist/lib/canvas.es.js

@@ -1,2 +1,2 @@
-export{c as CommonCanvas}from"../common-canvas-f6aa2d68.js";export{C as CanvasController}from"../canvas-controller-8093b1c5.js";import"../createClass-a140e270.js";import"../inherits-860188e5.js";import"react";import"react-redux";import"react-intl";import"../toolbar-ea0499c3.js";import"../common-canvas-utils-99c8d7d1.js";import"../toInteger-a2c772fc.js";import"../isArrayLikeObject-78364f29.js";import"../keyboard-utils-39fd7227.js";import"prop-types";import"../datarecord-metadata-v3-schema-e5869fb9.js";import"../en-ba70b655.js";import"./tooltip.es.js";import"react-portal";import"@carbon/react";import"uuid";import"react-inlinesvg";import"../icon-69d824a6.js";import"../bucket-3-c6b2f22e.js";import"../canvas-logger-3584cb6d.js";import"../context-menu-wrapper-5c84d66f.js";import"../defineProperty-f3298a15.js";import"markdown-it";import"react-dom";import"./command-stack.es.js";import"immutable";import"redux";import"jsonschema";import"@elyra/pipeline-schemas";
+export{c as CommonCanvas}from"../common-canvas-60e6c495.js";export{C as CanvasController}from"../canvas-controller-6e8175f3.js";import"../createClass-a140e270.js";import"../inherits-860188e5.js";import"react";import"react-redux";import"react-intl";import"../toolbar-ea0499c3.js";import"../common-canvas-utils-99c8d7d1.js";import"../toInteger-a2c772fc.js";import"../isArrayLikeObject-78364f29.js";import"../keyboard-utils-39fd7227.js";import"prop-types";import"../datarecord-metadata-v3-schema-e5869fb9.js";import"../en-ba70b655.js";import"./tooltip.es.js";import"react-portal";import"@carbon/react";import"uuid";import"react-inlinesvg";import"../icon-69d824a6.js";import"../bucket-3-c6b2f22e.js";import"../canvas-logger-3584cb6d.js";import"../context-menu-wrapper-5c84d66f.js";import"../defineProperty-f3298a15.js";import"markdown-it";import"react-dom";import"./command-stack.es.js";import"immutable";import"redux";import"jsonschema";import"@elyra/pipeline-schemas";
 //# sourceMappingURL=canvas.es.js.map

package/dist/lib/canvas.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../common-canvas-76637856.js"),r=require("../canvas-controller-73f1a168.js");require("../createClass-df7b07d6.js"),require("../inherits-74e481d1.js"),require("react"),require("react-redux"),require("react-intl"),require("../toolbar-f49f9bc4.js"),require("../common-canvas-utils-0422db0b.js"),require("../toInteger-59f8800a.js"),require("../isArrayLikeObject-9f61d956.js"),require("../keyboard-utils-36a4cde5.js"),require("prop-types"),require("../datarecord-metadata-v3-schema-e8c37ecf.js"),require("../en-412ab08a.js"),require("./tooltip.js"),require("react-portal"),require("@carbon/react"),require("uuid"),require("react-inlinesvg"),require("../icon-cd9138da.js"),require("../bucket-3-ce4b6e95.js"),require("../canvas-logger-8c01664d.js"),require("../context-menu-wrapper-0aba15be.js"),require("../defineProperty-d68f985b.js"),require("markdown-it"),require("react-dom"),require("./command-stack.js"),require("immutable"),require("redux"),require("jsonschema"),require("@elyra/pipeline-schemas"),exports.CommonCanvas=e.commonCanvas,exports.CanvasController=r.CanvasController;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../common-canvas-c6a5094d.js"),r=require("../canvas-controller-40365e79.js");require("../createClass-df7b07d6.js"),require("../inherits-74e481d1.js"),require("react"),require("react-redux"),require("react-intl"),require("../toolbar-f49f9bc4.js"),require("../common-canvas-utils-0422db0b.js"),require("../toInteger-59f8800a.js"),require("../isArrayLikeObject-9f61d956.js"),require("../keyboard-utils-36a4cde5.js"),require("prop-types"),require("../datarecord-metadata-v3-schema-e8c37ecf.js"),require("../en-412ab08a.js"),require("./tooltip.js"),require("react-portal"),require("@carbon/react"),require("uuid"),require("react-inlinesvg"),require("../icon-cd9138da.js"),require("../bucket-3-ce4b6e95.js"),require("../canvas-logger-8c01664d.js"),require("../context-menu-wrapper-0aba15be.js"),require("../defineProperty-d68f985b.js"),require("markdown-it"),require("react-dom"),require("./command-stack.js"),require("immutable"),require("redux"),require("jsonschema"),require("@elyra/pipeline-schemas"),exports.CommonCanvas=e.commonCanvas,exports.CanvasController=r.CanvasController;
 //# sourceMappingURL=canvas.js.map

package/dist/lib/properties.es.js

@@ -1,2 +1,2 @@
-export{c as CommonProperties,P as PropertiesController}from"../common-properties-2c1ae93f.js";export{F as FlexibleTable}from"../flexible-table-40613b78.js";export{F as FieldPicker}from"../index-2af83c12.js";export{clem}from"./properties/clem.es.js";export{getPythonHints}from"./properties/getPythonHints.es.js";import"../createClass-a140e270.js";import"../inherits-860188e5.js";import"react";import"../toolbar-ea0499c3.js";import"../common-canvas-utils-99c8d7d1.js";import"../toInteger-a2c772fc.js";import"../isArrayLikeObject-78364f29.js";import"../keyboard-utils-39fd7227.js";import"prop-types";import"../datarecord-metadata-v3-schema-e5869fb9.js";import"../en-ba70b655.js";import"./tooltip.es.js";import"react-portal";import"@carbon/react";import"uuid";import"react-inlinesvg";import"../icon-69d824a6.js";import"../bucket-3-c6b2f22e.js";import"react-intl";import"react-redux";import"../defineProperty-f3298a15.js";import"redux";import"seedrandom";import"./command-stack.es.js";import"immutable";import"date-fns";import"@codemirror/view";import"@codemirror/commands";import"@codemirror/search";import"@codemirror/autocomplete";import"@codemirror/state";import"@codemirror/language";import"@codemirror/lang-python";import"@codemirror/lang-sql";import"@codemirror/lang-javascript";import"@codemirror/lang-json";import"jsonschema";import"@tanstack/react-table";import"@tanstack/react-virtual";import"react-virtualized";import"react-draggable";
+export{c as CommonProperties,P as PropertiesController}from"../common-properties-abcfd713.js";export{F as FlexibleTable}from"../flexible-table-40613b78.js";export{F as FieldPicker}from"../index-2af83c12.js";export{clem}from"./properties/clem.es.js";export{getPythonHints}from"./properties/getPythonHints.es.js";import"../createClass-a140e270.js";import"../inherits-860188e5.js";import"react";import"../toolbar-ea0499c3.js";import"../common-canvas-utils-99c8d7d1.js";import"../toInteger-a2c772fc.js";import"../isArrayLikeObject-78364f29.js";import"../keyboard-utils-39fd7227.js";import"prop-types";import"../datarecord-metadata-v3-schema-e5869fb9.js";import"../en-ba70b655.js";import"./tooltip.es.js";import"react-portal";import"@carbon/react";import"uuid";import"react-inlinesvg";import"../icon-69d824a6.js";import"../bucket-3-c6b2f22e.js";import"react-intl";import"react-redux";import"../defineProperty-f3298a15.js";import"redux";import"seedrandom";import"./command-stack.es.js";import"immutable";import"date-fns";import"@codemirror/view";import"@codemirror/commands";import"@codemirror/search";import"@codemirror/autocomplete";import"@codemirror/state";import"@codemirror/language";import"@codemirror/lang-python";import"@codemirror/lang-sql";import"@codemirror/lang-javascript";import"@codemirror/lang-json";import"jsonschema";import"@tanstack/react-table";import"@tanstack/react-virtual";import"react-virtualized";import"react-draggable";
 //# sourceMappingURL=properties.es.js.map

package/dist/lib/properties.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../common-properties-44874063.js"),r=require("../flexible-table-9403ff35.js"),i=require("../index-1fccfdbf.js"),t=require("./properties/clem.js"),o=require("./properties/getPythonHints.js");require("../createClass-df7b07d6.js"),require("../inherits-74e481d1.js"),require("react"),require("../toolbar-f49f9bc4.js"),require("../common-canvas-utils-0422db0b.js"),require("../toInteger-59f8800a.js"),require("../isArrayLikeObject-9f61d956.js"),require("../keyboard-utils-36a4cde5.js"),require("prop-types"),require("../datarecord-metadata-v3-schema-e8c37ecf.js"),require("../en-412ab08a.js"),require("./tooltip.js"),require("react-portal"),require("@carbon/react"),require("uuid"),require("react-inlinesvg"),require("../icon-cd9138da.js"),require("../bucket-3-ce4b6e95.js"),require("react-intl"),require("react-redux"),require("../defineProperty-d68f985b.js"),require("redux"),require("seedrandom"),require("./command-stack.js"),require("immutable"),require("date-fns"),require("@codemirror/view"),require("@codemirror/commands"),require("@codemirror/search"),require("@codemirror/autocomplete"),require("@codemirror/state"),require("@codemirror/language"),require("@codemirror/lang-python"),require("@codemirror/lang-sql"),require("@codemirror/lang-javascript"),require("@codemirror/lang-json"),require("jsonschema"),require("@tanstack/react-table"),require("@tanstack/react-virtual"),require("react-virtualized"),require("react-draggable"),exports.CommonProperties=e.commonProperties,exports.PropertiesController=e.PropertiesController,exports.FlexibleTable=r.FlexibleTable,exports.FieldPicker=i.FieldPicker,exports.clem=t.clem,exports.getPythonHints=o.getPythonHints;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../common-properties-2010da23.js"),r=require("../flexible-table-9403ff35.js"),i=require("../index-1fccfdbf.js"),t=require("./properties/clem.js"),o=require("./properties/getPythonHints.js");require("../createClass-df7b07d6.js"),require("../inherits-74e481d1.js"),require("react"),require("../toolbar-f49f9bc4.js"),require("../common-canvas-utils-0422db0b.js"),require("../toInteger-59f8800a.js"),require("../isArrayLikeObject-9f61d956.js"),require("../keyboard-utils-36a4cde5.js"),require("prop-types"),require("../datarecord-metadata-v3-schema-e8c37ecf.js"),require("../en-412ab08a.js"),require("./tooltip.js"),require("react-portal"),require("@carbon/react"),require("uuid"),require("react-inlinesvg"),require("../icon-cd9138da.js"),require("../bucket-3-ce4b6e95.js"),require("react-intl"),require("react-redux"),require("../defineProperty-d68f985b.js"),require("redux"),require("seedrandom"),require("./command-stack.js"),require("immutable"),require("date-fns"),require("@codemirror/view"),require("@codemirror/commands"),require("@codemirror/search"),require("@codemirror/autocomplete"),require("@codemirror/state"),require("@codemirror/language"),require("@codemirror/lang-python"),require("@codemirror/lang-sql"),require("@codemirror/lang-javascript"),require("@codemirror/lang-json"),require("jsonschema"),require("@tanstack/react-table"),require("@tanstack/react-virtual"),require("react-virtualized"),require("react-draggable"),exports.CommonProperties=e.commonProperties,exports.PropertiesController=e.PropertiesController,exports.FlexibleTable=r.FlexibleTable,exports.FieldPicker=i.FieldPicker,exports.clem=t.clem,exports.getPythonHints=o.getPythonHints;
 //# sourceMappingURL=properties.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elyra/canvas",
-  "version": "13.41.2",
+  "version": "13.42.0",
   "description": "Elyra common-canvas",
   "main": "dist/common-canvas.js",
   "module": "dist/common-canvas.es.js",
@@ -56,7 +56,7 @@
     "d3": "7.9.0",
     "dagre": "^0.8.5",
     "date-fns": "^2.28.0",
-    "immutable": "^4.0.0",
+    "immutable": "^5.1.5",
     "jsonschema": "^1.4.0",
     "lodash": "^4.17.21",
     "markdown-it": "^14.1.1",

package/src/command-actions/arrangeLayoutAction.js

@@ -27,6 +27,9 @@ export default class ArrangeLayoutAction extends Action {
 		// Copy the nodes to remember their original positions.
 		this.existingNodes = this.apiPipeline.getNodes().map((n) => ({ ...n }));
 
+		// Copy the comments to remember their original positions.
+		this.existingComments = this.apiPipeline.getComments().map((c) => ({ ...c }));
+
 		// Copy the links (including detached links) to remember their original positions.
 		this.existingLinks = this.apiPipeline.getLinks().map((n) => ({ ...n }));
 	}
@@ -38,6 +41,7 @@ export default class ArrangeLayoutAction extends Action {
 
 	undo() {
 		this.apiPipeline.replaceNodes(this.existingNodes);
+		this.apiPipeline.replaceComments(this.existingComments);
 		this.apiPipeline.updateLinks(this.existingLinks);
 	}
 

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

@@ -817,6 +817,43 @@ export default class SVGCanvasRenderer {
 		return { x: pos.x + Math.round(svgRect.left), y: pos.y + Math.round(svgRect.top) };
 	}
 
+	// Converts canvas coordinates to screen coordinates.
+	// If we're displaying a sub-flow in place, we need to adjust the position
+	// to account for the offset of the sub-flow SVG area within the parent canvas.
+	// This is done recursively for nested sub-flows.
+	convertCanvasCoordsToScreenCoords(pos) {
+		let screenPos = this.zoomUtils.unTransformPos(pos);
+
+		if (this.dispUtils.isDisplayingSubFlowInPlace()) {
+			screenPos = this.addParentSupernodeOffset(screenPos);
+		}
+
+		return screenPos;
+	}
+
+	// Recursively adds the parent supernode offset to the position.
+	// This handles nested sub-flows by transforming through each parent's zoom level.
+	addParentSupernodeOffset(pos) {
+		const parentSVGDims = this.getParentSupernodeSVGDimensions();
+
+		// Add the offset of this sub-flow's SVG area within the parent's canvas (in canvas coordinates)
+		const posWithOffset = {
+			x: pos.x + parentSVGDims.x_pos,
+			y: pos.y + parentSVGDims.y_pos
+		};
+
+		// Transform through the parent's zoom to get to parent's viewport coordinates
+		const transformedPos = this.supernodeInfo.renderer.zoomUtils.unTransformPos(posWithOffset);
+
+		// If the parent renderer is also displaying a sub-flow in place,
+		// recursively transform through its parent's zoom
+		if (this.supernodeInfo.renderer.dispUtils.isDisplayingSubFlowInPlace()) {
+			return this.supernodeInfo.renderer.addParentSupernodeOffset(transformedPos);
+		}
+
+		return transformedPos;
+	}
+
 	// Creates the div which contains the ghost node for drag and
 	// drop actions from the palette. The way setDragImage is handled in
 	// browsers for HTML drag and drop is very odd since the image has to be
@@ -3500,7 +3537,7 @@ export default class SVGCanvasRenderer {
 			let pos = this.getDefaultContextToolbarPos(objType, d, port);
 			pos.x = xPos ? pos.x + xPos : pos.x;
 			pos.y = yPos ? pos.y + yPos : pos.y;
-			pos = this.zoomUtils.unTransformPos(pos);
+			pos = this.convertCanvasCoordsToScreenCoords(pos);
 			this.openContextMenu(d3Event, objType, d, port, pos, cause);
 		}
 	}

package/src/common-properties/components/wide-flyout/wide-flyout.jsx

@@ -48,11 +48,15 @@ export default class WideFlyout extends Component {
 			return;
 		}
 		if (this.props.show && modal) {
-			const active = document.activeElement;
-			// Restore focus if lost due to modal content changes like typing or adding new fields
-			if (active === document.body || !modal.contains(active)) {
-				this.focusOnFirstFocusable();
-			}
+			// During render, document.activeElement is document.body temporarily,
+			// so we need to wait for last updates before checking focus.
+			setTimeout(() => {
+				const active = document.activeElement;
+				// Restore focus if lost due to modal content changes like typing or adding new fields
+				if (active === document.body || !modal.contains(active)) {
+					this.focusOnFirstFocusable();
+				}
+			}, 0);
 		}
 	}
 	componentWillUnmount() {
@@ -67,7 +71,7 @@ export default class WideFlyout extends Component {
 		}
 		return Array.from(
 			modal.querySelectorAll(
-				"button, a[href], input, select, textarea, [tabindex]:not([tabindex='-1'])"
+				"button, a[href], input, select, textarea, [tabindex]:not([tabindex='-1']), [contenteditable='true']"
 			)).filter((el) => el.offsetParent !== null); // Filter out hidden/disabled elements.
 	}
 	// Focus on the first focusable element once modal opens.

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

@@ -1187,6 +1187,10 @@ export default class APIPipeline {
 		this.store.dispatch({ type: "SET_COMMENT_HIGHLIGHT_TEXT", data: { commentIds, highlightText }, pipelineId: this.pipelineId });
 	}
 
+	 replaceComments(replacementComments) {
+		this.store.dispatch({ type: "REPLACE_COMMENTS", data: replacementComments, pipelineId: this.pipelineId });
+	}
+
 	// ---------------------------------------------------------------------------
 	// Link methods
 	// ---------------------------------------------------------------------------

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

@@ -159,6 +159,7 @@ export default (state = {}, action) => {
 	case "UPDATE_NODES":
 	case "REPLACE_NODES":
 	case "REPLACE_NODE":
+	case "REPLACE_COMMENTS":
 	case "SIZE_AND_POSITION_OBJECTS":
 	case "SET_NODE_PARAMETERS":
 	case "SET_NODE_UI_PARAMETERS":

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

@@ -222,6 +222,10 @@ export default (state = [], action) => {
 			return comment;
 		});
 
+	case "REPLACE_COMMENTS": {
+		return action.data;
+	}
+
 	default:
 		return state;
 	}