From d2c579dc6b59052570eb5bd367a586e224c170bd Mon Sep 17 00:00:00 2001
From: RUNFUNRUN <ryotauchiyama1212@gmail.com>
Date: Wed, 24 Jul 2024 23:59:13 +0900
Subject: [PATCH 1/2] feat: add drag mode

---
 src/app/_components/canvas.tsx      |  25 ++++-
 src/app/_components/oekaki-chat.tsx |  13 ++-
 src/app/_components/piece.tsx       |  33 +++++-
 src/app/_components/setting.tsx     | 159 ++++++++++++++++++----------
 src/types.ts                        |   4 +-
 5 files changed, 167 insertions(+), 67 deletions(-)

diff --git a/src/app/_components/canvas.tsx b/src/app/_components/canvas.tsx
index 0a9ae17..25428ef 100644
--- a/src/app/_components/canvas.tsx
+++ b/src/app/_components/canvas.tsx
@@ -1,5 +1,5 @@
-import type { AsciiData, Height } from '@/types';
-import type { Dispatch, SetStateAction } from 'react';
+import type { AsciiData, DrawingMode, Height } from '@/types';
+import { useEffect, useState, type Dispatch, type SetStateAction } from 'react';
 import { Piece } from './piece';
 
 export const Canvas = ({
@@ -7,12 +7,30 @@ export const Canvas = ({
   setAsciiData,
   width,
   height,
+  drawingMode,
 }: {
   asciiData: AsciiData;
   setAsciiData: Dispatch<SetStateAction<AsciiData>>;
   width: number;
   height: Height;
+  drawingMode: DrawingMode;
 }) => {
+  const [isMouseDown, setIsMouseDown] = useState(false);
+
+  useEffect(() => {
+    if (drawingMode === 'drag') {
+      const handleWindowMouseUp = () => {
+        setIsMouseDown(false);
+      };
+
+      window.addEventListener('mouseup', handleWindowMouseUp);
+
+      return () => {
+        window.removeEventListener('mouseup', handleWindowMouseUp);
+      };
+    }
+  }, [drawingMode]);
+
   return (
     <div className='min-w-[405px] md:min-w-[810px] lg:min-w-[1080px] text-center'>
       {asciiData.map((row, i) => {
@@ -33,6 +51,9 @@ export const Canvas = ({
                   yIndex={i}
                   asciiData={asciiData}
                   setAsciiData={setAsciiData}
+                  isMouseDown={isMouseDown}
+                  setIsMouseDown={setIsMouseDown}
+                  drawingMode={drawingMode}
                 />
               );
             })}
diff --git a/src/app/_components/oekaki-chat.tsx b/src/app/_components/oekaki-chat.tsx
index c3d5d3e..1e01785 100644
--- a/src/app/_components/oekaki-chat.tsx
+++ b/src/app/_components/oekaki-chat.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import type { AsciiData, Height, Resolution } from '@/types';
+import type { AsciiData, DrawingMode, Height, Resolution } from '@/types';
 import { useState } from 'react';
 import { Buttons } from './buttons';
 import { Canvas } from './canvas';
@@ -8,9 +8,9 @@ import { Setting } from './setting';
 
 export const OekakiChat = () => {
   const fullhdWidth = 26;
-  const stretchWidth = 27;
+  const stretchedWidth = 27;
 
-  const maxW = fullhdWidth > stretchWidth ? fullhdWidth : stretchWidth;
+  const maxW = fullhdWidth > stretchedWidth ? fullhdWidth : stretchedWidth;
   const maxH = 13;
   const defaultAsciiData = (): AsciiData => {
     const data = new Array(maxH);
@@ -25,6 +25,7 @@ export const OekakiChat = () => {
 
   const [asciiData, setAsciiData] = useState<AsciiData>(defaultAsciiData());
   const [resolution, setResolution] = useState<Resolution>('fullhd');
+  const [drawingMode, setDrawingMode] = useState<DrawingMode>('click');
   const [height, setHeight] = useState<Height>(7);
 
   return (
@@ -33,17 +34,19 @@ export const OekakiChat = () => {
         setResolution={setResolution}
         height={height}
         setHeight={setHeight}
+        setDrawingMode={setDrawingMode}
       />
       <Canvas
         asciiData={asciiData}
         setAsciiData={setAsciiData}
-        width={resolution === 'fullhd' ? fullhdWidth : stretchWidth}
+        width={resolution === 'fullhd' ? fullhdWidth : stretchedWidth}
         height={height}
+        drawingMode={drawingMode}
       />
       <Buttons
         asciiData={asciiData}
         setAsciiData={setAsciiData}
-        width={resolution === 'fullhd' ? fullhdWidth : stretchWidth}
+        width={resolution === 'fullhd' ? fullhdWidth : stretchedWidth}
         height={height}
       />
     </div>
diff --git a/src/app/_components/piece.tsx b/src/app/_components/piece.tsx
index a87639c..200be06 100644
--- a/src/app/_components/piece.tsx
+++ b/src/app/_components/piece.tsx
@@ -1,4 +1,4 @@
-import type { AsciiData } from '@/types';
+import type { AsciiData, DrawingMode } from '@/types';
 import { useTheme } from 'next-themes';
 import { type Dispatch, type SetStateAction, useEffect, useState } from 'react';
 
@@ -8,12 +8,18 @@ export const Piece = ({
   yIndex,
   asciiData,
   setAsciiData,
+  isMouseDown,
+  setIsMouseDown,
+  drawingMode,
 }: {
   active: boolean;
   xIndex: number;
   yIndex: number;
   asciiData: AsciiData;
   setAsciiData: Dispatch<SetStateAction<AsciiData>>;
+  isMouseDown: boolean;
+  setIsMouseDown: Dispatch<boolean>;
+  drawingMode: DrawingMode;
 }) => {
   const { theme, systemTheme } = useTheme();
   const [currentTheme, setCurrentTheme] = useState<string | undefined>(
@@ -28,12 +34,31 @@ export const Piece = ({
     }
   }, [theme, systemTheme]);
 
-  const handleClick = () => {
+  const toggleAsciiData = () => {
     const newAsciiData = [...asciiData];
     newAsciiData[yIndex][xIndex] = !newAsciiData[yIndex][xIndex];
     setAsciiData(newAsciiData);
   };
 
+  const handleClick = () => {
+    if (drawingMode === 'click') {
+      toggleAsciiData();
+    }
+  };
+
+  const handleMouseDown = () => {
+    if (drawingMode === 'drag') {
+      setIsMouseDown(true);
+      toggleAsciiData();
+    }
+  };
+
+  const handleMouseEnter = () => {
+    if (drawingMode === 'drag' && isMouseDown) {
+      toggleAsciiData();
+    }
+  };
+
   if (active) {
     return (
       <button
@@ -42,6 +67,8 @@ export const Piece = ({
           currentTheme === 'dark' ? 'bg-gray-300' : 'bg-white'
         } w-[15px] h-[15px] md:w-[30px] sm:h-[30px] lg:w-[40px] lg:h-[40px] m-0 border border-black`}
         onClick={handleClick}
+        onMouseDown={handleMouseDown}
+        onMouseEnter={handleMouseEnter}
       />
     );
   }
@@ -52,6 +79,8 @@ export const Piece = ({
         currentTheme === 'dark' ? 'bg-gray-600' : 'bg-gray-400'
       } w-[15px] h-[15px] md:w-[30px] sm:h-[30px] lg:w-[40px] lg:h-[40px] m-0 border border-black`}
       onClick={handleClick}
+      onMouseDown={handleMouseDown}
+      onMouseEnter={handleMouseEnter}
     />
   );
 };
diff --git a/src/app/_components/setting.tsx b/src/app/_components/setting.tsx
index 439a500..6f42c8d 100644
--- a/src/app/_components/setting.tsx
+++ b/src/app/_components/setting.tsx
@@ -2,79 +2,124 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
 import { Slider } from '@/components/ui/slider';
-import type { Height, Resolution } from '@/types';
+import type { DrawingMode, Height, Resolution } from '@/types';
 import type { Dispatch, SetStateAction } from 'react';
 
 export const Setting = ({
   setResolution,
+  setDrawingMode,
   height,
   setHeight,
 }: {
   setResolution: Dispatch<SetStateAction<Resolution>>;
+  setDrawingMode: Dispatch<SetStateAction<DrawingMode>>;
   height: Height;
   setHeight: Dispatch<SetStateAction<Height>>;
 }) => {
   return (
-    <div className='w-[390px] md:w-[750px] lg:w-[1000px] mx-auto my-8'>
-      <Label htmlFor='resolution' className='text-xl font-bold'>
-        Resolution
-      </Label>
-      <RadioGroup defaultValue='fullhd' id='resolution' className='flex gap-4'>
-        <div className='flex items-center space-x-2'>
-          <RadioGroupItem
-            value='fullhd'
-            id='r1'
-            onClick={() => {
-              setResolution('fullhd');
+    <div className='w-[390px] md:w-[750px] lg:w-[1000px] mx-auto my-4 flex flex-col gap-2'>
+      <div>
+        <Label htmlFor='resolution' className='text-xl font-bold'>
+          Resolution
+        </Label>
+        <RadioGroup
+          defaultValue='fullhd'
+          id='resolution'
+          className='flex gap-4'
+        >
+          <div className='flex items-center space-x-2'>
+            <RadioGroupItem
+              value='fullhd'
+              id='fullhd'
+              onClick={() => {
+                setResolution('fullhd');
+              }}
+            />
+            <Label htmlFor='fullhd' className='text-xl'>
+              Full HD
+            </Label>
+          </div>
+          <div className='flex items-center space-x-2'>
+            <RadioGroupItem
+              value='stretched'
+              id='stretched'
+              onClick={() => {
+                setResolution('stretched');
+              }}
+            />
+            <Label htmlFor='stretched' className='text-xl'>
+              Stretched
+            </Label>
+          </div>
+        </RadioGroup>
+      </div>
+      <div>
+        <Label htmlFor='height' className='text-xl'>
+          <span className='font-bold'>Height</span> (1-13 default: 7)
+        </Label>
+        <div id='height' className='flex'>
+          <Input
+            className='w-16 mr-8 ml-0'
+            type='number'
+            value={height}
+            onChange={(e) => {
+              if (height === 13 && Number(e.target.value) > 13) {
+                setHeight(13);
+                return;
+              }
+              if (height === 1 && Number(e.target.value) < 1) {
+                setHeight(1);
+                return;
+              }
+              if (Number(e.target.value) < 1 || Number(e.target.value) > 13) {
+                return;
+              }
+              setHeight(Number(e.target.value));
             }}
           />
-          <Label htmlFor='r1' className='text-xl'>
-            Full HD
-          </Label>
-        </div>
-        <div className='flex items-center space-x-2'>
-          <RadioGroupItem
-            value='stretch'
-            id='r2'
-            onClick={() => {
-              setResolution('stretch');
-            }}
+          <Slider
+            defaultValue={[height]}
+            min={1}
+            max={13}
+            step={1}
+            onValueChange={(e) => setHeight(e[0])}
           />
-          <Label htmlFor='r2' className='text-xl'>
-            Stretch
-          </Label>
         </div>
-      </RadioGroup>
-      <Label htmlFor='height' className='text-xl'>
-        <span className='font-bold'>Height</span> (1-13 default: 7)
-      </Label>
-      <div id='height' className='flex'>
-        <Input
-          className='w-16 mr-8 ml-0'
-          type='number'
-          value={height}
-          onChange={(e) => {
-            if (height === 13 && Number(e.target.value) > 13) {
-              setHeight(13);
-              return;
-            }
-            if (height === 1 && Number(e.target.value) < 1) {
-              setHeight(1);
-              return;
-            }
-            if (Number(e.target.value) < 1 || Number(e.target.value) > 13) {
-              return;
-            }
-            setHeight(Number(e.target.value));
-          }}
-        />
-        <Slider
-          defaultValue={[height]}
-          min={1}
-          max={13}
-          step={1}
-          onValueChange={(e) => setHeight(e[0])}
-        />
+      </div>
+      <div>
+        <Label htmlFor='drawing-mode' className='text-xl font-bold'>
+          Drawing mode
+        </Label>
+        <RadioGroup
+          defaultValue='click'
+          id='drawing-mode'
+          className='flex gap-4'
+        >
+          <div className='flex items-center space-x-2'>
+            <RadioGroupItem
+              value='click'
+              id='click'
+              onClick={() => {
+                setDrawingMode('click');
+              }}
+            />
+            <Label htmlFor='click' className='text-xl'>
+              Click
+            </Label>
+          </div>
+          <div className='flex items-center space-x-2'>
+            <RadioGroupItem
+              value='drag'
+              id='drag'
+              onClick={() => {
+                setDrawingMode('drag');
+              }}
+            />
+            <Label htmlFor='drag' className='text-xl'>
+              Drag
+            </Label>
+          </div>
+        </RadioGroup>
       </div>
     </div>
   );
diff --git a/src/types.ts b/src/types.ts
index 6e39866..03f0c35 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,6 +1,8 @@
 import { z } from 'zod';
 
-export type Resolution = 'fullhd' | 'stretch';
+export type Resolution = 'fullhd' | 'stretched';
+
+export type DrawingMode = 'click' | 'drag';
 
 const heightSchema = z.number().int().min(1).max(13);
 export type Height = z.infer<typeof heightSchema>;

From 5627e780e20b256acdd56a6a57915c8f7ab695bd Mon Sep 17 00:00:00 2001
From: RUNFUNRUN <ryotauchiyama1212@gmail.com>
Date: Thu, 25 Jul 2024 00:02:23 +0900
Subject: [PATCH 2/2] fix: import sorting

---
 src/app/_components/canvas.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/_components/canvas.tsx b/src/app/_components/canvas.tsx
index 25428ef..df41209 100644
--- a/src/app/_components/canvas.tsx
+++ b/src/app/_components/canvas.tsx
@@ -1,5 +1,5 @@
 import type { AsciiData, DrawingMode, Height } from '@/types';
-import { useEffect, useState, type Dispatch, type SetStateAction } from 'react';
+import { type Dispatch, type SetStateAction, useEffect, useState } from 'react';
 import { Piece } from './piece';
 
 export const Canvas = ({