フォームのバリデーションとニコ連携の画面変更 (#090) (#355)

Reviewed-on: #355
Co-authored-by: miteruzo <miteruzo@naver.com>
Co-committed-by: miteruzo <miteruzo@naver.com>

frontend/src/components/PostOriginalCreatedTimeField.tsx

@@ -1,5 +1,5 @@
 import DateTimeField from '@/components/common/DateTimeField'
-import Label from '@/components/common/Label'
+import FormField from '@/components/common/FormField'
 import { Button } from '@/components/ui/button'
 
 import type { FC } from 'react'
@@ -9,68 +9,81 @@ type Props = {
     originalCreatedFrom:      string | null
     setOriginalCreatedFrom:   (x: string | null) => void
     originalCreatedBefore:    string | null
-    setOriginalCreatedBefore: (x: string | null) => void }
+    setOriginalCreatedBefore: (x: string | null) => void
+    errors?:                  string[] }
 
 
-const PostOriginalCreatedTimeField: FC<Props> = ({ disabled,
-		   originalCreatedFrom,
-		   setOriginalCreatedFrom,
-		   originalCreatedBefore,
-		   setOriginalCreatedBefore }) => (
-    <div>
-      <Label>オリジナルの作成日時</Label>
-      <div className="my-1 flex">
-	<div className="w-80">
-	  <DateTimeField
-	      className="mr-2"
-	      disabled={disabled ?? false}
-	      value={originalCreatedFrom ?? undefined}
-	      onChange={setOriginalCreatedFrom}
-	      onBlur={ev => {
-		const v = ev.target.value
-		if (!(v))
-		  return
+const PostOriginalCreatedTimeField: FC<Props> = (
+    { disabled,
+      originalCreatedFrom,
+      setOriginalCreatedFrom,
+      originalCreatedBefore,
+      setOriginalCreatedBefore,
+      errors }: Props,
+) => (
+    <FormField label="オリジナルの作成日時" messages={errors}>
+      {({ describedBy, invalid }) => (
+	  <>
+	    <div className="my-1 flex">
+	      <div className="w-80">
+		<DateTimeField
+		    className="mr-2"
+		    disabled={disabled ?? false}
+		    aria-describedby={describedBy}
+		    aria-invalid={invalid}
+		    invalid={invalid}
+		    value={originalCreatedFrom ?? undefined}
+		    onChange={setOriginalCreatedFrom}
+		    onBlur={ev => {
+		      const v = ev.target.value
+		      if (!(v))
+			return
 
-		const d = new Date (v)
-		if (d.getMinutes () === 0 && d.getHours () === 0)
-		  d.setDate (d.getDate () + 1)
-		else
-		  d.setMinutes (d.getMinutes () + 1)
-		setOriginalCreatedBefore (d.toISOString ())
-	      }}/>
-	  以降
-	</div>
-	<div>
-	  <Button
-	      className="bg-gray-600 text-white rounded"
-	      disabled={disabled}
-	      onClick={() => {
-		setOriginalCreatedFrom (null)
-	      }}>
-	    リセット
-	  </Button>
-	</div>
-      </div>
-      <div className="my-1 flex">
-	<div className="w-80">
-	  <DateTimeField
-	      className="mr-2"
-	      disabled={disabled}
-	      value={originalCreatedBefore ?? undefined}
-	      onChange={setOriginalCreatedBefore}/>
-	  より前
-	</div>
-	<div>
-	  <Button
-	      className="bg-gray-600 text-white rounded"
-	      disabled={disabled}
-	      onClick={() => {
-		setOriginalCreatedBefore (null)
-	      }}>
-	    リセット
-	  </Button>
-	</div>
-      </div>
-    </div>)
+		      const d = new Date (v)
+		      if (d.getMinutes () === 0 && d.getHours () === 0)
+			d.setDate (d.getDate () + 1)
+		      else
+			d.setMinutes (d.getMinutes () + 1)
+		      setOriginalCreatedBefore (d.toISOString ())
+		    }}/>
+		以降
+	      </div>
+	      <div>
+		<Button
+		    className="bg-gray-600 text-white rounded"
+		    disabled={disabled}
+		    onClick={() => {
+		      setOriginalCreatedFrom (null)
+		    }}>
+		  リセット
+		</Button>
+	      </div>
+	    </div>
 
-export default PostOriginalCreatedTimeField
+	    <div className="my-1 flex">
+	      <div className="w-80">
+		<DateTimeField
+		    className="mr-2"
+		    disabled={disabled}
+		    aria-describedby={describedBy}
+		    aria-invalid={invalid}
+		    invalid={invalid}
+		    value={originalCreatedBefore ?? undefined}
+		    onChange={setOriginalCreatedBefore}/>
+		より前
+	      </div>
+	      <div>
+		<Button
+		    className="bg-gray-600 text-white rounded"
+		    disabled={disabled}
+		    onClick={() => {
+		      setOriginalCreatedBefore (null)
+		    }}>
+		  リセット
+		</Button>
+	      </div>
+	    </div>
+	  </>)}
+    </FormField>)
+
+export default PostOriginalCreatedTimeField