diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-07 19:25:26 -0400 |
---|---|---|
committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-08 07:25:26 +0800 |
commit | 0bb4add8a17fc1b0984094cf48da711b68a26d55 (patch) | |
tree | 059616ff582613477dffa6aeaa20efd785356c3a /webapp/components/emoji_picker/emoji_picker.jsx | |
parent | 15ad24d160cb4604d0605ebbfa53d11a57820706 (diff) | |
download | chat-0bb4add8a17fc1b0984094cf48da711b68a26d55.tar.gz chat-0bb4add8a17fc1b0984094cf48da711b68a26d55.tar.bz2 chat-0bb4add8a17fc1b0984094cf48da711b68a26d55.zip |
PLT-6999 Stopped mutating style object provided by react-bootstrap (#6869)
* PLT-6999 Stopped mutating style object provided by react-bootstrap
* Fixed indentation to satisfy eslint
Diffstat (limited to 'webapp/components/emoji_picker/emoji_picker.jsx')
-rw-r--r-- | webapp/components/emoji_picker/emoji_picker.jsx | 102 |
1 files changed, 61 insertions, 41 deletions
diff --git a/webapp/components/emoji_picker/emoji_picker.jsx b/webapp/components/emoji_picker/emoji_picker.jsx index a047c1277..0d9b34176 100644 --- a/webapp/components/emoji_picker/emoji_picker.jsx +++ b/webapp/components/emoji_picker/emoji_picker.jsx @@ -309,7 +309,7 @@ export default class EmojiPicker extends React.Component { right: this.props.rightOffset }; } else { - pickerStyle = this.props.style; + pickerStyle = {...this.props.style}; } } @@ -325,91 +325,111 @@ export default class EmojiPicker extends React.Component { <div className='emoji-picker__categories'> <EmojiPickerCategory category='recent' - icon={<i - className='fa fa-clock-o' - title={Utils.localizeMessage('emoji_picker.recent', 'Recently Used')} - />} + icon={ + <i + className='fa fa-clock-o' + title={Utils.localizeMessage('emoji_picker.recent', 'Recently Used')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'recent'} /> <EmojiPickerCategory category='people' - icon={<i - className='fa fa-smile-o' - title={Utils.localizeMessage('emoji_picker.people', 'People')} - />} + icon={ + <i + className='fa fa-smile-o' + title={Utils.localizeMessage('emoji_picker.people', 'People')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'people'} /> <EmojiPickerCategory category='nature' - icon={<i - className='fa fa-leaf' - title={Utils.localizeMessage('emoji_picker.nature', 'Nature')} - />} + icon={ + <i + className='fa fa-leaf' + title={Utils.localizeMessage('emoji_picker.nature', 'Nature')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'nature'} /> <EmojiPickerCategory category='food' - icon={<i - className='fa fa-cutlery' - title={Utils.localizeMessage('emoji_picker.food', 'Food')} - />} + icon={ + <i + className='fa fa-cutlery' + title={Utils.localizeMessage('emoji_picker.food', 'Food')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'food'} /> <EmojiPickerCategory category='activity' - icon={<i - className='fa fa-futbol-o' - title={Utils.localizeMessage('emoji_picker.activity', 'Activity')} - />} + icon={ + <i + className='fa fa-futbol-o' + title={Utils.localizeMessage('emoji_picker.activity', 'Activity')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'activity'} /> <EmojiPickerCategory category='travel' - icon={<i - className='fa fa-plane' - title={Utils.localizeMessage('emoji_picker.travel', 'Travel')} - />} + icon={ + <i + className='fa fa-plane' + title={Utils.localizeMessage('emoji_picker.travel', 'Travel')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'travel'} /> <EmojiPickerCategory category='objects' - icon={<i - className='fa fa-lightbulb-o' - title={Utils.localizeMessage('emoji_picker.objects', 'Objects')} - />} + icon={ + <i + className='fa fa-lightbulb-o' + title={Utils.localizeMessage('emoji_picker.objects', 'Objects')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'objects'} /> <EmojiPickerCategory category='symbols' - icon={<i - className='fa fa-heart-o' - title={Utils.localizeMessage('emoji_picker.symbols', 'Symbols')} - />} + icon={ + <i + className='fa fa-heart-o' + title={Utils.localizeMessage('emoji_picker.symbols', 'Symbols')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'symbols'} /> <EmojiPickerCategory category='flags' - icon={<i - className='fa fa-flag-o' - title={Utils.localizeMessage('emoji_picker.flags', 'Flags')} - />} + icon={ + <i + className='fa fa-flag-o' + title={Utils.localizeMessage('emoji_picker.flags', 'Flags')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'flags'} /> <EmojiPickerCategory category='custom' - icon={<i - className='fa fa-at' - title={Utils.localizeMessage('emoji_picker.custom', 'Custom')} - />} + icon={ + <i + className='fa fa-at' + title={Utils.localizeMessage('emoji_picker.custom', 'Custom')} + /> + } onCategoryClick={this.handleCategoryClick} selected={this.state.category === 'custom'} /> |