diff --git a/src/components/dialogs/MapListMoreDialog.jsx b/src/components/dialogs/MapListMoreDialog.jsx index 6169322..097347c 100644 --- a/src/components/dialogs/MapListMoreDialog.jsx +++ b/src/components/dialogs/MapListMoreDialog.jsx @@ -71,6 +71,11 @@ class Component extends React.Component { return (
+
+
Мои
+
Общие
+
Выбранные
+
({ } }); -const newDistCalc = ({ distance, min, max, filter }) => { +const newDistCalc = ({ + distance, min, max, filter +}) => { if (filter.min === filter.max) { // slider was disabled return [min, max]; @@ -137,33 +139,21 @@ const newDistCalc = ({ distance, min, max, filter }) => { // state.routes.filter.distance }; -const searchPutRoutes = (state, { list = [], min, max }) => { - console.log('a', state.routes.filter.distance[0], state.routes.filter.min); - return ({ - ...state, - routes: { - ...state.routes, - list, - filter: { - ...state.routes.filter, - distance: (state.routes.filter.min === state.routes.filter.max) - ? [min, max] - : state.routes.filter.distance, - // distance: - // [ - // (state.routes.filter.min > min && state.routes.filter.distance[0] <= state.routes.filter.min) - // ? min - // : state.routes.filter.distance[0], - // (state.routes.filter.max < max && state.routes.filter.distance[1] >= state.routes.filter.max) - // ? max - // : state.routes.filter.distance[1], - // ], - min, - max, - } +const searchPutRoutes = (state, { list = [], min, max }) => ({ + ...state, + routes: { + ...state.routes, + list, + filter: { + ...state.routes.filter, + distance: (state.routes.filter.min === state.routes.filter.max) + ? [min, max] + : state.routes.filter.distance, + min, + max, } - }); -} + } +}); const searchSetLoading = (state, { loading = false }) => ({ ...state, diff --git a/src/styles/dialogs.less b/src/styles/dialogs.less index b52c5c7..38f45b2 100644 --- a/src/styles/dialogs.less +++ b/src/styles/dialogs.less @@ -168,6 +168,27 @@ color: white; } +.dialog-head-tabs { + background: rgba(255, 255, 255, 0); + border-radius: @panel_radius @panel_radius 0 0; + height: 32px; + + .dialog-head-tab { + height: 32px; + display: inline-flex; + align-items: center; + justify-content: center; + color: white; + padding: 0 10px; + cursor: pointer; + border-radius: @panel_radius @panel_radius 0 0; + + &.active { + background: rgba(255, 255, 255, 0.1); + } + } +} + .dialog-head-title { font-size: 20px; text-transform: uppercase;