ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2024-11-14 20:25:56 +05:30
Code Issues Packages Projects Releases Wiki Activity

#106: recalculate form height, after lang changed

Browse Source
This commit is contained in:
SleepWalker 2016-05-28 00:36:10 +03:00
parent 61534b069b
commit 0816e7a848
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/auth/PanelTransition.jsx
View File

@ -316,7 +316,7 @@ class PanelTransition extends Component {
}
shouldMeasureHeight() {
return '' + this.props.auth.error + this.state.isHeightDirty;
return '' + this.props.auth.error + this.state.isHeightDirty + this.props.user.lang;
}
getHeader({key, style, data}) {

3
src/components/profile/changeEmail/ChangeEmail.jsx
View File

@ -22,6 +22,7 @@ export default class ChangeEmail extends Component {
static propTypes = {
onChangeStep: PropTypes.func,
lang: PropTypes.string.isRequired,
email: PropTypes.string.isRequired,
stepForms: PropTypes.arrayOf((propValue, key, componentName, location, propFullName) => {
if (propValue.length !== 3) {
@ -161,7 +162,7 @@ export default class ChangeEmail extends Component {
<MeasureHeight
className={changeEmail.stepForm}
onMeasure={this.onStepMeasure(step)}
state={`${step}.${form.hasErrors()}`}
state={`${step}.${form.hasErrors()}.${this.props.lang}`}
key={step}
>
{this[`renderStep${step}`]({

5
src/components/ui/form/Form.jsx
View File

@ -52,8 +52,9 @@ export default class Form extends Component {
});
}
if (nextProps.form && nextProps.form !== this.props.form) {
throw new Error('The FormModel instance should not be changed during component lifetime');
if (nextProps.form && this.props.form && nextProps.form !== this.props.form) {
this.props.form.removeLoadingListener(this.onLoading);
nextProps.form.addLoadingListener(this.onLoading);
}
}

10
src/components/ui/form/FormModel.js
View File

@ -105,10 +105,16 @@ export default class FormModel {
}
beginLoading() {
this.handlers.forEach((fn) => fn(true));
this._isLoading = true;
this.notifyHandlers();
}
endLoading() {
this.handlers.forEach((fn) => fn(false));
this._isLoading = false;
this.notifyHandlers();
}
notifyHandlers() {
this.handlers.forEach((fn) => fn(this._isLoading));
}
}

5
src/pages/profile/ChangeEmailPage.jsx
View File

@ -9,6 +9,7 @@ class ChangeEmailPage extends Component {
static propTypes = {
email: PropTypes.string.isRequired,
lang: PropTypes.string.isRequired,
params: PropTypes.shape({
step: PropTypes.oneOf(['step1', 'step2', 'step3']),
code: PropTypes.string
@ -40,6 +41,7 @@ class ChangeEmailPage extends Component {
<ChangeEmail
onSubmit={this.onSubmit}
email={this.props.email}
lang={this.props.lang}
step={step.slice(-1) * 1 - 1}
onChangeStep={this.onChangeStep}
code={code}
@ -98,6 +100,7 @@ function handleErrors(repeatUrl) {
import { connect } from 'react-redux';
export default connect((state) => ({
email: state.user.email
email: state.user.email,
lang: state.user.lang
}), {
})(ChangeEmailPage);