diff --git a/src/components/dialogs/MapListDialog.tsx b/src/components/dialogs/MapListDialog.tsx index cb0a2bf..900673a 100644 --- a/src/components/dialogs/MapListDialog.tsx +++ b/src/components/dialogs/MapListDialog.tsx @@ -48,7 +48,8 @@ class Component extends React.Component { openRoute = (_id: string): void => { if (isMobile()) this.props.setDialogActive(false); - pushPath(`/${_id}/${this.props.editing ? 'edit' : ''}`); + // pushPath(`/${_id}/${this.props.editing ? 'edit' : ''}`); + pushPath(`/${_id}`); }; onScroll = (e: { target: { scrollHeight: number, scrollTop: number, clientHeight: number }}): void => { diff --git a/src/components/panels/EditorPanel.tsx b/src/components/panels/EditorPanel.tsx index 49a70fd..d2babca 100644 --- a/src/components/panels/EditorPanel.tsx +++ b/src/components/panels/EditorPanel.tsx @@ -11,6 +11,7 @@ import { IRootState } from "$redux/user/reducer"; import { Tooltip } from "$components/panels/Tooltip"; interface Props extends IRootState { + routing: IRootState['features']['routing'], setMode: typeof setMode, startEditing: typeof startEditing, stopEditing: typeof stopEditing, @@ -46,20 +47,25 @@ class Component extends React.PureComponent { render() { const { - mode, changed, editing, + mode, changed, editing, routing, } = this.props; return (
{ this.panel = el; }}>
- + { + routing && + + } + + +