Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: remove emoji regex

Johnny92a44e26b979
diff --git a/web/package.json b/web/package.json
index 8f8e2a711..ead99854d 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 5363cded0..0c4e894c4 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:
resolution: {integrity: sha512-AidaH9JETVRr9DIPGfp1kAarm/W6hRJTPuCnkF+2MqhF4KaAgRIcBc8nvjk+YMXZhwfISof/7WG29eS4iGxQLQ==}
- resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
-
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -5411,8 +5405,6 @@ snapshots:
-
diff --git a/web/src/components/HomeSidebar/ShortcutsSection.tsx b/web/src/components/HomeSidebar/ShortcutsSection.tsx
index f7458dc1c..f7e6a87cf 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(() => {
</div>
<div className="w-full flex flex-row justify-start items-center relative flex-wrap gap-x-2 gap-y-1">
{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 (
<div
key={shortcut.id}