Skip to content

fix(pkg/emojipicker): fix emojipicker #82

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
unknownproperty merged 1 commit into from
May 17, 2026
Merged

fix(pkg/emojipicker): fix emojipicker #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 24 additions & 3 deletions apps/xi.storybook/src/stories/EmojiPicker.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Meta, StoryObj } from '@storybook/react';
import { EmojiPicker } from '@xipkg/emojipicker';
import { EmojiPicker, EmojiPickerPopup } from '@xipkg/emojipicker';
import { useState } from 'react';

const meta = {
Expand Down Expand Up @@ -30,11 +30,32 @@ export const Default: Story = {
export const WithRecentEmojis: Story = {
render: () => {
const [selectedEmoji, setSelectedEmoji] = useState<string>('');
const recentEmojis = ['1f600', '1f601', '1f602', '1f603', '1f604'];
const [recentEmojis, setRecentEmojis] = useState(['😂', '👽']);
const onEmojiSelectHandler = (emoji: string) => {
setSelectedEmoji(emoji);
setRecentEmojis([emoji, ...recentEmojis]);
};

return (
<div className="flex flex-col items-center gap-4">
<EmojiPicker onEmojiSelect={setSelectedEmoji} recentEmojis={recentEmojis} />
<EmojiPicker onEmojiSelect={onEmojiSelectHandler} recentEmojis={recentEmojis} />
{selectedEmoji && <div className="text-2xl">Выбранный эмодзи: {selectedEmoji}</div>}
</div>
);
},
};

export const WithCustomTriggerComponent: Story = {
render: () => {
const [selectedEmoji, setSelectedEmoji] = useState<string>('');
const [open, setOpen] = useState(false);

const setOpenHandle = () => setOpen(!open);

return (
<div className="flex flex-col items-center gap-4">
<span onClick={setOpenHandle}>Trigger</span>
{open && <EmojiPickerPopup onEmojiSelect={setSelectedEmoji} />}
{selectedEmoji && <div className="text-2xl">Выбранный эмодзи: {selectedEmoji}</div>}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/pkg.emoji.picker/EmojiCategory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const EmojiCategory = memo(
title={`:${emoji.name}:`}
variant="ghost"
className="hover:bg-gray-10 dark:hover:bg-gray-90 h-6 w-6 rounded-sm p-1"
onClick={() => handleEmojiClick(emoji.unicode)}
onClick={() => handleEmojiClick(emoji.char)}
style={{
fontFamily: 'Apple Color Emoji, Twemoji Mozilla, Noto Color Emoji, Android Emoji',
}}
Expand Down
186 changes: 5 additions & 181 deletions packages/pkg.emoji.picker/EmojiPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,117 +1,10 @@
'use client';

import { useState, useRef, useMemo, useEffect, useCallback } from 'react';
import { Button } from '@xipkg/button';
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@xipkg/dropdown';
import {
Clock,
Emotions,
Search,
Nature,
Food,
Activity,
Places,
Objects,
Heart,
Flag,
} from '@xipkg/icons';
import { Input } from '@xipkg/input';
import { cn } from '@xipkg/utils';
import { CategoryT, EmojiPickerPropsT, EmojiT } from './types';
import { EmojiCategory } from './EmojiCategory';

import { unicodeToNative } from './utils/unicodeToNative';

import emojisData from './emojis.json';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@xipkg/tooltip';

const recentIcon = { icon: Clock, name: 'Последние' };

const categoryIcons = [
{ icon: Emotions, name: 'Лица и эмоции' },
{ icon: Nature, name: 'Природа' },
{ icon: Food, name: 'Еда и напитки' },
{ icon: Activity, name: 'Активности' },
{ icon: Places, name: 'Путешествия и места' },
{ icon: Objects, name: 'Объекты' },
{ icon: Heart, name: 'Символы' },
{ icon: Flag, name: 'Флаги' },
];

export const EmojiPicker = ({ recentEmojis, onEmojiSelect }: EmojiPickerPropsT) => {
const [activeCategoryIndex, setActiveCategoryIndex] = useState<number>(0);
const scrollContainerRef = useRef<HTMLDivElement>(null);
const [searchQuery, setSearchQuery] = useState<string>('');

const categories = emojisData;

const handleSearchEmoji = (e: React.ChangeEvent<HTMLInputElement>) => {
setActiveCategoryIndex(0);
setSearchQuery(e.target.value);
};

const filteredCategories = useMemo(() => {
if (!categories) return { name: 'empty', emojis: [] };

return {
name: 'search',
emojis: categories
.map((category) => category.emojis)
.flat()
.filter((emoji: EmojiT) => emoji.name.toLowerCase().includes(searchQuery.toLowerCase())),
};
}, [categories, searchQuery]);

const matchedEmojis = useMemo(() => {
if (!categories || !recentEmojis) return [];

return categories.flatMap((category) =>
category.emojis.filter((emoji) => recentEmojis.includes(emoji.unicode)),
);
}, [categories, recentEmojis]);

const emojiCategoriesIcons =
matchedEmojis.length > 0 ? [recentIcon, ...categoryIcons] : categoryIcons;

const emojiCategories: CategoryT[] = useMemo(() => {
if (!categories) {
return [];
}
return matchedEmojis.length > 0
? [{ emojis: matchedEmojis, name: 'recent' }, ...categories]
: categories;
}, [categories, matchedEmojis]);

const scrollToCategory = (target: HTMLElement) => {
target.scrollIntoView({
block: 'start',
inline: 'nearest',
});
};

const selectCategory = (index: number) => {
setSearchQuery('');
setTimeout(() => {
setActiveCategoryIndex(index);
}, 50);

const container = scrollContainerRef.current;
if (!container) return;

const categoryEl = container.querySelector<HTMLElement>(`#emoji-category-${index}`);
if (categoryEl) {
scrollToCategory(categoryEl);
}
};

const handleEmojiClick = useCallback(
(emoji: string) => {
const char = unicodeToNative(emoji);
onEmojiSelect(char);
},
[onEmojiSelect],
);
import { Emotions } from '@xipkg/icons';
import { EmojiPickerPopup } from './EmojiPickerPopup';
import { TEmojiPickerProps } from './types';

export const EmojiPicker = ({ recentEmojis, onEmojiSelect }: TEmojiPickerProps) => {
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
Expand All @@ -120,76 +13,7 @@ export const EmojiPicker = ({ recentEmojis, onEmojiSelect }: EmojiPickerPropsT)
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent className="p-0" align="end" sideOffset={8}>
<div className="flex h-[296px] w-[276px] rounded-lg">
<div className="bg-gray-5 dark:bg-gray-90 flex flex-col gap-2 p-2">
<TooltipProvider>
{emojiCategoriesIcons.map(({ icon: Icon, name }, index) => {
return (
<Tooltip key={index}>
<TooltipTrigger asChild>
<Button
variant="ghost"
className={cn(
'hover:bg-brand-0 group h-auto rounded-none bg-transparent p-1',
index === activeCategoryIndex
? 'bg-brand-0 text-brand-100 focus:bg-brand-0'
: 'text-brand-50 dark:text-brand-40',
)}
onClick={() => selectCategory(index)}
>
<Icon
size="sm"
className="fill-current group-hover:fill-current group-focus:fill-current"
/>
</Button>
</TooltipTrigger>
<TooltipContent side="right" className="z-99">
<p>{name}</p>
</TooltipContent>
</Tooltip>
);
})}
</TooltipProvider>
</div>
<div className="bg-gray-0 flex w-full flex-col gap-2 p-2 dark:bg-gray-100">
<Input
variant="s"
before={<Search size="sm" className="text-gray-60 dark:text-gray-40" />}
placeholder="Поиск"
className="border"
value={searchQuery}
onChange={handleSearchEmoji}
/>
<div
className="h-full overflow-y-auto"
ref={scrollContainerRef}
style={{ scrollbarWidth: 'none', msOverflowStyle: 'none' }}
>
{filteredCategories && searchQuery ? (
<EmojiCategory
setActiveCategory={setActiveCategoryIndex}
category={filteredCategories}
currentIndex={0}
handleEmojiClick={handleEmojiClick}
containerRef={scrollContainerRef}
isIntersectionEnabled={false}
/>
) : (
emojiCategories.length > 0 &&
emojiCategories.map((emojis, index) => (
<EmojiCategory
key={index}
setActiveCategory={setActiveCategoryIndex}
category={emojis}
currentIndex={index}
handleEmojiClick={handleEmojiClick}
containerRef={scrollContainerRef}
/>
))
)}
</div>
</div>
</div>
<EmojiPickerPopup recentEmojis={recentEmojis} onEmojiSelect={onEmojiSelect} />
</DropdownMenuContent>
</DropdownMenu>
);
Expand Down
Loading
Loading