Skip to content

Commit ca65608

Browse files
committed
2.0.2 - [PATCH][BUGFIX] add onClick handler to emojis
1 parent dd81623 commit ca65608

File tree

9 files changed

+26
-23
lines changed

9 files changed

+26
-23
lines changed

dist/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/universal/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/universal/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emoji-picker-react",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "React emoji-picker component",
55
"main": "./dist/index.js",
66
"scripts": {

src/DiversityPicker/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ function DiversityPicker({ index, assetPath, emojiResolution, onEmojiClick, clos
1717
let diversities = null;
1818

1919
function onClick(diversity, e) {
20-
e.preventDefault();
2120
onEmojiClick(diversity, emoji, e);
22-
close();
21+
setTimeout(close, 500);
2322
}
2423

2524
if (emoji && emoji.diversities) {
@@ -35,7 +34,7 @@ function DiversityPicker({ index, assetPath, emojiResolution, onEmojiClick, clos
3534
key={diversity}
3635
style={style}
3736
className="emoji"
38-
onMouseDown={((e) => onClick(diversity, e))}/>
37+
onClick={((e) => onClick(diversity, e))}/>
3938
);
4039
})
4140
}</div>

src/Emoji/index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class Emoji extends Component {
1313
this.hasDiversities = this.emoji.hasOwnProperty('diversities');
1414

1515
this.onClick = this.onClick.bind(this);
16+
this.emojiChosen = this.emojiChosen.bind(this);
1617
this.onMouseEnter = this.onMouseEnter.bind(this);
1718
this.onMouseLeave = this.onMouseLeave.bind(this);
1819
this.onMouseDown = this.onMouseDown.bind(this);
@@ -30,6 +31,10 @@ class Emoji extends Component {
3031
}
3132

3233
onClick(e) {
34+
e.preventDefault();
35+
}
36+
37+
emojiChosen(e) {
3338
const { emoji } = this.props;
3439
const onEmojiClick = this.context.onEmojiClick;
3540

@@ -88,7 +93,7 @@ class Emoji extends Component {
8893
delete this.timeCounter;
8994

9095
if (!(counter && (Date.now() - counter) >= OPEN_DIVERSITIES_TIMEOUT)) {
91-
return this.onClick(e);
96+
return this.emojiChosen(e);
9297
}
9398
}
9499

@@ -108,6 +113,7 @@ class Emoji extends Component {
108113
return (
109114
<a href="#!"
110115
className={className}
116+
onClick={this.onClick}
111117
onMouseEnter={this.onMouseEnter}
112118
onMouseLeave={this.onMouseLeave}
113119
onMouseDown={this.onMouseDown}
@@ -134,7 +140,7 @@ Emoji.contextTypes = {
134140
activeModifier: PropTypes.string,
135141
emojiResolution: PropTypes.number,
136142
openDiversitiesMenu: PropTypes.func,
137-
disableDiversityPicker: PropTypes.bool,
143+
disableDiversityPicker: PropTypes.bool
138144
};
139145

140146
export default Emoji;

src/EmojiPicker/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class EmojiPicker extends Component {
4242
}
4343

4444
getChildContext() {
45-
const { assetPath, emojiResolution, disableDiversityPicker, customCategoryNames, emojiSize, emojiPadding} = this.props;
45+
const { assetPath, emojiResolution, disableDiversityPicker, customCategoryNames} = this.props;
4646
const { activeModifier } = this.state;
4747
const { openDiversitiesMenu } = this;
4848
return { onEmojiClick: this.onEmojiClick, parent: this, assetPath, activeModifier, emojiResolution, openDiversitiesMenu, disableDiversityPicker, customCategoryNames };
@@ -243,9 +243,7 @@ EmojiPicker.propTypes = {
243243
emojiResolution: PropTypes.number,
244244
preload: PropTypes.bool,
245245
customCategoryNames: PropTypes.object,
246-
disableDiversityPicker: PropTypes.bool,
247-
emojiSize: PropTypes.number,
248-
emojiPadding: PropTypes.number
246+
disableDiversityPicker: PropTypes.bool
249247
};
250248

251249
EmojiPicker.childContextTypes = {

yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2462,9 +2462,9 @@ doctrine@^2.0.0:
24622462
esutils "^2.0.2"
24632463
isarray "^1.0.0"
24642464

2465-
doctrine@^2.0.2:
2466-
version "2.0.2"
2467-
resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
2465+
doctrine@^2.1.0:
2466+
version "2.1.0"
2467+
resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
24682468
dependencies:
24692469
esutils "^2.0.2"
24702470

@@ -2817,17 +2817,17 @@ eslint-visitor-keys@^1.0.0:
28172817
version "1.0.0"
28182818
resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
28192819

2820-
eslint@4.15.0:
2821-
version "4.15.0"
2822-
resolved "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz#89ab38c12713eec3d13afac14e4a89e75ef08145"
2820+
eslint@4.16.0:
2821+
version "4.16.0"
2822+
resolved "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz#934ada9e98715e1d7bbfd6f6f0519ed2fab35cc1"
28232823
dependencies:
28242824
ajv "^5.3.0"
28252825
babel-code-frame "^6.22.0"
28262826
chalk "^2.1.0"
28272827
concat-stream "^1.6.0"
28282828
cross-spawn "^5.1.0"
28292829
debug "^3.1.0"
2830-
doctrine "^2.0.2"
2830+
doctrine "^2.1.0"
28312831
eslint-scope "^3.7.1"
28322832
eslint-visitor-keys "^1.0.0"
28332833
espree "^3.5.2"

0 commit comments

Comments
 (0)