treehouse
/
emoji-mart-lazyload
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support inline picker style

release
Etienne Lemay 2016-07-11 14:08:41 -04:00
parent f9053d21bb
commit 042c381d3e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/picker.js
View File

@ -187,11 +187,11 @@ export default class Picker extends React.Component {
} }
render() { render() {
var { perLine, emojiSize, sheetURL } = this.props, var { perLine, emojiSize, sheetURL, style } = this.props,
{ skin } = this.state, { skin } = this.state,
width = (perLine * (emojiSize + 12)) + 12 + 2 width = (perLine * (emojiSize + 12)) + 12 + 2
return <div style={{width: width}} className='emoji-picker'> return <div style={{...style, width: width}} className='emoji-picker'>
<div className='emoji-picker-bar'> <div className='emoji-picker-bar'>
<Anchors <Anchors
ref='anchors' ref='anchors'
@ -248,6 +248,7 @@ Picker.propTypes = {
skin: React.PropTypes.number, skin: React.PropTypes.number,
perLine: React.PropTypes.number, perLine: React.PropTypes.number,
emojiSize: React.PropTypes.number, emojiSize: React.PropTypes.number,
style: React.PropTypes.object,
sheetURL: React.PropTypes.string.isRequired, sheetURL: React.PropTypes.string.isRequired,
} }
@ -255,5 +256,6 @@ Picker.defaultProps = {
onClick: (() => {}), onClick: (() => {}),
emojiSize: 24, emojiSize: 24,
perLine: 9, perLine: 9,
style: {},
skin: 1, skin: 1,
} }