Rename annotation to label

Signed-off-by: Šimon Brandner <[email protected]>
matrix-org · Dec 5, 2021 · 2e4feaf · 2e4feaf
1 parent 43abf01
commit 2e4feaf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -195,7 +195,7 @@ class EmojiPicker extends React.Component<IProps, IState> {
     };
 
     private emojiMatchesFilter = (emoji: IEmoji, filter: string): boolean => {
-        return emoji.annotation.toLowerCase().includes(filter) ||
+        return emoji.label.toLowerCase().includes(filter) ||
             emoji.emoticon?.toLowerCase().includes(filter) ||
             emoji.shortcodes.some(x => x.toLowerCase().includes(filter)) ||
             emoji.unicode.split(ZERO_WIDTH_JOINER).includes(filter);

diff --git a/src/components/views/emojipicker/Preview.tsx b/src/components/views/emojipicker/Preview.tsx
@@ -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 }

diff --git a/src/components/views/emojipicker/QuickReactions.tsx b/src/components/views/emojipicker/QuickReactions.tsx
@@ -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>
                     }

diff --git a/src/emoji.ts b/src/emoji.ts
@@ -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;
@@ -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,