Skip to content

fix(FEC-13973): volume control a11y changes #888

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
merged 2 commits into from
May 29, 2024
Merged

fix(FEC-13973): volume control a11y changes #888

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae9470
fix(FEC-13973): volume controll a11y changes
semarche-kaltura May 29, 2024
9c37027
address comments
semarche-kaltura May 29, 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: 3 additions & 1 deletion src/components/volume/_volume.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
&.hover {
.volume-control-bar {
display: block !important;
opacity: 1;
}
}

Expand All @@ -28,6 +29,7 @@
&.dragging-active {
.volume-control-bar {
display: block;
opacity: 1;
}
}

Expand Down Expand Up @@ -70,7 +72,7 @@
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.3);
background-color: #333333;
padding: 6px;
display: none;
opacity: 0;

&:before {
position: absolute;
Expand Down
22 changes: 10 additions & 12 deletions src/components/volume/volume.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class Volume extends Component<any, any> {
* @returns {void}
* @memberof Volume
*/
handleKeydown(event: KeyboardEvent): void {
handleKeydown(event: KeyboardEvent, preventMute?: boolean): void {
const {player} = this.props;
/**
* Change volume operations.
Expand Down Expand Up @@ -246,7 +246,9 @@ class Volume extends Component<any, any> {
break;
case KeyMap.ENTER:
case KeyMap.SPACE:
this.toggleMute();
if (!preventMute) {
this.toggleMute();
}
break;
default:
break;
Expand Down Expand Up @@ -419,7 +421,7 @@ class Volume extends Component<any, any> {
default:
event.preventDefault();
event.stopPropagation();
this.handleKeydown(event);
this.handleKeydown(event, true);
break;
}
};
Expand Down Expand Up @@ -447,8 +449,7 @@ class Volume extends Component<any, any> {
ref={c => (c ? (this._volumeControlElement = c) : undefined)}
className={controlButtonClasses}
onMouseOver={this.onMouseOver}
onMouseOut={this.onMouseOut}
>
onMouseOut={this.onMouseOut}>
<Tooltip label={this.props.volumeLabel} type={this.props.toolTipType ? this.props.toolTipType : ToolTipType.Left}>
<Button
tabIndex="0"
Expand All @@ -457,9 +458,7 @@ class Volume extends Component<any, any> {
className={style.controlButton}
onMouseUp={this.toggleMute}
onTouchEnd={this.onTouchEnd}
onKeyDown={this.onKeyDown}
onFocus={this.onFocus}
>
onKeyDown={this.onKeyDown}>
<Icon type={IconType.VolumeBase} />
<Icon type={IconType.VolumeWaves} />
<Icon type={IconType.VolumeMute} />
Expand All @@ -471,17 +470,16 @@ class Volume extends Component<any, any> {
aria-label={this.props.sliderAriaLabel}
onKeyDown={this.onProgressBarKeyDown}
className={style.volumeControlBar}
onFocus={this.onFocus}
role="slider"
aria-valuemin={0}
aria-valuemax={100}
aria-valuenow={player.volume * 100}
aria-valuetext={`${player.volume * 100}% volume ${player.muted ? 'muted' : ''}`}
>
aria-valuetext={`${player.volume * 100}% volume ${player.muted ? 'muted' : ''}`}>
<div
className={style.bar}
ref={c => (c ? (this._volumeProgressBarElement = c) : undefined)}
onMouseDown={this.onVolumeProgressBarMouseDown}
>
onMouseDown={this.onVolumeProgressBarMouseDown}>
<div className={style.progress} style={{height: this.getVolumeProgressHeight()}} />
</div>
</div>
Expand Down
Loading