Skip to content

Commit eb5e478

Browse files
authored
elyra-ai#2294 Fix Accessibility Violations - 2 (elyra-ai#2295)
Signed-off-by: srikant <srksriks123@gmail.com>
1 parent 84ce953 commit eb5e478

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

canvas_modules/common-canvas/assets/images/arrange_horizontally.svg

-1
This file was deleted.

canvas_modules/common-canvas/assets/images/arrange_vertically.svg

-1
This file was deleted.
Loading

canvas_modules/common-canvas/src/common-canvas/cc-contents.jsx

+1
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ class CanvasContents extends React.Component {
479479
onMouseDown={this.onMouseDown} onMouseLeave={this.onMouseLeave}
480480
onBlur={this.onBlur}
481481
onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp}
482+
role="application" aria-label="canvas-keyboard-navigation" // Resolve Accessibility Violation of role and label
482483
/>
483484
);
484485
}

canvas_modules/common-canvas/src/icons/icon.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export default class Icon extends React.Component {
124124
icon = this.getCanvasIcon(this.props.type);
125125
if (typeof icon !== "undefined") {
126126
const className = classNames("canvas-icon", iconClassName, this.props.className);
127-
icon = <SVG src={icon} className={className} disabled={this.props.disabled} />;
127+
icon = <SVG src={icon} className={className} disabled={this.props.disabled} aria-label={this.props.type} />;
128128
} else {
129129
icon = <div />;
130130
}

canvas_modules/common-canvas/src/toolbar/toolbar-button-item.jsx

+3-7
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import React from "react";
1818
import PropTypes from "prop-types";
1919

2020
import Tooltip from "../tooltip/tooltip.jsx";
21-
import ArrangeHorizontally from "./../../assets/images/arrange_horizontally.svg";
22-
import ArrangeVertically from "./../../assets/images/arrange_vertically.svg";
2321
import ToggleNotificationPanel from "./../../assets/images/notification_counter_icon.svg";
2422

2523
import { Button } from "@carbon/react";
@@ -29,7 +27,7 @@ import { StopFilledAlt, Play, Undo, Redo, Chat, ChatOff, Result,
2927
Cut, Copy, Paste, Edit, ColorPalette, Maximize, Minimize,
3028
Launch, AddComment, TrashCan, ZoomIn, ZoomOut,
3129
Checkmark, ChevronRight, ChevronDown, ChevronUp,
32-
CenterToFit, OpenPanelFilledLeft } from "@carbon/react/icons";
30+
CenterToFit, OpenPanelFilledLeft, ArrangeVertical, ArrangeHorizontal } from "@carbon/react/icons";
3331
import { TOOLBAR_STOP, TOOLBAR_RUN, TOOLBAR_UNDO, TOOLBAR_REDO,
3432
TOOLBAR_CUT, TOOLBAR_COPY, TOOLBAR_PASTE, TOOLBAR_CLIPBOARD,
3533
TOOLBAR_CREATE_COMMENT, TOOLBAR_CREATE_AUTO_COMMENT,
@@ -123,12 +121,10 @@ class ToolbarButtonItem extends React.Component {
123121
return <OpenPanelFilledLeft disabled={disabled} />;
124122
case (TOOLBAR_TOGGLE_PALETTE):
125123
return <OpenPanelFilledLeft disabled={disabled} />;
126-
127-
// Non-carbon icons
128124
case (TOOLBAR_ARRANGE_HORIZONALLY):
129-
return <SVG src={ArrangeHorizontally} disabled={disabled} />;
125+
return <ArrangeHorizontal disabled={disabled} />;
130126
case (TOOLBAR_ARRANGE_VERTICALLY):
131-
return <SVG src={ArrangeVertically} disabled={disabled} />;
127+
return <ArrangeVertical disabled={disabled} />;
132128
case (TOOLBAR_TOGGLE_NOTIFICATION_PANEL):
133129
return <SVG src={ToggleNotificationPanel} disabled={disabled} />;
134130

0 commit comments

Comments
 (0)