Add emoji suggestions to CW and poll option fields (#10555)
* Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focusmaster
ThibG
6 years ago
committed by
Eugen Rochko
parent
62f5235b6f
commit
f2be71c293
@ -0,0 +1,229 @@ |
||||
import React from 'react'; |
||||
import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container'; |
||||
import AutosuggestEmoji from './autosuggest_emoji'; |
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import PropTypes from 'prop-types'; |
||||
import { isRtl } from '../rtl'; |
||||
import ImmutablePureComponent from 'react-immutable-pure-component'; |
||||
import classNames from 'classnames'; |
||||
import { List as ImmutableList } from 'immutable'; |
||||
|
||||
const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => { |
||||
let word; |
||||
|
||||
let left = str.slice(0, caretPosition).search(/\S+$/); |
||||
let right = str.slice(caretPosition).search(/\s/); |
||||
|
||||
if (right < 0) { |
||||
word = str.slice(left); |
||||
} else { |
||||
word = str.slice(left, right + caretPosition); |
||||
} |
||||
|
||||
if (!word || word.trim().length < 3 || searchTokens.indexOf(word[0]) === -1) { |
||||
return [null, null]; |
||||
} |
||||
|
||||
word = word.trim().toLowerCase(); |
||||
|
||||
if (word.length > 0) { |
||||
return [left + 1, word]; |
||||
} else { |
||||
return [null, null]; |
||||
} |
||||
}; |
||||
|
||||
export default class AutosuggestInput extends ImmutablePureComponent { |
||||
|
||||
static propTypes = { |
||||
value: PropTypes.string, |
||||
suggestions: ImmutablePropTypes.list, |
||||
disabled: PropTypes.bool, |
||||
placeholder: PropTypes.string, |
||||
onSuggestionSelected: PropTypes.func.isRequired, |
||||
onSuggestionsClearRequested: PropTypes.func.isRequired, |
||||
onSuggestionsFetchRequested: PropTypes.func.isRequired, |
||||
onChange: PropTypes.func.isRequired, |
||||
onKeyUp: PropTypes.func, |
||||
onKeyDown: PropTypes.func, |
||||
autoFocus: PropTypes.bool, |
||||
className: PropTypes.string, |
||||
id: PropTypes.string, |
||||
searchTokens: PropTypes.list, |
||||
maxLength: PropTypes.number, |
||||
}; |
||||
|
||||
static defaultProps = { |
||||
autoFocus: true, |
||||
searchTokens: ImmutableList(['@', ':', '#']), |
||||
}; |
||||
|
||||
state = { |
||||
suggestionsHidden: true, |
||||
focused: false, |
||||
selectedSuggestion: 0, |
||||
lastToken: null, |
||||
tokenStart: 0, |
||||
}; |
||||
|
||||
onChange = (e) => { |
||||
const [ tokenStart, token ] = textAtCursorMatchesToken(e.target.value, e.target.selectionStart, this.props.searchTokens); |
||||
|
||||
if (token !== null && this.state.lastToken !== token) { |
||||
this.setState({ lastToken: token, selectedSuggestion: 0, tokenStart }); |
||||
this.props.onSuggestionsFetchRequested(token); |
||||
} else if (token === null) { |
||||
this.setState({ lastToken: null }); |
||||
this.props.onSuggestionsClearRequested(); |
||||
} |
||||
|
||||
this.props.onChange(e); |
||||
} |
||||
|
||||
onKeyDown = (e) => { |
||||
const { suggestions, disabled } = this.props; |
||||
const { selectedSuggestion, suggestionsHidden } = this.state; |
||||
|
||||
if (disabled) { |
||||
e.preventDefault(); |
||||
return; |
||||
} |
||||
|
||||
if (e.which === 229 || e.isComposing) { |
||||
// Ignore key events during text composition
|
||||
// e.key may be a name of the physical key even in this case (e.x. Safari / Chrome on Mac)
|
||||
return; |
||||
} |
||||
|
||||
switch(e.key) { |
||||
case 'Escape': |
||||
if (suggestions.size === 0 || suggestionsHidden) { |
||||
document.querySelector('.ui').parentElement.focus(); |
||||
} else { |
||||
e.preventDefault(); |
||||
this.setState({ suggestionsHidden: true }); |
||||
} |
||||
|
||||
break; |
||||
case 'ArrowDown': |
||||
if (suggestions.size > 0 && !suggestionsHidden) { |
||||
e.preventDefault(); |
||||
this.setState({ selectedSuggestion: Math.min(selectedSuggestion + 1, suggestions.size - 1) }); |
||||
} |
||||
|
||||
break; |
||||
case 'ArrowUp': |
||||
if (suggestions.size > 0 && !suggestionsHidden) { |
||||
e.preventDefault(); |
||||
this.setState({ selectedSuggestion: Math.max(selectedSuggestion - 1, 0) }); |
||||
} |
||||
|
||||
break; |
||||
case 'Enter': |
||||
case 'Tab': |
||||
// Select suggestion
|
||||
if (this.state.lastToken !== null && suggestions.size > 0 && !suggestionsHidden) { |
||||
e.preventDefault(); |
||||
e.stopPropagation(); |
||||
this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestions.get(selectedSuggestion)); |
||||
} |
||||
|
||||
break; |
||||
} |
||||
|
||||
if (e.defaultPrevented || !this.props.onKeyDown) { |
||||
return; |
||||
} |
||||
|
||||
this.props.onKeyDown(e); |
||||
} |
||||
|
||||
onBlur = () => { |
||||
this.setState({ suggestionsHidden: true, focused: false }); |
||||
} |
||||
|
||||
onFocus = () => { |
||||
this.setState({ focused: true }); |
||||
} |
||||
|
||||
onSuggestionClick = (e) => { |
||||
const suggestion = this.props.suggestions.get(e.currentTarget.getAttribute('data-index')); |
||||
e.preventDefault(); |
||||
this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion); |
||||
this.input.focus(); |
||||
} |
||||
|
||||
componentWillReceiveProps (nextProps) { |
||||
if (nextProps.suggestions !== this.props.suggestions && nextProps.suggestions.size > 0 && this.state.suggestionsHidden && this.state.focused) { |
||||
this.setState({ suggestionsHidden: false }); |
||||
} |
||||
} |
||||
|
||||
setInput = (c) => { |
||||
this.input = c; |
||||
} |
||||
|
||||
renderSuggestion = (suggestion, i) => { |
||||
const { selectedSuggestion } = this.state; |
||||
let inner, key; |
||||
|
||||
if (typeof suggestion === 'object') { |
||||
inner = <AutosuggestEmoji emoji={suggestion} />; |
||||
key = suggestion.id; |
||||
} else if (suggestion[0] === '#') { |
||||
inner = suggestion; |
||||
key = suggestion; |
||||
} else { |
||||
inner = <AutosuggestAccountContainer id={suggestion} />; |
||||
key = suggestion; |
||||
} |
||||
|
||||
return ( |
||||
<div role='button' tabIndex='0' key={key} data-index={i} className={classNames('autosuggest-textarea__suggestions__item', { selected: i === selectedSuggestion })} onMouseDown={this.onSuggestionClick}> |
||||
{inner} |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
render () { |
||||
const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, className, id, maxLength } = this.props; |
||||
const { suggestionsHidden } = this.state; |
||||
const style = { direction: 'ltr' }; |
||||
|
||||
if (isRtl(value)) { |
||||
style.direction = 'rtl'; |
||||
} |
||||
|
||||
return ( |
||||
<div className='autosuggest-input'> |
||||
<label> |
||||
<span style={{ display: 'none' }}>{placeholder}</span> |
||||
|
||||
<input |
||||
type='text' |
||||
ref={this.setInput} |
||||
disabled={disabled} |
||||
placeholder={placeholder} |
||||
autoFocus={autoFocus} |
||||
value={value} |
||||
onChange={this.onChange} |
||||
onKeyDown={this.onKeyDown} |
||||
onKeyUp={onKeyUp} |
||||
onFocus={this.onFocus} |
||||
onBlur={this.onBlur} |
||||
style={style} |
||||
aria-autocomplete='list' |
||||
id={id} |
||||
className={className} |
||||
maxLength={maxLength} |
||||
/> |
||||
</label> |
||||
|
||||
<div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}> |
||||
{suggestions.map(this.renderSuggestion)} |
||||
</div> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue