redux: router fixed

This commit is contained in:
muerwre 2018-11-26 15:50:36 +07:00
parent 5d2c534aa9
commit eb5b0e5d28
6 changed files with 98 additions and 39 deletions

View file

@ -1,68 +1,60 @@
import React from 'react';
const noPoints = ({ cancelDrawing }) => (
type Props = {
routerCancel: Function,
routerSubmit: Function,
routerPoints: Number,
}
const noPoints = ({ routerCancel }: Props) => (
<div className="helper router-helper">
<div className="helper__text">
<div className="big white">Укажите на карте первую точку маршрута</div>
<div className="small gray">Путь прокладывается по улицам, тротуарам и тропинкам</div>
</div>
<div className="helper__buttons">
<div className="button router-helper__button" onClick={cancelDrawing}>
<div className="button router-helper__button" onClick={routerCancel}>
Отмена
</div>
</div>
</div>
);
const firstPoint = ({ cancelDrawing }) => (
const firstPoint = ({ routerCancel }: Props) => (
<div className="helper router-helper">
<div className="helper__text">
<div className="big white">Укажите на карте конечную точку маршрута</div>
<div className="small gray"> Вы сможете добавить уточняющие точки</div>
</div>
<div className="helper__buttons">
<div className="button router-helper__button" onClick={cancelDrawing}>
<div className="button router-helper__button" onClick={routerCancel}>
Отмена
</div>
</div>
</div>
);
const draggablePoints = ({ cancelDrawing, submitDrawing }) => (
const draggablePoints = ({ routerCancel, routerSubmit }: Props) => (
<div className="helper router-helper">
<div className="helper__text">
<div className="big white">Продолжите маршрут, щелкая по карте</div>
<div className="small gray">Потяните линию, чтобы указать промежуточные точки</div>
</div>
<div className="helper__buttons button-group">
<div className="button button_red router-helper__button" onClick={cancelDrawing}>
<div className="button button_red router-helper__button" onClick={routerCancel}>
Отмена
</div>
<div className="button primary router-helper__button" onClick={submitDrawing}>
<div className="button primary router-helper__button" onClick={routerSubmit}>
Применить
</div>
</div>
</div>
);
export class RouterDialog extends React.Component {
cancelDrawing = () => {
this.props.editor.router.cancelDrawing();
};
submitDrawing = () => {
this.props.editor.router.submitDrawing();
};
render() {
const { routerPoints, editor } = this.props;
const { cancelDrawing, submitDrawing } = this;
return (
<div>
{!routerPoints && noPoints({ cancelDrawing })}
{routerPoints === 1 && firstPoint({ cancelDrawing })}
{routerPoints >= 2 && draggablePoints({ cancelDrawing, submitDrawing })}
</div>
);
}
}
export const RouterDialog = ({ routerPoints, routerCancel, routerSubmit }: Props) => (
<div>
{!routerPoints && noPoints({ routerCancel })}
{routerPoints === 1 && firstPoint({ routerCancel })}
{routerPoints >= 2 && draggablePoints({ routerCancel, routerSubmit })}
</div>
);