muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-25 02:56:41 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed cancel dialog

Browse source
This commit is contained in:
Fedor Katurov 2020-01-14 11:08:26 +07:00
parent 1a00b98ba3
commit 56fd8ec4cd
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/dialogs/CancelDialog.tsx
View file

@ -3,6 +3,7 @@ import React from 'react';
import { MODES } from '~/constants/modes'; import { MODES } from '~/constants/modes';
import { Icon } from '~/components/panels/Icon'; import { Icon } from '~/components/panels/Icon';
import { editorSetMode, editorStopEditing } from '~/redux/editor/actions'; import { editorSetMode, editorStopEditing } from '~/redux/editor/actions';
import { connect } from 'react-redux';
const mapStateToProps = () => ({}); const mapStateToProps = () => ({});
const mapDispatchToProps = { const mapDispatchToProps = {
@ -12,7 +13,7 @@ const mapDispatchToProps = {
type Props = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & { }; type Props = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & { };
export class CancelDialog extends React.Component<Props, void> { class CancelDialogUnconnected extends React.Component<Props, void> {
cancel = () => { cancel = () => {
this.props.editorStopEditing(); this.props.editorStopEditing();
}; };
@ -46,3 +47,5 @@ export class CancelDialog extends React.Component<Props, void> {
); );
} }
} }
export const CancelDialog = connect(mapStateToProps, mapDispatchToProps)(CancelDialogUnconnected)

4
src/redux/editor/sagas.ts
View file

@ -56,7 +56,6 @@ const hideLoader = () => {
function* stopEditingSaga() { function* stopEditingSaga() {
const { changed, mode }: ReturnType<typeof selectEditor> = yield select(selectEditor); const { changed, mode }: ReturnType<typeof selectEditor> = yield select(selectEditor);
const { address_origin }: ReturnType<typeof selectMap> = yield select(selectMap);
const { path } = getUrlData(); const { path } = getUrlData();
if (changed && mode !== MODES.CONFIRM_CANCEL) { if (changed && mode !== MODES.CONFIRM_CANCEL) {
@ -66,8 +65,9 @@ function* stopEditingSaga() {
yield put(editorSetMode(MODES.NONE)); yield put(editorSetMode(MODES.NONE));
yield put(editorSetChanged(false)); yield put(editorSetChanged(false));
yield put(editorSetReady(true));
yield pushPath(`/${address_origin || path}/`); yield pushPath(`/${path}/`);
} }
function* checkOSRMServiceSaga() { function* checkOSRMServiceSaga() {

4
src/styles/map.less
View file

@ -292,4 +292,8 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
}
.leaflet-pane {
user-select: none;
} }