Skip to content

Add ariaDisabled prop to button #11236

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

Merged
riknoll merged 2 commits into from
Apr 2, 2026
Merged

Add ariaDisabled prop to button #11236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ffe667
Add ariaDisabled prop to button
microbit-robert Apr 1, 2026
271416c
Merge branch 'master' into button-aria
riknoll Apr 2, 2026
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/editortoolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ export class EditorToolbar extends data.Component<ISettingsProps, EditorToolbarS
const hasUndo = this.props.parent.editor.hasUndo();
const hasRedo = this.props.parent.editor.hasRedo();
return [
<EditorToolbarButton icon='xicon undo' className={`editortools-btn undo-editortools-btn ${!hasUndo ? 'disabled' : ''}`} title={lf("Undo")} ariaLabel={lf("{0}, {1}", lf("Undo"), !hasUndo ? lf("Disabled") : "")} onButtonClick={this.undo} view={this.getViewString(view)} key="undo" />,
<EditorToolbarButton icon='xicon redo' className={`editortools-btn redo-editortools-btn ${!hasRedo ? 'disabled' : ''}`} title={lf("Redo")} ariaLabel={lf("{0}, {1}", lf("Redo"), !hasRedo ? lf("Disabled") : "")} onButtonClick={this.redo} view={this.getViewString(view)} key="redo" />
<EditorToolbarButton icon='xicon undo' className={`editortools-btn undo-editortools-btn ${!hasUndo ? 'disabled' : ''}`} ariaDisabled={!hasUndo} ariaLabel={lf("{0}, {1}", lf("Undo"), !hasUndo ? lf("Disabled") : "")} onButtonClick={this.undo} view={this.getViewString(view)} key="undo" />,
<EditorToolbarButton icon='xicon redo' className={`editortools-btn redo-editortools-btn ${!hasRedo ? 'disabled' : ''}`} ariaDisabled={!hasRedo} ariaLabel={lf("{0}, {1}", lf("Redo"), !hasRedo ? lf("Disabled") : "")} onButtonClick={this.redo} view={this.getViewString(view)} key="redo" />
];
}

Expand Down
2 changes: 2 additions & 0 deletions webapp/src/sui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ export interface ButtonProps extends UiProps, TooltipUIProps {
id?: string;
title?: string;
ariaLabel?: string;
ariaDisabled?: boolean;
ariaExpanded?: boolean;
onClick?: (e: React.MouseEvent<HTMLElement>) => void;
disabled?: boolean;
Expand Down Expand Up @@ -539,6 +540,7 @@ export class Button extends StatelessUIElement<ButtonProps> {
tabIndex={this.props.tabIndex || 0}
aria-label={this.props.ariaLabel}
aria-expanded={this.props.ariaExpanded}
aria-disabled={this.props.ariaDisabled ?? disabled}
onClick={this.props.onClick}
onKeyDown={this.props.onKeyDown}
autoFocus={this.props.autoFocus}
Expand Down
Loading