refactoring

mate-academy · Dec 22, 2024 · 5a1fdd3 · 5a1fdd3
1 parent b39ea1b
commit 5a1fdd3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -101,14 +101,14 @@ export const App: React.FC = () => {
     });
   }
 
-  function handleTitleChange(newTitle: string, editingTodoId1: number | null) {
+  function handleTitleChange(newTitle: string, editingTodoId: number | null) {
     const updateStatus = { title: newTitle };
 
     return client
-      .patch<Todo>(`/todos/${editingTodoId1}`, updateStatus)
+      .patch<Todo>(`/todos/${editingTodoId}`, updateStatus)
       .then(fetchedTodo => {
-        changeState(editingTodoId1 as number, setFilteredTodos, fetchedTodo);
-        changeState(editingTodoId1 as number, setTodos, fetchedTodo);
+        changeState(editingTodoId as number, setFilteredTodos, fetchedTodo);
+        changeState(editingTodoId as number, setTodos, fetchedTodo);
       })
       .catch(error => {
         ShowError(Error.UpdateError);
@@ -132,23 +132,27 @@ export const App: React.FC = () => {
       });
   }
 
+  function setFocusOnAddInput() {
+    if (addTodoField.current !== null) {
+      addTodoField.current.focus();
+    }
+  }
+
   useEffect(() => {
     client
       .get<Todo[]>(`/todos?userId=${USER_ID}`)
       .then(fetchedTodos => {
         setTodos(fetchedTodos);
         setFilteredTodos(fetchedTodos);
-        if (addTodoField.current !== null) {
-          addTodoField.current.focus();
-        }
+        setFocusOnAddInput();
       })
       .catch(() => ShowError(Error.LoadError));
   }, []);
 
   useEffect(() => {
-    if (addTodoField.current !== null && tempTodo === null) {
+    if (tempTodo === null) {
       /*tempTodo === null для того, не виконувати це два рази (бо стейт tempTodo спочатку змінюється на об'єкт а потім змінюється на null)*/
-      addTodoField.current.focus();
+      setFocusOnAddInput();
     }
   }, [tempTodo]);
 
@@ -207,10 +211,7 @@ export const App: React.FC = () => {
     });
 
     Promise.all(promises).then(() => {
-      //винести
-      if (addTodoField.current !== null) {
-        addTodoField.current.focus();
-      }
+      setFocusOnAddInput();
     });
   }
 

diff --git a/src/components/TodoItem/TodoItem.tsx b/src/components/TodoItem/TodoItem.tsx
@@ -45,10 +45,14 @@ export const TodoItem: React.FC<Props> = ({
   const [editingTodoId, setEditingTodoId] = useState<number | null>(null);
   const [isUpdatingTitle, setIsUpdatingTitle] = useState<boolean>(false);
 
-  useEffect(() => {
+  function setFocusOnEditInput() {
     if (editTodoField.current !== null) {
       editTodoField.current.focus();
     }
+  }
+
+  useEffect(() => {
+    setFocusOnEditInput();
   }, [editingTodoId]);
 
   function trimTitle(text: string) {
@@ -102,9 +106,7 @@ export const TodoItem: React.FC<Props> = ({
         setEditingTodoId(null);
       })
       .catch(() => {
-        if (editTodoField.current !== null) {
-          editTodoField.current.focus();
-        }
+        setFocusOnEditInput();
       })
       .finally(() => {
         setIsUpdatingTitle(false);

diff --git a/src/utils/fetchClient.ts b/src/utils/fetchClient.ts
@@ -27,7 +27,7 @@ function request<T>(
   }
 
   // DON'T change the delay it is required for tests +
-  return wait(400)
+  return wait(100)
     .then(() => fetch(BASE_URL + url, options))
     .then(response => {
       if (!response.ok) {