Honor perLine with for real

Signed-off-by: Chad Wagner <cwagner@pivotal.io>
release
Thomas Osugi 2017-02-01 12:01:14 -07:00 committed by Etienne Lemay
parent 8e6c393ab7
commit 6c2d1e4bf1
1 changed files with 9 additions and 2 deletions

View File

@ -262,8 +262,15 @@ export default class Picker extends React.Component {
render() {
var { perLine, emojiSize, set, sheetSize, style, title, emoji, color, backgroundImageFn, emojisToShowFilter, displayNative } = this.props,
{ skin } = this.state,
width = (perLine * (emojiSize + 12)) + 12 + 2
{ skin } = this.state
let width;
if (displayNative) {
width = (perLine * (emojiSize + 15)) + 17;
} else {
width = (perLine * (emojiSize + 12)) + 12 + 2;
}
return <div style={{width: width, ...style}} className='emoji-mart'>
<div className='emoji-mart-bar'>