imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade emojibase and twemoji (#7286)

Browse source 
Co-authored-by: Tulir Asokan <tulir@maunium.net>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Šimon Brandner 2022-03-23 18:08:34 +01:00 • committed by GitHub
parent 9961b003bb
commit 3534e9b6ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/autocomplete/EmojiProvider.tsx
View file

@ -75,7 +75,7 @@ export default class EmojiProvider extends AutocompleteProvider {
shouldMatchWordsOnly: false,
});
this.nameMatcher = new QueryMatcher(SORTED_EMOJI, {
keys: ['emoji.annotation'],
keys: ['emoji.label'],
// For removing punctuation
shouldMatchWordsOnly: true,
});

7
src/components/views/emojipicker/EmojiPicker.tsx
View file

@ -196,8 +196,11 @@ class EmojiPicker extends React.Component<IProps, IState> {
};
private emojiMatchesFilter = (emoji: IEmoji, filter: string): boolean => {
return emoji.annotation.toLowerCase().includes(filter) ||
emoji.emoticon?.toLowerCase().includes(filter) ||
return emoji.label.toLowerCase().includes(filter) ||
(Array.isArray(emoji.emoticon)
? emoji.emoticon.some((x) => x.includes(filter))
: emoji.emoticon?.includes(filter)
) ||
emoji.shortcodes.some(x => x.toLowerCase().includes(filter)) ||
emoji.unicode.split(ZERO_WIDTH_JOINER).includes(filter);
};

4
src/components/views/emojipicker/Preview.tsx
View file

@ -27,7 +27,7 @@ interface IProps {
@replaceableComponent("views.emojipicker.Preview")
class Preview extends React.PureComponent<IProps> {
render() {
const { unicode, annotation, shortcodes: [shortcode] } = this.props.emoji;
const { unicode, label, shortcodes: [shortcode] } = this.props.emoji;
return (
<div className="mx_EmojiPicker_footer mx_EmojiPicker_preview">
@ -36,7 +36,7 @@ class Preview extends React.PureComponent<IProps> {
</div>
<div className="mx_EmojiPicker_preview_text">
<div className="mx_EmojiPicker_name mx_EmojiPicker_preview_name">
{ annotation }
{ label }
</div>
<div className="mx_EmojiPicker_shortcode">
{ shortcode }

2
src/components/views/emojipicker/QuickReactions.tsx
View file

@ -68,7 +68,7 @@ class QuickReactions extends React.Component<IProps, IState> {
{ !this.state.hover
? _t("Quick Reactions")
: <React.Fragment>
<span className="mx_EmojiPicker_name">{ this.state.hover.annotation }</span>
<span className="mx_EmojiPicker_name">{ this.state.hover.label }</span>
<span className="mx_EmojiPicker_shortcode">{ this.state.hover.shortcodes[0] }</span>
</React.Fragment>
}

10
src/emoji.ts
View file

@ -18,7 +18,7 @@ import EMOJIBASE from 'emojibase-data/en/compact.json';
import SHORTCODES from 'emojibase-data/en/shortcodes/iamcal.json';
export interface IEmoji {
annotation: string;
label: string;
group?: number;
hexcode: string;
order?: number;
@ -26,7 +26,7 @@ export interface IEmoji {
tags?: string[];
unicode: string;
skins?: Omit<IEmoji, "shortcodes" | "tags">[]; // Currently unused
emoticon?: string;
emoticon?: string | string[];
}
// The unicode is stored without the variant selector
@ -74,7 +74,7 @@ export const EMOJI: IEmoji[] = EMOJIBASE.map((emojiData: Omit<IEmoji, "shortcode
// If there's ever a gap in shortcode coverage, we fudge it by
// filling it in with the emoji's CLDR annotation
const shortcodeData = SHORTCODES[emojiData.hexcode] ??
[emojiData.annotation.toLowerCase().replace(/\W+/g, "_")];
[emojiData.label.toLowerCase().replace(/\W+/g, "_")];
const emoji: IEmoji = {
...emojiData,
@ -102,7 +102,9 @@ export const EMOJI: IEmoji[] = EMOJIBASE.map((emojiData: Omit<IEmoji, "shortcode
if (emoji.emoticon) {
// Add mapping from emoticon to Emoji object
EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji);
Array.isArray(emoji.emoticon)
? emoji.emoticon.forEach((x) => EMOTICON_TO_EMOJI.set(x, emoji))
: EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji);
}
return emoji;