Skip to content

emoji!!! #13

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 1 commit into from
Apr 19, 2025
Merged

emoji!!! #13

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
78 changes: 69 additions & 9 deletions client/src/components/chat/chat-area.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useRef, useState } from 'react'
import { Edit, LogOut, Menu, MoreVertical, Send, Trash2 } from 'lucide-react'
import { Edit, LogOut, Menu, MoreVertical, Send, SmilePlus, Trash2 } from 'lucide-react'
import type { Message } from '@/lib/types'
import { Avatar, AvatarFallback } from '@/components/ui/avatar'
import { Badge } from '@/components/ui/badge'
Expand All @@ -26,6 +26,7 @@ import {
DialogTitle,
DialogTrigger,
} from '@/components/ui/dialog'
import { flatEmojiList, emojiCategories } from './chat-emoji'

interface ChatAreaProps {
setIsMobileMenuOpen: (open: boolean) => void
Expand Down Expand Up @@ -56,6 +57,16 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {

const currentChatMessages = selectedChat ? messages[selectedChat.id] : []

type EmojiCategory = keyof typeof emojiCategories;

const [selectedCategory, setSelectedCategory] = useState<EmojiCategory | 'all'>('all');
const getFilteredEmojis = () => {
if (selectedCategory === 'all') {
return flatEmojiList;
}
return emojiCategories[selectedCategory] || [];
};

useEffect(() => {
if (chatAreaScrollDown) {
scrollToBottom()
Expand Down Expand Up @@ -280,9 +291,9 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
className={cn(
'ml-2 text-xs',
participant.role === 'admin' &&
'bg-red-100 text-red-700',
'bg-red-100 text-red-700',
participant.role === 'member' &&
'bg-blue-100 text-blue-700',
'bg-blue-100 text-blue-700',
)}
>
{participant.role}
Expand Down Expand Up @@ -361,11 +372,10 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
>
{message.senderType === 'user' ? (
<div
className={`max-w-[70%] ${
isCurrentUser
? 'rounded-lg bg-primary text-white'
: 'rounded-lg bg-gray-100 text-gray-900'
} overflow-hidden`}
className={`max-w-[70%] ${isCurrentUser
? 'rounded-lg bg-primary text-white'
: 'rounded-lg bg-gray-100 text-gray-900'
} overflow-hidden`}
>
{!isCurrentUser && selectedChat.isGroup && (
<div className="border-b border-gray-200 px-4 py-2 text-xs font-medium">
Expand Down Expand Up @@ -502,6 +512,56 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
onChange={(e) => setMessageText(e.target.value)}
className="flex-1 h-10 py-2 px-4 bg-gray-100 rounded-full border-none text-sm md:text-base"
/>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
type="button"
className="rounded-full bg-gray-200 text-gray-500 hover:bg-gray-300 hover:text-black active:bg-gray-400 active:text-gray-700"
size="icon"
>
<SmilePlus className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>

<DropdownMenuContent
className="mb-2 "
align="end"
side="top"
>
<div className="max-w-[420px] overflow-x-auto whitespace-nowrap pb-2 flex space-x-2">
<Button
onClick={() => setSelectedCategory('all')}
className={`shrink-0 ${selectedCategory === 'all'
? 'bg-blue-500 text-white'
: 'bg-gray-200 text-gray-600 hover:text-black'
}`}
>
All
</Button>

{Object.keys(emojiCategories).map((category) => (
<Button
key={category}
onClick={() => setSelectedCategory(category as EmojiCategory)}
className={`shrink-0 ${selectedCategory === category
? 'bg-blue-500 text-white'
: 'bg-gray-200 text-gray-600 hover:text-black'
}`}
>
{category.charAt(0).toUpperCase() + category.slice(1)}
</Button>
))}
</div>
<div className='grid grid-cols-10 gap-1 overflow-y-auto min-h-50 max-h-50'>
{getFilteredEmojis().map((emoji, i) => (
<DropdownMenuItem key={i} onClick={() => setMessageText(messageText + emoji)}>
{emoji}
</DropdownMenuItem>
))}
</div>

</DropdownMenuContent>
</DropdownMenu>
<Button
type="submit"
disabled={!messageText.trim()}
Expand All @@ -512,6 +572,6 @@ export default function ChatArea({ setIsMobileMenuOpen }: ChatAreaProps) {
</Button>
</form>
</div>
</div>
</div >
)
}
103 changes: 103 additions & 0 deletions client/src/components/chat/chat-emoji.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
export const emojiCategories = {
smileys: [
"😀", "😃", "😄", "😁", "😆", "😅", "😂", "🤣", "😊", "😇",
"🙂", "🙃", "😉", "😌", "😍", "🥰", "😘", "😗", "😙", "😚",
"😋", "😛", "😜", "🤪", "😝", "🤑", "🤗", "🤭", "🤫", "🤔",
"🤐", "🤨", "😐", "😑", "😶", "😏", "😒", "🙄", "😬", "😮‍💨",
"🤥", "😌", "😔", "😪", "🤤", "😴", "😷", "🤒", "🤕", "🤢",
"🤮", "🤧", "🥵", "🥶", "🥴", "😵", "😵‍💫", "🤯", "🤠", "🥳",
"😎", "🤓", "🧐", "😕", "😟", "🙁", "☹️", "😮", "😯", "😲",
"😳", "🥺", "😦", "😧", "😨", "😰", "😥", "😢", "😭", "😱",
"😖", "😣", "😞", "😓", "😩", "😫", "🥱", "😤", "😡", "😠",
"🤬", "😈", "👿", "💀", "☠️", "💩", "🤡", "👹", "👺", "👻"
],
love: [
"😍", "🥰", "😘", "😗", "😙", "😚", "❤️", "🧡", "💛", "💚",
"💙", "💜", "🤎", "🤍", "💕", "💞", "💓", "💗", "💖", "💘",
"💝", "💟", "💌", "💋", "❣️", "💔", "💍", "👩‍❤️‍👨", "👨‍❤️‍👨", "👩‍❤️‍👩",
"💑", "💏", "👩‍❤️‍💋‍👨", "👨‍❤️‍💋‍👨", "👩‍❤️‍💋‍👩", "🫂", "🤗", "🥲", "😻", "😽",
"😚", "😙", "😽", "😗", "🫶", "🤝", "🫰", "🙏", "👼", "👨‍👩‍👧",
"👨‍👩‍👦", "👨‍👩‍👧‍👦", "👩‍👧", "👩‍👦", "👨‍👧", "👨‍👦", "👨‍❤️‍💋‍👨", "👩‍❤️‍💋‍👩", "🧸", "🌹",
"🌺", "🌷", "🌸", "💐", "🎁", "🎀", "🎊", "🎉", "💃", "🕺",
"💇", "💆", "👗", "👠", "👒", "👑", "👛", "👜", "👝", "💼",
"💄", "💎", "🧴", "🧼", "🛁", "🛀", "🧖", "🧖‍♀️", "🧖‍♂️", "🫧",
"🫀", "🫶", "🤍", "💘", "💓", "💗", "💞", "💖", "❣️", "💝"
],
reactions: [
"😀", "😃", "😄", "😁", "😆", "😅", "😂", "🤣", "🥲", "😊",
"😇", "🙂", "🙃", "😉", "😌", "😍", "🥰", "😘", "😗", "😙",
"😚", "😋", "😛", "😝", "😜", "🤪", "🤨", "🧐", "🤓", "😎",
"🥸", "🤩", "🥳", "😏", "😒", "😞", "😔", "😟", "😕", "🙁",
"☹️", "😣", "😖", "😫", "😩", "🥺", "😢", "😭", "😤", "😠",
"😡", "🤬", "🤯", "😳", "🥵", "🥶", "😱", "😨", "😰", "😥",
"😓", "🤗", "🤔", "🫢", "🤭", "🫣", "🤫", "🤥", "😶", "😐",
"😑", "😬", "🙄", "😯", "😦", "😧", "😮", "😲", "🥱", "😴",
"🤤", "😪", "😵", "😵‍💫", "🤐", "🤑", "🤠", "😈", "👿", "👻",
"💀", "☠️", "👽", "🤖", "💩", "🙈", "🙉", "🙊", "💤", "👋"
],
animals: [
"🐶", "🐱", "🐭", "🐹", "🐰", "🦊", "🐻", "🐼", "🐻‍❄️", "🐨",
"🐯", "🦁", "🐮", "🐷", "🐽", "🐸", "🐵", "🙈", "🙉", "🙊",
"🐔", "🐤", "🐣", "🐥", "🦆", "🦅", "🦉", "🦇", "🐧", "🐦",
"🕊️", "🦢", "🦜", "🦚", "🦩", "🦤", "🪿", "🦝", "🦡", "🐗",
"🐴", "🫏", "🦄", "🐝", "🐛", "🦋", "🐌", "🐞", "🐜", "🪲",
"🪳", "🕷️", "🕸️", "🦂", "🐢", "🐍", "🦎", "🦖", "🦕", "🐙",
"🦑", "🦐", "🦞", "🦀", "🐡", "🐠", "🐟", "🐬", "🐳", "🐋",
"🦈", "🐊", "🐅", "🐆", "🦓", "🦍", "🦧", "🐘", "🦛", "🦏",
"🦣", "🐫", "🐪", "🦙", "🦒", "🦘", "🦬", "🐃", "🐂", "🐄",
"🐎", "🐖", "🐏", "🐑", "🦌", "🫎", "🫏", "🐐", "🦮", "🐕‍🦺"
],
food: [
"🍏", "🍎", "🍐", "🍊", "🍋", "🍌", "🍉", "🍇", "🍓", "🫐",
"🍈", "🍒", "🍑", "🥭", "🍍", "🥥", "🥝", "🍅", "🍆", "🥑",
"🥦", "🥬", "🥒", "🌶️", "🫑", "🌽", "🥕", "🫒", "🧄", "🧅",
"🥔", "🍠", "🥐", "🥯", "🍞", "🥖", "🫓", "🥨", "🥞", "🧇",
"🧀", "🍖", "🍗", "🥩", "🥓", "🍔", "🍟", "🍕", "🌭", "🥪",
"🌮", "🌯", "🫔", "🥙", "🧆", "🥚", "🍳", "🥘", "🍲", "🫕",
"🍝", "🍜", "🍛", "🍚", "🍙", "🍘", "🍥", "🥠", "🥡", "🦪",
"🍢", "🍡", "🍧", "🍨", "🍦", "🥧", "🧁", "🍰", "🎂", "🍮",
"🍭", "🍬", "🍫", "🍿", "🧂", "🥤", "🧃", "🧉", "🧊", "🥛",
"🍼", "☕", "🍵", "🫖", "🍶", "🍺", "🍻", "🥂", "🍷", "🥃"
],
objects: [
"⌚", "📱", "📲", "💻", "🖥️", "🖨️", "🖱️", "🖲️", "🕹️", "🗜️",
"💽", "💾", "💿", "📀", "📼", "📷", "📸", "📹", "🎥", "📞",
"☎️", "📟", "📠", "📺", "📻", "🧭", "⏱️", "⏲️", "⏰", "🕰️",
"🔋", "🔌", "💡", "🔦", "🕯️", "🧯", "🛢️", "💸", "💵", "💴",
"💶", "💷", "💰", "💳", "🧾", "💎", "⚖️", "🔧", "🔨", "⚒️",
"🛠️", "⛏️", "🔩", "⚙️", "🗜️", "🧱", "🪚", "🪛", "🪓", "🔫",
"🪃", "🛡️", "🪖", "🔗", "⛓️", "🧰", "🪤", "🧲", "🪜", "🛏️",
"🛋️", "🪑", "🚪", "🪞", "🪟", "🧴", "🛁", "🛀", "🚿", "🪠",
"🧼", "🪥", "🧻", "🚽", "🪒", "🧽", "🪣", "🧺", "🧷", "🧵",
"🪡", "🧶", "🧳", "🌂", "☂️", "🧂", "🧊", "🪆", "🎁", "📦"
],
nature: [
"🌵", "🎄", "🌲", "🌳", "🌴", "🌱", "🌿", "☘️", "🍀", "🎍",
"🪴", "🎋", "🍃", "🍂", "🍁", "🍄", "🌾", "💐", "🌷", "🌹",
"🥀", "🌺", "🌸", "🌼", "🌻", "🌞", "🌝", "🌛", "🌜", "🌚",
"🌕", "🌖", "🌗", "🌘", "🌑", "🌒", "🌓", "🌔", "🌙", "🌎",
"🌍", "🌏", "💫", "⭐", "🌟", "✨", "⚡", "☄️", "💥", "🔥",
"🌪️", "🌈", "☀️", "🌤️", "⛅", "🌥️", "☁️", "🌦️", "🌧️", "⛈️",
"🌩️", "🌨️", "❄️", "☃️", "⛄", "🌬️", "💨", "🌀", "🌫️", "🌊",
"🌫", "🌋", "🏔️", "⛰️", "🗻", "🏕️", "🏖️", "🏜️", "🏝️", "🏞️",
"🌌", "🌠", "🎇", "🎆", "🌉", "🌁", "🛤️", "🌅", "🌄", "🌇",
"🌆", "🏙️", "🌃", "🌉", "🪨", "🪵", "🛶", "🏞", "🪺", "🦋"
],
sports: [
"⚽", "🏀", "🏈", "⚾", "🎾", "🏐", "🏉", "🥏", "🏓", "🏸",
"🥇", "🥈", "🥉", "🏅", "🎯", "🎮", "🚴", "🏌️", "🏋️‍♂️", "🤾", "🚣‍♂️",
"🤸‍♀️", "⛷️", "🏂", "⛸️", "🏒", "🥋", "🥊", "🎿", "🏇", "🏍️", "🤺"
],
travel: [
"✈️", "🚗", "🚕", "🚙", "🚌", "🚎", "🏎️", "🚓", "🚑", "🚒",
"🚐", "🚚", "🚜", "🏍️", "🛵", "🚲", "🚂", "🚀", "🛸", "⛵", "🚢",
"🚤", "🛥️", "🛶", "⛴️", "🚘", "🚟", "🚠", "🚡", "🚃", "🚍", "🚋"
],
flags: [
"🇺🇸", "🇬🇧", "🇨🇦", "🇦🇺", "🇮🇳", "🇯🇵", "🇨🇳", "🇫🇷", "🇩🇪", "🇮🇹",
"🇪🇸", "🇷🇺", "🇰🇷", "🇲🇽", "🇧🇷", "🇿🇦", "🇷🇴", "🇵🇱", "🇺🇦", "🇲🇾",
"🇮🇩", "🇵🇭", "🇻🇳", "🇰🇪", "🇿🇼", "🇸🇬", "🇮🇷", "🇵🇰", "🇿🇲", "🇸🇱"
]
};

export const flatEmojiList = Object.values(emojiCategories).flat();