From caba7d0b3499fc1872b538774ce1ab372954da3f Mon Sep 17 00:00:00 2001 From: Kaylee Mann Date: Fri, 8 Mar 2019 14:00:50 +0900 Subject: [PATCH 1/2] Show preview panel when showPreview is false but showSkinTones is true. This is necessary in order to be able to show skin tone picker even when one desires for the mouseover preview to be invisible. This is an important case because mouseover displays must be disabled in order to enable single click emoji typing on iOS without disabling the skin tone picker. --- src/components/picker/nimble-picker.js | 3 ++- src/components/preview.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js index 24c0ff4..6f9c2e5 100644 --- a/src/components/picker/nimble-picker.js +++ b/src/components/picker/nimble-picker.js @@ -560,7 +560,7 @@ export default class NimblePicker extends React.PureComponent { })} - {showPreview && ( + {(showPreview || showSkinTones) && (
Date: Fri, 8 Mar 2019 14:13:17 +0900 Subject: [PATCH 2/2] Add "prepare" script so that emoji-mart can be installed from git. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e242b3f..f958930 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,8 @@ "prepublishOnly": "npm run build", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook", - "prettier": "prettier --write \"{src,scripts,spec}/**/*.js\"" + "prettier": "prettier --write \"{src,scripts,spec}/**/*.js\"", + "prepare": "npm run build:dist" }, "size-limit": [ {