diff --git a/package.json b/package.json index 5c86c11..aca5962 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "reactrangeslider": "^3.0.6", "redux": "^4.0.1", "redux-persist": "^5.10.0", - "redux-saga": "^0.16.2", + "redux-saga": "^1.0.0", "reduxsauce": "^1.0.0", "scrypt": "^6.0.3", "throttle-debounce": "^2.1.0", diff --git a/src/components/search/MapListDialogHead.tsx b/src/components/search/MapListDialogHead.tsx index 409abc8..54875cf 100644 --- a/src/components/search/MapListDialogHead.tsx +++ b/src/components/search/MapListDialogHead.tsx @@ -22,7 +22,7 @@ const MapListDialogHead: FC = memo( }), {} ), - [] + [max, min] ); return ( diff --git a/src/redux/editor/sagas.ts b/src/redux/editor/sagas.ts index d636770..dd4ee84 100644 --- a/src/redux/editor/sagas.ts +++ b/src/redux/editor/sagas.ts @@ -1,5 +1,4 @@ -import { call, put, takeEvery, takeLatest, select, race } from 'redux-saga/effects'; -import { delay, SagaIterator } from 'redux-saga'; +import { call, put, takeEvery, takeLatest, select, race, delay } from 'redux-saga/effects'; import { selectEditor, selectEditorMode } from '~/redux/editor/selectors'; import { simplify } from '~/utils/simplify'; import { @@ -217,7 +216,7 @@ function* keyPressedSaga({ key, target }: ReturnType) { } } -function* getGPXTrackSaga(): SagaIterator { +function* getGPXTrackSaga() { const { route, stickers, title, address }: ReturnType = yield select(selectMap); if (!route.length && !stickers.length) return; diff --git a/src/redux/map/sagas.ts b/src/redux/map/sagas.ts index 8deecd2..e323c79 100644 --- a/src/redux/map/sagas.ts +++ b/src/redux/map/sagas.ts @@ -7,6 +7,7 @@ import { race, take, takeLatest, + delay, } from 'redux-saga/effects'; import { MAP_ACTIONS } from './constants'; import { @@ -36,7 +37,6 @@ import { getStoredMap, postMap } from '~/utils/api'; import { Unwrap } from '~/utils/middleware'; import { selectMap, selectMapProvider, selectMapRoute, selectMapStickers } from './selectors'; import { TIPS } from '~/constants/tips'; -import { delay } from 'redux-saga'; import { setReadySaga } from '../editor/sagas'; import { selectEditor } from '../editor/selectors'; import { EDITOR_ACTIONS } from '../editor/constants'; diff --git a/src/redux/user/sagas.ts b/src/redux/user/sagas.ts index 32c0893..5b2b4b4 100644 --- a/src/redux/user/sagas.ts +++ b/src/redux/user/sagas.ts @@ -1,6 +1,5 @@ import { REHYDRATE, RehydrateAction } from 'redux-persist'; -import { delay, SagaIterator } from 'redux-saga'; -import { takeLatest, select, call, put, takeEvery } from 'redux-saga/effects'; +import { takeLatest, select, call, put, takeEvery, delay } from 'redux-saga/effects'; import { checkIframeToken, checkUserToken, @@ -198,7 +197,7 @@ function* searchSetTabSaga() { yield put(searchSetTitle('')); } -function* userLogoutSaga(): SagaIterator { +function* userLogoutSaga() { yield put(setUser(DEFAULT_USER)); yield call(generateGuestSaga); } @@ -256,7 +255,7 @@ function* mapsLoadMoreSaga() { yield put(searchSetLoading(false)); } -function* dropRouteSaga({ address }: ReturnType): SagaIterator { +function* dropRouteSaga({ address }: ReturnType) { const { token }: ReturnType = yield select(selectUserUser); const { routes: { @@ -290,7 +289,7 @@ function* modifyRouteSaga({ address, title, is_public, -}: ReturnType): SagaIterator { +}: ReturnType) { const { token }: ReturnType = yield select(selectUserUser); const { routes: {