Browse Source

Handle empty case

master
Roderick Hsiao 4 years ago
parent
commit
0da76ef29c
  1. 6
      src/categoryButtons.ts
  2. 2
      src/emojiArea.ts

6
src/categoryButtons.ts

@ -2,6 +2,8 @@ import { TinyEmitter as Emitter } from 'tiny-emitter';
import { CLASS_CATEGORY_BUTTONS, CLASS_CATEGORY_BUTTON } from './classes';
import emojiData from './data/emoji';
import { CATEGORY_CLICKED } from './events';
import * as icons from './icons';
@ -38,8 +40,8 @@ export class CategoryButtons {
const container = createElement('div', CLASS_CATEGORY_BUTTONS);
let categories = this.options.showRecents
? ['recents', ...(this.options.categories || this.options.emojiData.categories)]
: this.options.categories || his.options.emojiData.categories;
? ['recents', ...(this.options.categories || this.options.emojiData?.categories || emojiData.categories)]
: this.options.categories || this.options.emojiData?.categories || emojiData.categories;
if (this.options.custom) {
categories = [...categories, 'custom'];

2
src/emojiArea.ts

@ -53,7 +53,7 @@ export class EmojiArea {
private options: EmojiButtonOptions
) {
this.emojisPerRow = options.emojisPerRow || 8;
this.categories = options.categories || options.emojiData.categories;
this.categories = options.categories || options.emojiData?.categories || emojiData.categories;
if (options.showRecents) {
this.categories = ['recents', ...this.categories];

Loading…
Cancel
Save