From d8f094e4550b66acb569f0e3d716b1a778101614 Mon Sep 17 00:00:00 2001 From: Etienne Lemay Date: Fri, 17 Feb 2017 10:13:59 -0500 Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=9CdisplayNative=E2=80=9D=20=3D>?= =?UTF-8?q?=20=E2=80=9Cnative=E2=80=9D=20for=20consistency=20w/=20Emoji=20?= =?UTF-8?q?props?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/picker.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/picker.js b/src/components/picker.js index c19c7a0..4bdf323 100644 --- a/src/components/picker.js +++ b/src/components/picker.js @@ -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, }