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

setMode --> changeMode

Browse source
This commit is contained in:
Fedor Katurov 2020-01-21 15:01:17 +07:00
parent 5e55434772
commit d0f419c18b
9 changed files with 80 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,12 @@ import React from 'react';
import { MODES } from '~/constants/modes';
import { Icon } from '~/components/panels/Icon';
import { editorSetMode, editorStopEditing } from '~/redux/editor/actions';
import { editorChangeMode, editorStopEditing } from '~/redux/editor/actions';
import { connect } from 'react-redux';
const mapStateToProps = () => ({});
const mapDispatchToProps = {
editorSetMode,
editorChangeMode,
editorStopEditing,
};
@ -19,7 +19,7 @@ class CancelDialogUnconnected extends React.Component<Props, void> {
};
proceed = () => {
this.props.editorSetMode(MODES.NONE);
this.props.editorChangeMode(MODES.NONE);
};
render() {

4
src/components/dialogs/SaveDialog.tsx
View file

@ -20,7 +20,7 @@ const mapStateToProps = state => ({
const mapDispatchToProps = {
editorCancelSave: EDITOR_ACTIONS.editorCancelSave,
editorSetMode: EDITOR_ACTIONS.editorSetMode,
editorChangeMode: EDITOR_ACTIONS.editorChangeMode,
editorSendSaveRequest: EDITOR_ACTIONS.editorSendSaveRequest,
};
@ -80,7 +80,7 @@ class SaveDialogUnconnected extends React.Component<Props, State> {
forceSaveRequest = e => this.editorSendSaveRequest(e, true);
cancelSaving = () => this.props.editorSetMode(MODES.NONE);
cancelSaving = () => this.props.editorChangeMode(MODES.NONE);
onCopy = e => {
e.preventDefault();

14
src/components/panels/EditorPanel.tsx
View file

@ -6,7 +6,7 @@ import { Icon } from '~/components/panels/Icon';
import { EditorDialog } from '~/components/panels/EditorDialog';
import { connect } from 'react-redux';
import {
editorSetMode,
editorChangeMode,
editorStartEditing,
editorStopEditing,
editorTakeAShot,
@ -21,7 +21,7 @@ const mapStateToProps = (state: IState) =>
pick(['mode', 'changed', 'editing', 'features'], selectEditor(state));
const mapDispatchToProps = {
editorSetMode,
editorChangeMode,
editorStartEditing,
editorStopEditing,
editorTakeAShot,
@ -54,12 +54,12 @@ class EditorPanelUnconnected extends PureComponent<Props, void> {
this.props.editorKeyPressed(event);
};
startPolyMode = () => this.props.editorSetMode(MODES.POLY);
startStickerMode = () => this.props.editorSetMode(MODES.STICKERS_SELECT);
startRouterMode = () => this.props.editorSetMode(MODES.ROUTER);
startTrashMode = () => this.props.editorSetMode(MODES.TRASH);
startPolyMode = () => this.props.editorChangeMode(MODES.POLY);
startStickerMode = () => this.props.editorChangeMode(MODES.STICKERS_SELECT);
startRouterMode = () => this.props.editorChangeMode(MODES.ROUTER);
startTrashMode = () => this.props.editorChangeMode(MODES.TRASH);
startSaveMode = () => {
this.props.editorSetMode(MODES.SAVE);
this.props.editorChangeMode(MODES.SAVE);
};
render() {

10
src/components/panels/TopRightPanel.tsx
View file

@ -19,7 +19,7 @@ const mapStateToProps = (state: IState) => {
};
const mapDispatchToProps = {
editorSetMode: EDITOR_ACTIONS.editorSetMode,
editorChangeMode: EDITOR_ACTIONS.editorChangeMode,
};
type Props = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & {};
@ -29,11 +29,11 @@ const TopRightPanelUnconnected = ({
logo,
markers_shown,
editing,
editorSetMode,
editorChangeMode,
}: Props) => {
const startProviderMode = useCallback(() => editorSetMode(MODES.PROVIDER), [editorSetMode]);
const startLogoMode = useCallback(() => editorSetMode(MODES.LOGO), [editorSetMode]);
const clearMode = useCallback(() => editorSetMode(MODES.NONE), [editorSetMode]);
const startProviderMode = useCallback(() => editorChangeMode(MODES.PROVIDER), [editorChangeMode]);
const startLogoMode = useCallback(() => editorChangeMode(MODES.LOGO), [editorChangeMode]);
const clearMode = useCallback(() => editorChangeMode(MODES.NONE), [editorChangeMode]);
return (
<div className="status-panel top right">

7
src/redux/editor/actions.ts
View file

@ -7,10 +7,17 @@ export const editorSetEditing = (editing: IEditorState['editing']) => ({
type: EDITOR_ACTIONS.SET_EDITING,
editing,
});
export const editorChangeMode = (mode: IEditorState['mode']) => ({
type: EDITOR_ACTIONS.CHANGE_MODE,
mode,
});
export const editorSetMode = (mode: IEditorState['mode']) => ({
type: EDITOR_ACTIONS.SET_MODE,
mode,
});
export const editorSetDistance = (distance: IEditorState['distance']) => ({
type: EDITOR_ACTIONS.SET_DISTANCE,
distance,

1
src/redux/editor/constants.ts
View file

@ -2,6 +2,7 @@ const P = 'EDITOR';
export const EDITOR_ACTIONS = {
SET_EDITING: `${P}-SET_EDITING`,
CHANGE_MODE: `${P}-CHANGE_MODE`,
SET_MODE: `${P}-SET_MODE`,
SET_DISTANCE: `${P}-SET_DISTANCE`,
SET_CHANGED: `${P}-SET_CHANGED`,

2
src/redux/editor/handlers.ts
View file

@ -20,7 +20,7 @@ const setChanged = (
changed,
});
const setMode = (state, { mode }: ReturnType<typeof ACTIONS.editorSetMode>): IEditorState => ({
const setMode = (state, { mode }: ReturnType<typeof ACTIONS.editorChangeMode>): IEditorState => ({
...state,
mode,
});

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

@ -13,7 +13,7 @@ import { simplify } from '~/utils/simplify';
import {
editorHideRenderer,
editorSetChanged,
editorSetMode,
editorChangeMode,
editorSetReady,
editorSetRenderer,
editorSetDialogActive,
@ -25,6 +25,8 @@ import {
editorSearchNominatim,
editorSetDialog,
editorSetNominatim,
editorSetMode,
editorSetRouter,
} from '~/redux/editor/actions';
import { getUrlData, pushPath } from '~/utils/history';
import { MODES } from '~/constants/modes';
@ -70,11 +72,11 @@ function* stopEditingSaga() {
const { path } = getUrlData();
if (changed && mode !== MODES.CONFIRM_CANCEL) {
yield put(editorSetMode(MODES.CONFIRM_CANCEL));
yield put(editorChangeMode(MODES.CONFIRM_CANCEL));
return;
}
yield put(editorSetMode(MODES.NONE));
yield put(editorChangeMode(MODES.NONE));
yield put(editorSetChanged(false));
yield put(editorSetReady(true));
@ -144,11 +146,11 @@ function* takeAShotSaga() {
timeout: delay(500),
});
if (timeout) yield put(editorSetMode(MODES.SHOT_PREFETCH));
if (timeout) yield put(editorChangeMode(MODES.SHOT_PREFETCH));
const data = yield result || worker;
yield put(editorSetMode(MODES.NONE));
yield put(editorChangeMode(MODES.NONE));
yield put(
editorSetRenderer({
data,
@ -200,7 +202,7 @@ function* locationChangeSaga({ location }: ReturnType<typeof editorLocationChang
const mode: ReturnType<typeof selectEditorMode> = yield select(selectEditorMode);
if (mode !== MODES.NONE) {
yield put(editorSetMode(MODES.NONE));
yield put(editorChangeMode(MODES.NONE));
}
yield call(loadMapFromPath);
@ -221,7 +223,7 @@ function* keyPressedSaga({ key, target }: ReturnType<typeof editorKeyPressed>) {
if (renderer_active) return yield put(editorHideRenderer());
if (dialog_active) return yield put(editorSetDialogActive(false));
if (mode !== MODES.NONE) return yield put(editorSetMode(MODES.NONE));
if (mode !== MODES.NONE) return yield put(editorChangeMode(MODES.NONE));
} else if (key === 'Delete') {
const { editing } = yield select(selectEditor);
@ -232,7 +234,7 @@ function* keyPressedSaga({ key, target }: ReturnType<typeof editorKeyPressed>) {
if (mode === MODES.TRASH) {
yield put(editorClearAll());
} else {
yield put(editorSetMode(MODES.TRASH));
yield put(editorChangeMode(MODES.TRASH));
}
}
}
@ -248,7 +250,7 @@ function* getGPXTrackSaga() {
}
function* routerCancel() {
yield put(editorSetMode(MODES.NONE));
yield put(editorChangeMode(MODES.NONE));
}
function* mapClick({ latlng }: ReturnType<typeof mapClicked>) {
@ -268,7 +270,7 @@ function* routerSubmit() {
yield put(mapSetRoute([...route, ...coordinates]));
OsrmRouter.setWaypoints([]);
yield put(editorSetMode(MODES.NONE));
yield put(editorChangeMode(MODES.NONE));
}
function* cancelSave() {
@ -295,6 +297,25 @@ function* searchNominatimSaga({ search }: ReturnType<typeof editorSearchNominati
yield put(editorSetNominatim({ loading: false }));
}
function* changeMode({ mode }: ReturnType<typeof editorChangeMode>) {
const current: ReturnType<typeof selectEditorMode> = yield select(selectEditorMode);
if (mode === current) {
yield put(editorSetMode(MODES.NONE));
return;
}
switch (current) {
case MODES.ROUTER:
yield put(editorSetRouter({ waypoints: [] }));
}
yield put(editorSetMode(mode));
switch (mode) {
}
}
export function* editorSaga() {
yield takeEvery(EDITOR_ACTIONS.LOCATION_CHANGED, locationChangeSaga);
@ -308,4 +329,5 @@ export function* editorSaga() {
yield takeLatest(EDITOR_ACTIONS.ROUTER_SUBMIT, routerSubmit);
yield takeLatest(EDITOR_ACTIONS.CANCEL_SAVE, cancelSave);
yield takeLeading(EDITOR_ACTIONS.SEARCH_NOMINATIM, searchNominatimSaga);
yield takeLeading(EDITOR_ACTIONS.CHANGE_MODE, changeMode);
}

28
src/redux/map/sagas.ts
View file

@ -23,7 +23,7 @@ import {
import { selectUser, selectUserUser } from '~/redux/user/selectors';
import { MODES } from '~/constants/modes';
import {
editorSetMode,
editorChangeMode,
editorSetChanged,
editorSetEditing,
editorSetReady,
@ -51,10 +51,11 @@ function* onMapClick({ latlng }: ReturnType<typeof mapClicked>) {
switch (mode) {
case MODES.STICKERS:
yield put(mapAddSticker({ latlng, set, sticker, text: '', angle: 2.11 }));
yield put(editorSetMode(MODES.NONE));
yield put(editorChangeMode(MODES.NONE));
break;
default:
break;
}
}
@ -156,7 +157,7 @@ export function* mapInitSaga() {
}
function* setActiveStickerSaga() {
yield put(editorSetMode(MODES.STICKERS));
yield put(editorChangeMode(MODES.STICKERS));
}
function* setTitleSaga({ title }: ReturnType<typeof mapSetTitle>) {
@ -171,20 +172,20 @@ function* startEditingSaga() {
}
function* clearPolySaga() {
const route: ReturnType<typeof selectMapRoute> = yield select(selectMapRoute)
const route: ReturnType<typeof selectMapRoute> = yield select(selectMapRoute);
if (!route.length) return;
yield put(mapSetRoute([]));
}
function* clearStickersSaga() {
const stickers: ReturnType<typeof selectMapStickers> = yield select(selectMapStickers)
const stickers: ReturnType<typeof selectMapStickers> = yield select(selectMapStickers);
if (!stickers.length) return;
yield put(mapSetStickers([]));
}
function* clearAllSaga() {
const route: ReturnType<typeof selectMapRoute> = yield select(selectMapRoute)
const stickers: ReturnType<typeof selectMapStickers> = yield select(selectMapStickers)
const route: ReturnType<typeof selectMapRoute> = yield select(selectMapRoute);
const stickers: ReturnType<typeof selectMapStickers> = yield select(selectMapStickers);
if (!stickers.length && !route.length) return;
@ -211,8 +212,15 @@ function* clearSaga({ type }) {
break;
}
yield put(editorSetActiveSticker(null));
yield put(editorSetMode(MODES.NONE));
const { mode, activeSticker }: ReturnType<typeof selectEditor> = yield select(selectEditor);
if (activeSticker && activeSticker.set && activeSticker.sticker) {
yield put(editorSetActiveSticker(null));
}
if (mode !== MODES.NONE) {
yield put(editorChangeMode(MODES.NONE));
}
}
function* sendSaveRequestSaga({
@ -264,7 +272,7 @@ function* sendSaveRequestSaga({
yield put(editorSetSave({ loading: false }));
if (cancel) return yield put(editorSetMode(MODES.NONE));
if (cancel) return yield put(editorChangeMode(MODES.NONE));
if (result && result.data.code === 'already_exist')
return yield put(editorSetSave({ overwriting: true }));