Fix #129 - Passing down a `recent` prop instead of localStorage
parent
067d665ab2
commit
d781320498
|
@ -93,11 +93,11 @@ export default class Category extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
getEmojis() {
|
getEmojis() {
|
||||||
var { name, emojis, perLine } = this.props
|
var { name, emojis, recent, perLine } = this.props
|
||||||
|
|
||||||
if (name == 'Recent') {
|
if (name == 'Recent') {
|
||||||
let { custom } = this.props
|
let { custom } = this.props
|
||||||
let frequentlyUsed = frequently.get(perLine)
|
let frequentlyUsed = recent || frequently.get(perLine)
|
||||||
|
|
||||||
if (frequentlyUsed.length) {
|
if (frequentlyUsed.length) {
|
||||||
emojis = frequentlyUsed.map(id => {
|
emojis = frequentlyUsed.map(id => {
|
||||||
|
@ -208,6 +208,7 @@ Category.propTypes = {
|
||||||
native: PropTypes.bool.isRequired,
|
native: PropTypes.bool.isRequired,
|
||||||
perLine: PropTypes.number.isRequired,
|
perLine: PropTypes.number.isRequired,
|
||||||
emojiProps: PropTypes.object.isRequired,
|
emojiProps: PropTypes.object.isRequired,
|
||||||
|
recent: PropTypes.arrayOf(PropTypes.string),
|
||||||
}
|
}
|
||||||
|
|
||||||
Category.defaultProps = {
|
Category.defaultProps = {
|
||||||
|
|
|
@ -220,7 +220,7 @@ export default class Picker extends React.PureComponent {
|
||||||
|
|
||||||
handleEmojiClick(emoji, e) {
|
handleEmojiClick(emoji, e) {
|
||||||
this.props.onClick(emoji, e)
|
this.props.onClick(emoji, e)
|
||||||
if (!this.hideRecent) frequently.add(emoji)
|
if (!this.hideRecent && !this.props.recent) frequently.add(emoji)
|
||||||
|
|
||||||
var component = this.categoryRefs['category-1']
|
var component = this.categoryRefs['category-1']
|
||||||
if (component) {
|
if (component) {
|
||||||
|
@ -420,6 +420,7 @@ export default class Picker extends React.PureComponent {
|
||||||
emojiTooltip,
|
emojiTooltip,
|
||||||
include,
|
include,
|
||||||
exclude,
|
exclude,
|
||||||
|
recent,
|
||||||
autoFocus,
|
autoFocus,
|
||||||
} = this.props,
|
} = this.props,
|
||||||
{ skin } = this.state,
|
{ skin } = this.state,
|
||||||
|
@ -464,6 +465,9 @@ export default class Picker extends React.PureComponent {
|
||||||
native={native}
|
native={native}
|
||||||
hasStickyPosition={this.hasStickyPosition}
|
hasStickyPosition={this.hasStickyPosition}
|
||||||
i18n={this.i18n}
|
i18n={this.i18n}
|
||||||
|
recent={
|
||||||
|
category.name == 'Recent' ? recent : undefined
|
||||||
|
}
|
||||||
custom={
|
custom={
|
||||||
category.name == 'Recent' ? CUSTOM_CATEGORY.emojis : undefined
|
category.name == 'Recent' ? CUSTOM_CATEGORY.emojis : undefined
|
||||||
}
|
}
|
||||||
|
@ -530,6 +534,7 @@ Picker.propTypes = {
|
||||||
emojiTooltip: Emoji.propTypes.tooltip,
|
emojiTooltip: Emoji.propTypes.tooltip,
|
||||||
include: PropTypes.arrayOf(PropTypes.string),
|
include: PropTypes.arrayOf(PropTypes.string),
|
||||||
exclude: PropTypes.arrayOf(PropTypes.string),
|
exclude: PropTypes.arrayOf(PropTypes.string),
|
||||||
|
recent: PropTypes.arrayOf(PropTypes.string),
|
||||||
autoFocus: PropTypes.bool,
|
autoFocus: PropTypes.bool,
|
||||||
custom: PropTypes.arrayOf(
|
custom: PropTypes.arrayOf(
|
||||||
PropTypes.shape({
|
PropTypes.shape({
|
||||||
|
|
Loading…
Reference in New Issue