From c84389c360ab47c0c88ea2f08ddab76eb79a4e22 Mon Sep 17 00:00:00 2001
From: "Diogo Franco (Kovensky)" <diogomfranco@gmail.com>
Date: Mon, 13 Nov 2017 17:26:39 +0900
Subject: [PATCH] Declare aliases for most literal union types

---
 types/emoji-mart/dist-es/components/category.d.ts |  4 +++-
 types/emoji-mart/dist-es/components/emoji.d.ts    | 14 +++++++++-----
 types/emoji-mart/dist-es/components/index.d.ts    |  2 +-
 types/emoji-mart/dist-es/components/picker.d.ts   | 14 +++++++-------
 types/emoji-mart/dist-es/index.d.ts               |  2 +-
 types/emoji-mart/dist-es/utils/emoji-index.d.ts   |  4 +++-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/types/emoji-mart/dist-es/components/category.d.ts b/types/emoji-mart/dist-es/components/category.d.ts
index 71b23f3964..8cd4ceefbb 100644
--- a/types/emoji-mart/dist-es/components/category.d.ts
+++ b/types/emoji-mart/dist-es/components/category.d.ts
@@ -1,9 +1,11 @@
 import React = require('react');
 
+import { EmojiData } from '..';
+
 import { Emoji, EmojiProps, I18n } from '.';
 
 export interface Props {
-    emojis?: Array<EmojiProps["emoji"]>;
+    emojis?: Array<string|EmojiData>;
     hasStickyPosition?: boolean;
     name: string;
     native: boolean;
diff --git a/types/emoji-mart/dist-es/components/emoji.d.ts b/types/emoji-mart/dist-es/components/emoji.d.ts
index 16c3dfc373..030ff7ce12 100644
--- a/types/emoji-mart/dist-es/components/emoji.d.ts
+++ b/types/emoji-mart/dist-es/components/emoji.d.ts
@@ -1,22 +1,26 @@
 import React = require('react');
 
-import { EmojiData } from '..';
+import { EmojiData, EmojiSkin } from '..';
+
+export type BackgroundImageFn = (set: EmojiSet, sheetSize: EmojiSheetSize) => string;
+export type EmojiSet = 'apple'|'google'|'twitter'|'emojione'|'messenger'|'facebook';
+export type EmojiSheetSize = 16|20|32|64;
 
 export interface Props {
     onOver?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
     onLeave?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
     onClick?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
     /** defaults to returning a png from unpkg.com-hosted emoji-datasource-${set} */
-    backgroundImageFn?(set: 'apple'|'google'|'twitter'|'emojione'|'messenger'|'facebook', sheetSize: 16|20|32|64): string;
+    backgroundImageFn?: BackgroundImageFn;
     native?: boolean;
     forceSize?: boolean;
     tooltip?: boolean;
     /** defaults to 1 */
-    skin?: 1|2|3|4|5|6;
+    skin?: EmojiSkin;
     /** defaults to 64 */
-    sheetSize?: 16|20|32|64;
+    sheetSize?: EmojiSheetSize;
     /** defaults to 'apple' */
-    set?: 'apple'|'google'|'twitter'|'emojione'|'messenger'|'facebook';
+    set?: EmojiSet;
     size: number;
     emoji: string|EmojiData;
 }
diff --git a/types/emoji-mart/dist-es/components/index.d.ts b/types/emoji-mart/dist-es/components/index.d.ts
index 49b02511bd..6fc29ecd54 100644
--- a/types/emoji-mart/dist-es/components/index.d.ts
+++ b/types/emoji-mart/dist-es/components/index.d.ts
@@ -1,4 +1,4 @@
 // The other exports on the components folder are not public API
 export { default as Category, Props as CategoryProps } from './category';
-export { default as Emoji, Props as EmojiProps } from './emoji';
+export { default as Emoji, Props as EmojiProps, BackgroundImageFn, EmojiSet, EmojiSheetSize } from './emoji';
 export { default as Picker, Props as PickerProps, I18n, PartialI18n, CustomEmoji } from './picker';
diff --git a/types/emoji-mart/dist-es/components/picker.d.ts b/types/emoji-mart/dist-es/components/picker.d.ts
index b38c436378..9f9132df05 100644
--- a/types/emoji-mart/dist-es/components/picker.d.ts
+++ b/types/emoji-mart/dist-es/components/picker.d.ts
@@ -1,8 +1,8 @@
 import React = require('react');
 
-import { EmojiData } from '..';
+import { EmojiData, EmojiSkin } from '..';
 
-import { Category, Emoji, EmojiProps } from '.';
+import { Category, Emoji, EmojiProps, BackgroundImageFn, EmojiSet, EmojiSheetSize } from '.';
 
 // tslint:disable-next-line interface-name
 export interface I18n {
@@ -33,14 +33,14 @@ export interface Props {
     title?: string;
     emoji?: string;
     color?: string;
-    set?: EmojiProps['set'];
-    skin?: EmojiProps['skin'];
+    set?: EmojiSet;
+    skin?: EmojiSkin;
     native?: boolean;
-    backgroundImageFn?: EmojiProps['backgroundImageFn'];
-    sheetSize?: EmojiProps['sheetSize'];
+    backgroundImageFn?: BackgroundImageFn;
+    sheetSize?: EmojiSheetSize;
     emojisToShowFilter?(emoji: EmojiData): boolean;
     showPreview?: boolean;
-    emojiTooltip?: EmojiProps['tooltip'];
+    emojiTooltip?: boolean;
     include?: string[];
     exclude?: string[];
     recent?: string[];
diff --git a/types/emoji-mart/dist-es/index.d.ts b/types/emoji-mart/dist-es/index.d.ts
index 82049c8495..e49d37fcf6 100644
--- a/types/emoji-mart/dist-es/index.d.ts
+++ b/types/emoji-mart/dist-es/index.d.ts
@@ -1,4 +1,4 @@
-export { default as  emojiIndex, EmojiData } from './utils/emoji-index';
+export { default as  emojiIndex, EmojiData, EmojiSkin } from './utils/emoji-index';
 export { default as store, StoreHandlers } from './utils/store';
 export { default as frequently } from './utils/frequently';
 
diff --git a/types/emoji-mart/dist-es/utils/emoji-index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index.d.ts
index bcf542254e..c6499e663c 100644
--- a/types/emoji-mart/dist-es/utils/emoji-index.d.ts
+++ b/types/emoji-mart/dist-es/utils/emoji-index.d.ts
@@ -1,3 +1,5 @@
+export type EmojiSkin = 1|2|3|4|5|6;
+
 export interface EmojiData {
     id: string;
     name: string;
@@ -5,7 +7,7 @@ export interface EmojiData {
     /** Reverse mapping to keyof emoticons */
     emoticons: string[];
     unified: string;
-    skin: 1|2|3|4|5|6|null;
+    skin: EmojiSkin|null;
     native: string;
 }