Add language dropdown to compose in web UI (#18420)
parent
c3fac61f56
commit
0cdb077570
15 changed files with 513 additions and 16 deletions
@ -0,0 +1,12 @@ |
||||
import { saveSettings } from './settings'; |
||||
|
||||
export const LANGUAGE_USE = 'LANGUAGE_USE'; |
||||
|
||||
export const useLanguage = language => dispatch => { |
||||
dispatch({ |
||||
type: LANGUAGE_USE, |
||||
language, |
||||
}); |
||||
|
||||
dispatch(saveSettings()); |
||||
}; |
@ -0,0 +1,332 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import { injectIntl, defineMessages } from 'react-intl'; |
||||
import TextIconButton from './text_icon_button'; |
||||
import Overlay from 'react-overlays/lib/Overlay'; |
||||
import Motion from 'mastodon/features/ui/util/optional_motion'; |
||||
import spring from 'react-motion/lib/spring'; |
||||
import { supportsPassiveEvents } from 'detect-passive-events'; |
||||
import classNames from 'classnames'; |
||||
import { languages as preloadedLanguages } from 'mastodon/initial_state'; |
||||
import fuzzysort from 'fuzzysort'; |
||||
|
||||
const messages = defineMessages({ |
||||
changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' }, |
||||
search: { id: 'compose.language.search', defaultMessage: 'Search languages...' }, |
||||
clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' }, |
||||
}); |
||||
|
||||
// Copied from emoji-mart for consistency with emoji picker and since
|
||||
// they don't export the icons in the package
|
||||
const icons = { |
||||
loupe: ( |
||||
<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' width='13' height='13'> |
||||
<path d='M12.9 14.32a8 8 0 1 1 1.41-1.41l5.35 5.33-1.42 1.42-5.33-5.34zM8 14A6 6 0 1 0 8 2a6 6 0 0 0 0 12z' /> |
||||
</svg> |
||||
), |
||||
|
||||
delete: ( |
||||
<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' width='13' height='13'> |
||||
<path d='M10 8.586L2.929 1.515 1.515 2.929 8.586 10l-7.071 7.071 1.414 1.414L10 11.414l7.071 7.071 1.414-1.414L11.414 10l7.071-7.071-1.414-1.414L10 8.586z' /> |
||||
</svg> |
||||
), |
||||
}; |
||||
|
||||
const listenerOptions = supportsPassiveEvents ? { passive: true } : false; |
||||
|
||||
class LanguageDropdownMenu extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
style: PropTypes.object, |
||||
value: PropTypes.string.isRequired, |
||||
frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string).isRequired, |
||||
placement: PropTypes.string.isRequired, |
||||
onClose: PropTypes.func.isRequired, |
||||
onChange: PropTypes.func.isRequired, |
||||
languages: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)), |
||||
intl: PropTypes.object, |
||||
}; |
||||
|
||||
static defaultProps = { |
||||
languages: preloadedLanguages, |
||||
}; |
||||
|
||||
state = { |
||||
mounted: false, |
||||
searchValue: '', |
||||
}; |
||||
|
||||
handleDocumentClick = e => { |
||||
if (this.node && !this.node.contains(e.target)) { |
||||
this.props.onClose(); |
||||
} |
||||
} |
||||
|
||||
componentDidMount () { |
||||
document.addEventListener('click', this.handleDocumentClick, false); |
||||
document.addEventListener('touchend', this.handleDocumentClick, listenerOptions); |
||||
this.setState({ mounted: true }); |
||||
} |
||||
|
||||
componentWillUnmount () { |
||||
document.removeEventListener('click', this.handleDocumentClick, false); |
||||
document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions); |
||||
} |
||||
|
||||
setRef = c => { |
||||
this.node = c; |
||||
} |
||||
|
||||
setListRef = c => { |
||||
this.listNode = c; |
||||
} |
||||
|
||||
handleSearchChange = ({ target }) => { |
||||
this.setState({ searchValue: target.value }); |
||||
} |
||||
|
||||
search () { |
||||
const { languages, value, frequentlyUsedLanguages } = this.props; |
||||
const { searchValue } = this.state; |
||||
|
||||
if (searchValue === '') { |
||||
return [...languages].sort((a, b) => { |
||||
// Push current selection to the top of the list
|
||||
|
||||
if (a[0] === value) { |
||||
return -1; |
||||
} else if (b[0] === value) { |
||||
return 1; |
||||
} else { |
||||
// Sort according to frequently used languages
|
||||
|
||||
const indexOfA = frequentlyUsedLanguages.indexOf(a[0]); |
||||
const indexOfB = frequentlyUsedLanguages.indexOf(b[0]); |
||||
|
||||
return ((indexOfA > -1 ? indexOfA : Infinity) - (indexOfB > -1 ? indexOfB : Infinity)); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
return fuzzysort.go(searchValue, languages, { |
||||
keys: ['0', '1', '2'], |
||||
limit: 5, |
||||
threshold: -10000, |
||||
}).map(result => result.obj); |
||||
} |
||||
|
||||
frequentlyUsed () { |
||||
const { languages, value } = this.props; |
||||
const current = languages.find(lang => lang[0] === value); |
||||
const results = []; |
||||
|
||||
if (current) { |
||||
results.push(current); |
||||
} |
||||
|
||||
return results; |
||||
} |
||||
|
||||
handleClick = e => { |
||||
const value = e.currentTarget.getAttribute('data-index'); |
||||
|
||||
e.preventDefault(); |
||||
|
||||
this.props.onClose(); |
||||
this.props.onChange(value); |
||||
} |
||||
|
||||
handleKeyDown = e => { |
||||
const { onClose } = this.props; |
||||
const index = Array.from(this.listNode.childNodes).findIndex(node => node === e.currentTarget); |
||||
|
||||
let element = null; |
||||
|
||||
switch(e.key) { |
||||
case 'Escape': |
||||
onClose(); |
||||
break; |
||||
case 'Enter': |
||||
this.handleClick(e); |
||||
break; |
||||
case 'ArrowDown': |
||||
element = this.listNode.childNodes[index + 1] || this.listNode.firstChild; |
||||
break; |
||||
case 'ArrowUp': |
||||
element = this.listNode.childNodes[index - 1] || this.listNode.lastChild; |
||||
break; |
||||
case 'Tab': |
||||
if (e.shiftKey) { |
||||
element = this.listNode.childNodes[index - 1] || this.listNode.lastChild; |
||||
} else { |
||||
element = this.listNode.childNodes[index + 1] || this.listNode.firstChild; |
||||
} |
||||
break; |
||||
case 'Home': |
||||
element = this.listNode.firstChild; |
||||
break; |
||||
case 'End': |
||||
element = this.listNode.lastChild; |
||||
break; |
||||
} |
||||
|
||||
if (element) { |
||||
element.focus(); |
||||
e.preventDefault(); |
||||
e.stopPropagation(); |
||||
} |
||||
} |
||||
|
||||
handleSearchKeyDown = e => { |
||||
const { onChange, onClose } = this.props; |
||||
const { searchValue } = this.state; |
||||
|
||||
let element = null; |
||||
|
||||
switch(e.key) { |
||||
case 'Tab': |
||||
case 'ArrowDown': |
||||
element = this.listNode.firstChild; |
||||
|
||||
if (element) { |
||||
element.focus(); |
||||
e.preventDefault(); |
||||
e.stopPropagation(); |
||||
} |
||||
|
||||
break; |
||||
case 'Enter': |
||||
element = this.listNode.firstChild; |
||||
|
||||
if (element) { |
||||
onChange(element.getAttribute('data-index')); |
||||
onClose(); |
||||
} |
||||
break; |
||||
case 'Escape': |
||||
if (searchValue !== '') { |
||||
e.preventDefault(); |
||||
this.handleClear(); |
||||
} |
||||
|
||||
break; |
||||
} |
||||
} |
||||
|
||||
handleClear = () => { |
||||
this.setState({ searchValue: '' }); |
||||
} |
||||
|
||||
renderItem = lang => { |
||||
const { value } = this.props; |
||||
|
||||
return ( |
||||
<div key={lang[0]} role='option' tabIndex='0' data-index={lang[0]} className={classNames('language-dropdown__dropdown__results__item', { active: lang[0] === value })} aria-selected={lang[0] === value} onClick={this.handleClick} onKeyDown={this.handleKeyDown}> |
||||
<span className='language-dropdown__dropdown__results__item__native-name'>{lang[2]}</span> <span className='language-dropdown__dropdown__results__item__common-name'>({lang[1]})</span> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
render () { |
||||
const { style, placement, intl } = this.props; |
||||
const { mounted, searchValue } = this.state; |
||||
const isSearching = searchValue !== ''; |
||||
const results = this.search(); |
||||
|
||||
return ( |
||||
<Motion defaultStyle={{ opacity: 0, scaleX: 0.85, scaleY: 0.75 }} style={{ opacity: spring(1, { damping: 35, stiffness: 400 }), scaleX: spring(1, { damping: 35, stiffness: 400 }), scaleY: spring(1, { damping: 35, stiffness: 400 }) }}> |
||||
{({ opacity, scaleX, scaleY }) => ( |
||||
// It should not be transformed when mounting because the resulting
|
||||
// size will be used to determine the coordinate of the menu by
|
||||
// react-overlays
|
||||
<div className={`language-dropdown__dropdown ${placement}`} style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} ref={this.setRef}> |
||||
<div className='emoji-mart-search'> |
||||
<input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} autoFocus /> |
||||
<button className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? icons.loupe : icons.delete}</button> |
||||
</div> |
||||
|
||||
<div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}> |
||||
{results.map(this.renderItem)} |
||||
</div> |
||||
</div> |
||||
)} |
||||
</Motion> |
||||
); |
||||
} |
||||
|
||||
} |
||||
|
||||
export default @injectIntl |
||||
class LanguageDropdown extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
value: PropTypes.string, |
||||
frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string), |
||||
intl: PropTypes.object.isRequired, |
||||
onChange: PropTypes.func, |
||||
onClose: PropTypes.func, |
||||
}; |
||||
|
||||
state = { |
||||
open: false, |
||||
placement: 'bottom', |
||||
}; |
||||
|
||||
handleToggle = ({ target }) => { |
||||
const { top } = target.getBoundingClientRect(); |
||||
|
||||
if (this.state.open && this.activeElement) { |
||||
this.activeElement.focus({ preventScroll: true }); |
||||
} |
||||
|
||||
this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' }); |
||||
this.setState({ open: !this.state.open }); |
||||
} |
||||
|
||||
handleClose = () => { |
||||
const { value, onClose } = this.props; |
||||
|
||||
if (this.state.open && this.activeElement) { |
||||
this.activeElement.focus({ preventScroll: true }); |
||||
} |
||||
|
||||
this.setState({ open: false }); |
||||
onClose(value); |
||||
} |
||||
|
||||
handleChange = value => { |
||||
const { onChange } = this.props; |
||||
onChange(value); |
||||
} |
||||
|
||||
render () { |
||||
const { value, intl, frequentlyUsedLanguages } = this.props; |
||||
const { open, placement } = this.state; |
||||
|
||||
return ( |
||||
<div className={classNames('privacy-dropdown', { active: open })}> |
||||
<div className='privacy-dropdown__value'> |
||||
<TextIconButton |
||||
className='privacy-dropdown__value-icon' |
||||
label={value && value.toUpperCase()} |
||||
title={intl.formatMessage(messages.changeLanguage)} |
||||
active={open} |
||||
onClick={this.handleToggle} |
||||
/> |
||||
</div> |
||||
|
||||
<Overlay show={open} placement={placement} target={this}> |
||||
<LanguageDropdownMenu |
||||
value={value} |
||||
frequentlyUsedLanguages={frequentlyUsedLanguages} |
||||
onClose={this.handleClose} |
||||
onChange={this.handleChange} |
||||
placement={placement} |
||||
intl={intl} |
||||
/> |
||||
</Overlay> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
@ -0,0 +1,34 @@ |
||||
import { connect } from 'react-redux'; |
||||
import LanguageDropdown from '../components/language_dropdown'; |
||||
import { changeComposeLanguage } from 'mastodon/actions/compose'; |
||||
import { useLanguage } from 'mastodon/actions/languages'; |
||||
import { createSelector } from 'reselect'; |
||||
import { Map as ImmutableMap } from 'immutable'; |
||||
|
||||
const getFrequentlyUsedLanguages = createSelector([ |
||||
state => state.getIn(['settings', 'frequentlyUsedLanguages'], ImmutableMap()), |
||||
], languageCounters => ( |
||||
languageCounters.keySeq() |
||||
.sort((a, b) => languageCounters.get(a) - languageCounters.get(b)) |
||||
.reverse() |
||||
.toArray() |
||||
)); |
||||
|
||||
const mapStateToProps = state => ({ |
||||
frequentlyUsedLanguages: getFrequentlyUsedLanguages(state), |
||||
value: state.getIn(['compose', 'language']), |
||||
}); |
||||
|
||||
const mapDispatchToProps = dispatch => ({ |
||||
|
||||
onChange (value) { |
||||
dispatch(changeComposeLanguage(value)); |
||||
}, |
||||
|
||||
onClose (value) { |
||||
dispatch(useLanguage(value)); |
||||
}, |
||||
|
||||
}); |
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown); |
Loading…
Reference in new issue