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

[MA-30]: MM-61604: Provide proper name, role, and state information to skin tone accordion #26

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −3
Open

[MA-30]: MM-61604: Provide proper name, role, and state information to skin tone accordion #26

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5bbf21
[MA-30]: Provide state information
SaurabhSharma-884 Dec 18, 2024
0e4df0d
[MA-30]: Update aria attributes
SaurabhSharma-884 Dec 20, 2024
7665e31
[MA-30]: Remove unnecessary id
SaurabhSharma-884 Dec 27, 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
21 changes: 18 additions & 3 deletions webapp/channels/src/components/emoji_picker/components/emoji_picker_skin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export class EmojiPickerSkin extends React.PureComponent<Props, State> {
onClick={() => this.hideSkinTonePicker(skin)}
>
<img
alt={skinTone.label.defaultMessage}
src={imgTrans}
className={spriteClassName}
/>
Expand All @@ -144,6 +145,9 @@ export class EmojiPickerSkin extends React.PureComponent<Props, State> {
className='skin-tones__close-icon style--none'
onClick={() => this.hideSkinTonePicker(this.props.userSkinTone)}
aria-label={closeButtonLabel}
aria-expanded={this.state.pickerExtended}
tabIndex={0}
ayush-chauhan233 marked this conversation as resolved.
Show resolved Hide resolved
aria-controls='skin-tones-icons'
>
<CloseIcon
size={16}
Expand All @@ -156,7 +160,12 @@ export class EmojiPickerSkin extends React.PureComponent<Props, State> {
/>
</div>
</div>
<div className='skin-tones__icons'>
<div
className='skin-tones__icons'
id='skin-tones-icons'
aria-label='Skin tone icons'
role='region'
>
{choices}
</div>
</>
Expand All @@ -182,6 +191,8 @@ export class EmojiPickerSkin extends React.PureComponent<Props, State> {
className='style--none skin-tones__icon skin-tones__expand-icon'
onClick={this.showSkinTonePicker}
aria-label={expandButtonLabel}
aria-controls='skin-tones-icons'
aria-expanded={this.state.pickerExtended}
>
<img
alt={'emoji skin tone picker'}
Expand All @@ -201,8 +212,12 @@ export class EmojiPickerSkin extends React.PureComponent<Props, State> {
timeout={200}
>
<div className={classNames('skin-tones', {'skin-tones--active': this.state.pickerExtended})}>
<div className={classNames('skin-tones__content', {'skin-tones__content__single': !this.state.pickerExtended})}>
{this.state.pickerExtended ? this.extended() : this.collapsed()}
<div
id='skin-tones-content'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this id still needed?

className={classNames('skin-tones__content', {'skin-tones__content__single': !this.state.pickerExtended})}
aria-orientation='horizontal'
>
{this.state.pickerExtended ? this.extended() : this.collapsed() }
</div>
</div>
</CSSTransition>
Expand Down
Loading