From d24a441935b8c5f986654c8bcaea4a5768ce8779 Mon Sep 17 00:00:00 2001 From: Jakob Krigovsky Date: Tue, 23 May 2017 16:47:42 +0200 Subject: [PATCH 1/3] Update yarn.lock --- yarn.lock | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3776243..1369b80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1119,7 +1119,7 @@ extsprintf@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" -fbjs@^0.8.1: +fbjs@^0.8.1, fbjs@^0.8.9: version "0.8.9" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.9.tgz#180247fbd347dcc9004517b904f865400a0c8f14" dependencies: @@ -1681,7 +1681,7 @@ longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" -loose-envify@^1.0.0, loose-envify@^1.1.0: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" dependencies: @@ -2010,6 +2010,13 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.5.8: + version "15.5.10" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.3.1" + prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" From 95be21383d445cb7b73233d84abbe594b6ec918c Mon Sep 17 00:00:00 2001 From: Sam Kelleher Date: Thu, 25 May 2017 18:27:30 +0100 Subject: [PATCH 2/3] Allow the fallback emoji to be optional, will display nothing. --- src/components/preview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/preview.js b/src/components/preview.js index a5a4e08..a240c86 100644 --- a/src/components/preview.js +++ b/src/components/preview.js @@ -53,10 +53,10 @@ export default class Preview extends React.Component { } else { return
- 0 && + />}
From 0dc2ed59f85b526bd69e5bc11fcb2f1735a2278e Mon Sep 17 00:00:00 2001 From: Sam Kelleher Date: Thu, 25 May 2017 18:28:18 +0100 Subject: [PATCH 3/3] Describe setting empty --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64c6ed5..4c0b8d3 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ import { Picker } from 'emoji-mart' | ---- | :------: | ------- | ----------- | | **autoFocus** | | `false` | Auto focus the search input when mounted | | **color** | | `#ae65c5` | The top bar anchors select and hover color | -| **emoji** | | `department_store` | The emoji shown when no emojis are hovered | +| **emoji** | | `department_store` | The emoji shown when no emojis are hovered, set to an empty string to show nothing | | **include** | | `[]` | Only load included categories. Accepts [I18n categories keys](#i18n). Order will be respected, except for the `recent` category which will always be the first. | | **exclude** | | `[]` | Don't load excluded categories. Accepts [I18n categories keys](#i18n). | | **emojiSize** | | `24` | The emoji width and height |