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

Upgrade emoji support to Unicode v12

Browse source
This commit is contained in:
josh-signal 2020-01-23 13:17:06 -08:00 • committed by Ken Powers
parent 1b975bec65
commit de7bc8b1b1
4 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/components/emoji/EmojiPicker.tsx
View file

@ -177,6 +177,8 @@ export const EmojiPicker = React.memo(
// Focus after initial render, restore focus on teardown
useRestoreFocus(focusRef);
const [, ...renderableCategories] = categories;
const emojiGrid = React.useMemo(() => {
if (searchText) {
return chunk(
@ -185,9 +187,7 @@ export const EmojiPicker = React.memo(
);
}
const [, ...cats] = categories;
const chunks = flatMap(cats, cat =>
const chunks = flatMap(renderableCategories, cat =>
chunk(
dataByCategory[cat].map(e => e.short_name),
COL_COUNT
@ -201,9 +201,8 @@ export const EmojiPicker = React.memo(
const rowEnds: Array<number> = [
Math.ceil(firstRecent.length / COL_COUNT) - 1,
];
const [, ...cats] = categories;
cats.forEach(cat => {
renderableCategories.forEach(cat => {
rowEnds.push(
Math.ceil(dataByCategory[cat].length / COL_COUNT) +
(last(rowEnds) as number)