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

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

frontend/src/pages/posts/PostSearchPage.tsx

@@ -8,7 +8,7 @@ import PrefetchLink from '@/components/PrefetchLink'
 import SortHeader from '@/components/SortHeader'
 import TagLink from '@/components/TagLink'
 import DateTimeField from '@/components/common/DateTimeField'
-import Label from '@/components/common/Label'
+import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import Pagination from '@/components/common/Pagination'
 import TagInput from '@/components/common/TagInput'
@@ -16,7 +16,7 @@ import MainArea from '@/components/layout/MainArea'
 import { SITE_TITLE } from '@/config'
 import { fetchPosts } from '@/lib/posts'
 import { postsKeys } from '@/lib/queryKeys'
-import { dateString, originalCreatedAtString } from '@/lib/utils'
+import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
 
 import type { FC, FormEvent } from 'react'
 
@@ -138,31 +138,33 @@ const PostSearchPage: FC = () => {
 
 	  <form onSubmit={handleSearch} className="space-y-2">
 	    {/* タイトル */}
-	    <div>
-	      <Label>タイトル</Label>
-	      <input
-		  type="text"
-		  value={title}
-		  onChange={e => setTitle (e.target.value)}
-		  className="w-full border p-2 rounded"/>
-	    </div>
+	    <FormField label="タイトル">
+	      {({ invalid }) => (
+		  <input
+		      type="text"
+		      value={title}
+		      onChange={e => setTitle (e.target.value)}
+		      className={inputClass (invalid)}/>)}
+	    </FormField>
 
 	    {/* URL */}
-	    <div>
-	      <Label>URL</Label>
-	      <input
-		  type="text"
-		  value={url}
-		  onChange={e => setURL (e.target.value)}
-		  className="w-full border p-2 rounded"/>
-	    </div>
+	    <FormField label="URL">
+	      {({ invalid }) => (
+		  <input
+		      type="text"
+		      value={url}
+		      onChange={e => setURL (e.target.value)}
+		      className={inputClass (invalid)}/>)}
+	    </FormField>
 
 	    {/* タグ */}
+	    <FormField label="タグ">
+	      {() => (
+		  <TagInput
+		      value={tagsStr}
+		      setValue={setTagsStr}/>)}
+	    </FormField>
 	    <div>
-	      <Label>タグ</Label>
-	      <TagInput
-		  value={tagsStr}
-		  setValue={setTagsStr}/>
 	      <fieldset className="w-full my-2">
 		<label>検索区分：</label>
 		<label className="mx-2">
@@ -185,40 +187,46 @@ const PostSearchPage: FC = () => {
 	    </div>
 
 	    {/* オリジナルの投稿日時 */}
-	    <div>
-	      <Label>オリジナルの投稿日時</Label>
-	      <DateTimeField
-		  value={originalCreatedFrom ?? undefined}
-		  onChange={setOriginalCreatedFrom}/>
-	      <span className="mx-1">〜</span>
-	      <DateTimeField
-		  value={originalCreatedTo ?? undefined}
-		  onChange={setOriginalCreatedTo}/>
-	    </div>
+	    <FormField label="オリジナルの投稿日時">
+	      {() => (
+		  <>
+		    <DateTimeField
+			value={originalCreatedFrom ?? undefined}
+			onChange={setOriginalCreatedFrom}/>
+		    <span className="mx-1">〜</span>
+		    <DateTimeField
+			value={originalCreatedTo ?? undefined}
+			onChange={setOriginalCreatedTo}/>
+		  </>)}
+	    </FormField>
 
 	    {/* 投稿日時 */}
-	    <div>
-	      <Label>投稿日時</Label>
-	      <DateTimeField
-		  value={createdFrom ?? undefined}
-		  onChange={setCreatedFrom}/>
-	      <span className="mx-1">〜</span>
-	      <DateTimeField
-		  value={createdTo ?? undefined}
-		  onChange={setCreatedTo}/>
-	    </div>
+	    <FormField label="投稿日時">
+	      {() => (
+		  <>
+		    <DateTimeField
+			value={createdFrom ?? undefined}
+			onChange={setCreatedFrom}/>
+		    <span className="mx-1">〜</span>
+		    <DateTimeField
+			value={createdTo ?? undefined}
+			onChange={setCreatedTo}/>
+		  </>)}
+	    </FormField>
 
 	    {/* 更新日時 */}
-	    <div>
-	      <Label>更新日時</Label>
-	      <DateTimeField
-		  value={updatedFrom ?? undefined}
-		  onChange={setUpdatedFrom}/>
-	      <span className="mx-1">〜</span>
-	      <DateTimeField
-		  value={updatedTo ?? undefined}
-		  onChange={setUpdatedTo}/>
-	    </div>
+	    <FormField label="更新日時">
+	      {() => (
+		  <>
+		    <DateTimeField
+			value={updatedFrom ?? undefined}
+			onChange={setUpdatedFrom}/>
+		    <span className="mx-1">〜</span>
+		    <DateTimeField
+			value={updatedTo ?? undefined}
+			onChange={setUpdatedTo}/>
+		  </>)}
+	    </FormField>
 
 	    {/* 検索 */}
 	    <div className="py-3">