Skip to content

Commit 97d5277

Browse files
ealushealush
committed
1.2.12 Add Filter Empty State
1 parent f94e452 commit 97d5277

11 files changed

+70
-48
lines changed

‎docs/iframe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<body>
1717
<div id="root"></div>
1818
<div id="error-display"></div>
19-
<script src="static/preview.77d1a63fd6652ab7d7ab.bundle.js"></script>
19+
<script src="static/preview.d2b463239f237a2daa7b.bundle.js"></script>
2020
</body>
2121
</html>
2222

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</head>
3939
<body style="margin: 0;">
4040
<div id="root"></div>
41-
<script src="static/manager.1bab24b126040818739b.bundle.js"></script>
41+
<script src="static/manager.1a9f8fa53bb0b1f0943a.bundle.js"></script>
4242
</body>
4343
</html>
4444

‎docs/static/manager.1bab24b126040818739b.bundle.js‎ renamed to ‎docs/static/manager.1a9f8fa53bb0b1f0943a.bundle.js‎

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

‎docs/static/manager.1bab24b126040818739b.bundle.js.map‎ renamed to ‎docs/static/manager.1a9f8fa53bb0b1f0943a.bundle.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.

‎docs/static/preview.77d1a63fd6652ab7d7ab.bundle.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/static/preview.77d1a63fd6652ab7d7ab.bundle.js‎ renamed to ‎docs/static/preview.d2b463239f237a2daa7b.bundle.js‎

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

‎docs/static/preview.d2b463239f237a2daa7b.bundle.js.map‎

Lines changed: 1 addition & 0 deletions
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": "1.2.11",
3+
"version": "1.2.12",
44
"description": "React emoji-picker component",
55
"main": "./dist/index.js",
66
"scripts": {

‎src/Emoji/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class Emoji extends Component {
3838
}
3939

4040
onMouseEnter() {
41-
if (this.props.emojiProps._emojiName) {
42-
this.props.emojiProps._emojiName.textContent = this.emoji.name;
41+
if (this.props.emojiProps.parent._emojiName) {
42+
this.props.emojiProps.parent._emojiName.textContent = this.emoji.name;
4343
}
4444
}
4545

@@ -49,8 +49,8 @@ class Emoji extends Component {
4949
return;
5050
}
5151

52-
if (this.props.emojiProps._emojiName) {
53-
this.props.emojiProps._emojiName.textContent = '';
52+
if (this.props.emojiProps.parent._emojiName) {
53+
this.props.emojiProps.parent._emojiName.textContent = '';
5454
}
5555
}
5656

‎src/EmojiPicker/index.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,21 +278,22 @@ class EmojiPicker extends Component {
278278
}
279279

280280
render() {
281-
282281
const { assetPath, emojiResolution } = this.props;
283282
const { filter, activeModifier, seenCategories, seenInSearch, diversityPicker, modifiersSpread } = this.state;
284283
const { openDiversitiesMenu, closeDiversitiesMenu, _emojiName } = this;
285-
const emojiProps = { onEmojiClick: this.onEmojiClick, assetPath, activeModifier, emojiResolution, _emojiName, openDiversitiesMenu },
284+
const emojiProps = { onEmojiClick: this.onEmojiClick, parent: this, assetPath, activeModifier, emojiResolution, _emojiName, openDiversitiesMenu },
286285
visibleCategories = Object.assign({}, seenCategories, seenInSearch);
287286

287+
const wrapperClassName = `wrapper${filter && Object.keys(filter).length === 0 ? ' no-results' : ''}`;
288+
288289
return (
289290
<aside className={this.pickerClassName} ref={(picker) => this._picker = picker}>
290291
<CategoriesNav onClick={this.onCategoryClick}/>
291292
<div className="bar-wrapper">
292293
<SkinTones onModifierClick={this.onModifierClick} activeModifier={activeModifier} spread={modifiersSpread}/>
293294
<SearchBar onChange={this.onSearch}/>
294295
</div>
295-
<div className="wrapper">
296+
<div className={wrapperClassName}>
296297
<DiversityPicker name={diversityPicker}
297298
assetPath={assetPath}
298299
emojiResolution={emojiResolution}

0 commit comments

Comments
 (0)