From 8501430387946b1ec8bf5409f34e14b98ac00d72 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Mon, 28 Mar 2016 06:46:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D1=8B=D1=81=D0=BE=D1=82=D1=8B=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=B2=20=D1=82=D0=BE=D0=BC=20?= =?UTF-8?q?=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5,=20=D0=B5=D1=81=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D1=80=D0=B0=D0=BD=D1=8C=D1=88=D0=B5?= =?UTF-8?q?=20=D1=87=D0=B5=D0=BC=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/MeasureHeight.js | 1 + src/components/auth/PanelTransition.jsx | 80 +++++++++---------- src/components/auth/activation/Activation.jsx | 1 + .../auth/changePassword/ChangePassword.jsx | 1 + .../auth/forgotPassword/ForgotPassword.jsx | 15 ++-- src/components/auth/login/Login.jsx | 1 + src/components/auth/password/Password.jsx | 15 ++-- .../auth/permissions/Permissions.jsx | 1 + src/components/auth/register/Register.jsx | 1 + 9 files changed, 60 insertions(+), 56 deletions(-) diff --git a/src/components/auth/MeasureHeight.js b/src/components/auth/MeasureHeight.js index abc3335..4649eb6 100644 --- a/src/components/auth/MeasureHeight.js +++ b/src/components/auth/MeasureHeight.js @@ -2,6 +2,7 @@ import React, { Component, PropTypes } from 'react'; import ReactDOM from 'react-dom'; export default class MeasureHeight extends Component { + static displayName = 'MeasureHeight'; static propTypes = { shouldMeasure: PropTypes.func, onMeasure: PropTypes.func diff --git a/src/components/auth/PanelTransition.jsx b/src/components/auth/PanelTransition.jsx index cd09751..d87204f 100644 --- a/src/components/auth/PanelTransition.jsx +++ b/src/components/auth/PanelTransition.jsx @@ -37,7 +37,6 @@ class PanelTransition extends Component { reject: React.PropTypes.func.isRequired, // local props - path: PropTypes.string.isRequired, Title: PropTypes.element, Body: PropTypes.element, Footer: PropTypes.element, @@ -59,6 +58,10 @@ class PanelTransition extends Component { reject: PropTypes.func }; + state = { + contextHeight: 0 + }; + getChildContext() { return { auth: this.props.auth, @@ -69,23 +72,18 @@ class PanelTransition extends Component { }; } - state = { - contextHeight: 0 - }; - componentWillReceiveProps(nextProps) { - var nextPath = nextProps.path; - var previousPath = this.props.path; + const nextPanel = nextProps.Body && nextProps.Body.type.panelId; + const previousPanel = this.props.Body && this.props.Body.type.panelId; - if (nextPath !== previousPath) { - var direction = this.getDirection(nextPath, previousPath); - var forceHeight = direction === 'Y' && nextPath !== previousPath ? 1 : 0; + if (nextPanel !== previousPanel) { + const direction = this.getDirection(nextPanel, previousPanel); + const forceHeight = direction === 'Y' && nextPanel !== previousPanel ? 1 : 0; this.props.clearErrors(); this.setState({ direction, - forceHeight, - previousPath + forceHeight }); if (forceHeight) { @@ -99,9 +97,7 @@ class PanelTransition extends Component { render() { const {canAnimateHeight, contextHeight, forceHeight} = this.state; - const {path, Title, Body, Footer, Links} = this.props; - - const formHeight = this.state[`formHeight${path}`] || 0; + const {Title, Body, Footer, Links} = this.props; if (this.props.children) { return this.props.children; @@ -109,10 +105,15 @@ class PanelTransition extends Component { throw new Error('Title, Body, Footer and Links are required'); } + const panelId = Body.type.panelId; + const hasGoBack = Body.type.hasGoBack; + + const formHeight = this.state[`formHeight${panelId}`] || 0; + return ( +
{panels.map((config) => this.getHeader(config))} @@ -193,13 +194,13 @@ class PanelTransition extends Component { const {isLeave = false} = options; const map = { - '/login': -1, - '/register': -1, - '/password': 1, - '/activation': 1, - '/oauth/permissions': -1, - '/change-password': 1, - '/forgot-password': 1 + login: -1, + register: -1, + password: 1, + activation: 1, + permissions: -1, + changePassword: 1, + forgotPassword: 1 }; const sign = map[key]; @@ -212,16 +213,16 @@ class PanelTransition extends Component { } getDirection(next, prev) { - var not = (path) => prev !== path && next !== path; + const not = (panelId) => prev !== panelId && next !== panelId; - var map = { - '/login': not('/password') && not('/forgot-password') ? 'Y' : 'X', - '/password': not('/login') && not('/forgot-password') ? 'Y' : 'X', - '/register': not('/activation') ? 'Y' : 'X', - '/activation': not('/register') ? 'Y' : 'X', - '/oauth/permissions': 'Y', - '/change-password': 'Y', - '/forgot-password': not('/password') && not('/login') ? 'Y' : 'X' + const map = { + login: not('password') && not('forgotPassword') ? 'Y' : 'X', + password: not('login') && not('forgotPassword') ? 'Y' : 'X', + register: not('activation') ? 'Y' : 'X', + activation: not('register') ? 'Y' : 'X', + permissions: 'Y', + changePassword: 'Y', + forgotPassword: not('password') && not('login') ? 'Y' : 'X' }; return map[next]; @@ -232,7 +233,7 @@ class PanelTransition extends Component { // we need to skip first render, because there is no panel to make transition from // const canAnimateHeight = Object.keys(this.state.height).length > 1 || this.state[heightKey]; - const canAnimateHeight = true; + const canAnimateHeight = true; // NOTE: lets try to always animate this.setState({ canAnimateHeight, @@ -276,7 +277,7 @@ class PanelTransition extends Component { ); return ( -
+
{hasBackButton ? backButton : null}
{Title} @@ -306,7 +307,7 @@ class PanelTransition extends Component { return ( this.onUpdateHeight(height, key)} @@ -326,7 +327,7 @@ class PanelTransition extends Component { style = this.getDefaultTransitionStyles(key, style); return ( -
+
{Footer}
); @@ -338,7 +339,7 @@ class PanelTransition extends Component { style = this.getDefaultTransitionStyles(key, style); return ( -
+
{Links}
); @@ -358,7 +359,7 @@ class PanelTransition extends Component { left: 0, width: '100%', opacity: opacitySpring, - pointerEvents: key === this.props.path ? 'auto' : 'none' + pointerEvents: key === this.props.Body.type.panelId ? 'auto' : 'none' }; } @@ -380,7 +381,6 @@ class PanelTransition extends Component { export default connect((state) => ({ user: state.user, auth: state.auth, - path: state.routing.location.pathname, resolve: authFlow.resolve.bind(authFlow), reject: authFlow.reject.bind(authFlow) }), { diff --git a/src/components/auth/activation/Activation.jsx b/src/components/auth/activation/Activation.jsx index 1c20d53..97b544d 100644 --- a/src/components/auth/activation/Activation.jsx +++ b/src/components/auth/activation/Activation.jsx @@ -12,6 +12,7 @@ import messages from './Activation.messages'; class Body extends BaseAuthBody { static displayName = 'ActivationBody'; + static panelId = 'activation'; render() { return ( diff --git a/src/components/auth/changePassword/ChangePassword.jsx b/src/components/auth/changePassword/ChangePassword.jsx index 6e0d3aa..f4dffd8 100644 --- a/src/components/auth/changePassword/ChangePassword.jsx +++ b/src/components/auth/changePassword/ChangePassword.jsx @@ -13,6 +13,7 @@ import styles from './changePassword.scss'; class Body extends BaseAuthBody { static displayName = 'ChangePasswordBody'; + static panelId = 'changePassword'; render() { return ( diff --git a/src/components/auth/forgotPassword/ForgotPassword.jsx b/src/components/auth/forgotPassword/ForgotPassword.jsx index b6f33ba..55078b3 100644 --- a/src/components/auth/forgotPassword/ForgotPassword.jsx +++ b/src/components/auth/forgotPassword/ForgotPassword.jsx @@ -13,6 +13,8 @@ import styles from './forgotPassword.scss'; class Body extends BaseAuthBody { static displayName = 'ForgotPasswordBody'; + static panelId = 'forgotPassword'; + static hasGoBack = true; // Если юзер вводил своё мыло во время попытки авторизации, то почему бы его сюда автоматически не подставить? render() { @@ -45,15 +47,12 @@ class Body extends BaseAuthBody { } export default function ForgotPassword() { - var Title = () => ( // TODO: separate component for PageTitle - - {(msg) => {msg}} - - ); - Title.goBack = true; - return { - Title, + Title: () => ( // TODO: separate component for PageTitle + + {(msg) => {msg}} + + ), Body, Footer: () => (