feat: @ mention user filter self

teableio · Sep 19, 2024 · 3648597 · 3648597
1 parent abda5a3
commit 3648597
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/packages/sdk/src/components/comment/comment-editor/CommentEditor.tsx b/packages/sdk/src/components/comment/comment-editor/CommentEditor.tsx
@@ -68,7 +68,6 @@ export const CommentEditor = (props: ICommentEditorProps) => {
     blur: noop,
   });
   const { t } = useTranslation();
-  const collaborators = useCollaborators();
   const { quoteId, setQuoteId, setEditorRef, editingCommentId, setEditingCommentId } =
     useCommentStore();
   const mentionUserRender = (element: TMentionElement) => {
@@ -155,12 +154,7 @@ export const CommentEditor = (props: ICommentEditorProps) => {
           [MentionPlugin.key]: (props: React.ComponentProps<typeof MentionElement>) => (
             <MentionElement {...props} render={mentionUserRender} />
           ),
-          [MentionInputPlugin.key]: (props: React.ComponentProps<typeof MentionInputElement>) => (
-            <MentionInputElement
-              {...props}
-              nodeProps={{ ...props.nodeProps, user: collaborators }}
-            />
-          ),
+          [MentionInputPlugin.key]: MentionInputElement,
           [ImagePlugin.key]: ImageElement,
         }),
         [ParagraphPlugin.key]: ParagraphElement,

diff --git a/packages/sdk/src/components/comment/comment-editor/plate-ui/mention-element.tsx b/packages/sdk/src/components/comment/comment-editor/plate-ui/mention-element.tsx
@@ -17,7 +17,6 @@ export const MentionElement = withRef<
   const element = useElement<TMentionElement>();
   const selected = useSelected();
   const focused = useFocused();
-  console.log('element', element);
 
   return (
     <PlateElement

diff --git a/packages/sdk/src/components/comment/comment-editor/plate-ui/mention-input-element.tsx b/packages/sdk/src/components/comment/comment-editor/plate-ui/mention-input-element.tsx
@@ -3,6 +3,7 @@ import { PlateElement } from '@udecode/plate-common/react';
 import { getMentionOnSelectItem } from '@udecode/plate-mention';
 import React, { useState } from 'react';
 import { useTranslation } from '../../../../context/app/i18n';
+import { useSession } from '../../../../hooks';
 import { UserAvatar } from '../../../cell-value';
 import { useCollaborators } from '../../hooks';
 import {
@@ -19,7 +20,9 @@ export const MentionInputElement = withRef<typeof PlateElement>(({ className, ..
   const { children, editor, element } = props;
   const { t } = useTranslation();
   const [search, setSearch] = useState('');
+  const { user } = useSession();
   const collaborators = useCollaborators();
+  const mentionUsers = collaborators.filter((item) => item.userId !== user.id);
 
   return (
     <PlateElement
@@ -50,7 +53,7 @@ export const MentionInputElement = withRef<typeof PlateElement>(({ className, ..
         <InlineComboboxContent className="my-1.5">
           <InlineComboboxEmpty>{t('common.search.empty')}</InlineComboboxEmpty>
 
-          {collaborators.map((item) => (
+          {mentionUsers.map((item) => (
             <InlineComboboxItem
               key={item.userId}
               onClick={() =>