Ticket 4665 - Emoji Picker (#5157)
* #4665 Added EmojiPicker Work primarily by @broernr-de and @harrison on pre-release.mattermost.com * Final fixes to handle custom emojis from internal review and single merge error * ESLint fixes * CSS changes and other code to support emoji picker in reply window * Fix for file upload and emoji picker icon positions on post and comment. RHS emoji picker appearing see-through at this time. * Fix for two ESLint issues. * covered most of feedback: RHS emoji picker looks correct color-wise RHS emoji picker dynamically positions against height of thread size (post + reply messages) escape closes emoji window search box focused on open ESLint fixes against other files oversized emoji preview fixes * Adding in 'outside click' eventing to dismiss the emoji window * Changing some formatting to fix mismatch between my local eslant rules and jenkins. * adding alternative import method due to downstream testing errors * yet another attempt to retain functionality and pass tests - skipping import of browser store * fix for feedback items 5 and 7: * move search to float on top with stylistic changes * whitespace in the header (+1 squashed commit) Squashed commits: [6a26d32] changes that address items 1, 2, 6, 8, and 9 of latest feedback * Fix for attachment preview location on mobile * Fix for latest rounds of feedback * fixing eslint issue * making emojipicker sprite based, fixing alignments * Fix for emoji quality, fixing some behavior (hover background and cursor settings) undoing config changes * Preview feature for emojis * Adjustments to config file, and changing layout/design of attachment and emoji icon. * manual revert from master branch for config.json * reverting paperclip and fixing alignments. Additionally fixing inadvertent display of picker on mobile. * CSS changes to try to fix the hover behavior - currently working for emoji picker (when enabled), but hover for attachment isn't working * Made suggested changes by jwilander except for jQuery removal * Adding hover for both icons * removal of some usages of jQuery * Fix for two layout issues on IE11/Edge * UI improvements for emoji picker * Fix for many minor display issues * fix for additional appearance items * fix to two minor UI items * A little extra padding for IE11 * fix for IE11 scroll issue, and removing align attribute on img tag which was throwing js error * fixes some display issues on firefox * fix for uneven sides of emojis * fix for eslint issues that I didn't introduce * fix for missing bottom edge of RHS emojipicker. also fixing text overlapping icons on text area (including RHS) * Update "emoji selector" to "emoji picker" * changes for code review - removal of ..getDOMNode - use sprite imagery for emoji preview - remove lastBlurAt from state as it wasn't used * fixes for: - fake custom emoji preview in picker - RHS scrollbar on preview * fix for minor alignment of preview emoji
Этот коммит содержится в:
коммит произвёл
Jason Blais
родитель
d0af931e6e
Коммит
28ad645153
@@ -49,6 +49,7 @@ class FileUpload extends React.Component {
|
||||
this.pasteUpload = this.pasteUpload.bind(this);
|
||||
this.keyUpload = this.keyUpload.bind(this);
|
||||
this.handleMaxUploadReached = this.handleMaxUploadReached.bind(this);
|
||||
this.emojiClick = this.emojiClick.bind(this);
|
||||
|
||||
this.state = {
|
||||
requests: {}
|
||||
@@ -210,7 +211,9 @@ class FileUpload extends React.Component {
|
||||
// jquery-dragster doesn't provide a function to unregister itself so do it manually
|
||||
target.off('dragenter dragleave dragover drop dragster:enter dragster:leave dragster:over dragster:drop');
|
||||
}
|
||||
|
||||
emojiClick() {
|
||||
this.props.onEmojiClick();
|
||||
}
|
||||
pasteUpload(e) {
|
||||
var inputDiv = ReactDOM.findDOMNode(this.refs.input);
|
||||
const {formatMessage} = this.props.intl;
|
||||
@@ -347,24 +350,33 @@ class FileUpload extends React.Component {
|
||||
const channelId = this.props.channelId || ChannelStore.getCurrentId();
|
||||
|
||||
const uploadsRemaining = Constants.MAX_UPLOAD_FILES - this.props.getFileCount(channelId);
|
||||
const emojiSpan = (<span
|
||||
className={'fa fa-smile-o icon--emoji-picker emoji-' + this.props.navBarName}
|
||||
onClick={this.emojiClick}
|
||||
/>);
|
||||
const filestyle = {visibility: 'hidden'};
|
||||
|
||||
return (
|
||||
<span
|
||||
ref='input'
|
||||
className={'btn btn-file' + (uploadsRemaining <= 0 ? ' btn-file__disabled' : '')}
|
||||
>
|
||||
<span
|
||||
className='icon'
|
||||
dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}}
|
||||
/>
|
||||
<input
|
||||
ref='fileInput'
|
||||
type='file'
|
||||
onChange={this.handleChange}
|
||||
onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached}
|
||||
multiple={multiple}
|
||||
accept={accept}
|
||||
/>
|
||||
<div className='icon--attachment'>
|
||||
<span
|
||||
dangerouslySetInnerHTML={{__html: Constants.ATTACHMENT_ICON_SVG}}
|
||||
onClick={() => this.refs.fileInput.click()}
|
||||
/>
|
||||
<input
|
||||
ref='fileInput'
|
||||
type='file'
|
||||
style={filestyle}
|
||||
onChange={this.handleChange}
|
||||
onClick={uploadsRemaining > 0 ? this.props.onClick : this.handleMaxUploadReached}
|
||||
multiple={multiple}
|
||||
accept={accept}
|
||||
/>
|
||||
</div>
|
||||
{this.props.emojiEnabled ? emojiSpan : ''}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
@@ -380,7 +392,10 @@ FileUpload.propTypes = {
|
||||
onFileUploadChange: React.PropTypes.func,
|
||||
onTextDrop: React.PropTypes.func,
|
||||
channelId: React.PropTypes.string,
|
||||
postType: React.PropTypes.string
|
||||
postType: React.PropTypes.string,
|
||||
onEmojiClick: React.PropTypes.func,
|
||||
navBarName: React.PropTypes.string,
|
||||
emojiEnabled: React.PropTypes.bool
|
||||
};
|
||||
|
||||
export default injectIntl(FileUpload, {withRef: true});
|
||||
|
||||
Ссылка в новой задаче
Block a user