#34

backend/db/schema.rb

@@ -72,6 +72,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.index ["correct_post_id"], name: "index_gekanator_games_on_correct_post_id"
     t.index ["guessed_post_id"], name: "index_gekanator_games_on_guessed_post_id"
     t.index ["user_id"], name: "index_gekanator_games_on_user_id"
+    t.check_constraint "`question_count` >= 0", name: "chk_gekanator_games_question_count_nonnegative"
   end
 
   create_table "gekanator_question_examples", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -274,9 +275,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.datetime "created_at", null: false
     t.bigint "created_by_user_id"
     t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
-    t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at"
+    t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
-    t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at"
+    t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
     t.index ["tag_id", "version_no"], name: "index_nico_tag_versions_on_tag_id_and_version_no", unique: true
+    t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
   end
 
   create_table "post_implications", primary_key: ["post_id", "parent_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -285,13 +287,14 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["parent_post_id"], name: "index_post_implications_on_parent_post_id"
+    t.check_constraint "`post_id` <> `parent_post_id`", name: "chk_post_implications_no_self"
   end
 
   create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "post_id", null: false
     t.bigint "target_post_id", null: false
     t.float "cos", null: false
-    t.index ["post_id", "cos"], name: "index_post_similarities_on_post_id_and_cos"
+    t.index ["post_id", "cos"], name: "index_post_similarities_on_post_id_and_cos", order: { cos: :desc }
     t.index ["target_post_id"], name: "index_post_similarities_on_target_post_id"
   end
 
@@ -347,6 +350,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.index ["post_id"], name: "index_post_versions_on_post_id"
     t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
     t.check_constraint "(`video_ms` is null) or (`video_ms` > 0)", name: "chk_post_versions_video_ms_positive"
+    t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
+    t.check_constraint "`version_no` > 0", name: "post_versions_version_no_positive"
   end
 
   create_table "posts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -364,6 +369,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.index ["url"], name: "index_posts_on_url", unique: true
     t.index ["video_ms", "id"], name: "idx_posts_video_ms_id"
     t.check_constraint "(`video_ms` is null) or (`video_ms` > 0)", name: "chk_posts_video_ms_positive"
+    t.check_constraint "`version_no` > 0", name: "chk_posts_version_no_positive"
   end
 
   create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -377,6 +383,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.index ["user_id"], name: "index_settings_on_user_id", unique: true
   end
 
+  create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "wiki_page_id", null: false
+    t.integer "no", null: false
+    t.string "alt_text"
+    t.binary "sha256", limit: 32, null: false
+    t.bigint "created_by_user_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
+    t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
+    t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
+  end
+
   create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "tag_id", null: false
     t.bigint "parent_tag_id", null: false
@@ -412,7 +431,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.bigint "tag_id", null: false
     t.bigint "target_tag_id", null: false
     t.float "cos", null: false
-    t.index ["tag_id", "cos"], name: "index_tag_similarities_on_tag_id_and_cos"
+    t.index ["tag_id", "cos"], name: "index_tag_similarities_on_tag_id_and_cos", order: { cos: :desc }
     t.index ["target_tag_id"], name: "index_tag_similarities_on_target_tag_id"
   end
 
@@ -428,9 +447,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.datetime "created_at", null: false
     t.bigint "created_by_user_id"
     t.index ["created_at"], name: "index_tag_versions_on_created_at"
-    t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at"
+    t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
-    t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at"
+    t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
     t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true
+    t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
   end
 
   create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -446,6 +466,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.index ["discarded_at"], name: "index_tags_on_discarded_at"
     t.index ["tag_name_id"], name: "index_tags_on_tag_name_id", unique: true
     t.check_constraint "(`deprecated_at` is null) or (`category` <> _utf8mb4'nico')", name: "chk_tags_deprecated_at_not_nico"
+    t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive"
   end
 
   create_table "theatre_comments", primary_key: ["theatre_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -599,11 +620,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "discarded_at"
+    t.integer "next_asset_no", default: 1, null: false
     t.integer "version_no", null: false
     t.index ["created_user_id"], name: "index_wiki_pages_on_created_user_id"
     t.index ["discarded_at"], name: "index_wiki_pages_on_discarded_at"
     t.index ["tag_name_id"], name: "index_wiki_pages_on_tag_name_id", unique: true
     t.index ["updated_user_id"], name: "index_wiki_pages_on_updated_user_id"
+    t.check_constraint "`version_no` > 0", name: "chk_wiki_pages_version_no_positive"
   end
 
   create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -648,6 +671,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
     t.index ["created_by_user_id"], name: "index_wiki_versions_on_created_by_user_id"
     t.index ["wiki_page_id", "version_no"], name: "index_wiki_versions_on_wiki_page_id_and_version_no", unique: true
     t.index ["wiki_page_id"], name: "index_wiki_versions_on_wiki_page_id"
+    t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "wiki_versions_event_type_valid"
+    t.check_constraint "`version_no` > 0", name: "wiki_versions_version_no_positive"
   end
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
@@ -729,6 +754,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
   add_foreign_key "user_post_views", "posts"
   add_foreign_key "user_post_views", "users"
   add_foreign_key "user_theme_slots", "users"
+  add_foreign_key "wiki_assets", "users", column: "created_by_user_id"
+  add_foreign_key "wiki_assets", "wiki_pages"
   add_foreign_key "wiki_pages", "tag_names"
   add_foreign_key "wiki_pages", "users", column: "created_user_id"
   add_foreign_key "wiki_pages", "users", column: "updated_user_id"

backend/spec/models/setting_spec.rb

@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+RSpec.describe Setting, type: :model do
+  it 'accepts the default typed user settings' do
+    setting = described_class.new({ user: create(:user) }.merge(described_class.defaults))
+
+    expect(setting).to be_valid
+  end
+
+  it 'requires one settings row per user' do
+    user = create(:user)
+    described_class.create!({ user: }.merge(described_class.defaults))
+
+    duplicate = described_class.new({ user: }.merge(described_class.defaults))
+
+    expect(duplicate).not_to be_valid
+    expect(duplicate.errors[:user_id]).to be_present
+  end
+
+  it 'validates enum-like settings columns' do
+    setting = described_class.new(
+        { user: create(:user),
+          theme: 'neon',
+          auto_fetch_title: 'sometimes',
+          auto_fetch_thumbnail: 'sometimes',
+          wiki_editor_mode: 'sideways' })
+
+    expect(setting).not_to be_valid
+    expect(setting.errors[:theme]).to be_present
+    expect(setting.errors[:auto_fetch_title]).to be_present
+    expect(setting.errors[:auto_fetch_thumbnail]).to be_present
+    expect(setting.errors[:wiki_editor_mode]).to be_present
+  end
+end

backend/spec/models/user_theme_slot_spec.rb

@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+RSpec.describe UserThemeSlot, type: :model do
+  it 'accepts a theme slot for one user, base theme, and slot number' do
+    slot = described_class.new(user: create(:user),
+                               base_theme: 'light',
+                               slot_no: 1,
+                               tokens: { 'background' => '0 0% 100%' })
+
+    expect(slot).to be_valid
+  end
+
+  it 'requires unique slot numbers per user and base theme' do
+    user = create(:user)
+    described_class.create!(user:,
+                            base_theme: 'dark',
+                            slot_no: 2,
+                            tokens: { 'background' => '222.2 84% 4.9%' })
+
+    duplicate = described_class.new(user:,
+                                    base_theme: 'dark',
+                                    slot_no: 2,
+                                    tokens: { 'background' => '0 0% 100%' })
+
+    expect(duplicate).not_to be_valid
+    expect(duplicate.errors[:user_id]).to be_present
+  end
+
+  it 'validates base theme, slot number, and token object shape' do
+    slot = described_class.new(user: create(:user),
+                               base_theme: 'system',
+                               slot_no: 4,
+                               tokens: 'not-object')
+
+    expect(slot).not_to be_valid
+    expect(slot.errors[:base_theme]).to be_present
+    expect(slot.errors[:slot_no]).to be_present
+    expect(slot.errors[:tokens]).to be_present
+  end
+end

backend/spec/requests/user_settings_spec.rb

@@ -0,0 +1,98 @@
+require 'rails_helper'
+
+RSpec.describe 'user settings', type: :request do
+  describe 'GET /users/settings' do
+    it 'requires a current user' do
+      sign_out
+
+      get '/users/settings'
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'returns defaults and creates a missing settings row' do
+      user = create(:user)
+      sign_in_as(user)
+
+      expect {
+        get '/users/settings'
+      }.to change(Setting, :count).by(1)
+
+      expect(response).to have_http_status(:ok)
+      expect(json).to eq(
+          'theme' => 'system',
+          'auto_fetch_title' => 'manual',
+          'auto_fetch_thumbnail' => 'manual',
+          'wiki_editor_mode' => 'split')
+      expect(user.reload.setting).to be_present
+    end
+  end
+
+  describe 'PATCH /users/settings' do
+    it 'requires a current user' do
+      sign_out
+
+      patch '/users/settings', params: { theme: 'dark' }, as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'updates multiple typed settings at once' do
+      user = create(:user)
+      sign_in_as(user)
+
+      patch '/users/settings',
+            params: {
+              theme: 'dark',
+              auto_fetch_title: 'auto',
+              auto_fetch_thumbnail: 'off',
+              wiki_editor_mode: 'preview' },
+            as: :json
+
+      expect(response).to have_http_status(:ok)
+      expect(json).to include(
+          'theme' => 'dark',
+          'auto_fetch_title' => 'auto',
+          'auto_fetch_thumbnail' => 'off',
+          'wiki_editor_mode' => 'preview')
+      expect(user.reload.setting).to have_attributes(
+          theme: 'dark',
+          auto_fetch_title: 'auto',
+          auto_fetch_thumbnail: 'off',
+          wiki_editor_mode: 'preview')
+    end
+
+    it 'does not treat Rails parameter wrapping as an editable setting' do
+      user = create(:user)
+      sign_in_as(user)
+
+      patch '/users/settings',
+            params: { theme: 'light', user_setting: { theme: 'dark' } },
+            as: :json
+
+      expect(response).to have_http_status(:ok)
+      expect(user.reload.setting.theme).to eq('light')
+    end
+
+    it 'returns validation_error for type mismatches' do
+      sign_in_as(create(:user))
+
+      patch '/users/settings', params: { theme: 1 }, as: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(json).to include('type' => 'validation_error')
+      expect(json.fetch('errors')).to include(
+          'theme' => ['値の型が不正です．'])
+    end
+
+    it 'returns validation_error for invalid enum values' do
+      sign_in_as(create(:user))
+
+      patch '/users/settings', params: { theme: 'neon' }, as: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(json).to include('type' => 'validation_error')
+      expect(json.fetch('errors').fetch('theme')).to be_present
+    end
+  end
+end

backend/spec/requests/user_theme_slots_spec.rb

@@ -0,0 +1,104 @@
+require 'rails_helper'
+
+RSpec.describe 'user theme slots', type: :request do
+  describe 'GET /users/theme_slots' do
+    it 'requires a current user' do
+      sign_out
+
+      get '/users/theme_slots'
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'returns only the current user slots in stable order' do
+      user = create(:user)
+      other_user = create(:user)
+      sign_in_as(user)
+      UserThemeSlot.create!(user:, base_theme: 'light', slot_no: 2, tokens: { 'a' => 1 })
+      UserThemeSlot.create!(user:, base_theme: 'dark', slot_no: 1, tokens: { 'b' => 2 })
+      UserThemeSlot.create!(user: other_user,
+                            base_theme: 'dark',
+                            slot_no: 3,
+                            tokens: { 'c' => 3 })
+
+      get '/users/theme_slots'
+
+      expect(response).to have_http_status(:ok)
+      expect(json.map { |slot| [slot.fetch('base_theme'), slot.fetch('slot_no')] }).to eq(
+          [['dark', 1], ['light', 2]])
+      expect(json.map { |slot| slot.fetch('tokens') }).to eq(
+          [{ 'b' => 2 }, { 'a' => 1 }])
+    end
+  end
+
+  describe 'PUT /users/theme_slots/:base_theme/:slot_no' do
+    it 'requires a current user' do
+      sign_out
+
+      put '/users/theme_slots/light/1',
+          params: { tokens: { background: '0 0% 100%' } },
+          as: :json
+
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    it 'creates a theme slot' do
+      user = create(:user)
+      sign_in_as(user)
+
+      expect {
+        put '/users/theme_slots/light/1',
+            params: { tokens: { background: '0 0% 100%', tagColours: { nico: '#ffffff' } } },
+            as: :json
+      }.to change(UserThemeSlot, :count).by(1)
+
+      expect(response).to have_http_status(:ok)
+      expect(json).to include('base_theme' => 'light', 'slot_no' => 1)
+      expect(json.fetch('tokens')).to include(
+          'background' => '0 0% 100%',
+          'tagColours' => { 'nico' => '#ffffff' })
+      expect(user.theme_slots.find_by!(base_theme: 'light', slot_no: 1).tokens).to include(
+          'background' => '0 0% 100%')
+    end
+
+    it 'updates an existing theme slot instead of creating a duplicate' do
+      user = create(:user)
+      sign_in_as(user)
+      UserThemeSlot.create!(user:, base_theme: 'dark', slot_no: 2, tokens: { 'old' => true })
+
+      expect {
+        put '/users/theme_slots/dark/2',
+            params: { tokens: { background: '222.2 84% 4.9%' } },
+            as: :json
+      }.not_to change(UserThemeSlot, :count)
+
+      expect(response).to have_http_status(:ok)
+      expect(user.theme_slots.find_by!(base_theme: 'dark', slot_no: 2).tokens).to eq(
+          'background' => '222.2 84% 4.9%')
+    end
+
+    it 'rejects invalid path parameters and token shapes' do
+      sign_in_as(create(:user))
+
+      put '/users/theme_slots/system/4',
+          params: { tokens: 'not-object' },
+          as: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(json.fetch('errors')).to include(
+          'base_theme' => ['値が不正です．'])
+    end
+
+    it 'rejects non-object tokens for valid slots' do
+      sign_in_as(create(:user))
+
+      put '/users/theme_slots/light/1',
+          params: { tokens: 'not-object' },
+          as: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(json.fetch('errors')).to include(
+          'tokens' => ['JSON object で指定してください．'])
+    end
+  end
+end

frontend/src/App.tsx

@@ -1,5 +1,5 @@
 import { AnimatePresence, LayoutGroup, MotionConfig, motion } from 'framer-motion'
-import { useEffect, useMemo, useState } from 'react'
+import { Fragment, useEffect, useMemo, useState } from 'react'
 import { BrowserRouter,
 	 Navigate,
 	 Route,
@@ -12,7 +12,9 @@ import TopNav from '@/components/TopNav'
 import DialogueProvider from '@/components/dialogues/DialogueProvider'
 import { Toaster } from '@/components/ui/toaster'
 import { apiPost, isApiError } from '@/lib/api'
-import { applyClientAppearance,
+import { applyClientAnimationMode,
+	 applyClientAppearance,
+	 type ClientAnimationMode,
 	 fetchUserThemeSlots,
 	 fetchUserSettings,
 	 getClientThemeMode,
@@ -60,11 +62,51 @@ import type { Dispatch, FC, SetStateAction } from 'react'
 import type { User } from '@/types'
 
 
-const RouteTransitionWrapper = ({ user, setUser }: {
+const RouteTransitionWrapper = ({ animationMode, user, setUser }: {
+    animationMode: ClientAnimationMode
     user:     User | null
     setUser:  Dispatch<SetStateAction<User | null>> }) => {
   const location = useLocation ()
 
+  if (animationMode === 'off')
+    {
+      return (
+	  <Routes location={location}>
+	    <Route path="/" element={<Navigate to="/posts" replace/>}/>
+	    <Route path="/posts" element={<PostListPage/>}/>
+	    <Route path="/posts/new" element={<PostNewPage user={user}/>}/>
+	    <Route path="/posts/search" element={<PostSearchPage/>}/>
+	    <Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/>
+	    <Route path="/posts/changes" element={<PostHistoryPage/>}/>
+	    <Route path="/tags" element={<TagListPage/>}/>
+	    <Route path="/tags/:id" element={<TagDetailPage/>}/>
+	    <Route path="/tags/:id/deerjikists" element={<DeerjikistDetailPage/>}/>
+	    <Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
+	    <Route path="/nico/tags" element={<NicoTagListPage user={user}/>}/>
+	    <Route path="/tags/changes" element={<TagHistoryPage/>}/>
+	    <Route path="/theatres/:id" element={<TheatreDetailPage user={user}/>}/>
+	    <Route path="/materials" element={<MaterialBasePage/>}>
+	      <Route index element={<MaterialListPage/>}/>
+	      <Route path="changes" element={<MaterialHistoryPage/>}/>
+	      <Route path="new" element={<MaterialNewPage/>}/>
+	      <Route path="suppressions" element={<MaterialSyncSuppressionsPage/>}/>
+	      <Route path=":id" element ={<MaterialDetailPage/>}/>
+	    </Route>
+	    <Route path="/wiki" element={<WikiSearchPage/>}/>
+	    <Route path="/wiki/:title" element={<WikiDetailPage/>}/>
+	    <Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
+	    <Route path="/wiki/:id/edit" element={<WikiEditPage user={user}/>}/>
+	    <Route path="/wiki/:id/diff" element={<WikiDiffPage/>}/>
+	    <Route path="/wiki/changes" element={<WikiHistoryPage/>}/>
+	    <Route path="/users/settings" element={<SettingPage user={user} setUser={setUser}/>}/>
+	    <Route path="/settings" element={<Navigate to="/users/settings" replace/>}/>
+	    <Route path="/tos" element={<TOSPage/>}/>
+	    <Route path="/gekanator" element={<GekanatorPage user={user}/>}/>
+	    <Route path="/more" element={<MorePage/>}/>
+	    <Route path="*" element={<NotFound/>}/>
+	  </Routes>)
+    }
+
   return (
       <AnimatePresence mode="wait">
 	<Routes location={location}>
@@ -117,6 +159,7 @@ const App: FC = () => {
   const [status, setStatus] = useState (200)
   const behaviourSettings = useClientBehaviourSettings ()
   const animationMode = behaviourSettings.animation ?? 'normal'
+  const LayoutWrapper = animationMode === 'off' ? Fragment : LayoutGroup
 
   const appLayoutTransition = useMemo (
       () => (
@@ -142,6 +185,10 @@ const App: FC = () => {
     return () => mediaQuery.removeEventListener ('change', handleThemeChange)
   }, [])
 
+  useEffect (() => {
+    applyClientAnimationMode (animationMode)
+  }, [animationMode])
+
   useEffect (() => {
     const createUser = async () => {
       const data = await apiPost<{ code: string; user: User }> ('/users')
@@ -222,15 +269,18 @@ const App: FC = () => {
 			? 'user'
 			: 'always'
 		  }>
-		<LayoutGroup>
+		<LayoutWrapper>
 		  <motion.div
 		      layout={animationMode === 'off' ? false : 'position'}
 		      transition={{ layout: appLayoutTransition }}
 		      className="relative flex flex-col h-dvh w-full overflow-y-hidden">
 		    <TopNav user={user}/>
-		    <RouteTransitionWrapper user={user} setUser={setUser}/>
+		    <RouteTransitionWrapper
+			animationMode={animationMode}
+			user={user}
+			setUser={setUser}/>
 		  </motion.div>
-		</LayoutGroup>
+		</LayoutWrapper>
 	      </MotionConfig>
 
 	      <Toaster/>

frontend/src/components/DraggableDroppableTagRow.tsx

@@ -4,6 +4,8 @@ import { motion } from 'framer-motion'
 import { useRef } from 'react'
 
 import TagLink from '@/components/TagLink'
+import { clientAnimationTransition } from '@/lib/clientAnimation'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
 
 import type { CSSProperties, FC, MutableRefObject } from 'react'
@@ -20,6 +22,12 @@ type Props = {
 
 
 const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }) => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const layoutTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { duration: .2, ease: 'easeOut' as const } },
+  )
   const dndId = `tag-node:${ pathKey }`
 
   const downPosRef = useRef<{ x: number; y: number } | null> (null)
@@ -94,8 +102,10 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
 	  {...listeners}>
 	<motion.div
 	    className="flex min-w-0 max-w-full items-baseline overflow-hidden"
-	    transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+	    transition={{ layout: layoutTransition }}
-	    layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
+	    layoutId={animationMode === 'off'
+		? undefined
+		: `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
 	  <TagLink tag={tag} nestLevel={nestLevel}/>
 	</motion.div>
       </div>)

frontend/src/components/ResponsiveMarqueeText.tsx

@@ -1,3 +1,4 @@
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
 import { useEffect, useRef, useState } from 'react'
 
@@ -20,6 +21,8 @@ const MIN_MARQUEE_OVERFLOW_PX = 1
 const ResponsiveMarqueeText: FC<Props> = (
     { text, className, truncateOnMobile = false, title },
 ) => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
   const outerRef = useRef<HTMLSpanElement | null> (null)
   const staticRef = useRef<HTMLSpanElement | null> (null)
   const animatedRef = useRef<HTMLSpanElement | null> (null)
@@ -98,6 +101,7 @@ const ResponsiveMarqueeText: FC<Props> = (
     const animated = animatedRef.current
     const canMarquee = (
         active
+        && animationMode !== 'off'
         && desktopMarqueeEnabled
         && overflowPx >= MIN_MARQUEE_OVERFLOW_PX
         && animated != null)
@@ -207,7 +211,7 @@ const ResponsiveMarqueeText: FC<Props> = (
       resetAnimated ()
       setMarqueeVisible (false)
     }
-  }, [active, desktopMarqueeEnabled, overflowPx, text])
+  }, [active, animationMode, desktopMarqueeEnabled, overflowPx, text])
 
   return (
       <span

frontend/src/components/TagDetailSidebar.tsx

@@ -20,6 +20,7 @@ import SidebarComponent from '@/components/layout/SidebarComponent'
 import { toast } from '@/components/ui/use-toast'
 import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
 import { apiDelete, apiGet, apiPatch, apiPost } from '@/lib/api'
+import { clientAnimationTransition } from '@/lib/clientAnimation'
 import { postsKeys, tagsKeys } from '@/lib/queryKeys'
 import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { dateString, originalCreatedAtString } from '@/lib/utils'
@@ -30,9 +31,6 @@ import type { FC, MutableRefObject, ReactNode } from 'react'
 import type { Category, Post, TagWithSections } from '@/types'
 
 type TagByCategory = { [key in Category]: TagWithSections[] }
-type FlatTagRow = {
-    tag:          TagWithSections
-    parentTagId?: number }
 
 
 const renderTagTree = (
@@ -64,34 +62,6 @@ const renderTagTree = (
 	  ?? [])]
 }
 
-
-const flattenTagTree = (
-    tags: TagWithSections[],
-): FlatTagRow[] => {
-  const seen = new Set<number> ()
-  const rows: FlatTagRow[] = []
-
-  const visit = (
-      tag:           TagWithSections,
-      parentTagId?:  number,
-  ) => {
-    if (seen.has (tag.id))
-      return
-
-    seen.add (tag.id)
-    rows.push ({ tag, parentTagId })
-
-    for (const child of tag.children ?? [])
-      visit (child, tag.id)
-  }
-
-  for (const tag of tags)
-    visit (tag)
-
-  return rows.sort ((rowA, rowB) => rowA.tag.name < rowB.tag.name ? -1 : 1)
-}
-
-
 const isDescendant = (
     root:     TagWithSections,
     targetId: number,
@@ -158,6 +128,37 @@ const buildTagByCategory = (post: Post): TagByCategory => {
 }
 
 
+const buildFlatTagByCategory = (
+    byCategory: TagByCategory,
+): TagByCategory => {
+  const tagsTmp = { } as TagByCategory
+  const seen = new Set<number> ()
+
+  for (const category of CATEGORIES)
+    tagsTmp[category] = []
+
+  const visit = (tag: TagWithSections) => {
+    if (seen.has (tag.id))
+      return
+
+    seen.add (tag.id)
+    tagsTmp[tag.category].push ({ ...tag, children: [] })
+
+    for (const child of tag.children ?? [])
+      visit (child)
+  }
+
+  for (const category of CATEGORIES)
+    for (const tag of byCategory[category] ?? [])
+      visit (tag)
+
+  for (const category of CATEGORIES)
+    tagsTmp[category].sort ((tagA, tagB) => tagA.name < tagB.name ? -1 : 1)
+
+  return tagsTmp
+}
+
+
 const changeCategory = async (
     tagId:    number,
     category: Category): Promise<void> => {
@@ -189,6 +190,11 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
   const qc = useQueryClient ()
   const behaviourSettings = useClientBehaviourSettings ()
   const tagRelationDisplay = behaviourSettings.tagRelationDisplay ?? 'grouped'
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const layoutTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { duration: .2, ease: 'easeOut' as const } },
+  )
 
   const baseTags = useMemo<TagByCategory> (() => {
     const tagsTmp = { } as TagByCategory
@@ -210,6 +216,10 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
   const [dragging, setDragging] = useState (false)
   const [saving, setSaving] = useState (false)
   const [tags, setTags] = useState (baseTags)
+  const flatTagsByCategory = useMemo<TagByCategory> (
+      () => buildFlatTagByCategory (tags),
+      [tags],
+  )
 
   const suppressClickRef = useRef (false)
 
@@ -343,45 +353,58 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
 	      document.body.style.userSelect = ''
 	    }}
 	    modifiers={[restrictToWindowEdges]}>
-	  {CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && (
+	  {CATEGORIES.map ((cat: Category) => {
-	      <div className="my-3" key={cat}>
+	    const categoryTags =
-		<SubsectionTitle>
+		tagRelationDisplay === 'grouped'
-		  <motion.div
+		? (tags[cat] ?? [])
-		      layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}
+		: (flatTagsByCategory[cat] ?? [])
-		      transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
-		    {CATEGORY_NAMES[cat]}
-		  </motion.div>
-		</SubsectionTitle>
 
-		<ul>
+	    if (!(categoryTags.length > 0 || dragging))
-		  {(tagRelationDisplay === 'grouped'
+	      return null
-		    ? (tags[cat] ?? []).flatMap (tag =>
+
-			  renderTagTree (
+	    return (
-			      tag,
+		<div className="my-3" key={cat}>
-			      0,
+		  <SubsectionTitle>
-			      `cat-${ cat }`,
+		    <motion.div
-			      suppressClickRef,
+			layoutId={animationMode === 'off'
-			      undefined,
+			    ? undefined
-			      sp,
+			    : `tag-${ sp ? 'sp-' : '' }${ cat }`}
-			  ),
+			transition={{ layout: layoutTransition }}>
-		      )
+		      {CATEGORY_NAMES[cat]}
-		    : flattenTagTree (tags[cat] ?? []).map (row => (
+		    </motion.div>
-			<li key={`flat-${ cat }-${ row.tag.id }`} className="mb-1">
+		  </SubsectionTitle>
-			  <DraggableDroppableTagRow
+
-			      tag={row.tag}
+		  <ul>
-			      nestLevel={0}
+		    {(tagRelationDisplay === 'grouped'
-			      pathKey={`flat-${ cat }-${ row.tag.id }`}
+		      ? (tags[cat] ?? []).flatMap (tag =>
-			      parentTagId={row.parentTagId}
+			    renderTagTree (
-			      suppressClickRef={suppressClickRef}
+				tag,
-			      sp={sp}/>
+				0,
-			</li>)))}
+				`cat-${ cat }`,
-		  <DropSlot cat={cat}/>
+				suppressClickRef,
-		</ul>
+				undefined,
-	      </div>))}
+				sp,
+			    ),
+			)
+		      : (flatTagsByCategory[cat] ?? []).map (tag => (
+			  <li key={`flat-${ cat }-${ tag.id }`} className="mb-1">
+			    <DraggableDroppableTagRow
+				tag={tag}
+				nestLevel={0}
+				pathKey={`flat-${ cat }-${ tag.id }`}
+				suppressClickRef={suppressClickRef}
+				sp={sp}/>
+			  </li>)))}
+		    <DropSlot cat={cat}/>
+		  </ul>
+		</div>)
+	  })}
 	  {post && (
 	      <motion.div
-		  layoutId={`post-info-${ sp }`}
+		  layoutId={animationMode === 'off'
-		  transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
+		      ? undefined
+		      : `post-info-${ sp }`}
+		  transition={{ layout: layoutTransition }}>
 		<SectionTitle>情報</SectionTitle>
 		<ul>
 		  <li>Id.: {post.id}</li>

frontend/src/components/TagSidebar.tsx

@@ -8,6 +8,8 @@ import SectionTitle from '@/components/common/SectionTitle'
 import SidebarComponent from '@/components/layout/SidebarComponent'
 import { CATEGORIES } from '@/consts'
 import { apiGet } from '@/lib/api'
+import { clientAnimationTransition } from '@/lib/clientAnimation'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 
 import type { FC, MouseEvent } from 'react'
 
@@ -21,6 +23,13 @@ type Props = { posts:     Post[]
 
 const TagSidebar: FC<Props> = ({ posts, onClick }) => {
   const navigate = useNavigate ()
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const animationsOff = animationMode === 'off'
+  const layoutTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { duration: .2, ease: 'easeOut' as const } },
+  )
 
   const [tagsVsbl, setTagsVsbl] = useState (false)
   const [tags, setTags] = useState<TagByCategory> ({ })
@@ -65,12 +74,18 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 	  {CATEGORIES.flatMap (cat => cat in tags ? (
 	      tags[cat].map (tag => (
 		  <li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
-		    <motion.div
+		    {animationsOff
-			className="flex min-w-0 max-w-full items-baseline overflow-hidden"
+		     ? (
-			transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+			 <div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
-			layoutId={`tag-${ tag.id }`}>
+			   <TagLink tag={tag} onClick={onClick}/>
-		      <TagLink tag={tag} onClick={onClick}/>
+			 </div>)
-		    </motion.div>
+		     : (
+			 <motion.div
+			     className="flex min-w-0 max-w-full items-baseline overflow-hidden"
+			     transition={{ layout: layoutTransition }}
+			     layoutId={`tag-${ tag.id }`}>
+			   <TagLink tag={tag} onClick={onClick}/>
+			 </motion.div>)}
 		  </li>))) : [])}
 	</ul>
 	<SectionTitle>関聯</SectionTitle>
@@ -103,18 +118,25 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 	  {posts.length > 0 && TagBlock}
 	</div>
 
-	<AnimatePresence initial={false}>
+	{animationsOff
-	  {tagsVsbl && (
+	 ? (
-	      <motion.div
+	     tagsVsbl && (
-		  key="sptags"
+		 <div className="md:hidden overflow-hidden">
-		  className="md:hidden overflow-hidden"
+		   {posts.length > 0 && TagBlock}
-		  initial={{ height: 0 }}
+		 </div>))
-		  animate={{ height: 'auto' }}
+	 : (
-		  exit={{ height: 0 }}
+	     <AnimatePresence initial={false}>
-		  transition={{ duration: .2, ease: 'easeOut' }}>
+	       {tagsVsbl && (
-		{posts.length > 0 && TagBlock}
+		   <motion.div
-	      </motion.div>)}
+		       key="sptags"
-	</AnimatePresence>
+		       className="md:hidden overflow-hidden"
+		       initial={{ height: 0 }}
+		       animate={{ height: 'auto' }}
+		       exit={{ height: 0 }}
+		       transition={layoutTransition}>
+		     {posts.length > 0 && TagBlock}
+		   </motion.div>)}
+	     </AnimatePresence>)}
 
 	<a href="#"
 	   className="md:hidden block my-2 text-center text-sm

frontend/src/components/TopNav.tsx

@@ -161,13 +161,17 @@ const TopNav: FC<Props> = ({ user }) => {
       visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
   const submenuHeight = moreVsbl ? 40 * moreMenu.length : (activeIdx < 0 ? 0 : 40)
   const topNavTransition =
-      reducedAnimations
+      animationsOff
-      ? { duration: .08, ease: 'linear' as const }
+      ? { duration: 0 }
-      : { duration: .2, ease: 'easeOut' as const }
+      : reducedAnimations
+	? { duration: .08, ease: 'linear' as const }
+	: { duration: .2, ease: 'easeOut' as const }
   const opacityTransition =
-      reducedAnimations
+      animationsOff
-      ? { duration: .08 }
+      ? { duration: 0 }
-      : { duration: .12 }
+      : reducedAnimations
+	? { duration: .08 }
+	: { duration: .12 }
   const highlightTransitionClass =
       animationsOff
       ? undefined

frontend/src/components/common/TabGroup.test.tsx

@@ -20,4 +20,16 @@ describe ('TabGroup', () => {
     expect (screen.getByText ('Alpha')).toBeInTheDocument ()
     expect (screen.queryByText ('Beta')).not.toBeInTheDocument ()
   })
+
+  it ('renders tabs as buttons and shows the right addon', () => {
+    render (
+        <TabGroup rightAddon={<span>件数 20</span>}>
+          <Tab name="広場">Plaza</Tab>
+        </TabGroup>,
+    )
+
+    expect (screen.getByRole ('button', { name: '広場' })).toBeInTheDocument ()
+    expect (screen.queryByRole ('link', { name: '広場' })).not.toBeInTheDocument ()
+    expect (screen.getByText ('件数 20')).toBeInTheDocument ()
+  })
 })

frontend/src/components/layout/MainArea.tsx

@@ -1,5 +1,7 @@
 import { motion } from 'framer-motion'
 
+import { clientAnimationTransition } from '@/lib/clientAnimation'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
 
 import type { FC, ReactNode } from 'react'
@@ -9,12 +11,21 @@ type Props = {
     className?: string }
 
 
-const MainArea: FC<Props> = ({ children, className }) => (
+const MainArea: FC<Props> = ({ children, className }) => {
-    <motion.main
+  const behaviourSettings = useClientBehaviourSettings ()
-	transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+  const animationMode = behaviourSettings.animation ?? 'normal'
-	className={cn ('flex-1 overflow-y-auto p-4', className)}
+  const layoutTransition = clientAnimationTransition (
-	layout="position">
+      animationMode,
-      {children}
+      { normal: { duration: .2, ease: 'easeOut' as const } },
-    </motion.main>)
+  )
 
-export default MainArea
+  return (
+      <motion.main
+	  transition={{ layout: layoutTransition }}
+	  className={cn ('flex-1 overflow-y-auto p-4', className)}
+	  layout={animationMode === 'off' ? false : 'position'}>
+	{children}
+      </motion.main>)
+}
+
+export default MainArea

frontend/src/components/layout/SidebarComponent.tsx

@@ -1,6 +1,8 @@
 import { motion } from 'framer-motion'
 import { Helmet } from 'react-helmet-async'
 
+import { clientAnimationTransition } from '@/lib/clientAnimation'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
 
 import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
@@ -68,6 +70,12 @@ const SidebarComponent: FC<Props> = ({
     sidebarKey,
     side = 'left',
 }) => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const layoutTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { duration: .2, ease: 'easeOut' as const } },
+  )
   const rootRef = useRef<HTMLDivElement | null> (null)
   const maxWidthRef = useRef (maxWidth)
   const getContainerWidth = useCallback (() => {
@@ -305,8 +313,8 @@ const SidebarComponent: FC<Props> = ({
   return (
       <motion.div
 	  ref={rootRef}
-	  layout="position"
+	  layout={animationMode === 'off' ? false : 'position'}
-	  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+	  transition={{ layout: layoutTransition }}
 	  style={style}
 	  className={cn (
 	      'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',

frontend/src/components/users/BehaviourSettingsSection.tsx

@@ -11,8 +11,7 @@ import type { ClientAnimationMode,
 	      ClientBehaviorSettings,
 	      ClientEmbedAutoLoadMode,
 	      ClientLinkPreloadMode,
-	      ClientTagRelationDisplayMode,
+	      ClientTagRelationDisplayMode } from '@/lib/settings'
-	      ClientThumbnailMode } from '@/lib/settings'
 
 type Props = {
     sectionClassName: string
@@ -31,9 +30,9 @@ type SegmentedControlProps<T extends string> = {
     onChange:  (value: T) => void }
 
 type SettingBlockProps = {
-    title:       string
+    title:        string
-    description: string
+    description?: string
-    children:    ReactNode }
+    children:     ReactNode }
 
 const animationOptions: SegmentedOption<ClientAnimationMode>[] = [
     { value: 'off', label: 'なし' },
@@ -47,18 +46,12 @@ const embedAutoLoadOptions: SegmentedOption<ClientEmbedAutoLoadMode>[] = [
 
 const linkPreloadOptions: SegmentedOption<ClientLinkPreloadMode>[] = [
     { value: 'off', label: 'しない' },
-    { value: 'intent', label: 'マウスを置いたら' }]
+    { value: 'intent', label: 'する' }]
 
 const tagRelationDisplayOptions: SegmentedOption<ClientTagRelationDisplayMode>[] = [
     { value: 'flat', label: 'まとめない' },
     { value: 'grouped', label: 'まとめる' }]
 
-const thumbnailModeOptions: SegmentedOption<ClientThumbnailMode>[] = [
-    { value: 'off', label: '非表示' },
-    { value: 'light', label: '軽量' },
-    { value: 'normal', label: '通常' }]
-
-
 const SegmentedControl = <T extends string,> (
     { value, options, onChange }: SegmentedControlProps<T>,
 ) => {
@@ -90,7 +83,7 @@ const SegmentedControl = <T extends string,> (
 const SettingBlock: FC<SettingBlockProps> = (
     { title, description, children },
 ) => (
-    <div className="space-y-3 rounded-xl border border-border/70 bg-background/70 p-4">
+    <div className="space-y-3 rounded-xl px-4">
       <div className="space-y-1">
 	<h3 className="text-sm font-semibold">{title}</h3>
 	<p className="text-sm text-muted-foreground">{description}</p>
@@ -149,10 +142,6 @@ const BehaviourSettingsSection: FC<Props> = (
 	<div className="flex flex-wrap items-start justify-between gap-3">
 	  <div className="space-y-1">
 	    <h2 className="text-xl font-bold">動作</h2>
-	    {hasUnsavedChanges && (
-		<p className="text-sm text-amber-700 dark:text-amber-300">
-		  未保存の変更があります
-		</p>)}
 	  </div>
 
 	  <div className="flex flex-wrap gap-2">
@@ -173,9 +162,7 @@ const BehaviourSettingsSection: FC<Props> = (
 	</div>
 
 	<div className="space-y-4">
-	  <SettingBlock
+	  <SettingBlock title="アニメーション">
-	      title="アニメーション"
-	      description="画面遷移やレイアウト移動の動きを調整します。">
 	    <SegmentedControl
 		value={draftSettings.animation ?? 'normal'}
 		options={animationOptions}
@@ -184,39 +171,26 @@ const BehaviourSettingsSection: FC<Props> = (
 
 	  <SettingBlock
 	      title="リンク先の先読み"
-	      description="リンクにマウスを置いた時などに、移動先の情報を先に読みます。通信量や意図しない読込みが気になる場合は「しない」にできます。">
+	      description="マウスを置いた時点でリンク先のデータを取得します。">
 	    <SegmentedControl
 		value={draftSettings.linkPreload ?? 'intent'}
 		options={linkPreloadOptions}
 		onChange={value => updateDraft ('linkPreload', value)}/>
 	  </SettingBlock>
 
-	  <SettingBlock
+	  <SettingBlock title="タグの親子関係表示">
-	      title="タグの親子関係表示"
-	      description="親子関係があるタグを、まとまりとして表示します。見た目を単純にしたい場合は「まとめない」にできます。">
 	    <SegmentedControl
 		value={draftSettings.tagRelationDisplay ?? 'grouped'}
 		options={tagRelationDisplayOptions}
 		onChange={value => updateDraft ('tagRelationDisplay', value)}/>
 	  </SettingBlock>
 
-	  <SettingBlock
+	  <SettingBlock title="埋め込み自動読込">
-	      title="埋め込み自動読込"
-	      description="外部埋め込みを自動で読み込むかを切り替えます。">
 	    <SegmentedControl
 		value={draftSettings.embedAutoLoad ?? 'auto'}
 		options={embedAutoLoadOptions}
 		onChange={value => updateDraft ('embedAutoLoad', value)}/>
 	  </SettingBlock>
-
-	  <SettingBlock
-	      title="サムネイル表示"
-	      description="投稿一覧や詳細の画像表示を軽量化します。">
-	    <SegmentedControl
-		value={draftSettings.thumbnailMode ?? 'normal'}
-		options={thumbnailModeOptions}
-		onChange={value => updateDraft ('thumbnailMode', value)}/>
-	  </SettingBlock>
 	</div>
       </section>)
 }

frontend/src/components/users/KeyboardSettingsSection.tsx

@@ -147,10 +147,6 @@ const KeyboardSettingsSection: FC<Props> = (
 	<div className="flex flex-wrap items-start justify-between gap-3">
 	  <div className="space-y-1">
 	    <h2 className="text-xl font-bold">キーボード</h2>
-	    {hasUnsavedChanges && (
-		<p className="text-sm text-amber-700 dark:text-amber-300">
-		  未保存の変更があります
-		</p>)}
 	  </div>
 
 	  <div className="flex flex-wrap gap-2">
@@ -206,8 +202,8 @@ const KeyboardSettingsSection: FC<Props> = (
 		<th className="p-2 text-left">操作</th>
 		<th className="p-2 text-left">適用範囲</th>
 		<th className="p-2 text-left">現在のキー</th>
-		<th className="p-2 text-left">変更</th>
+		<th className="p-2 text-left"></th>
-		<th className="p-2 text-left">既定に戻す</th>
+		<th className="p-2 text-left"></th>
 		<th className="p-2 text-left">競合状態</th>
 	      </tr>
 	    </thead>

frontend/src/index.css

@@ -137,9 +137,11 @@
 :root[data-animation='off'] *::before,
 :root[data-animation='off'] *::after
 {
-  animation-duration: 0.001ms !important;
+  animation-duration: 0ms !important;
+  animation-delay: 0ms !important;
   animation-iteration-count: 1 !important;
-  transition-duration: 0.001ms !important;
+  transition-duration: 0ms !important;
+  transition-delay: 0ms !important;
 }
 
 a

frontend/src/lib/clientAnimation.ts

@@ -0,0 +1,34 @@
+import type { Transition } from 'framer-motion'
+
+import type { ClientAnimationMode } from '@/lib/settings'
+
+type ClientAnimationTransitionOptions = {
+    normal:   Transition
+    reduced?: Transition
+    off?:     Transition }
+
+
+export const clientAnimationsOff = (
+    animationMode: ClientAnimationMode,
+): boolean =>
+    animationMode === 'off'
+
+
+export const clientAnimationTransition = (
+    animationMode: ClientAnimationMode,
+    { normal, reduced, off }: ClientAnimationTransitionOptions,
+): Transition => {
+  if (animationMode === 'off')
+    return off ?? { duration: 0 }
+
+  if (animationMode === 'reduced')
+    return reduced ?? { duration: .08, ease: 'linear' as const }
+
+  return normal
+}
+
+
+export const clientScrollBehaviour = (
+    animationMode: ClientAnimationMode,
+): ScrollBehavior =>
+    animationMode === 'off' ? 'auto' : 'smooth'

frontend/src/lib/keyboardShortcuts.test.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest'
+
+import { DEFAULT_KEY_BINDINGS,
+	 formatKeyBinding,
+	 getConflictingShortcutActionIds,
+	 isEditableEventTarget,
+	 keyBindingFromKeyboardEvent,
+	 resolveShortcutScope,
+	 SHORTCUT_DEFINITIONS_BY_ID } from '@/lib/keyboardShortcuts'
+
+describe ('keyboardShortcuts', () => {
+  it ('defines the default key bindings used by the settings screen', () => {
+    expect (SHORTCUT_DEFINITIONS_BY_ID['global.openShortcutHelp']).toMatchObject ({
+	label: 'ショートカット一覧を開く',
+	scope: 'global',
+	defaultBinding: { key: '?', shift: true } })
+    expect (DEFAULT_KEY_BINDINGS['global.focusSearch']).toEqual ({ key: '/' })
+    expect (DEFAULT_KEY_BINDINGS['navigation.posts']).toEqual ({ key: 'p' })
+    expect (DEFAULT_KEY_BINDINGS['pagination.next']).toEqual ({ key: 'ArrowRight' })
+    expect (DEFAULT_KEY_BINDINGS['settings.theme']).toEqual ({ key: '3' })
+  })
+
+  it ('formats key bindings for display', () => {
+    expect (formatKeyBinding ({ key: '?', shift: true })).toBe ('Shift + ?')
+    expect (formatKeyBinding ({ key: '/' })).toBe ('/')
+    expect (formatKeyBinding ({ key: 'p' })).toBe ('P')
+    expect (formatKeyBinding ({ key: 'ArrowRight' })).toBe ('ArrowRight')
+    expect (formatKeyBinding (null)).toBe ('未割当')
+  })
+
+  it ('normalises keyboard events without assigning space by default', () => {
+    const event = { key: 'P',
+		    ctrlKey: false,
+		    shiftKey: false,
+		    altKey: false,
+		    metaKey: false } as KeyboardEvent
+
+    expect (keyBindingFromKeyboardEvent (event)).toEqual ({ key: 'p' })
+    expect (DEFAULT_KEY_BINDINGS['pagination.next']).not.toEqual ({ key: ' ' })
+  })
+
+  it ('detects conflicting action bindings', () => {
+    const conflicts = getConflictingShortcutActionIds ({
+	...DEFAULT_KEY_BINDINGS,
+	'navigation.posts': { key: 'p' },
+	'navigation.tags': { key: 'p' } })
+
+    expect (conflicts.has ('navigation.posts')).toBe (true)
+    expect (conflicts.has ('navigation.tags')).toBe (true)
+    expect (conflicts.has ('navigation.wiki')).toBe (false)
+  })
+
+  it ('resolves route scopes and editable event targets', () => {
+    const input = document.createElement ('input')
+    const div = document.createElement ('div')
+    div.setAttribute ('role', 'textbox')
+
+    expect (resolveShortcutScope ('/posts/search')).toBe ('postSearch')
+    expect (resolveShortcutScope ('/users/settings')).toBe ('settings')
+    expect (resolveShortcutScope ('/materials/1')).toBe ('materials')
+    expect (isEditableEventTarget (input)).toBe (true)
+    expect (isEditableEventTarget (div)).toBe (true)
+    expect (isEditableEventTarget (document.createElement ('button'))).toBe (false)
+  })
+})

frontend/src/lib/settings.test.ts

@@ -0,0 +1,108 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { applyClientAnimationMode,
+	 applyThemeTokens,
+	 buildThemeTokens,
+	 CLIENT_SETTINGS_STORAGE_KEY,
+	 DARK_THEME_TOKENS,
+	 DEFAULT_POST_LIST_ORDER,
+	 getClientListLimit,
+	 getClientListOrder,
+	 getClientThemeMode,
+	 LIGHT_THEME_TOKENS,
+	 loadClientSettings,
+	 setClientListSettings,
+	 setClientThemeAppearance } from '@/lib/settings'
+
+import type { FetchPostsOrder } from '@/types'
+
+const installMatchMedia = (matches: boolean) => {
+  Object.defineProperty (window, 'matchMedia', {
+      configurable: true,
+      value: vi.fn ().mockImplementation (() => ({
+	  matches,
+	  addEventListener: vi.fn (),
+	  removeEventListener: vi.fn () })) })
+}
+
+describe ('settings', () => {
+  beforeEach (() => {
+    localStorage.clear ()
+    document.documentElement.removeAttribute ('data-animation')
+    document.documentElement.removeAttribute ('style')
+    document.documentElement.className = ''
+    installMatchMedia (false)
+  })
+
+  it ('stores list settings under the shared client settings key', () => {
+    setClientListSettings ('postSearch', {
+	limit: 50,
+	order: 'title:asc' })
+
+    expect (getClientListLimit ('postSearch')).toBe (50)
+    expect (getClientListOrder<FetchPostsOrder> ('postSearch')).toBe ('title:asc')
+    expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
+	.toMatchObject ({ lists: { postSearch: { limit: 50, order: 'title:asc' } } })
+  })
+
+  it ('ignores invalid list limits and keeps stored order strings', () => {
+    localStorage.setItem (
+	CLIENT_SETTINGS_STORAGE_KEY,
+	JSON.stringify ({ lists: { postList: { limit: 30, order: DEFAULT_POST_LIST_ORDER } } }))
+
+    expect (getClientListLimit ('postList')).toBeNull ()
+    expect (getClientListOrder<FetchPostsOrder> ('postList')).toBe (
+	DEFAULT_POST_LIST_ORDER)
+  })
+
+  it ('stores theme mode and light/dark slot selections in client settings', () => {
+    setClientThemeAppearance ({
+	themeMode: 'dark',
+	activeLightThemeSlotNo: 2,
+	activeDarkThemeSlotNo: 3 })
+
+    expect (getClientThemeMode ()).toBe ('dark')
+    expect (loadClientSettings ().appearance).toMatchObject ({
+	themeMode: 'dark',
+	activeLightThemeSlotNo: 2,
+	activeDarkThemeSlotNo: 3 })
+  })
+
+  it ('applies animation mode to the document dataset', () => {
+    applyClientAnimationMode ('off')
+    expect (document.documentElement.dataset.animation).toBe ('off')
+
+    applyClientAnimationMode ('reduced')
+    expect (document.documentElement.dataset.animation).toBe ('reduced')
+
+    applyClientAnimationMode ('normal')
+    expect (document.documentElement.dataset.animation).toBeUndefined ()
+  })
+
+  it ('normalises TopNav menu link tokens to complete CSS colours', () => {
+    const tokens = buildThemeTokens ('light', {
+	link: '221.2 83.2% 53.3%',
+	topNavMenuLink: '221.2 83.2% 53.3%' })
+
+    expect (tokens.link).toBe ('221.2 83.2% 53.3%')
+    expect (tokens.topNavMenuLink).toBe ('hsl(221.2 83.2% 53.3%)')
+  })
+
+  it ('derives TopNav colours without mixing mobile active backgrounds', () => {
+    expect (buildThemeTokens ('light', { }).topNavMobileActiveBackground).toBe (
+	LIGHT_THEME_TOKENS.topNavRootBackgroundDesktop)
+    expect (buildThemeTokens ('dark', { }).topNavMobileActiveBackground).toBe (
+	DARK_THEME_TOKENS.topNavActiveBackground)
+  })
+
+  it ('sets shadcn tokens and TopNav tokens with their different value formats', () => {
+    const tokens = buildThemeTokens ('dark', { link: '213.1 93.9% 67.8%' })
+
+    applyThemeTokens (tokens)
+
+    expect (document.documentElement.style.getPropertyValue ('--theme-link')).toBe (
+	'213.1 93.9% 67.8%')
+    expect (document.documentElement.style.getPropertyValue ('--top-nav-menu-link')).toBe (
+	'hsl(213.1 93.9% 67.8%)')
+  })
+})

frontend/src/lib/useKeyboardShortcuts.tsx

@@ -291,10 +291,27 @@ export const useKeyboardShortcutSettings = (): KeyboardShortcutsContextValue =>
 
 export const useKeyboardShortcuts = (handlers: ShortcutHandlers): void => {
   const { registerHandlers } = useKeyboardShortcutSettings ()
+  const handlersRef = useRef (handlers)
+  const actionIdsKey = Object.keys (handlers).sort ().join ('|')
+
+  useEffect (() => {
+    handlersRef.current = handlers
+  }, [handlers])
+
+  const stableHandlers = useMemo<ShortcutHandlers> (() => {
+    return actionIdsKey.split ('|').filter (actionId => actionId !== '')
+	.reduce<ShortcutHandlers> ((nextHandlers, actionId) => {
+	  const key = actionId as ShortcutActionId
+	  nextHandlers[key] = () => {
+	    handlersRef.current[key]?.()
+	  }
+	  return nextHandlers
+	}, { })
+  }, [actionIdsKey])
 
   useEffect (
-      () => registerHandlers (handlers),
+      () => registerHandlers (stableHandlers),
-      [handlers, registerHandlers],
+      [registerHandlers, stableHandlers],
   )
 }
 

frontend/src/pages/GekanatorPage.tsx

@@ -28,6 +28,7 @@ import {
   getClientGekanatorBackgroundMotion,
   setClientGekanatorBackgroundMotion,
 } from '@/lib/settings'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
 
 import type { FC } from 'react'
@@ -3677,6 +3678,8 @@ const expectedAnswerFor = (
 
 
 const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
   const storedGame = useMemo (loadStoredGame, [])
   const hasStoredRestore = storedGame != null && isStoredPhase (storedGame.phase)
   const queryClient = useQueryClient ()
@@ -4069,9 +4072,12 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
     return reviewGuessedPostId === reviewCorrectPostId
   }) ()
   const effectiveBackgroundMotionMode = (() => {
+    if (animationMode === 'off')
+      return 'off'
+
     if (backgroundMotionMode === 'off')
       return 'off'
-    if (prefersReducedMotion)
+    if (animationMode === 'reduced' || prefersReducedMotion)
       return 'calm'
 
     return backgroundMotionMode

frontend/src/pages/materials/MaterialHistoryPage.tsx

@@ -9,14 +9,18 @@ import PageTitle from '@/components/common/PageTitle'
 import Pagination from '@/components/common/Pagination'
 import MainArea from '@/components/layout/MainArea'
 import { SITE_TITLE } from '@/config'
+import { clientScrollBehaviour } from '@/lib/clientAnimation'
 import { fetchMaterialChanges } from '@/lib/materials'
 import { materialsKeys } from '@/lib/queryKeys'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { dateString, inputClass } from '@/lib/utils'
 
 import type { FC, FormEvent } from 'react'
 
 
 const MaterialHistoryPage: FC = () => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
   const location = useLocation ()
   const navigate = useNavigate ()
   const query = new URLSearchParams (location.search)
@@ -55,8 +59,9 @@ const MaterialHistoryPage: FC = () => {
   const totalPages = data ? Math.ceil (data.count / limit) : 0
 
   useEffect (() => {
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
+    document.querySelector ('table')?.scrollIntoView ({
-  }, [location.search])
+	behavior: clientScrollBehaviour (animationMode) })
+  }, [animationMode, location.search])
 
   const handleSearch = (event: FormEvent) => {
     event.preventDefault ()

frontend/src/pages/posts/PostHistoryPage.tsx

@@ -12,9 +12,12 @@ import { useDialogue } from '@/components/dialogues/DialogueProvider'
 import MainArea from '@/components/layout/MainArea'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
+import { clientAnimationTransition,
+	 clientScrollBehaviour } from '@/lib/clientAnimation'
 import { fetchPostChanges, updatePost } from '@/lib/posts'
 import { postsKeys, tagsKeys } from '@/lib/queryKeys'
 import { fetchTag } from '@/lib/tags'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
 
 import type { FC, MouseEvent } from 'react'
@@ -37,6 +40,12 @@ const renderDiff = (diff: { current: string | null; prev: string | null }) => (
 
 const PostHistoryPage: FC = () => {
   const dialogue = useDialogue ()
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const layoutTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { duration: .2, ease: 'easeOut' as const } },
+  )
 
   const location = useLocation ()
   const query = new URLSearchParams (location.search)
@@ -113,8 +122,9 @@ const PostHistoryPage: FC = () => {
   }
 
   useEffect (() => {
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
+    document.querySelector ('table')?.scrollIntoView ({
-  }, [location.search])
+	behavior: clientScrollBehaviour (animationMode) })
+  }, [animationMode, location.search])
 
   const layoutIds: string[] = []
 
@@ -198,8 +208,8 @@ const PostHistoryPage: FC = () => {
 				    rowSpan={rowsCnt}>
 				  <PrefetchLink to={`/posts/${ change.postId }`}>
 				    <motion.div
-					layoutId={layoutId}
+					layoutId={animationMode === 'off' ? undefined : layoutId}
-					transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
+					transition={{ layout: layoutTransition }}>
 				      <img src={change.thumbnail.current
 						|| change.thumbnailBase.current
 						|| undefined}

frontend/src/pages/posts/PostListPage.test.tsx

@@ -1,9 +1,10 @@
 import { fireEvent, screen, waitFor } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import PostListPage from '@/pages/posts/PostListPage'
 import { buildPost, buildTag, buildWikiPage } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
+import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
 
 const postsApi = vi.hoisted (() => ({
   fetchPosts: vi.fn (),
@@ -18,6 +19,11 @@ vi.mock ('@/lib/posts', () => postsApi)
 vi.mock ('@/lib/wiki', () => wikiApi)
 
 describe ('PostListPage', () => {
+  beforeEach (() => {
+    localStorage.clear ()
+    vi.clearAllMocks ()
+  })
+
   it ('loads posts from the current query and renders the plaza tab', async () => {
     const tag = buildTag ({ name: '虹夏' })
     postsApi.fetchPosts.mockResolvedValueOnce ({
@@ -36,6 +42,7 @@ describe ('PostListPage', () => {
             match: 'all',
             page:  2,
             limit: 20,
+            order: 'original_created_at:desc',
           }),
       )
     })
@@ -71,4 +78,36 @@ describe ('PostListPage', () => {
         '/wiki/%E8%99%B9%E5%A4%8F',
     )
   })
+
+  it ('uses stored list limit but keeps the fixed plaza order', async () => {
+    localStorage.setItem (
+        CLIENT_SETTINGS_STORAGE_KEY,
+        JSON.stringify ({ lists: { postList: { limit: 50, order: 'title:asc' } } }))
+    postsApi.fetchPosts.mockResolvedValueOnce ({ posts: [], count: 0 })
+
+    renderWithProviders (<PostListPage/>, { route: '/posts' })
+
+    await waitFor (() => {
+      expect (postsApi.fetchPosts).toHaveBeenCalledWith (
+          expect.objectContaining ({
+            limit: 50,
+            order: 'original_created_at:desc',
+          }),
+      )
+    })
+  })
+
+  it ('updates the limit from the tab right addon and resets to page 1', async () => {
+    postsApi.fetchPosts.mockResolvedValue ({ posts: [], count: 0 })
+
+    renderWithProviders (<PostListPage/>, { route: '/posts?page=3' })
+
+    fireEvent.change (await screen.findByLabelText ('件数'), { target: { value: '100' } })
+
+    await waitFor (() => {
+      expect (postsApi.fetchPosts).toHaveBeenLastCalledWith (
+          expect.objectContaining ({ page: 1, limit: 100 }),
+      )
+    })
+  })
 })

frontend/src/pages/posts/PostNewPage.test.tsx

@@ -30,16 +30,12 @@ describe ('PostNewPage', () => {
     expect (screen.getByText ('403')).toBeInTheDocument ()
   })
 
-  it ('submits a new post with manual title and thumbnail settings', async () => {
+  it ('submits a new post with manual title and thumbnail fetch UI', async () => {
     api.apiPost.mockResolvedValueOnce ({})
     api.apiGet.mockResolvedValue ([])
 
     renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
 
-    const checkboxes = screen.getAllByRole ('checkbox', { name: '自動' })
-    fireEvent.click (checkboxes[0])
-    fireEvent.click (checkboxes[1])
-
     const textboxes = screen.getAllByRole ('textbox')
     fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
     fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
@@ -97,10 +93,6 @@ describe ('PostNewPage', () => {
 
     renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
 
-    const checkboxes = screen.getAllByRole ('checkbox', { name: '自動' })
-    fireEvent.click (checkboxes[0])
-    fireEvent.click (checkboxes[1])
-
     const textboxes = screen.getAllByRole ('textbox')
     fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
     fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })

frontend/src/pages/posts/PostSearchPage.test.tsx

@@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import PostSearchPage from '@/pages/posts/PostSearchPage'
 import { buildPost, buildTag } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
+import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
 
 const postsApi = vi.hoisted (() => ({
   fetchPosts: vi.fn (),
@@ -18,6 +19,7 @@ vi.mock ('@/lib/api', () => api)
 
 describe ('PostSearchPage', () => {
   beforeEach (() => {
+    localStorage.clear ()
     vi.clearAllMocks ()
     api.apiGet.mockResolvedValue ([])
   })
@@ -40,6 +42,7 @@ describe ('PostSearchPage', () => {
             tags:  'x',
             match: 'any',
             page:  2,
+            limit: 20,
           }),
       )
     })
@@ -81,4 +84,41 @@ describe ('PostSearchPage', () => {
 
     expect (await screen.findByText ('結果ないよ（笑）')).toBeInTheDocument ()
   })
+
+  it ('uses URL limit before localStorage and stores the active list settings', async () => {
+    localStorage.setItem (
+        CLIENT_SETTINGS_STORAGE_KEY,
+        JSON.stringify ({ lists: { postSearch: { limit: 100, order: 'title:asc' } } }))
+    postsApi.fetchPosts.mockResolvedValueOnce ({ posts: [], count: 0 })
+
+    renderWithProviders (
+        <PostSearchPage/>,
+        { route: '/posts/search?limit=50&order=created_at%3Adesc' },
+    )
+
+    await waitFor (() => {
+      expect (postsApi.fetchPosts).toHaveBeenCalledWith (
+          expect.objectContaining ({ limit: 50, order: 'created_at:desc' }),
+      )
+    })
+    expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
+        .toMatchObject ({ lists: { postSearch: { limit: 50, order: 'created_at:desc' } } })
+  })
+
+  it ('moves the compact limit control outside the search form and resets page on change', async () => {
+    postsApi.fetchPosts.mockResolvedValue ({ posts: [], count: 0 })
+
+    renderWithProviders (<PostSearchPage/>, { route: '/posts/search?page=4' })
+
+    const limitSelect = await screen.findByLabelText ('件数')
+    expect (limitSelect.closest ('form')).toBeNull ()
+
+    fireEvent.change (limitSelect, { target: { value: '100' } })
+
+    await waitFor (() => {
+      expect (postsApi.fetchPosts).toHaveBeenLastCalledWith (
+          expect.objectContaining ({ page: 1, limit: 100 }),
+      )
+    })
+  })
 })

frontend/src/pages/posts/PostSearchPage.tsx

@@ -14,6 +14,8 @@ import Pagination from '@/components/common/Pagination'
 import TagInput from '@/components/common/TagInput'
 import MainArea from '@/components/layout/MainArea'
 import { SITE_TITLE } from '@/config'
+import { clientAnimationTransition,
+	 clientScrollBehaviour } from '@/lib/clientAnimation'
 import { fetchPosts } from '@/lib/posts'
 import { postsKeys } from '@/lib/queryKeys'
 import {
@@ -24,6 +26,7 @@ import {
     LIST_LIMIT_OPTIONS,
     setClientListSettings,
 } from '@/lib/settings'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
 import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
 
@@ -67,6 +70,13 @@ const parseOrder = (value: string | null): FetchPostsOrder | null => {
 
 
 const PostSearchPage: FC = () => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const thumbnailTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { type: 'spring', stiffness: 500, damping: 40, mass: .5 },
+	reduced: { duration: .08, ease: 'linear' as const } },
+  )
   const location = useLocation ()
 
   const navigate = useNavigate ()
@@ -141,9 +151,11 @@ const PostSearchPage: FC = () => {
     setUpdatedFrom (qUpdatedFrom)
     setUpdatedTo (qUpdatedTo)
 
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
+    document.querySelector ('table')?.scrollIntoView ({
-  }, [location.search, qCreatedFrom, qCreatedTo, qMatch, qOriginalCreatedFrom,
+	behavior: clientScrollBehaviour (animationMode) })
-      qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom, qUpdatedTo, qURL])
+  }, [animationMode, location.search, qCreatedFrom, qCreatedTo, qMatch,
+      qOriginalCreatedFrom, qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom,
+      qUpdatedTo, qURL])
 
   const search = async () => {
     const qs = new URLSearchParams ()
@@ -400,11 +412,10 @@ const PostSearchPage: FC = () => {
 			  <td className="p-2">
 			    <PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
 			      <motion.div
-				  layoutId={`page-${ row.id }`}
+				  layoutId={animationMode === 'off'
-				  transition={{ type: 'spring',
+				      ? undefined
-						stiffness: 500,
+				      : `page-${ row.id }`}
-						damping: 40,
+				  transition={thumbnailTransition}>
-						mass: .5 }}>
 				<img src={row.thumbnail || row.thumbnailBase || undefined}
 				     alt={row.title || row.url}
 				     title={row.title || row.url || undefined}

frontend/src/pages/tags/NicoTagListPage.test.tsx

@@ -6,6 +6,7 @@ import { dateString } from '@/lib/utils'
 import { buildTag, buildUser } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
 
+import type { ReactNode } from 'react'
 import type { NicoTag } from '@/types'
 
 const api = vi.hoisted (() => ({
@@ -27,6 +28,7 @@ const scrollIntoView = vi.fn ()
 vi.mock ('@/lib/api', () => api)
 vi.mock ('@/components/ui/use-toast', () => toastApi)
 vi.mock ('@/components/dialogues/DialogueProvider', () => ({
+  default: ({ children }: { children: ReactNode }) => <>{children}</>,
   useDialogue: () => dialogue,
 }))
 

frontend/src/pages/tags/NicoTagListPage.tsx

@@ -17,8 +17,10 @@ import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
 import { apiPut } from '@/lib/api'
 import { extractValidationError } from '@/lib/apiErrors'
+import { clientScrollBehaviour } from '@/lib/clientAnimation'
 import { tagsKeys } from '@/lib/queryKeys'
 import { fetchNicoTags } from '@/lib/tags'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn, dateString, inputClass } from '@/lib/utils'
 import { canEditContent } from '@/lib/users'
 
@@ -38,6 +40,8 @@ const setIf = (qs: URLSearchParams, key: string, value: string) => {
 
 
 const NicoTagListPage: FC<Props> = ({ user }) => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
   const dialogue = useDialogue ()
   const location = useLocation ()
   const navigate = useNavigate ()
@@ -152,8 +156,9 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
     setLinkStatus (qLinkStatus)
     setEditingId (null)
 
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
+    document.querySelector ('table')?.scrollIntoView ({
-  }, [location.search, qLinkedTag, qLinkStatus, qName])
+	behavior: clientScrollBehaviour (animationMode) })
+  }, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
 
   useEffect (() => {
     if (!(data))

frontend/src/pages/tags/TagHistoryPage.tsx

@@ -11,8 +11,10 @@ import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
 import { CATEGORY_NAMES } from '@/consts'
 import { apiPut } from '@/lib/api'
+import { clientScrollBehaviour } from '@/lib/clientAnimation'
 import { postsKeys, tagsKeys } from '@/lib/queryKeys'
 import { fetchTagChanges } from '@/lib/tags'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn, dateString } from '@/lib/utils'
 
 import type { FC } from 'react'
@@ -43,6 +45,8 @@ const renderStateDiff = (diff: { current: string | null; prev: string | null })
 
 
 const TagHistoryPage: FC = () => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
   const location = useLocation ()
   const query = new URLSearchParams (location.search)
   const id = query.get ('id')
@@ -58,8 +62,9 @@ const TagHistoryPage: FC = () => {
   const qc = useQueryClient ()
 
   useEffect (() => {
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
+    document.querySelector ('table')?.scrollIntoView ({
-  }, [location.search])
+	behavior: clientScrollBehaviour (animationMode) })
+  }, [animationMode, location.search])
 
   return (
       <MainArea>

frontend/src/pages/tags/TagListPage.test.tsx

@@ -1,9 +1,10 @@
 import { fireEvent, screen, waitFor } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import TagListPage from '@/pages/tags/TagListPage'
 import { buildTag } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
+import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
 
 const tagsApi = vi.hoisted (() => ({
   fetchTags: vi.fn (),
@@ -12,6 +13,11 @@ const tagsApi = vi.hoisted (() => ({
 vi.mock ('@/lib/tags', () => tagsApi)
 
 describe ('TagListPage', () => {
+  beforeEach (() => {
+    localStorage.clear ()
+    vi.clearAllMocks ()
+  })
+
   it ('loads tags from URL filters and renders the results table', async () => {
     tagsApi.fetchTags.mockResolvedValueOnce ({
       tags: [buildTag ({
@@ -38,6 +44,8 @@ describe ('TagListPage', () => {
             name:         '虹',
             category:     'character',
             page:         3,
+            limit:        20,
+            order:        'post_count:desc',
             postCountGTE: 5,
             deprecated:   true,
           }),
@@ -48,7 +56,7 @@ describe ('TagListPage', () => {
         '/tags/7',
     )
     expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
-    expect (screen.getAllByRole ('combobox')[1]).toHaveValue ('1')
+    expect (screen.getAllByRole ('combobox')[2]).toHaveValue ('1')
     expect (screen.getAllByText ('廃止')).toHaveLength (2)
   })
 
@@ -58,7 +66,7 @@ describe ('TagListPage', () => {
     renderWithProviders (<TagListPage/>, { route: '/tags' })
 
     fireEvent.change (screen.getByRole ('textbox'), { target: { value: '虹夏' } })
-    fireEvent.change (screen.getAllByRole ('combobox')[0], {
+    fireEvent.change (screen.getAllByRole ('combobox')[1], {
       target: { value: 'character' },
     })
     fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
@@ -82,4 +90,41 @@ describe ('TagListPage', () => {
 
     expect (await screen.findByText ('結果ないよ（笑）')).toBeInTheDocument ()
   })
+
+  it ('uses URL limit before localStorage and preserves the query order', async () => {
+    localStorage.setItem (
+        CLIENT_SETTINGS_STORAGE_KEY,
+        JSON.stringify ({ lists: { tagList: { limit: 100, order: 'name:asc' } } }))
+    tagsApi.fetchTags.mockResolvedValueOnce ({ tags: [], count: 0 })
+
+    renderWithProviders (
+        <TagListPage/>,
+        { route: '/tags?limit=50&order=updated_at%3Adesc' },
+    )
+
+    await waitFor (() => {
+      expect (tagsApi.fetchTags).toHaveBeenCalledWith (
+          expect.objectContaining ({ limit: 50, order: 'updated_at:desc' }),
+      )
+    })
+    expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
+        .toMatchObject ({ lists: { tagList: { limit: 50, order: 'updated_at:desc' } } })
+  })
+
+  it ('keeps the compact limit control outside the search form and resets page on change', async () => {
+    tagsApi.fetchTags.mockResolvedValue ({ tags: [], count: 0 })
+
+    renderWithProviders (<TagListPage/>, { route: '/tags?page=4' })
+
+    const limitSelect = await screen.findByLabelText ('件数')
+    expect (limitSelect.closest ('form')).toBeNull ()
+
+    fireEvent.change (limitSelect, { target: { value: '100' } })
+
+    await waitFor (() => {
+      expect (tagsApi.fetchTags).toHaveBeenLastCalledWith (
+          expect.objectContaining ({ page: 1, limit: 100 }),
+      )
+    })
+  })
 })

frontend/src/pages/tags/TagListPage.tsx

@@ -13,6 +13,7 @@ import Pagination from '@/components/common/Pagination'
 import MainArea from '@/components/layout/MainArea'
 import { SITE_TITLE } from '@/config'
 import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
+import { clientScrollBehaviour } from '@/lib/clientAnimation'
 import { tagsKeys } from '@/lib/queryKeys'
 import {
     DEFAULT_POST_LIST_LIMIT,
@@ -22,6 +23,7 @@ import {
     LIST_LIMIT_OPTIONS,
     setClientListSettings,
 } from '@/lib/settings'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
 import { fetchTags } from '@/lib/tags'
 import { dateString, inputClass } from '@/lib/utils'
@@ -71,6 +73,8 @@ const parseOrder = (value: string | null): FetchTagsOrder | null => {
 
 
 const TagListPage: FC = () => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
   const location = useLocation ()
 
   const navigate = useNavigate ()
@@ -145,9 +149,11 @@ const TagListPage: FC = () => {
     setUpdatedTo (qUpdatedTo)
     setDeprecated (qDeprecated)
 
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
+    document.querySelector ('table')?.scrollIntoView ({
-  }, [location.search, qCategory, qCreatedFrom, qCreatedTo, qName, qPostCountGTE,
+	behavior: clientScrollBehaviour (animationMode) })
-      qPostCountLTE, qUpdatedFrom, qUpdatedTo, qDeprecated])
+  }, [animationMode, location.search, qCategory, qCreatedFrom, qCreatedTo,
+      qName, qPostCountGTE, qPostCountLTE, qUpdatedFrom, qUpdatedTo,
+      qDeprecated])
 
   const handleSearch = (e: FormEvent) => {
     e.preventDefault ()

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

@@ -41,6 +41,7 @@ const postEmbed = vi.hoisted (() => ({
 vi.mock ('@/lib/api', () => api)
 vi.mock ('@/lib/posts', () => postsApi)
 vi.mock ('@/components/dialogues/DialogueProvider', () => ({
+  default: ({ children }: { children: ReactNode }) => <>{children}</>,
   useDialogue: () => dialogue,
 }))
 vi.mock ('@/components/PostEmbed', () => ({

frontend/src/pages/theatres/TheatreDetailPage.tsx

@@ -15,6 +15,8 @@ import { Button } from '@/components/ui/button'
 import { SITE_TITLE } from '@/config'
 import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
 import { apiDelete, apiGet, apiPatch, apiPost, apiPut, isApiError } from '@/lib/api'
+import { clientAnimationTransition,
+	 clientScrollBehaviour } from '@/lib/clientAnimation'
 import { fetchPost } from '@/lib/posts'
 import {
   getClientTheatreLayoutMode,
@@ -22,6 +24,7 @@ import {
   setClientTheatreLayoutMode,
   setClientTheatreTagFlow,
 } from '@/lib/settings'
+import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { canEditContent } from '@/lib/users'
 import { cn, dateString, inputClass } from '@/lib/utils'
 import { useValidationErrors } from '@/lib/useValidationErrors'
@@ -57,8 +60,6 @@ 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
 
@@ -214,6 +215,12 @@ type Props = { user: User | null }
 
 
 const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
+  const behaviourSettings = useClientBehaviourSettings ()
+  const animationMode = behaviourSettings.animation ?? 'normal'
+  const layoutTransition = clientAnimationTransition (
+      animationMode,
+      { normal: { duration: .2, ease: 'easeOut' as const } },
+  )
   const { id } = useParams ()
   const dialogue = useDialogue ()
 
@@ -620,7 +627,9 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
       clearValidationErrors ()
       await apiPost (`/theatres/${ id }/comments`, { content })
       setContent ('')
-      commentsRef.current?.scrollTo ({ top: 0, behavior: 'smooth' })
+      commentsRef.current?.scrollTo ({
+	  top: 0,
+	  behavior: clientScrollBehaviour (animationMode) })
     }
     catch (error)
     {
@@ -837,8 +846,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 
   return (
       <motion.div
-	  layout="position"
+	  layout={animationMode === 'off' ? false : 'position'}
-	  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+	  transition={{ layout: layoutTransition }}
 	  className="min-h-0 flex-1 overflow-y-auto bg-zinc-50 text-zinc-950
 		     md:overflow-hidden dark:bg-zinc-950 dark:text-zinc-50">
 	<Helmet>
@@ -862,7 +871,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	      </SidebarComponent>)}
 
 	  <motion.main
-	      layout="position"
+	      layout={animationMode === 'off' ? false : 'position'}
 	      className="order-1 min-w-0 flex-1 space-y-4 md:order-none
 			 md:min-w-[360px] md:overflow-y-auto">
 	    <div className="space-y-4">

frontend/src/pages/users/SettingPage.test.tsx

@@ -6,6 +6,7 @@ import { buildUser } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
 
 const api = vi.hoisted (() => ({
+  apiGet:     vi.fn (),
   apiPut:     vi.fn (),
   isApiError: vi.fn (),
 }))
@@ -27,12 +28,23 @@ describe ('SettingPage', () => {
   beforeEach (() => {
     vi.clearAllMocks ()
     api.isApiError.mockReturnValue (false)
+    api.apiGet.mockImplementation ((path: string) => {
+      if (path === '/users/settings')
+	return Promise.resolve ({
+	    theme: 'system',
+	    auto_fetch_title: 'manual',
+	    auto_fetch_thumbnail: 'manual',
+	    wiki_editor_mode: 'split' })
+      if (path === '/users/theme_slots')
+	return Promise.resolve ([])
+      return Promise.resolve ({})
+    })
   })
 
   it ('shows loading when user is absent', () => {
     renderWithProviders (<SettingPage user={null} setUser={vi.fn ()}/>)
 
-    expect (screen.getByText ('Loading...')).toBeInTheDocument ()
+    expect (screen.getAllByText ('Loading...').length).toBeGreaterThan (0)
   })
 
   it ('updates the current user name', async () => {
@@ -42,8 +54,9 @@ describe ('SettingPage', () => {
 
     renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
 
-    fireEvent.change (screen.getByRole ('textbox'), { target: { value: 'new' } })
+    const nameInput = (await screen.findAllByRole ('textbox'))[0]
-    fireEvent.click (screen.getByRole ('button', { name: '更新' }))
+    fireEvent.change (nameInput, { target: { value: 'new' } })
+    fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
 
     await waitFor (() => {
       expect (api.apiPut).toHaveBeenCalledWith (
@@ -55,7 +68,7 @@ describe ('SettingPage', () => {
     const formData = api.apiPut.mock.calls[0]?.[1] as FormData
     expect (formData.get ('name')).toBe ('new')
     expect (setUser).toHaveBeenCalled ()
-    expect (toastApi.toast).toHaveBeenCalledWith ({ title: '設定を更新しました．' })
+    expect (toastApi.toast).toHaveBeenCalledWith ({ title: '表示名を更新しました．' })
   })
 
   it ('shows validation errors returned for the name field', async () => {
@@ -75,10 +88,11 @@ describe ('SettingPage', () => {
 
     renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
 
-    fireEvent.change (screen.getByRole ('textbox'), { target: { value: '' } })
+    const nameInput = (await screen.findAllByRole ('textbox'))[0]
-    fireEvent.click (screen.getByRole ('button', { name: '更新' }))
+    fireEvent.change (nameInput, { target: { value: '' } })
+    fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
 
-    expect (await screen.findByText ('名前は必須です．')).toBeInTheDocument ()
+    expect ((await screen.findAllByText ('名前は必須です．')).length).toBeGreaterThan (0)
-    expect (screen.getByRole ('textbox')).toHaveAttribute ('aria-invalid', 'true')
+    expect (nameInput).toHaveAttribute ('aria-invalid', 'true')
   })
 })

frontend/src/pages/users/SettingPage.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet-async'
 import { useBeforeUnload, useLocation, useNavigate } from 'react-router-dom'
 
@@ -152,7 +152,7 @@ const themeSlotNoSelections: ThemeSegmentedOption<UserThemeSlotNo>[] = [
     { value: 3, label: '3' } ]
 
 const sectionClassName =
-    'space-y-4 rounded-xl border border-border bg-background/80 p-4'
+    'space-y-4 rounded-xl p-4'
 
 const themeSelections: ThemeSelectionItem[] = [
     { id: 'user:light:1', label: 'ライト 1', baseTheme: 'light', slotNo: 1 },
@@ -168,24 +168,7 @@ const themeTokenGroups: ThemeTokenGroupSpec[] = [
       fields: [
 	  { key: 'background', label: '背景' },
 	  { key: 'foreground', label: '文字' },
-	  { key: 'primary', label: '主色' },
+	  { key: 'link', label: 'リンク' }] }]
-	  { key: 'accent', label: 'アクセント' },
-	  { key: 'link', label: 'リンク' },
-      ] },
-    { title: '面',
-      fields: [
-	  { key: 'card', label: 'カード' },
-	  { key: 'muted', label: '薄い背景' },
-	  { key: 'border', label: '境界線' },
-      ] },
-    { title: '上部ナビ',
-      fields: [
-	  { key: 'topNavRootBackgroundMobile', label: 'スマホ背景' },
-	  { key: 'topNavRootBackgroundDesktop', label: 'PC 背景' },
-	  { key: 'topNavActiveBackground', label: '選択中背景' },
-	  { key: 'topNavBrandLink', label: 'ロゴ色' },
-      ] },
-]
 
 
 const ThemeSegmentedControl = <T extends string | number,> (
@@ -498,8 +481,6 @@ const ThemeSection: FC<ThemeSectionProps> = (
       draftActiveDarkThemeSlotNo,
       currentDisplayedThemeSlot,
       selectedTheme,
-      displayedThemeLabel,
-      systemThemeLabel,
       hasUnsavedChanges,
       settingsBaseErrors,
       settingsFieldErrors,
@@ -517,16 +498,6 @@ const ThemeSection: FC<ThemeSectionProps> = (
 	<div className="flex flex-wrap items-start justify-between gap-3">
 	  <div className="space-y-1">
 	    <h2 className="text-xl font-bold">テーマ</h2>
-	    <p className="text-sm text-muted-foreground">
-	      現在表示中: {displayedThemeLabel}
-	    </p>
-	    {draftThemeMode === 'system' && (
-		<p className="text-sm text-muted-foreground">
-		  システム設定: {systemThemeLabel}
-		</p>)}
-	    <p className="text-sm text-muted-foreground">
-	      保存先: {themeLabelBySelection (currentDisplayedThemeSlot)}
-	    </p>
 	    {hasUnsavedChanges && (
 		<p className="text-sm text-amber-700 dark:text-amber-300">
 		  未保存の変更があります
@@ -534,6 +505,13 @@ const ThemeSection: FC<ThemeSectionProps> = (
 	  </div>
 
 	  <div className="flex flex-wrap gap-2">
+	    <Button
+		type="button"
+		variant="outline"
+		onClick={onResetThemeSlot}>
+	      既定に戻す
+	    </Button>
+
 	    <Button
 		type="button"
 		variant="destructive"
@@ -553,7 +531,7 @@ const ThemeSection: FC<ThemeSectionProps> = (
 	<FieldError messages={settingsBaseErrors}/>
 	<FieldError messages={settingsFieldErrors.theme ?? []}/>
 
-	<div className="space-y-3 rounded-xl border border-border/70 bg-background/70 p-4">
+	<div className="space-y-3 rounded-xl p-4">
 	  <div className="flex flex-wrap items-center gap-x-4 gap-y-2">
 	    <div className="shrink-0">
 	      <Label>表示モード</Label>
@@ -567,14 +545,6 @@ const ThemeSection: FC<ThemeSectionProps> = (
 	  </div>
 
 	  <div className="space-y-3">
-	    <div className="space-y-1">
-	      <h3 className="text-sm font-semibold">テーマの使い分け</h3>
-	      <p className="text-sm text-muted-foreground">
-		表示モードと使用テーマは，このブラウザにすぐ保存されます．
-		色の編輯だけが保存・破棄の対象です．
-	      </p>
-	    </div>
-
 	    <div className="grid gap-3 md:grid-cols-2">
 	      <div className="space-y-2">
 		<Label>ライト時</Label>
@@ -588,9 +558,6 @@ const ThemeSection: FC<ThemeSectionProps> = (
 			  {`ライト ${ selection.value }`}
 			</option>))}
 		</select>
-		<p className="text-sm text-muted-foreground">
-		  ライト表示の時に使うテーマを選びます．
-		</p>
 	      </div>
 
 	      <div className="space-y-2">
@@ -605,36 +572,16 @@ const ThemeSection: FC<ThemeSectionProps> = (
 			  {`ダーク ${ selection.value }`}
 			</option>))}
 		</select>
-		<p className="text-sm text-muted-foreground">
-		  ダーク表示の時に使うテーマを選びます．
-		</p>
 	      </div>
 	    </div>
 	  </div>
-
-	  <div className="flex flex-wrap items-center gap-2">
-	    <Button
-		type="button"
-		variant="outline"
-		onClick={onResetThemeSlot}>
-	      既定に戻す
-	    </Button>
-	  </div>
-
-	  <div style={themePreviewStyle (selectedTheme.tokens.tagColours)}>
-	    <TagLink
-		tag={previewTags.general}
-		linkFlg={false}
-		truncateOnMobile
-		withWiki={false}/>
-	  </div>
 	</div>
 
 	<div className="space-y-4">
 	  {themeTokenGroups.map (group => (
 	      <div
 		  key={group.title}
-		  className="space-y-3 rounded-xl border border-border/70 bg-background/70 p-4">
+		  className="space-y-3 rounded-xl p-4">
 		<h3 className="text-sm font-semibold">{group.title}</h3>
 		<div className="space-y-1">
 		  {group.fields.map (field => (
@@ -657,7 +604,7 @@ const ThemeSection: FC<ThemeSectionProps> = (
 		</div>
 	      </div>))}
 
-	  <div className="space-y-3 rounded-xl border border-border/70 bg-background/70 p-4">
+	  <div className="space-y-3 rounded-xl bg-background/70 p-4">
 	    <div className="flex flex-wrap items-center justify-between gap-2">
 	      <div>
 		<h3 className="font-medium">タグ</h3>
@@ -788,6 +735,9 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
       state:  SettingsTabDirtyState,
   ) => {
     setDirtyStates (current => {
+      if (!(state.dirty) && current[tab] == null)
+	return current
+
       const next = { ...current }
 
       if (!(state.dirty))
@@ -880,7 +830,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
     }, nextThemeSlots)
   }
 
-  const discardAllDirtyChanges = async (): Promise<void> => {
+  const discardAllDirtyChanges = useCallback (async (): Promise<void> => {
     const currentDirtyStates = Object.values (dirtyStates)
 
     for (const dirtyState of currentDirtyStates)
@@ -890,7 +840,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
       }
 
     setDirtyStates ({ })
-  }
+  }, [dirtyStates])
 
   const discardCurrentTabChanges = async (): Promise<void> => {
     const currentDirtyState = dirtyStates[activeTab]

frontend/src/test/render.tsx

@@ -3,6 +3,10 @@ import { render } from '@testing-library/react'
 import { HelmetProvider } from 'react-helmet-async'
 import { MemoryRouter } from 'react-router-dom'
 
+import DialogueProvider from '@/components/dialogues/DialogueProvider'
+import { KeyboardShortcutsProvider } from '@/lib/useKeyboardShortcuts'
+import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
+
 import type { ReactElement, ReactNode } from 'react'
 
 type Options = {
@@ -15,21 +19,25 @@ export const renderWithProviders = (
 ) => {
   const queryClient = new QueryClient ({
     defaultOptions: {
-      queries: { retry: false },
+      queries: { retry: false } },
-    },
   })
 
   const Wrapper = ({ children }: { children: ReactNode }) => (
       <QueryClientProvider client={queryClient}>
         <HelmetProvider>
           <MemoryRouter initialEntries={[options.route ?? '/']}>
-            {children}
+            <DialogueProvider>
+              <UnsavedChangesGuardProvider>
+                <KeyboardShortcutsProvider>
+                  {children}
+                </KeyboardShortcutsProvider>
+              </UnsavedChangesGuardProvider>
+            </DialogueProvider>
           </MemoryRouter>
         </HelmetProvider>
       </QueryClientProvider>)
 
   return {
     queryClient,
-    ...render (ui, { wrapper: Wrapper }),
+    ...render (ui, { wrapper: Wrapper }) }
-  }
 }

frontend/src/test/setup.ts

@@ -20,3 +20,10 @@ window.requestAnimationFrame = callback => {
   callback (0)
   return 0
 }
+
+Object.defineProperty (window, 'matchMedia', {
+    configurable: true,
+    value: vi.fn ().mockImplementation (() => ({
+	addEventListener: vi.fn (),
+	removeEventListener: vi.fn (),
+	matches: false })) })