diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-06 04:21:04 +0800 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-05 16:21:04 -0400 |
commit | 81a893b556bbd4e5a73dd41b3dad92915cb06119 (patch) | |
tree | f455a019b374d619be4d88e4ddb1398d9864689d /webapp/components/emoji_picker/emoji_picker.jsx | |
parent | 4efb0f37b701aa8e875e541cc4f121c264e4d8ab (diff) | |
download | chat-81a893b556bbd4e5a73dd41b3dad92915cb06119.tar.gz chat-81a893b556bbd4e5a73dd41b3dad92915cb06119.tar.bz2 chat-81a893b556bbd4e5a73dd41b3dad92915cb06119.zip |
fix position of emoji picker (#6837)
Diffstat (limited to 'webapp/components/emoji_picker/emoji_picker.jsx')
-rw-r--r-- | webapp/components/emoji_picker/emoji_picker.jsx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/webapp/components/emoji_picker/emoji_picker.jsx b/webapp/components/emoji_picker/emoji_picker.jsx index 2a5b84747..a047c1277 100644 --- a/webapp/components/emoji_picker/emoji_picker.jsx +++ b/webapp/components/emoji_picker/emoji_picker.jsx @@ -31,11 +31,18 @@ const CATEGORIES = [ export default class EmojiPicker extends React.Component { static propTypes = { style: PropTypes.object, + rightOffset: PropTypes.number, + topOffset: PropTypes.number, placement: PropTypes.oneOf(['top', 'bottom', 'left']), customEmojis: PropTypes.object, onEmojiClick: PropTypes.func.isRequired } + static defaultProps = { + rightOffset: 0, + topOffset: 0 + }; + constructor(props) { super(props); @@ -299,13 +306,17 @@ export default class EmojiPicker extends React.Component { pickerStyle = { top: this.props.style.top, bottom: this.props.style.bottom, - right: 1 + right: this.props.rightOffset }; } else { pickerStyle = this.props.style; } } + if (pickerStyle && pickerStyle.top) { + pickerStyle.top += this.props.topOffset; + } + return ( <div className='emoji-picker' |