Skip to content

regression: EmojiPicker not displaying scrollbar properly #35536

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
kodiakhq merged 3 commits into from
Mar 17, 2025
Merged

regression: EmojiPicker not displaying scrollbar properly #35536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d187c8
fix: EmojiPicker not displaying scrollbar properly
dougfabris Mar 17, 2025
7b35a95
Merge branch 'develop' into reg/emojiPicker-scrollbar
kodiakhq[bot] Mar 17, 2025
cabe2f4
Merge branch 'develop' into reg/emojiPicker-scrollbar
kodiakhq[bot] Mar 17, 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
6 changes: 3 additions & 3 deletions apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Virtuoso } from 'react-virtuoso';

import EmojiCategoryRow from './EmojiCategoryRow';
import type { EmojiByCategory } from '../../../../app/emoji/client';
import { CustomScrollbars } from '../../../components/CustomScrollbars';
import { VirtualizedScrollbars } from '../../../components/CustomScrollbars';

type CategoriesResultProps = {
emojiListByCategory: EmojiByCategory[];
Expand All @@ -33,7 +33,7 @@ const CategoriesResult = forwardRef<VirtuosoHandle, CategoriesResultProps>(funct
`}
height='full'
>
<CustomScrollbars>
<VirtualizedScrollbars>
<Virtuoso
ref={ref}
totalCount={emojiListByCategory.length}
Expand All @@ -60,7 +60,7 @@ const CategoriesResult = forwardRef<VirtuosoHandle, CategoriesResultProps>(funct
/>
)}
/>
</CustomScrollbars>
</VirtualizedScrollbars>
</Box>
);
});
Expand Down
28 changes: 17 additions & 11 deletions apps/meteor/tests/e2e/emojis.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,28 @@ test.describe.serial('emoji', () => {
await page.goto('/home');
});

test('should focus the active emoji tab category', async () => {
const activityEmojiTab = poHomeChannel.content.getEmojiPickerTabByName('Activity');

test('should display emoji picker properly', async ({ page }) => {
await poHomeChannel.sidenav.openChat(targetChannel);
await poHomeChannel.content.btnComposerEmoji.click();
await activityEmojiTab.click();

await expect(activityEmojiTab).toBeFocused();
});
await test.step('should display scroller', async () => {
await expect(poHomeChannel.content.scrollerEmojiPicker).toBeVisible();
});

test('expect pick and send grinning emoji', async ({ page }) => {
await poHomeChannel.sidenav.openChat(targetChannel);
await poHomeChannel.content.pickEmoji('grinning');
await page.keyboard.press('Enter');
await test.step('should focus the active emoji tab category', async () => {
const activityEmojiTab = poHomeChannel.content.getEmojiPickerTabByName('Activity');
await activityEmojiTab.click();

await expect(activityEmojiTab).toBeFocused();
});

await test.step('should pick and send grinning emoji', async () => {
await poHomeChannel.sidenav.openChat(targetChannel);
await poHomeChannel.content.pickEmoji('grinning');
await page.keyboard.press('Enter');

await expect(poHomeChannel.content.lastUserMessage).toContainText('😀');
await expect(poHomeChannel.content.lastUserMessage).toContainText('😀');
});
});

test('expect send emoji via text', async ({ page }) => {
Expand Down
4 changes: 4 additions & 0 deletions apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,10 @@ export class HomeContent {
return this.page.getByRole('dialog', { name: 'Emoji picker' });
}

get scrollerEmojiPicker(): Locator {
return this.dialogEmojiPicker.locator('[data-overlayscrollbars]');
}

getEmojiPickerTabByName(name: string) {
return this.dialogEmojiPicker.locator(`role=tablist >> role=tab[name="${name}"]`);
}
Expand Down
Loading