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

frontend/src/components/MaterialSidebar.tsx

@@ -488,25 +488,23 @@ const MaterialSidebar: FC = () => {
 	  </div>
 	</div>
 
-	<div className="hidden md:block">
+	<SidebarComponent sidebarKey="materials" className="hidden md:block">
-	  <SidebarComponent>
+	  <div className="space-y-4">
-	    <div className="space-y-4">
+	    <MaterialFilterButtons
-	      <MaterialFilterButtons
+		materialFilter={materialFilter}
-		  materialFilter={materialFilter}
+		onChange={handleFilterChange}/>
-		  onChange={handleFilterChange}/>
+	    {isLoading && (
-	      {isLoading && (
+		<p className="text-sm text-neutral-500 dark:text-stone-400">読込中……</p>)}
-		  <p className="text-sm text-neutral-500 dark:text-stone-400">読込中……</p>)}
+	    {isError && (
-	      {isError && (
+		<p className="text-sm text-red-600 dark:text-red-300">
-		  <p className="text-sm text-red-600 dark:text-red-300">
+		  タグ一覧の取得に失敗しました．
-		    タグ一覧の取得に失敗しました．
+		</p>)}
-		  </p>)}
+	    {(!isLoading && !isError) && (
-	      {(!isLoading && !isError) && (
+		<ul>
-		  <ul>
+		  {renderDesktopTree (visibleRootTags)}
-		    {renderDesktopTree (visibleRootTags)}
+		</ul>)}
-		  </ul>)}
+	  </div>
-	    </div>
+	</SidebarComponent>
-	  </SidebarComponent>
-	</div>
       </>)
 }
 

frontend/src/components/TagDetailSidebar.tsx

@@ -146,10 +146,13 @@ const DropSlot = ({ cat }: { cat: Category }) => {
 }
 
 
-type Props = { post: Post; sp?: boolean }
+type Props = {
+    className?: string
+    post:       Post
+    sp?:        boolean }
 
 
-const TagDetailSidebar: FC<Props> = ({ post, sp }) => {
+const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
   sp = Boolean (sp)
 
   const qc = useQueryClient ()
@@ -278,7 +281,7 @@ const TagDetailSidebar: FC<Props> = ({ post, sp }) => {
   }, [baseTags])
 
   return (
-      <SidebarComponent>
+      <SidebarComponent sidebarKey="post-detail-tags" className={className}>
 	<TagSearch/>
 	<DndContext
 	    sensors={sensors}

frontend/src/components/TagSidebar.tsx

@@ -96,7 +96,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
       </>)
 
   return (
-      <SidebarComponent>
+      <SidebarComponent sidebarKey="posts-index-tags">
 	<TagSearch/>
 
 	<div className="hidden md:block mt-4">

frontend/src/components/layout/SidebarComponent.test.tsx

@@ -0,0 +1,124 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { HelmetProvider } from 'react-helmet-async'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import SidebarComponent from '@/components/layout/SidebarComponent'
+
+
+const sidebarWidth = (element: Element | null): string =>
+    (element as HTMLElement).style.getPropertyValue ('--sidebar-width')
+
+
+const sidebarRoot = (container: HTMLElement): Element =>
+    container.querySelector ('[style*="--sidebar-width"]')!
+
+
+const sidebarTree = (props: Partial<Parameters<typeof SidebarComponent>[0]>) => (
+    <HelmetProvider>
+      <div data-sidebar-container>
+	<SidebarComponent sidebarKey="test-sidebar" {...props}>
+	  Sidebar body
+	</SidebarComponent>
+      </div>
+    </HelmetProvider>)
+
+
+const renderSidebar = (
+    props: Partial<Parameters<typeof SidebarComponent>[0]> = {},
+    containerWidth = 800,
+) => {
+  Object.defineProperty (HTMLElement.prototype, 'clientWidth', {
+      configurable: true,
+      get () {
+	return this.hasAttribute ('data-sidebar-container') ? containerWidth : 0
+      },
+  })
+
+  const rendered = render (sidebarTree (props))
+
+  return rendered
+}
+
+
+describe ('SidebarComponent', () => {
+  beforeEach (() => {
+    Object.defineProperty (window, 'innerWidth', {
+	configurable: true,
+	value:        1_000,
+    })
+
+    Object.defineProperty (HTMLElement.prototype, 'setPointerCapture', {
+	configurable: true,
+	value:        vi.fn (),
+    })
+    Object.defineProperty (HTMLElement.prototype, 'releasePointerCapture', {
+	configurable: true,
+	value:        vi.fn (),
+    })
+    Object.defineProperty (HTMLElement.prototype, 'hasPointerCapture', {
+	configurable: true,
+	value:        vi.fn (() => true),
+    })
+
+    vi.spyOn (HTMLElement.prototype, 'setPointerCapture').mockImplementation (() => {
+      ;
+    })
+    vi.spyOn (HTMLElement.prototype, 'releasePointerCapture').mockImplementation (() => {
+      ;
+    })
+    vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
+  })
+
+  it ('uses maxWidth without applying the container main-width reserve twice', async () => {
+    localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
+    const onWidthChange = vi.fn ()
+
+    const { container } = renderSidebar ({ maxWidth: 700, onWidthChange }, 800)
+
+    await waitFor (() => {
+      expect (sidebarWidth (sidebarRoot (container))).toBe ('700px')
+    })
+    expect (onWidthChange).toHaveBeenLastCalledWith (700)
+  })
+
+  it ('resets width and removes only its storage key on double click', async () => {
+    localStorage.setItem ('sidebar:test-sidebar:right:width', '420')
+    localStorage.setItem ('sidebar:other-sidebar:right:width', '480')
+
+    const { container } = renderSidebar ({ side: 'right' }, 900)
+
+    await waitFor (() => {
+      expect (sidebarWidth (sidebarRoot (container))).toBe ('420px')
+    })
+
+    fireEvent.doubleClick (screen.getByRole ('separator', { name: 'サイドバー幅' }))
+
+    await waitFor (() => {
+      expect (sidebarWidth (sidebarRoot (container))).toBe ('256px')
+    })
+    expect (localStorage.getItem ('sidebar:test-sidebar:right:width')).toBeNull ()
+    expect (localStorage.getItem ('sidebar:other-sidebar:right:width')).toBe ('480')
+  })
+
+  it ('clamps current width on maxWidth changes without re-reading storage', async () => {
+    localStorage.setItem ('sidebar:test-sidebar:left:width', '420')
+
+    const { container, rerender } = renderSidebar ({ maxWidth: 420 }, 900)
+
+    await waitFor (() => {
+      expect (sidebarWidth (sidebarRoot (container))).toBe ('420px')
+    })
+
+    rerender (sidebarTree ({ maxWidth: 300 }))
+
+    await waitFor (() => {
+      expect (sidebarWidth (sidebarRoot (container))).toBe ('300px')
+    })
+
+    rerender (sidebarTree ({ maxWidth: 500 }))
+
+    await waitFor (() => {
+      expect (sidebarWidth (sidebarRoot (container))).toBe ('300px')
+    })
+  })
+})

frontend/src/components/layout/SidebarComponent.tsx

@@ -1,19 +1,319 @@
 import { motion } from 'framer-motion'
 import { Helmet } from 'react-helmet-async'
 
-import type { FC, ReactNode } from 'react'
+import { cn } from '@/lib/utils'
 
-type Props = { children: ReactNode }
+import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+type SidebarSide = 'left' | 'right'
+
+type Props = {
+    children:      ReactNode
+    className?:    string
+    maxWidth?:     number
+    onWidthChange?: (width: number) => void
+    sidebarKey:    string
+    side?:         SidebarSide }
+
+type ResizeState = {
+    pointerId:  number
+    startWidth: number
+    startX:     number
+    side:       SidebarSide }
+
+type PendingPressState = ResizeState & { startY: number }
+
+const DEFAULT_SIDEBAR_WIDTH = 256
+const MIN_SIDEBAR_WIDTH = 192
+const MIN_MAIN_WIDTH = 360
+const MAX_VIEWPORT_WIDTH_RATIO = .8
+const LONG_PRESS_DELAY_MS = 350
+const TOUCH_MOVE_THRESHOLD_PX = 8
 
 
-const SidebarComponent: FC<Props> = ({ children }) => (
+const storageKeyForSidebar = (sidebarKey: string, side: SidebarSide): string =>
-    <motion.div
+    `sidebar:${ sidebarKey }:${ side }:width`
-	layout="position"
+
-	transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+
-	className="p-4 w-full md:w-64 md:h-full md:overflow-y-auto sidebar">
+const getSidebarMaxWidth = (containerWidth: number): number => {
-      <Helmet>
+  const viewportWidth =
-	<style>
+      typeof window === 'undefined' ? containerWidth : window.innerWidth
-	  {`
+  const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO)
+  const containerMaxWidth = Math.floor (containerWidth - MIN_MAIN_WIDTH)
+  const dynamicMaxWidth = Math.min (viewportMaxWidth, containerMaxWidth)
+
+  return Math.max (MIN_SIDEBAR_WIDTH, dynamicMaxWidth)
+}
+
+
+const readStoredSidebarWidth = (
+    sidebarKey: string,
+    side: SidebarSide): number => {
+  if (typeof window === 'undefined')
+    return DEFAULT_SIDEBAR_WIDTH
+
+  const value = window.localStorage.getItem (storageKeyForSidebar (sidebarKey, side))
+  const width = value == null ? Number.NaN : Number (value)
+
+  return Number.isFinite (width) ? width : DEFAULT_SIDEBAR_WIDTH
+}
+
+
+const SidebarComponent: FC<Props> = ({
+    children,
+    className,
+    maxWidth,
+    onWidthChange,
+    sidebarKey,
+    side = 'left',
+}) => {
+  const rootRef = useRef<HTMLDivElement | null> (null)
+  const maxWidthRef = useRef (maxWidth)
+  const getContainerWidth = useCallback (() => {
+    const containerWidth = rootRef.current
+	?.closest ('[data-sidebar-container]')
+	?.clientWidth
+    ?? window.innerWidth
+    return containerWidth
+  }, [])
+  const getClampedWidth = useCallback ((
+      nextWidth: number,
+      containerWidth: number): number => {
+    const viewportWidth =
+	typeof window === 'undefined' ? containerWidth : window.innerWidth
+    const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO)
+    const maxAllowedWidth =
+	maxWidthRef.current == null
+	? getSidebarMaxWidth (containerWidth)
+	: Math.max (
+	    MIN_SIDEBAR_WIDTH,
+	    Math.min (viewportMaxWidth, maxWidthRef.current))
+
+    return Math.min (maxAllowedWidth, Math.max (MIN_SIDEBAR_WIDTH, nextWidth))
+  }, [])
+
+  const [width, setWidth] = useState (() => (
+      typeof window === 'undefined'
+      ? DEFAULT_SIDEBAR_WIDTH
+      : getClampedWidth (
+	  readStoredSidebarWidth (sidebarKey, side),
+	  window.innerWidth)))
+  const [resizing, setResizing] = useState (false)
+  const widthRef = useRef (width)
+  const longPressTimerRef = useRef<ReturnType<typeof setTimeout> | null> (null)
+  const pendingPressRef = useRef<PendingPressState | null> (null)
+  const resizeRef = useRef<ResizeState | null> (null)
+  const bodyStyleRef = useRef<{ cursor: string, userSelect: string } | null> (null)
+
+  const clearLongPressTimer = useCallback (() => {
+    if (longPressTimerRef.current == null)
+      return
+
+    clearTimeout (longPressTimerRef.current)
+    longPressTimerRef.current = null
+  }, [])
+
+  const restoreBodyStyle = useCallback (() => {
+    if (bodyStyleRef.current == null)
+      return
+
+    document.body.style.cursor = bodyStyleRef.current.cursor
+    document.body.style.userSelect = bodyStyleRef.current.userSelect
+    bodyStyleRef.current = null
+  }, [])
+
+  const startResize = useCallback ((state: ResizeState) => {
+    clearLongPressTimer ()
+    pendingPressRef.current = null
+    resizeRef.current = state
+    setResizing (true)
+
+    if (bodyStyleRef.current == null)
+    {
+      bodyStyleRef.current = {
+	  cursor: document.body.style.cursor,
+	  userSelect: document.body.style.userSelect }
+    }
+
+    document.body.style.cursor = 'col-resize'
+    document.body.style.userSelect = 'none'
+  }, [clearLongPressTimer])
+
+  const finishResize = useCallback (() => {
+    clearLongPressTimer ()
+    pendingPressRef.current = null
+
+    const state = resizeRef.current
+    resizeRef.current = null
+
+    if (state != null)
+      window.localStorage.setItem (
+	  storageKeyForSidebar (sidebarKey, state.side),
+	  String (widthRef.current))
+
+    setResizing (false)
+    restoreBodyStyle ()
+  }, [clearLongPressTimer, restoreBodyStyle, sidebarKey])
+
+  const applyWidth = useCallback ((nextWidth: number) => {
+    if (nextWidth === widthRef.current)
+      return
+
+    widthRef.current = nextWidth
+    setWidth (nextWidth)
+  }, [])
+
+  useEffect (() => {
+    maxWidthRef.current = maxWidth
+    const containerWidth = getContainerWidth ()
+    const nextWidth = getClampedWidth (widthRef.current, containerWidth)
+    applyWidth (nextWidth)
+  }, [applyWidth, getClampedWidth, getContainerWidth, maxWidth])
+
+  const updateWidth = useCallback ((clientX: number) => {
+    const state = resizeRef.current
+    if (state == null)
+      return
+
+    const containerWidth = getContainerWidth ()
+    const delta = state.side === 'left'
+		  ? clientX - state.startX
+		  : state.startX - clientX
+    const nextWidth = getClampedWidth (state.startWidth + delta, containerWidth)
+    applyWidth (nextWidth)
+  }, [applyWidth, getClampedWidth, getContainerWidth])
+
+  const handlePointerDown = (ev: PointerEvent<HTMLDivElement>) => {
+    if (ev.pointerType !== 'mouse' && ev.pointerType !== 'touch')
+      return
+
+    if (ev.pointerType === 'mouse' && ev.button !== 0)
+      return
+
+    ev.preventDefault ()
+    ev.stopPropagation ()
+    ev.currentTarget.setPointerCapture (ev.pointerId)
+
+    const state = {
+	pointerId: ev.pointerId,
+	side,
+	startWidth: widthRef.current,
+	startX: ev.clientX }
+
+    if (ev.pointerType === 'mouse')
+    {
+      startResize (state)
+      return
+    }
+
+    pendingPressRef.current = { ...state, startY: ev.clientY }
+    clearLongPressTimer ()
+    longPressTimerRef.current = setTimeout (() => {
+      if (pendingPressRef.current != null)
+	startResize (pendingPressRef.current)
+    }, LONG_PRESS_DELAY_MS)
+  }
+
+  const handlePointerMove = (ev: PointerEvent<HTMLDivElement>) => {
+    ev.stopPropagation ()
+
+    if (resizeRef.current != null)
+    {
+      ev.preventDefault ()
+      updateWidth (ev.clientX)
+      return
+    }
+
+    const pendingPress = pendingPressRef.current
+    if (pendingPress == null || pendingPress.pointerId !== ev.pointerId)
+      return
+
+    const deltaX = ev.clientX - pendingPress.startX
+    const deltaY = ev.clientY - pendingPress.startY
+    const distance = Math.hypot (deltaX, deltaY)
+
+    if (distance >= TOUCH_MOVE_THRESHOLD_PX)
+    {
+      clearLongPressTimer ()
+      pendingPressRef.current = null
+    }
+  }
+
+  const handlePointerEnd = (ev: PointerEvent<HTMLDivElement>) => {
+    ev.stopPropagation ()
+
+    if (ev.currentTarget.hasPointerCapture (ev.pointerId))
+      ev.currentTarget.releasePointerCapture (ev.pointerId)
+
+    finishResize ()
+  }
+
+  const resetWidth = useCallback (() => {
+    const containerWidth = getContainerWidth ()
+    const nextWidth = getClampedWidth (DEFAULT_SIDEBAR_WIDTH, containerWidth)
+    applyWidth (nextWidth)
+    window.localStorage.removeItem (storageKeyForSidebar (sidebarKey, side))
+  }, [applyWidth, getClampedWidth, getContainerWidth, sidebarKey, side])
+
+  const handleDoubleClick = (ev: MouseEvent<HTMLDivElement>) => {
+    ev.preventDefault ()
+    ev.stopPropagation ()
+    resetWidth ()
+  }
+
+  useEffect (() => {
+    const containerWidth = getContainerWidth ()
+    const nextWidth = getClampedWidth (
+	readStoredSidebarWidth (sidebarKey, side),
+	containerWidth)
+    applyWidth (nextWidth)
+  }, [applyWidth, getClampedWidth, getContainerWidth, sidebarKey, side])
+
+  useEffect (() => {
+    const containerWidth = getContainerWidth ()
+    const nextWidth = getClampedWidth (widthRef.current, containerWidth)
+    applyWidth (nextWidth)
+  }, [applyWidth, getClampedWidth, getContainerWidth])
+
+  useEffect (() => {
+    if (typeof window === 'undefined')
+      return
+
+    const handleResize = () => {
+      const containerWidth = getContainerWidth ()
+      const nextWidth = getClampedWidth (widthRef.current, containerWidth)
+      applyWidth (nextWidth)
+    }
+
+    window.addEventListener ('resize', handleResize)
+    return () => window.removeEventListener ('resize', handleResize)
+  }, [applyWidth, getClampedWidth, getContainerWidth])
+
+  useEffect (() => {
+    onWidthChange?.(width)
+  }, [onWidthChange, width])
+
+  useEffect (() => () => {
+    clearLongPressTimer ()
+    restoreBodyStyle ()
+  }, [clearLongPressTimer, restoreBodyStyle])
+
+  const style = {
+      '--sidebar-width': `${ width }px` } as CSSProperties
+
+  return (
+      <motion.div
+	  ref={rootRef}
+	  layout="position"
+	  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+	  style={style}
+	  className={cn (
+	      'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
+	      className)}>
+	<Helmet>
+	  <style>
+	    {`
 	      .sidebar
 	      {
 		direction: rtl;
@@ -23,10 +323,34 @@ const SidebarComponent: FC<Props> = ({ children }) => (
 	      {
 		direction: ltr;
 	      }`}
-	</style>
+	  </style>
-      </Helmet>
+	</Helmet>
 
-      {children}
+	<div className="h-full overflow-y-auto p-4 sidebar">
-    </motion.div>)
+	  {children}
+	</div>
+
+	<div
+	    role="separator"
+	    aria-orientation="vertical"
+	    aria-label="サイドバー幅"
+	    onPointerDown={handlePointerDown}
+	    onPointerMove={handlePointerMove}
+	    onPointerUp={handlePointerEnd}
+	    onPointerCancel={handlePointerEnd}
+	    onDoubleClick={handleDoubleClick}
+	    className={cn (
+		'hidden md:block absolute top-0 bottom-0 z-20 w-4 cursor-col-resize',
+		'touch-none select-none',
+		side === 'left' ? '-right-2' : '-left-2',
+		'before:absolute before:top-0 before:bottom-0 before:w-px',
+		'before:bg-neutral-500/0 hover:before:bg-neutral-500/30',
+		'before:transition-colors before:duration-150',
+		side === 'left'
+		? 'before:left-1/2'
+		: 'before:right-1/2',
+		resizing && 'before:bg-neutral-500/40')}/>
+      </motion.div>)
+}
 
 export default SidebarComponent

frontend/src/pages/materials/MaterialBasePage.tsx

@@ -6,7 +6,9 @@ import type { FC } from 'react'
 
 
 const MaterialBasePage: FC = () => (
-    <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
+    <div
+	data-sidebar-container
+	className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
       <MaterialSidebar/>
       <Outlet/>
     </div>)

frontend/src/pages/posts/PostDetailPage.tsx

@@ -94,16 +94,16 @@ const PostDetailPage: FC<Props> = ({ user }) => {
 		       : 'bg-gray-500 hover:bg-gray-600')
 
   return (
-      <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
+      <div
+	  data-sidebar-container
+	  className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
 	<Helmet>
 	  {(post?.thumbnail || post?.thumbnailBase) && (
 	      <meta name="thumbnail" content={post.thumbnail! || post.thumbnailBase!}/>)}
 	  {post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
 	</Helmet>
 
-	<div className="hidden md:block">
+	{post && <TagDetailSidebar post={post} className="hidden md:block"/>}
-	  {post && <TagDetailSidebar post={post}/>}
-	</div>
 
 	<MainArea className="relative">
 	  {post
@@ -183,9 +183,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
 	   : 'Loading...'}
 	</MainArea>
 
-	<div className="md:hidden">
+	{post && <TagDetailSidebar post={post} sp className="md:hidden"/>}
-	  {post && <TagDetailSidebar post={post} sp/>}
-	</div>
       </div>)
 }
 

frontend/src/pages/posts/PostListPage.tsx

@@ -122,6 +122,7 @@ const PostListPage: FC = () => {
 
   return (
       <div
+	  data-sidebar-container
 	  className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden"
 	  ref={containerRef}>
 	<Helmet>

frontend/src/pages/theatres/TheatreDetailPage.test.tsx

@@ -105,6 +105,20 @@ const tagSection = (): HTMLElement =>
   screen.getAllByRole ('heading', { name: 'タグ' })[0].closest ('section')!
 
 const mockDefaultApi = () => {
+  let commentsFetched = false
+  let currentTheatreInfo = buildTheatreInfo ({
+    postId:        currentPost.id,
+    postStartedAt: '2026-01-02T03:04:05.000Z',
+    postElapsedMs: 1_000,
+    watchingUsers,
+    skipVote:      {
+      votesCount:         0,
+      requiredCount:      2,
+      watchingUsersCount: watchingUsers.length,
+      voted:              false,
+    },
+  })
+
   api.apiGet.mockImplementation ((path: string) => {
     switch (path)
     {
@@ -112,13 +126,17 @@ const mockDefaultApi = () => {
       return Promise.resolve (theatre)
 
     case '/theatres/7/comments':
+      if (commentsFetched)
+	return Promise.resolve ([])
+
+      commentsFetched = true
       return Promise.resolve ([
-        buildTheatreComment ({
+	  buildTheatreComment ({
-          theatreId: 7,
+	    theatreId: 7,
-          no:        2,
+	    no:        2,
-          user:      { id: 1, name: 'tester' },
+	    user:      { id: 1, name: 'tester' },
-          content:   '視聴コメント',
+	    content:   '視聴コメント',
-        }),
+	  }),
       ])
 
     case '/theatres/7/programmes':
@@ -136,32 +154,22 @@ const mockDefaultApi = () => {
     switch (path)
     {
     case '/theatres/7/watching':
-      return Promise.resolve (buildTheatreInfo ({
+      return Promise.resolve (currentTheatreInfo)
-        postId:        currentPost.id,
-        postStartedAt: '2026-01-02T03:04:05.000Z',
-        postElapsedMs: 1_000,
-        watchingUsers,
-        skipVote:      {
-          votesCount:         0,
-          requiredCount:      2,
-          watchingUsersCount: watchingUsers.length,
-          voted:              false,
-        },
-      }))
 
     case '/theatres/7/skip_vote':
-      return Promise.resolve (buildTheatreInfo ({
+      currentTheatreInfo = buildTheatreInfo ({
-        postId:        currentPost.id,
+	postId:        currentPost.id,
-        postStartedAt: '2026-01-02T03:04:05.000Z',
+	postStartedAt: '2026-01-02T03:04:05.000Z',
-        postElapsedMs: 2_000,
+	postElapsedMs: 2_000,
-        watchingUsers,
+	watchingUsers,
-        skipVote:      {
+	skipVote:      {
-          votesCount:         1,
+	  votesCount:         1,
-          requiredCount:      2,
+	  requiredCount:      2,
-          watchingUsersCount: watchingUsers.length,
+	  watchingUsersCount: watchingUsers.length,
-          voted:              true,
+	  voted:              true,
-        },
+	},
-      }))
+      })
+      return Promise.resolve (currentTheatreInfo)
 
     default:
       return Promise.reject (new Error (`Unexpected PUT ${ path }`))

frontend/src/pages/theatres/TheatreDetailPage.tsx

@@ -10,6 +10,7 @@ import PrefetchLink from '@/components/PrefetchLink'
 import TagLink from '@/components/TagLink'
 import FieldError from '@/components/common/FieldError'
 import { useDialogue } from '@/components/dialogues/DialogueProvider'
+import SidebarComponent from '@/components/layout/SidebarComponent'
 import { Button } from '@/components/ui/button'
 import { SITE_TITLE } from '@/config'
 import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
@@ -56,6 +57,11 @@ const INITIAL_THEATRE_INFO: TheatreInfo =
 const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
     { tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
 
+const LAYOUT_STORAGE_KEY = 'theatre-layout-mode'
+const TAG_FLOW_STORAGE_KEY = 'theatre-tag-flow'
+const MIN_MAIN_WIDTH = 360
+const SIDEBAR_GAP_WIDTH = 16
+
 const LAYOUT_LABELS: Record<TheatreLayoutMode, string> = {
     threeColumns:   '3 列',
     tagsBottom:     '2 列 A 型',
@@ -214,11 +220,16 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
   const commentsRef = useRef<HTMLDivElement> (null)
   const embedRef = useRef<NiconicoViewerHandle> (null)
   const loadingRef = useRef (false)
+  const sidebarContainerRef = useRef<HTMLDivElement> (null)
   const theatreInfoRef = useRef<TheatreInfo> (INITIAL_THEATRE_INFO)
   const theatreInfoReceivedAtRef = useRef (performance.now ())
   const videoLengthRef = useRef (0)
   const lastCommentNoRef = useRef (0)
 
+  const [leftSidebarWidth, setLeftSidebarWidth] = useState (256)
+  const [rightSidebarWidth, setRightSidebarWidth] = useState (256)
+  const [sidebarContainerWidth, setSidebarContainerWidth] = useState (
+      () => typeof window === 'undefined' ? 0 : window.innerWidth)
   const [comments, setComments] = useState<TheatreComment[]> ([])
   const [content, setContent] = useState ('')
   const [editingPost, setEditingPost] = useState<Post | null> (null)
@@ -249,6 +260,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 
   const applyTheatreInfo = useCallback ((nextInfo: TheatreInfo) => {
     theatreInfoReceivedAtRef.current = performance.now ()
+    theatreInfoRef.current = nextInfo
     setTheatreInfo (nextInfo)
   }, [])
 
@@ -315,6 +327,17 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
     lastCommentNoRef.current = comments[0]?.no ?? 0
   }, [comments])
 
+  useEffect (() => {
+    const updateSidebarContainerWidth = () => {
+      const nextWidth = sidebarContainerRef.current?.clientWidth ?? window.innerWidth
+      setSidebarContainerWidth (nextWidth)
+    }
+
+    updateSidebarContainerWidth ()
+    window.addEventListener ('resize', updateSidebarContainerWidth)
+    return () => window.removeEventListener ('resize', updateSidebarContainerWidth)
+  }, [])
+
   useEffect (() => {
     if (!(id))
       return
@@ -378,6 +401,9 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	    setComments (prev => [...newComments, ...prev])
 	  }
 
+	if (loadingRef.current)
+	  return
+
 	const currentInfo = theatreInfoRef.current
 	const ended =
 	    currentInfo.hostFlg
@@ -399,8 +425,9 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	    return
 	  }
 
+	const watchingRequestedAt = performance.now ()
 	const nextInfo = await apiPut<TheatreInfo> (`/theatres/${ id }/watching`)
-	if (!(cancelled))
+	if (!(cancelled) && watchingRequestedAt >= theatreInfoReceivedAtRef.current)
 	  applyTheatreInfo (nextInfo)
       }
       catch (error)
@@ -529,6 +556,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
     if (!(id) || !(post))
       return
 
+    loadingRef.current = true
     setLoading (true)
     try
     {
@@ -557,6 +585,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
     }
     finally
     {
+      loadingRef.current = false
       setLoading (false)
     }
   }
@@ -630,6 +659,26 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
   if (status >= 400)
     return <ErrorScreen status={status}/>
 
+  const singleSidebarMaxWidth = Math.max (
+      192,
+      sidebarContainerWidth - MIN_MAIN_WIDTH - SIDEBAR_GAP_WIDTH)
+  const leftSidebarMaxWidth = layoutMode === 'threeColumns'
+			      ? Math.max (
+				  192,
+				  sidebarContainerWidth
+				  - rightSidebarWidth
+				  - MIN_MAIN_WIDTH
+				  - SIDEBAR_GAP_WIDTH * 2)
+			      : singleSidebarMaxWidth
+  const rightSidebarMaxWidth = layoutMode === 'threeColumns'
+			       ? Math.max (
+				   192,
+				   sidebarContainerWidth
+				   - leftSidebarWidth
+				   - MIN_MAIN_WIDTH
+				   - SIDEBAR_GAP_WIDTH * 2)
+			       : singleSidebarMaxWidth
+
   const tagPanel = (
       <section className="rounded border-zinc-300 p-4 dark:border-zinc-800">
 	<div className="mb-3 flex items-center justify-between gap-3">
@@ -797,30 +846,26 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	  {theatre && <title>{`${ theatreTitle } | ${ SITE_TITLE }`}</title>}
 	</Helmet>
 
-	<div className={cn (
+	<div
-	    'grid min-h-full gap-4 overflow-visible md:h-full md:overflow-hidden',
+	    ref={sidebarContainerRef}
-	    (layoutMode === 'threeColumns'
+	    data-sidebar-container
-	     && ['md:grid-cols-[16rem_minmax(0,1fr)_22rem]',
+	    className="flex min-h-full flex-col gap-4 overflow-visible md:h-full md:flex-row
-		 'xl:grid-cols-[18rem_minmax(0,1fr)_24rem]']),
+		       md:overflow-hidden">
-	    (layoutMode === 'tagsBottom'
-	     && 'md:grid-cols-[minmax(0,1fr)_22rem] xl:grid-cols-[minmax(0,1fr)_24rem]'),
-	    (layoutMode === 'commentsBottom'
-	     && 'md:grid-cols-[16rem_minmax(0,1fr)] xl:grid-cols-[18rem_minmax(0,1fr)]'))}>
 	  {layoutMode !== 'tagsBottom' && (
-	      <motion.aside
+	      <SidebarComponent
-		  layout="position"
+		  sidebarKey="theatre-tags"
-		  className="hidden min-w-0 space-y-4 md:order-none md:block md:overflow-y-auto
+		  side="left"
-			     md:[direction:rtl]">
+		  maxWidth={leftSidebarMaxWidth}
-		<div className="md:[direction:ltr]">
+		  onWidthChange={setLeftSidebarWidth}
-		  {tagPanel}
+		  className="hidden md:block">
-		</div>
+		{tagPanel}
-	      </motion.aside>)}
+	      </SidebarComponent>)}
 
 	  <motion.main
 	      layout="position"
-	      className={cn ('order-1 min-w-0 space-y-4 md:order-none md:overflow-y-auto',
+	      className="order-1 min-w-0 flex-1 space-y-4 md:order-none
-			     layoutMode === 'tagsBottom' && 'md:[direction:rtl]')}>
+			 md:min-w-[360px] md:overflow-y-auto">
-	    <div className={cn ('space-y-4', layoutMode === 'tagsBottom' && 'md:[direction:ltr]')}>
+	    <div className="space-y-4">
 	      <section className="overflow-hidden rounded border-zinc-300
 				  dark:border-zinc-800">
 		<div className="flex flex-wrap items-center justify-between gap-3
@@ -956,12 +1001,17 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	  </motion.main>
 
 	  {layoutMode !== 'commentsBottom' && (
-	      <motion.aside
+	      <SidebarComponent
-		  layout="position"
+		  sidebarKey="theatre-comments"
-		  className="hidden min-w-0 space-y-4 md:order-none md:block md:overflow-y-auto">
+		  side="right"
-		{commentsPanel}
+		  maxWidth={rightSidebarMaxWidth}
-		{participantsPanel}
+		  onWidthChange={setRightSidebarWidth}
-	      </motion.aside>)}
+		  className="hidden md:block">
+		<div className="space-y-4">
+		  {commentsPanel}
+		  {participantsPanel}
+		</div>
+	      </SidebarComponent>)}
 	</div>
       </motion.div>)
 }