Skip to content

MM-61616: Add tab roles inside Emoji Picker #37

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

Open
ayush-chauhan233 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

MM-61616: Add tab roles inside Emoji Picker #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89b049b
MM-61616: Add tab roles inside Emoji Picker
Dec 24, 2024
bc05895
MM-61616: Update snapshot tests
Dec 24, 2024
2b0ffe9
MM-61616: Update emoji_picker_category E2E
Dec 26, 2024
88ec914
MM-61616: Minor aria properties changes
Jan 12, 2025
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
122 changes: 82 additions & 40 deletions webapp/channels/src/components/emoji_picker/__snapshots__/emoji_picker.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,99 +35,141 @@ exports[`components/emoji_picker/EmojiPicker should match snapshot 1`] = `
<div />
</div>
<div
aria-orientation="horizontal"
class="emoji-picker__categories"
id="emojiPickerCategories"
role="tablist"
>
<a
<button
aria-controls="emojipickercat-smileys-emotion"
aria-label="Smileys & Emotion"
class="emoji-picker__category emoji-picker__category--selected"
href="#"
aria-selected="true"
class="style--none emoji-picker__category emoji-picker__category--selected"
id="emojiPickerCategoryTab-smileys-emotion"
role="tab"
type="button"
>
<i
class="icon-emoticon-happy-outline"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-people-body"
aria-label="People & Body"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-people-body"
role="tab"
type="button"
>
<i
class="icon-account-outline"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-animals-nature"
aria-label="Animals & Nature"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-animals-nature"
role="tab"
type="button"
>
<i
class="icon-leaf-outline"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-food-drink"
aria-label="Food & Drink"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-food-drink"
role="tab"
type="button"
>
<i
class="icon-food-apple"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-travel-places"
aria-label="Travel & Places"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-travel-places"
role="tab"
type="button"
>
<i
class="icon-airplane-variant"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-activities"
aria-label="Activities"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-activities"
role="tab"
type="button"
>
<i
class="icon-basketball"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-objects"
aria-label="Objects"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-objects"
role="tab"
type="button"
>
<i
class="icon-lightbulb-outline"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-symbols"
aria-label="Symbols"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-symbols"
role="tab"
type="button"
>
<i
class="icon-heart-outline"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-flags"
aria-label="Flags"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-flags"
role="tab"
type="button"
>
<i
class="icon-flag-outline"
/>
</a>
<a
</button>
<button
aria-controls="emojipickercat-custom"
aria-label="Custom"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-custom"
role="tab"
type="button"
>
<i
class="icon-emoticon-custom-outline"
/>
</a>
</button>
</div>
<div
class="emoji-picker__items"
Expand Down
12 changes: 8 additions & 4 deletions .../src/components/emoji_picker/components/__snapshots__/emoji_picker_category.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@

exports[`EmojiPickerCategory should match snapshot 1`] = `
<DocumentFragment>
<a
<button
aria-controls="emojipickercat-recent"
aria-label="category name"
class="emoji-picker__category"
href="#"
aria-selected="false"
class="style--none emoji-picker__category"
id="emojiPickerCategoryTab-recent"
role="tab"
type="button"
>
<i
class="categoryClass"
/>
</a>
</button>
</DocumentFragment>
`;
2 changes: 2 additions & 0 deletions webapp/channels/src/components/emoji_picker/components/emoji_picker_categories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ function EmojiPickerCategories({
id='emojiPickerCategories'
className='emoji-picker__categories'
onKeyDown={handleKeyDown}
Copy link
Copy Markdown

@SaurabhSharma-884 SaurabhSharma-884 Jan 10, 2025

Choose a reason for hiding this comment

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

aria-orientation missing

role='tablist'
aria-orientation='horizontal'
>
{categoryNames.map((categoryName) => {
const category = categories[categoryName];
Expand Down
4 changes: 2 additions & 2 deletions webapp/channels/src/components/emoji_picker/components/emoji_picker_category.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ describe('EmojiPickerCategory', () => {
renderWithContext(<EmojiPickerCategory {...props}/>);

// TODO: Change when we actually disabled the element when enable is false
expect(screen.getByRole('link')).toHaveClass('emoji-picker__category disable');
expect(screen.getByRole('tab')).toHaveClass('emoji-picker__category disable');
});

test('should have tooltip on hover', async () => {
renderWithContext(<EmojiPickerCategory {...defaultProps}/>);

await act(async () => {
const emojiPickerCategory = screen.getByRole('link');
const emojiPickerCategory = screen.getByRole('tab');
userEvent.hover(emojiPickerCategory);
await new Promise((resolve) => setTimeout(resolve, 1000));
});
Expand Down
12 changes: 8 additions & 4 deletions webapp/channels/src/components/emoji_picker/components/emoji_picker_category.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,18 @@ function EmojiPickerCategory({category, categoryRowIndex, selected, enable, onCl
<FormattedMessage {...category.label}/>
}
>
<a
className={className}
href='#'
<button
role='tab'
Copy link
Copy Markdown

@SaurabhSharma-884 SaurabhSharma-884 Jan 10, 2025

Choose a reason for hiding this comment

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

Suggested change
role='tab'
role='tab'
type='button'

type='button'
aria-selected={selected}
className={classNames('style--none', className)}
id={`emojiPickerCategoryTab-${category.name}`}
onClick={handleClick}
aria-controls={`emojipickercat-${category.name}`}
aria-label={intl.formatMessage(category.label)}
>
<i className={category.iconClassName}/>
</a>
</button>
</WithTooltip>
);
}
Expand Down
2 changes: 2 additions & 0 deletions webapp/channels/src/components/emoji_picker/components/emoji_picker_category_row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ function EmojiPickerCategoryRow({categoryName, style}: Props) {
<div
className='emoji-picker__category-header'
id={`emojipickercat-${categoryName}`}
aria-labelledby={`emojiPickerCategoryTab-${categoryName}`}
role='tabpanel'
>
<FormattedMessage id={`emoji_picker.${categoryName}`}/>
</div>
Expand Down