#75 fixed problem with cancel request in debounce function.

artzub · Jan 8, 2021 · 729089e · 729089e
1 parent 2d364ee
commit 729089e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/src/components/Header/components/ProfileStep/Body.jsx b/src/components/Header/components/ProfileStep/Body.jsx
@@ -95,13 +95,11 @@ const Body = () => {
 
   useDebounce(
     () => {
+      dispatch(slice.actions.cancel());
+
       if (search) {
         dispatch(slice.actions.search(search));
       }
-
-      return () => {
-        dispatch(slice.actions.cancel());
-      };
     },
     300,
     [search, dispatch],

diff --git a/src/redux/modules/profiles.js b/src/redux/modules/profiles.js
@@ -68,6 +68,7 @@ export default createSlice({
           yield put(actions.fail(error));
         } finally {
           if (yield cancelled()) {
+            console.log('cancelled');
             yield put(actions.stopFetching());
           }
         }

diff --git a/src/redux/modules/progress.js b/src/redux/modules/progress.js
@@ -21,10 +21,11 @@ export default createSlice({
       };
 
       if (show) {
-        startFetching(newState, { payload: 'show' });
+        startFetching(newState);
       } else if (show === false) {
-        stopFetching(newState, { payload: 'show' });
+        stopFetching(newState);
       }
+      state.show = state.isFetching;
 
       return newState;
     },
@@ -40,10 +41,11 @@ export default createSlice({
     toggle: (state, { payload }) => {
       const show = payload ?? !state.show;
       if (show) {
-        startFetching(state, { payload: 'show' });
+        startFetching(state);
       } else {
-        stopFetching(state, { payload: 'show' });
+        stopFetching(state);
       }
+      state.show = state.isFetching;
     },
   },
 });
diff --git a/src/redux/utils/index.js b/src/redux/utils/index.js
@@ -5,24 +5,20 @@ export * from './withCancellation';
 /**
  * incs counter of request and set isFetching to true
  * @param state
- * @param {String} payload - name of property
  */
-export const startFetching = (state, { payload } = {}) => {
-  const prop = typeof payload === 'string' ? payload : 'isFetching';
-  state[prop] = true;
+export const startFetching = (state) => {
+  state.isFetching = true;
   state._requests = (state._requests ?? 0) + 1;
   state.error = '';
 };
 
 /**
  * decs counter of request and set isFetching to false if counter less than 1.
  * @param state
- * @param {String} [payload] - name of property
  */
-export const stopFetching = (state, { payload } = {}) => {
-  const prop = typeof payload === 'string' ? payload : 'isFetching';
+export const stopFetching = (state) => {
   state._requests = Math.max(0, (state._requests ?? 1) - 1);
-  state[prop] = !!state._requests;
+  state.isFetching = !!state._requests;
 };
 
 /**