Rename “displayNative” => “native” for consistency w/ Emoji props
parent
6c2d1e4bf1
commit
d8f094e455
|
@ -261,12 +261,12 @@ export default class Picker extends React.Component {
|
|||
}
|
||||
|
||||
render() {
|
||||
var { perLine, emojiSize, set, sheetSize, style, title, emoji, color, backgroundImageFn, emojisToShowFilter, displayNative } = this.props,
|
||||
var { perLine, emojiSize, set, sheetSize, style, title, emoji, color, native, backgroundImageFn, emojisToShowFilter } = this.props,
|
||||
{ skin } = this.state
|
||||
|
||||
let width;
|
||||
|
||||
if (displayNative) {
|
||||
if (native) {
|
||||
width = (perLine * (emojiSize + 15)) + 17;
|
||||
} else {
|
||||
width = (perLine * (emojiSize + 12)) + 12 + 2;
|
||||
|
@ -301,7 +301,7 @@ export default class Picker extends React.Component {
|
|||
hasStickyPosition={this.hasStickyPosition}
|
||||
i18n={this.i18n}
|
||||
emojiProps={{
|
||||
native: displayNative,
|
||||
native: native,
|
||||
skin: skin,
|
||||
size: emojiSize,
|
||||
set: set,
|
||||
|
@ -321,7 +321,7 @@ export default class Picker extends React.Component {
|
|||
title={title}
|
||||
emoji={emoji}
|
||||
emojiProps={{
|
||||
native: displayNative,
|
||||
native: native,
|
||||
size: 38,
|
||||
skin: skin,
|
||||
set: set,
|
||||
|
@ -348,11 +348,11 @@ Picker.propTypes = {
|
|||
emoji: React.PropTypes.string,
|
||||
color: React.PropTypes.string,
|
||||
set: Emoji.propTypes.set,
|
||||
backgroundImageFn: Emoji.propTypes.backgroundImageFn,
|
||||
skin: Emoji.propTypes.skin,
|
||||
native: React.PropTypes.bool,
|
||||
backgroundImageFn: Emoji.propTypes.backgroundImageFn,
|
||||
sheetSize: Emoji.propTypes.sheetSize,
|
||||
emojisToShowFilter: React.PropTypes.func,
|
||||
displayNative: React.PropTypes.bool,
|
||||
}
|
||||
|
||||
Picker.defaultProps = {
|
||||
|
@ -366,8 +366,8 @@ Picker.defaultProps = {
|
|||
color: '#ae65c5',
|
||||
set: Emoji.defaultProps.set,
|
||||
skin: Emoji.defaultProps.skin,
|
||||
native: Emoji.defaultProps.native,
|
||||
sheetSize: Emoji.defaultProps.sheetSize,
|
||||
backgroundImageFn: Emoji.defaultProps.backgroundImageFn,
|
||||
emojisToShowFilter: (codePoint) => true,
|
||||
displayNative: false,
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue