solutin2

mate-academy · Dec 16, 2024 · 0ab0d88 · 0ab0d88
1 parent 5a7e5d1
commit 0ab0d88
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -24,11 +24,12 @@ export const App: React.FC = () => {
   const [selectedTodo, setSelectedTodo] = useState<Todo | null>(null);
 
   useEffect(() => {
-    getTodos().then(data => {
-      setTodosFromServer(data);
-      setIsDataLoaded(true);
-    });
-  }, [status]);
+    getTodos()
+      .then(data => {
+        setTodosFromServer(data);
+      })
+      .finally(() => setIsDataLoaded(true));
+  }, []);
 
   const filteredTodos = todosFromServer
     .filter(todo => {

diff --git a/src/components/TodoFilter/TodoFilter.tsx b/src/components/TodoFilter/TodoFilter.tsx
@@ -1,20 +1,20 @@
 type Props = {
-  setStatus: (status: () => string) => void;
-  setQuery: (status: () => string) => void;
+  setStatus: (status: string) => void;
+  setQuery: (status: string) => void;
   query: string;
 };
 
 export const TodoFilter: React.FC<Props> = ({ query, setStatus, setQuery }) => {
   const handlerOnChangeStatus = (
     event: React.ChangeEvent<HTMLSelectElement>,
   ): void => {
-    setStatus(() => event.target.value);
+    setStatus(event.target.value);
   };
 
   const handlerOnChangeQuery = (
     event: React.ChangeEvent<HTMLInputElement>,
   ): void => {
-    setQuery(() => event.target.value);
+    setQuery(event.target.value);
   };
 
   return (
@@ -49,7 +49,7 @@ export const TodoFilter: React.FC<Props> = ({ query, setStatus, setQuery }) => {
               type="button"
               className="delete"
               onClick={() => {
-                setQuery(() => '');
+                setQuery('');
               }}
             />
           </span>