@elyra/canvas 13.41.0 → 13.41.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elyra/canvas",
-  "version": "13.41.0",
+  "version": "13.41.1",
   "description": "Elyra common-canvas",
   "main": "dist/common-canvas.js",
   "module": "dist/common-canvas.es.js",
@@ -128,7 +128,7 @@
     "url": "0.11.3"
   },
   "peerDependencies": {
-    "@carbon/react": "^1.51.0",
+    "@carbon/react": "^1.92.0",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-intl": "^5.0.0 || ^6.0.0 || ^7.0.0"

package/src/command-actions/commonPropertiesAction.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 Elyra Authors
+ * Copyright 2017-2026 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,15 +27,21 @@ export default class CommonPropertiesAction extends Action {
 
 	// Standard methods
 	do() {
-		this.applyPropertyChanges(this.newValues.properties, this.appData, this.newValues.additionalInfo, this.newValues.undoInfo, this.newValues.uiProperties);
+		if (this.applyPropertyChanges) {
+			this.applyPropertyChanges(this.newValues.properties, this.appData, this.newValues.additionalInfo, this.newValues.undoInfo, this.newValues.uiProperties);
+		}
 	}
 
 	undo() {
-		this.applyPropertyChanges(this.initialValues.properties, this.appData, this.initialValues.additionalInfo, this.initialValues.undoInfo, this.initialValues.uiProperties);
+		if (this.applyPropertyChanges) {
+			this.applyPropertyChanges(this.initialValues.properties, this.appData, this.initialValues.additionalInfo, this.initialValues.undoInfo, this.initialValues.uiProperties);
+		}
 	}
 
 	redo() {
-		this.applyPropertyChanges(this.newValues.properties, this.appData, this.newValues.additionalInfo, this.newValues.undoInfo, this.newValues.uiProperties);
+		if (this.applyPropertyChanges) {
+			this.applyPropertyChanges(this.newValues.properties, this.appData, this.newValues.additionalInfo, this.newValues.undoInfo, this.newValues.uiProperties);
+		}
 	}
 
 	getLabel() {

package/src/common-properties/components/virtualized-grid/virtualized-grid.jsx

@@ -197,11 +197,6 @@ const VirtualizedGrid = (props) => {
 				onMouseLeave={(evt) => overSelectOption(evt)}
 				onFocus={(evt) => overSelectOption(evt)}
 				onBlur={(evt) => overSelectOption(evt)}
-				onKeyDown={(evt) => {
-					if (evt.key === "Space" || evt.key === "Enter") {
-						onRowClick(evt, rowIndex, rowData);
-					}
-				}}
 			>
 				<Checkbox
 					id={`properties-vt-row-cb-${props.scrollKey}-${rowIndex}`}
@@ -211,6 +206,7 @@ const VirtualizedGrid = (props) => {
 					checked={rowSelected}
 					disabled={rowDisabled || props.tableDisabled}
 					readOnly={props.readOnly}
+					onChange={(evt, data) => onRowClick(evt.nativeEvent, rowIndex, rowData, data.checked)}
 				/>
 			</td>);
 		}
@@ -391,12 +387,24 @@ const VirtualizedGrid = (props) => {
 		</tbody>);
 	};
 
-	const onRowClick = (evt, rowIndex, rowData) => {
+	/**
+	 * Handles row click events for selection and interaction.
+	 * Prevents propagation for dropdown options and manages row selection state
+	 * including support for shift-key multi-selection.
+	 *
+	 * @param {Event} evt - The click event object
+	 * @param {number} rowIndex - The visual index of the clicked row
+	 * @param {Object} rowData - The data object for the clicked row
+	 * @param {number} rowData.originalRowIndex - The original index from getOriginalRowIndex
+	 * @param {boolean} rowData.disabled - Whether the row is disabled
+	 * @param {boolean} [newValue] - Optional explicit new selection state (true/false)
+	 */
+	const onRowClick = (evt, rowIndex, rowData, newValue) => {
 		if (evt.target.className === "cds--select-option") {
 			evt.stopPropagation(); // stop propagation when selecting dropdown select options within table rows
-		} else {
+		} else if (typeof newValue !== "undefined" || props.rowSelection === ROW_SELECTION.SINGLE) {
 			// Set selections
-			const selected = !isRowSelected(rowData.originalRowIndex);
+			const selected = newValue ?? !isRowSelected(rowData.originalRowIndex);
 			if (typeof props.setRowsSelected === "function") {
 				props.setRowsSelected({
 					"index": rowIndex,

package/src/toolbar/toolbar-sub-menu-item.jsx

@@ -193,19 +193,17 @@ class ToolbarSubMenuItem extends React.Component {
 				data-toolbar-action={actionObj.action}
 				onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} onKeyDown={this.onKeyDown}
 			>
-				<div>
-					<ToolbarButtonItem
-						actionObj={actionObj}
-						actionName={this.generateActionName()}
-						instanceId={this.props.instanceId}
-						isInMenu
-						subAreaDisplayed={this.state.subAreaDisplayed}
-						actionClickHandler={this.actionClickHandler}
-						buttonFocusAction={this.props.subMenuFocusAction}
-						isFocusInToolbar // Focus must be in toolbar for this sub-menu item to appear
-						size={this.props.size}
-					/>
-				</div>
+				<ToolbarButtonItem
+					actionObj={actionObj}
+					actionName={this.generateActionName()}
+					instanceId={this.props.instanceId}
+					isInMenu
+					subAreaDisplayed={this.state.subAreaDisplayed}
+					actionClickHandler={this.actionClickHandler}
+					buttonFocusAction={this.props.subMenuFocusAction}
+					isFocusInToolbar // Focus must be in toolbar for this sub-menu item to appear
+					size={this.props.size}
+				/>
 				{subArea}
 			</div>
 		);

package/src/toolbar/toolbar.scss

@@ -299,7 +299,7 @@ $toolbar-divider-width: 1px;
 
 .toolbar-sub-menu-item {
 	position: relative; // Allows any cascade sub-menu to be positioned absolutely
-	& button {
+	& > button { // Restrict styles to sub-menu buttons so styles do not cascade to buttons in sub-panels.
 		width: 100%;
 		padding-top: 0;
 		padding-bottom: 0;