Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accessibility insights fixes #9955

Merged
merged 8 commits into from
Apr 10, 2024
Merged

Accessibility insights fixes #9955

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0042713
add aria-label to editor toggle, change the dropdown language selecto…
srietkerk Apr 8, 2024
dab7b34
add role=menuitem to organization logo
srietkerk Apr 8, 2024
5e5cb46
give editor selector div the role menuitem
srietkerk Apr 8, 2024
408a555
cloud sync status component is only visual. do not include an aria la…
srietkerk Apr 9, 2024
71a871f
remove button role from outer div for projects header
srietkerk Apr 9, 2024
61e0e19
remove menu role from projectnamearea, give explicit role of button t…
srietkerk Apr 9, 2024
88f0293
change other toolbar menus to menubars
srietkerk Apr 10, 2024
8e230ab
fixed capitalization on editortoggle aria label
srietkerk Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions webapp/src/container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,12 @@ export class EditorSelector extends data.Component<IEditorSelectorProps, {}> {
}

return (
<div id="editortoggle" className={`ui grid padded ${(pyOnly || tsOnly) ? "one-language" : ""}`} role="listbox" aria-orientation="horizontal">
<div id="editortoggle" className={`ui grid padded ${(pyOnly || tsOnly) ? "one-language" : ""}`} role="listbox" aria-orientation="horizontal" aria-label={lf("editor toggle")}>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

capitalization?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preference?
between:

  1. Editor Toggle
  2. Editor toggle

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nvm, I chose "Editor toggle" based on what I saw other aria labels doing.

{showSandbox && <SandboxMenuItem parent={parent} />}
{showBlocks && <BlocksMenuItem parent={parent} />}
{textLanguage}
{secondTextLanguage}
{showDropdown && <sui.DropdownMenu id="editordropdown" role="menuitem" icon="chevron down" rightIcon title={lf("Select code editor language")} className={`item button attached right ${dropdownActive ? "active" : ""}`}>
{showDropdown && <sui.DropdownMenu id="editordropdown" role="option" icon="chevron down" rightIcon title={lf("Select code editor language")} className={`item button attached right ${dropdownActive ? "active" : ""}`}>
<JavascriptMenuItem parent={parent} />
<PythonMenuItem parent={parent} />
</sui.DropdownMenu>}
Expand Down
8 changes: 4 additions & 4 deletions webapp/src/editortoolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export class EditorToolbar extends data.Component<ISettingsProps, EditorToolbarS
readOnly={projectNameReadOnly}
/>)
if (showSave) {
saveInput.push(<EditorToolbarButton icon='save' className={`right attached editortools-btn save-editortools-btn ${saveButtonClasses}`} title={lf("Save")} ariaLabel={lf("Save the project")} onButtonClick={this.saveFile} view={this.getViewString(View.Computer)} key={`save${View.Computer}`} />)
saveInput.push(<EditorToolbarButton role="button" icon='save' className={`right attached editortools-btn save-editortools-btn ${saveButtonClasses}`} title={lf("Save")} ariaLabel={lf("Save the project")} onButtonClick={this.saveFile} view={this.getViewString(View.Computer)} key={`save${View.Computer}`} />)
}

return saveInput;
Expand Down Expand Up @@ -416,7 +416,7 @@ export class EditorToolbar extends data.Component<ISettingsProps, EditorToolbarS
}

return <div id="editortools" className="ui" role="region" aria-label={lf("Editor toolbar")}>
<div id="downloadArea" role="menu" className="ui column items">{headless &&
<div id="downloadArea" role="menubar" className="ui column items">{headless &&
<div className="ui item">
<div className="ui icon large buttons">
{compileBtn && <EditorToolbarButton icon={downloadIcon} className={`primary large download-button mobile tablet hide ${downloadButtonClasses}`} title={compileTooltip} onButtonClick={this.compile} view='computer' />}
Expand All @@ -431,14 +431,14 @@ export class EditorToolbar extends data.Component<ISettingsProps, EditorToolbarS
</div>}
</div>
{(showProjectRename || showGithub || identity.CloudSaveStatus.wouldRender(header.id)) &&
<div id="projectNameArea" role="menu" className="ui column items">
<div id="projectNameArea" className="ui column items">
<div className={`ui right ${showSave ? "labeled" : ""} input projectname-input projectname-computer`}>
{showProjectRename && this.getSaveInput(showSave, "fileNameInput2", projectName, showProjectRenameReadonly)}
{showGithub && <githubbutton.GithubButton parent={this.props.parent} key={`githubbtn${computer}`} />}
<identity.CloudSaveStatus headerId={header.id} />
</div>
</div>}
<div id="editorToolbarArea" role="menu" className="ui column items">
<div id="editorToolbarArea" role="menubar" className="ui column items">
{showUndoRedo && <div className="ui icon buttons">{this.getUndoRedo(computer)}</div>}
{showZoomControls && <div className="ui icon buttons mobile hide">{this.getZoomControl(computer)}</div>}
{targetTheme.bigRunButton && !pxt.shell.isTimeMachineEmbed() &&
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/headerbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class HeaderBar extends data.Component<ISettingsProps, {}> {
if (view === "time-machine") {
return <></>;
}
return <div className="ui item logo organization">
return <div className="ui item logo organization" role="menuitem">
{targetTheme.organizationWideLogo || targetTheme.organizationLogo
? <img className={`ui logo ${view !== "home" ? "mobile hide" : ""}`} src={targetTheme.organizationWideLogo || targetTheme.organizationLogo} alt={lf("{0} Logo", targetTheme.organization)} />
: <span className="name">{targetTheme.organization}</span>}
Expand Down Expand Up @@ -178,7 +178,7 @@ export class HeaderBar extends data.Component<ISettingsProps, {}> {
break;
}
} else {
return <div className="ui item link editor-menuitem">
return <div className="ui item link editor-menuitem" role="menuitem">
<container.EditorSelector parent={this.props.parent} sandbox={view === "sandbox"} python={targetTheme.python} languageRestriction={languageRestriction} headless={pxt.appTarget.simulator?.headless} />
</div>
}
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/identity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ export class CloudSaveStatus extends data.Component<CloudSaveStatusProps, {}> {
const syncing = preparing || cloudStatus.value === "syncing";

return (<div className="cloudstatusarea">
{!syncing && <sui.Item className={"ui tiny cloudicon xicon " + cloudStatus.icon} title={cloudStatus.tooltip} tabIndex={-1}></sui.Item>}
{syncing && <sui.Item className={"ui tiny inline loader active cloudprogress" + (preparing ? " indeterminate" : "")} title={cloudStatus.tooltip} tabIndex={-1}></sui.Item>}
{!syncing && <sui.Item role="presentation" className={"ui tiny cloudicon xicon " + cloudStatus.icon} title={cloudStatus.tooltip} tabIndex={-1}></sui.Item>}
{syncing && <sui.Item role="presentation" className={"ui tiny inline loader active cloudprogress" + (preparing ? " indeterminate" : "")} title={cloudStatus.tooltip} tabIndex={-1}></sui.Item>}
{cloudStatus.value !== "none" && cloudStatus.value !== "synced" && <span className="ui mobile hide no-select cloudtext" role="note">{cloudStatus.shortStatus}</span>}
</div>);
}
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/projects.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export class Projects extends auth.Component<ISettingsProps, ProjectsState> {
<div key={`mystuff_gallerysegment`} className="ui segment gallerysegment mystuff-segment" role="region" aria-label={lf("My Projects")}>
<div className="ui heading">
<div className="column" style={{ zIndex: 1 }}
role={scriptManager && "button"} onClick={scriptManager && this.showScriptManager} onKeyDown={scriptManager && fireClickOnEnter}
onClick={scriptManager && this.showScriptManager} onKeyDown={scriptManager && fireClickOnEnter}
>
{scriptManager ? <h2 className="ui header myproject-header">
{lf("My Projects")}
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/sui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ export class Item extends data.Component<ItemProps, {}> {
return (
<div className={genericClassName("ui item link", this.props, true) + ` ${this.props.active ? 'active' : ''}`}
role={this.props.role}
aria-label={ariaLabel || title || text}
aria-label={(!this.props.role || this.props.role === "presentation") ? "" : ariaLabel || title || text}
aria-selected={this.props.active}
aria-hidden={ariaHidden}
title={title || text}
Expand Down