fix: fix mention list will not hide member discriminator problem

pull/220/head
moonrailgun 1 year ago
parent a3781ae14b
commit d22eabeec7

@ -1,9 +1,9 @@
import { UserListItem } from '@/components/UserListItem'; import { UserListItem } from '@/components/UserListItem';
import { getMessageTextDecorators } from '@/plugin/common'; import { getMessageTextDecorators, useGroupIdContext } from '@/plugin/common';
import { stopPropagation } from '@/utils/dom-helper'; import { stopPropagation } from '@/utils/dom-helper';
import React from 'react'; import React from 'react';
import { Mention, MentionsInput } from 'react-mentions'; import { Mention, MentionsInput } from 'react-mentions';
import { t } from 'tailchat-shared'; import { getGroupConfigWithInfo, t, useGroupInfo } from 'tailchat-shared';
import { useChatInputMentionsContext } from './context'; import { useChatInputMentionsContext } from './context';
import { MentionCommandItem } from './MentionCommandItem'; import { MentionCommandItem } from './MentionCommandItem';
import './input.less'; import './input.less';
@ -33,6 +33,9 @@ export const ChatInputBoxInput: React.FC<ChatInputBoxInputProps> = React.memo(
(props) => { (props) => {
const { users, panels, placeholder, disabled } = const { users, panels, placeholder, disabled } =
useChatInputMentionsContext(); useChatInputMentionsContext();
const groupId = useGroupIdContext();
const groupInfo = useGroupInfo(groupId);
const { hideGroupMemberDiscriminator } = getGroupConfigWithInfo(groupInfo);
return ( return (
<MentionsInput <MentionsInput
@ -61,7 +64,10 @@ export const ChatInputBoxInput: React.FC<ChatInputBoxInputProps> = React.memo(
displayTransform={(id, display) => `@${display}`} displayTransform={(id, display) => `@${display}`}
appendSpaceOnAdd={true} appendSpaceOnAdd={true}
renderSuggestion={(suggestion) => ( renderSuggestion={(suggestion) => (
<UserListItem userId={String(suggestion.id)} /> <UserListItem
userId={String(suggestion.id)}
hideDiscriminator={hideGroupMemberDiscriminator}
/>
)} )}
markup={getMessageTextDecorators().mention('__id__', '__display__')} markup={getMessageTextDecorators().mention('__id__', '__display__')}
/> />

Loading…
Cancel
Save