diff --git a/web/package.json b/web/package.json index 8f8e2a71..ead99854 100644 --- a/web/package.json +++ b/web/package.json @@ -22,7 +22,6 @@ "clsx": "^2.1.1", "copy-to-clipboard": "^3.3.3", "dayjs": "^1.11.13", - "emoji-regex": "^10.4.0", "fuse.js": "^7.1.0", "highlight.js": "^11.11.1", "i18next": "^24.2.2", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 5363cded..0c4e894c 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -47,9 +47,6 @@ importers: dayjs: specifier: ^1.11.13 version: 1.11.13 - emoji-regex: - specifier: ^10.4.0 - version: 10.4.0 fuse.js: specifier: ^7.1.0 version: 7.1.0 @@ -1955,9 +1952,6 @@ packages: electron-to-chromium@1.5.109: resolution: {integrity: sha512-AidaH9JETVRr9DIPGfp1kAarm/W6hRJTPuCnkF+2MqhF4KaAgRIcBc8nvjk+YMXZhwfISof/7WG29eS4iGxQLQ==} - emoji-regex@10.4.0: - resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} - emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -5411,8 +5405,6 @@ snapshots: electron-to-chromium@1.5.109: {} - emoji-regex@10.4.0: {} - emoji-regex@8.0.0: {} emoji-regex@9.2.2: {} diff --git a/web/src/components/HomeSidebar/ShortcutsSection.tsx b/web/src/components/HomeSidebar/ShortcutsSection.tsx index f7458dc1..f7e6a87c 100644 --- a/web/src/components/HomeSidebar/ShortcutsSection.tsx +++ b/web/src/components/HomeSidebar/ShortcutsSection.tsx @@ -1,5 +1,4 @@ import { Dropdown, Menu, MenuButton, MenuItem, Tooltip } from "@mui/joy"; -import EmojiRegex from "emoji-regex"; import { Edit3Icon, MoreVerticalIcon, TrashIcon, PlusIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { userServiceClient } from "@/grpcweb"; @@ -12,7 +11,7 @@ import { cn } from "@/utils"; import { useTranslate } from "@/utils/i18n"; import showCreateShortcutDialog from "../CreateShortcutDialog"; -const emojiRegex = EmojiRegex(); +const emojiRegex = /^(\p{Emoji_Presentation}|\p{Emoji}\uFE0F)$/u; const ShortcutsSection = observer(() => { const t = useTranslate(); @@ -42,10 +41,10 @@ const ShortcutsSection = observer(() => {
{shortcuts.map((shortcut) => { - const selected = memoFilterStore.shortcut === shortcut.id; const maybeEmoji = shortcut.title.split(" ")[0]; const emoji = emojiRegex.test(maybeEmoji) ? maybeEmoji : undefined; const title = emoji ? shortcut.title.replace(emoji, "") : shortcut.title; + const selected = memoFilterStore.shortcut === shortcut.id; return (