Merge remote-tracking branch 'origin/main' into feature/351

2026-06-22 12:39:17 +09:00
@@ -0,0 +1,83 @@
+import { act, fireEvent, render } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createRef } from 'react'
+
+import NicoViewer from '@/components/NicoViewer'
+
+import type { NiconicoViewerHandle } from '@/types'
+
+
+describe ('NicoViewer', () => {
+  afterEach (() => {
+    vi.useRealTimers ()
+  })
+
+  it ('does not time out after metadata reports a playable duration', () => {
+    vi.useFakeTimers ()
+
+    const onError = vi.fn ()
+    const onMetadataChange = vi.fn ()
+    const { container } = render (
+        <NicoViewer
+            id="sm12345"
+            width={640}
+            height={360}
+            onMetadataChange={onMetadataChange}
+            onError={onError}/>,
+    )
+    const iframe = container.querySelector ('iframe')
+    expect (iframe).not.toBeNull ()
+
+    fireEvent.load (iframe!)
+    act (() => {
+      window.dispatchEvent (new MessageEvent ('message', {
+        origin: 'https://embed.nicovideo.jp',
+        source: iframe!.contentWindow,
+        data:   {
+          eventName: 'playerMetadataChange',
+          data:      {
+            currentTime:           7,
+            duration:              120,
+            isVideoMetaDataLoaded: true,
+            maximumBuffered:       30,
+            muted:                 false,
+            showComment:           true,
+            volume:                1,
+          },
+        },
+      }))
+    })
+
+    act (() => {
+      vi.advanceTimersByTime (8_000)
+    })
+
+    expect (onMetadataChange).toHaveBeenCalled ()
+    expect (onError).not.toHaveBeenCalled ()
+  })
+
+  it ('seeks with milliseconds', () => {
+    const ref = createRef<NiconicoViewerHandle> ()
+    const { container } = render (
+        <NicoViewer
+            ref={ref}
+            id="sm12345"
+            width={640}
+            height={360}/>,
+    )
+    const iframe = container.querySelector ('iframe')!
+    const postMessage = vi.spyOn (iframe.contentWindow!, 'postMessage')
+
+    act (() => {
+      ref.current!.seek (7_000)
+    })
+
+    expect (postMessage).toHaveBeenCalledWith (
+        expect.objectContaining ({
+          eventName: 'seek',
+          data:      { time: 7_000 },
+        }),
+        'https://embed.nicovideo.jp',
+    )
+  })
+})
@@ -1,11 +1,11 @@
 import { forwardRef,
-         useCallback,
-         useEffect,
-         useImperativeHandle,
-         useLayoutEffect,
-         useMemo,
-         useRef,
-         useState } from 'react'
+	 useCallback,
+	 useEffect,
+	 useImperativeHandle,
+	 useLayoutEffect,
+	 useMemo,
+	 useRef,
+	 useState } from 'react'

 import type { CSSProperties, ForwardedRef } from 'react'

@@ -14,10 +14,20 @@ import type { NiconicoMetadata, NiconicoVideoInfo, NiconicoViewerHandle } from '
 type NiconicoPlayerMessage =
    | { eventName: 'enterProgrammaticFullScreen' }
    | { eventName: 'exitProgrammaticFullScreen' }
-    | { eventName: 'loadComplete'; playerId?: string; data: { videoInfo: NiconicoVideoInfo } }
-    | { eventName: 'playerMetadataChange'; playerId?: string; data: NiconicoMetadata }
-    | { eventName: 'playerStatusChange' | 'statusChange'; playerId?: string; data?: unknown }
-    | { eventName: 'error'; playerId?: string; data?: unknown; code?: string; message?: string }
+    | { eventName: 'loadComplete'
+	playerId?:  string
+	data:       { videoInfo: NiconicoVideoInfo } }
+    | { eventName: 'playerMetadataChange'
+	playerId?:  string
+	data:       NiconicoMetadata }
+    | { eventName: 'playerStatusChange' | 'statusChange'
+	playerId?:  string
+	data?:      unknown }
+    | { eventName: 'error'
+	playerId?:  string
+	data?:      unknown
+	code?:      string
+	message?:   string }

 type NiconicoCommand =
    | { eventName: 'play'; sourceConnectorType: 1; playerId: string }
@@ -30,6 +40,7 @@ type NiconicoCommand =
 	data: { commentVisibility: boolean } }

 const EMBED_ORIGIN = 'https://embed.nicovideo.jp'
+const LOAD_COMPLETE_TIMEOUT_MS = 8_000

 type Props = {
    id:                 string
@@ -37,14 +48,18 @@ type Props = {
    height:             number
    style?:             CSSProperties
    onLoadComplete?:    (info: NiconicoVideoInfo) => void
-    onMetadataChange?:  (meta: NiconicoMetadata) => void }
+    onMetadataChange?:  (meta: NiconicoMetadata) => void
+    onError?:           (data: unknown) => void }


 export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle>) => {
-  const { id, width, height, style = { }, onLoadComplete, onMetadataChange } = props
+  const { id, width, height, style = { }, onLoadComplete, onMetadataChange, onError } = props

  const iframeRef = useRef<HTMLIFrameElement> (null)
-  const playerId = useMemo (() => `nico-${ id }-${ Math.random ().toString (36).slice (2) }`, [id])
+  const loadCompleteTimerRef = useRef<ReturnType<typeof setTimeout> | null> (null)
+  const playerId = useMemo (
+      () => `nico-${ id }-${ Math.random ().toString (36).slice (2) }`,
+      [id])

  const [screenWidth, setScreenWidth] = useState<CSSProperties['width']> ()
  const [screenHeight, setScreenHeight] = useState<CSSProperties['height']> ()
@@ -64,21 +79,39 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle
  const styleFullScreen: CSSProperties =
      fullScreen
      ? { top: 0,
-          left: landscape ? 0 : '100%',
-          position: 'fixed',
-          width: screenWidth,
-          height: screenHeight,
-          zIndex: 2_147_483_647,
-          maxWidth: 'none',
-          transformOrigin: '0% 0%',
-          transform: landscape ? 'none' : 'rotate(90deg)',
-          WebkitTransformOrigin: '0% 0%',
-          WebkitTransform: landscape ? 'none' : 'rotate(90deg)' }
+	  left: landscape ? 0 : '100%',
+	  position: 'fixed',
+	  width: screenWidth,
+	  height: screenHeight,
+	  zIndex: 2_147_483_647,
+	  maxWidth: 'none',
+	  transformOrigin: '0% 0%',
+	  transform: landscape ? 'none' : 'rotate(90deg)',
+	  WebkitTransformOrigin: '0% 0%',
+	  WebkitTransform: landscape ? 'none' : 'rotate(90deg)' }
      : { }

  const margedStyle: CSSProperties =
      { border: 'none', maxWidth: '100%', ...style, ...styleFullScreen }

+  const clearLoadCompleteTimer = useCallback (() => {
+    if (!(loadCompleteTimerRef.current))
+      return
+
+    clearTimeout (loadCompleteTimerRef.current)
+    loadCompleteTimerRef.current = null
+  }, [])
+
+  const startLoadCompleteTimer = useCallback (() => {
+    clearLoadCompleteTimer ()
+    loadCompleteTimerRef.current = setTimeout (() => {
+      onError?.({
+	  eventName: 'loadCompleteTimeout',
+	  reason:    'niconico video length was not reported by embed',
+      })
+    }, LOAD_COMPLETE_TIMEOUT_MS)
+  }, [clearLoadCompleteTimer, onError])
+
  const postToPlayer = useCallback ((message: NiconicoCommand) => {
    const win = iframeRef.current?.contentWindow
    if (!(win))
@@ -96,7 +129,9 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle
  }, [playerId, postToPlayer])

  const seek = useCallback ((time: number) => {
-    postToPlayer ({ eventName: 'seek', sourceConnectorType: 1, playerId, data: { time } })
+    postToPlayer (
+	{ eventName: 'seek', sourceConnectorType: 1, playerId,
+	  data: { time } })
  }, [playerId, postToPlayer])

  const mute = useCallback (() => {
@@ -132,21 +167,21 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle
  useEffect (() => {
    const onMessage = (event: MessageEvent<NiconicoPlayerMessage>) => {
      if (!(iframeRef.current)
-          || (event.source !== iframeRef.current.contentWindow)
-          || (event.origin !== EMBED_ORIGIN))
-        return
+	  || (event.source !== iframeRef.current.contentWindow)
+	  || (event.origin !== EMBED_ORIGIN))
+	return

      const data = event.data

      if (!(data)
 	  || typeof data !== 'object'
 	  || !('eventName' in data))
-        return
+	return

      if (('playerId' in data)
 	  && data.playerId
 	  && data.playerId !== playerId)
-        return
+	return

      if (data.eventName === 'enterProgrammaticFullScreen')
 	{
@@ -162,24 +197,34 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle

      if (data.eventName === 'loadComplete')
 	{
+	  clearLoadCompleteTimer ()
 	  onLoadComplete?.(data.data.videoInfo)
 	  return
 	}

      if (data.eventName === 'playerMetadataChange')
 	{
+	  if (Number.isFinite (data.data.duration) && data.data.duration > 0)
+	    clearLoadCompleteTimer ()
+
 	  onMetadataChange?.(data.data)
 	  return
 	}

      if (data.eventName === 'error')
-        console.error ('niconico player error:', data)
+	{
+	  clearLoadCompleteTimer ()
+	  console.error ('niconico player error:', data)
+	  onError?.(data)
+	}
    }

    addEventListener ('message', onMessage)

    return () => removeEventListener ('message', onMessage)
-  }, [onLoadComplete, onMetadataChange, playerId])
+  }, [clearLoadCompleteTimer, onError, onLoadComplete, onMetadataChange, playerId])
+
+  useEffect (() => clearLoadCompleteTimer, [clearLoadCompleteTimer])

  useLayoutEffect (() => {
    if (!(fullScreen))
@@ -192,7 +237,7 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle

    const pollingResize = () => {
      if (ended)
-        return
+	return

      const isLandscape = innerWidth >= innerHeight
      const windowWidth = `${ isLandscape ? innerWidth : innerHeight }px`
@@ -206,9 +251,9 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle

    const startPollingResize = () => {
      if (requestAnimationFrame)
-        requestAnimationFrame (pollingResize)
+	requestAnimationFrame (pollingResize)
      else
-        pollingResize ()
+	pollingResize ()
    }

    startPollingResize ()
@@ -231,9 +276,10 @@ export default forwardRef ((props: Props, ref: ForwardedRef<NiconicoViewerHandle
      <iframe
 	  ref={iframeRef}
 	  src={src}
-	  width={width}
-	  height={height}
-	  style={margedStyle}
-	  allowFullScreen
-	  allow="autoplay"/>)
+		  width={width}
+		  height={height}
+		  style={margedStyle}
+		  onLoad={startLoadCompleteTimer}
+		  allowFullScreen
+		  allow="autoplay"/>)
 })
@@ -2,18 +2,23 @@ import { useEffect, useState } from 'react'

 import PostFormTagsArea from '@/components/PostFormTagsArea'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
-import Label from '@/components/common/Label'
+import FieldError from '@/components/common/FieldError'
+import FormField from '@/components/common/FormField'
 import { useDialogue } from '@/components/dialogues/DialogueProvider'
 import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { isApiError } from '@/lib/api'
 import { updatePost } from '@/lib/posts'
-import { msToTime } from '@/lib/utils'
+import { inputClass, msToTime } from '@/lib/utils'
+import { useValidationErrors } from '@/lib/useValidationErrors'

 import type { FC, FormEvent } from 'react'

 import type { Post, TagWithSections } from '@/types'

+type PostFormField =
+    'parentPostIds' | 'tags' | 'originalCreatedAt'
+

 const tagsToStr = (tags: TagWithSections[]): string => {
  const result: Omit<TagWithSections, 'children'>[] = []
@@ -39,6 +44,8 @@ type Props = { post:    Post

 const PostEditForm: FC<Props> = ({ post, onSave }) => {
  const [disabled, setDisabled] = useState (false)
+  const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
+      useValidationErrors<PostFormField> ()
  const [originalCreatedBefore, setOriginalCreatedBefore] =
      useState<string | null> (post.originalCreatedBefore)
  const [originalCreatedFrom, setOriginalCreatedFrom] =
@@ -51,6 +58,8 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
  const dialogue = useDialogue ()

  const update = async (...args: Parameters<typeof updatePost>) => {
+    clearValidationErrors ()
+
    try
    {
      const data = await updatePost (...args)
@@ -71,7 +80,14 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {

      if (response?.status !== 409)
 	{
-	  toast ({ description: '更新はできなかったよ……' })
+	  if (applyValidationError (e))
+	    {
+	      toast ({ description: '更新はできなかったよ……' })
+	      return
+	    }
+
+	  toast ({ title: '失敗……', description: '入力を確認してください．' })
+
 	  return
 	}

@@ -126,33 +142,38 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {

  return (
      <form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
+	<FieldError messages={baseErrors}/>
+
 	{/* タイトル */}
-	<div>
-	  <Label>タイトル</Label>
-	  <input
-	      type="text"
-	      disabled={disabled}
-	      className="w-full border rounded p-2"
-	      value={title ?? ''}
-	      onChange={ev => setTitle (ev.target.value)}/>
-	</div>
+	<FormField label="タイトル">
+	  {({ invalid }) => (
+	      <input
+		  type="text"
+		  disabled={disabled}
+		  className={inputClass (invalid)}
+		  value={title ?? ''}
+		  onChange={ev => setTitle (ev.target.value)}/>)}
+	</FormField>

 	{/* 親投稿 */}
-	<div>
-	  <Label>親投稿</Label>
-	  <input
-	      type="text"
-	      disabled={disabled}
-	      value={parentPostIds}
-	      onChange={e => setParentPostIds (e.target.value)}
-	      className="w-full border p-2 rounded"/>
-	</div>
+	<FormField label="親投稿" messages={fieldErrors.parentPostIds}>
+	  {({ describedBy, invalid }) => (
+	      <input
+		  type="text"
+		  disabled={disabled}
+		  value={parentPostIds}
+		  onChange={e => setParentPostIds (e.target.value)}
+		  aria-describedby={describedBy}
+		  aria-invalid={invalid}
+		  className={inputClass (invalid)}/>)}
+	</FormField>

 	{/* タグ */}
 	<PostFormTagsArea
 	    disabled={disabled}
 	    tags={tags}
-	    setTags={setTags}/>
+	    setTags={setTags}
+	    errors={fieldErrors.tags}/>

 	{/* オリジナルの作成日時 */}
 	<PostOriginalCreatedTimeField
@@ -160,12 +181,11 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 	    originalCreatedFrom={originalCreatedFrom}
 	    setOriginalCreatedFrom={setOriginalCreatedFrom}
 	    originalCreatedBefore={originalCreatedBefore}
-	    setOriginalCreatedBefore={setOriginalCreatedBefore}/>
+	    setOriginalCreatedBefore={setOriginalCreatedBefore}
+	    errors={fieldErrors.originalCreatedAt}/>

 	{/* 送信 */}
-	<Button
-	    type="submit"
-	    disabled={disabled}>
+	<Button type="submit" disabled={disabled}>
 	  更新
 	</Button>
      </form>)
@@ -8,12 +8,19 @@ const dialogue = vi.hoisted (() => ({
  confirm: vi.fn (),
 }))

+const nicoViewer = vi.hoisted (() => ({
+  props: vi.fn (),
+}))
+
 vi.mock ('@/components/dialogues/DialogueProvider', () => ({
  useDialogue: () => dialogue,
 }))

 vi.mock ('@/components/NicoViewer', () => ({
-  default: ({ id }: { id: string }) => <div>Nico:{id}</div>,
+  default: (props: { id: string }) => {
+    nicoViewer.props (props)
+    return <div>Nico:{props.id}</div>
+  },
 }))

 vi.mock ('react-youtube', () => ({
@@ -31,6 +38,64 @@ describe ('PostEmbed', () => {
    expect (screen.getByText ('Nico:sm12345')).toBeInTheDocument ()
  })

+  it ('reports niconico metadata as milliseconds', () => {
+    const onVideoReady = vi.fn ()
+    const onPlaybackChange = vi.fn ()
+    render (
+        <PostEmbed
+            post={buildPost ({ url: 'https://www.nicovideo.jp/watch/sm12345' })}
+            onVideoReady={onVideoReady}
+            onPlaybackChange={onPlaybackChange}/>,
+    )
+
+    nicoViewer.props.mock.calls[0][0].onMetadataChange ({
+      currentTime:            7_000,
+      duration:               120_000,
+      isVideoMetaDataLoaded:  true,
+      maximumBuffered:        30,
+      muted:                  false,
+      showComment:            true,
+      volume:                 1,
+    })
+
+    expect (onVideoReady).toHaveBeenCalledWith (120_000)
+    expect (onPlaybackChange).toHaveBeenCalledWith (7_000)
+  })
+
+  it ('reports niconico video readiness only once', () => {
+    const onVideoReady = vi.fn ()
+    render (
+        <PostEmbed
+            post={buildPost ({ url: 'https://www.nicovideo.jp/watch/sm12345' })}
+            onVideoReady={onVideoReady}/>,
+    )
+
+    nicoViewer.props.mock.calls[0][0].onLoadComplete ({
+      title:           '動画',
+      videoId:         'sm12345',
+      lengthInSeconds: 120,
+      thumbnailUrl:    'https://example.com/thumb.jpg',
+      description:     '',
+      viewCount:       1,
+      commentCount:    2,
+      mylistCount:     3,
+      postedAt:        '2026-01-02T03:04:05.000Z',
+      watchId:         12345,
+    })
+    nicoViewer.props.mock.calls[0][0].onMetadataChange ({
+      currentTime:            7_000,
+      duration:               120_000,
+      isVideoMetaDataLoaded:  true,
+      maximumBuffered:        30,
+      muted:                  false,
+      showComment:            true,
+      volume:                 1,
+    })
+
+    expect (onVideoReady).toHaveBeenCalledTimes (1)
+    expect (onVideoReady).toHaveBeenCalledWith (120_000)
+  })
+
  it ('embeds x/twitter status URLs', () => {
    render (<PostEmbed post={buildPost ({ url: 'https://x.com/someone/status/12345' })}/>)

@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import YoutubeEmbed from 'react-youtube'

 import NicoViewer from '@/components/NicoViewer'
@@ -8,17 +8,113 @@ import { useDialogue } from '@/components/dialogues/DialogueProvider'
 import type { FC, RefObject } from 'react'

 import type { NiconicoMetadata, NiconicoVideoInfo, NiconicoViewerHandle, Post } from '@/types'
+import type { YouTubePlayer } from 'react-youtube'
+
+type YouTubeEvent<T = unknown> = {
+    data:    T
+    target:  YouTubePlayer }

 type Props = {
    ref?:               RefObject<NiconicoViewerHandle | null>
    post:               Post
    onLoadComplete?:    (info: NiconicoVideoInfo) => void
-    onMetadataChange?:  (meta: NiconicoMetadata) => void }
+    onMetadataChange?:  (meta: NiconicoMetadata) => void
+    onVideoReady?:      (durationMs: number) => void
+    onPlaybackChange?:  (currentTimeMs: number) => number | void
+    onError?:           (data: unknown) => void }


-const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) => {
+const PostEmbed: FC<Props> = ({
+    ref,
+    post,
+    onLoadComplete,
+    onMetadataChange,
+    onVideoReady,
+    onPlaybackChange,
+    onError,
+}) => {
  const dialogue = useDialogue ()
  const [framed, setFramed] = useState (false)
+  const [youtubePlayer, setYoutubePlayer] = useState<YouTubePlayer | null> (null)
+  const niconicoVideoReadyRef = useRef (false)
+
+  const notifyNiconicoVideoReady = useCallback ((durationMs: number) => {
+    if (niconicoVideoReadyRef.current
+	|| !(Number.isFinite (durationMs))
+	|| durationMs <= 0)
+      return
+
+    niconicoVideoReadyRef.current = true
+    onVideoReady?.(durationMs)
+  }, [onVideoReady])
+
+  const reportYoutubePlayback = useCallback (async (player: YouTubePlayer) => {
+    const currentTime = await player.getCurrentTime ()
+    const currentTimeMs = currentTime * 1_000
+    const targetTimeMs = onPlaybackChange?.(currentTimeMs)
+
+    if (typeof targetTimeMs !== 'number')
+      return
+
+    if (Math.abs (currentTimeMs - targetTimeMs) > 5_000)
+      await player.seekTo (targetTimeMs / 1_000, true)
+  }, [onPlaybackChange])
+
+  const handleYoutubeReady = async (event: YouTubeEvent) => {
+    setYoutubePlayer (event.target)
+
+    try
+    {
+      await event.target.playVideo ()
+
+      const duration = await event.target.getDuration ()
+      const durationMs = duration * 1_000
+      onVideoReady?.(durationMs)
+
+      if (!(Number.isFinite (durationMs)) || durationMs <= 0)
+	return
+
+      await reportYoutubePlayback (event.target)
+    }
+    catch (error)
+    {
+      onError?.({ platform: 'youtube', error })
+    }
+  }
+
+  const handleYoutubeStateChange = (event: YouTubeEvent<number>) => {
+    void reportYoutubePlayback (event.target)
+  }
+
+  const handleYoutubeError = (event: YouTubeEvent<number>) => {
+    onError?.({ platform: 'youtube', code: event.data })
+  }
+
+  const handleNiconicoLoadComplete = (info: NiconicoVideoInfo) => {
+    notifyNiconicoVideoReady (info.lengthInSeconds * 1_000)
+    onLoadComplete?.(info)
+  }
+
+  const handleNiconicoMetadataChange = (meta: NiconicoMetadata) => {
+    notifyNiconicoVideoReady (meta.duration)
+    onPlaybackChange?.(meta.currentTime)
+    onMetadataChange?.(meta)
+  }
+
+  useEffect (() => {
+    niconicoVideoReadyRef.current = false
+  }, [post.url])
+
+  useEffect (() => {
+    if (!(youtubePlayer) || !(onPlaybackChange))
+      return
+
+    const timer = setInterval (
+	() => void reportYoutubePlayback (youtubePlayer),
+	1_000)
+
+    return () => clearInterval (timer)
+  }, [onPlaybackChange, reportYoutubePlayback, youtubePlayer])

  const url = new URL (post.url)

@@ -38,8 +134,9 @@ const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) =
 	      id={videoId}
 	      width={640}
 	      height={360}
-	      onLoadComplete={onLoadComplete}
-	      onMetadataChange={onMetadataChange}/>)
+	      onLoadComplete={handleNiconicoLoadComplete}
+	      onMetadataChange={handleNiconicoMetadataChange}
+	      onError={onError}/>)
    }

  case 'twitter.com':
@@ -69,7 +166,10 @@ const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) =
 	      mute:         0,
 	      loop:         1,
 	      width:        '640',
-	      height:       '360' } }}/>)
+	      height:       '360' } }}
+	      onReady={handleYoutubeReady}
+	      onStateChange={handleYoutubeStateChange}
+	      onError={handleYoutubeError}/>)
    }
  }

@@ -3,7 +3,7 @@
 import { useRef, useState } from 'react'

 import TagSearchBox from '@/components/TagSearchBox'
-import Label from '@/components/common/Label'
+import FormField from '@/components/common/FormField'
 import TextArea from '@/components/common/TextArea'
 import { apiGet } from '@/lib/api'

@@ -33,10 +33,11 @@ const replaceToken = (value: string, start: number, end: number, text: string) =

 type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
    tags:     string
-    setTags:  (tags: string) => void }
+    setTags:  (tags: string) => void
+    errors?:  string[] }


-const PostFormTagsArea: FC<Props> = ({ tags, setTags, ...rest }) => {
+const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
  const ref = useRef<HTMLTextAreaElement> (null)

  const [bounds, setBounds] = useState<{ start: number; end: number }> ({ start: 0, end: 0 })
@@ -73,30 +74,34 @@ const PostFormTagsArea: FC<Props> = ({ tags, setTags, ...rest }) => {
  }

  return (
-      <div className="relative w-full">
-	<Label>タグ</Label>
-	<TextArea
-	    {...rest}
-	    ref={ref}
-	    value={tags}
-	    onChange={ev => setTags (ev.target.value)}
-	    onSelect={async (ev: SyntheticEvent<HTMLTextAreaElement>) => {
-	      const pos = (ev.target as HTMLTextAreaElement).selectionStart
-	      await recompute (pos)
-	    }}
-	    onFocus={() => setFocused (true)}
-	    onBlur={() => {
-	      setFocused (false)
-	      setSuggestionsVsbl (false)
-	    }}/>
-	{focused && (
-	    <TagSearchBox
-		suggestions={suggestionsVsbl && suggestions.length > 0
-			     ? suggestions
-			     : [] as Tag[]}
-		activeIndex={-1}
-		onSelect={handleTagSelect}/>)}
-      </div>)
+      <FormField className="relative w-full" label="タグ" messages={errors}>
+	{({ describedBy, invalid }) => (
+	    <>
+	      <TextArea
+		  {...rest}
+		  ref={ref}
+		  value={tags}
+		  aria-describedby={describedBy}
+		  invalid={invalid}
+		  onChange={ev => setTags (ev.target.value)}
+		  onSelect={async (ev: SyntheticEvent<HTMLTextAreaElement>) => {
+		    const pos = (ev.target as HTMLTextAreaElement).selectionStart
+		    await recompute (pos)
+		  }}
+		  onFocus={() => setFocused (true)}
+		  onBlur={() => {
+		    setFocused (false)
+		    setSuggestionsVsbl (false)
+		  }}/>
+	      {focused && (
+		  <TagSearchBox
+		      suggestions={suggestionsVsbl && suggestions.length > 0
+				   ? suggestions
+				   : [] as Tag[]}
+		      activeIndex={-1}
+		      onSelect={handleTagSelect}/>)}
+	    </>)}
+      </FormField>)
 }

-export default PostFormTagsArea
+export default PostFormTagsArea
@@ -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
@@ -18,6 +18,21 @@ describe ('TagLink', () => {
    expect (screen.getByText ('4')).toBeInTheDocument ()
  })

+  it ('does not append deprecated state to the rendered tag name', () => {
+    renderWithProviders (
+        <TagLink
+            tag={buildTag ({
+                name:         '旧タグ',
+                deprecatedAt: '2026-06-01T00:00:00.000Z',
+            })}
+            withWiki={false}
+            withCount={false}/>,
+    )
+
+    expect (screen.getByRole ('link', { name: '旧タグ' })).toBeInTheDocument ()
+    expect (screen.queryByText ('（廃止）')).not.toBeInTheDocument ()
+  })
+
  it ('links wiki markers to the correct detail route', () => {
    renderWithProviders (
        <TagLink tag={buildTag ({ hasWiki: true, name: 'a/b' })}/>,
@@ -128,4 +128,4 @@ const TagLink: FC<Props> = ({ tag,
      </>)
 }

-export default TagLink
+export default TagLink
@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react'
 import { useNavigate, useLocation } from 'react-router-dom'

 import { apiGet } from '@/lib/api'
+import { inputClass } from '@/lib/utils'

 import TagSearchBox from './TagSearchBox'

@@ -110,11 +111,12 @@ const TagSearch: FC = () => {
 	       onFocus={() => setSuggestionsVsbl (true)}
 	       onBlur={() => setSuggestionsVsbl (false)}
 	       onKeyDown={handleKeyDown}
-	       className="w-full px-3 py-2 border rounded dark:border-gray-600 dark:bg-gray-800 dark:text-white"/>
+	       className={inputClass (false,
+				      'px-3 py-2 dark:border-gray-600 dark:bg-gray-800 dark:text-white')}/>
 	<TagSearchBox suggestions={suggestionsVsbl && suggestions.length ? suggestions : [] as Tag[]}
 		      activeIndex={activeIndex}
 		      onSelect={handleTagSelect}/>
      </div>)
 }

-export default TagSearch
+export default TagSearch
@@ -55,12 +55,6 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 	  { name: '追加', to: '/materials/new' },
 	  { name: '全体履歴', to: '/materials/changes', visible: false },
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
-      { name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
-	  { name: <>第&thinsp;1&thinsp;会場</>, to: '/theatres/1' },
-	  { name: 'CyTube', to: '//cytube.mm428.net/r/deernijika' },
-	  { name: <>ニジカ放送局第&thinsp;1&thinsp;チャンネル</>,
-	    to: '//www.youtube.com/watch?v=DCU3hL4Uu6A' },
-	  { name: 'ヘルプ', to: '/wiki/ヘルプ:上映会' }] },
      { name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
 	  { name: '検索', to: '/wiki' },
 	  { name: '新規', to: '/wiki/new' },
@@ -71,6 +65,9 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 	    visible: wikiPageFlg },
 	  { name: '履歴', to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
 	  { name: '編輯', to: `/wiki/${ wikiId || wikiTitle }/edit`, visible: wikiPageFlg }] },
+      { name: 'おたのしみ', visible: false, subMenu: [
+	  { name: '上映会 (β)', to: '/theatres/1' },
+	  { name: 'グカネータ (β)', to: '/gekanator' }] },
      { name: 'ユーザ', to: '/users/settings', visible: false, subMenu: [
 	  { name: '一覧', to: '/users', visible: false },
 	  { name: 'お前', to: `/users/${ user?.id }`, visible: false },
@@ -132,8 +129,12 @@ const TopNav: FC<Props> = ({ user }) => {

  const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
  const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
+  const moreMenu = menu.filter (item =>
+      !(item.visible ?? true)
+      || item.subMenu.filter (subItem => subItem.visible ?? true).length > 0)
  const activeIdx =
      visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
+  const submenuHeight = moreVsbl ? 40 * moreMenu.length : (activeIdx < 0 ? 0 : 40)

  const prevActiveIdxRef = useRef<number> (activeIdx)

@@ -244,9 +245,9 @@ const TopNav: FC<Props> = ({ user }) => {
 	  <motion.div
 	      key="submenu-shell"
 	      layout
-	      className="relative hidden md:block overflow-hidden
+	      className="relative z-20 hidden md:block overflow-hidden
 			 bg-yellow-200 dark:bg-red-950"
-	      style={{ height: moreVsbl ? 40 * menu.length : (activeIdx < 0 ? 0 : 40) }}
+	      animate={{ height: submenuHeight }}
 	      onMouseLeave={() => {
 		if (moreVsbl)
 		  setMoreVsbl (false)
@@ -257,7 +258,7 @@ const TopNav: FC<Props> = ({ user }) => {
 	      }}>
 	  {moreVsbl
 	   ? (
-	      menu.map ((item, i) => (
+	      moreMenu.map ((item, i) => (
 		  <div key={i} className="relative h-[40px]">
 		    <div className="absolute inset-0 flex items-center px-3">
 		      <motion.div
@@ -267,7 +268,7 @@ const TopNav: FC<Props> = ({ user }) => {
 			       : { initial: { x: 40, y: -40, opacity: 0 },
 				   animate: { x: 0, y: 0, opacity: 1 },
 				   exit: { x: 40, y: -40, opacity: 0 } })}
-			  className="z-10 h-full flex items-center px-3 font-bold w-24">
+			  className="z-10 h-full flex items-center px-3 font-bold w-28">
 			<h2>{item.name}</h2>
 		      </motion.div>
 		      {item.subMenu
@@ -22,10 +22,11 @@ type Props = Omit<ComponentPropsWithoutRef<'input'>, 'onChange'> & {
    value?:     string
    onChange?:  (isoUTC: string | null) => void
    className?: string
-    onBlur?:    (ev: FocusEvent<HTMLInputElement>) => void }
+    onBlur?:    (ev: FocusEvent<HTMLInputElement>) => void
+    invalid?:   boolean }


-const DateTimeField: FC<Props> = ({ value, onChange, className, onBlur, ...rest }) => {
+const DateTimeField: FC<Props> = ({ value, onChange, className, onBlur, invalid, ...rest }) => {
  const [local, setLocal] = useState ('')

  useEffect (() => {
@@ -35,9 +36,19 @@ const DateTimeField: FC<Props> = ({ value, onChange, className, onBlur, ...rest
  return (
      <input
 	  {...rest}
-	  className={cn ('border rounded p-2', className)}
+	  className={cn ('border rounded p-2',
+			 (invalid
+			  ? ['border-red-500 bg-red-50 text-red-900',
+			     'focus:border-red-500 focus:outline-none',
+			     'focus:ring-2 focus:ring-red-200',
+			     'dark:border-red-500 dark:bg-red-950/30 dark:text-red-100']
+			  : ['border-gray-300',
+			     'focus:border-blue-500 focus:outline-none',
+			     'focus:ring-2 focus:ring-blue-200']),
+			 className)}
 	  type="datetime-local"
 	  value={local}
+	  aria-invalid={invalid}
 	  onChange={ev => {
 	    const v = ev.target.value
 	    setLocal (v)
@@ -46,4 +57,4 @@ const DateTimeField: FC<Props> = ({ value, onChange, className, onBlur, ...rest
 	  onBlur={onBlur}/>)
 }

-export default DateTimeField
+export default DateTimeField
@@ -0,0 +1,18 @@
+import type { FC } from 'react'
+
+type Props = { id?:        string
+	       messages?:  string[] }
+
+
+export const FieldError: FC<Props> = ({ id, messages }: Props) => {
+  if (!(messages) || messages.length === 0)
+    return null
+
+  return (
+      <ul id={id} className="mt-1 space-y-1 text-red-700 dark:text-red-300">
+	{messages.map ((message, i) => <li key={i}>{message}</li>)}
+      </ul>)
+}
+
+
+export default FieldError
@@ -0,0 +1,36 @@
+import { useId } from 'react'
+
+import FieldError from '@/components/common/FieldError'
+import Label from '@/components/common/Label'
+import { cn } from '@/lib/utils'
+
+import type { FC, ReactNode } from 'react'
+
+type FieldState = { describedBy?: string
+		    invalid:      boolean }
+
+type Props = {
+    children:   (state: FieldState) => ReactNode
+    checkBox?:   { label:    string
+		   checked:  boolean
+		   onChange: (event: React.ChangeEvent<HTMLInputElement>) => void }
+    className?:  string
+    label:      ReactNode
+    messages?:  string[] }
+
+
+const FormField: FC<Props> = ({ children, checkBox, className, label, messages }: Props) => {
+  const id = useId ()
+  const invalid = messages != null && messages.length > 0
+  const errorId = invalid ? `${ id }-error` : undefined
+
+  return (
+      <div className={cn (className)}>
+	<Label checkBox={checkBox} invalid={invalid}>{label}</Label>
+	{children ({ describedBy: errorId, invalid })}
+	<FieldError id={errorId} messages={messages}/>
+      </div>)
+}
+
+
+export default FormField
@@ -1,32 +1,39 @@
 import React from 'react'

+import { cn } from '@/lib/utils'
+
 import type { FC } from 'react'

 type Props = { children:  React.ReactNode
-               checkBox?: { label:    string
-                            checked:  boolean
-                            onChange: (event: React.ChangeEvent<HTMLInputElement>) => void } }
+	       checkBox?: { label:    string
+			    checked:  boolean
+			    onChange: (event: React.ChangeEvent<HTMLInputElement>) => void }
+	       invalid?:  boolean }


-const Label: FC<Props> = ({ children, checkBox }) => {
+const Label: FC<Props> = ({ children, checkBox, invalid }: Props) => {
+  const labelClassName = cn ('block font-semibold mb-1',
+			     invalid && 'text-red-700 dark:text-red-300')
+
  if (!(checkBox))
    {
      return (
-          <label className="block font-semibold mb-1">
-            {children}
-          </label>)
+	  <label className={labelClassName}>
+	    {children}
+	  </label>)
    }

  return (
      <div className="flex gap-2 mb-1">
-        <label className="flex-1 block font-semibold">{children}</label>
-        <label className="flex items-center block gap-1">
-          <input type="checkbox"
-                 checked={checkBox.checked}
-                 onChange={checkBox.onChange}/>
-          {checkBox.label}
-        </label>
+	<label className="flex-1 block font-semibold">{children}</label>
+	<label className="flex items-center block gap-1">
+	  <input type="checkbox"
+		 checked={checkBox.checked}
+		 onChange={checkBox.onChange}/>
+	  {checkBox.label}
+	</label>
      </div>)
 }

+
 export default Label
@@ -2,6 +2,7 @@ import { useState } from 'react'

 import TagSearchBox from '@/components/TagSearchBox'
 import { apiGet } from '@/lib/api'
+import { inputClass } from '@/lib/utils'

 import type { FC, ChangeEvent, KeyboardEvent } from 'react'

@@ -9,10 +10,13 @@ import type { Tag } from '@/types'


 type Props = {
-    value:      string
-    setValue:   (value: string) => void }
+    describedBy?:  string
+    invalid?:      boolean
+    value:         string
+    setValue:      (value: string) => void }

-const TagInput: FC<Props> = ({ value, setValue }) => {
+
+const TagInput: FC<Props> = ({ describedBy, invalid, value, setValue }) => {
  const [activeIndex, setActiveIndex] = useState (-1)
  const [suggestions, setSuggestions] = useState<Tag[]> ([])
  const [suggestionsVsbl, setSuggestionsVsbl] = useState (false)
@@ -85,12 +89,14 @@ const TagInput: FC<Props> = ({ value, setValue }) => {
      <div className="relative">
 	<input
 	    type="text"
+	    aria-describedby={describedBy}
+	    aria-invalid={invalid}
 	    value={value}
 	    onChange={whenChanged}
 	    onFocus={() => setSuggestionsVsbl (true)}
 	    onBlur={() => setSuggestionsVsbl (false)}
 	    onKeyDown={handleKeyDown}
-	    className="w-full border p-2 rounded"/>
+	    className={inputClass (invalid)}/>
 	<TagSearchBox
 	    suggestions={
 		suggestionsVsbl && suggestions.length > 0 ? suggestions : [] as Tag[]}
@@ -99,4 +105,4 @@ const TagInput: FC<Props> = ({ value, setValue }) => {
      </div>)
 }

-export default TagInput
+export default TagInput
@@ -1,9 +1,25 @@
 import { forwardRef } from 'react'

+import { cn } from '@/lib/utils'
+
 import type { TextareaHTMLAttributes } from 'react'

-type Props = TextareaHTMLAttributes<HTMLTextAreaElement>
+type Props = TextareaHTMLAttributes<HTMLTextAreaElement> & { invalid?: boolean }


-export default forwardRef<HTMLTextAreaElement, Props> (({ ...props }, ref) => (
-    <textarea ref={ref} className="rounded border w-full p-2 h-32" {...props}/>))
+export default forwardRef<HTMLTextAreaElement, Props> (
+    ({ className, invalid = false, ...props }, ref) => (
+	<textarea
+	    ref={ref}
+	    aria-invalid={invalid}
+	    className={cn ('rounded border w-full p-2 h-32',
+			   (invalid
+			    ? ['border-red-500 bg-red-50 text-red-900',
+			       'focus:border-red-500 focus:outline-none focus:ring-2',
+			       'focus:ring-red-200',
+			       'dark:border-red-500 dark:bg-red-950/30 dark:text-red-100']
+			    : ['border-gray-300',
+			       'focus:border-blue-500 focus:outline-none focus:ring-2',
+			       'focus:ring-blue-200']),
+			   className)}
+	    {...props}/>))