@mention support for story replies

This commit is contained in:
Josh Perez 2022-08-23 14:02:51 -04:00 committed by GitHub
parent a4f727a5b2
commit fef9e5b58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions

View File

@ -54,6 +54,7 @@ export type PropsType = {
| 'name' | 'name'
| 'profileName' | 'profileName'
| 'sharedGroupNames' | 'sharedGroupNames'
| 'sortedGroupMembers'
| 'title' | 'title'
>; >;
hasActiveCall?: boolean; hasActiveCall?: boolean;
@ -774,6 +775,7 @@ export const StoryViewer = ({
renderEmojiPicker={renderEmojiPicker} renderEmojiPicker={renderEmojiPicker}
replies={replies} replies={replies}
skinTone={skinTone} skinTone={skinTone}
sortedGroupMembers={group?.sortedGroupMembers}
storyPreviewAttachment={attachment} storyPreviewAttachment={attachment}
views={views} views={views}
/> />

View File

@ -6,6 +6,7 @@ import classNames from 'classnames';
import { usePopper } from 'react-popper'; import { usePopper } from 'react-popper';
import type { AttachmentType } from '../types/Attachment'; import type { AttachmentType } from '../types/Attachment';
import type { BodyRangeType, LocalizerType } from '../types/Util'; import type { BodyRangeType, LocalizerType } from '../types/Util';
import type { ConversationType } from '../state/ducks/conversations';
import type { EmojiPickDataType } from './emoji/EmojiPicker'; import type { EmojiPickDataType } from './emoji/EmojiPicker';
import type { InputApi } from './CompositionInput'; import type { InputApi } from './CompositionInput';
import type { PreferredBadgeSelectorType } from '../state/selectors/badges'; import type { PreferredBadgeSelectorType } from '../state/selectors/badges';
@ -104,6 +105,7 @@ export type PropsType = {
renderEmojiPicker: (props: RenderEmojiPickerProps) => JSX.Element; renderEmojiPicker: (props: RenderEmojiPickerProps) => JSX.Element;
replies: Array<ReplyType>; replies: Array<ReplyType>;
skinTone?: number; skinTone?: number;
sortedGroupMembers?: Array<ConversationType>;
storyPreviewAttachment?: AttachmentType; storyPreviewAttachment?: AttachmentType;
views: Array<StorySendStateType>; views: Array<StorySendStateType>;
}; };
@ -126,6 +128,7 @@ export const StoryViewsNRepliesModal = ({
renderEmojiPicker, renderEmojiPicker,
replies, replies,
skinTone, skinTone,
sortedGroupMembers,
storyPreviewAttachment, storyPreviewAttachment,
views, views,
}: PropsType): JSX.Element | null => { }: PropsType): JSX.Element | null => {
@ -210,6 +213,7 @@ export const StoryViewsNRepliesModal = ({
? i18n('StoryViewer__reply-group') ? i18n('StoryViewer__reply-group')
: i18n('StoryViewer__reply') : i18n('StoryViewer__reply')
} }
sortedGroupMembers={sortedGroupMembers}
theme={ThemeType.dark} theme={ThemeType.dark}
> >
<EmojiButton <EmojiButton

View File

@ -180,6 +180,7 @@ export function getConversationStory(
'name', 'name',
'profileName', 'profileName',
'sharedGroupNames', 'sharedGroupNames',
'sortedGroupMembers',
'title', 'title',
]); ]);

View File

@ -50,6 +50,7 @@ export type ConversationStoryType = {
| 'name' | 'name'
| 'profileName' | 'profileName'
| 'sharedGroupNames' | 'sharedGroupNames'
| 'sortedGroupMembers'
| 'title' | 'title'
>; >;
isHidden?: boolean; isHidden?: boolean;