Merge branch 'main' into upgrade-carbon-1.68.0

nmgokhale · Oct 23, 2024 · 80a02f5 · 80a02f5
2 parents 32621ce + 89e8d63
commit 80a02f5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
@@ -174,7 +174,7 @@ class TitleEditor extends Component {
 				</div>)
 				: null;
 			const icon = this.props.icon && typeof this.props.icon === "string"
-				? <Isvg className="properties-title-heading-icon" src={this.props.icon} />
+				? <Isvg className="properties-title-heading-icon" src={this.props.icon} aria-hidden="true" />
 				: null;
 			if (label || icon) {
 				heading = (<div className="properties-title-heading">

diff --git a/canvas_modules/common-canvas/src/palette/palette-content-list-item.jsx b/canvas_modules/common-canvas/src/palette/palette-content-list-item.jsx
@@ -284,7 +284,7 @@ class PaletteContentListItem extends React.Component {
 				icon = image;
 			} else if (typeof image === "string") {
 				icon = image.endsWith(".svg")
-					? <SVG src={image} className="palette-list-item-icon" draggable="false" />
+					? <SVG src={image} className="palette-list-item-icon" draggable="false" aria-hidden="true" />
 					: <img src={image} className="palette-list-item-icon" draggable="false" alt={""} />;
 			}
 		}

diff --git a/canvas_modules/common-canvas/src/palette/palette-flyout-content-category.jsx b/canvas_modules/common-canvas/src/palette/palette-flyout-content-category.jsx
@@ -170,7 +170,7 @@ class PaletteFlyoutContentCategory extends React.Component {
 			} else if (this.props.category.image.endsWith(".svg")) {
 				itemImage = (
 					<div>
-						<SVG src={this.props.category.image} className="palette-flyout-category-item-icon" draggable="false" />
+						<SVG src={this.props.category.image} className="palette-flyout-category-item-icon" draggable="false" aria-hidden="true" />
 					</div>
 				);
 			} else {

diff --git a/canvas_modules/common-canvas/src/palette/palette-flyout-content-search.jsx b/canvas_modules/common-canvas/src/palette/palette-flyout-content-search.jsx
@@ -52,7 +52,6 @@ class PaletteFlyoutContentSearch extends React.Component {
 			// palette-flyout-search id added for hopscotch tours
 			<div className="palette-flyout-search-container" id="palette-flyout-search">
 				<Search
-					id="palette-flyout-search"
 					className="palette-flyout-search"
 					placeholder={placeHolder}
 					onChange={this.handleSearchStringChange}

diff --git a/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx b/canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx
@@ -275,7 +275,7 @@ class ToolbarButtonItem extends React.Component {
 			}
 			const path = this.props.size === "sm" ? "M 29 29 L 29 23 23 29 Z" : "M 37 37 L 37 30 30 37 Z";
 			return (
-				<svg className="toolbar-tick-svg">
+				<svg className="toolbar-tick-svg" aria-hidden="true">
 					<path d={path} className="toolbar-tick-mark" />
 				</svg>
 			);

diff --git a/canvas_modules/harness/src/client/App.js b/canvas_modules/harness/src/client/App.js
@@ -2225,7 +2225,7 @@ class App extends React.Component {
 					{ action: "color-subpanel", iconEnabled: (<ColorPalette size={32} />), label: "Color picker", enable: true,
 						subPanel: ColorPicker, subPanelData: { clickActionHandler: (color) => window.alert("Color selected = " + color) } },
 					{ divider: true },
-					{ action: "save", iconEnabled: (<Save size={32} />), enable: true, tooltip: saveReloadTooltip }
+					{ action: "save", iconEnabled: (<Save size={32} />), label: "Save", enable: true, tooltip: saveReloadTooltip }
 				],
 				rightBar: [
 					{ divider: true },