mirrors
/
emoji-mart-lazyload
mirror of https://github.com/mashirozx/emoji-mart.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename “displayNative” => “native” for consistency w/ Emoji props

nolan/hinaloe-test
Etienne Lemay 2017-02-17 10:13:59 -05:00
parent 6c2d1e4bf1
commit d8f094e455
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/picker.js
View File

@ -261,12 +261,12 @@ export default class Picker extends React.Component {
} }
render() { 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 { skin } = this.state
let width; let width;
if (displayNative) { if (native) {
width = (perLine * (emojiSize + 15)) + 17; width = (perLine * (emojiSize + 15)) + 17;
} else { } else {
width = (perLine * (emojiSize + 12)) + 12 + 2; width = (perLine * (emojiSize + 12)) + 12 + 2;
@ -301,7 +301,7 @@ export default class Picker extends React.Component {
hasStickyPosition={this.hasStickyPosition} hasStickyPosition={this.hasStickyPosition}
i18n={this.i18n} i18n={this.i18n}
emojiProps={{ emojiProps={{
native: displayNative, native: native,
skin: skin, skin: skin,
size: emojiSize, size: emojiSize,
set: set, set: set,
@ -321,7 +321,7 @@ export default class Picker extends React.Component {
title={title} title={title}
emoji={emoji} emoji={emoji}
emojiProps={{ emojiProps={{
native: displayNative, native: native,
size: 38, size: 38,
skin: skin, skin: skin,
set: set, set: set,
@ -348,11 +348,11 @@ Picker.propTypes = {
emoji: React.PropTypes.string, emoji: React.PropTypes.string,
color: React.PropTypes.string, color: React.PropTypes.string,
set: Emoji.propTypes.set, set: Emoji.propTypes.set,
backgroundImageFn: Emoji.propTypes.backgroundImageFn,
skin: Emoji.propTypes.skin, skin: Emoji.propTypes.skin,
native: React.PropTypes.bool,
backgroundImageFn: Emoji.propTypes.backgroundImageFn,
sheetSize: Emoji.propTypes.sheetSize, sheetSize: Emoji.propTypes.sheetSize,
emojisToShowFilter: React.PropTypes.func, emojisToShowFilter: React.PropTypes.func,
displayNative: React.PropTypes.bool,
} }
Picker.defaultProps = { Picker.defaultProps = {
@ -366,8 +366,8 @@ Picker.defaultProps = {
color: '#ae65c5', color: '#ae65c5',
set: Emoji.defaultProps.set, set: Emoji.defaultProps.set,
skin: Emoji.defaultProps.skin, skin: Emoji.defaultProps.skin,
native: Emoji.defaultProps.native,
sheetSize: Emoji.defaultProps.sheetSize, sheetSize: Emoji.defaultProps.sheetSize,
backgroundImageFn: Emoji.defaultProps.backgroundImageFn, backgroundImageFn: Emoji.defaultProps.backgroundImageFn,
emojisToShowFilter: (codePoint) => true, emojisToShowFilter: (codePoint) => true,
displayNative: false,
} }