mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Pre-alpha: React with any emoji, behind flag

Browse source
This commit is contained in:
Ken Powers 2020-05-05 15:49:34 -04:00 • committed by Scott Nonnenberg
parent d13c3d3350
commit 0865a5481c
31 changed files with 572 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/components/conversation/Message.tsx
View file

@ -19,7 +19,7 @@ import {
OwnProps as ReactionViewerProps,
ReactionViewer,
} from './ReactionViewer';
import { ReactionPicker } from './ReactionPicker';
import { Props as ReactionPickerProps, ReactionPicker } from './ReactionPicker';
import { Emoji } from '../emoji/Emoji';
import {
@ -155,7 +155,10 @@ export type PropsActions = {
showExpiredOutgoingTapToViewToast: () => unknown;
};
export type Props = PropsData & PropsHousekeeping & PropsActions;
export type Props = PropsData &
PropsHousekeeping &
PropsActions &
Pick<ReactionPickerProps, 'renderEmojiPicker'>;
interface State {
expiring: boolean;
@ -1001,9 +1004,11 @@ export class Message extends React.PureComponent<Props, State> {
canReply,
direction,
disableMenu,
i18n,
id,
isSticker,
isTapToView,
renderEmojiPicker,
replyToMessage,
} = this.props;
@ -1121,6 +1126,7 @@ export class Message extends React.PureComponent<Props, State> {
<Popper placement="top">
{({ ref, style }) => (
<ReactionPicker
i18n={i18n}
ref={ref}
style={style}
selected={this.props.selectedReaction}
@ -1132,6 +1138,7 @@ export class Message extends React.PureComponent<Props, State> {
remove: emoji === this.props.selectedReaction,
});
}}
renderEmojiPicker={renderEmojiPicker}
/>
)}
</Popper>,