improve code according to mentor's suggestion

mate-academy · Nov 27, 2023 · 3522f3c · 3522f3c
1 parent 98c6b48
commit 3522f3c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx
@@ -10,7 +10,7 @@ export const Footer: React.FC = () => {
 
   return (
     <>
-      {!!todos.length && (
+      {todos.length > 0 && (
         <footer className="footer">
           <span className="todo-count" data-cy="todosCounter">
             {`${todosToComplete} items left`}

diff --git a/src/components/TodoList/TodoList.tsx b/src/components/TodoList/TodoList.tsx
@@ -9,26 +9,27 @@ type Props = {
 
 export const TodoList: React.FC<Props> = React.memo(({ todos }) => {
   const { filter } = useContext(StateContext);
-
-  const isDisplayed = (todo: Todo) => {
+  const filterTodos = (todosToFilter: Todo[]) => {
     switch (filter.title) {
       case 'All':
       default:
-        return true;
+        return todosToFilter;
 
       case 'Active':
-        return !todo.completed;
+        return todosToFilter.filter(todo => !todo.completed);
 
       case 'Completed':
-        return todo.completed;
+        return todosToFilter.filter(todo => todo.completed);
     }
   };
 
+  const filteredTodos = filterTodos(todos);
+
   return (
     <>
-      {!!todos.length && (
+      {todos.length > 0 && (
         <ul className="todo-list" data-cy="todosList">
-          {todos.map(todo => isDisplayed(todo) && (
+          {filteredTodos.map(todo => (
             <TodoItem key={todo.id} todo={todo} />
           ))}
         </ul>