-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract Todo.tsx from index.tsx in order to move index.test.tsx to co…
…mponents directory. https://blog.shibayu36.org/entry/2019/12/11/193000 vercel/next.js#3728
- Loading branch information
Showing
4 changed files
with
137 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| import React, { ChangeEventHandler, DragEventHandler, KeyboardEventHandler, MouseEvent, useState } from 'react' | ||
| import cn from 'classnames' | ||
| import { MdClearAll } from 'react-icons/md' | ||
| import { Task } from '../lib/task' | ||
| import { moved } from '../lib/array' | ||
| import ToggleExpandIcon from '../components/ToggleExpandIcon' | ||
| import OpenTaskItem from '../components/OpenTaskItem' | ||
| import ClosedTaskItem from '../components/ClosedTaskItem' | ||
|
|
||
| const preventDefault: DragEventHandler = (event) => event.preventDefault() | ||
|
|
||
| export default function Todo() { | ||
| const [tasks, setTasks] = useState<Task[]>([]) | ||
| const [formText, setFormText] = useState('') | ||
| const [foldingClosedTasks, setFoldingClosedTasks] = useState(true) | ||
| const [draggedTaskNextIndex, setDraggedTaskNextIndex] = useState<number | null>(null) | ||
| const [draggedTaskId, setDraggedTaskId] = useState<number | null>(null) | ||
|
|
||
| const onChange: ChangeEventHandler<HTMLInputElement> = (event) => { | ||
| // https://developer.mozilla.org/ja/docs/Web/API/Event/currentTarget | ||
| setFormText(event.currentTarget.value) | ||
| } | ||
|
|
||
| const onKeyDown: KeyboardEventHandler<HTMLInputElement> = (event) => { | ||
| // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode | ||
| // if (event.keyCode === 229) return | ||
| if (event.key !== 'Enter') return | ||
| if (formText === '') return | ||
| event.currentTarget.value = '' | ||
| setTasks([...tasks, Task.create(formText)]) | ||
| setFormText('') | ||
| } | ||
|
|
||
| const closeTask = (taskId: number, closed = true) => { | ||
| const newTasks = tasks.map((task) => { | ||
| if (task.id !== taskId) return task | ||
| return { ...task, closed: closed } | ||
| }) | ||
| setTasks(newTasks) | ||
| } | ||
|
|
||
| const toggleTask = (event: MouseEvent<HTMLInputElement>, target: Task) => { | ||
| const newTasks = tasks.map((task) => { | ||
| if (task.id !== target.id) return task | ||
| return { ...task, closed: event.currentTarget.checked } | ||
| }) | ||
| setTasks(newTasks) | ||
| } | ||
|
|
||
| const clearTask = (_event: MouseEvent<HTMLElement>, target: Task) => { | ||
| setTasks(tasks.filter((task) => task.id !== target.id)) | ||
| } | ||
|
|
||
| const moveTask = (taskId: number, targetIndex: number) => { | ||
| const taskIndex = tasks.findIndex((t) => t.id === taskId) | ||
| const result = moved(tasks, taskIndex, targetIndex) | ||
| console.log(result) | ||
| setTasks(result) | ||
| setDraggedTaskNextIndex(null) | ||
| setDraggedTaskId(null) | ||
| } | ||
|
|
||
| return ( | ||
| <div className="max-w-xl mx-auto py-8"> | ||
| <div className="shadow-xl rounded px-4 pb-4"> | ||
| <div className="py-4"> | ||
| <h1>Todo</h1> | ||
| </div> | ||
| <div | ||
| data-testid="open-task-area" | ||
| onDragOver={preventDefault} | ||
| onDrop={(e) => { | ||
| e.stopPropagation() | ||
| e.preventDefault() | ||
| if (draggedTaskId !== null && draggedTaskNextIndex !== null) moveTask(draggedTaskId, draggedTaskNextIndex) | ||
| }} | ||
| > | ||
| <ul> | ||
| <li className="py-2"> | ||
| + <input className="focus:outline-none ml-1" onKeyDown={onKeyDown} onChange={onChange} type="text" /> | ||
| </li> | ||
| {tasks | ||
| .filter((task) => !task.closed) | ||
| .map((task, index) => ( | ||
| <OpenTaskItem | ||
| key={task.id} | ||
| task={task} | ||
| index={index} | ||
| toggleTask={toggleTask} | ||
| isNext={index === draggedTaskNextIndex} | ||
| setDraggedTaskNextIndex={setDraggedTaskNextIndex} | ||
| setDraggedTaskId={setDraggedTaskId} | ||
| /> | ||
| ))} | ||
| </ul> | ||
| </div> | ||
|
|
||
| <div | ||
| data-testid="closed-task-area" | ||
| onDragOver={(e) => e.preventDefault()} | ||
| onDrop={(e) => { | ||
| e.stopPropagation() // TODO why it's necessary | ||
| e.preventDefault() // TODO Remove | ||
| closeTask(draggedTaskId!) | ||
| setDraggedTaskId(null) | ||
| setDraggedTaskNextIndex(null) | ||
| }} | ||
| > | ||
| <div className="mt-2 py-1 flex justify-between"> | ||
| <h2>closed</h2> | ||
| <div className="ml-auto mr-2" onClick={() => setTasks(tasks.filter((item) => !item.closed))}> | ||
| <MdClearAll /> | ||
| </div> | ||
| <ToggleExpandIcon | ||
| expanded={foldingClosedTasks} | ||
| onClick={() => setFoldingClosedTasks(!foldingClosedTasks)} | ||
| /> | ||
| </div> | ||
| <ul className={cn({ 'divide-y': true, hidden: foldingClosedTasks })}> | ||
| {tasks | ||
| .filter((task) => task.closed) | ||
| .map((task) => ( | ||
| <ClosedTaskItem key={task.id} task={task} toggleTask={toggleTask} clearTask={clearTask} /> | ||
| ))} | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,130 +1,6 @@ | ||
| import React, { ChangeEventHandler, DragEventHandler, KeyboardEventHandler, MouseEvent, useState } from 'react' | ||
| import cn from 'classnames' | ||
| import { MdClearAll } from 'react-icons/md' | ||
| import { Task } from '../lib/task' | ||
| import { moved } from '../lib/array' | ||
| import ToggleExpandIcon from '../components/ToggleExpandIcon' | ||
| import OpenTaskItem from '../components/OpenTaskItem' | ||
| import ClosedTaskItem from '../components/ClosedTaskItem' | ||
|
|
||
| const preventDefault: DragEventHandler = (event) => event.preventDefault() | ||
| import React from 'react' | ||
| import Todo from '../components/Todo' | ||
|
|
||
| export default function Home() { | ||
| const [tasks, setTasks] = useState<Task[]>([]) | ||
| const [formText, setFormText] = useState('') | ||
| const [foldingClosedTasks, setFoldingClosedTasks] = useState(true) | ||
| const [draggedTaskNextIndex, setDraggedTaskNextIndex] = useState<number | null>(null) | ||
| const [draggedTaskId, setDraggedTaskId] = useState<number | null>(null) | ||
|
|
||
| const onChange: ChangeEventHandler<HTMLInputElement> = (event) => { | ||
| // https://developer.mozilla.org/ja/docs/Web/API/Event/currentTarget | ||
| setFormText(event.currentTarget.value) | ||
| } | ||
|
|
||
| const onKeyDown: KeyboardEventHandler<HTMLInputElement> = (event) => { | ||
| // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode | ||
| // if (event.keyCode === 229) return | ||
| if (event.key !== 'Enter') return | ||
| if (formText === '') return | ||
| event.currentTarget.value = '' | ||
| setTasks([...tasks, Task.create(formText)]) | ||
| setFormText('') | ||
| } | ||
|
|
||
| const closeTask = (taskId: number, closed = true) => { | ||
| const newTasks = tasks.map((task) => { | ||
| if (task.id !== taskId) return task | ||
| return { ...task, closed: closed } | ||
| }) | ||
| setTasks(newTasks) | ||
| } | ||
|
|
||
| const toggleTask = (event: MouseEvent<HTMLInputElement>, target: Task) => { | ||
| const newTasks = tasks.map((task) => { | ||
| if (task.id !== target.id) return task | ||
| return { ...task, closed: event.currentTarget.checked } | ||
| }) | ||
| setTasks(newTasks) | ||
| } | ||
|
|
||
| const clearTask = (_event: MouseEvent<HTMLElement>, target: Task) => { | ||
| setTasks(tasks.filter((task) => task.id !== target.id)) | ||
| } | ||
|
|
||
| const moveTask = (taskId: number, targetIndex: number) => { | ||
| const taskIndex = tasks.findIndex((t) => t.id === taskId) | ||
| const result = moved(tasks, taskIndex, targetIndex) | ||
| console.log(result) | ||
| setTasks(result) | ||
| setDraggedTaskNextIndex(null) | ||
| setDraggedTaskId(null) | ||
| } | ||
|
|
||
| return ( | ||
| <div className="max-w-xl mx-auto py-8"> | ||
| <div className="shadow-xl rounded px-4 pb-4"> | ||
| <div className="py-4"> | ||
| <h1>Todo</h1> | ||
| </div> | ||
| <div | ||
| data-testid="open-task-area" | ||
| onDragOver={preventDefault} | ||
| onDrop={(e) => { | ||
| e.stopPropagation() | ||
| e.preventDefault() | ||
| if (draggedTaskId !== null && draggedTaskNextIndex !== null) moveTask(draggedTaskId, draggedTaskNextIndex) | ||
| }} | ||
| > | ||
| <ul> | ||
| <li className="py-2"> | ||
| + <input className="focus:outline-none ml-1" onKeyDown={onKeyDown} onChange={onChange} type="text" /> | ||
| </li> | ||
| {tasks | ||
| .filter((task) => !task.closed) | ||
| .map((task, index) => ( | ||
| <OpenTaskItem | ||
| key={task.id} | ||
| task={task} | ||
| index={index} | ||
| toggleTask={toggleTask} | ||
| isNext={index === draggedTaskNextIndex} | ||
| setDraggedTaskNextIndex={setDraggedTaskNextIndex} | ||
| setDraggedTaskId={setDraggedTaskId} | ||
| /> | ||
| ))} | ||
| </ul> | ||
| </div> | ||
|
|
||
| <div | ||
| data-testid="closed-task-area" | ||
| onDragOver={(e) => e.preventDefault()} // TODO why it's necessary | ||
| onDrop={(e) => { | ||
| e.stopPropagation() // TODO why it's necessary | ||
| e.preventDefault() // TODO Remove | ||
| closeTask(draggedTaskId!) | ||
| setDraggedTaskId(null) | ||
| setDraggedTaskNextIndex(null) | ||
| }} | ||
| > | ||
| <div className="mt-2 py-1 flex justify-between"> | ||
| <h2>closed</h2> | ||
| <div className="ml-auto mr-2" onClick={() => setTasks(tasks.filter((item) => !item.closed))}> | ||
| <MdClearAll /> | ||
| </div> | ||
| <ToggleExpandIcon | ||
| expanded={foldingClosedTasks} | ||
| onClick={() => setFoldingClosedTasks(!foldingClosedTasks)} | ||
| /> | ||
| </div> | ||
| <ul className={cn({ 'divide-y': true, hidden: foldingClosedTasks })}> | ||
| {tasks | ||
| .filter((task) => task.closed) | ||
| .map((task) => ( | ||
| <ClosedTaskItem key={task.id} task={task} toggleTask={toggleTask} clearTask={clearTask} /> | ||
| ))} | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ) | ||
| return <Todo /> | ||
| } |
fee18e7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to following URLs: