#71

frontend/src/components/TagLink.tsx

@@ -3,18 +3,28 @@ import { Link } from 'react-router-dom'
 import { LIGHT_COLOUR_SHADE, DARK_COLOUR_SHADE, TAG_COLOUR } from '@/consts'
 import { cn } from '@/lib/utils'
 
+import type { ComponentProps, HTMLAttributes } from 'react'
+
 import type { Tag } from '@/types'
 
-type Props = { tag:         Tag
+type CommonProps = { tag:         Tag
-	       linkFlg?:    boolean
+		     withWiki?:   boolean
-	       withWiki?:   boolean
+		     withCount?:  boolean }
-	       withCount?:  boolean }
+
+type PropsWithLink =
+    CommonProps & { linkFlg?: true } & Partial<ComponentProps<typeof Link>>
+
+type PropsWithoutLink =
+    CommonProps & { linkFlg: false } & Partial<HTMLAttributes<HTMLSpanElement>>
+
+type Props = PropsWithLink | PropsWithoutLink
 
 
 export default ({ tag,
 		  linkFlg   = true,
 		  withWiki  = true,
-		  withCount = true }: Props) => {
+		  withCount = true,
+		  ...props }: Props) => {
   const spanClass = cn (
       `text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
       `dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
@@ -35,11 +45,13 @@ export default ({ tag,
 	{linkFlg
 	 ? (
 	    <Link to={`/posts?${ (new URLSearchParams ({ tags: tag.name })).toString () }`}
-		  className={linkClass}>
+		  className={linkClass}
+		  {...props}>
 	      {tag.name}
 	    </Link>)
 	 : (
-	    <span className={spanClass}>
+	    <span className={spanClass}
+		  {...props}>
 	      {tag.name}
 	    </span>)}
 	{withCount && (

frontend/src/pages/posts/PostListPage.tsx

@@ -102,7 +102,9 @@ export default () => {
 		<Tab name="Wiki" init={!(posts.length)}>
 		  <WikiBody body={wikiPage.body} />
 		  <div className="my-2">
-		    <Link to={`/wiki/${ encodeURIComponent (wikiPage.title) }`}>Wiki を見る</Link>
+		    <Link to={`/wiki/${ encodeURIComponent (wikiPage.title) }`}>
+		      Wiki を見る
+		    </Link>
 		  </div>
 		</Tab>)}
 	  </TabGroup>

frontend/src/pages/wiki/WikiDetailPage.tsx

@@ -102,20 +102,25 @@ export default () => {
 	{(wikiPage && version) && (
 	    <div className="text-sm flex gap-3 items-center justify-center border border-gray-700 rounded px-2 py-1 mb-4">
 	      {wikiPage.pred ? (
-		  <Link to={`/wiki/${ title }?version=${ wikiPage.pred }`}>
+		  <Link to={`/wiki/${ encodeURIComponent (title) }?version=${ wikiPage.pred }`}>
 		    &lt; 古
-		  </Link>) : <>(最古)</>}
+		  </Link>) : '(最古)'}
 
 	      <span>{wikiPage.updatedAt}</span>
 
 	      {wikiPage.succ ? (
-		  <Link to={`/wiki/${ title }?version=${ wikiPage.succ }`}>
+		  <Link to={`/wiki/${ encodeURIComponent (title) }?version=${ wikiPage.succ }`}>
 		    新 &gt;
-		  </Link>) : <>(最新)</>}
+		  </Link>) : '(最新)'}
 	    </div>)}
 
 	<PageTitle>
-	  <TagLink tag={tag} withWiki={false} withCount={false} />
+	  <TagLink tag={tag}
+		   withWiki={false}
+		   withCount={false}
+		   to={version
+		       ? `/wiki/${ encodeURIComponent (title) }`
+		       : undefined} />
 	</PageTitle>
 	<div className="prose mx-auto p-4">
 	  {wikiPage === undefined
@@ -123,7 +128,7 @@ export default () => {
 	   : <WikiBody body={wikiPage?.body || `このページは存在しません。[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`} />}
 	</div>
 
-	{posts.length > 0 && (
+	{(!(version) && posts.length > 0) && (
 	    <TabGroup>
 	      <Tab name="広場">
 		<PostList posts={posts} />