From d22eabeec78002997411ec51aca7943b45e9e879 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Fri, 16 Feb 2024 22:50:35 +0800 Subject: [PATCH] fix: fix mention list will not hide member discriminator problem --- .../src/components/ChatBox/ChatInputBox/input.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/client/web/src/components/ChatBox/ChatInputBox/input.tsx b/client/web/src/components/ChatBox/ChatInputBox/input.tsx index e396ca05..47d9ca49 100644 --- a/client/web/src/components/ChatBox/ChatInputBox/input.tsx +++ b/client/web/src/components/ChatBox/ChatInputBox/input.tsx @@ -1,9 +1,9 @@ import { UserListItem } from '@/components/UserListItem'; -import { getMessageTextDecorators } from '@/plugin/common'; +import { getMessageTextDecorators, useGroupIdContext } from '@/plugin/common'; import { stopPropagation } from '@/utils/dom-helper'; import React from 'react'; import { Mention, MentionsInput } from 'react-mentions'; -import { t } from 'tailchat-shared'; +import { getGroupConfigWithInfo, t, useGroupInfo } from 'tailchat-shared'; import { useChatInputMentionsContext } from './context'; import { MentionCommandItem } from './MentionCommandItem'; import './input.less'; @@ -33,6 +33,9 @@ export const ChatInputBoxInput: React.FC = React.memo( (props) => { const { users, panels, placeholder, disabled } = useChatInputMentionsContext(); + const groupId = useGroupIdContext(); + const groupInfo = useGroupInfo(groupId); + const { hideGroupMemberDiscriminator } = getGroupConfigWithInfo(groupInfo); return ( = React.memo( displayTransform={(id, display) => `@${display}`} appendSpaceOnAdd={true} renderSuggestion={(suggestion) => ( - + )} markup={getMessageTextDecorators().mention('__id__', '__display__')} />