diff --git a/packages/client/src/tiptap/menus/emoji/constants.ts b/packages/client/src/tiptap/menus/emoji/constants.ts
deleted file mode 100644
index f178b3e..0000000
--- a/packages/client/src/tiptap/menus/emoji/constants.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-export const EXPRESSIONES = [
-  '😀',
-  '😃',
-  '😄',
-  '😁',
-  '😆',
-  '😅',
-  '😂',
-  '🤣',
-  '🥲',
-  '😊',
-  '😇',
-  '🙂',
-  '🙃',
-  '😉',
-  '😌',
-  '😍',
-  '🥰',
-  '😘',
-  '😗',
-  '😙',
-  '😚',
-  '😋',
-  '😛',
-  '😝',
-  '😜',
-  '🤪',
-  '🤨',
-  '🧐',
-  '🤓',
-  '😎',
-  '🥸',
-  '🤩',
-  '🥳',
-  '😏',
-  '😒',
-  '😞',
-  '😔',
-  '😟',
-  '😕',
-  '🙁',
-  '😣',
-  '😖',
-  '😫',
-  '😩',
-  '🥺',
-  '😢',
-  '😭',
-  '😤',
-  '😠',
-  '😡',
-  '🤬',
-  '🤯',
-  '😳',
-  '🥵',
-  '🥶',
-  '😱',
-  '😨',
-  '😰',
-  '😥',
-  '😓',
-  '🤗',
-  '🤔',
-  '🤭',
-  '🤫',
-  '🤥',
-  '😶',
-  '😐',
-  '😑',
-  '😬',
-  '🙄',
-  '😯',
-  '😦',
-  '😧',
-  '😮',
-  '😲',
-  '🥱',
-  '😴',
-  '🤤',
-  '😪',
-  '😵',
-  '🤐',
-  '🥴',
-  '🤢',
-  '🤮',
-  '🤧',
-  '😷',
-  '🤒',
-  '🤕',
-  '🤑',
-  '🤠',
-  '😈',
-  '👿',
-  '👹',
-  '👺',
-  '🤡',
-  '💩',
-  '👻',
-  '💀',
-  '☠️',
-  '👽',
-  '👾',
-  '🤖',
-  '🎃',
-  '😺',
-  '😸',
-  '😹',
-  '😻',
-  '😼',
-  '😽',
-  '🙀',
-  '😿',
-  '😾',
-];
-
-export const GESTURES = [
-  '👋',
-  '🤚',
-  '🖐',
-  '✋',
-  '🖖',
-  '👌',
-  '🤌',
-  '🤏',
-  '✌️',
-  '🤞',
-  '🤟',
-  '🤘',
-  '🤙',
-  '👈',
-  '👉',
-  '👆',
-  '🖕',
-  '👇',
-  '☝️',
-  '👍',
-  '👎',
-  '✊',
-  '👊',
-  '🤛',
-  '🤜',
-  '👏',
-  '🙌',
-  '👐',
-  '🤲',
-  '🤝',
-  '🙏',
-  '✍️',
-  '💅',
-  '🤳',
-  '💪',
-  '🦾',
-  '🦵',
-  '🦿',
-  '🦶',
-  '👣',
-  '👂',
-  '🦻',
-  '👃',
-  '🫀',
-  '🫁',
-  '🧠',
-  '🦷',
-  '🦴',
-  '👀',
-  '👁',
-  '👅',
-  '👄',
-  '💋',
-  '🩸',
-];
diff --git a/packages/client/src/tiptap/menus/emoji/index.module.scss b/packages/client/src/tiptap/menus/emoji/index.module.scss
deleted file mode 100644
index 3c2158f..0000000
--- a/packages/client/src/tiptap/menus/emoji/index.module.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.wrap {
-  height: 300px;
-  overflow: auto;
-}
-
-.listWrap {
-  display: flex;
-  width: 320px;
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  flex-wrap: wrap;
-
-  > li {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 32px;
-    height: 32px;
-    padding: 4px;
-    font-size: 24px;
-    cursor: pointer;
-  }
-}
diff --git a/packages/client/src/tiptap/menus/emoji/index.tsx b/packages/client/src/tiptap/menus/emoji/index.tsx
index 0a77cf3..e95540d 100644
--- a/packages/client/src/tiptap/menus/emoji/index.tsx
+++ b/packages/client/src/tiptap/menus/emoji/index.tsx
@@ -1,63 +1,22 @@
 import React, { useCallback } from 'react';
 import { Editor } from '@tiptap/core';
-import { Popover, Button, Typography } from '@douyinfe/semi-ui';
+import { Button } from '@douyinfe/semi-ui';
 import { Tooltip } from 'components/tooltip';
 import { IconEmoji } from 'components/icons';
-import { EXPRESSIONES, GESTURES } from './constants';
-import styles from './index.module.scss';
-
-const { Title } = Typography;
-
-const LIST = [
-  {
-    title: '表情',
-    data: EXPRESSIONES,
-  },
-  {
-    title: '手势',
-    data: GESTURES,
-  },
-];
+import { EmojiPicker } from 'components/emoji-picker';
 
 export const Emoji: React.FC<{ editor: Editor }> = ({ editor }) => {
   const setEmoji = useCallback((emoji) => {
-    return () => {
-      const transaction = editor.state.tr.insertText(emoji);
-      editor.view.dispatch(transaction);
-    };
+    const { selection } = editor.state;
+    const { $anchor } = selection;
+    return editor.chain().insertContentAt($anchor.pos, emoji).run();
   }, []);
 
   return (
-    <Popover
-      showArrow
-      zIndex={10000}
-      trigger="click"
-      content={
-        <div className={styles.wrap}>
-          {LIST.map((item, index) => {
-            return (
-              <div key={item.title} className={styles.sectionWrap}>
-                <Title heading={6} style={{ margin: `${index === 0 ? 0 : 16}px 0 6px` }}>
-                  {item.title}
-                </Title>
-                <ul className={styles.listWrap}>
-                  {(item.data || []).map((ex) => (
-                    <li key={ex} onClick={setEmoji(ex)}>
-                      {ex}
-                    </li>
-                  ))}
-                </ul>
-              </div>
-            );
-          })}
-        </div>
-      }
-    >
-      <span>
-        <Tooltip content="插入表情">
-          <Button theme={'borderless'} type="tertiary" icon={<IconEmoji />} />
-        </Tooltip>
-      </span>
-    </Popover>
+    <EmojiPicker onSelectEmoji={setEmoji}>
+      <Tooltip content="插入表情">
+        <Button theme={'borderless'} type="tertiary" icon={<IconEmoji />} />
+      </Tooltip>
+    </EmojiPicker>
   );
 };