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

Show clicked-on reaction in ReactionViewer

Browse source
This commit is contained in:
Ken Powers 2020-02-06 14:57:46 -05:00 • committed by GitHub
parent c147e6ce25
commit c9292544aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/components/conversation/ReactionViewer.tsx
View file

@ -22,6 +22,7 @@ export type Reaction = {
export type OwnProps = {
reactions: Array<Reaction>;
pickedReaction?: string;
onClose?: () => unknown;
};
@ -33,11 +34,11 @@ const emojisOrder = ['❤️', '👍', '👎', '😂', '😮', '😢', '😡'];
export const ReactionViewer = React.forwardRef<HTMLDivElement, Props>(
// tslint:disable-next-line max-func-body-length
({ i18n, reactions, onClose, ...rest }, ref) => {
({ i18n, reactions, onClose, pickedReaction, ...rest }, ref) => {
const grouped = mapValues(groupBy(reactions, 'emoji'), res =>
orderBy(res, ['timestamp'], ['desc'])
);
const [selected, setSelected] = React.useState('all');
const [selected, setSelected] = React.useState(pickedReaction || 'all');
const focusRef = React.useRef<HTMLButtonElement>(null);
// Handle escape key
@ -77,7 +78,7 @@ export const ReactionViewer = React.forwardRef<HTMLDivElement, Props>(
}, [reactions]);
const allSorted = React.useMemo(() => {
return sortBy(reactions, 'timestamp');
return orderBy(reactions, ['timestamp'], ['desc']);
}, [reactions]);
// If we have previously selected a reaction type that is no longer present