From e928981c0813be4a07a83422e1715bb3116382c2 Mon Sep 17 00:00:00 2001
From: fantasticit <fantasticit@163.com>
Date: Sun, 5 Jun 2022 00:19:30 +0800
Subject: [PATCH] tiptap: use id instead of name

---
 packages/client/src/tiptap/core/menus/commands.tsx        | 5 ++---
 packages/client/src/tiptap/core/menus/katex/bubble.tsx    | 5 +++--
 packages/client/src/tiptap/core/wrappers/status/index.tsx | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/tiptap/core/menus/commands.tsx b/packages/client/src/tiptap/core/menus/commands.tsx
index f02684af..db010ec4 100644
--- a/packages/client/src/tiptap/core/menus/commands.tsx
+++ b/packages/client/src/tiptap/core/menus/commands.tsx
@@ -128,13 +128,12 @@ export const COMMANDS: ICommand[] = [
   {
     icon: <IconMath />,
     label: '数学公式',
-    action: (editor, user) => editor.chain().focus().setKatex({ defaultShowPicker: true, createUser: user.name }).run(),
+    action: (editor, user) => editor.chain().focus().setKatex({ defaultShowPicker: true, createUser: user.id }).run(),
   },
   {
     icon: <IconStatus />,
     label: '状态',
-    action: (editor, user) =>
-      editor.chain().focus().setStatus({ defaultShowPicker: true, createUser: user.name }).run(),
+    action: (editor, user) => editor.chain().focus().setStatus({ defaultShowPicker: true, createUser: user.id }).run(),
   },
   {
     icon: <IconCallout />,
diff --git a/packages/client/src/tiptap/core/menus/katex/bubble.tsx b/packages/client/src/tiptap/core/menus/katex/bubble.tsx
index ad2062d7..5882479e 100644
--- a/packages/client/src/tiptap/core/menus/katex/bubble.tsx
+++ b/packages/client/src/tiptap/core/menus/katex/bubble.tsx
@@ -41,10 +41,11 @@ export const KatexBubbleMenu: React.FC<{ editor: Editor }> = ({ editor }) => {
   }, [editor, createUser]);
 
   useEffect(() => {
-    if (defaultShowPicker && user && createUser === user.name) {
+    if (defaultShowPicker && user && createUser === user.id) {
       toggleVisible(true);
+      editor.chain().updateAttributes(Katex.name, { defaultShowPicker: false }).focus().run();
     }
-  }, [defaultShowPicker, toggleVisible, createUser, user]);
+  }, [editor, defaultShowPicker, toggleVisible, createUser, user]);
 
   useEffect(() => {
     if (visible) {
diff --git a/packages/client/src/tiptap/core/wrappers/status/index.tsx b/packages/client/src/tiptap/core/wrappers/status/index.tsx
index dab9bfe9..93f0702c 100644
--- a/packages/client/src/tiptap/core/wrappers/status/index.tsx
+++ b/packages/client/src/tiptap/core/wrappers/status/index.tsx
@@ -69,7 +69,7 @@ export const StatusWrapper = ({ editor, node, updateAttributes }) => {
   const onVisibleChange = useCallback(
     (value) => {
       toggleVisible(value);
-      if (defaultShowPicker && user && user.name === createUser) {
+      if (defaultShowPicker && user && user.id === createUser) {
         updateAttributes({ defaultShowPicker: false });
       }
     },
@@ -77,7 +77,7 @@ export const StatusWrapper = ({ editor, node, updateAttributes }) => {
   );
 
   useEffect(() => {
-    if (defaultShowPicker && user && user.name === createUser) {
+    if (defaultShowPicker && user && user.id === createUser) {
       toggleVisible(true);
       setTimeout(() => ref.current?.focus(), 100);
     }