Исправлен placeholder для поля поиска языка

Добавлен автофокус при открытии попапа
Добавлена адаптивность для переключателя языка
This commit is contained in:
ErickSkrauch 2017-12-16 03:36:39 +03:00
parent ddd5ddab2e
commit e2c8471ce2
3 changed files with 26 additions and 11 deletions

View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import { FormattedMessage as Message } from 'react-intl'; import { FormattedMessage as Message, intlShape } from 'react-intl';
import { requireLocaleFlag } from 'functions'; import { requireLocaleFlag } from 'functions';
import LANGS from 'i18n/index.json'; import LANGS from 'i18n/index.json';
@ -13,6 +13,8 @@ import icons from 'components/ui/icons.scss';
import styles from './languageSwitcher.scss'; import styles from './languageSwitcher.scss';
import messages from './languageSwitcher.intl.json'; import messages from './languageSwitcher.intl.json';
const improveTranslationUrl = 'http://ely.by/erickskrauch/posts/174943';
class LanguageSwitcher extends Component { class LanguageSwitcher extends Component {
static displayName = 'LanguageSwitcher'; static displayName = 'LanguageSwitcher';
@ -22,6 +24,10 @@ class LanguageSwitcher extends Component {
changeLang: PropTypes.func, changeLang: PropTypes.func,
}; };
static contextTypes = {
intl: intlShape.isRequired,
};
state = { state = {
items: [], items: [],
filter: '', filter: '',
@ -56,15 +62,10 @@ class LanguageSwitcher extends Component {
formStyles.lightTextField, formStyles.lightTextField,
formStyles.greenTextField formStyles.greenTextField
)} )}
placeholder={ placeholder={this.context.intl.formatMessage(messages.startTyping)}
<Message {...messages.startTyping}>
{(placeholder) => (
{placeholder}
)}
</Message>
}
onChange={this.onFilterUpdate()} onChange={this.onFilterUpdate()}
onKeyPress={this.onFilterKeyPress()} onKeyPress={this.onFilterKeyPress()}
autoFocus
/> />
<span className={styles.searchIcon} /> <span className={styles.searchIcon} />
</div> </div>
@ -89,7 +90,7 @@ class LanguageSwitcher extends Component {
<div className={styles.improveTranslatesText}> <div className={styles.improveTranslatesText}>
<Message {...messages.improveTranslatesDescription} values={{ <Message {...messages.improveTranslatesDescription} values={{
articleLink: ( articleLink: (
<a href="#"> <a href={improveTranslationUrl} target="_blank">
<Message {...messages.improveTranslatesArticleLink} /> <Message {...messages.improveTranslatesArticleLink} />
</a> </a>
) )
@ -184,7 +185,7 @@ class LanguageSwitcher extends Component {
this.changeLang(locales[0]); this.changeLang(locales[0]);
}; };
}; }
} }
import { connect } from 'react-redux'; import { connect } from 'react-redux';

View File

@ -13,7 +13,11 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
max-height: 550px; max-height: calc(100vh - 132px);
@media screen and (min-height: 630px) {
max-height: 500px;
}
} }
.searchBox { .searchBox {
@ -135,6 +139,12 @@ $languageListBorderStyle: 1px solid #eee;
padding: 10px; padding: 10px;
display: flex; display: flex;
flex-shrink: 0; flex-shrink: 0;
@media screen and (max-height: 455px) {
& {
display: none;
}
}
} }
.improveTranslatesIcon { .improveTranslatesIcon {

View File

@ -2799,6 +2799,10 @@ find-up@^1.0.0:
path-exists "^2.0.0" path-exists "^2.0.0"
pinkie-promise "^2.0.0" pinkie-promise "^2.0.0"
flag-icon-css@^2.8.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/flag-icon-css/-/flag-icon-css-2.9.0.tgz#5793c15244e3c63ae36631478a758a3fc29c86be"
flat-cache@^1.2.1: flat-cache@^1.2.1:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"