コミットを比較
10 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| c7e60c9e43 | |||
| 881e940e24 | |||
| 60335b4d34 | |||
| 46de995f8d | |||
| 53d1cadefb | |||
| d3af4563ca | |||
| 469228a6ed | |||
| 7e89fb286a | |||
| 7fcfc8b8aa | |||
| 7b6b24b9c5 |
@@ -106,10 +106,6 @@ npm run preview
|
|||||||
- Explain risks directly.
|
- Explain risks directly.
|
||||||
- Prefer single quotes for strings unless interpolation or escaping makes
|
- Prefer single quotes for strings unless interpolation or escaping makes
|
||||||
double quotes better.
|
double quotes better.
|
||||||
- For Japanese text, follow the 1986 Cabinet Notice
|
|
||||||
《現代仮名遣い》 as the default orthography.
|
|
||||||
- For Japanese kanji spelling, do not apply
|
|
||||||
《当用漢字による書きかえ》; prefer the original spelling as the formal one.
|
|
||||||
- Ruby: never put a space before method-call parentheses.
|
- Ruby: never put a space before method-call parentheses.
|
||||||
- Ruby: `render` 系メソッド呼び出しでは、keyword 引数付きでも括弧を書かない。
|
- Ruby: `render` 系メソッド呼び出しでは、keyword 引数付きでも括弧を書かない。
|
||||||
- Ruby: never put a line break immediately before `)`.
|
- Ruby: never put a line break immediately before `)`.
|
||||||
@@ -204,7 +200,7 @@ const value =
|
|||||||
## Backend rules
|
## Backend rules
|
||||||
|
|
||||||
- Inspect existing routes, controllers, models, services, and specs before
|
- Inspect existing routes, controllers, models, services, and specs before
|
||||||
editing backend behaviour.
|
editing backend behavior.
|
||||||
- Never run `db:drop`, `db:reset`, `db:setup`, or any command that drops or
|
- Never run `db:drop`, `db:reset`, `db:setup`, or any command that drops or
|
||||||
recreates the development database. This applies even when the user includes
|
recreates the development database. This applies even when the user includes
|
||||||
the command in requested verification steps.
|
the command in requested verification steps.
|
||||||
@@ -215,7 +211,7 @@ const value =
|
|||||||
- Repeated destructive instructions are not enough confirmation because they
|
- Repeated destructive instructions are not enough confirmation because they
|
||||||
may be auto-generated. Without `いいからやれ`, refuse or substitute a safer
|
may be auto-generated. Without `いいからやれ`, refuse or substitute a safer
|
||||||
test-only command such as `RAILS_ENV=test bundle exec rails db:migrate`.
|
test-only command such as `RAILS_ENV=test bundle exec rails db:migrate`.
|
||||||
- For API behaviour changes, add or update request specs under
|
- For API behavior changes, add or update request specs under
|
||||||
`backend/spec/requests` only when the user explicitly asks for tests.
|
`backend/spec/requests` only when the user explicitly asks for tests.
|
||||||
- Prefer RSpec for new backend tests; existing minitest files under
|
- Prefer RSpec for new backend tests; existing minitest files under
|
||||||
`backend/test` do not make minitest the default for new coverage.
|
`backend/test` do not make minitest the default for new coverage.
|
||||||
@@ -223,8 +219,8 @@ const value =
|
|||||||
- Preserve the `X-Transfer-Code` user identification flow unless the task
|
- Preserve the `X-Transfer-Code` user identification flow unless the task
|
||||||
explicitly changes authentication.
|
explicitly changes authentication.
|
||||||
- Be careful with version tables, `version_no`, optimistic concurrency,
|
- Be careful with version tables, `version_no`, optimistic concurrency,
|
||||||
wiki revisions, and restore/diff behaviour.
|
wiki revisions, and restore/diff behavior.
|
||||||
- Be careful with tag names, tag normalisation, implications, similarities, and discard behaviour.
|
- Be careful with tag names, tag normalization, implications, similarities, and discard behavior.
|
||||||
- Be sensitive to N+1 queries; avoid introducing them and proactively fix
|
- Be sensitive to N+1 queries; avoid introducing them and proactively fix
|
||||||
existing N+1 issues in the code path being edited.
|
existing N+1 issues in the code path being edited.
|
||||||
- Keep migration files and `backend/db/schema.rb` consistent when changing schema.
|
- Keep migration files and `backend/db/schema.rb` consistent when changing schema.
|
||||||
@@ -245,9 +241,9 @@ const value =
|
|||||||
- Internal links must use `PrefetchLink`.
|
- Internal links must use `PrefetchLink`.
|
||||||
- External links must use `<a>` with `target="_blank"`.
|
- External links must use `<a>` with `target="_blank"`.
|
||||||
- When adding or changing Tailwind `bg-*` classes in TSX, pair them with an
|
- When adding or changing Tailwind `bg-*` classes in TSX, pair them with an
|
||||||
explicit readable `text-*` colour and dark-mode counterparts such as
|
explicit readable `text-*` color and dark-mode counterparts such as
|
||||||
`dark:bg-*`, `dark:text-*`, and `dark:border-*` where a border is present.
|
`dark:bg-*`, `dark:text-*`, and `dark:border-*` where a border is present.
|
||||||
- Do not rely on inherited text colour for light backgrounds. This is especially
|
- Do not rely on inherited text color for light backgrounds. This is especially
|
||||||
important for chips, cards, buttons, and panels that may inherit white text in
|
important for chips, cards, buttons, and panels that may inherit white text in
|
||||||
dark mode.
|
dark mode.
|
||||||
- Mobile UI must be checked as a first-class layout. Avoid wide fixed content,
|
- Mobile UI must be checked as a first-class layout. Avoid wide fixed content,
|
||||||
@@ -259,52 +255,15 @@ const value =
|
|||||||
`!==` over negating a comparison like `!(a === b)`.
|
`!==` over negating a comparison like `!(a === b)`.
|
||||||
- In TypeScript and TSX, prefer `++i` or `--i` over `i += 1` or `i -= 1` for
|
- In TypeScript and TSX, prefer `++i` or `--i` over `i += 1` or `i -= 1` for
|
||||||
simple unit-step counter updates.
|
simple unit-step counter updates.
|
||||||
- For user-facing Japanese text, follow the 1986 Cabinet Notice
|
- For user-facing Japanese text, prefer modern kana usage and natural current
|
||||||
《現代仮名遣い》 and avoid historical kana spellings unless the task
|
phrasing over historical spellings or awkward literal wording.
|
||||||
explicitly requires them.
|
|
||||||
- For user-facing Japanese kanji spelling, do not normalize to
|
|
||||||
《当用漢字による書きかえ》; prefer original forms such as `編輯`.
|
|
||||||
- For user-facing Japanese ellipses, prefer `……` over ASCII `...`.
|
- For user-facing Japanese ellipses, prefer `……` over ASCII `...`.
|
||||||
|
|
||||||
### Frontend TypeScript and TSX style
|
### Frontend TSX style
|
||||||
|
|
||||||
- The delimiter-placement and line-breaking rules in this section apply to
|
- Preserve the local TSX formatting style.
|
||||||
both plain TypeScript `.ts` and TSX `.tsx`, unless a bullet explicitly says
|
|
||||||
it is JSX- or React-specific.
|
|
||||||
- Preserve the local TypeScript and TSX formatting style.
|
|
||||||
- Do not normalize TSX to common Prettier-style React formatting unless
|
- Do not normalize TSX to common Prettier-style React formatting unless
|
||||||
explicitly asked.
|
explicitly asked.
|
||||||
- Treat TypeScript and TSX formatting rules as hard constraints, not
|
|
||||||
preferences. Before finishing a TypeScript or TSX edit, inspect the edited
|
|
||||||
hunks for closing `)`, `]`, and `}` placement and fix violations instead of
|
|
||||||
relying on formatter defaults.
|
|
||||||
- After every TypeScript or TSX edit, perform a style-only self-review of the
|
|
||||||
edited hunks before running verification or reporting completion. The task is
|
|
||||||
not complete while any edited TypeScript or TSX hunk violates these local
|
|
||||||
formatting rules.
|
|
||||||
- The TypeScript/TSX self-review must classify every edited leading or trailing
|
|
||||||
`)`, `]`, and `}` by syntax role before deciding whether it is valid. Do not
|
|
||||||
apply a rule by glyph alone. A closing `)` for a function parameter list is
|
|
||||||
different from a closing `)` for a function call. A closing `}` for a block
|
|
||||||
is different from a closing `}` for an object, type literal, import list, or
|
|
||||||
destructuring pattern.
|
|
||||||
- The TSX-specific self-review must confirm there are no common Prettier-style
|
|
||||||
React component declarations with a multi-line destructured parameter.
|
|
||||||
- The TypeScript/TSX self-review must confirm multi-line function declaration
|
|
||||||
parameter `)` placement follows the detailed parameter-list rules below.
|
|
||||||
- The TypeScript/TSX self-review must confirm call-expression `)` is never at
|
|
||||||
the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm
|
|
||||||
object/type/import/destructuring `}` is not at the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm multi-line
|
|
||||||
function/lambda/callback/block `}` is on its own line and never at the end
|
|
||||||
of the previous line.
|
|
||||||
- The TypeScript/TSX self-review must confirm array `]` is not at the
|
|
||||||
beginning of a line.
|
|
||||||
- The TSX-specific self-review must confirm JSX closing markers and closing
|
|
||||||
parentheses keep the surrounding compact style.
|
|
||||||
- The TypeScript/TSX self-review must confirm leading indentation follows
|
|
||||||
4-space logical indentation with tabs only as leading 8-space compression.
|
|
||||||
- Prefer `const` arrow functions for TypeScript/TSX component and helper declarations.
|
- Prefer `const` arrow functions for TypeScript/TSX component and helper declarations.
|
||||||
- Put two blank lines before and after top-level `const` function
|
- Put two blank lines before and after top-level `const` function
|
||||||
declarations, unless imports, exports, or file boundaries make that awkward.
|
declarations, unless imports, exports, or file boundaries make that awkward.
|
||||||
@@ -313,37 +272,16 @@ const value =
|
|||||||
character.
|
character.
|
||||||
- A leading tab is exactly equivalent to 8 leading spaces.
|
- A leading tab is exactly equivalent to 8 leading spaces.
|
||||||
- In TypeScript and TSX function declarations, including `const` arrow
|
- In TypeScript and TSX function declarations, including `const` arrow
|
||||||
function declarations, classify the parameter list before placing the closing
|
function declarations, when the parameter list spans multiple lines, always
|
||||||
`)`.
|
put the closing parenthesis at the beginning of its own line before the return
|
||||||
- If the parameter list itself is given its own multi-line block after the
|
type or `=>`.
|
||||||
function's opening `(`, put the closing parameter `)` at the beginning of its
|
|
||||||
own line before the return type or `=>`.
|
|
||||||
- If the only line break is inside a parameter's inline type, object type, or
|
|
||||||
destructuring shape, and the parameter list itself is not split as a separate
|
|
||||||
block, keep the closing parameter `)` on the same line as that parameter's
|
|
||||||
final `}`. In this case, moving `)` to a new line is wrong.
|
|
||||||
- Do not write React component declarations in the common Prettier form
|
|
||||||
`const Component = ({ ... }) => (` when the destructured parameter spans
|
|
||||||
multiple lines. Use the project form with the opening `(` after `=`, the
|
|
||||||
destructured object as the argument, and the closing parameter `)` on its own
|
|
||||||
line before `=>`.
|
|
||||||
- In TypeScript and TSX, never place a closing parenthesis at the beginning of
|
- In TypeScript and TSX, never place a closing parenthesis at the beginning of
|
||||||
a line except for a multi-line function declaration parameter list.
|
a line except for a multi-line function declaration parameter list.
|
||||||
- Never place a closing square bracket at the beginning of a line.
|
- Never place a closing square bracket at the beginning of a line.
|
||||||
- For object literals, type literals, import/export named bindings, destructuring
|
- For object literals and other associative-array-style braces, do not place
|
||||||
patterns, and other associative-array-style braces, do not place the closing
|
the closing brace at the beginning of a line. Function, lambda, callback, and
|
||||||
brace at the beginning of a line. Keep `}` on the same line as the final
|
block closing braces are exempt and should stay on their own line when that
|
||||||
property, binding, or specifier unless that would violate the line limit.
|
fits the local style.
|
||||||
Function, lambda, callback, and block closing braces are exempt and should
|
|
||||||
stay on their own line when that fits the local style. When a function,
|
|
||||||
lambda, callback, or block body spans multiple lines, do not put its closing
|
|
||||||
`}` at the end of the previous line.
|
|
||||||
- For arrays and tuple-like lists, do not place the closing `]` at the
|
|
||||||
beginning of a line. Keep `]` on the same line as the final element unless
|
|
||||||
that would violate the line limit.
|
|
||||||
- For function and method calls, do not place the closing `)` at the beginning
|
|
||||||
of a line. The only TypeScript/TSX exception is the closing parameter `)` of a
|
|
||||||
multi-line function declaration.
|
|
||||||
- When writing braces on a single line in TypeScript or TSX JavaScript
|
- When writing braces on a single line in TypeScript or TSX JavaScript
|
||||||
context, put exactly one space inside the braces, as in `{ value }` or
|
context, put exactly one space inside the braces, as in `{ value }` or
|
||||||
`{ key: value }`.
|
`{ key: value }`.
|
||||||
@@ -362,585 +300,6 @@ const value =
|
|||||||
- Do not use a leading semicolon for expression statements such as
|
- Do not use a leading semicolon for expression statements such as
|
||||||
`;([...]).forEach(...)`; rewrite the expression to avoid ASI hazards
|
`;([...]).forEach(...)`; rewrite the expression to avoid ASI hazards
|
||||||
explicitly, for example with `void`.
|
explicitly, for example with `void`.
|
||||||
- Do not insert `void` mechanically before ordinary event-handler or callback
|
|
||||||
calls merely because the callee returns a `Promise`. If the surrounding code
|
|
||||||
already uses a plain expression statement such as
|
|
||||||
`onClick={() => requestActiveTab ('theme')}`, preserve that style unless a
|
|
||||||
local rule or type requirement truly forces `void`. Adding unnecessary
|
|
||||||
`void` is a medium-severity style violation.
|
|
||||||
- When fixing formatting, never change operator binding, evaluation order,
|
|
||||||
tuple/comma behaviour, or any other expression structure. A formatting pass
|
|
||||||
that changes how `!==`, `??`, `?:`, `&&`, `||`, or `,` binds is a capital
|
|
||||||
offence.
|
|
||||||
- In TypeScript and TSX, do not mechanically verticalise short call tails,
|
|
||||||
short object literals, or short callback bodies that already fit the local
|
|
||||||
line-length and delimiter rules. Expanding compact local code without a
|
|
||||||
readability need is a minor style violation.
|
|
||||||
- In TypeScript and TSX, treat short object literals, short returned objects,
|
|
||||||
short typed object shapes, and short function-call object arguments as
|
|
||||||
compact associative syntax by default. If they fit locally, keep the opening
|
|
||||||
`{` on the same line as the first property and keep the closing `}` on the
|
|
||||||
same line as the final property. Do not explode them into vertical
|
|
||||||
Prettier-style blocks without a concrete readability or line-length reason.
|
|
||||||
- In TypeScript and TSX, when a compact associative form is broken across two
|
|
||||||
lines, keep the opening `{` with the first property and the closing `}` with
|
|
||||||
the final property. A shape like `{\n key: value,\n}` is wrong even when
|
|
||||||
line length would permit it.
|
|
||||||
- In TypeScript and TSX, when a short call such as `apiGet<...> (...)`,
|
|
||||||
`apiPatch<...> (...)`, `setState (...)`, `updateClientSettings (...)`, or
|
|
||||||
`window.dispatchEvent (...)` already fits within the local style, do not
|
|
||||||
add extra vertical layers around the object argument or callback body.
|
|
||||||
- In TypeScript and TSX, after editing a file, inspect the file tail and
|
|
||||||
remove meaningless blank lines before `export default` or the end of file.
|
|
||||||
A stray empty line before `export default` is a minor style offence.
|
|
||||||
- Use correct British English spelling for new identifiers, filenames,
|
|
||||||
component names, helper names, comments, and developer-facing prose unless
|
|
||||||
editing an already established American-English API that must keep its
|
|
||||||
existing spelling for compatibility.
|
|
||||||
- Prefer British English spellings such as `behaviour`, `colour`, `realise`,
|
|
||||||
`theatre`, `centre`, `favourite`, `optimise`, and `catalogue`.
|
|
||||||
- Avoid American or Canadian spellings such as `behavior`, `color`, `realize`,
|
|
||||||
`theater`, `center`, `favorite`, `optimize`, and `catalog`.
|
|
||||||
- Even when an external library or API uses the wrong spelling, prefer to
|
|
||||||
correct it at the local boundary and use proper British English names in this
|
|
||||||
codebase. For example, prefer `import { color: colour } from '@external-lib'`
|
|
||||||
over spreading `color` through local code.
|
|
||||||
- Apply the same boundary correction to object destructuring, wrapper helpers,
|
|
||||||
adapter layers, and local variable names when doing so does not break the
|
|
||||||
external contract.
|
|
||||||
- For this repository, prefer names such as `BehaviourSettingsSection.tsx`, not
|
|
||||||
`BehaviorSettingsSection.tsx`.
|
|
||||||
|
|
||||||
### Additional style offences and penalties
|
|
||||||
|
|
||||||
Use this section for recurrent failure modes that are easy to miss when
|
|
||||||
applying the delimiter rules mechanically.
|
|
||||||
|
|
||||||
#### Unnecessary `void` before ordinary callbacks
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
onClick={() => void requestActiveTab ('theme')}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
onClick={() => requestActiveTab ('theme')}
|
|
||||||
```
|
|
||||||
|
|
||||||
Penalty: medium-severity offence. The code still works, but it pollutes the
|
|
||||||
local style and usually signals that the edit was made mechanically rather than
|
|
||||||
by reading the surrounding code.
|
|
||||||
|
|
||||||
#### Formatting that changes expression structure
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const hasUnsavedChanges =
|
|
||||||
serialiseThemeDraft (draftThemeSlots)
|
|
||||||
!== (serialiseThemeDraft (savedThemeSlots),
|
|
||||||
draftActiveThemeMode !== savedThemeMode)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const hasUnsavedChanges =
|
|
||||||
serialiseThemeDraft (draftThemeSlots)
|
|
||||||
!== serialiseThemeDraft (savedThemeSlots)
|
|
||||||
|| draftThemeMode !== savedThemeMode
|
|
||||||
```
|
|
||||||
|
|
||||||
Penalty: capital offence. Formatting must never corrupt the meaning of an
|
|
||||||
expression.
|
|
||||||
|
|
||||||
#### Mechanical vertical expansion of compact local code
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const nextState = {
|
|
||||||
open,
|
|
||||||
activeTab }
|
|
||||||
|
|
||||||
setDirtyStates (
|
|
||||||
current => ({
|
|
||||||
current,
|
|
||||||
key: value }),
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const nextState = { open, activeTab }
|
|
||||||
|
|
||||||
setDirtyStates (
|
|
||||||
current => ({
|
|
||||||
current,
|
|
||||||
key: value }))
|
|
||||||
```
|
|
||||||
|
|
||||||
Penalty: minor offence when semantics stay intact. It is not necessarily
|
|
||||||
broken, but it ignores the repository's compact associative style.
|
|
||||||
|
|
||||||
#### Prettier-style exploded object literals that should stay compact
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = {
|
|
||||||
enabled: keyboard?.enabled !== false,
|
|
||||||
bindings: normaliseKeyboardBindings (keyboard?.bindings),
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = {
|
|
||||||
enabled: keyboard?.enabled !== false,
|
|
||||||
bindings: normaliseKeyboardBindings (keyboard?.bindings) }
|
|
||||||
```
|
|
||||||
|
|
||||||
Also good when short enough:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = { enabled: keyboard?.enabled !== false,
|
|
||||||
bindings: normaliseKeyboardBindings (keyboard?.bindings) }
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: for compact associative syntax, keep `{` with the first property and `}`
|
|
||||||
with the final property unless line length truly forces a different shape.
|
|
||||||
Do not mechanically apply the common Prettier block form.
|
|
||||||
Penalty: medium-severity offence. The code still runs, but it violates a core
|
|
||||||
repository formatting habit that must be preserved consistently.
|
|
||||||
|
|
||||||
#### Exploded object arguments inside short calls
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
updateClientSettings (settings => ({
|
|
||||||
...settings,
|
|
||||||
keyboard: next,
|
|
||||||
}))
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
updateClientSettings (settings => ({
|
|
||||||
...settings,
|
|
||||||
keyboard: next }))
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: a call-expression closing `)` must not drift onto its own line, and a
|
|
||||||
short object argument should not be exploded more than necessary. Keep the
|
|
||||||
callback's returned object compact when it fits.
|
|
||||||
Penalty: medium-severity offence. This usually means the edit was formatted
|
|
||||||
mechanically instead of by reading the local style.
|
|
||||||
|
|
||||||
#### Stray blank line before `export default`
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const Component: FC = () => {
|
|
||||||
return <div/>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export default Component
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const Component: FC = () => {
|
|
||||||
return <div/>
|
|
||||||
}
|
|
||||||
|
|
||||||
export default Component
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: do not leave an extra empty line between the last top-level declaration
|
|
||||||
and `export default` unless some surrounding file structure genuinely requires
|
|
||||||
visual separation.
|
|
||||||
Penalty: minor offence. It is small, but it is easy to avoid and should not
|
|
||||||
recur.
|
|
||||||
|
|
||||||
### Frontend delimiter decision table
|
|
||||||
|
|
||||||
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
|
||||||
more authoritative than formatter habit.
|
|
||||||
|
|
||||||
#### Import and export named bindings
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
} from '@/components/ui'
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import { Button,
|
|
||||||
Card } from '@/components/ui'
|
|
||||||
```
|
|
||||||
|
|
||||||
Also acceptable when short:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import { Button, Card } from '@/components/ui'
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: named-binding `}` is associative-array-style syntax. It must not be alone
|
|
||||||
at the beginning of a line. Prefer keeping `{` with the first binding and `}`
|
|
||||||
with the final binding when this fits the line limit.
|
|
||||||
Penalty: capital offence. This is one of the core associative-brace rules.
|
|
||||||
|
|
||||||
#### Type literals
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
type Props = {
|
|
||||||
open: boolean
|
|
||||||
onOpenChange: (open: boolean) => void
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
type Props = {
|
|
||||||
open: boolean
|
|
||||||
onOpenChange: (open: boolean) => void }
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: type-literal `}` is not a block close. It must stay on the same line as
|
|
||||||
the final property unless that would break the hard line limit.
|
|
||||||
Penalty: capital offence. Mistaking a type-literal `}` for a block `}` is one
|
|
||||||
of the recurring death-class errors.
|
|
||||||
|
|
||||||
#### Object literals
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = {
|
|
||||||
open,
|
|
||||||
activeScope,
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = {
|
|
||||||
open,
|
|
||||||
activeScope }
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = useMemo (() => ({
|
|
||||||
open,
|
|
||||||
activeScope,
|
|
||||||
}), [open, activeScope])
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = useMemo (() => ({
|
|
||||||
open,
|
|
||||||
activeScope }), [open, activeScope])
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: object-literal `}` is associative-array-style syntax. It must not be on a
|
|
||||||
line by itself. Keep it with the final property, and keep call `)` off the
|
|
||||||
beginning of a line.
|
|
||||||
Penalty: capital offence. Wrong object-literal `}` placement and wrong call
|
|
||||||
`)` placement are both death-class violations here.
|
|
||||||
|
|
||||||
#### Destructuring parameters
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
const Component: FC<Props> = ({
|
|
||||||
open,
|
|
||||||
onOpenChange,
|
|
||||||
}) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
const Component: FC<Props> = (
|
|
||||||
{ open,
|
|
||||||
onOpenChange },
|
|
||||||
) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: when a React component or helper takes a destructured object parameter
|
|
||||||
that spans multiple lines, do not use the Prettier-style `= ({ ... }) =>`
|
|
||||||
shape. Put the function parameter list on its own lines. The destructuring `}`
|
|
||||||
stays with the final binding. The parameter-list `)` is then allowed and
|
|
||||||
required at the beginning of its own line.
|
|
||||||
Penalty: capital offence. This pattern is a primary source of repeated TSX
|
|
||||||
style regressions.
|
|
||||||
|
|
||||||
#### Inline typed destructuring parameter
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const RouteTransitionWrapper = ({ user, setUser }: {
|
|
||||||
user: User | null
|
|
||||||
setUser: Dispatch<SetStateAction<User | null>> }) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const RouteTransitionWrapper = ({ user, setUser }: {
|
|
||||||
user: User | null
|
|
||||||
setUser: Dispatch<SetStateAction<User | null>>
|
|
||||||
}) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: this is not a separately split parameter-list block. The line break is
|
|
||||||
inside the inline type. Keep the type-literal `}` and parameter-list `)` on the
|
|
||||||
same line as the final type property.
|
|
||||||
Penalty: capital offence. Misclassifying this case means the delimiter review
|
|
||||||
has failed at the syntax-role level.
|
|
||||||
|
|
||||||
#### Multi-line normal parameter list
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const updateDraft = <Key extends keyof Settings,> (
|
|
||||||
key: Key,
|
|
||||||
value: Settings[Key]) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const updateDraft = <Key extends keyof Settings,> (
|
|
||||||
key: Key,
|
|
||||||
value: Settings[Key],
|
|
||||||
) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: when the parameter list itself is split across multiple parameter lines,
|
|
||||||
the closing parameter `)` goes at the beginning of its own line before `=>` or
|
|
||||||
the return type.
|
|
||||||
Penalty: capital offence. This is the main allowed exception for a leading `)`,
|
|
||||||
so getting it wrong destroys the whole rule set.
|
|
||||||
|
|
||||||
#### Function and callback blocks
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const handleSave = () => { save ()
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const handleSave = () => {
|
|
||||||
save () }
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const handleSave = () => {
|
|
||||||
save ()
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: block `}` closes executable code, not associative data. Multi-line
|
|
||||||
function, lambda, callback, `if`, `for`, `switch`, and similar block braces
|
|
||||||
belong on their own line.
|
|
||||||
Penalty: capital offence. Confusing block `}` with associative `}` is a
|
|
||||||
death-class delimiter error.
|
|
||||||
|
|
||||||
#### Function and method calls
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = compute (
|
|
||||||
first,
|
|
||||||
second
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = compute (
|
|
||||||
first,
|
|
||||||
second)
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: call-expression `)` must not be at the beginning of a line. The exception
|
|
||||||
for leading `)` applies only to function declaration parameter lists, never to
|
|
||||||
calls.
|
|
||||||
Penalty: capital offence. A leading call `)` is one of the clearest death-class
|
|
||||||
violations in this codebase.
|
|
||||||
|
|
||||||
#### JSX closing markers
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
onClick={handleSave}
|
|
||||||
>
|
|
||||||
保存
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
onClick={handleSave}>
|
|
||||||
保存
|
|
||||||
</Button>)
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Input
|
|
||||||
value={value}
|
|
||||||
onChange={handleChange}
|
|
||||||
/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Input
|
|
||||||
value={value}
|
|
||||||
onChange={handleChange}/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: keep `>` or `/>` with the final prop, and keep JSX closing parentheses in
|
|
||||||
the local compact form such as `</div>)`.
|
|
||||||
Penalty: medium-severity offence. It is usually not semantically broken, but it
|
|
||||||
is a conspicuous TSX-style failure.
|
|
||||||
|
|
||||||
#### Arrays and tuples
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const items = [
|
|
||||||
first,
|
|
||||||
second,
|
|
||||||
]
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const items = [
|
|
||||||
first,
|
|
||||||
second]
|
|
||||||
```
|
|
||||||
|
|
||||||
Good when short:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const items = [first, second]
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: array and tuple `]` must not be at the beginning of a line. Keep it with
|
|
||||||
the final element unless that would break the hard line limit.
|
|
||||||
Penalty: capital offence. A leading `]` is forbidden by the same class of hard
|
|
||||||
delimiter rule as leading associative `}` and leading call `)`.
|
|
||||||
|
|
||||||
#### Single-line braces
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = { ...current, enabled: true }
|
|
||||||
const tag = { id, name }
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Component prop={ value }/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Component prop={value}/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: JavaScript object braces on one line get one inner space. JSX expression
|
|
||||||
braces do not get inner spaces.
|
|
||||||
Penalty: minor offence. This is not normally semantic breakage, but it still
|
|
||||||
counts as a style miss.
|
|
||||||
|
|
||||||
#### Final TypeScript/TSX self-review checklist
|
|
||||||
|
|
||||||
Before reporting completion after a TypeScript or TSX edit, check the edited
|
|
||||||
hunks line by line. Unless a step explicitly mentions JSX, it applies equally
|
|
||||||
to `.ts` and `.tsx`:
|
|
||||||
|
|
||||||
1. No import/export/type/object/destructuring `}` appears alone at the beginning
|
|
||||||
of a line.
|
|
||||||
2. No call-expression `)` appears at the beginning of a line.
|
|
||||||
3. Any leading `)` is definitely closing a function declaration parameter list,
|
|
||||||
not a call.
|
|
||||||
4. Any parameter-list `)` at the end of a line is valid because the parameter
|
|
||||||
list itself was not split, only an inline type or destructuring shape was.
|
|
||||||
5. No array or tuple `]` appears at the beginning of a line.
|
|
||||||
6. Multi-line executable block `}` is on its own line.
|
|
||||||
7. JSX `>` and `/>` stay with the final prop unless nearby code proves
|
|
||||||
otherwise.
|
|
||||||
8. JSX closing parentheses keep the compact local style.
|
|
||||||
9. Leading indentation is 4-space logical indentation with tabs used only as
|
|
||||||
leading 8-space compression.
|
|
||||||
10. No line has trailing whitespace.
|
|
||||||
|
|
||||||
Preferred:
|
Preferred:
|
||||||
|
|
||||||
@@ -976,7 +335,7 @@ function PostFormTagsArea ({ tags, setTags }: Props) {
|
|||||||
- Do not scan or summarize dependency/generated/runtime directories such as
|
- Do not scan or summarize dependency/generated/runtime directories such as
|
||||||
`node_modules`, `dist`, `tmp`, `log`, and `storage` unless explicitly needed.
|
`node_modules`, `dist`, `tmp`, `log`, and `storage` unless explicitly needed.
|
||||||
- Before touching wiki, tag, versioning, BAN, IP BAN, or authentication
|
- Before touching wiki, tag, versioning, BAN, IP BAN, or authentication
|
||||||
behaviour, inspect the related request specs and service objects.
|
behavior, inspect the related request specs and service objects.
|
||||||
- If frontend code changes, run only non-test verification commands that
|
- If frontend code changes, run only non-test verification commands that
|
||||||
apply, such as `npm run build` and `npm run lint`. Run `npm run test:run`
|
apply, such as `npm run build` and `npm run lint`. Run `npm run test:run`
|
||||||
only when the user explicitly asks for tests.
|
only when the user explicitly asks for tests.
|
||||||
@@ -993,4 +352,4 @@ A task is complete only when:
|
|||||||
explained,
|
explained,
|
||||||
- unrelated files are not changed,
|
- unrelated files are not changed,
|
||||||
- migrations and schema are consistent when schema changes are made,
|
- migrations and schema are consistent when schema changes are made,
|
||||||
- user-facing behaviour is documented when needed.
|
- user-facing behavior is documented when needed.
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
class UserSettingsController < ApplicationController
|
|
||||||
wrap_parameters false
|
|
||||||
|
|
||||||
def show
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
render json: current_setting.serializable_hash
|
|
||||||
end
|
|
||||||
|
|
||||||
def update
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
raw_attributes = editable_raw_attributes
|
|
||||||
field_errors = validate_raw_attributes(raw_attributes)
|
|
||||||
return render_validation_error fields: field_errors if field_errors.present?
|
|
||||||
|
|
||||||
setting = current_setting
|
|
||||||
setting.assign_attributes(raw_attributes)
|
|
||||||
|
|
||||||
if setting.save
|
|
||||||
render json: setting.serializable_hash, status: :ok
|
|
||||||
else
|
|
||||||
render_validation_error setting
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def current_setting
|
|
||||||
Setting.find_or_create_by!(user: current_user) do |setting|
|
|
||||||
setting.assign_attributes(Setting.defaults)
|
|
||||||
end
|
|
||||||
rescue ActiveRecord::RecordNotUnique
|
|
||||||
Setting.find_by!(user: current_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
def editable_raw_attributes
|
|
||||||
request.request_parameters.slice(*Setting::EDITABLE_ATTRIBUTES)
|
|
||||||
end
|
|
||||||
|
|
||||||
def validate_raw_attributes raw_attributes
|
|
||||||
raw_attributes.each_with_object({ }) do |(key, value), errors|
|
|
||||||
next if value_matches_type?(key, value)
|
|
||||||
|
|
||||||
errors[key.to_sym] = ['値の型が不正です.']
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def value_matches_type? key, value
|
|
||||||
case Setting::TYPE_BY_ATTRIBUTE.fetch(key)
|
|
||||||
when :string
|
|
||||||
value.is_a?(String)
|
|
||||||
when :integer
|
|
||||||
value.is_a?(Integer)
|
|
||||||
when :boolean
|
|
||||||
value == true || value == false
|
|
||||||
else
|
|
||||||
false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
class UserThemeSlotsController < ApplicationController
|
|
||||||
wrap_parameters false
|
|
||||||
|
|
||||||
def index
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
render json: current_user
|
|
||||||
.theme_slots
|
|
||||||
.order(:base_theme, :slot_no)
|
|
||||||
.map { |slot| slot.serializable_hash }
|
|
||||||
end
|
|
||||||
|
|
||||||
def update
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
base_theme = params[:base_theme].to_s
|
|
||||||
slot_no = params[:slot_no].to_i
|
|
||||||
tokens = params[:tokens]
|
|
||||||
|
|
||||||
unless UserThemeSlot::BASE_THEMES.include?(base_theme)
|
|
||||||
return render_validation_error fields: { base_theme: ['値が不正です.'] }
|
|
||||||
end
|
|
||||||
unless UserThemeSlot::SLOT_NOS.include?(slot_no)
|
|
||||||
return render_validation_error fields: { slot_no: ['値が不正です.'] }
|
|
||||||
end
|
|
||||||
unless tokens.is_a?(ActionController::Parameters) || tokens.is_a?(Hash)
|
|
||||||
return render_validation_error fields: { tokens: ['JSON object で指定してください.'] }
|
|
||||||
end
|
|
||||||
|
|
||||||
slot = UserThemeSlot.find_or_initialize_by(user: current_user,
|
|
||||||
base_theme:,
|
|
||||||
slot_no:)
|
|
||||||
slot.tokens = tokens.is_a?(ActionController::Parameters) ? tokens.to_unsafe_h : tokens
|
|
||||||
slot.save!
|
|
||||||
|
|
||||||
render json: slot.serializable_hash, status: :ok
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,52 +1,7 @@
|
|||||||
class Setting < ApplicationRecord
|
class Setting < ApplicationRecord
|
||||||
THEMES = ['system', 'light', 'dark'].freeze
|
|
||||||
|
|
||||||
# These remain in the typed settings schema to preserve existing backend
|
|
||||||
# work. The common `/users/settings` page currently surfaces only `theme`.
|
|
||||||
AUTO_FETCH_MODES = ['auto', 'manual', 'off'].freeze
|
|
||||||
WIKI_EDITOR_MODES = ['split', 'write', 'preview'].freeze
|
|
||||||
|
|
||||||
STRING_ATTRIBUTES = [
|
|
||||||
'theme',
|
|
||||||
'auto_fetch_title',
|
|
||||||
'auto_fetch_thumbnail',
|
|
||||||
'wiki_editor_mode',
|
|
||||||
].freeze
|
|
||||||
INTEGER_ATTRIBUTES = [].freeze
|
|
||||||
BOOLEAN_ATTRIBUTES = [].freeze
|
|
||||||
EDITABLE_ATTRIBUTES =
|
|
||||||
(STRING_ATTRIBUTES + INTEGER_ATTRIBUTES + BOOLEAN_ATTRIBUTES).freeze
|
|
||||||
TYPE_BY_ATTRIBUTE = {
|
|
||||||
'theme' => :string,
|
|
||||||
'auto_fetch_title' => :string,
|
|
||||||
'auto_fetch_thumbnail' => :string,
|
|
||||||
'wiki_editor_mode' => :string,
|
|
||||||
}.freeze
|
|
||||||
|
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
validates :user_id, presence: true
|
validates :user_id, presence: true
|
||||||
validates :user_id, uniqueness: true
|
validates :key, presence: true, length: { maximum: 255 }
|
||||||
|
validates :value, presence: true
|
||||||
validates :theme, inclusion: { in: THEMES }
|
|
||||||
validates :auto_fetch_title, inclusion: { in: AUTO_FETCH_MODES }
|
|
||||||
validates :auto_fetch_thumbnail, inclusion: { in: AUTO_FETCH_MODES }
|
|
||||||
validates :wiki_editor_mode, inclusion: { in: WIKI_EDITOR_MODES }
|
|
||||||
|
|
||||||
def self.defaults
|
|
||||||
{
|
|
||||||
theme: 'system',
|
|
||||||
auto_fetch_title: 'manual',
|
|
||||||
auto_fetch_thumbnail: 'manual',
|
|
||||||
wiki_editor_mode: 'split',
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.serializable_attributes
|
|
||||||
EDITABLE_ATTRIBUTES.map(&:to_sym)
|
|
||||||
end
|
|
||||||
|
|
||||||
def serializable_hash(options = nil)
|
|
||||||
super({ only: self.class.serializable_attributes }.merge(options || { }))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ class User < ApplicationRecord
|
|||||||
|
|
||||||
has_many :created_posts,
|
has_many :created_posts,
|
||||||
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
||||||
has_one :setting, dependent: :destroy
|
has_many :settings
|
||||||
has_many :theme_slots, class_name: 'UserThemeSlot', dependent: :destroy
|
|
||||||
has_many :user_ips, dependent: :destroy
|
has_many :user_ips, dependent: :destroy
|
||||||
has_many :ip_addresses, through: :user_ips
|
has_many :ip_addresses, through: :user_ips
|
||||||
has_many :user_post_views, dependent: :destroy
|
has_many :user_post_views, dependent: :destroy
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
class UserThemeSlot < ApplicationRecord
|
|
||||||
BASE_THEMES = ['light', 'dark'].freeze
|
|
||||||
SLOT_NOS = [1, 2, 3].freeze
|
|
||||||
|
|
||||||
belongs_to :user
|
|
||||||
|
|
||||||
validates :user_id, presence: true
|
|
||||||
validates :base_theme, presence: true, inclusion: { in: BASE_THEMES }
|
|
||||||
validates :slot_no, presence: true, inclusion: { in: SLOT_NOS }
|
|
||||||
validates :tokens, presence: true
|
|
||||||
validates :user_id, uniqueness: { scope: [:base_theme, :slot_no] }
|
|
||||||
|
|
||||||
validate :tokens_must_be_object
|
|
||||||
|
|
||||||
def serializable_hash(options = nil)
|
|
||||||
hash = { only: [:base_theme, :slot_no, :tokens, :created_at, :updated_at] }
|
|
||||||
super(hash.merge(options || {}))
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def tokens_must_be_object
|
|
||||||
return if tokens.is_a?(Hash)
|
|
||||||
|
|
||||||
errors.add(:tokens, 'は JSON object で指定してください.')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -81,11 +81,6 @@ Rails.application.routes.draw do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
get 'users/settings', to: 'user_settings#show'
|
|
||||||
patch 'users/settings', to: 'user_settings#update'
|
|
||||||
get 'users/theme_slots', to: 'user_theme_slots#index'
|
|
||||||
put 'users/theme_slots/:base_theme/:slot_no', to: 'user_theme_slots#update'
|
|
||||||
|
|
||||||
resources :users, only: [:create, :update] do
|
resources :users, only: [:create, :update] do
|
||||||
collection do
|
collection do
|
||||||
post :verify
|
post :verify
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
class RebuildSettingsAsTypedUserSettings < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
remove_foreign_key :settings, :users if foreign_key_exists?(:settings, :users)
|
|
||||||
remove_index :settings, :user_id if index_exists?(:settings, :user_id)
|
|
||||||
|
|
||||||
remove_column :settings, :key, :string if column_exists?(:settings, :key)
|
|
||||||
remove_column :settings, :value, :json if column_exists?(:settings, :value)
|
|
||||||
|
|
||||||
change_column_null :settings, :user_id, false
|
|
||||||
|
|
||||||
add_column :settings, :theme, :string, null: false, default: 'system'
|
|
||||||
add_column :settings,
|
|
||||||
:auto_fetch_title,
|
|
||||||
:string,
|
|
||||||
null: false,
|
|
||||||
default: 'manual'
|
|
||||||
add_column :settings,
|
|
||||||
:auto_fetch_thumbnail,
|
|
||||||
:string,
|
|
||||||
null: false,
|
|
||||||
default: 'manual'
|
|
||||||
add_column :settings,
|
|
||||||
:wiki_editor_mode,
|
|
||||||
:string,
|
|
||||||
null: false,
|
|
||||||
default: 'split'
|
|
||||||
|
|
||||||
add_index :settings, :user_id, unique: true
|
|
||||||
add_foreign_key :settings, :users
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
class CreateUserThemeSlots < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
create_table :user_theme_slots do |t|
|
|
||||||
t.references :user, null: false, foreign_key: true
|
|
||||||
t.string :base_theme, null: false
|
|
||||||
t.integer :slot_no, null: false
|
|
||||||
t.json :tokens, null: false
|
|
||||||
t.timestamps
|
|
||||||
end
|
|
||||||
|
|
||||||
add_index :user_theme_slots,
|
|
||||||
[:user_id, :base_theme, :slot_no],
|
|
||||||
unique: true,
|
|
||||||
name: 'index_user_theme_slots_on_user_theme_and_slot'
|
|
||||||
add_check_constraint :user_theme_slots,
|
|
||||||
"base_theme IN ('light', 'dark')",
|
|
||||||
name: 'user_theme_slots_base_theme_valid'
|
|
||||||
add_check_constraint :user_theme_slots,
|
|
||||||
'slot_no BETWEEN 1 AND 3',
|
|
||||||
name: 'user_theme_slots_slot_no_valid'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
生成ファイル
+19
-35
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
|
||||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "record_type", null: false
|
t.string "record_type", null: false
|
||||||
@@ -374,26 +374,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
|||||||
|
|
||||||
create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "user_id", null: false
|
t.bigint "user_id", null: false
|
||||||
|
t.string "key", null: false
|
||||||
|
t.json "value", null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.string "theme", default: "system", null: false
|
t.index ["user_id"], name: "index_settings_on_user_id"
|
||||||
t.string "auto_fetch_title", default: "manual", null: false
|
|
||||||
t.string "auto_fetch_thumbnail", default: "manual", null: false
|
|
||||||
t.string "wiki_editor_mode", default: "split", null: false
|
|
||||||
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
|
end
|
||||||
|
|
||||||
create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -441,9 +426,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
|||||||
t.string "event_type", null: false
|
t.string "event_type", null: false
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "category", null: false
|
t.string "category", null: false
|
||||||
|
t.datetime "deprecated_at"
|
||||||
t.text "aliases", null: false
|
t.text "aliases", null: false
|
||||||
t.text "parent_tag_ids", null: false
|
t.text "parent_tag_ids", null: false
|
||||||
t.datetime "deprecated_at"
|
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
||||||
@@ -456,10 +441,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
|||||||
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_name_id", null: false
|
t.bigint "tag_name_id", null: false
|
||||||
t.string "category", default: "general", null: false
|
t.string "category", default: "general", null: false
|
||||||
t.datetime "deprecated_at"
|
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "post_count", default: 0, null: false
|
t.integer "post_count", default: 0, null: false
|
||||||
|
t.datetime "deprecated_at"
|
||||||
t.datetime "discarded_at"
|
t.datetime "discarded_at"
|
||||||
t.integer "version_no", null: false
|
t.integer "version_no", null: false
|
||||||
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
|
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
|
||||||
@@ -581,19 +566,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
|||||||
t.index ["post_id"], name: "index_user_post_views_on_post_id"
|
t.index ["post_id"], name: "index_user_post_views_on_post_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "user_theme_slots", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "user_id", null: false
|
|
||||||
t.string "base_theme", null: false
|
|
||||||
t.integer "slot_no", null: false
|
|
||||||
t.json "tokens", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["user_id", "base_theme", "slot_no"], name: "index_user_theme_slots_on_user_theme_and_slot", unique: true
|
|
||||||
t.index ["user_id"], name: "index_user_theme_slots_on_user_id"
|
|
||||||
t.check_constraint "`base_theme` in (_utf8mb4'light',_utf8mb4'dark')", name: "user_theme_slots_base_theme_valid"
|
|
||||||
t.check_constraint "`slot_no` between 1 and 3", name: "user_theme_slots_slot_no_valid"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
t.string "inheritance_code", limit: 64, null: false
|
t.string "inheritance_code", limit: 64, null: false
|
||||||
@@ -604,6 +576,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
|||||||
t.index ["banned_at"], name: "index_users_on_banned_at"
|
t.index ["banned_at"], name: "index_users_on_banned_at"
|
||||||
end
|
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 "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "sha256", limit: 64, null: false
|
t.string "sha256", limit: 64, null: false
|
||||||
t.text "body", null: false
|
t.text "body", null: false
|
||||||
@@ -753,7 +738,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) do
|
|||||||
add_foreign_key "user_ips", "users"
|
add_foreign_key "user_ips", "users"
|
||||||
add_foreign_key "user_post_views", "posts"
|
add_foreign_key "user_post_views", "posts"
|
||||||
add_foreign_key "user_post_views", "users"
|
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", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "wiki_assets", "wiki_pages"
|
add_foreign_key "wiki_assets", "wiki_pages"
|
||||||
add_foreign_key "wiki_pages", "tag_names"
|
add_foreign_key "wiki_pages", "tag_names"
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
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
|
|
||||||
+2
-434
@@ -118,455 +118,23 @@ pass or the remaining failure is clearly blocked.
|
|||||||
short Japanese labels that fit the control.
|
short Japanese labels that fit the control.
|
||||||
- Preserve existing Japanese tone and orthography in nearby UI text, including
|
- Preserve existing Japanese tone and orthography in nearby UI text, including
|
||||||
old-kana wording where the file already uses it.
|
old-kana wording where the file already uses it.
|
||||||
- When adding dynamic tag colour classes, update `tailwind.config.js` safelist
|
- When adding dynamic tag color classes, update `tailwind.config.js` safelist
|
||||||
if the class cannot be statically detected.
|
if the class cannot be statically detected.
|
||||||
- Do not introduce new UI libraries or production dependencies without approval.
|
- Do not introduce new UI libraries or production dependencies without approval.
|
||||||
|
|
||||||
## TypeScript and TSX formatting
|
## TSX formatting
|
||||||
|
|
||||||
- The delimiter-placement and line-breaking rules in this section apply to
|
|
||||||
both plain TypeScript `.ts` and TSX `.tsx`, unless a bullet explicitly says
|
|
||||||
it is JSX- or React-specific.
|
|
||||||
- Preserve compact TSX expression shapes such as inline ternary branches and
|
- Preserve compact TSX expression shapes such as inline ternary branches and
|
||||||
closing `</div>)` forms when nearby code uses them.
|
closing `</div>)` forms when nearby code uses them.
|
||||||
- Treat TypeScript and TSX formatting rules as hard constraints, not
|
|
||||||
preferences. Before finishing a TypeScript or TSX edit, inspect the edited
|
|
||||||
hunks for closing `)`, `]`, and `}` placement and fix violations instead of
|
|
||||||
relying on formatter defaults.
|
|
||||||
- After every TypeScript or TSX edit, perform a style-only self-review of the
|
|
||||||
edited hunks before running verification or reporting completion. The task is
|
|
||||||
not complete while any edited TypeScript or TSX hunk violates these local
|
|
||||||
formatting rules.
|
|
||||||
- The TypeScript/TSX self-review must classify every edited leading or trailing
|
|
||||||
`)`, `]`, and `}` by syntax role before deciding whether it is valid. Do not
|
|
||||||
apply a rule by glyph alone. A closing `)` for a function parameter list is
|
|
||||||
different from a closing `)` for a function call. A closing `}` for a block
|
|
||||||
is different from a closing `}` for an object, type literal, import list, or
|
|
||||||
destructuring pattern.
|
|
||||||
- The TSX-specific self-review must confirm there are no common Prettier-style
|
|
||||||
React component declarations with a multi-line destructured parameter.
|
|
||||||
- The TypeScript/TSX self-review must confirm multi-line function declaration
|
|
||||||
parameter `)` placement follows the detailed parameter-list rules below.
|
|
||||||
- The TypeScript/TSX self-review must confirm call-expression `)` is never at
|
|
||||||
the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm
|
|
||||||
object/type/import/destructuring `}` is not at the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm multi-line
|
|
||||||
function/lambda/callback/block `}` is on its own line and never at the end
|
|
||||||
of the previous line.
|
|
||||||
- The TypeScript/TSX self-review must confirm array `]` is not at the
|
|
||||||
beginning of a line.
|
|
||||||
- The TSX-specific self-review must confirm JSX closing markers and closing
|
|
||||||
parentheses keep the surrounding compact style.
|
|
||||||
- The TypeScript/TSX self-review must confirm leading indentation follows
|
|
||||||
4-space logical indentation with tabs only as leading 8-space compression.
|
|
||||||
- For long Tailwind `className` strings, wrap across lines only when needed.
|
- For long Tailwind `className` strings, wrap across lines only when needed.
|
||||||
- Keep continuation indentation aligned with the 4-space logical indentation
|
- Keep continuation indentation aligned with the 4-space logical indentation
|
||||||
rule, using tabs only as leading 8-space compression.
|
rule, using tabs only as leading 8-space compression.
|
||||||
- In TypeScript and TSX function declarations, including `const` arrow
|
|
||||||
function declarations, classify the parameter list before placing the closing
|
|
||||||
`)`.
|
|
||||||
- If the parameter list itself is given its own multi-line block after the
|
|
||||||
function's opening `(`, put the closing parameter `)` at the beginning of its
|
|
||||||
own line before the return type or `=>`.
|
|
||||||
- If the only line break is inside a parameter's inline type, object type, or
|
|
||||||
destructuring shape, and the parameter list itself is not split as a separate
|
|
||||||
block, keep the closing parameter `)` on the same line as that parameter's
|
|
||||||
final `}`. In this case, moving `)` to a new line is wrong.
|
|
||||||
- Do not write React component declarations in the common Prettier form
|
|
||||||
`const Component = ({ ... }) => (` when the destructured parameter spans
|
|
||||||
multiple lines. Use the project form with the opening `(` after `=`, the
|
|
||||||
destructured object as the argument, and the closing parameter `)` on its own
|
|
||||||
line before `=>`.
|
|
||||||
- In TypeScript and TSX, never place a closing parenthesis at the beginning of
|
|
||||||
a line except for a multi-line function declaration parameter list.
|
|
||||||
- Never place a closing square bracket at the beginning of a line.
|
|
||||||
- For object literals, type literals, import/export named bindings, destructuring
|
|
||||||
patterns, and other associative-array-style braces, do not place the closing
|
|
||||||
brace at the beginning of a line. Keep `}` on the same line as the final
|
|
||||||
property, binding, or specifier unless that would violate the line limit.
|
|
||||||
Function, lambda, callback, and block closing braces are exempt and should
|
|
||||||
stay on their own line when that fits the local style. When a function,
|
|
||||||
lambda, callback, or block body spans multiple lines, do not put its closing
|
|
||||||
`}` at the end of the previous line.
|
|
||||||
- For arrays and tuple-like lists, do not place the closing `]` at the
|
|
||||||
beginning of a line. Keep `]` on the same line as the final element unless
|
|
||||||
that would violate the line limit.
|
|
||||||
- For function and method calls, do not place the closing `)` at the beginning
|
|
||||||
of a line. The only TypeScript/TSX exception is the closing parameter `)` of a
|
|
||||||
multi-line function declaration.
|
|
||||||
- Do not add braces around `if`, `else`, or `for` bodies when the body is a
|
- Do not add braces around `if`, `else`, or `for` bodies when the body is a
|
||||||
single physical line.
|
single physical line.
|
||||||
- Always add braces around `if`, `else`, or `for` bodies when the body spans
|
- Always add braces around `if`, `else`, or `for` bodies when the body spans
|
||||||
two or more physical lines, even if it is one statement.
|
two or more physical lines, even if it is one statement.
|
||||||
- Use correct British English spelling for new identifiers, filenames,
|
|
||||||
component names, helper names, comments, and developer-facing prose unless
|
|
||||||
editing an already established American-English API that must keep its
|
|
||||||
existing spelling for compatibility.
|
|
||||||
- Prefer British English spellings such as `behaviour`, `colour`, `realise`,
|
|
||||||
`theatre`, `centre`, `favourite`, `optimise`, and `catalogue`.
|
|
||||||
- Avoid American or Canadian spellings such as `behavior`, `color`, `realize`,
|
|
||||||
`theater`, `center`, `favorite`, `optimize`, and `catalog`.
|
|
||||||
- Even when an external library or API uses the wrong spelling, prefer to
|
|
||||||
correct it at the local boundary and use proper British English names in this
|
|
||||||
frontend codebase. For example, prefer
|
|
||||||
`import { color: colour } from '@external-lib'` over spreading `color`
|
|
||||||
through local code.
|
|
||||||
- Apply the same boundary correction to object destructuring, wrapper helpers,
|
|
||||||
adapter layers, and local variable names when doing so does not break the
|
|
||||||
external contract.
|
|
||||||
- In this frontend, prefer names such as `BehaviourSettingsSection.tsx`, not
|
|
||||||
`BehaviorSettingsSection.tsx`.
|
|
||||||
- Avoid reformatting unrelated JSX.
|
- Avoid reformatting unrelated JSX.
|
||||||
|
|
||||||
### Delimiter decision table
|
|
||||||
|
|
||||||
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
|
||||||
more authoritative than formatter habit. Unless a subsection explicitly
|
|
||||||
mentions JSX, it applies equally to `.ts` and `.tsx`.
|
|
||||||
|
|
||||||
#### Import and export named bindings
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
} from '@/components/ui'
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import { Button,
|
|
||||||
Card } from '@/components/ui'
|
|
||||||
```
|
|
||||||
|
|
||||||
Also acceptable when short:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import { Button, Card } from '@/components/ui'
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: named-binding `}` is associative-array-style syntax. It must not be alone
|
|
||||||
at the beginning of a line. Prefer keeping `{` with the first binding and `}`
|
|
||||||
with the final binding when this fits the line limit.
|
|
||||||
|
|
||||||
#### Type literals
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
type Props = {
|
|
||||||
open: boolean
|
|
||||||
onOpenChange: (open: boolean) => void
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
type Props = {
|
|
||||||
open: boolean
|
|
||||||
onOpenChange: (open: boolean) => void }
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: type-literal `}` is not a block close. It must stay on the same line as
|
|
||||||
the final property unless that would break the hard line limit.
|
|
||||||
|
|
||||||
#### Object literals
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = {
|
|
||||||
open,
|
|
||||||
activeScope,
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = {
|
|
||||||
open,
|
|
||||||
activeScope }
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = useMemo (() => ({
|
|
||||||
open,
|
|
||||||
activeScope,
|
|
||||||
}), [open, activeScope])
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = useMemo (() => ({
|
|
||||||
open,
|
|
||||||
activeScope }), [open, activeScope])
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: object-literal `}` is associative-array-style syntax. It must not be on a
|
|
||||||
line by itself. Keep it with the final property, and keep call `)` off the
|
|
||||||
beginning of a line.
|
|
||||||
|
|
||||||
#### Destructuring parameters
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
const Component: FC<Props> = ({
|
|
||||||
open,
|
|
||||||
onOpenChange,
|
|
||||||
}) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
const Component: FC<Props> = (
|
|
||||||
{ open,
|
|
||||||
onOpenChange },
|
|
||||||
) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: when a React component or helper takes a destructured object parameter
|
|
||||||
that spans multiple lines, do not use the Prettier-style `= ({ ... }) =>`
|
|
||||||
shape. Put the function parameter list on its own lines. The destructuring `}`
|
|
||||||
stays with the final binding. The parameter-list `)` is then allowed and
|
|
||||||
required at the beginning of its own line.
|
|
||||||
|
|
||||||
#### Inline typed destructuring parameter
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const RouteTransitionWrapper = ({ user, setUser }: {
|
|
||||||
user: User | null
|
|
||||||
setUser: Dispatch<SetStateAction<User | null>> }) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const RouteTransitionWrapper = ({ user, setUser }: {
|
|
||||||
user: User | null
|
|
||||||
setUser: Dispatch<SetStateAction<User | null>>
|
|
||||||
}) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: this is not a separately split parameter-list block. The line break is
|
|
||||||
inside the inline type. Keep the type-literal `}` and parameter-list `)` on the
|
|
||||||
same line as the final type property.
|
|
||||||
|
|
||||||
#### Multi-line normal parameter list
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const updateDraft = <Key extends keyof Settings,> (
|
|
||||||
key: Key,
|
|
||||||
value: Settings[Key]) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const updateDraft = <Key extends keyof Settings,> (
|
|
||||||
key: Key,
|
|
||||||
value: Settings[Key],
|
|
||||||
) => {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: when the parameter list itself is split across multiple parameter lines,
|
|
||||||
the closing parameter `)` goes at the beginning of its own line before `=>` or
|
|
||||||
the return type.
|
|
||||||
|
|
||||||
#### Function and callback blocks
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const handleSave = () => { save ()
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const handleSave = () => {
|
|
||||||
save () }
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const handleSave = () => {
|
|
||||||
save ()
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: block `}` closes executable code, not associative data. Multi-line
|
|
||||||
function, lambda, callback, `if`, `for`, `switch`, and similar block braces
|
|
||||||
belong on their own line.
|
|
||||||
|
|
||||||
#### Function and method calls
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = compute (
|
|
||||||
first,
|
|
||||||
second
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const value = compute (
|
|
||||||
first,
|
|
||||||
second)
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: call-expression `)` must not be at the beginning of a line. The exception
|
|
||||||
for leading `)` applies only to function declaration parameter lists, never to
|
|
||||||
calls.
|
|
||||||
|
|
||||||
#### JSX closing markers
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
onClick={handleSave}
|
|
||||||
>
|
|
||||||
保存
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
onClick={handleSave}>
|
|
||||||
保存
|
|
||||||
</Button>)
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Input
|
|
||||||
value={value}
|
|
||||||
onChange={handleChange}
|
|
||||||
/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Input
|
|
||||||
value={value}
|
|
||||||
onChange={handleChange}/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: keep `>` or `/>` with the final prop, and keep JSX closing parentheses in
|
|
||||||
the local compact form such as `</div>)`.
|
|
||||||
|
|
||||||
#### Arrays and tuples
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const items = [
|
|
||||||
first,
|
|
||||||
second,
|
|
||||||
]
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const items = [
|
|
||||||
first,
|
|
||||||
second]
|
|
||||||
```
|
|
||||||
|
|
||||||
Good when short:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const items = [first, second]
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: array and tuple `]` must not be at the beginning of a line. Keep it with
|
|
||||||
the final element unless that would break the hard line limit.
|
|
||||||
|
|
||||||
#### Single-line braces
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = { ...current, enabled: true }
|
|
||||||
const tag = { id, name }
|
|
||||||
```
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Component prop={ value }/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
<Component prop={value}/>
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: JavaScript object braces on one line get one inner space. JSX expression
|
|
||||||
braces do not get inner spaces.
|
|
||||||
|
|
||||||
#### Final TSX self-review checklist
|
|
||||||
|
|
||||||
Before reporting completion after a TypeScript or TSX edit, check the edited
|
|
||||||
hunks line by line:
|
|
||||||
|
|
||||||
1. No import/export/type/object/destructuring `}` appears alone at the beginning
|
|
||||||
of a line.
|
|
||||||
2. No call-expression `)` appears at the beginning of a line.
|
|
||||||
3. Any leading `)` is definitely closing a function declaration parameter list,
|
|
||||||
not a call.
|
|
||||||
4. Any parameter-list `)` at the end of a line is valid because the parameter
|
|
||||||
list itself was not split, only an inline type or destructuring shape was.
|
|
||||||
5. No array or tuple `]` appears at the beginning of a line.
|
|
||||||
6. Multi-line executable block `}` is on its own line.
|
|
||||||
7. JSX `>` and `/>` stay with the final prop unless nearby code proves
|
|
||||||
otherwise.
|
|
||||||
8. JSX closing parentheses keep the compact local style.
|
|
||||||
9. Leading indentation is 4-space logical indentation with tabs used only as
|
|
||||||
leading 8-space compression.
|
|
||||||
10. No line has trailing whitespace.
|
|
||||||
|
|
||||||
## Lint and build constraints
|
## Lint and build constraints
|
||||||
|
|
||||||
- ESLint uses `@eslint/js`, `typescript-eslint`, `eslint-plugin-react-hooks`,
|
- ESLint uses `@eslint/js`, `typescript-eslint`, `eslint-plugin-react-hooks`,
|
||||||
|
|||||||
+13
-138
@@ -1,5 +1,5 @@
|
|||||||
import { AnimatePresence, LayoutGroup, MotionConfig, motion } from 'framer-motion'
|
import { AnimatePresence, LayoutGroup, motion } from 'framer-motion'
|
||||||
import { Fragment, useEffect, useMemo, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { BrowserRouter,
|
import { BrowserRouter,
|
||||||
Navigate,
|
Navigate,
|
||||||
Route,
|
Route,
|
||||||
@@ -12,20 +12,6 @@ import TopNav from '@/components/TopNav'
|
|||||||
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
||||||
import { Toaster } from '@/components/ui/toaster'
|
import { Toaster } from '@/components/ui/toaster'
|
||||||
import { apiPost, isApiError } from '@/lib/api'
|
import { apiPost, isApiError } from '@/lib/api'
|
||||||
import { applyClientAnimationMode,
|
|
||||||
applyClientAppearance,
|
|
||||||
type ClientAnimationMode,
|
|
||||||
fetchUserThemeSlots,
|
|
||||||
fetchUserSettings,
|
|
||||||
getClientThemeMode,
|
|
||||||
hasStoredClientThemeSelection,
|
|
||||||
normaliseUserThemeSlots,
|
|
||||||
setCachedUserThemeSlots,
|
|
||||||
seedClientThemeMode } from '@/lib/settings'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
|
|
||||||
import { KeyboardShortcutsProvider } from '@/lib/useKeyboardShortcuts'
|
|
||||||
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
||||||
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
||||||
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
||||||
@@ -62,51 +48,11 @@ import type { Dispatch, FC, SetStateAction } from 'react'
|
|||||||
import type { User } from '@/types'
|
import type { User } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
const RouteTransitionWrapper = ({ animationMode, user, setUser }: {
|
const RouteTransitionWrapper = ({ user, setUser }: {
|
||||||
animationMode: ClientAnimationMode
|
|
||||||
user: User | null
|
user: User | null
|
||||||
setUser: Dispatch<SetStateAction<User | null>> }) => {
|
setUser: Dispatch<SetStateAction<User | null>> }) => {
|
||||||
const location = useLocation ()
|
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 (
|
return (
|
||||||
<AnimatePresence mode="wait">
|
<AnimatePresence mode="wait">
|
||||||
<Routes location={location}>
|
<Routes location={location}>
|
||||||
@@ -157,37 +103,6 @@ const PostDetailRoute = ({ user }: { user: User | null }) => {
|
|||||||
const App: FC = () => {
|
const App: FC = () => {
|
||||||
const [user, setUser] = useState<User | null> (null)
|
const [user, setUser] = useState<User | null> (null)
|
||||||
const [status, setStatus] = useState (200)
|
const [status, setStatus] = useState (200)
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const LayoutWrapper = animationMode === 'off' ? Fragment : LayoutGroup
|
|
||||||
|
|
||||||
const appLayoutTransition = useMemo (
|
|
||||||
() => (
|
|
||||||
animationMode === 'off'
|
|
||||||
? { duration: 0 }
|
|
||||||
: animationMode === 'reduced'
|
|
||||||
? { duration: .08, ease: 'linear' as const }
|
|
||||||
: { duration: .2, ease: 'easeOut' as const }
|
|
||||||
),
|
|
||||||
[animationMode],
|
|
||||||
)
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
applyClientAppearance ()
|
|
||||||
|
|
||||||
const mediaQuery = window.matchMedia ('(prefers-color-scheme: dark)')
|
|
||||||
const handleThemeChange = () => {
|
|
||||||
if (getClientThemeMode () === 'system')
|
|
||||||
applyClientAppearance ()
|
|
||||||
}
|
|
||||||
|
|
||||||
mediaQuery.addEventListener ('change', handleThemeChange)
|
|
||||||
return () => mediaQuery.removeEventListener ('change', handleThemeChange)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
applyClientAnimationMode (animationMode)
|
|
||||||
}, [animationMode])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
const createUser = async () => {
|
const createUser = async () => {
|
||||||
@@ -222,30 +137,6 @@ const App: FC = () => {
|
|||||||
createUser ()
|
createUser ()
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
if (!(user))
|
|
||||||
return
|
|
||||||
|
|
||||||
void (async () => {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
const [settings, themeSlots] = await Promise.all ([
|
|
||||||
fetchUserSettings (),
|
|
||||||
fetchUserThemeSlots (),
|
|
||||||
])
|
|
||||||
const storedThemeSlots = normaliseUserThemeSlots (themeSlots)
|
|
||||||
setCachedUserThemeSlots (storedThemeSlots)
|
|
||||||
if (!(hasStoredClientThemeSelection ()))
|
|
||||||
seedClientThemeMode (settings.theme)
|
|
||||||
applyClientAppearance ()
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}) ()
|
|
||||||
}, [user])
|
|
||||||
|
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
case 503:
|
case 503:
|
||||||
@@ -259,33 +150,17 @@ const App: FC = () => {
|
|||||||
|
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<DialogueProvider>
|
<DialogueProvider>
|
||||||
<UnsavedChangesGuardProvider>
|
<LayoutGroup>
|
||||||
<KeyboardShortcutsProvider>
|
<motion.div
|
||||||
<MotionConfig
|
layout="position"
|
||||||
reducedMotion={
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
animationMode === 'normal'
|
className="relative flex flex-col h-dvh w-full overflow-y-hidden">
|
||||||
? 'never'
|
<TopNav user={user}/>
|
||||||
: animationMode === 'reduced'
|
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
||||||
? 'user'
|
</motion.div>
|
||||||
: '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
|
|
||||||
animationMode={animationMode}
|
|
||||||
user={user}
|
|
||||||
setUser={setUser}/>
|
|
||||||
</motion.div>
|
|
||||||
</LayoutWrapper>
|
|
||||||
</MotionConfig>
|
|
||||||
|
|
||||||
<Toaster/>
|
<Toaster/>
|
||||||
</KeyboardShortcutsProvider>
|
|
||||||
</UnsavedChangesGuardProvider>
|
|
||||||
</DialogueProvider>
|
</DialogueProvider>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</>)
|
</>)
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow'
|
|
||||||
import { buildTag } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
const dndKit = vi.hoisted (() => ({
|
|
||||||
useDraggable: vi.fn (),
|
|
||||||
useDroppable: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@dnd-kit/core', () => dndKit)
|
|
||||||
|
|
||||||
const tag = buildTag ({ id: 7, name: 'ドラッグ元', postCount: 3 })
|
|
||||||
|
|
||||||
const renderRow = (activeDndId?: string) => {
|
|
||||||
renderWithProviders (
|
|
||||||
<DraggableDroppableTagRow
|
|
||||||
activeDndId={activeDndId}
|
|
||||||
tag={tag}
|
|
||||||
nestLevel={2}
|
|
||||||
pathKey="cat-general-7"
|
|
||||||
suppressClickRef={{ current: false }}/>,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const tagBody = (): HTMLElement => {
|
|
||||||
const link = document.querySelector<HTMLElement> ('a[title="ドラッグ元"]')
|
|
||||||
|
|
||||||
if (link == null)
|
|
||||||
throw new Error ('tag link not found')
|
|
||||||
|
|
||||||
const body = link.closest ('div')
|
|
||||||
|
|
||||||
if (body == null)
|
|
||||||
throw new Error ('tag body not found')
|
|
||||||
|
|
||||||
return body
|
|
||||||
}
|
|
||||||
|
|
||||||
describe ('DraggableDroppableTagRow', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
dndKit.useDraggable.mockReturnValue ({
|
|
||||||
attributes: { 'aria-describedby': 'drag-source' },
|
|
||||||
listeners: { onPointerDown: vi.fn () },
|
|
||||||
setNodeRef: vi.fn (),
|
|
||||||
transform: null })
|
|
||||||
dndKit.useDroppable.mockReturnValue ({
|
|
||||||
isOver: false,
|
|
||||||
setNodeRef: vi.fn () })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('passes dndId through draggable data for active-row tracking', () => {
|
|
||||||
renderRow ()
|
|
||||||
|
|
||||||
expect (dndKit.useDraggable).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({
|
|
||||||
id: 'tag-node:cat-general-7',
|
|
||||||
data: expect.objectContaining ({
|
|
||||||
dndId: 'tag-node:cat-general-7',
|
|
||||||
nestLevel: 2,
|
|
||||||
tagId: 7 }) }))
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('hides only the active drag source from the explicit active dnd id', () => {
|
|
||||||
renderRow ('tag-node:cat-general-7')
|
|
||||||
expect (tagBody ()).toHaveStyle ({ visibility: 'hidden' })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('keeps inactive tag rows visible while another tag is dragged', () => {
|
|
||||||
renderRow ('tag-node:other')
|
|
||||||
expect (tagBody ()).toHaveStyle ({ visibility: 'visible' })
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -4,8 +4,6 @@ import { motion } from 'framer-motion'
|
|||||||
import { useRef } from 'react'
|
import { useRef } from 'react'
|
||||||
|
|
||||||
import TagLink from '@/components/TagLink'
|
import TagLink from '@/components/TagLink'
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { CSSProperties, FC, MutableRefObject } from 'react'
|
import type { CSSProperties, FC, MutableRefObject } from 'react'
|
||||||
@@ -13,7 +11,6 @@ import type { CSSProperties, FC, MutableRefObject } from 'react'
|
|||||||
import type { Tag } from '@/types'
|
import type { Tag } from '@/types'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
activeDndId?: string
|
|
||||||
tag: Tag
|
tag: Tag
|
||||||
nestLevel: number
|
nestLevel: number
|
||||||
pathKey: string
|
pathKey: string
|
||||||
@@ -22,21 +19,7 @@ type Props = {
|
|||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
|
|
||||||
const DraggableDroppableTagRow: FC<Props> = ({
|
const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }) => {
|
||||||
activeDndId,
|
|
||||||
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 dndId = `tag-node:${ pathKey }`
|
||||||
|
|
||||||
const downPosRef = useRef<{ x: number; y: number } | null> (null)
|
const downPosRef = useRef<{ x: number; y: number } | null> (null)
|
||||||
@@ -62,23 +45,18 @@ const DraggableDroppableTagRow: FC<Props> = ({
|
|||||||
const { attributes,
|
const { attributes,
|
||||||
listeners,
|
listeners,
|
||||||
setNodeRef: setDragRef,
|
setNodeRef: setDragRef,
|
||||||
transform } = useDraggable ({ id: dndId,
|
transform,
|
||||||
data: { kind: 'tag',
|
isDragging: dragging } = useDraggable ({ id: dndId,
|
||||||
dndId,
|
data: { kind: 'tag',
|
||||||
tagId: tag.id,
|
tagId: tag.id,
|
||||||
parentTagId,
|
parentTagId } })
|
||||||
nestLevel } })
|
|
||||||
|
|
||||||
const { setNodeRef: setDropRef, isOver: over } = useDroppable ({
|
const { setNodeRef: setDropRef, isOver: over } = useDroppable ({
|
||||||
id: dndId,
|
id: dndId,
|
||||||
data: { kind: 'tag', tagId: tag.id } })
|
data: { kind: 'tag', tagId: tag.id } })
|
||||||
|
|
||||||
const activeDragging = activeDndId === dndId
|
|
||||||
const style: CSSProperties = { transform: CSS.Translate.toString (transform),
|
const style: CSSProperties = { transform: CSS.Translate.toString (transform),
|
||||||
visibility: activeDragging ? 'hidden' : 'visible' }
|
visibility: dragging ? 'hidden' : 'visible' }
|
||||||
const innerClassName = cn (
|
|
||||||
'inline-flex min-w-0 max-w-full items-baseline overflow-hidden',
|
|
||||||
sp && 'touch-pan-y')
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -91,16 +69,12 @@ const DraggableDroppableTagRow: FC<Props> = ({
|
|||||||
return
|
return
|
||||||
const dx = e.clientX - p.x
|
const dx = e.clientX - p.x
|
||||||
const dy = e.clientY - p.y
|
const dy = e.clientY - p.y
|
||||||
|
|
||||||
if (dx * dx + dy * dy >= 9)
|
if (dx * dx + dy * dy >= 9)
|
||||||
armEatNextClick ()
|
armEatNextClick ()
|
||||||
}}
|
}}
|
||||||
onPointerUpCapture={() => {
|
onPointerUpCapture={() => {
|
||||||
downPosRef.current = null
|
downPosRef.current = null
|
||||||
}}
|
}}
|
||||||
onPointerCancelCapture={() => {
|
|
||||||
downPosRef.current = null
|
|
||||||
}}
|
|
||||||
onClickCapture={e => {
|
onClickCapture={e => {
|
||||||
if (suppressClickRef.current)
|
if (suppressClickRef.current)
|
||||||
{
|
{
|
||||||
@@ -108,35 +82,22 @@ const DraggableDroppableTagRow: FC<Props> = ({
|
|||||||
e.stopPropagation ()
|
e.stopPropagation ()
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
ref={setDropRef}
|
ref={node => {
|
||||||
|
setDragRef (node)
|
||||||
|
setDropRef (node)
|
||||||
|
}}
|
||||||
|
style={style}
|
||||||
className={cn (
|
className={cn (
|
||||||
'min-w-0 max-w-full overflow-hidden rounded select-none',
|
'min-w-0 max-w-full overflow-hidden rounded select-none',
|
||||||
sp && 'touch-pan-y',
|
|
||||||
over && 'ring-2 ring-offset-2')}
|
over && 'ring-2 ring-offset-2')}
|
||||||
>
|
{...attributes}
|
||||||
{activeDragging
|
{...listeners}>
|
||||||
? (
|
<motion.div
|
||||||
<div
|
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
||||||
ref={setDragRef}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
style={style}
|
layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
||||||
className={innerClassName}
|
<TagLink tag={tag} nestLevel={nestLevel}/>
|
||||||
{...attributes}
|
</motion.div>
|
||||||
{...listeners}>
|
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
|
||||||
</div>)
|
|
||||||
: (
|
|
||||||
<motion.div
|
|
||||||
ref={setDragRef}
|
|
||||||
style={style}
|
|
||||||
className={innerClassName}
|
|
||||||
{...attributes}
|
|
||||||
{...listeners}
|
|
||||||
transition={{ layout: layoutTransition }}
|
|
||||||
layoutId={animationMode === 'off'
|
|
||||||
? undefined
|
|
||||||
: `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
|
||||||
</motion.div>)}
|
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -488,23 +488,25 @@ const MaterialSidebar: FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<SidebarComponent sidebarKey="materials" className="hidden md:block">
|
<div className="hidden md:block">
|
||||||
<div className="space-y-4">
|
<SidebarComponent>
|
||||||
<MaterialFilterButtons
|
<div className="space-y-4">
|
||||||
materialFilter={materialFilter}
|
<MaterialFilterButtons
|
||||||
onChange={handleFilterChange}/>
|
materialFilter={materialFilter}
|
||||||
{isLoading && (
|
onChange={handleFilterChange}/>
|
||||||
<p className="text-sm text-neutral-500 dark:text-stone-400">読込中……</p>)}
|
{isLoading && (
|
||||||
{isError && (
|
<p className="text-sm text-neutral-500 dark:text-stone-400">読込中……</p>)}
|
||||||
<p className="text-sm text-red-600 dark:text-red-300">
|
{isError && (
|
||||||
タグ一覧の取得に失敗しました.
|
<p className="text-sm text-red-600 dark:text-red-300">
|
||||||
</p>)}
|
タグ一覧の取得に失敗しました.
|
||||||
{(!isLoading && !isError) && (
|
</p>)}
|
||||||
<ul>
|
{(!isLoading && !isError) && (
|
||||||
{renderDesktopTree (visibleRootTags)}
|
<ul>
|
||||||
</ul>)}
|
{renderDesktopTree (visibleRootTags)}
|
||||||
</div>
|
</ul>)}
|
||||||
</SidebarComponent>
|
</div>
|
||||||
|
</SidebarComponent>
|
||||||
|
</div>
|
||||||
</>)
|
</>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ import YoutubeEmbed from 'react-youtube'
|
|||||||
import NicoViewer from '@/components/NicoViewer'
|
import NicoViewer from '@/components/NicoViewer'
|
||||||
import TwitterEmbed from '@/components/TwitterEmbed'
|
import TwitterEmbed from '@/components/TwitterEmbed'
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
||||||
import { Button } from '@/components/ui/button'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
|
|
||||||
import type { FC, RefObject } from 'react'
|
import type { FC, RefObject } from 'react'
|
||||||
|
|
||||||
@@ -26,19 +24,16 @@ type Props = {
|
|||||||
onError?: (data: unknown) => void }
|
onError?: (data: unknown) => void }
|
||||||
|
|
||||||
|
|
||||||
const PostEmbed: FC<Props> = (
|
const PostEmbed: FC<Props> = ({
|
||||||
{ ref,
|
ref,
|
||||||
post,
|
post,
|
||||||
onLoadComplete,
|
onLoadComplete,
|
||||||
onMetadataChange,
|
onMetadataChange,
|
||||||
onVideoReady,
|
onVideoReady,
|
||||||
onPlaybackChange,
|
onPlaybackChange,
|
||||||
onError },
|
onError,
|
||||||
) => {
|
}) => {
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const embedAutoLoadMode = behaviourSettings.embedAutoLoad ?? 'auto'
|
|
||||||
const [manualLoadRequested, setManualLoadRequested] = useState (false)
|
|
||||||
const [framed, setFramed] = useState (false)
|
const [framed, setFramed] = useState (false)
|
||||||
const [youtubePlayer, setYoutubePlayer] = useState<YouTubePlayer | null> (null)
|
const [youtubePlayer, setYoutubePlayer] = useState<YouTubePlayer | null> (null)
|
||||||
const niconicoVideoReadyRef = useRef (false)
|
const niconicoVideoReadyRef = useRef (false)
|
||||||
@@ -110,10 +105,6 @@ const PostEmbed: FC<Props> = (
|
|||||||
niconicoVideoReadyRef.current = false
|
niconicoVideoReadyRef.current = false
|
||||||
}, [post.url])
|
}, [post.url])
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
setManualLoadRequested (false)
|
|
||||||
}, [embedAutoLoadMode, post.url])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
if (!(youtubePlayer) || !(onPlaybackChange))
|
if (!(youtubePlayer) || !(onPlaybackChange))
|
||||||
return
|
return
|
||||||
@@ -126,28 +117,6 @@ const PostEmbed: FC<Props> = (
|
|||||||
}, [onPlaybackChange, reportYoutubePlayback, youtubePlayer])
|
}, [onPlaybackChange, reportYoutubePlayback, youtubePlayer])
|
||||||
|
|
||||||
const url = new URL (post.url)
|
const url = new URL (post.url)
|
||||||
const shouldLoadEmbed =
|
|
||||||
embedAutoLoadMode === 'auto'
|
|
||||||
|| (
|
|
||||||
embedAutoLoadMode === 'manual'
|
|
||||||
&& manualLoadRequested
|
|
||||||
)
|
|
||||||
|
|
||||||
const externalLink = (
|
|
||||||
<a href={post.url} target="_blank" rel="noreferrer">
|
|
||||||
外部ページを開く
|
|
||||||
</a>)
|
|
||||||
|
|
||||||
const manualLoadControl = (
|
|
||||||
<div className="flex flex-wrap items-center gap-3">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => setManualLoadRequested (true)}>
|
|
||||||
埋め込みを読込
|
|
||||||
</Button>
|
|
||||||
{externalLink}
|
|
||||||
</div>)
|
|
||||||
|
|
||||||
switch (url.hostname.split ('.').slice (-2).join ('.'))
|
switch (url.hostname.split ('.').slice (-2).join ('.'))
|
||||||
{
|
{
|
||||||
@@ -159,11 +128,6 @@ const PostEmbed: FC<Props> = (
|
|||||||
|
|
||||||
const [videoId] = mVideoId
|
const [videoId] = mVideoId
|
||||||
|
|
||||||
if (embedAutoLoadMode === 'off')
|
|
||||||
return externalLink
|
|
||||||
if (shouldLoadEmbed === false)
|
|
||||||
return manualLoadControl
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<NicoViewer
|
<NicoViewer
|
||||||
ref={ref}
|
ref={ref}
|
||||||
@@ -186,11 +150,6 @@ const PostEmbed: FC<Props> = (
|
|||||||
const [userId] = mUserId
|
const [userId] = mUserId
|
||||||
const [statusId] = mStatusId
|
const [statusId] = mStatusId
|
||||||
|
|
||||||
if (embedAutoLoadMode === 'off')
|
|
||||||
return externalLink
|
|
||||||
if (shouldLoadEmbed === false)
|
|
||||||
return manualLoadControl
|
|
||||||
|
|
||||||
return <TwitterEmbed userId={userId} statusId={statusId}/>
|
return <TwitterEmbed userId={userId} statusId={statusId}/>
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,11 +159,6 @@ const PostEmbed: FC<Props> = (
|
|||||||
if (!(videoId))
|
if (!(videoId))
|
||||||
break
|
break
|
||||||
|
|
||||||
if (embedAutoLoadMode === 'off')
|
|
||||||
return externalLink
|
|
||||||
if (shouldLoadEmbed === false)
|
|
||||||
return manualLoadControl
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<YoutubeEmbed videoId={videoId} opts={{ playerVars: {
|
<YoutubeEmbed videoId={videoId} opts={{ playerVars: {
|
||||||
playsinline: 1,
|
playsinline: 1,
|
||||||
@@ -230,11 +184,6 @@ const PostEmbed: FC<Props> = (
|
|||||||
height={360}/>)
|
height={360}/>)
|
||||||
: (
|
: (
|
||||||
<div>
|
<div>
|
||||||
{embedAutoLoadMode === 'off'
|
|
||||||
? externalLink
|
|
||||||
: embedAutoLoadMode === 'manual' && shouldLoadEmbed === false
|
|
||||||
? manualLoadControl
|
|
||||||
: (
|
|
||||||
<a href="#" onClick={async e => {
|
<a href="#" onClick={async e => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
|
|
||||||
@@ -248,7 +197,7 @@ const PostEmbed: FC<Props> = (
|
|||||||
confirmText: '表示' }))
|
confirmText: '表示' }))
|
||||||
}}>
|
}}>
|
||||||
外部ページを表示
|
外部ページを表示
|
||||||
</a>)}
|
</a>
|
||||||
</div>)}
|
</div>)}
|
||||||
</>)
|
</>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,12 +68,9 @@ const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
|
|||||||
|
|
||||||
setBounds ({ start, end })
|
setBounds ({ start, end })
|
||||||
|
|
||||||
const data = await apiGet<Tag[]> ('/tags/autocomplete', { params: {
|
const data = await apiGet<Tag[]> ('/tags/autocomplete', { params: { q: token, nico: '0' } })
|
||||||
q: token,
|
setSuggestions (data.filter (t => t.postCount > 0))
|
||||||
nico: '0' } })
|
setSuggestionsVsbl (suggestions.length > 0)
|
||||||
const nextSuggestions = data.filter (t => t.postCount > 0)
|
|
||||||
setSuggestions (nextSuggestions)
|
|
||||||
setSuggestionsVsbl (nextSuggestions.length > 0)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { useRef } from 'react'
|
|||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
||||||
|
|
||||||
@@ -17,15 +16,6 @@ type Props = { posts: Post[]
|
|||||||
|
|
||||||
const PostList: FC<Props> = ({ posts, onClick }) => {
|
const PostList: FC<Props> = ({ posts, onClick }) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal'
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const cardLayoutTransition =
|
|
||||||
animationMode === 'off'
|
|
||||||
? { duration: 0 }
|
|
||||||
: animationMode === 'reduced'
|
|
||||||
? { duration: .08, ease: 'linear' as const }
|
|
||||||
: { duration: .2, ease: 'easeOut' as const }
|
|
||||||
|
|
||||||
const setForLocationKey = useSharedTransitionStore (s => s.setForLocationKey)
|
const setForLocationKey = useSharedTransitionStore (s => s.setForLocationKey)
|
||||||
|
|
||||||
@@ -49,8 +39,7 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
}}>
|
}}>
|
||||||
<motion.div
|
<motion.div
|
||||||
ref={cardRef}
|
ref={cardRef}
|
||||||
layout={animationMode === 'off' ? false : true}
|
layoutId={layoutId}
|
||||||
layoutId={animationMode === 'off' ? undefined : layoutId}
|
|
||||||
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
||||||
'transform-gpu will-change-transform',
|
'transform-gpu will-change-transform',
|
||||||
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
||||||
@@ -65,36 +54,22 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
}}
|
}}
|
||||||
onLayoutAnimationComplete={() => {
|
onLayoutAnimationComplete={() => {
|
||||||
if (!(cardRef.current))
|
if (!(cardRef.current))
|
||||||
return
|
return
|
||||||
|
|
||||||
cardRef.current.style.zIndex = ''
|
cardRef.current.style.zIndex = ''
|
||||||
cardRef.current.style.position = ''
|
cardRef.current.style.position = ''
|
||||||
}}
|
}}
|
||||||
transition={{ layout: cardLayoutTransition }}>
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
{thumbnailMode === 'off'
|
<img src={post.thumbnail || post.thumbnailBase || undefined}
|
||||||
? (
|
alt={post.title || post.url}
|
||||||
<div className="flex h-full w-full items-center justify-center
|
title={post.title || post.url || undefined}
|
||||||
bg-muted text-center text-xs text-muted-foreground">
|
loading={i < 12 ? 'eager' : 'lazy'}
|
||||||
サムネイルなし
|
decoding="async"
|
||||||
</div>)
|
className="object-cover w-full h-full"/>
|
||||||
: (
|
|
||||||
<img
|
|
||||||
src={post.thumbnail || post.thumbnailBase || undefined}
|
|
||||||
alt={post.title || post.url}
|
|
||||||
title={post.title || post.url || undefined}
|
|
||||||
loading={
|
|
||||||
thumbnailMode === 'light'
|
|
||||||
? 'lazy'
|
|
||||||
: i < 12
|
|
||||||
? 'eager'
|
|
||||||
: 'lazy'
|
|
||||||
}
|
|
||||||
decoding="async"
|
|
||||||
className="object-cover w-full h-full"/>)}
|
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
})}
|
})}
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default PostList
|
export default PostList
|
||||||
@@ -5,8 +5,6 @@ import { createPath, useNavigate } from 'react-router-dom'
|
|||||||
|
|
||||||
import { useOverlayStore } from '@/components/RouteBlockerOverlay'
|
import { useOverlayStore } from '@/components/RouteBlockerOverlay'
|
||||||
import { prefetchForURL } from '@/lib/prefetchers'
|
import { prefetchForURL } from '@/lib/prefetchers'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { AnchorHTMLAttributes, MouseEvent, TouchEvent } from 'react'
|
import type { AnchorHTMLAttributes, MouseEvent, TouchEvent } from 'react'
|
||||||
@@ -35,20 +33,10 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const { confirmDiscardNavigation } = useUnsavedChangesGuard ()
|
|
||||||
const linkPreloadMode = behaviourSettings.linkPreload ?? 'intent'
|
|
||||||
const path = useMemo (
|
|
||||||
() => typeof to === 'string' ? to : createPath (to),
|
|
||||||
[to],
|
|
||||||
)
|
|
||||||
const url = useMemo (() => {
|
const url = useMemo (() => {
|
||||||
return (new URL (path, window.location.origin)).toString ()
|
const path = (typeof to === 'string') ? to : createPath (to)
|
||||||
}, [path])
|
return (new URL (path, location.origin)).toString ()
|
||||||
const nextPathname = useMemo (
|
}, [to])
|
||||||
() => (new URL (path, window.location.origin)).pathname,
|
|
||||||
[path],
|
|
||||||
)
|
|
||||||
const setOverlay = useOverlayStore (s => s.setActive)
|
const setOverlay = useOverlayStore (s => s.setActive)
|
||||||
|
|
||||||
const doPrefetch = async () => {
|
const doPrefetch = async () => {
|
||||||
@@ -66,15 +54,11 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
const handleMouseEnter = async (ev: MouseEvent<HTMLAnchorElement>) => {
|
const handleMouseEnter = async (ev: MouseEvent<HTMLAnchorElement>) => {
|
||||||
onMouseEnter?.(ev)
|
onMouseEnter?.(ev)
|
||||||
if (ev.defaultPrevented || linkPreloadMode !== 'intent')
|
|
||||||
return
|
|
||||||
await doPrefetch ()
|
await doPrefetch ()
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleTouchStart = async (ev: TouchEvent<HTMLAnchorElement>) => {
|
const handleTouchStart = async (ev: TouchEvent<HTMLAnchorElement>) => {
|
||||||
onTouchStart?.(ev)
|
onTouchStart?.(ev)
|
||||||
if (ev.defaultPrevented || linkPreloadMode !== 'intent')
|
|
||||||
return
|
|
||||||
await doPrefetch ()
|
await doPrefetch ()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,13 +77,6 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
ev.preventDefault ()
|
ev.preventDefault ()
|
||||||
|
|
||||||
if (nextPathname !== window.location.pathname)
|
|
||||||
{
|
|
||||||
const confirmed = await confirmDiscardNavigation ()
|
|
||||||
if (!(confirmed))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
flushSync (() => {
|
flushSync (() => {
|
||||||
setOverlay (true)
|
setOverlay (true)
|
||||||
})
|
})
|
||||||
@@ -122,7 +99,7 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<a ref={ref}
|
<a ref={ref}
|
||||||
href={path}
|
href={typeof to === 'string' ? to : createPath (to)}
|
||||||
onMouseEnter={handleMouseEnter}
|
onMouseEnter={handleMouseEnter}
|
||||||
onTouchStart={handleTouchStart}
|
onTouchStart={handleTouchStart}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
|
|
||||||
@@ -21,8 +20,6 @@ const MIN_MARQUEE_OVERFLOW_PX = 1
|
|||||||
const ResponsiveMarqueeText: FC<Props> = (
|
const ResponsiveMarqueeText: FC<Props> = (
|
||||||
{ text, className, truncateOnMobile = false, title },
|
{ text, className, truncateOnMobile = false, title },
|
||||||
) => {
|
) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const outerRef = useRef<HTMLSpanElement | null> (null)
|
const outerRef = useRef<HTMLSpanElement | null> (null)
|
||||||
const staticRef = useRef<HTMLSpanElement | null> (null)
|
const staticRef = useRef<HTMLSpanElement | null> (null)
|
||||||
const animatedRef = useRef<HTMLSpanElement | null> (null)
|
const animatedRef = useRef<HTMLSpanElement | null> (null)
|
||||||
@@ -101,7 +98,6 @@ const ResponsiveMarqueeText: FC<Props> = (
|
|||||||
const animated = animatedRef.current
|
const animated = animatedRef.current
|
||||||
const canMarquee = (
|
const canMarquee = (
|
||||||
active
|
active
|
||||||
&& animationMode !== 'off'
|
|
||||||
&& desktopMarqueeEnabled
|
&& desktopMarqueeEnabled
|
||||||
&& overflowPx >= MIN_MARQUEE_OVERFLOW_PX
|
&& overflowPx >= MIN_MARQUEE_OVERFLOW_PX
|
||||||
&& animated != null)
|
&& animated != null)
|
||||||
@@ -211,7 +207,7 @@ const ResponsiveMarqueeText: FC<Props> = (
|
|||||||
resetAnimated ()
|
resetAnimated ()
|
||||||
setMarqueeVisible (false)
|
setMarqueeVisible (false)
|
||||||
}
|
}
|
||||||
}, [active, animationMode, desktopMarqueeEnabled, overflowPx, text])
|
}, [active, desktopMarqueeEnabled, overflowPx, text])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
import { DndContext,
|
import { DndContext,
|
||||||
DragOverlay,
|
DragOverlay,
|
||||||
MeasuringStrategy,
|
|
||||||
MouseSensor,
|
MouseSensor,
|
||||||
TouchSensor,
|
TouchSensor,
|
||||||
pointerWithin,
|
|
||||||
useDroppable,
|
useDroppable,
|
||||||
useSensor,
|
useSensor,
|
||||||
useSensors } from '@dnd-kit/core'
|
useSensors } from '@dnd-kit/core'
|
||||||
import { restrictToWindowEdges, snapCenterToCursor } from '@dnd-kit/modifiers'
|
import { restrictToWindowEdges } from '@dnd-kit/modifiers'
|
||||||
import { useQueryClient } from '@tanstack/react-query'
|
import { useQueryClient } from '@tanstack/react-query'
|
||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react'
|
import { useEffect, useMemo, useRef, useState } from 'react'
|
||||||
@@ -22,28 +20,18 @@ import SidebarComponent from '@/components/layout/SidebarComponent'
|
|||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
import { apiDelete, apiGet, apiPatch, apiPost } from '@/lib/api'
|
import { apiDelete, apiGet, apiPatch, apiPost } from '@/lib/api'
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { dateString, originalCreatedAtString } from '@/lib/utils'
|
import { dateString, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { CollisionDetection, DragEndEvent } from '@dnd-kit/core'
|
import type { DragEndEvent } from '@dnd-kit/core'
|
||||||
import type { FC, MutableRefObject, ReactNode } from 'react'
|
import type { FC, MutableRefObject, ReactNode } from 'react'
|
||||||
|
|
||||||
import type { Category, Post, TagWithSections } from '@/types'
|
import type { Category, Post, TagWithSections } from '@/types'
|
||||||
|
|
||||||
type TagByCategory = { [key in Category]: TagWithSections[] }
|
type TagByCategory = { [key in Category]: TagWithSections[] }
|
||||||
|
|
||||||
const tagCollisionDetection: CollisionDetection = args => {
|
|
||||||
return pointerWithin (args)
|
|
||||||
}
|
|
||||||
|
|
||||||
const alwaysMeasureDroppables = {
|
|
||||||
droppable: { strategy: MeasuringStrategy.Always } } as const
|
|
||||||
|
|
||||||
|
|
||||||
const renderTagTree = (
|
const renderTagTree = (
|
||||||
activeDndId: string | undefined,
|
|
||||||
tag: TagWithSections,
|
tag: TagWithSections,
|
||||||
nestLevel: number,
|
nestLevel: number,
|
||||||
path: string,
|
path: string,
|
||||||
@@ -55,7 +43,6 @@ const renderTagTree = (
|
|||||||
const self = (
|
const self = (
|
||||||
<li key={key} className="mb-1">
|
<li key={key} className="mb-1">
|
||||||
<DraggableDroppableTagRow
|
<DraggableDroppableTagRow
|
||||||
activeDndId={activeDndId}
|
|
||||||
tag={tag}
|
tag={tag}
|
||||||
nestLevel={nestLevel}
|
nestLevel={nestLevel}
|
||||||
pathKey={key}
|
pathKey={key}
|
||||||
@@ -69,17 +56,11 @@ const renderTagTree = (
|
|||||||
...((tag.children
|
...((tag.children
|
||||||
?.sort ((a, b) => a.name < b.name ? -1 : 1)
|
?.sort ((a, b) => a.name < b.name ? -1 : 1)
|
||||||
.flatMap (child =>
|
.flatMap (child =>
|
||||||
renderTagTree (
|
renderTagTree (child, nestLevel + 1, key, suppressClickRef, tag.id, sp)))
|
||||||
activeDndId,
|
|
||||||
child,
|
|
||||||
nestLevel + 1,
|
|
||||||
key,
|
|
||||||
suppressClickRef,
|
|
||||||
tag.id,
|
|
||||||
sp)))
|
|
||||||
?? [])]
|
?? [])]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const isDescendant = (
|
const isDescendant = (
|
||||||
root: TagWithSections,
|
root: TagWithSections,
|
||||||
targetId: number,
|
targetId: number,
|
||||||
@@ -146,37 +127,6 @@ 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 (
|
const changeCategory = async (
|
||||||
tagId: number,
|
tagId: number,
|
||||||
category: Category): Promise<void> => {
|
category: Category): Promise<void> => {
|
||||||
@@ -195,47 +145,14 @@ const DropSlot = ({ cat }: { cat: Category }) => {
|
|||||||
</li>)
|
</li>)
|
||||||
}
|
}
|
||||||
|
|
||||||
const EmptyCategoryDropSection = (
|
|
||||||
{ cat, children }: { cat: Category
|
|
||||||
children: ReactNode }) => {
|
|
||||||
const { setNodeRef, isOver: over } = useDroppable ({
|
|
||||||
id: `slot:${ cat }`,
|
|
||||||
data: { kind: 'slot', cat } })
|
|
||||||
|
|
||||||
return (
|
type Props = { post: Post; sp?: boolean }
|
||||||
<div ref={setNodeRef} className="my-3">
|
|
||||||
{children}
|
|
||||||
<ul>
|
|
||||||
<li className="h-1">
|
|
||||||
{over && <div className="h-0.5 w-full rounded bg-sky-400"/>}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
type Props = {
|
const TagDetailSidebar: FC<Props> = ({ post, sp }) => {
|
||||||
className?: string
|
|
||||||
post: Post
|
|
||||||
sp?: boolean }
|
|
||||||
|
|
||||||
type ActiveTagDrag = {
|
|
||||||
dndId: string
|
|
||||||
tagId: number
|
|
||||||
nestLevel: number }
|
|
||||||
|
|
||||||
|
|
||||||
const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|
||||||
sp = Boolean (sp)
|
sp = Boolean (sp)
|
||||||
|
|
||||||
const qc = useQueryClient ()
|
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 baseTags = useMemo<TagByCategory> (() => {
|
||||||
const tagsTmp = { } as TagByCategory
|
const tagsTmp = { } as TagByCategory
|
||||||
@@ -253,15 +170,10 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
return tagsTmp
|
return tagsTmp
|
||||||
}, [post])
|
}, [post])
|
||||||
|
|
||||||
const [activeTagDrag, setActiveTagDrag] = useState<ActiveTagDrag | null> (null)
|
const [activeTagId, setActiveTagId] = useState<number | null> (null)
|
||||||
const [dragging, setDragging] = useState (false)
|
const [dragging, setDragging] = useState (false)
|
||||||
const [saving, setSaving] = useState (false)
|
const [saving, setSaving] = useState (false)
|
||||||
const [tags, setTags] = useState (baseTags)
|
const [tags, setTags] = useState (baseTags)
|
||||||
const flatTagsByCategory = useMemo<TagByCategory> (
|
|
||||||
() => buildFlatTagByCategory (tags),
|
|
||||||
[tags],
|
|
||||||
)
|
|
||||||
const activeDndId = activeTagDrag?.dndId
|
|
||||||
|
|
||||||
const suppressClickRef = useRef (false)
|
const suppressClickRef = useRef (false)
|
||||||
|
|
||||||
@@ -366,23 +278,13 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
}, [baseTags])
|
}, [baseTags])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SidebarComponent sidebarKey="post-detail-tags" className={className}>
|
<SidebarComponent>
|
||||||
<TagSearch/>
|
<TagSearch/>
|
||||||
<DndContext
|
<DndContext
|
||||||
sensors={sensors}
|
sensors={sensors}
|
||||||
collisionDetection={tagCollisionDetection}
|
|
||||||
measuring={alwaysMeasureDroppables}
|
|
||||||
onDragStart={e => {
|
onDragStart={e => {
|
||||||
if (e.active.data.current?.kind === 'tag')
|
if (e.active.data.current?.kind === 'tag')
|
||||||
{
|
setActiveTagId (e.active.data.current?.tagId ?? null)
|
||||||
const tagId = e.active.data.current?.tagId
|
|
||||||
const nestLevel = e.active.data.current?.nestLevel
|
|
||||||
const dndId = e.active.data.current?.dndId
|
|
||||||
setActiveTagDrag (
|
|
||||||
tagId == null || nestLevel == null || dndId == null
|
|
||||||
? null
|
|
||||||
: { dndId, tagId, nestLevel })
|
|
||||||
}
|
|
||||||
setDragging (true)
|
setDragging (true)
|
||||||
suppressClickRef.current = true
|
suppressClickRef.current = true
|
||||||
document.body.style.userSelect = 'none'
|
document.body.style.userSelect = 'none'
|
||||||
@@ -393,80 +295,38 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
suppressClickRef.current = false}, { capture: true, once: true })
|
suppressClickRef.current = false}, { capture: true, once: true })
|
||||||
}}
|
}}
|
||||||
onDragCancel={() => {
|
onDragCancel={() => {
|
||||||
setActiveTagDrag (null)
|
setActiveTagId (null)
|
||||||
setDragging (false)
|
setDragging (false)
|
||||||
document.body.style.userSelect = ''
|
document.body.style.userSelect = ''
|
||||||
suppressClickRef.current = false
|
suppressClickRef.current = false
|
||||||
}}
|
}}
|
||||||
onDragEnd={async e => {
|
onDragEnd={async e => {
|
||||||
setActiveTagDrag (null)
|
setActiveTagId (null)
|
||||||
setDragging (false)
|
setDragging (false)
|
||||||
await onDragEnd (e)
|
await onDragEnd (e)
|
||||||
document.body.style.userSelect = ''
|
document.body.style.userSelect = ''
|
||||||
}}
|
}}
|
||||||
modifiers={[restrictToWindowEdges]}>
|
modifiers={[restrictToWindowEdges]}>
|
||||||
{CATEGORIES.map ((cat: Category) => {
|
{CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && (
|
||||||
const categoryTags =
|
<div className="my-3" key={cat}>
|
||||||
tagRelationDisplay === 'grouped'
|
|
||||||
? (tags[cat] ?? [])
|
|
||||||
: (flatTagsByCategory[cat] ?? [])
|
|
||||||
|
|
||||||
if (!(categoryTags.length > 0 || dragging))
|
|
||||||
return null
|
|
||||||
|
|
||||||
const sectionTitle = (
|
|
||||||
<SubsectionTitle>
|
<SubsectionTitle>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off'
|
layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}
|
||||||
? undefined
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
: `tag-${ sp ? 'sp-' : '' }${ cat }`}
|
|
||||||
transition={{ layout: layoutTransition }}>
|
|
||||||
{CATEGORY_NAMES[cat]}
|
{CATEGORY_NAMES[cat]}
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</SubsectionTitle>)
|
</SubsectionTitle>
|
||||||
|
|
||||||
if (!(categoryTags.length > 0))
|
<ul>
|
||||||
return (
|
{(tags[cat] ?? []).flatMap (tag => (
|
||||||
<EmptyCategoryDropSection cat={cat} key={cat}>
|
renderTagTree (tag, 0, `cat-${ cat }`, suppressClickRef, undefined, sp)))}
|
||||||
{sectionTitle}
|
<DropSlot cat={cat}/>
|
||||||
</EmptyCategoryDropSection>)
|
</ul>
|
||||||
|
</div>))}
|
||||||
return (
|
|
||||||
<div className="my-3" key={cat}>
|
|
||||||
{sectionTitle}
|
|
||||||
<ul>
|
|
||||||
{(tagRelationDisplay === 'grouped'
|
|
||||||
? (tags[cat] ?? []).flatMap (tag =>
|
|
||||||
renderTagTree (
|
|
||||||
activeDndId,
|
|
||||||
tag,
|
|
||||||
0,
|
|
||||||
`cat-${ cat }`,
|
|
||||||
suppressClickRef,
|
|
||||||
undefined,
|
|
||||||
sp,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: (flatTagsByCategory[cat] ?? []).map (tag => (
|
|
||||||
<li key={`flat-${ cat }-${ tag.id }`} className="mb-1">
|
|
||||||
<DraggableDroppableTagRow
|
|
||||||
activeDndId={activeDndId}
|
|
||||||
tag={tag}
|
|
||||||
nestLevel={0}
|
|
||||||
pathKey={`flat-${ cat }-${ tag.id }`}
|
|
||||||
suppressClickRef={suppressClickRef}
|
|
||||||
sp={sp}/>
|
|
||||||
</li>)))}
|
|
||||||
<DropSlot cat={cat}/>
|
|
||||||
</ul>
|
|
||||||
</div>)
|
|
||||||
})}
|
|
||||||
{post && (
|
{post && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off'
|
layoutId={`post-info-${ sp }`}
|
||||||
? undefined
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
: `post-info-${ sp }`}
|
|
||||||
transition={{ layout: layoutTransition }}>
|
|
||||||
<SectionTitle>情報</SectionTitle>
|
<SectionTitle>情報</SectionTitle>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Id.: {post.id}</li>
|
<li>Id.: {post.id}</li>
|
||||||
@@ -503,14 +363,11 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
</ul>
|
</ul>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
|
|
||||||
<DragOverlay
|
<DragOverlay adjustScale={false}>
|
||||||
adjustScale={false}
|
|
||||||
modifiers={[snapCenterToCursor]}
|
|
||||||
dropAnimation={animationMode === 'off' ? null : undefined}>
|
|
||||||
<div className="pointer-events-none">
|
<div className="pointer-events-none">
|
||||||
{activeTagDrag != null && (() => {
|
{activeTagId != null && (() => {
|
||||||
const tag = findTag (tags, activeTagDrag.tagId)
|
const tag = findTag (tags, activeTagId)
|
||||||
return tag && <TagLink tag={tag} nestLevel={activeTagDrag.nestLevel}/>
|
return tag && <TagLink tag={tag}/>
|
||||||
}) ()}
|
}) ()}
|
||||||
</div>
|
</div>
|
||||||
</DragOverlay>
|
</DragOverlay>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
import ResponsiveMarqueeText from '@/components/ResponsiveMarqueeText'
|
import ResponsiveMarqueeText from '@/components/ResponsiveMarqueeText'
|
||||||
|
import { LIGHT_COLOUR_SHADE, DARK_COLOUR_SHADE, TAG_COLOUR } from '@/consts'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { ComponentProps, CSSProperties, FC, HTMLAttributes } from 'react'
|
import type { ComponentProps, FC, HTMLAttributes } from 'react'
|
||||||
|
|
||||||
import type { Tag } from '@/types'
|
import type { Tag } from '@/types'
|
||||||
|
|
||||||
@@ -35,16 +36,15 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
withWiki = true,
|
withWiki = true,
|
||||||
withCount = true,
|
withCount = true,
|
||||||
className,
|
className,
|
||||||
style,
|
|
||||||
title,
|
title,
|
||||||
...props }) => {
|
...props }) => {
|
||||||
const colourStyle = {
|
const spanClass = cn (
|
||||||
'--tag-link-colour': `var(--tag-colour-${ tag.category })`,
|
`text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
|
||||||
'--tag-link-hover-colour': `var(--tag-colour-${ tag.category }-hover)`,
|
`dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
|
||||||
...style,
|
const linkClass = cn (
|
||||||
} as CSSProperties
|
spanClass,
|
||||||
const spanClass = 'tag-link-colour'
|
`hover:text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE - 200 }`,
|
||||||
const linkClass = 'tag-link-colour tag-link-hover-colour'
|
`dark:hover:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE - 200 }`)
|
||||||
const textClass = 'group min-w-0 max-w-full overflow-hidden align-bottom'
|
const textClass = 'group min-w-0 max-w-full overflow-hidden align-bottom'
|
||||||
const rootClass =
|
const rootClass =
|
||||||
'inline-flex min-w-0 max-w-full flex-nowrap items-stretch align-baseline gap-x-1 md:items-baseline'
|
'inline-flex min-w-0 max-w-full flex-nowrap items-stretch align-baseline gap-x-1 md:items-baseline'
|
||||||
@@ -63,8 +63,7 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
? (
|
? (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||||
className={linkClass}
|
className={linkClass}>
|
||||||
style={colourStyle}>
|
|
||||||
?
|
?
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
: (
|
: (
|
||||||
@@ -72,15 +71,13 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
? (
|
? (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/materials/${ tag.materialId }`}
|
to={`/materials/${ tag.materialId }`}
|
||||||
className={linkClass}
|
className={linkClass}>
|
||||||
style={colourStyle}>
|
|
||||||
?
|
?
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
: (
|
: (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/tags/${ tag.id }/deerjikists`}
|
to={`/tags/${ tag.id }/deerjikists`}
|
||||||
className={linkClass}
|
className={linkClass}>
|
||||||
style={colourStyle}>
|
|
||||||
?
|
?
|
||||||
</PrefetchLink>)))
|
</PrefetchLink>)))
|
||||||
: (
|
: (
|
||||||
@@ -123,7 +120,6 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
<span
|
<span
|
||||||
title={textTitle}
|
title={textTitle}
|
||||||
className={cn (spanClass, textClass, className)}
|
className={cn (spanClass, textClass, className)}
|
||||||
style={colourStyle}
|
|
||||||
{...props}>
|
{...props}>
|
||||||
<ResponsiveMarqueeText
|
<ResponsiveMarqueeText
|
||||||
text={tag.matchedAlias}
|
text={tag.matchedAlias}
|
||||||
@@ -138,7 +134,6 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
to={`/posts?${ (new URLSearchParams ({ tags: tag.name })).toString () }`}
|
to={`/posts?${ (new URLSearchParams ({ tags: tag.name })).toString () }`}
|
||||||
title={textTitle}
|
title={textTitle}
|
||||||
className={cn (linkClass, textClass, className)}
|
className={cn (linkClass, textClass, className)}
|
||||||
style={colourStyle}
|
|
||||||
{...props}>
|
{...props}>
|
||||||
<ResponsiveMarqueeText
|
<ResponsiveMarqueeText
|
||||||
text={tag.name}
|
text={tag.name}
|
||||||
@@ -149,7 +144,6 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
<span
|
<span
|
||||||
title={textTitle}
|
title={textTitle}
|
||||||
className={cn (spanClass, textClass, className)}
|
className={cn (spanClass, textClass, className)}
|
||||||
style={colourStyle}
|
|
||||||
{...props}>
|
{...props}>
|
||||||
<ResponsiveMarqueeText
|
<ResponsiveMarqueeText
|
||||||
text={tag.name}
|
text={tag.name}
|
||||||
|
|||||||
@@ -105,7 +105,6 @@ const TagSearch: FC = () => {
|
|||||||
return (
|
return (
|
||||||
<div className="relative w-full">
|
<div className="relative w-full">
|
||||||
<input type="text"
|
<input type="text"
|
||||||
data-shortcut-focus-search="true"
|
|
||||||
placeholder="タグ検索..."
|
placeholder="タグ検索..."
|
||||||
value={search}
|
value={search}
|
||||||
onChange={whenChanged}
|
onChange={whenChanged}
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ import SectionTitle from '@/components/common/SectionTitle'
|
|||||||
import SidebarComponent from '@/components/layout/SidebarComponent'
|
import SidebarComponent from '@/components/layout/SidebarComponent'
|
||||||
import { CATEGORIES } from '@/consts'
|
import { CATEGORIES } from '@/consts'
|
||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
|
|
||||||
@@ -23,13 +21,6 @@ type Props = { posts: Post[]
|
|||||||
|
|
||||||
const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
||||||
const navigate = useNavigate ()
|
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 [tagsVsbl, setTagsVsbl] = useState (false)
|
||||||
const [tags, setTags] = useState<TagByCategory> ({ })
|
const [tags, setTags] = useState<TagByCategory> ({ })
|
||||||
@@ -74,18 +65,12 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
|||||||
{CATEGORIES.flatMap (cat => cat in tags ? (
|
{CATEGORIES.flatMap (cat => cat in tags ? (
|
||||||
tags[cat].map (tag => (
|
tags[cat].map (tag => (
|
||||||
<li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
|
<li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
|
||||||
{animationsOff
|
<motion.div
|
||||||
? (
|
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
||||||
<div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
<TagLink tag={tag} onClick={onClick}/>
|
layoutId={`tag-${ tag.id }`}>
|
||||||
</div>)
|
<TagLink tag={tag} onClick={onClick}/>
|
||||||
: (
|
</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>))) : [])}
|
</li>))) : [])}
|
||||||
</ul>
|
</ul>
|
||||||
<SectionTitle>関聯</SectionTitle>
|
<SectionTitle>関聯</SectionTitle>
|
||||||
@@ -111,32 +96,25 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
|||||||
</>)
|
</>)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SidebarComponent sidebarKey="posts-index-tags">
|
<SidebarComponent>
|
||||||
<TagSearch/>
|
<TagSearch/>
|
||||||
|
|
||||||
<div className="hidden md:block mt-4">
|
<div className="hidden md:block mt-4">
|
||||||
{posts.length > 0 && TagBlock}
|
{posts.length > 0 && TagBlock}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{animationsOff
|
<AnimatePresence initial={false}>
|
||||||
? (
|
{tagsVsbl && (
|
||||||
tagsVsbl && (
|
<motion.div
|
||||||
<div className="md:hidden overflow-hidden">
|
key="sptags"
|
||||||
{posts.length > 0 && TagBlock}
|
className="md:hidden overflow-hidden"
|
||||||
</div>))
|
initial={{ height: 0 }}
|
||||||
: (
|
animate={{ height: 'auto' }}
|
||||||
<AnimatePresence initial={false}>
|
exit={{ height: 0 }}
|
||||||
{tagsVsbl && (
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
<motion.div
|
{posts.length > 0 && TagBlock}
|
||||||
key="sptags"
|
</motion.div>)}
|
||||||
className="md:hidden overflow-hidden"
|
</AnimatePresence>
|
||||||
initial={{ height: 0 }}
|
|
||||||
animate={{ height: 'auto' }}
|
|
||||||
exit={{ height: 0 }}
|
|
||||||
transition={layoutTransition}>
|
|
||||||
{posts.length > 0 && TagBlock}
|
|
||||||
</motion.div>)}
|
|
||||||
</AnimatePresence>)}
|
|
||||||
|
|
||||||
<a href="#"
|
<a href="#"
|
||||||
className="md:hidden block my-2 text-center text-sm
|
className="md:hidden block my-2 text-center text-sm
|
||||||
|
|||||||
+150
-263
@@ -8,7 +8,6 @@ import PrefetchLink from '@/components/PrefetchLink'
|
|||||||
import TopNavUser from '@/components/TopNavUser'
|
import TopNavUser from '@/components/TopNavUser'
|
||||||
import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
|
import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
|
||||||
import { materialsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
import { materialsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { fetchTag, fetchTagByName } from '@/lib/tags'
|
import { fetchTag, fetchTagByName } from '@/lib/tags'
|
||||||
import { fetchMaterial } from '@/lib/materials'
|
import { fetchMaterial } from '@/lib/materials'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
@@ -92,10 +91,6 @@ export const menuOutline = (
|
|||||||
|
|
||||||
const TopNav: FC<Props> = ({ user }) => {
|
const TopNav: FC<Props> = ({ user }) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const animationsOff = animationMode === 'off'
|
|
||||||
const reducedAnimations = animationMode === 'reduced'
|
|
||||||
|
|
||||||
const dirRef = useRef<(-1) | 1> (1)
|
const dirRef = useRef<(-1) | 1> (1)
|
||||||
const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([])
|
const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([])
|
||||||
@@ -160,24 +155,6 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
const activeIdx =
|
const activeIdx =
|
||||||
visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
|
visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
|
||||||
const submenuHeight = moreVsbl ? 40 * moreMenu.length : (activeIdx < 0 ? 0 : 40)
|
const submenuHeight = moreVsbl ? 40 * moreMenu.length : (activeIdx < 0 ? 0 : 40)
|
||||||
const topNavTransition =
|
|
||||||
animationsOff
|
|
||||||
? { duration: 0 }
|
|
||||||
: reducedAnimations
|
|
||||||
? { duration: .08, ease: 'linear' as const }
|
|
||||||
: { duration: .2, ease: 'easeOut' as const }
|
|
||||||
const opacityTransition =
|
|
||||||
animationsOff
|
|
||||||
? { duration: 0 }
|
|
||||||
: reducedAnimations
|
|
||||||
? { duration: .08 }
|
|
||||||
: { duration: .12 }
|
|
||||||
const highlightTransitionClass =
|
|
||||||
animationsOff
|
|
||||||
? undefined
|
|
||||||
: reducedAnimations
|
|
||||||
? 'transition-[transform,width] duration-75 ease-linear'
|
|
||||||
: 'transition-[transform,width] duration-200 ease-out'
|
|
||||||
|
|
||||||
const prevActiveIdxRef = useRef<number> (activeIdx)
|
const prevActiveIdxRef = useRef<number> (activeIdx)
|
||||||
|
|
||||||
@@ -212,11 +189,13 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<nav className="top-nav-root px-3 flex justify-between items-center w-full">
|
<nav className="px-3 flex justify-between items-center w-full
|
||||||
|
bg-yellow-200 dark:bg-red-975 md:bg-yellow-50">
|
||||||
<div className="flex items-center gap-2 h-12">
|
<div className="flex items-center gap-2 h-12">
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to="/posts"
|
to="/posts"
|
||||||
className="top-nav-brand-link mx-4 text-xl font-bold"
|
className="mx-4 text-xl font-bold text-pink-600 hover:text-pink-400
|
||||||
|
dark:text-pink-300 dark:hover:text-pink-100"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
scroll (0, 0)
|
scroll (0, 0)
|
||||||
}}>
|
}}>
|
||||||
@@ -226,8 +205,8 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
<div ref={navRef} className="relative hidden md:flex h-12 items-center">
|
<div ref={navRef} className="relative hidden md:flex h-12 items-center">
|
||||||
<div aria-hidden
|
<div aria-hidden
|
||||||
className={cn ('absolute inset-y-0 h-12',
|
className={cn ('absolute inset-y-0 h-12',
|
||||||
'top-nav-highlight',
|
'bg-yellow-200 dark:bg-red-950',
|
||||||
highlightTransitionClass)}
|
'transition-[transform,width] duration-200 ease-out')}
|
||||||
style={{ width: hl.width,
|
style={{ width: hl.width,
|
||||||
transform: `translateX(${ hl.left }px)`,
|
transform: `translateX(${ hl.left }px)`,
|
||||||
opacity: hl.visible ? 1 : 0 }}/>
|
opacity: hl.visible ? 1 : 0 }}/>
|
||||||
@@ -235,12 +214,10 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
{visibleMenu.map ((item, i) => (
|
{visibleMenu.map ((item, i) => (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={item.to}
|
key={item.to}
|
||||||
{...(animationsOff
|
layoutId={`menu-${ item.name }`}
|
||||||
? { }
|
|
||||||
: { layoutId: `menu-${ item.name }` })}
|
|
||||||
animate={{ opacity: moreVsbl ? 0 : 1 }}
|
animate={{ opacity: moreVsbl ? 0 : 1 }}
|
||||||
transition={{ opacity: opacityTransition,
|
transition={{ opacity: { duration: .12 },
|
||||||
layout: topNavTransition }}
|
layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
style={{ pointerEvents: moreVsbl ? 'none' : 'auto' }}
|
style={{ pointerEvents: moreVsbl ? 'none' : 'auto' }}
|
||||||
onMouseEnter={() => setMoreVsbl (false)}>
|
onMouseEnter={() => setMoreVsbl (false)}>
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
@@ -248,7 +225,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
itemsRef.current[i] = el
|
itemsRef.current[i] = el
|
||||||
}}
|
}}
|
||||||
className={cn ('top-nav-menu-link relative z-10 flex h-full items-center px-5',
|
className={cn ('relative z-10 flex h-full items-center px-5',
|
||||||
(i === openItemIdx) && 'font-bold')}>
|
(i === openItemIdx) && 'font-bold')}>
|
||||||
{item.name}
|
{item.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
@@ -263,7 +240,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
setMoreVsbl (true)
|
setMoreVsbl (true)
|
||||||
measure (-1)
|
measure (-1)
|
||||||
}}
|
}}
|
||||||
className={cn ('top-nav-menu-link relative z-10 flex h-full items-center px-5',
|
className={cn ('relative z-10 flex h-full items-center px-5',
|
||||||
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
||||||
その他 »
|
その他 »
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
@@ -272,28 +249,30 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
<TopNavUser user={user}/>
|
<TopNavUser user={user}/>
|
||||||
|
|
||||||
<button
|
<a href="#"
|
||||||
type="button"
|
className="md:hidden ml-auto pr-4
|
||||||
className="top-nav-mobile-toggle md:hidden ml-auto border-0 bg-transparent pr-4"
|
text-pink-600 hover:text-pink-400
|
||||||
onClick={() => {
|
dark:text-pink-300 dark:hover:text-pink-100"
|
||||||
|
onClick={ev => {
|
||||||
|
ev.preventDefault ()
|
||||||
setMenuOpen (!(menuOpen))
|
setMenuOpen (!(menuOpen))
|
||||||
}}>
|
}}>
|
||||||
{menuOpen ? '×' : 'Menu'}
|
{menuOpen ? '×' : 'Menu'}
|
||||||
</button>
|
</a>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<AnimatePresence initial={false}>
|
<AnimatePresence initial={false}>
|
||||||
<motion.div
|
<motion.div
|
||||||
key="submenu-shell"
|
key="submenu-shell"
|
||||||
{...(animationsOff ? { }
|
layout
|
||||||
: { layout: true })}
|
className="relative z-20 hidden md:block overflow-hidden
|
||||||
className="relative z-20 hidden md:block overflow-hidden top-nav-submenu"
|
bg-yellow-200 dark:bg-red-950"
|
||||||
animate={{ height: submenuHeight }}
|
animate={{ height: submenuHeight }}
|
||||||
onMouseLeave={() => {
|
onMouseLeave={() => {
|
||||||
if (moreVsbl)
|
if (moreVsbl)
|
||||||
setMoreVsbl (false)
|
setMoreVsbl (false)
|
||||||
}}
|
}}
|
||||||
transition={{ layout: topNavTransition }}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
onAnimationComplete={() => {
|
onAnimationComplete={() => {
|
||||||
measure (moreVsbl ? -1 : activeIdx)
|
measure (moreVsbl ? -1 : activeIdx)
|
||||||
}}>
|
}}>
|
||||||
@@ -303,14 +282,12 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
<div key={i} className="relative h-[40px]">
|
<div key={i} className="relative h-[40px]">
|
||||||
<div className="absolute inset-0 flex items-center px-3">
|
<div className="absolute inset-0 flex items-center px-3">
|
||||||
<motion.div
|
<motion.div
|
||||||
transition={topNavTransition}
|
transition={{ duration: .2, ease: 'easeOut' }}
|
||||||
{...(animationsOff
|
{...((item.visible ?? true)
|
||||||
? { }
|
|
||||||
: ((item.visible ?? true)
|
|
||||||
? { layoutId: `menu-${ item.name }` }
|
? { layoutId: `menu-${ item.name }` }
|
||||||
: { initial: { x: 40, y: -40, opacity: 0 },
|
: { initial: { x: 40, y: -40, opacity: 0 },
|
||||||
animate: { x: 0, y: 0, opacity: 1 },
|
animate: { x: 0, y: 0, opacity: 1 },
|
||||||
exit: { x: 40, y: -40, opacity: 0 } }))}
|
exit: { x: 40, y: -40, opacity: 0 } })}
|
||||||
className="z-10 h-full flex items-center px-3 font-bold w-28">
|
className="z-10 h-full flex items-center px-3 font-bold w-28">
|
||||||
<h2>{item.name}</h2>
|
<h2>{item.name}</h2>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
@@ -321,34 +298,30 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
? (
|
? (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={`c-${ i }-${ j }`}
|
key={`c-${ i }-${ j }`}
|
||||||
transition={topNavTransition}
|
transition={{ duration: .2, ease: 'easeOut' }}
|
||||||
{...(animationsOff
|
{...((visibleMenu[activeIdx]?.name
|
||||||
? { }
|
|
||||||
: ((visibleMenu[activeIdx]?.name
|
|
||||||
=== item.name)
|
=== item.name)
|
||||||
? { layoutId: `submenu-${ item.name }-${ j }` }
|
? { layoutId: `submenu-${ item.name }-${ j }` }
|
||||||
: { initial: { y: -40, opacity: 0 },
|
: { initial: { y: -40, opacity: 0 },
|
||||||
animate: { y: 0, opacity: 1 },
|
animate: { y: 0, opacity: 1 },
|
||||||
exit: { y: -40, opacity: 0 } }))}>
|
exit: { y: -40, opacity: 0 } })}>
|
||||||
{subItem.component}
|
{subItem.component}
|
||||||
</motion.div>)
|
</motion.div>)
|
||||||
: (
|
: (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={`l-${ i }-${ j }`}
|
key={`l-${ i }-${ j }`}
|
||||||
transition={topNavTransition}
|
transition={{ duration: .2, ease: 'easeOut' }}
|
||||||
{...(animationsOff
|
{...((visibleMenu[activeIdx]?.name
|
||||||
? { }
|
|
||||||
: ((visibleMenu[activeIdx]?.name
|
|
||||||
=== item.name)
|
=== item.name)
|
||||||
? { layoutId: `submenu-${ item.name }-${ j }` }
|
? { layoutId: `submenu-${ item.name }-${ j }` }
|
||||||
: { initial: { y: -40, opacity: 0 },
|
: { initial: { y: -40, opacity: 0 },
|
||||||
animate: { y: 0, opacity: 1 },
|
animate: { y: 0, opacity: 1 },
|
||||||
exit: { y: -40, opacity: 0 } }))}>
|
exit: { y: -40, opacity: 0 } })}>
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={subItem.to}
|
to={subItem.to}
|
||||||
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
||||||
onClick={() => setMoreVsbl (false)}
|
onClick={() => setMoreVsbl (false)}
|
||||||
className="top-nav-menu-link h-full flex items-center px-3">
|
className="h-full flex items-center px-3">
|
||||||
{subItem.name}
|
{subItem.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</motion.div>)))}
|
</motion.div>)))}
|
||||||
@@ -357,215 +330,129 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
: ((visibleMenu[activeIdx]?.subMenu ?? []).length > 0
|
: ((visibleMenu[activeIdx]?.subMenu ?? []).length > 0
|
||||||
&& (
|
&& (
|
||||||
<div className="relative h-[40px]">
|
<div className="relative h-[40px]">
|
||||||
{animationsOff
|
<AnimatePresence initial={false} custom={dir}>
|
||||||
? (
|
<motion.div
|
||||||
<div className="absolute inset-0 flex items-center px-3">
|
key={activeIdx}
|
||||||
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
custom={dir}
|
||||||
.filter (item => item.visible ?? true)
|
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
|
||||||
.map ((item, i) => (
|
centre: { y: 0, opacity: 1 },
|
||||||
'component' in item
|
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
|
||||||
? (
|
className="absolute inset-0 flex items-center px-3"
|
||||||
<div key={`c-${ i }`}>
|
initial="enter"
|
||||||
{item.component}
|
animate="centre"
|
||||||
</div>)
|
exit="exit"
|
||||||
: (
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
<div key={`l-${ i }`}>
|
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
||||||
<PrefetchLink
|
.filter (item => item.visible ?? true)
|
||||||
to={item.to}
|
.map ((item, i) => (
|
||||||
target={item.to.slice (0, 2) === '//'
|
'component' in item
|
||||||
? '_blank'
|
? (
|
||||||
: undefined}
|
<motion.div
|
||||||
className="top-nav-menu-link h-full flex items-center px-3">
|
key={`c-${ i }`}
|
||||||
{item.name}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
</PrefetchLink>
|
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
||||||
</div>)))}
|
{item.component}
|
||||||
</div>)
|
</motion.div>)
|
||||||
: (
|
: (
|
||||||
<AnimatePresence initial={false} custom={dir}>
|
<motion.div
|
||||||
<motion.div
|
key={`l-${ i }`}
|
||||||
key={activeIdx}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
custom={dir}
|
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
||||||
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
|
<PrefetchLink
|
||||||
centre: { y: 0, opacity: 1 },
|
to={item.to}
|
||||||
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
|
target={item.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
||||||
className="absolute inset-0 flex items-center px-3"
|
className="h-full flex items-center px-3">
|
||||||
initial="enter"
|
{item.name}
|
||||||
animate="centre"
|
</PrefetchLink>
|
||||||
exit="exit"
|
</motion.div>)))}
|
||||||
transition={topNavTransition}>
|
</motion.div>
|
||||||
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
</AnimatePresence>
|
||||||
.filter (item => item.visible ?? true)
|
|
||||||
.map ((item, i) => (
|
|
||||||
'component' in item
|
|
||||||
? (
|
|
||||||
<motion.div
|
|
||||||
key={`c-${ i }`}
|
|
||||||
transition={{ layout: topNavTransition }}
|
|
||||||
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
|
||||||
{item.component}
|
|
||||||
</motion.div>)
|
|
||||||
: (
|
|
||||||
<motion.div
|
|
||||||
key={`l-${ i }`}
|
|
||||||
transition={{ layout: topNavTransition }}
|
|
||||||
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
|
||||||
<PrefetchLink
|
|
||||||
to={item.to}
|
|
||||||
target={item.to.slice (0, 2) === '//'
|
|
||||||
? '_blank'
|
|
||||||
: undefined}
|
|
||||||
className="top-nav-menu-link h-full flex items-center px-3">
|
|
||||||
{item.name}
|
|
||||||
</PrefetchLink>
|
|
||||||
</motion.div>)))}
|
|
||||||
</motion.div>
|
|
||||||
</AnimatePresence>)}
|
|
||||||
</div>))}
|
</div>))}
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</AnimatePresence>
|
</AnimatePresence>
|
||||||
|
|
||||||
{animationsOff
|
<AnimatePresence initial={false}>
|
||||||
? (
|
{menuOpen && (
|
||||||
menuOpen && (
|
<motion.div
|
||||||
<div
|
key="spmenu"
|
||||||
className={cn ('top-nav-root top-nav-mobile-menu flex flex-col md:hidden',
|
className={cn ('flex flex-col md:hidden',
|
||||||
'items-start')}>
|
'bg-yellow-200 dark:bg-red-975 items-start')}
|
||||||
<Separator/>
|
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
||||||
{visibleMenu.map ((item, i) => (
|
height: 0 },
|
||||||
<Fragment key={i}>
|
open: { clipPath: 'inset(0 0 0% 0)',
|
||||||
<PrefetchLink
|
height: 'auto' } }}
|
||||||
to={i === openItemIdx ? item.to : '#'}
|
initial="closed"
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
animate="open"
|
||||||
((i === openItemIdx)
|
exit="closed"
|
||||||
&& 'top-nav-mobile-active font-bold'))}
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
<Separator/>
|
||||||
if (i !== openItemIdx)
|
{visibleMenu.map ((item, i) => (
|
||||||
{
|
<Fragment key={i}>
|
||||||
ev.preventDefault ()
|
<PrefetchLink
|
||||||
setOpenItemIdx (i)
|
to={i === openItemIdx ? item.to : '#'}
|
||||||
}
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
}}>
|
((i === openItemIdx)
|
||||||
{item.name}
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}
|
||||||
</PrefetchLink>
|
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
||||||
|
if (i !== openItemIdx)
|
||||||
|
{
|
||||||
|
ev.preventDefault ()
|
||||||
|
setOpenItemIdx (i)
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
{item.name}
|
||||||
|
</PrefetchLink>
|
||||||
|
|
||||||
{i === openItemIdx && (
|
<AnimatePresence initial={false}>
|
||||||
<div className="top-nav-submenu w-full">
|
{i === openItemIdx && (
|
||||||
{item.subMenu
|
<motion.div
|
||||||
.filter (subItem => subItem.visible ?? true)
|
key={`sp-sub-${ i }`}
|
||||||
.map ((subItem, j) => (
|
className="w-full bg-yellow-50 dark:bg-red-950"
|
||||||
'component' in subItem
|
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
||||||
? (
|
height: 0,
|
||||||
<Fragment key={`sp-c-${ i }-${ j }`}>
|
opacity: 0 },
|
||||||
{subItem.component}
|
open: { clipPath: 'inset(0 0 0% 0)',
|
||||||
</Fragment>)
|
height: 'auto',
|
||||||
: (
|
opacity: 1 } }}
|
||||||
<PrefetchLink
|
initial="closed"
|
||||||
key={`sp-l-${ i }-${ j }`}
|
animate="open"
|
||||||
to={subItem.to}
|
exit="closed"
|
||||||
target={subItem.to.slice (0, 2) === '//'
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
? '_blank'
|
{item.subMenu
|
||||||
: undefined}
|
.filter (subItem => subItem.visible ?? true)
|
||||||
className="top-nav-mobile-row w-full min-h-[36px] flex items-center pl-12">
|
.map ((subItem, j) => (
|
||||||
{subItem.name}
|
'component' in subItem
|
||||||
</PrefetchLink>)))}
|
? (
|
||||||
</div>)}
|
<Fragment key={`sp-c-${ i }-${ j }`}>
|
||||||
</Fragment>))}
|
{subItem.component}
|
||||||
<PrefetchLink
|
</Fragment>)
|
||||||
to="/more"
|
: (
|
||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
<PrefetchLink
|
||||||
itemsRef.current[visibleMenu.length] = el
|
key={`sp-l-${ i }-${ j }`}
|
||||||
}}
|
to={subItem.to}
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
target={subItem.to.slice (0, 2) === '//'
|
||||||
((openItemIdx < 0)
|
? '_blank'
|
||||||
&& 'top-nav-mobile-active font-bold'))}>
|
: undefined}
|
||||||
その他 »
|
className="w-full min-h-[36px] flex items-center pl-12">
|
||||||
</PrefetchLink>
|
{subItem.name}
|
||||||
<TopNavUser user={user} sp/>
|
</PrefetchLink>)))}
|
||||||
<Separator/>
|
</motion.div>)}
|
||||||
</div>))
|
</AnimatePresence>
|
||||||
: (
|
</Fragment>))}
|
||||||
<AnimatePresence initial={false}>
|
<PrefetchLink
|
||||||
{menuOpen && (
|
to="/more"
|
||||||
<motion.div
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
key="spmenu"
|
itemsRef.current[visibleMenu.length] = el
|
||||||
className={cn ('top-nav-root top-nav-mobile-menu flex flex-col md:hidden',
|
}}
|
||||||
'items-start')}
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
((openItemIdx < 0)
|
||||||
height: 0 },
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}>
|
||||||
open: { clipPath: 'inset(0 0 0% 0)',
|
その他 »
|
||||||
height: 'auto' } }}
|
</PrefetchLink>
|
||||||
initial="closed"
|
<TopNavUser user={user} sp/>
|
||||||
animate="open"
|
<Separator/>
|
||||||
exit="closed"
|
</motion.div>)}
|
||||||
transition={topNavTransition}>
|
</AnimatePresence>
|
||||||
<Separator/>
|
|
||||||
{visibleMenu.map ((item, i) => (
|
|
||||||
<Fragment key={i}>
|
|
||||||
<PrefetchLink
|
|
||||||
to={i === openItemIdx ? item.to : '#'}
|
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
|
||||||
((i === openItemIdx)
|
|
||||||
&& 'top-nav-mobile-active font-bold'))}
|
|
||||||
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
|
||||||
if (i !== openItemIdx)
|
|
||||||
{
|
|
||||||
ev.preventDefault ()
|
|
||||||
setOpenItemIdx (i)
|
|
||||||
}
|
|
||||||
}}>
|
|
||||||
{item.name}
|
|
||||||
</PrefetchLink>
|
|
||||||
|
|
||||||
<AnimatePresence initial={false}>
|
|
||||||
{i === openItemIdx && (
|
|
||||||
<motion.div
|
|
||||||
key={`sp-sub-${ i }`}
|
|
||||||
className="top-nav-submenu w-full"
|
|
||||||
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
|
||||||
height: 0,
|
|
||||||
opacity: 0 },
|
|
||||||
open: { clipPath: 'inset(0 0 0% 0)',
|
|
||||||
height: 'auto',
|
|
||||||
opacity: 1 } }}
|
|
||||||
initial="closed"
|
|
||||||
animate="open"
|
|
||||||
exit="closed"
|
|
||||||
transition={topNavTransition}>
|
|
||||||
{item.subMenu
|
|
||||||
.filter (subItem => subItem.visible ?? true)
|
|
||||||
.map ((subItem, j) => (
|
|
||||||
'component' in subItem
|
|
||||||
? (
|
|
||||||
<Fragment key={`sp-c-${ i }-${ j }`}>
|
|
||||||
{subItem.component}
|
|
||||||
</Fragment>)
|
|
||||||
: (
|
|
||||||
<PrefetchLink
|
|
||||||
key={`sp-l-${ i }-${ j }`}
|
|
||||||
to={subItem.to}
|
|
||||||
target={subItem.to.slice (0, 2) === '//'
|
|
||||||
? '_blank'
|
|
||||||
: undefined}
|
|
||||||
className="top-nav-mobile-row w-full min-h-[36px] flex items-center pl-12">
|
|
||||||
{subItem.name}
|
|
||||||
</PrefetchLink>)))}
|
|
||||||
</motion.div>)}
|
|
||||||
</AnimatePresence>
|
|
||||||
</Fragment>))}
|
|
||||||
<PrefetchLink
|
|
||||||
to="/more"
|
|
||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
|
||||||
itemsRef.current[visibleMenu.length] = el
|
|
||||||
}}
|
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
|
||||||
((openItemIdx < 0)
|
|
||||||
&& 'top-nav-mobile-active font-bold'))}>
|
|
||||||
その他 »
|
|
||||||
</PrefetchLink>
|
|
||||||
<TopNavUser user={user} sp/>
|
|
||||||
<Separator/>
|
|
||||||
</motion.div>)}
|
|
||||||
</AnimatePresence>)}
|
|
||||||
</>)
|
</>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,16 +20,4 @@ describe ('TabGroup', () => {
|
|||||||
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
|
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
|
||||||
expect (screen.queryByText ('Beta')).not.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 ()
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -7,15 +7,12 @@ type TabProps = { name: string
|
|||||||
init?: boolean
|
init?: boolean
|
||||||
children: React.ReactNode }
|
children: React.ReactNode }
|
||||||
|
|
||||||
type Props = {
|
type Props = { children: React.ReactNode }
|
||||||
children: React.ReactNode
|
|
||||||
rightAddon?: React.ReactNode
|
|
||||||
}
|
|
||||||
|
|
||||||
export const Tab = ({ children }: TabProps) => <>{children}</>
|
export const Tab = ({ children }: TabProps) => <>{children}</>
|
||||||
|
|
||||||
|
|
||||||
const TabGroup: FC<Props> = ({ children, rightAddon }) => {
|
const TabGroup: FC<Props> = ({ children }) => {
|
||||||
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
|
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
|
||||||
|
|
||||||
const [current, setCurrent] = useState<number> (() => {
|
const [current, setCurrent] = useState<number> (() => {
|
||||||
@@ -25,27 +22,17 @@ const TabGroup: FC<Props> = ({ children, rightAddon }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mt-4">
|
<div className="mt-4">
|
||||||
<div className="flex items-center justify-between gap-4">
|
<div className="flex gap-4">
|
||||||
<div className="flex min-w-0 gap-4">
|
{tabs.map ((tab, i) => (
|
||||||
{tabs.map ((tab, i) => (
|
<a key={i}
|
||||||
<button
|
href="#"
|
||||||
key={i}
|
className={cn (i === current && 'font-bold')}
|
||||||
type="button"
|
onClick={ev => {
|
||||||
className={cn (
|
ev.preventDefault ()
|
||||||
'bg-transparent p-0 text-left text-[hsl(var(--theme-link))] hover:opacity-85',
|
setCurrent (i)
|
||||||
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
|
}}>
|
||||||
i === current && 'font-bold',
|
{tab.props.name}
|
||||||
)}
|
</a>))}
|
||||||
onClick={() => {
|
|
||||||
setCurrent (i)
|
|
||||||
}}>
|
|
||||||
{tab.props.name}
|
|
||||||
</button>))}
|
|
||||||
</div>
|
|
||||||
{rightAddon && (
|
|
||||||
<div className="shrink-0">
|
|
||||||
{rightAddon}
|
|
||||||
</div>)}
|
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2">
|
<div className="mt-2">
|
||||||
{tabs[current]}
|
{tabs[current]}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ describe ('TagInput', () => {
|
|||||||
await waitFor (() => {
|
await waitFor (() => {
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
expect (api.apiGet).toHaveBeenCalledWith (
|
||||||
'/tags/autocomplete',
|
'/tags/autocomplete',
|
||||||
{ params: { q: '虹夏', nico: '0' } },
|
{ params: { q: '虹夏' } },
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
expect (setValue).toHaveBeenCalledWith ('ぼっち 虹夏')
|
expect (setValue).toHaveBeenCalledWith ('ぼっち 虹夏')
|
||||||
@@ -41,20 +41,4 @@ describe ('TagInput', () => {
|
|||||||
expect (api.apiGet).not.toHaveBeenCalled ()
|
expect (api.apiGet).not.toHaveBeenCalled ()
|
||||||
expect (setValue).toHaveBeenCalledWith (' ')
|
expect (setValue).toHaveBeenCalledWith (' ')
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('sends nico=1 only when includeNico is true', async () => {
|
|
||||||
const setValue = vi.fn ()
|
|
||||||
api.apiGet.mockResolvedValueOnce ([buildTag ({ name: '虹夏', postCount: 2 })])
|
|
||||||
|
|
||||||
render (<TagInput value="" setValue={setValue} includeNico={true}/>)
|
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '虹夏' } })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
|
||||||
'/tags/autocomplete',
|
|
||||||
{ params: { q: '虹夏', nico: '1' } },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -10,20 +10,13 @@ import type { Tag } from '@/types'
|
|||||||
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
includeNico?: boolean
|
|
||||||
describedBy?: string
|
describedBy?: string
|
||||||
invalid?: boolean
|
invalid?: boolean
|
||||||
value: string
|
value: string
|
||||||
setValue: (value: string) => void }
|
setValue: (value: string) => void }
|
||||||
|
|
||||||
|
|
||||||
const TagInput: FC<Props> = ({
|
const TagInput: FC<Props> = ({ describedBy, invalid, value, setValue }) => {
|
||||||
includeNico = false,
|
|
||||||
describedBy,
|
|
||||||
invalid,
|
|
||||||
value,
|
|
||||||
setValue,
|
|
||||||
}) => {
|
|
||||||
const [activeIndex, setActiveIndex] = useState (-1)
|
const [activeIndex, setActiveIndex] = useState (-1)
|
||||||
const [suggestions, setSuggestions] = useState<Tag[]> ([])
|
const [suggestions, setSuggestions] = useState<Tag[]> ([])
|
||||||
const [suggestionsVsbl, setSuggestionsVsbl] = useState (false)
|
const [suggestionsVsbl, setSuggestionsVsbl] = useState (false)
|
||||||
@@ -39,12 +32,10 @@ const TagInput: FC<Props> = ({
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await apiGet<Tag[]> ('/tags/autocomplete', { params: {
|
const data = await apiGet<Tag[]> ('/tags/autocomplete', { params: { q } })
|
||||||
q,
|
setSuggestions (data.filter (t => t.postCount > 0))
|
||||||
nico: includeNico ? '1' : '0' } })
|
if (suggestions.length > 0)
|
||||||
const nextSuggestions = data.filter (t => t.postCount > 0)
|
setSuggestionsVsbl (true)
|
||||||
setSuggestions (nextSuggestions)
|
|
||||||
setSuggestionsVsbl (nextSuggestions.length > 0)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: TagSearch からのコピペのため,共通化を考へる.
|
// TODO: TagSearch からのコピペのため,共通化を考へる.
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
|
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, ReactNode } from 'react'
|
import type { FC, ReactNode } from 'react'
|
||||||
@@ -11,21 +9,12 @@ type Props = {
|
|||||||
className?: string }
|
className?: string }
|
||||||
|
|
||||||
|
|
||||||
const MainArea: FC<Props> = ({ children, className }) => {
|
const MainArea: FC<Props> = ({ children, className }) => (
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
<motion.main
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
const layoutTransition = clientAnimationTransition (
|
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
||||||
animationMode,
|
layout="position">
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
{children}
|
||||||
)
|
</motion.main>)
|
||||||
|
|
||||||
return (
|
export default MainArea
|
||||||
<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
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
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')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,327 +1,19 @@
|
|||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
import type { FC, ReactNode } from 'react'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
|
type Props = { children: ReactNode }
|
||||||
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 storageKeyForSidebar = (sidebarKey: string, side: SidebarSide): string =>
|
const SidebarComponent: FC<Props> = ({ children }) => (
|
||||||
`sidebar:${ sidebarKey }:${ side }:width`
|
<motion.div
|
||||||
|
layout="position"
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
const getSidebarMaxWidth = (containerWidth: number): number => {
|
className="p-4 w-full md:w-64 md:h-full md:overflow-y-auto sidebar">
|
||||||
const viewportWidth =
|
<Helmet>
|
||||||
typeof window === 'undefined' ? containerWidth : window.innerWidth
|
<style>
|
||||||
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 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 (() => {
|
|
||||||
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={animationMode === 'off' ? false : 'position'}
|
|
||||||
transition={{ layout: layoutTransition }}
|
|
||||||
style={style}
|
|
||||||
className={cn (
|
|
||||||
'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
|
|
||||||
className)}>
|
|
||||||
<Helmet>
|
|
||||||
<style>
|
|
||||||
{`
|
|
||||||
.sidebar
|
.sidebar
|
||||||
{
|
{
|
||||||
direction: rtl;
|
direction: rtl;
|
||||||
@@ -331,34 +23,10 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
{
|
{
|
||||||
direction: ltr;
|
direction: ltr;
|
||||||
}`}
|
}`}
|
||||||
</style>
|
</style>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
{children}
|
||||||
{children}
|
</motion.div>)
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
export default SidebarComponent
|
||||||
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
|
|
||||||
@@ -1,198 +0,0 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react'
|
|
||||||
|
|
||||||
import { Button } from '@/components/ui/button'
|
|
||||||
import { toast } from '@/components/ui/use-toast'
|
|
||||||
import { getClientBehaviorSettings, setClientBehaviorSettings } from '@/lib/settings'
|
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { FC, ReactNode } from 'react'
|
|
||||||
|
|
||||||
import type { ClientAnimationMode,
|
|
||||||
ClientBehaviorSettings,
|
|
||||||
ClientEmbedAutoLoadMode,
|
|
||||||
ClientLinkPreloadMode,
|
|
||||||
ClientTagRelationDisplayMode } from '@/lib/settings'
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
sectionClassName: string
|
|
||||||
onDirtyStateChange?: (
|
|
||||||
dirty: boolean,
|
|
||||||
discard: () => void,
|
|
||||||
) => void }
|
|
||||||
|
|
||||||
type SegmentedOption<T extends string> = {
|
|
||||||
value: T
|
|
||||||
label: string }
|
|
||||||
|
|
||||||
type SegmentedControlProps<T extends string> = {
|
|
||||||
value: T
|
|
||||||
options: SegmentedOption<T>[]
|
|
||||||
onChange: (value: T) => void }
|
|
||||||
|
|
||||||
type SettingBlockProps = {
|
|
||||||
title: string
|
|
||||||
description?: string
|
|
||||||
children: ReactNode }
|
|
||||||
|
|
||||||
const animationOptions: SegmentedOption<ClientAnimationMode>[] = [
|
|
||||||
{ value: 'off', label: 'なし' },
|
|
||||||
{ value: 'reduced', label: '控えめ' },
|
|
||||||
{ value: 'normal', label: '通常' }]
|
|
||||||
|
|
||||||
const embedAutoLoadOptions: SegmentedOption<ClientEmbedAutoLoadMode>[] = [
|
|
||||||
{ value: 'off', label: '読み込まない' },
|
|
||||||
{ value: 'manual', label: 'クリック時' },
|
|
||||||
{ value: 'auto', label: '自動' }]
|
|
||||||
|
|
||||||
const linkPreloadOptions: SegmentedOption<ClientLinkPreloadMode>[] = [
|
|
||||||
{ value: 'off', label: 'しない' },
|
|
||||||
{ value: 'intent', label: 'する' }]
|
|
||||||
|
|
||||||
const tagRelationDisplayOptions: SegmentedOption<ClientTagRelationDisplayMode>[] = [
|
|
||||||
{ value: 'flat', label: 'まとめない' },
|
|
||||||
{ value: 'grouped', label: 'まとめる' }]
|
|
||||||
|
|
||||||
const SegmentedControl = <T extends string,> (
|
|
||||||
{ value, options, onChange }: SegmentedControlProps<T>,
|
|
||||||
) => {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
role="radiogroup"
|
|
||||||
className="flex flex-wrap gap-2 rounded-xl border border-border bg-muted/40 p-1">
|
|
||||||
{options.map (option => (
|
|
||||||
<button
|
|
||||||
key={option.value}
|
|
||||||
type="button"
|
|
||||||
role="radio"
|
|
||||||
aria-checked={value === option.value}
|
|
||||||
className={cn (
|
|
||||||
'min-w-0 flex-1 rounded-lg px-3 py-2 text-sm font-medium',
|
|
||||||
'transition-colors focus-visible:outline-none focus-visible:ring-2',
|
|
||||||
'focus-visible:ring-ring focus-visible:ring-offset-2',
|
|
||||||
value === option.value
|
|
||||||
? 'bg-primary text-primary-foreground shadow-sm ring-1 ring-primary/40'
|
|
||||||
: 'bg-transparent text-muted-foreground hover:bg-background/70 hover:text-foreground',
|
|
||||||
)}
|
|
||||||
onClick={() => onChange (option.value)}>
|
|
||||||
{option.label}
|
|
||||||
</button>))}
|
|
||||||
</div>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const SettingBlock: FC<SettingBlockProps> = (
|
|
||||||
{ title, description, children },
|
|
||||||
) => (
|
|
||||||
<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>
|
|
||||||
</div>
|
|
||||||
{children}
|
|
||||||
</div>)
|
|
||||||
|
|
||||||
|
|
||||||
const BehaviourSettingsSection: FC<Props> = (
|
|
||||||
{ sectionClassName,
|
|
||||||
onDirtyStateChange },
|
|
||||||
) => {
|
|
||||||
const [savedSettings, setSavedSettings] =
|
|
||||||
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
|
||||||
const [draftSettings, setDraftSettings] =
|
|
||||||
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
const current = getClientBehaviorSettings ()
|
|
||||||
setSavedSettings (current)
|
|
||||||
setDraftSettings (current)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const hasUnsavedChanges = useMemo (
|
|
||||||
() => JSON.stringify (draftSettings) !== JSON.stringify (savedSettings),
|
|
||||||
[draftSettings, savedSettings])
|
|
||||||
|
|
||||||
const updateDraft = <Key extends keyof ClientBehaviorSettings,> (
|
|
||||||
key: Key,
|
|
||||||
value: ClientBehaviorSettings[Key],
|
|
||||||
) => {
|
|
||||||
setDraftSettings (current => ({ ...current, [key]: value }))
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleSave = () => {
|
|
||||||
const next = setClientBehaviorSettings (draftSettings)
|
|
||||||
setSavedSettings (next)
|
|
||||||
setDraftSettings (next)
|
|
||||||
toast ({ title: '動作設定を保存しました' })
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleDiscard = () => {
|
|
||||||
setDraftSettings (savedSettings)
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
onDirtyStateChange?.(hasUnsavedChanges, handleDiscard)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
onDirtyStateChange?.(false, () => { })
|
|
||||||
}
|
|
||||||
}, [handleDiscard, hasUnsavedChanges, onDirtyStateChange])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<section className={sectionClassName}>
|
|
||||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
|
||||||
<div className="space-y-1">
|
|
||||||
<h2 className="text-xl font-bold">動作</h2>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="destructive"
|
|
||||||
disabled={hasUnsavedChanges === false}
|
|
||||||
onClick={handleDiscard}>
|
|
||||||
変更を破棄
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
disabled={hasUnsavedChanges === false}
|
|
||||||
onClick={handleSave}>
|
|
||||||
保存
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-4">
|
|
||||||
<SettingBlock title="アニメーション">
|
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.animation ?? 'normal'}
|
|
||||||
options={animationOptions}
|
|
||||||
onChange={value => updateDraft ('animation', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
|
|
||||||
<SettingBlock
|
|
||||||
title="リンク先の先読み"
|
|
||||||
description="マウスを置いた時点でリンク先のデータを取得します。">
|
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.linkPreload ?? 'intent'}
|
|
||||||
options={linkPreloadOptions}
|
|
||||||
onChange={value => updateDraft ('linkPreload', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
|
|
||||||
<SettingBlock title="タグの親子関係表示">
|
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.tagRelationDisplay ?? 'grouped'}
|
|
||||||
options={tagRelationDisplayOptions}
|
|
||||||
onChange={value => updateDraft ('tagRelationDisplay', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
|
|
||||||
<SettingBlock title="埋め込み自動読込">
|
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.embedAutoLoad ?? 'auto'}
|
|
||||||
options={embedAutoLoadOptions}
|
|
||||||
onChange={value => updateDraft ('embedAutoLoad', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
</div>
|
|
||||||
</section>)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default BehaviourSettingsSection
|
|
||||||
@@ -1,262 +0,0 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react'
|
|
||||||
|
|
||||||
import { Button } from '@/components/ui/button'
|
|
||||||
import { toast } from '@/components/ui/use-toast'
|
|
||||||
import {
|
|
||||||
getConflictingShortcutActionIds,
|
|
||||||
formatKeyBinding,
|
|
||||||
isSpaceBinding,
|
|
||||||
keyBindingFromKeyboardEvent,
|
|
||||||
SHORTCUT_DEFINITIONS,
|
|
||||||
SHORTCUT_SCOPE_LABELS,
|
|
||||||
} from '@/lib/keyboardShortcuts'
|
|
||||||
import { getEffectiveKeyBindings } from '@/lib/settings'
|
|
||||||
import { useKeyboardShortcutSettings } from '@/lib/useKeyboardShortcuts'
|
|
||||||
|
|
||||||
import type { ShortcutActionId } from '@/lib/keyboardShortcuts'
|
|
||||||
import type { ClientKeyboardSettings } from '@/lib/settings'
|
|
||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
sectionClassName: string
|
|
||||||
onDirtyStateChange?: (
|
|
||||||
dirty: boolean,
|
|
||||||
discard: () => void,
|
|
||||||
) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const KeyboardSettingsSection: FC<Props> = (
|
|
||||||
{ sectionClassName,
|
|
||||||
onDirtyStateChange },
|
|
||||||
) => {
|
|
||||||
const {
|
|
||||||
keyboardSettings,
|
|
||||||
saveKeyboardSettings,
|
|
||||||
} = useKeyboardShortcutSettings ()
|
|
||||||
const [capturingActionId, setCapturingActionId] =
|
|
||||||
useState<ShortcutActionId | null> (null)
|
|
||||||
const [draftKeyboardSettings, setDraftKeyboardSettings] =
|
|
||||||
useState<ClientKeyboardSettings> (keyboardSettings)
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
setDraftKeyboardSettings (keyboardSettings)
|
|
||||||
}, [keyboardSettings])
|
|
||||||
|
|
||||||
const draftEffectiveBindings = useMemo (
|
|
||||||
() => getEffectiveKeyBindings (draftKeyboardSettings.bindings),
|
|
||||||
[draftKeyboardSettings.bindings],
|
|
||||||
)
|
|
||||||
const draftConflictActionIds = useMemo (
|
|
||||||
() => getConflictingShortcutActionIds (draftEffectiveBindings),
|
|
||||||
[draftEffectiveBindings],
|
|
||||||
)
|
|
||||||
const hasUnsavedChanges = useMemo (
|
|
||||||
() => JSON.stringify (draftKeyboardSettings) !== JSON.stringify (keyboardSettings),
|
|
||||||
[draftKeyboardSettings, keyboardSettings],
|
|
||||||
)
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
if (capturingActionId == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
const onKeyDown = (event: KeyboardEvent) => {
|
|
||||||
if (event.isComposing || event.key === 'Process')
|
|
||||||
return
|
|
||||||
|
|
||||||
event.preventDefault ()
|
|
||||||
event.stopPropagation ()
|
|
||||||
|
|
||||||
if (event.key === 'Escape')
|
|
||||||
{
|
|
||||||
setCapturingActionId (null)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.key === 'Backspace' || event.key === 'Delete')
|
|
||||||
{
|
|
||||||
setDraftKeyboardSettings (current => ({
|
|
||||||
...current,
|
|
||||||
bindings: {
|
|
||||||
...(current.bindings ?? { }),
|
|
||||||
[capturingActionId]: null,
|
|
||||||
},
|
|
||||||
}))
|
|
||||||
setCapturingActionId (null)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const binding = keyBindingFromKeyboardEvent (event)
|
|
||||||
if (binding == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
if (isSpaceBinding (binding))
|
|
||||||
{
|
|
||||||
toast ({ title: 'Space は今は割り当てられません.' })
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
setDraftKeyboardSettings (current => ({
|
|
||||||
...current,
|
|
||||||
bindings: {
|
|
||||||
...(current.bindings ?? { }),
|
|
||||||
[capturingActionId]: binding,
|
|
||||||
},
|
|
||||||
}))
|
|
||||||
setCapturingActionId (null)
|
|
||||||
}
|
|
||||||
|
|
||||||
document.addEventListener ('keydown', onKeyDown, true)
|
|
||||||
return () => document.removeEventListener ('keydown', onKeyDown, true)
|
|
||||||
}, [capturingActionId])
|
|
||||||
|
|
||||||
const rows = useMemo (() => SHORTCUT_DEFINITIONS.map (definition => ({
|
|
||||||
...definition,
|
|
||||||
currentBinding: draftEffectiveBindings[definition.id],
|
|
||||||
hasConflict: draftConflictActionIds.has (definition.id),
|
|
||||||
hasCustomBinding: Object.prototype.hasOwnProperty.call (
|
|
||||||
draftKeyboardSettings.bindings ?? { },
|
|
||||||
definition.id,
|
|
||||||
),
|
|
||||||
})), [
|
|
||||||
draftConflictActionIds,
|
|
||||||
draftEffectiveBindings,
|
|
||||||
draftKeyboardSettings.bindings,
|
|
||||||
])
|
|
||||||
|
|
||||||
const handleSave = () => {
|
|
||||||
saveKeyboardSettings (draftKeyboardSettings)
|
|
||||||
toast ({ title: 'キーボード設定を保存しました' })
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleDiscard = () => {
|
|
||||||
setDraftKeyboardSettings (keyboardSettings)
|
|
||||||
setCapturingActionId (null)
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
onDirtyStateChange?.(hasUnsavedChanges, handleDiscard)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
onDirtyStateChange?.(false, () => { })
|
|
||||||
}
|
|
||||||
}, [handleDiscard, hasUnsavedChanges, onDirtyStateChange])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<section className={sectionClassName}>
|
|
||||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
|
||||||
<div className="space-y-1">
|
|
||||||
<h2 className="text-xl font-bold">キーボード</h2>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => {
|
|
||||||
setDraftKeyboardSettings (current => ({
|
|
||||||
...current,
|
|
||||||
bindings: { },
|
|
||||||
}))
|
|
||||||
}}>
|
|
||||||
すべて既定に戻す
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="destructive"
|
|
||||||
disabled={!(hasUnsavedChanges)}
|
|
||||||
onClick={handleDiscard}>
|
|
||||||
変更を破棄
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
disabled={!(hasUnsavedChanges) || draftConflictActionIds.size > 0}
|
|
||||||
onClick={handleSave}>
|
|
||||||
保存
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<label className="flex items-center gap-2 text-sm">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={draftKeyboardSettings.enabled !== false}
|
|
||||||
onChange={event => {
|
|
||||||
setDraftKeyboardSettings (current => ({
|
|
||||||
...current,
|
|
||||||
enabled: event.target.checked,
|
|
||||||
}))
|
|
||||||
}}/>
|
|
||||||
<span>キーボード・ショートカットを有効にする</span>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
{capturingActionId != null && (
|
|
||||||
<p className="text-sm text-muted-foreground">
|
|
||||||
キー入力待ちです.Escape で取消し,Backspace / Delete で未割当にできます.
|
|
||||||
</p>)}
|
|
||||||
|
|
||||||
<div className="overflow-x-auto">
|
|
||||||
<table className="w-full min-w-[52rem] table-fixed border-collapse text-sm">
|
|
||||||
<thead className="border-b border-border">
|
|
||||||
<tr>
|
|
||||||
<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>
|
|
||||||
<tbody>
|
|
||||||
{rows.map (row => (
|
|
||||||
<tr key={row.id} className="border-b border-border/60 last:border-b-0">
|
|
||||||
<td className="p-2">{row.label}</td>
|
|
||||||
<td className="p-2">{SHORTCUT_SCOPE_LABELS[row.scope]}</td>
|
|
||||||
<td className="p-2 font-mono">
|
|
||||||
{formatKeyBinding (row.currentBinding)}
|
|
||||||
</td>
|
|
||||||
<td className="p-2">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant={capturingActionId === row.id ? 'default' : 'outline'}
|
|
||||||
className="h-8"
|
|
||||||
onClick={() => {
|
|
||||||
setCapturingActionId (
|
|
||||||
capturingActionId === row.id ? null : row.id,
|
|
||||||
)
|
|
||||||
}}>
|
|
||||||
{capturingActionId === row.id ? '入力待ち…' : '変更'}
|
|
||||||
</Button>
|
|
||||||
</td>
|
|
||||||
<td className="p-2">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="ghost"
|
|
||||||
className="h-8"
|
|
||||||
disabled={!(row.hasCustomBinding)}
|
|
||||||
onClick={() => {
|
|
||||||
setDraftKeyboardSettings (current => {
|
|
||||||
const nextBindings = { ...(current.bindings ?? { }) }
|
|
||||||
delete nextBindings[row.id]
|
|
||||||
return {
|
|
||||||
...current,
|
|
||||||
bindings: nextBindings,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}}>
|
|
||||||
既定に戻す
|
|
||||||
</Button>
|
|
||||||
</td>
|
|
||||||
<td className="p-2">
|
|
||||||
{row.hasConflict
|
|
||||||
? <span className="text-red-600 dark:text-red-400">競合あり</span>
|
|
||||||
: 'なし'}
|
|
||||||
</td>
|
|
||||||
</tr>))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</section>)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default KeyboardSettingsSection
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
import {
|
|
||||||
Dialog,
|
|
||||||
DialogContent,
|
|
||||||
DialogDescription,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
|
||||||
} from '@/components/ui/dialog'
|
|
||||||
import {
|
|
||||||
formatKeyBinding,
|
|
||||||
SHORTCUT_DEFINITIONS,
|
|
||||||
SHORTCUT_SCOPE_LABELS,
|
|
||||||
} from '@/lib/keyboardShortcuts'
|
|
||||||
|
|
||||||
import type {
|
|
||||||
KeyBinding,
|
|
||||||
ShortcutActionId,
|
|
||||||
ShortcutScope,
|
|
||||||
} from '@/lib/keyboardShortcuts'
|
|
||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
open: boolean
|
|
||||||
onOpenChange: (open: boolean) => void
|
|
||||||
activeScope: ShortcutScope
|
|
||||||
effectiveBindings: Record<ShortcutActionId, KeyBinding | null>
|
|
||||||
conflictActionIds: Set<ShortcutActionId>
|
|
||||||
availableActionIds: Set<ShortcutActionId>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const ShortcutHelpDialog: FC<Props> = (
|
|
||||||
{
|
|
||||||
open,
|
|
||||||
onOpenChange,
|
|
||||||
activeScope,
|
|
||||||
effectiveBindings,
|
|
||||||
conflictActionIds,
|
|
||||||
availableActionIds,
|
|
||||||
},
|
|
||||||
) => {
|
|
||||||
const rows = SHORTCUT_DEFINITIONS
|
|
||||||
.filter (definition =>
|
|
||||||
definition.scope === 'global' || definition.scope === activeScope)
|
|
||||||
.filter (definition => availableActionIds.has (definition.id))
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
||||||
<DialogContent className="max-w-3xl px-6 pb-6 pt-7">
|
|
||||||
<DialogHeader className="pl-8">
|
|
||||||
<DialogTitle>キーボード・ショートカット</DialogTitle>
|
|
||||||
<DialogDescription>
|
|
||||||
この画面で利用できるショートカットを表示します。
|
|
||||||
</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
|
|
||||||
<div className="overflow-x-auto">
|
|
||||||
<table className="w-full min-w-[40rem] table-fixed border-collapse text-sm">
|
|
||||||
<thead className="border-b border-border">
|
|
||||||
<tr>
|
|
||||||
<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>
|
|
||||||
<tbody>
|
|
||||||
{rows.map (row => (
|
|
||||||
<tr key={row.id} className="border-b border-border/60 last:border-b-0">
|
|
||||||
<td className="p-2">{row.label}</td>
|
|
||||||
<td className="p-2">{SHORTCUT_SCOPE_LABELS[row.scope]}</td>
|
|
||||||
<td className="p-2 font-mono">
|
|
||||||
{formatKeyBinding (effectiveBindings[row.id])}
|
|
||||||
</td>
|
|
||||||
<td className="p-2">
|
|
||||||
{conflictActionIds.has (row.id)
|
|
||||||
? <span className="text-red-600 dark:text-red-400">競合あり</span>
|
|
||||||
: 'なし'}
|
|
||||||
</td>
|
|
||||||
</tr>))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default ShortcutHelpDialog
|
|
||||||
+22
-133
@@ -10,10 +10,6 @@
|
|||||||
{
|
{
|
||||||
--background: 0 0% 100%;
|
--background: 0 0% 100%;
|
||||||
--foreground: 222.2 84% 4.9%;
|
--foreground: 222.2 84% 4.9%;
|
||||||
--card: 0 0% 100%;
|
|
||||||
--card-foreground: 222.2 84% 4.9%;
|
|
||||||
--popover: 0 0% 100%;
|
|
||||||
--popover-foreground: 222.2 84% 4.9%;
|
|
||||||
|
|
||||||
--primary: 222.2 47.4% 11.2%;
|
--primary: 222.2 47.4% 11.2%;
|
||||||
--primary-foreground: 210 40% 98%;
|
--primary-foreground: 210 40% 98%;
|
||||||
@@ -33,40 +29,12 @@
|
|||||||
--border: 214.3 31.8% 91.4%;
|
--border: 214.3 31.8% 91.4%;
|
||||||
--input: 214.3 31.8% 91.4%;
|
--input: 214.3 31.8% 91.4%;
|
||||||
--ring: 222.2 84% 4.9%;
|
--ring: 222.2 84% 4.9%;
|
||||||
--theme-link: 221.2 83.2% 53.3%;
|
|
||||||
--top-nav-root-bg-mobile: #fef08a;
|
|
||||||
--top-nav-root-bg-desktop: #fefce8;
|
|
||||||
--top-nav-active-bg: #fef08a;
|
|
||||||
--top-nav-submenu-bg: #fef08a;
|
|
||||||
--top-nav-mobile-menu-bg: #fef08a;
|
|
||||||
--top-nav-mobile-active-bg: #fefce8;
|
|
||||||
--top-nav-brand-link: #db2777;
|
|
||||||
--top-nav-menu-link: #1d4ed8;
|
|
||||||
|
|
||||||
--tag-colour-deerjikist: #9f1239;
|
|
||||||
--tag-colour-deerjikist-hover: #b62a51;
|
|
||||||
--tag-colour-meme: #6b21a8;
|
|
||||||
--tag-colour-meme-hover: #8238bf;
|
|
||||||
--tag-colour-character: #4d7c0f;
|
|
||||||
--tag-colour-character-hover: #649326;
|
|
||||||
--tag-colour-general: #155e75;
|
|
||||||
--tag-colour-general-hover: #2c758c;
|
|
||||||
--tag-colour-material: #c2410c;
|
|
||||||
--tag-colour-material-hover: #d95823;
|
|
||||||
--tag-colour-meta: #a16207;
|
|
||||||
--tag-colour-meta-hover: #b8791e;
|
|
||||||
--tag-colour-nico: #4b5563;
|
|
||||||
--tag-colour-nico-hover: #626c7a;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark
|
.dark
|
||||||
{
|
{
|
||||||
--background: 222.2 84% 4.9%;
|
--background: 222.2 84% 4.9%;
|
||||||
--foreground: 210 40% 98%;
|
--foreground: 210 40% 98%;
|
||||||
--card: 222.2 84% 4.9%;
|
|
||||||
--card-foreground: 210 40% 98%;
|
|
||||||
--popover: 222.2 84% 4.9%;
|
|
||||||
--popover-foreground: 210 40% 98%;
|
|
||||||
|
|
||||||
--primary: 210 40% 98%;
|
--primary: 210 40% 98%;
|
||||||
--primary-foreground: 222.2 47.4% 11.2%;
|
--primary-foreground: 222.2 47.4% 11.2%;
|
||||||
@@ -86,28 +54,20 @@
|
|||||||
--border: 217.2 32.6% 17.5%;
|
--border: 217.2 32.6% 17.5%;
|
||||||
--input: 217.2 32.6% 17.5%;
|
--input: 217.2 32.6% 17.5%;
|
||||||
--ring: 212.7 26.8% 83.9%;
|
--ring: 212.7 26.8% 83.9%;
|
||||||
--top-nav-root-bg-mobile: #230505;
|
|
||||||
--top-nav-root-bg-desktop: #230505;
|
|
||||||
--top-nav-active-bg: #450a0a;
|
|
||||||
--top-nav-submenu-bg: #450a0a;
|
|
||||||
--top-nav-mobile-menu-bg: #230505;
|
|
||||||
--top-nav-mobile-active-bg: #450a0a;
|
|
||||||
--top-nav-brand-link: #f9a8d4;
|
|
||||||
--top-nav-menu-link: #93c5fd;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
body
|
body
|
||||||
{
|
{
|
||||||
@apply overflow-x-clip bg-background text-foreground;
|
@apply overflow-x-clip;
|
||||||
}
|
}
|
||||||
|
|
||||||
a
|
a
|
||||||
{
|
{
|
||||||
color: hsl(var(--theme-link));
|
@apply text-blue-700 dark:text-blue-300;
|
||||||
}
|
}
|
||||||
a:hover
|
a:hover
|
||||||
{
|
{
|
||||||
color: color-mix(in oklab, hsl(var(--theme-link)), white 18%);
|
@apply text-blue-500 dark:text-blue-100;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,8 +78,8 @@
|
|||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
|
|
||||||
color-scheme: light dark;
|
color-scheme: light dark;
|
||||||
color: hsl(var(--foreground));
|
color: rgba(255, 255, 255, 0.87);
|
||||||
background-color: hsl(var(--background));
|
background-color: #242424;
|
||||||
|
|
||||||
font-synthesis: none;
|
font-synthesis: none;
|
||||||
text-rendering: optimizeLegibility;
|
text-rendering: optimizeLegibility;
|
||||||
@@ -127,23 +87,6 @@
|
|||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
:root[data-animation='reduced'] *,
|
|
||||||
:root[data-animation='off'] *
|
|
||||||
{
|
|
||||||
scroll-behavior: auto !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
:root[data-animation='off'] *,
|
|
||||||
:root[data-animation='off'] *::before,
|
|
||||||
:root[data-animation='off'] *::after
|
|
||||||
{
|
|
||||||
animation-duration: 0ms !important;
|
|
||||||
animation-delay: 0ms !important;
|
|
||||||
animation-iteration-count: 1 !important;
|
|
||||||
transition-duration: 0ms !important;
|
|
||||||
transition-delay: 0ms !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
a
|
a
|
||||||
{
|
{
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
@@ -154,15 +97,28 @@ body
|
|||||||
{
|
{
|
||||||
margin: 0;
|
margin: 0;
|
||||||
min-width: 320px;
|
min-width: 320px;
|
||||||
background: hsl(var(--background));
|
|
||||||
color: hsl(var(--foreground));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#root
|
#root
|
||||||
{
|
{
|
||||||
min-height: 100dvh;
|
min-height: 100dvh;
|
||||||
background: hsl(var(--background));
|
}
|
||||||
color: hsl(var(--foreground));
|
|
||||||
|
@media (prefers-color-scheme: light)
|
||||||
|
{
|
||||||
|
:root
|
||||||
|
{
|
||||||
|
color: #213547;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
a:hover
|
||||||
|
{
|
||||||
|
color: #747bff;
|
||||||
|
}
|
||||||
|
button
|
||||||
|
{
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes wiki-blink
|
@keyframes wiki-blink
|
||||||
@@ -182,73 +138,6 @@ body
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tag-link-colour
|
|
||||||
{
|
|
||||||
color: var(--tag-link-colour);
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-link-hover-colour:hover
|
|
||||||
{
|
|
||||||
color: var(--tag-link-hover-colour) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-root
|
|
||||||
{
|
|
||||||
background: var(--top-nav-root-bg-mobile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 768px)
|
|
||||||
{
|
|
||||||
.top-nav-root
|
|
||||||
{
|
|
||||||
background: var(--top-nav-root-bg-desktop);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-brand-link,
|
|
||||||
.top-nav-mobile-toggle
|
|
||||||
{
|
|
||||||
color: var(--top-nav-brand-link);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-brand-link:hover,
|
|
||||||
.top-nav-mobile-toggle:hover
|
|
||||||
{
|
|
||||||
color: color-mix(in oklab, var(--top-nav-brand-link), white 18%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-menu-link,
|
|
||||||
.top-nav-mobile-row
|
|
||||||
{
|
|
||||||
color: var(--top-nav-menu-link);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-menu-link:hover,
|
|
||||||
.top-nav-mobile-row:hover
|
|
||||||
{
|
|
||||||
color: color-mix(in oklab, var(--top-nav-menu-link), white 18%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-highlight
|
|
||||||
{
|
|
||||||
background: var(--top-nav-active-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-submenu
|
|
||||||
{
|
|
||||||
background: var(--top-nav-submenu-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-mobile-menu
|
|
||||||
{
|
|
||||||
background: var(--top-nav-mobile-menu-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-mobile-active
|
|
||||||
{
|
|
||||||
background: var(--top-nav-mobile-active-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-marquee__animated
|
.tag-marquee__animated
|
||||||
{
|
{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
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'
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
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)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,328 +0,0 @@
|
|||||||
export type ShortcutScope =
|
|
||||||
| 'global'
|
|
||||||
| 'posts'
|
|
||||||
| 'postSearch'
|
|
||||||
| 'tags'
|
|
||||||
| 'settings'
|
|
||||||
| 'wiki'
|
|
||||||
| 'materials'
|
|
||||||
|
|
||||||
export type ShortcutActionId =
|
|
||||||
| 'global.openShortcutHelp'
|
|
||||||
| 'global.focusSearch'
|
|
||||||
| 'navigation.posts'
|
|
||||||
| 'navigation.tags'
|
|
||||||
| 'navigation.materials'
|
|
||||||
| 'navigation.wiki'
|
|
||||||
| 'pagination.next'
|
|
||||||
| 'pagination.previous'
|
|
||||||
| 'settings.account'
|
|
||||||
| 'settings.behavior'
|
|
||||||
| 'settings.theme'
|
|
||||||
| 'settings.keyboard'
|
|
||||||
|
|
||||||
export type KeyBinding = {
|
|
||||||
key: string
|
|
||||||
ctrl?: boolean
|
|
||||||
shift?: boolean
|
|
||||||
alt?: boolean
|
|
||||||
meta?: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ShortcutDefinition = {
|
|
||||||
id: ShortcutActionId
|
|
||||||
label: string
|
|
||||||
scope: ShortcutScope
|
|
||||||
defaultBinding: KeyBinding | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export const SHORTCUT_SCOPE_LABELS: Record<ShortcutScope, string> = {
|
|
||||||
global: '全画面',
|
|
||||||
posts: '広場',
|
|
||||||
postSearch: '広場検索',
|
|
||||||
tags: 'タグ',
|
|
||||||
settings: '設定',
|
|
||||||
wiki: 'Wiki',
|
|
||||||
materials: '素材',
|
|
||||||
}
|
|
||||||
|
|
||||||
export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
|
|
||||||
{
|
|
||||||
id: 'global.openShortcutHelp',
|
|
||||||
label: 'ショートカット一覧を開く',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: '?', shift: true },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'global.focusSearch',
|
|
||||||
label: '検索欄へ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: '/' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'navigation.posts',
|
|
||||||
label: '広場へ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: 'p' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'navigation.tags',
|
|
||||||
label: 'タグへ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: 't' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'navigation.materials',
|
|
||||||
label: '素材へ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: 'm' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'navigation.wiki',
|
|
||||||
label: 'Wiki へ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: 'w' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'pagination.next',
|
|
||||||
label: '次のページへ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: 'ArrowRight' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'pagination.previous',
|
|
||||||
label: '前のページへ移動',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: 'ArrowLeft' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'settings.account',
|
|
||||||
label: '設定: アカウント',
|
|
||||||
scope: 'settings',
|
|
||||||
defaultBinding: { key: '1' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'settings.behavior',
|
|
||||||
label: '設定: 動作',
|
|
||||||
scope: 'settings',
|
|
||||||
defaultBinding: { key: '2' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'settings.theme',
|
|
||||||
label: '設定: テーマ',
|
|
||||||
scope: 'settings',
|
|
||||||
defaultBinding: { key: '3' },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'settings.keyboard',
|
|
||||||
label: '設定: キーボード',
|
|
||||||
scope: 'settings',
|
|
||||||
defaultBinding: { key: '4' },
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
export const SHORTCUT_DEFINITIONS_BY_ID =
|
|
||||||
SHORTCUT_DEFINITIONS.reduce<Record<ShortcutActionId, ShortcutDefinition>> (
|
|
||||||
(definitions, definition) => {
|
|
||||||
definitions[definition.id] = definition
|
|
||||||
return definitions
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'global.openShortcutHelp': SHORTCUT_DEFINITIONS[0],
|
|
||||||
'global.focusSearch': SHORTCUT_DEFINITIONS[1],
|
|
||||||
'navigation.posts': SHORTCUT_DEFINITIONS[2],
|
|
||||||
'navigation.tags': SHORTCUT_DEFINITIONS[3],
|
|
||||||
'navigation.materials': SHORTCUT_DEFINITIONS[4],
|
|
||||||
'navigation.wiki': SHORTCUT_DEFINITIONS[5],
|
|
||||||
'pagination.next': SHORTCUT_DEFINITIONS[6],
|
|
||||||
'pagination.previous': SHORTCUT_DEFINITIONS[7],
|
|
||||||
'settings.account': SHORTCUT_DEFINITIONS[8],
|
|
||||||
'settings.behavior': SHORTCUT_DEFINITIONS[9],
|
|
||||||
'settings.theme': SHORTCUT_DEFINITIONS[10],
|
|
||||||
'settings.keyboard': SHORTCUT_DEFINITIONS[11],
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
export const DEFAULT_KEY_BINDINGS =
|
|
||||||
SHORTCUT_DEFINITIONS.reduce<Record<ShortcutActionId, KeyBinding | null>> (
|
|
||||||
(bindings, definition) => {
|
|
||||||
bindings[definition.id] = definition.defaultBinding
|
|
||||||
return bindings
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'global.openShortcutHelp': null,
|
|
||||||
'global.focusSearch': null,
|
|
||||||
'navigation.posts': null,
|
|
||||||
'navigation.tags': null,
|
|
||||||
'navigation.materials': null,
|
|
||||||
'navigation.wiki': null,
|
|
||||||
'pagination.next': null,
|
|
||||||
'pagination.previous': null,
|
|
||||||
'settings.account': null,
|
|
||||||
'settings.behavior': null,
|
|
||||||
'settings.theme': null,
|
|
||||||
'settings.keyboard': null,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const normaliseKey = (key: string): string => {
|
|
||||||
if (key === 'Spacebar')
|
|
||||||
return ' '
|
|
||||||
if (key.length === 1 && key !== ' ')
|
|
||||||
return key.toLowerCase ()
|
|
||||||
return key
|
|
||||||
}
|
|
||||||
|
|
||||||
const isModifierKey = (key: string): boolean =>
|
|
||||||
key === 'Shift'
|
|
||||||
|| key === 'Control'
|
|
||||||
|| key === 'Alt'
|
|
||||||
|| key === 'Meta'
|
|
||||||
|
|
||||||
export const normaliseKeyBinding = (value: unknown): KeyBinding | null => {
|
|
||||||
if (!(value) || typeof value !== 'object')
|
|
||||||
return null
|
|
||||||
|
|
||||||
const binding = value as Partial<KeyBinding>
|
|
||||||
if (typeof binding.key !== 'string')
|
|
||||||
return null
|
|
||||||
|
|
||||||
const key = normaliseKey (binding.key)
|
|
||||||
if (key.length === 0 || isModifierKey (key))
|
|
||||||
return null
|
|
||||||
|
|
||||||
return {
|
|
||||||
key,
|
|
||||||
...(binding.ctrl ? { ctrl: true } : { }),
|
|
||||||
...(binding.shift ? { shift: true } : { }),
|
|
||||||
...(binding.alt ? { alt: true } : { }),
|
|
||||||
...(binding.meta ? { meta: true } : { }),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const serialiseKeyBinding = (binding: KeyBinding | null): string | null => {
|
|
||||||
if (binding == null)
|
|
||||||
return null
|
|
||||||
|
|
||||||
const parts = [
|
|
||||||
binding.ctrl ? 'Ctrl' : null,
|
|
||||||
binding.shift ? 'Shift' : null,
|
|
||||||
binding.alt ? 'Alt' : null,
|
|
||||||
binding.meta ? 'Meta' : null,
|
|
||||||
binding.key,
|
|
||||||
].filter ((part): part is string => part != null)
|
|
||||||
|
|
||||||
return parts.join ('+')
|
|
||||||
}
|
|
||||||
|
|
||||||
const keyLabel = (key: string): string => {
|
|
||||||
switch (key)
|
|
||||||
{
|
|
||||||
case ' ':
|
|
||||||
return 'Space'
|
|
||||||
|
|
||||||
case 'ArrowLeft':
|
|
||||||
return 'ArrowLeft'
|
|
||||||
|
|
||||||
case 'ArrowRight':
|
|
||||||
return 'ArrowRight'
|
|
||||||
|
|
||||||
case 'ArrowUp':
|
|
||||||
return 'ArrowUp'
|
|
||||||
|
|
||||||
case 'ArrowDown':
|
|
||||||
return 'ArrowDown'
|
|
||||||
|
|
||||||
case 'Escape':
|
|
||||||
return 'Escape'
|
|
||||||
|
|
||||||
case 'Backspace':
|
|
||||||
return 'Backspace'
|
|
||||||
|
|
||||||
case 'Delete':
|
|
||||||
return 'Delete'
|
|
||||||
|
|
||||||
default:
|
|
||||||
return key.length === 1 ? key.toUpperCase () : key
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const formatKeyBinding = (binding: KeyBinding | null): string => {
|
|
||||||
if (binding == null)
|
|
||||||
return '未割当'
|
|
||||||
|
|
||||||
return [
|
|
||||||
binding.ctrl ? 'Ctrl' : null,
|
|
||||||
binding.shift ? 'Shift' : null,
|
|
||||||
binding.alt ? 'Alt' : null,
|
|
||||||
binding.meta ? 'Meta' : null,
|
|
||||||
keyLabel (binding.key),
|
|
||||||
].filter ((part): part is string => part != null)
|
|
||||||
.join (' + ')
|
|
||||||
}
|
|
||||||
|
|
||||||
export const keyBindingFromKeyboardEvent = (
|
|
||||||
event: Pick<KeyboardEvent, 'key' | 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey'>,
|
|
||||||
): KeyBinding | null => {
|
|
||||||
const key = normaliseKey (event.key)
|
|
||||||
if (key.length === 0 || isModifierKey (key))
|
|
||||||
return null
|
|
||||||
|
|
||||||
return {
|
|
||||||
key,
|
|
||||||
...(event.ctrlKey ? { ctrl: true } : { }),
|
|
||||||
...(event.shiftKey ? { shift: true } : { }),
|
|
||||||
...(event.altKey ? { alt: true } : { }),
|
|
||||||
...(event.metaKey ? { meta: true } : { }),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const isEditableEventTarget = (target: EventTarget | null): boolean => {
|
|
||||||
if (!(target instanceof Element))
|
|
||||||
return false
|
|
||||||
|
|
||||||
return target.closest (
|
|
||||||
'input, textarea, select, [contenteditable="true"], [role="textbox"]',
|
|
||||||
) != null
|
|
||||||
}
|
|
||||||
|
|
||||||
export const getConflictingShortcutActionIds = (
|
|
||||||
bindings: Record<ShortcutActionId, KeyBinding | null>,
|
|
||||||
): Set<ShortcutActionId> => {
|
|
||||||
const grouped = new Map<string, ShortcutActionId[]> ()
|
|
||||||
|
|
||||||
Object.entries (bindings).forEach (([actionId, binding]) => {
|
|
||||||
const serialised = serialiseKeyBinding (binding)
|
|
||||||
if (serialised == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
const ids = grouped.get (serialised) ?? []
|
|
||||||
ids.push (actionId as ShortcutActionId)
|
|
||||||
grouped.set (serialised, ids)
|
|
||||||
})
|
|
||||||
|
|
||||||
return new Set (
|
|
||||||
[...grouped.values ()]
|
|
||||||
.filter (actionIds => actionIds.length > 1)
|
|
||||||
.flat (),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export const resolveShortcutScope = (pathname: string): ShortcutScope => {
|
|
||||||
if (pathname.startsWith ('/posts/search'))
|
|
||||||
return 'postSearch'
|
|
||||||
if (pathname.startsWith ('/posts'))
|
|
||||||
return 'posts'
|
|
||||||
if (pathname.startsWith ('/tags'))
|
|
||||||
return 'tags'
|
|
||||||
if (pathname.startsWith ('/users/settings'))
|
|
||||||
return 'settings'
|
|
||||||
if (pathname.startsWith ('/wiki'))
|
|
||||||
return 'wiki'
|
|
||||||
if (pathname.startsWith ('/materials'))
|
|
||||||
return 'materials'
|
|
||||||
return 'global'
|
|
||||||
}
|
|
||||||
|
|
||||||
export const isSpaceBinding = (binding: KeyBinding | null): boolean =>
|
|
||||||
binding?.key === ' '
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
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%)')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -1,26 +0,0 @@
|
|||||||
import { useEffect, useState } from 'react'
|
|
||||||
|
|
||||||
import {
|
|
||||||
CLIENT_SETTINGS_EVENT,
|
|
||||||
getClientBehaviorSettings,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
|
|
||||||
import type { ClientBehaviorSettings } from '@/lib/settings'
|
|
||||||
|
|
||||||
|
|
||||||
export const useClientBehaviourSettings = (): ClientBehaviorSettings => {
|
|
||||||
const [settings, setSettings] =
|
|
||||||
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
const handleClientSettingsChange = () => {
|
|
||||||
setSettings (getClientBehaviorSettings ())
|
|
||||||
}
|
|
||||||
|
|
||||||
window.addEventListener (CLIENT_SETTINGS_EVENT, handleClientSettingsChange)
|
|
||||||
return () =>
|
|
||||||
window.removeEventListener (CLIENT_SETTINGS_EVENT, handleClientSettingsChange)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
return settings
|
|
||||||
}
|
|
||||||
@@ -1,322 +0,0 @@
|
|||||||
import {
|
|
||||||
createContext,
|
|
||||||
useCallback,
|
|
||||||
useContext,
|
|
||||||
useEffect,
|
|
||||||
useMemo,
|
|
||||||
useRef,
|
|
||||||
useState,
|
|
||||||
} from 'react'
|
|
||||||
import { useLocation, useNavigate } from 'react-router-dom'
|
|
||||||
|
|
||||||
import ShortcutHelpDialog from '@/components/users/ShortcutHelpDialog'
|
|
||||||
import {
|
|
||||||
DEFAULT_KEY_BINDINGS,
|
|
||||||
getConflictingShortcutActionIds,
|
|
||||||
isEditableEventTarget,
|
|
||||||
keyBindingFromKeyboardEvent,
|
|
||||||
resolveShortcutScope,
|
|
||||||
serialiseKeyBinding,
|
|
||||||
SHORTCUT_DEFINITIONS,
|
|
||||||
SHORTCUT_SCOPE_LABELS,
|
|
||||||
} from '@/lib/keyboardShortcuts'
|
|
||||||
import {
|
|
||||||
getClientKeyboardSettings,
|
|
||||||
getEffectiveKeyBindings,
|
|
||||||
setClientKeyboardSettings,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
|
|
||||||
import type {
|
|
||||||
KeyBinding,
|
|
||||||
ShortcutActionId,
|
|
||||||
ShortcutScope,
|
|
||||||
} from '@/lib/keyboardShortcuts'
|
|
||||||
import type { ClientKeyboardSettings } from '@/lib/settings'
|
|
||||||
import type { PropsWithChildren } from 'react'
|
|
||||||
|
|
||||||
type ShortcutHandler = () => void
|
|
||||||
type ShortcutHandlers = Partial<Record<ShortcutActionId, ShortcutHandler>>
|
|
||||||
|
|
||||||
type KeyboardShortcutsContextValue = {
|
|
||||||
activeScope: ShortcutScope
|
|
||||||
keyboardSettings: ClientKeyboardSettings
|
|
||||||
effectiveBindings: Record<ShortcutActionId, KeyBinding | null>
|
|
||||||
conflictActionIds: Set<ShortcutActionId>
|
|
||||||
saveKeyboardSettings: (settings: ClientKeyboardSettings) => void
|
|
||||||
registerHandlers: (handlers: ShortcutHandlers) => () => void
|
|
||||||
}
|
|
||||||
|
|
||||||
const KeyboardShortcutsContext =
|
|
||||||
createContext<KeyboardShortcutsContextValue | null> (null)
|
|
||||||
|
|
||||||
|
|
||||||
const isFocusableShortcutTarget = (element: HTMLElement): boolean => {
|
|
||||||
if (element.closest ('[hidden], [aria-hidden="true"]') != null)
|
|
||||||
return false
|
|
||||||
|
|
||||||
if (
|
|
||||||
(element instanceof HTMLInputElement
|
|
||||||
|| element instanceof HTMLButtonElement
|
|
||||||
|| element instanceof HTMLSelectElement
|
|
||||||
|| element instanceof HTMLTextAreaElement)
|
|
||||||
&& element.disabled
|
|
||||||
)
|
|
||||||
return false
|
|
||||||
|
|
||||||
const style = window.getComputedStyle (element)
|
|
||||||
if (
|
|
||||||
style.display === 'none'
|
|
||||||
|| style.visibility === 'hidden'
|
|
||||||
|| style.pointerEvents === 'none'
|
|
||||||
)
|
|
||||||
return false
|
|
||||||
|
|
||||||
return element.getClientRects ().length > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const focusSearchTarget = (): void => {
|
|
||||||
const targets = [
|
|
||||||
...document.querySelectorAll<HTMLElement> (
|
|
||||||
'[data-shortcut-focus-search="true"]',
|
|
||||||
),
|
|
||||||
]
|
|
||||||
const target = targets.find (isFocusableShortcutTarget)
|
|
||||||
|
|
||||||
if (target == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
target.focus ()
|
|
||||||
|
|
||||||
if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement)
|
|
||||||
target.select ()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|
||||||
const location = useLocation ()
|
|
||||||
const navigate = useNavigate ()
|
|
||||||
const { confirmDiscardNavigation } = useUnsavedChangesGuard ()
|
|
||||||
|
|
||||||
const [keyboardSettings, setKeyboardSettingsState] =
|
|
||||||
useState<ClientKeyboardSettings> (() => getClientKeyboardSettings ())
|
|
||||||
const [registeredHandlers, setRegisteredHandlers] =
|
|
||||||
useState<Record<number, ShortcutHandlers>> ({ })
|
|
||||||
const [shortcutHelpOpen, setShortcutHelpOpen] = useState (false)
|
|
||||||
const registrationIdRef = useRef (0)
|
|
||||||
|
|
||||||
const activeScope = useMemo<ShortcutScope> (
|
|
||||||
() => resolveShortcutScope (location.pathname),
|
|
||||||
[location.pathname],
|
|
||||||
)
|
|
||||||
const effectiveBindings = useMemo (
|
|
||||||
() => getEffectiveKeyBindings (keyboardSettings.bindings),
|
|
||||||
[keyboardSettings.bindings],
|
|
||||||
)
|
|
||||||
const conflictActionIds = useMemo (
|
|
||||||
() => getConflictingShortcutActionIds (effectiveBindings),
|
|
||||||
[effectiveBindings],
|
|
||||||
)
|
|
||||||
const mergedRegisteredHandlers = useMemo<ShortcutHandlers> (
|
|
||||||
() => Object.values (registeredHandlers).reduce<ShortcutHandlers> (
|
|
||||||
(handlers, currentHandlers) => ({ ...handlers, ...currentHandlers }),
|
|
||||||
{ },
|
|
||||||
),
|
|
||||||
[registeredHandlers],
|
|
||||||
)
|
|
||||||
|
|
||||||
const saveKeyboardSettings = useCallback ((settings: ClientKeyboardSettings) => {
|
|
||||||
const next = setClientKeyboardSettings (settings)
|
|
||||||
setKeyboardSettingsState (next)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const registerHandlers = useCallback ((handlers: ShortcutHandlers) => {
|
|
||||||
const registrationId = ++registrationIdRef.current
|
|
||||||
|
|
||||||
setRegisteredHandlers (current => ({
|
|
||||||
...current,
|
|
||||||
[registrationId]: handlers,
|
|
||||||
}))
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
setRegisteredHandlers (current => {
|
|
||||||
const next = { ...current }
|
|
||||||
delete next[registrationId]
|
|
||||||
return next
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const guardedNavigate = useCallback ((path: string) => {
|
|
||||||
confirmDiscardNavigation ().then (confirmed => {
|
|
||||||
if (confirmed)
|
|
||||||
navigate (path)
|
|
||||||
})
|
|
||||||
}, [confirmDiscardNavigation, navigate])
|
|
||||||
|
|
||||||
const builtinHandlers = useMemo<ShortcutHandlers> (
|
|
||||||
() => ({
|
|
||||||
'global.openShortcutHelp': () => {
|
|
||||||
setShortcutHelpOpen (true)
|
|
||||||
},
|
|
||||||
'global.focusSearch': () => {
|
|
||||||
focusSearchTarget ()
|
|
||||||
},
|
|
||||||
'navigation.posts': () => guardedNavigate ('/posts'),
|
|
||||||
'navigation.tags': () => guardedNavigate ('/tags'),
|
|
||||||
'navigation.materials': () => guardedNavigate ('/materials'),
|
|
||||||
'navigation.wiki': () => guardedNavigate ('/wiki'),
|
|
||||||
'settings.account': () => guardedNavigate ('/users/settings?tab=account'),
|
|
||||||
'settings.theme': () => guardedNavigate ('/users/settings?tab=theme'),
|
|
||||||
'settings.keyboard': () => guardedNavigate ('/users/settings?tab=keyboard'),
|
|
||||||
'settings.behavior': () => guardedNavigate ('/users/settings?tab=behavior'),
|
|
||||||
}),
|
|
||||||
[guardedNavigate],
|
|
||||||
)
|
|
||||||
|
|
||||||
const availableActionIds = useMemo<Set<ShortcutActionId>> (
|
|
||||||
() => new Set (
|
|
||||||
SHORTCUT_DEFINITIONS
|
|
||||||
.filter (definition =>
|
|
||||||
definition.scope === 'global' || definition.scope === activeScope)
|
|
||||||
.filter (definition =>
|
|
||||||
builtinHandlers[definition.id] != null
|
|
||||||
|| mergedRegisteredHandlers[definition.id] != null)
|
|
||||||
.map (definition => definition.id),
|
|
||||||
),
|
|
||||||
[activeScope, builtinHandlers, mergedRegisteredHandlers],
|
|
||||||
)
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
const onKeyDown = (event: KeyboardEvent) => {
|
|
||||||
if (
|
|
||||||
keyboardSettings.enabled === false
|
|
||||||
|| event.defaultPrevented
|
|
||||||
|| event.isComposing
|
|
||||||
|| event.key === 'Process'
|
|
||||||
|| event.repeat
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
if (isEditableEventTarget (event.target))
|
|
||||||
return
|
|
||||||
|
|
||||||
if (shortcutHelpOpen)
|
|
||||||
return
|
|
||||||
|
|
||||||
const binding = keyBindingFromKeyboardEvent (event)
|
|
||||||
if (binding == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
const serialisedBinding = serialiseKeyBinding (binding)
|
|
||||||
if (serialisedBinding == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
const candidates = SHORTCUT_DEFINITIONS.filter (definition => (
|
|
||||||
definition.scope === 'global'
|
|
||||||
|| definition.scope === activeScope
|
|
||||||
)).filter (definition => {
|
|
||||||
const currentBinding = effectiveBindings[definition.id]
|
|
||||||
return (
|
|
||||||
currentBinding != null
|
|
||||||
&& serialiseKeyBinding (currentBinding) === serialisedBinding
|
|
||||||
)
|
|
||||||
}).filter (definition => !(conflictActionIds.has (definition.id)))
|
|
||||||
|
|
||||||
if (candidates.length !== 1)
|
|
||||||
return
|
|
||||||
|
|
||||||
const actionId = candidates[0].id
|
|
||||||
const handler = mergedRegisteredHandlers[actionId] ?? builtinHandlers[actionId]
|
|
||||||
|
|
||||||
if (handler == null)
|
|
||||||
return
|
|
||||||
|
|
||||||
event.preventDefault ()
|
|
||||||
handler ()
|
|
||||||
}
|
|
||||||
|
|
||||||
document.addEventListener ('keydown', onKeyDown)
|
|
||||||
return () => document.removeEventListener ('keydown', onKeyDown)
|
|
||||||
}, [
|
|
||||||
activeScope,
|
|
||||||
conflictActionIds,
|
|
||||||
effectiveBindings,
|
|
||||||
builtinHandlers,
|
|
||||||
keyboardSettings.enabled,
|
|
||||||
mergedRegisteredHandlers,
|
|
||||||
shortcutHelpOpen,
|
|
||||||
])
|
|
||||||
|
|
||||||
const value = useMemo<KeyboardShortcutsContextValue> (() => ({
|
|
||||||
activeScope,
|
|
||||||
keyboardSettings,
|
|
||||||
effectiveBindings,
|
|
||||||
conflictActionIds,
|
|
||||||
saveKeyboardSettings,
|
|
||||||
registerHandlers,
|
|
||||||
}), [
|
|
||||||
activeScope,
|
|
||||||
conflictActionIds,
|
|
||||||
effectiveBindings,
|
|
||||||
keyboardSettings,
|
|
||||||
registerHandlers,
|
|
||||||
saveKeyboardSettings,
|
|
||||||
])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<KeyboardShortcutsContext.Provider value={value}>
|
|
||||||
{children}
|
|
||||||
<ShortcutHelpDialog
|
|
||||||
open={shortcutHelpOpen}
|
|
||||||
onOpenChange={setShortcutHelpOpen}
|
|
||||||
activeScope={activeScope}
|
|
||||||
effectiveBindings={effectiveBindings}
|
|
||||||
conflictActionIds={conflictActionIds}
|
|
||||||
availableActionIds={availableActionIds}/>
|
|
||||||
</KeyboardShortcutsContext.Provider>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const useKeyboardShortcutSettings = (): KeyboardShortcutsContextValue => {
|
|
||||||
const context = useContext (KeyboardShortcutsContext)
|
|
||||||
|
|
||||||
if (context == null)
|
|
||||||
throw new Error ('KeyboardShortcutsProvider が必要です.')
|
|
||||||
|
|
||||||
return context
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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 (stableHandlers),
|
|
||||||
[registerHandlers, stableHandlers],
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export {
|
|
||||||
DEFAULT_KEY_BINDINGS,
|
|
||||||
SHORTCUT_DEFINITIONS,
|
|
||||||
SHORTCUT_SCOPE_LABELS,
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
import { createContext, useCallback, useContext, useMemo, useState } from 'react'
|
|
||||||
|
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
|
|
||||||
import type { FC, PropsWithChildren } from 'react'
|
|
||||||
|
|
||||||
type UnsavedChangesSource = {
|
|
||||||
dirty: boolean
|
|
||||||
discard: () => void | Promise<void> }
|
|
||||||
|
|
||||||
type UnsavedChangesGuardContextValue = {
|
|
||||||
hasUnsavedChanges: boolean
|
|
||||||
registerUnsavedChangesSource: (
|
|
||||||
source: UnsavedChangesSource | null,
|
|
||||||
) => void
|
|
||||||
confirmDiscardNavigation: () => Promise<boolean> }
|
|
||||||
|
|
||||||
const UnsavedChangesGuardContext =
|
|
||||||
createContext<UnsavedChangesGuardContextValue | null> (null)
|
|
||||||
|
|
||||||
|
|
||||||
export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children }) => {
|
|
||||||
const dialogue = useDialogue ()
|
|
||||||
const [source, setSource] = useState<UnsavedChangesSource | null> (null)
|
|
||||||
|
|
||||||
const registerUnsavedChangesSource = useCallback ((
|
|
||||||
nextSource: UnsavedChangesSource | null,
|
|
||||||
) => {
|
|
||||||
setSource (nextSource)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const confirmDiscardNavigation = useCallback (async (): Promise<boolean> => {
|
|
||||||
if (!(source?.dirty))
|
|
||||||
return true
|
|
||||||
|
|
||||||
const confirmed = await dialogue.confirm ({
|
|
||||||
title: '未保存の変更があります',
|
|
||||||
description: 'このまま移動すると、保存していない変更は失われます。',
|
|
||||||
cancelText: 'このページに残る',
|
|
||||||
confirmText: '変更を破棄して移動',
|
|
||||||
variant: 'danger' })
|
|
||||||
if (!(confirmed))
|
|
||||||
return false
|
|
||||||
|
|
||||||
await source.discard ()
|
|
||||||
return true
|
|
||||||
}, [dialogue, source])
|
|
||||||
|
|
||||||
const value = useMemo<UnsavedChangesGuardContextValue> (() => ({
|
|
||||||
hasUnsavedChanges: source?.dirty === true,
|
|
||||||
registerUnsavedChangesSource,
|
|
||||||
confirmDiscardNavigation,
|
|
||||||
}), [confirmDiscardNavigation, registerUnsavedChangesSource, source?.dirty])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<UnsavedChangesGuardContext.Provider value={value}>
|
|
||||||
{children}
|
|
||||||
</UnsavedChangesGuardContext.Provider>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const useUnsavedChangesGuard = (): UnsavedChangesGuardContextValue => {
|
|
||||||
const context = useContext (UnsavedChangesGuardContext)
|
|
||||||
|
|
||||||
if (context == null)
|
|
||||||
throw new Error ('UnsavedChangesGuardProvider が必要です.')
|
|
||||||
|
|
||||||
return context
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import { HelmetProvider } from 'react-helmet-async'
|
|||||||
|
|
||||||
import '@/index.css'
|
import '@/index.css'
|
||||||
import App from '@/App'
|
import App from '@/App'
|
||||||
import { applyClientAnimationMode, getClientAnimationMode } from '@/lib/settings'
|
|
||||||
|
|
||||||
const helmetContext = { }
|
const helmetContext = { }
|
||||||
|
|
||||||
@@ -14,8 +13,6 @@ const client = new QueryClient ({
|
|||||||
gcTime: 30 * 60 * 1000,
|
gcTime: 30 * 60 * 1000,
|
||||||
retry: 1 } } })
|
retry: 1 } } })
|
||||||
|
|
||||||
applyClientAnimationMode (getClientAnimationMode ())
|
|
||||||
|
|
||||||
createRoot (document.getElementById ('root')!).render (
|
createRoot (document.getElementById ('root')!).render (
|
||||||
<HelmetProvider context={helmetContext}>
|
<HelmetProvider context={helmetContext}>
|
||||||
<QueryClientProvider client={client}>
|
<QueryClientProvider client={client}>
|
||||||
|
|||||||
@@ -24,11 +24,6 @@ import { recoverCandidatePosts } from '@/lib/gekanatorCandidateRecovery'
|
|||||||
import { isQuestionHardFilteredAfterAnswers,
|
import { isQuestionHardFilteredAfterAnswers,
|
||||||
monthForCondition } from '@/lib/gekanatorQuestionFilters'
|
monthForCondition } from '@/lib/gekanatorQuestionFilters'
|
||||||
import { gekanatorKeys } from '@/lib/queryKeys'
|
import { gekanatorKeys } from '@/lib/queryKeys'
|
||||||
import {
|
|
||||||
getClientGekanatorBackgroundMotion,
|
|
||||||
setClientGekanatorBackgroundMotion,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -190,6 +185,7 @@ const softenedAnswerWeight = .35
|
|||||||
const confidenceTemperature = 6
|
const confidenceTemperature = 6
|
||||||
const gameStorageKey = 'gekanator:game:v1'
|
const gameStorageKey = 'gekanator:game:v1'
|
||||||
const recentGamesStorageKey = 'gekanator:recent-games:v1'
|
const recentGamesStorageKey = 'gekanator:recent-games:v1'
|
||||||
|
const backgroundMotionStorageKey = 'gekanator:background-motion:v1'
|
||||||
const maxStoredRecentGames = 12
|
const maxStoredRecentGames = 12
|
||||||
const specialOriginalMonthDayLabels: Record<string, string> = {
|
const specialOriginalMonthDayLabels: Record<string, string> = {
|
||||||
'1-1': '元日',
|
'1-1': '元日',
|
||||||
@@ -433,13 +429,18 @@ const storeRecentGameSummary = (
|
|||||||
|
|
||||||
|
|
||||||
const loadBackgroundMotionMode = (): BackgroundMotionMode => {
|
const loadBackgroundMotionMode = (): BackgroundMotionMode => {
|
||||||
|
const fallbackMode = 'on'
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return getClientGekanatorBackgroundMotion ()
|
const raw = localStorage.getItem (backgroundMotionStorageKey)
|
||||||
|
if (raw === 'off' || raw === 'calm' || raw === 'on')
|
||||||
|
return raw
|
||||||
|
|
||||||
|
return fallbackMode
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
return 'on'
|
return fallbackMode
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3678,8 +3679,6 @@ const expectedAnswerFor = (
|
|||||||
|
|
||||||
|
|
||||||
const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const storedGame = useMemo (loadStoredGame, [])
|
const storedGame = useMemo (loadStoredGame, [])
|
||||||
const hasStoredRestore = storedGame != null && isStoredPhase (storedGame.phase)
|
const hasStoredRestore = storedGame != null && isStoredPhase (storedGame.phase)
|
||||||
const queryClient = useQueryClient ()
|
const queryClient = useQueryClient ()
|
||||||
@@ -3917,7 +3916,7 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
|||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
setClientGekanatorBackgroundMotion (backgroundMotionMode)
|
localStorage.setItem (backgroundMotionStorageKey, backgroundMotionMode)
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -4072,12 +4071,9 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
|||||||
return reviewGuessedPostId === reviewCorrectPostId
|
return reviewGuessedPostId === reviewCorrectPostId
|
||||||
}) ()
|
}) ()
|
||||||
const effectiveBackgroundMotionMode = (() => {
|
const effectiveBackgroundMotionMode = (() => {
|
||||||
if (animationMode === 'off')
|
|
||||||
return 'off'
|
|
||||||
|
|
||||||
if (backgroundMotionMode === 'off')
|
if (backgroundMotionMode === 'off')
|
||||||
return 'off'
|
return 'off'
|
||||||
if (animationMode === 'reduced' || prefersReducedMotion)
|
if (prefersReducedMotion)
|
||||||
return 'calm'
|
return 'calm'
|
||||||
|
|
||||||
return backgroundMotionMode
|
return backgroundMotionMode
|
||||||
|
|||||||
@@ -6,11 +6,9 @@ import type { FC } from 'react'
|
|||||||
|
|
||||||
|
|
||||||
const MaterialBasePage: FC = () => (
|
const MaterialBasePage: FC = () => (
|
||||||
<div
|
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
||||||
data-sidebar-container
|
|
||||||
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
|
||||||
<MaterialSidebar/>
|
<MaterialSidebar/>
|
||||||
<Outlet/>
|
<Outlet/>
|
||||||
</div>)
|
</div>)
|
||||||
|
|
||||||
export default MaterialBasePage
|
export default MaterialBasePage
|
||||||
@@ -9,18 +9,14 @@ import PageTitle from '@/components/common/PageTitle'
|
|||||||
import Pagination from '@/components/common/Pagination'
|
import Pagination from '@/components/common/Pagination'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchMaterialChanges } from '@/lib/materials'
|
import { fetchMaterialChanges } from '@/lib/materials'
|
||||||
import { materialsKeys } from '@/lib/queryKeys'
|
import { materialsKeys } from '@/lib/queryKeys'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { dateString, inputClass } from '@/lib/utils'
|
import { dateString, inputClass } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent } from 'react'
|
||||||
|
|
||||||
|
|
||||||
const MaterialHistoryPage: FC = () => {
|
const MaterialHistoryPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
@@ -59,9 +55,8 @@ const MaterialHistoryPage: FC = () => {
|
|||||||
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search])
|
||||||
}, [animationMode, location.search])
|
|
||||||
|
|
||||||
const handleSearch = (event: FormEvent) => {
|
const handleSearch = (event: FormEvent) => {
|
||||||
event.preventDefault ()
|
event.preventDefault ()
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ const MaterialNewPage: FC = () => {
|
|||||||
<FieldError messages={baseErrors}/>
|
<FieldError messages={baseErrors}/>
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<FormField label="タグ" messages={fieldErrors.tag}>
|
<FormField label="タグ" messages={fieldErrors.tag}>
|
||||||
{({ describedBy, invalid }) => (
|
{({ describedBy, invalid }) => (
|
||||||
<TagInput
|
<TagInput
|
||||||
describedBy={describedBy}
|
describedBy={describedBy}
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import { SITE_TITLE } from '@/config'
|
|||||||
import { isApiError } from '@/lib/api'
|
import { isApiError } from '@/lib/api'
|
||||||
import { fetchPost, toggleViewedFlg } from '@/lib/posts'
|
import { fetchPost, toggleViewedFlg } from '@/lib/posts'
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { canEditContent } from '@/lib/users'
|
import { canEditContent } from '@/lib/users'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import NotFound from '@/pages/NotFound'
|
import NotFound from '@/pages/NotFound'
|
||||||
@@ -30,17 +29,7 @@ type Props = { user: User | null }
|
|||||||
|
|
||||||
const PostDetailPage: FC<Props> = ({ user }) => {
|
const PostDetailPage: FC<Props> = ({ user }) => {
|
||||||
const editable = canEditContent (user)
|
const editable = canEditContent (user)
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal'
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const { id } = useParams ()
|
const { id } = useParams ()
|
||||||
const heroLayoutId = animationMode === 'off' ? undefined : `page-${ id }`
|
|
||||||
const heroTransition =
|
|
||||||
animationMode === 'off'
|
|
||||||
? { duration: 0 }
|
|
||||||
: animationMode === 'reduced'
|
|
||||||
? { duration: .08, ease: 'linear' as const }
|
|
||||||
: { duration: .2, ease: 'easeOut' as const }
|
|
||||||
const postId = String (id ?? '')
|
const postId = String (id ?? '')
|
||||||
const postKey = postsKeys.show (postId)
|
const postKey = postsKeys.show (postId)
|
||||||
|
|
||||||
@@ -103,16 +92,16 @@ const PostDetailPage: FC<Props> = ({ user }) => {
|
|||||||
: 'bg-gray-500 hover:bg-gray-600')
|
: 'bg-gray-500 hover:bg-gray-600')
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
||||||
data-sidebar-container
|
|
||||||
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
|
||||||
<Helmet>
|
<Helmet>
|
||||||
{(post?.thumbnail || post?.thumbnailBase) && (
|
{(post?.thumbnail || post?.thumbnailBase) && (
|
||||||
<meta name="thumbnail" content={post.thumbnail! || post.thumbnailBase!}/>)}
|
<meta name="thumbnail" content={post.thumbnail! || post.thumbnailBase!}/>)}
|
||||||
{post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
|
{post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
{post && <TagDetailSidebar post={post} className="hidden md:block"/>}
|
<div className="hidden md:block">
|
||||||
|
{post && <TagDetailSidebar post={post}/>}
|
||||||
|
</div>
|
||||||
|
|
||||||
<MainArea className="relative">
|
<MainArea className="relative">
|
||||||
{post
|
{post
|
||||||
@@ -145,19 +134,17 @@ const PostDetailPage: FC<Props> = ({ user }) => {
|
|||||||
</div>)
|
</div>)
|
||||||
})}
|
})}
|
||||||
|
|
||||||
{thumbnailMode !== 'off' && (post.thumbnail || post.thumbnailBase) && (
|
{(post.thumbnail || post.thumbnailBase) && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={heroLayoutId}
|
layoutId={`page-${ id }`}
|
||||||
className="absolute top-4 left-4 w-[min(640px,calc(100vw-2rem))] h-[360px]
|
className="absolute top-4 left-4 w-[min(640px,calc(100vw-2rem))] h-[360px]
|
||||||
overflow-hidden rounded-xl pointer-events-none z-50"
|
overflow-hidden rounded-xl pointer-events-none z-50"
|
||||||
initial={{ opacity: 1 }}
|
initial={{ opacity: 1 }}
|
||||||
animate={{ opacity: 0 }}
|
animate={{ opacity: 0 }}
|
||||||
transition={heroTransition}>
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
<img src={post.thumbnail || post.thumbnailBase || undefined}
|
<img src={post.thumbnail || post.thumbnailBase || undefined}
|
||||||
alt={post.title || post.url}
|
alt={post.title || post.url}
|
||||||
title={post.title || post.url || undefined}
|
title={post.title || post.url || undefined}
|
||||||
loading={thumbnailMode === 'light' ? 'lazy' : 'eager'}
|
|
||||||
decoding="async"
|
|
||||||
className="object-cover w-full h-full"/>
|
className="object-cover w-full h-full"/>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
|
|
||||||
@@ -192,7 +179,9 @@ const PostDetailPage: FC<Props> = ({ user }) => {
|
|||||||
: 'Loading...'}
|
: 'Loading...'}
|
||||||
</MainArea>
|
</MainArea>
|
||||||
|
|
||||||
{post && <TagDetailSidebar post={post} sp className="md:hidden"/>}
|
<div className="md:hidden">
|
||||||
|
{post && <TagDetailSidebar post={post} sp/>}
|
||||||
|
</div>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,12 +12,9 @@ import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { clientAnimationTransition,
|
|
||||||
clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchPostChanges, updatePost } from '@/lib/posts'
|
import { fetchPostChanges, updatePost } from '@/lib/posts'
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTag } from '@/lib/tags'
|
import { fetchTag } from '@/lib/tags'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
@@ -40,12 +37,6 @@ const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
|||||||
|
|
||||||
const PostHistoryPage: FC = () => {
|
const PostHistoryPage: FC = () => {
|
||||||
const dialogue = useDialogue ()
|
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 location = useLocation ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
@@ -122,9 +113,8 @@ const PostHistoryPage: FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search])
|
||||||
}, [animationMode, location.search])
|
|
||||||
|
|
||||||
const layoutIds: string[] = []
|
const layoutIds: string[] = []
|
||||||
|
|
||||||
@@ -208,8 +198,8 @@ const PostHistoryPage: FC = () => {
|
|||||||
rowSpan={rowsCnt}>
|
rowSpan={rowsCnt}>
|
||||||
<PrefetchLink to={`/posts/${ change.postId }`}>
|
<PrefetchLink to={`/posts/${ change.postId }`}>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off' ? undefined : layoutId}
|
layoutId={layoutId}
|
||||||
transition={{ layout: layoutTransition }}>
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
<img src={change.thumbnail.current
|
<img src={change.thumbnail.current
|
||||||
|| change.thumbnailBase.current
|
|| change.thumbnailBase.current
|
||||||
|| undefined}
|
|| undefined}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
import { describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import PostListPage from '@/pages/posts/PostListPage'
|
import PostListPage from '@/pages/posts/PostListPage'
|
||||||
import { buildPost, buildTag, buildWikiPage } from '@/test/factories'
|
import { buildPost, buildTag, buildWikiPage } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
|
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
const postsApi = vi.hoisted (() => ({
|
||||||
fetchPosts: vi.fn (),
|
fetchPosts: vi.fn (),
|
||||||
@@ -19,11 +18,6 @@ vi.mock ('@/lib/posts', () => postsApi)
|
|||||||
vi.mock ('@/lib/wiki', () => wikiApi)
|
vi.mock ('@/lib/wiki', () => wikiApi)
|
||||||
|
|
||||||
describe ('PostListPage', () => {
|
describe ('PostListPage', () => {
|
||||||
beforeEach (() => {
|
|
||||||
localStorage.clear ()
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('loads posts from the current query and renders the plaza tab', async () => {
|
it ('loads posts from the current query and renders the plaza tab', async () => {
|
||||||
const tag = buildTag ({ name: '虹夏' })
|
const tag = buildTag ({ name: '虹夏' })
|
||||||
postsApi.fetchPosts.mockResolvedValueOnce ({
|
postsApi.fetchPosts.mockResolvedValueOnce ({
|
||||||
@@ -42,7 +36,6 @@ describe ('PostListPage', () => {
|
|||||||
match: 'all',
|
match: 'all',
|
||||||
page: 2,
|
page: 2,
|
||||||
limit: 20,
|
limit: 20,
|
||||||
order: 'original_created_at:desc',
|
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -78,36 +71,4 @@ describe ('PostListPage', () => {
|
|||||||
'/wiki/%E8%99%B9%E5%A4%8F',
|
'/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 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useQuery } from '@tanstack/react-query'
|
import { useQuery } from '@tanstack/react-query'
|
||||||
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
|
import { useLayoutEffect, useMemo, useRef, useState } from 'react'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
import { useLocation, useNavigate } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import PostList from '@/components/PostList'
|
import PostList from '@/components/PostList'
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
@@ -13,24 +13,12 @@ import MainArea from '@/components/layout/MainArea'
|
|||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { fetchPosts } from '@/lib/posts'
|
import { fetchPosts } from '@/lib/posts'
|
||||||
import { postsKeys } from '@/lib/queryKeys'
|
import { postsKeys } from '@/lib/queryKeys'
|
||||||
import {
|
|
||||||
DEFAULT_POST_LIST_LIMIT,
|
|
||||||
getClientListLimit,
|
|
||||||
LIST_LIMIT_OPTIONS,
|
|
||||||
setClientListSettings,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
|
||||||
import { fetchWikiPageByTitle } from '@/lib/wiki'
|
import { fetchWikiPageByTitle } from '@/lib/wiki'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
import type { WikiPage } from '@/types'
|
import type { WikiPage } from '@/types'
|
||||||
|
|
||||||
const parseLimit = (value: string | null): 20 | 50 | 100 | null => {
|
|
||||||
const n = Number (value)
|
|
||||||
return n === 20 || n === 50 || n === 100 ? n : null
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const PostListPage: FC = () => {
|
const PostListPage: FC = () => {
|
||||||
const containerRef = useRef<HTMLDivElement | null> (null)
|
const containerRef = useRef<HTMLDivElement | null> (null)
|
||||||
@@ -38,7 +26,6 @@ const PostListPage: FC = () => {
|
|||||||
const [wikiPage, setWikiPage] = useState<WikiPage | null> (null)
|
const [wikiPage, setWikiPage] = useState<WikiPage | null> (null)
|
||||||
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
const tagsQuery = query.get ('tags') ?? ''
|
const tagsQuery = query.get ('tags') ?? ''
|
||||||
const anyFlg = query.get ('match') === 'any'
|
const anyFlg = query.get ('match') === 'any'
|
||||||
@@ -46,18 +33,13 @@ const PostListPage: FC = () => {
|
|||||||
const tags = useMemo (() => tagsQuery.split (' ').filter (e => e !== ''), [tagsQuery])
|
const tags = useMemo (() => tagsQuery.split (' ').filter (e => e !== ''), [tagsQuery])
|
||||||
const tagsKey = tags.join (' ')
|
const tagsKey = tags.join (' ')
|
||||||
const page = Number (query.get ('page') ?? 1)
|
const page = Number (query.get ('page') ?? 1)
|
||||||
const limit = (
|
const limit = Number (query.get ('limit') ?? 20)
|
||||||
parseLimit (query.get ('limit'))
|
|
||||||
?? getClientListLimit ('postList')
|
|
||||||
?? DEFAULT_POST_LIST_LIMIT
|
|
||||||
)
|
|
||||||
const order = 'original_created_at:desc' as const
|
|
||||||
|
|
||||||
const keys = {
|
const keys = {
|
||||||
tags: tagsKey, match, page, limit,
|
tags: tagsKey, match, page, limit,
|
||||||
url: '', title: '', originalCreatedFrom: '', originalCreatedTo: '',
|
url: '', title: '', originalCreatedFrom: '', originalCreatedTo: '',
|
||||||
createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '',
|
createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '',
|
||||||
order } as const
|
order: 'original_created_at:desc' } as const
|
||||||
const { data, isLoading: loading } = useQuery ({
|
const { data, isLoading: loading } = useQuery ({
|
||||||
queryKey: postsKeys.index (keys),
|
queryKey: postsKeys.index (keys),
|
||||||
queryFn: () => fetchPosts (keys) })
|
queryFn: () => fetchPosts (keys) })
|
||||||
@@ -65,40 +47,6 @@ const PostListPage: FC = () => {
|
|||||||
const cursor = ''
|
const cursor = ''
|
||||||
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
setClientListSettings ('postList', { limit })
|
|
||||||
}, [limit])
|
|
||||||
|
|
||||||
const updatePage = (nextPage: number) => {
|
|
||||||
const params = new URLSearchParams (location.search)
|
|
||||||
params.set ('page', String (Math.max (1, nextPage)))
|
|
||||||
navigate (`${ location.pathname }?${ params.toString () }`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateListQuery = (next: { limit?: 20 | 50 | 100 }) => {
|
|
||||||
const params = new URLSearchParams (location.search)
|
|
||||||
params.set ('limit', String (next.limit ?? limit))
|
|
||||||
params.set ('page', '1')
|
|
||||||
navigate (`${ location.pathname }?${ params.toString () }`)
|
|
||||||
}
|
|
||||||
|
|
||||||
useKeyboardShortcuts (useMemo (() => ({
|
|
||||||
...(page > 1
|
|
||||||
? {
|
|
||||||
'pagination.previous': () => {
|
|
||||||
updatePage (page - 1)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { }),
|
|
||||||
...(totalPages > 0 && page < totalPages
|
|
||||||
? {
|
|
||||||
'pagination.next': () => {
|
|
||||||
updatePage (Math.min (page + 1, totalPages))
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { }),
|
|
||||||
}), [page, totalPages, location.search]))
|
|
||||||
|
|
||||||
useLayoutEffect (() => {
|
useLayoutEffect (() => {
|
||||||
scroll (0, 0)
|
scroll (0, 0)
|
||||||
|
|
||||||
@@ -122,7 +70,6 @@ const PostListPage: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
data-sidebar-container
|
|
||||||
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden"
|
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden"
|
||||||
ref={containerRef}>
|
ref={containerRef}>
|
||||||
<Helmet>
|
<Helmet>
|
||||||
@@ -142,24 +89,7 @@ const PostListPage: FC = () => {
|
|||||||
}}/>
|
}}/>
|
||||||
|
|
||||||
<MainArea>
|
<MainArea>
|
||||||
<TabGroup
|
<TabGroup>
|
||||||
rightAddon={
|
|
||||||
<label className="flex items-center gap-2 text-xs text-muted-foreground">
|
|
||||||
<span>件数</span>
|
|
||||||
<select
|
|
||||||
className="rounded border border-border bg-background px-2 py-1 text-sm
|
|
||||||
text-foreground"
|
|
||||||
value={limit}
|
|
||||||
onChange={ev => updateListQuery ({
|
|
||||||
limit: Number (ev.target.value) as 20 | 50 | 100,
|
|
||||||
})}>
|
|
||||||
{LIST_LIMIT_OPTIONS.map (value => (
|
|
||||||
<option key={value} value={value}>
|
|
||||||
{value}
|
|
||||||
</option>))}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
}>
|
|
||||||
<Tab name="広場">
|
<Tab name="広場">
|
||||||
{posts.length > 0
|
{posts.length > 0
|
||||||
? (
|
? (
|
||||||
|
|||||||
@@ -30,12 +30,16 @@ describe ('PostNewPage', () => {
|
|||||||
expect (screen.getByText ('403')).toBeInTheDocument ()
|
expect (screen.getByText ('403')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('submits a new post with manual title and thumbnail fetch UI', async () => {
|
it ('submits a new post with manual title and thumbnail settings', async () => {
|
||||||
api.apiPost.mockResolvedValueOnce ({})
|
api.apiPost.mockResolvedValueOnce ({})
|
||||||
api.apiGet.mockResolvedValue ([])
|
api.apiGet.mockResolvedValue ([])
|
||||||
|
|
||||||
renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
|
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')
|
const textboxes = screen.getAllByRole ('textbox')
|
||||||
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
||||||
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
||||||
@@ -93,6 +97,10 @@ describe ('PostNewPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
|
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')
|
const textboxes = screen.getAllByRole ('textbox')
|
||||||
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
||||||
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
||||||
|
|||||||
@@ -41,13 +41,16 @@ const PostNewPage: FC<Props> = ({ user }) => {
|
|||||||
const [parentPostIds, setParentPostIds] = useState ('')
|
const [parentPostIds, setParentPostIds] = useState ('')
|
||||||
const [tags, setTags] = useState ('')
|
const [tags, setTags] = useState ('')
|
||||||
const [duration, setDuration] = useState ('')
|
const [duration, setDuration] = useState ('')
|
||||||
|
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
||||||
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
||||||
const [thumbnailLoading, setThumbnailLoading] = useState (false)
|
const [thumbnailLoading, setThumbnailLoading] = useState (false)
|
||||||
const [thumbnailPreview, setThumbnailPreview] = useState<string> ('')
|
const [thumbnailPreview, setThumbnailPreview] = useState<string> ('')
|
||||||
const [title, setTitle] = useState ('')
|
const [title, setTitle] = useState ('')
|
||||||
|
const [titleAutoFlg, setTitleAutoFlg] = useState (true)
|
||||||
const [titleLoading, setTitleLoading] = useState (false)
|
const [titleLoading, setTitleLoading] = useState (false)
|
||||||
const [url, setURL] = useState ('')
|
const [url, setURL] = useState ('')
|
||||||
|
|
||||||
|
const previousURLRef = useRef ('')
|
||||||
const thumbnailPreviewRef = useRef ('')
|
const thumbnailPreviewRef = useRef ('')
|
||||||
const videoFlg =
|
const videoFlg =
|
||||||
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
|
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
|
||||||
@@ -83,17 +86,23 @@ const PostNewPage: FC<Props> = ({ user }) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleURLBlur = () => {
|
||||||
|
if (!(url) || url === previousURLRef.current)
|
||||||
|
return
|
||||||
|
|
||||||
|
if (titleAutoFlg)
|
||||||
|
fetchTitle ()
|
||||||
|
if (thumbnailAutoFlg)
|
||||||
|
fetchThumbnail ()
|
||||||
|
previousURLRef.current = url
|
||||||
|
}
|
||||||
|
|
||||||
const fetchTitle = useCallback (async () => {
|
const fetchTitle = useCallback (async () => {
|
||||||
|
setTitle ('')
|
||||||
setTitleLoading (true)
|
setTitleLoading (true)
|
||||||
try
|
const data = await apiGet<{ title: string }> ('/preview/title', { params: { url } })
|
||||||
{
|
setTitle (data.title || '')
|
||||||
const data = await apiGet<{ title: string }> ('/preview/title', { params: { url } })
|
setTitleLoading (false)
|
||||||
setTitle (data.title || '')
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
setTitleLoading (false)
|
|
||||||
}
|
|
||||||
}, [url])
|
}, [url])
|
||||||
|
|
||||||
const fetchThumbnail = useCallback (async () => {
|
const fetchThumbnail = useCallback (async () => {
|
||||||
@@ -102,26 +111,30 @@ const PostNewPage: FC<Props> = ({ user }) => {
|
|||||||
setThumbnailLoading (true)
|
setThumbnailLoading (true)
|
||||||
if (thumbnailPreviewRef.current)
|
if (thumbnailPreviewRef.current)
|
||||||
URL.revokeObjectURL (thumbnailPreviewRef.current)
|
URL.revokeObjectURL (thumbnailPreviewRef.current)
|
||||||
try
|
const data = await apiGet<Blob> ('/preview/thumbnail',
|
||||||
{
|
{ params: { url }, responseType: 'blob' })
|
||||||
const data = await apiGet<Blob> ('/preview/thumbnail',
|
const imageURL = URL.createObjectURL (data)
|
||||||
{ params: { url }, responseType: 'blob' })
|
setThumbnailPreview (imageURL)
|
||||||
const imageURL = URL.createObjectURL (data)
|
setThumbnailFile (new File ([data],
|
||||||
setThumbnailPreview (imageURL)
|
'thumbnail.png',
|
||||||
setThumbnailFile (new File ([data],
|
{ type: data.type || 'image/png' }))
|
||||||
'thumbnail.png',
|
setThumbnailLoading (false)
|
||||||
{ type: data.type || 'image/png' }))
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
setThumbnailLoading (false)
|
|
||||||
}
|
|
||||||
}, [url])
|
}, [url])
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
thumbnailPreviewRef.current = thumbnailPreview
|
thumbnailPreviewRef.current = thumbnailPreview
|
||||||
}, [thumbnailPreview])
|
}, [thumbnailPreview])
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
if (titleAutoFlg && url)
|
||||||
|
fetchTitle ()
|
||||||
|
}, [fetchTitle, titleAutoFlg, url])
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
if (thumbnailAutoFlg && url)
|
||||||
|
fetchThumbnail ()
|
||||||
|
}, [fetchThumbnail, thumbnailAutoFlg, url])
|
||||||
|
|
||||||
if (!(editable))
|
if (!(editable))
|
||||||
return <Forbidden/>
|
return <Forbidden/>
|
||||||
|
|
||||||
@@ -143,62 +156,59 @@ const PostNewPage: FC<Props> = ({ user }) => {
|
|||||||
onChange={e => setURL (e.target.value)}
|
onChange={e => setURL (e.target.value)}
|
||||||
aria-describedby={describedBy}
|
aria-describedby={describedBy}
|
||||||
aria-invalid={invalid}
|
aria-invalid={invalid}
|
||||||
className={inputClass (invalid)}/>)}
|
className={inputClass (invalid)}
|
||||||
|
onBlur={handleURLBlur}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
{/* タイトル */}
|
{/* タイトル */}
|
||||||
<FormField label="タイトル" messages={fieldErrors.title}>
|
<FormField
|
||||||
|
checkBox={{
|
||||||
|
label: '自動',
|
||||||
|
checked: titleAutoFlg,
|
||||||
|
onChange: ev => setTitleAutoFlg (ev.target.checked)}}
|
||||||
|
label="タイトル"
|
||||||
|
messages={fieldErrors.title}>
|
||||||
{({ describedBy, invalid }) => (
|
{({ describedBy, invalid }) => (
|
||||||
<div className="space-y-2">
|
<input type="text"
|
||||||
<input type="text"
|
aria-describedby={describedBy}
|
||||||
aria-describedby={describedBy}
|
aria-invalid={invalid}
|
||||||
aria-invalid={invalid}
|
className={inputClass (invalid)}
|
||||||
className={inputClass (invalid)}
|
value={title}
|
||||||
value={title}
|
placeholder={titleLoading ? 'Loading...' : ''}
|
||||||
placeholder={titleLoading ? 'Loading...' : ''}
|
onChange={ev => setTitle (ev.target.value)}
|
||||||
onChange={ev => setTitle (ev.target.value)}
|
disabled={titleAutoFlg}/>)}
|
||||||
disabled={titleLoading}/>
|
|
||||||
<div className="flex flex-wrap items-center gap-2 text-sm">
|
|
||||||
<span>必要なタイミングで URL から取得できます.</span>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => void fetchTitle ()}
|
|
||||||
disabled={!(url) || titleLoading}>
|
|
||||||
取得
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>)}
|
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
{/* サムネール */}
|
{/* サムネール */}
|
||||||
<FormField label="サムネール" messages={fieldErrors.thumbnail}>
|
<FormField
|
||||||
|
checkBox={{
|
||||||
|
label: '自動',
|
||||||
|
checked: thumbnailAutoFlg,
|
||||||
|
onChange: ev => setThumbnailAutoFlg (ev.target.checked)}}
|
||||||
|
label="サムネール"
|
||||||
|
messages={fieldErrors.thumbnail}>
|
||||||
{({ describedBy, invalid }) => (
|
{({ describedBy, invalid }) => (
|
||||||
<>
|
<>
|
||||||
<div className="mb-2 flex flex-wrap items-center gap-2 text-sm">
|
{thumbnailAutoFlg
|
||||||
<span>必要なタイミングで URL から取得できます.</span>
|
? (thumbnailLoading
|
||||||
<Button
|
? <p className="text-gray-500 text-sm">Loading...</p>
|
||||||
type="button"
|
: !(thumbnailPreview) && (
|
||||||
variant="outline"
|
<p className="text-gray-500 text-sm">
|
||||||
onClick={() => void fetchThumbnail ()}
|
URL から自動取得されます。
|
||||||
disabled={!(url) || thumbnailLoading}>
|
</p>))
|
||||||
取得
|
: (
|
||||||
</Button>
|
<input type="file"
|
||||||
</div>
|
accept="image/*"
|
||||||
{thumbnailLoading && (
|
aria-describedby={describedBy}
|
||||||
<p className="text-gray-500 text-sm">Loading...</p>)}
|
aria-invalid={invalid}
|
||||||
<input type="file"
|
onChange={e => {
|
||||||
accept="image/*"
|
const file = e.target.files?.[0]
|
||||||
aria-describedby={describedBy}
|
if (file)
|
||||||
aria-invalid={invalid}
|
{
|
||||||
onChange={e => {
|
setThumbnailFile (file)
|
||||||
const file = e.target.files?.[0]
|
setThumbnailPreview (URL.createObjectURL (file))
|
||||||
if (file)
|
}
|
||||||
{
|
}}/>)}
|
||||||
setThumbnailFile (file)
|
|
||||||
setThumbnailPreview (URL.createObjectURL (file))
|
|
||||||
}
|
|
||||||
}}/>
|
|
||||||
{thumbnailPreview && (
|
{thumbnailPreview && (
|
||||||
<img src={thumbnailPreview}
|
<img src={thumbnailPreview}
|
||||||
alt="preview"
|
alt="preview"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import PostSearchPage from '@/pages/posts/PostSearchPage'
|
import PostSearchPage from '@/pages/posts/PostSearchPage'
|
||||||
import { buildPost, buildTag } from '@/test/factories'
|
import { buildPost, buildTag } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
|
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
const postsApi = vi.hoisted (() => ({
|
||||||
fetchPosts: vi.fn (),
|
fetchPosts: vi.fn (),
|
||||||
@@ -19,7 +18,6 @@ vi.mock ('@/lib/api', () => api)
|
|||||||
|
|
||||||
describe ('PostSearchPage', () => {
|
describe ('PostSearchPage', () => {
|
||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
localStorage.clear ()
|
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
api.apiGet.mockResolvedValue ([])
|
api.apiGet.mockResolvedValue ([])
|
||||||
})
|
})
|
||||||
@@ -42,7 +40,6 @@ describe ('PostSearchPage', () => {
|
|||||||
tags: 'x',
|
tags: 'x',
|
||||||
match: 'any',
|
match: 'any',
|
||||||
page: 2,
|
page: 2,
|
||||||
limit: 20,
|
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -84,41 +81,4 @@ describe ('PostSearchPage', () => {
|
|||||||
|
|
||||||
expect (await screen.findByText ('結果ないよ(笑)')).toBeInTheDocument ()
|
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 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -14,20 +14,8 @@ import Pagination from '@/components/common/Pagination'
|
|||||||
import TagInput from '@/components/common/TagInput'
|
import TagInput from '@/components/common/TagInput'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { clientAnimationTransition,
|
|
||||||
clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchPosts } from '@/lib/posts'
|
import { fetchPosts } from '@/lib/posts'
|
||||||
import { postsKeys } from '@/lib/queryKeys'
|
import { postsKeys } from '@/lib/queryKeys'
|
||||||
import {
|
|
||||||
DEFAULT_POST_LIST_LIMIT,
|
|
||||||
DEFAULT_POST_LIST_ORDER,
|
|
||||||
getClientListLimit,
|
|
||||||
getClientListOrder,
|
|
||||||
LIST_LIMIT_OPTIONS,
|
|
||||||
setClientListSettings,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
|
||||||
import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
|
import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent } from 'react'
|
||||||
@@ -43,40 +31,8 @@ const setIf = (qs: URLSearchParams, k: string, v: string | null) => {
|
|||||||
qs.set (k, t)
|
qs.set (k, t)
|
||||||
}
|
}
|
||||||
|
|
||||||
const parseLimit = (value: string | null): 20 | 50 | 100 | null => {
|
|
||||||
const n = Number (value)
|
|
||||||
return n === 20 || n === 50 || n === 100 ? n : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const parseOrder = (value: string | null): FetchPostsOrder | null => {
|
|
||||||
switch (value)
|
|
||||||
{
|
|
||||||
case 'title:asc':
|
|
||||||
case 'title:desc':
|
|
||||||
case 'url:asc':
|
|
||||||
case 'url:desc':
|
|
||||||
case 'original_created_at:asc':
|
|
||||||
case 'original_created_at:desc':
|
|
||||||
case 'created_at:asc':
|
|
||||||
case 'created_at:desc':
|
|
||||||
case 'updated_at:asc':
|
|
||||||
case 'updated_at:desc':
|
|
||||||
return value
|
|
||||||
|
|
||||||
default:
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const PostSearchPage: FC = () => {
|
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 location = useLocation ()
|
||||||
|
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
@@ -85,11 +41,7 @@ const PostSearchPage: FC = () => {
|
|||||||
[location.search])
|
[location.search])
|
||||||
|
|
||||||
const page = Number (query.get ('page') ?? 1)
|
const page = Number (query.get ('page') ?? 1)
|
||||||
const limit = (
|
const limit = Number (query.get ('limit') ?? 20)
|
||||||
parseLimit (query.get ('limit'))
|
|
||||||
?? getClientListLimit ('postSearch')
|
|
||||||
?? DEFAULT_POST_LIST_LIMIT
|
|
||||||
)
|
|
||||||
|
|
||||||
const qURL = query.get ('url') ?? ''
|
const qURL = query.get ('url') ?? ''
|
||||||
const qTitle = query.get ('title') ?? ''
|
const qTitle = query.get ('title') ?? ''
|
||||||
@@ -101,11 +53,7 @@ const PostSearchPage: FC = () => {
|
|||||||
const qCreatedTo = query.get ('created_to') ?? ''
|
const qCreatedTo = query.get ('created_to') ?? ''
|
||||||
const qUpdatedFrom = query.get ('updated_from') ?? ''
|
const qUpdatedFrom = query.get ('updated_from') ?? ''
|
||||||
const qUpdatedTo = query.get ('updated_to') ?? ''
|
const qUpdatedTo = query.get ('updated_to') ?? ''
|
||||||
const order = (
|
const order = (query.get ('order') || 'original_created_at:desc') as FetchPostsOrder
|
||||||
parseOrder (query.get ('order'))
|
|
||||||
?? getClientListOrder<FetchPostsOrder> ('postSearch')
|
|
||||||
?? DEFAULT_POST_LIST_ORDER
|
|
||||||
)
|
|
||||||
|
|
||||||
const [createdFrom, setCreatedFrom] = useState<string | null> (null)
|
const [createdFrom, setCreatedFrom] = useState<string | null> (null)
|
||||||
const [createdTo, setCreatedTo] = useState<string | null> (null)
|
const [createdTo, setCreatedTo] = useState<string | null> (null)
|
||||||
@@ -135,10 +83,6 @@ const PostSearchPage: FC = () => {
|
|||||||
const results = data?.posts ?? []
|
const results = data?.posts ?? []
|
||||||
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
setClientListSettings ('postSearch', { limit, order })
|
|
||||||
}, [limit, order])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
setURL (qURL ?? '')
|
setURL (qURL ?? '')
|
||||||
setTitle (qTitle ?? '')
|
setTitle (qTitle ?? '')
|
||||||
@@ -151,11 +95,9 @@ const PostSearchPage: FC = () => {
|
|||||||
setUpdatedFrom (qUpdatedFrom)
|
setUpdatedFrom (qUpdatedFrom)
|
||||||
setUpdatedTo (qUpdatedTo)
|
setUpdatedTo (qUpdatedTo)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search, qCreatedFrom, qCreatedTo, qMatch, qOriginalCreatedFrom,
|
||||||
}, [animationMode, location.search, qCreatedFrom, qCreatedTo, qMatch,
|
qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom, qUpdatedTo, qURL])
|
||||||
qOriginalCreatedFrom, qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom,
|
|
||||||
qUpdatedTo, qURL])
|
|
||||||
|
|
||||||
const search = async () => {
|
const search = async () => {
|
||||||
const qs = new URLSearchParams ()
|
const qs = new URLSearchParams ()
|
||||||
@@ -171,22 +113,6 @@ const PostSearchPage: FC = () => {
|
|||||||
qs.set ('match', matchType)
|
qs.set ('match', matchType)
|
||||||
qs.set ('page', '1')
|
qs.set ('page', '1')
|
||||||
qs.set ('order', order)
|
qs.set ('order', order)
|
||||||
qs.set ('limit', String (limit))
|
|
||||||
navigate (`${ location.pathname }?${ qs.toString () }`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateListQuery = (next: { limit?: 20 | 50 | 100
|
|
||||||
order?: FetchPostsOrder }) => {
|
|
||||||
const qs = new URLSearchParams (location.search)
|
|
||||||
qs.set ('limit', String (next.limit ?? limit))
|
|
||||||
qs.set ('order', next.order ?? order)
|
|
||||||
qs.set ('page', '1')
|
|
||||||
navigate (`${ location.pathname }?${ qs.toString () }`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatePage = (nextPage: number) => {
|
|
||||||
const qs = new URLSearchParams (location.search)
|
|
||||||
qs.set ('page', String (Math.max (1, nextPage)))
|
|
||||||
navigate (`${ location.pathname }?${ qs.toString () }`)
|
navigate (`${ location.pathname }?${ qs.toString () }`)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,23 +121,6 @@ const PostSearchPage: FC = () => {
|
|||||||
search ()
|
search ()
|
||||||
}
|
}
|
||||||
|
|
||||||
useKeyboardShortcuts (useMemo (() => ({
|
|
||||||
...(page > 1
|
|
||||||
? {
|
|
||||||
'pagination.previous': () => {
|
|
||||||
updatePage (page - 1)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { }),
|
|
||||||
...(totalPages > 0 && page < totalPages
|
|
||||||
? {
|
|
||||||
'pagination.next': () => {
|
|
||||||
updatePage (Math.min (page + 1, totalPages))
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { }),
|
|
||||||
}), [page, totalPages, location.search]))
|
|
||||||
|
|
||||||
const defaultDirection = { title: 'asc',
|
const defaultDirection = { title: 'asc',
|
||||||
url: 'asc',
|
url: 'asc',
|
||||||
original_created_at: 'desc',
|
original_created_at: 'desc',
|
||||||
@@ -225,24 +134,7 @@ const PostSearchPage: FC = () => {
|
|||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="max-w-xl">
|
<div className="max-w-xl">
|
||||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
<PageTitle>広場検索</PageTitle>
|
||||||
<PageTitle>広場検索</PageTitle>
|
|
||||||
<label className="flex items-center gap-2 text-xs text-muted-foreground">
|
|
||||||
<span>件数</span>
|
|
||||||
<select
|
|
||||||
className="rounded border border-border bg-background px-2 py-1 text-sm
|
|
||||||
text-foreground"
|
|
||||||
value={limit}
|
|
||||||
onChange={ev => updateListQuery ({
|
|
||||||
limit: Number (ev.target.value) as 20 | 50 | 100,
|
|
||||||
})}>
|
|
||||||
{LIST_LIMIT_OPTIONS.map (value => (
|
|
||||||
<option key={value} value={value}>
|
|
||||||
{value}
|
|
||||||
</option>))}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form onSubmit={handleSearch} className="space-y-2">
|
<form onSubmit={handleSearch} className="space-y-2">
|
||||||
{/* タイトル */}
|
{/* タイトル */}
|
||||||
@@ -250,7 +142,6 @@ const PostSearchPage: FC = () => {
|
|||||||
{({ invalid }) => (
|
{({ invalid }) => (
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
data-shortcut-focus-search="true"
|
|
||||||
value={title}
|
value={title}
|
||||||
onChange={e => setTitle (e.target.value)}
|
onChange={e => setTitle (e.target.value)}
|
||||||
className={inputClass (invalid)}/>)}
|
className={inputClass (invalid)}/>)}
|
||||||
@@ -270,7 +161,6 @@ const PostSearchPage: FC = () => {
|
|||||||
<FormField label="タグ">
|
<FormField label="タグ">
|
||||||
{() => (
|
{() => (
|
||||||
<TagInput
|
<TagInput
|
||||||
includeNico={true}
|
|
||||||
value={tagsStr}
|
value={tagsStr}
|
||||||
setValue={setTagsStr}/>)}
|
setValue={setTagsStr}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
@@ -406,16 +296,15 @@ const PostSearchPage: FC = () => {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{results.map (row => (
|
{results.map (row => (
|
||||||
<tr
|
<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
|
||||||
key={row.id}
|
|
||||||
className="even:bg-gray-100 dark:even:bg-gray-700">
|
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
<PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
|
<PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off'
|
layoutId={`page-${ row.id }`}
|
||||||
? undefined
|
transition={{ type: 'spring',
|
||||||
: `page-${ row.id }`}
|
stiffness: 500,
|
||||||
transition={thumbnailTransition}>
|
damping: 40,
|
||||||
|
mass: .5 }}>
|
||||||
<img src={row.thumbnail || row.thumbnailBase || undefined}
|
<img src={row.thumbnail || row.thumbnailBase || undefined}
|
||||||
alt={row.title || row.url}
|
alt={row.title || row.url}
|
||||||
title={row.title || row.url || undefined}
|
title={row.title || row.url || undefined}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { dateString } from '@/lib/utils'
|
|||||||
import { buildTag, buildUser } from '@/test/factories'
|
import { buildTag, buildUser } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
|
|
||||||
import type { ReactNode } from 'react'
|
|
||||||
import type { NicoTag } from '@/types'
|
import type { NicoTag } from '@/types'
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
const api = vi.hoisted (() => ({
|
||||||
@@ -28,7 +27,6 @@ const scrollIntoView = vi.fn ()
|
|||||||
vi.mock ('@/lib/api', () => api)
|
vi.mock ('@/lib/api', () => api)
|
||||||
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
||||||
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
||||||
default: ({ children }: { children: ReactNode }) => <>{children}</>,
|
|
||||||
useDialogue: () => dialogue,
|
useDialogue: () => dialogue,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,8 @@ import { toast } from '@/components/ui/use-toast'
|
|||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
import { extractValidationError } from '@/lib/apiErrors'
|
import { extractValidationError } from '@/lib/apiErrors'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { tagsKeys } from '@/lib/queryKeys'
|
import { tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchNicoTags } from '@/lib/tags'
|
import { fetchNicoTags } from '@/lib/tags'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn, dateString, inputClass } from '@/lib/utils'
|
import { cn, dateString, inputClass } from '@/lib/utils'
|
||||||
import { canEditContent } from '@/lib/users'
|
import { canEditContent } from '@/lib/users'
|
||||||
|
|
||||||
@@ -40,8 +38,6 @@ const setIf = (qs: URLSearchParams, key: string, value: string) => {
|
|||||||
|
|
||||||
|
|
||||||
const NicoTagListPage: FC<Props> = ({ user }) => {
|
const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
@@ -156,9 +152,8 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
|||||||
setLinkStatus (qLinkStatus)
|
setLinkStatus (qLinkStatus)
|
||||||
setEditingId (null)
|
setEditingId (null)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search, qLinkedTag, qLinkStatus, qName])
|
||||||
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
if (!(data))
|
if (!(data))
|
||||||
|
|||||||
@@ -11,10 +11,8 @@ import { toast } from '@/components/ui/use-toast'
|
|||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { CATEGORY_NAMES } from '@/consts'
|
import { CATEGORY_NAMES } from '@/consts'
|
||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTagChanges } from '@/lib/tags'
|
import { fetchTagChanges } from '@/lib/tags'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn, dateString } from '@/lib/utils'
|
import { cn, dateString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -45,8 +43,6 @@ const renderStateDiff = (diff: { current: string | null; prev: string | null })
|
|||||||
|
|
||||||
|
|
||||||
const TagHistoryPage: FC = () => {
|
const TagHistoryPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
const id = query.get ('id')
|
const id = query.get ('id')
|
||||||
@@ -62,9 +58,8 @@ const TagHistoryPage: FC = () => {
|
|||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search])
|
||||||
}, [animationMode, location.search])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MainArea>
|
<MainArea>
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
import { describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import TagListPage from '@/pages/tags/TagListPage'
|
import TagListPage from '@/pages/tags/TagListPage'
|
||||||
import { buildTag } from '@/test/factories'
|
import { buildTag } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
|
|
||||||
|
|
||||||
const tagsApi = vi.hoisted (() => ({
|
const tagsApi = vi.hoisted (() => ({
|
||||||
fetchTags: vi.fn (),
|
fetchTags: vi.fn (),
|
||||||
@@ -13,11 +12,6 @@ const tagsApi = vi.hoisted (() => ({
|
|||||||
vi.mock ('@/lib/tags', () => tagsApi)
|
vi.mock ('@/lib/tags', () => tagsApi)
|
||||||
|
|
||||||
describe ('TagListPage', () => {
|
describe ('TagListPage', () => {
|
||||||
beforeEach (() => {
|
|
||||||
localStorage.clear ()
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('loads tags from URL filters and renders the results table', async () => {
|
it ('loads tags from URL filters and renders the results table', async () => {
|
||||||
tagsApi.fetchTags.mockResolvedValueOnce ({
|
tagsApi.fetchTags.mockResolvedValueOnce ({
|
||||||
tags: [buildTag ({
|
tags: [buildTag ({
|
||||||
@@ -44,8 +38,6 @@ describe ('TagListPage', () => {
|
|||||||
name: '虹',
|
name: '虹',
|
||||||
category: 'character',
|
category: 'character',
|
||||||
page: 3,
|
page: 3,
|
||||||
limit: 20,
|
|
||||||
order: 'post_count:desc',
|
|
||||||
postCountGTE: 5,
|
postCountGTE: 5,
|
||||||
deprecated: true,
|
deprecated: true,
|
||||||
}),
|
}),
|
||||||
@@ -56,7 +48,7 @@ describe ('TagListPage', () => {
|
|||||||
'/tags/7',
|
'/tags/7',
|
||||||
)
|
)
|
||||||
expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
|
expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
|
||||||
expect (screen.getAllByRole ('combobox')[2]).toHaveValue ('1')
|
expect (screen.getAllByRole ('combobox')[1]).toHaveValue ('1')
|
||||||
expect (screen.getAllByText ('廃止')).toHaveLength (2)
|
expect (screen.getAllByText ('廃止')).toHaveLength (2)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -66,7 +58,7 @@ describe ('TagListPage', () => {
|
|||||||
renderWithProviders (<TagListPage/>, { route: '/tags' })
|
renderWithProviders (<TagListPage/>, { route: '/tags' })
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '虹夏' } })
|
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '虹夏' } })
|
||||||
fireEvent.change (screen.getAllByRole ('combobox')[1], {
|
fireEvent.change (screen.getAllByRole ('combobox')[0], {
|
||||||
target: { value: 'character' },
|
target: { value: 'character' },
|
||||||
})
|
})
|
||||||
fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
|
fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
|
||||||
@@ -90,41 +82,4 @@ describe ('TagListPage', () => {
|
|||||||
|
|
||||||
expect (await screen.findByText ('結果ないよ(笑)')).toBeInTheDocument ()
|
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 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -13,18 +13,7 @@ import Pagination from '@/components/common/Pagination'
|
|||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { tagsKeys } from '@/lib/queryKeys'
|
import { tagsKeys } from '@/lib/queryKeys'
|
||||||
import {
|
|
||||||
DEFAULT_POST_LIST_LIMIT,
|
|
||||||
DEFAULT_TAG_LIST_ORDER,
|
|
||||||
getClientListLimit,
|
|
||||||
getClientListOrder,
|
|
||||||
LIST_LIMIT_OPTIONS,
|
|
||||||
setClientListSettings,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
|
||||||
import { fetchTags } from '@/lib/tags'
|
import { fetchTags } from '@/lib/tags'
|
||||||
import { dateString, inputClass } from '@/lib/utils'
|
import { dateString, inputClass } from '@/lib/utils'
|
||||||
|
|
||||||
@@ -46,35 +35,8 @@ const boolFromQuery = (value: string | null): boolean =>
|
|||||||
|
|
||||||
const tagStateLabel = (deprecatedAt: string | null) => deprecatedAt ? '廃止' : ''
|
const tagStateLabel = (deprecatedAt: string | null) => deprecatedAt ? '廃止' : ''
|
||||||
|
|
||||||
const parseLimit = (value: string | null): 20 | 50 | 100 | null => {
|
|
||||||
const n = Number (value)
|
|
||||||
return n === 20 || n === 50 || n === 100 ? n : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const parseOrder = (value: string | null): FetchTagsOrder | null => {
|
|
||||||
switch (value)
|
|
||||||
{
|
|
||||||
case 'name:asc':
|
|
||||||
case 'name:desc':
|
|
||||||
case 'category:asc':
|
|
||||||
case 'category:desc':
|
|
||||||
case 'post_count:asc':
|
|
||||||
case 'post_count:desc':
|
|
||||||
case 'created_at:asc':
|
|
||||||
case 'created_at:desc':
|
|
||||||
case 'updated_at:asc':
|
|
||||||
case 'updated_at:desc':
|
|
||||||
return value
|
|
||||||
|
|
||||||
default:
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const TagListPage: FC = () => {
|
const TagListPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
@@ -82,11 +44,7 @@ const TagListPage: FC = () => {
|
|||||||
const query = useMemo (() => new URLSearchParams (location.search), [location.search])
|
const query = useMemo (() => new URLSearchParams (location.search), [location.search])
|
||||||
|
|
||||||
const page = Number (query.get ('page') ?? 1)
|
const page = Number (query.get ('page') ?? 1)
|
||||||
const limit = (
|
const limit = Number (query.get ('limit') ?? 20)
|
||||||
parseLimit (query.get ('limit'))
|
|
||||||
?? getClientListLimit ('tagList')
|
|
||||||
?? DEFAULT_POST_LIST_LIMIT
|
|
||||||
)
|
|
||||||
|
|
||||||
const qName = query.get ('name') ?? ''
|
const qName = query.get ('name') ?? ''
|
||||||
const qCategory = (query.get ('category') || null) as Category | null
|
const qCategory = (query.get ('category') || null) as Category | null
|
||||||
@@ -100,11 +58,7 @@ const TagListPage: FC = () => {
|
|||||||
const qDeprecated = query.has ('deprecated')
|
const qDeprecated = query.has ('deprecated')
|
||||||
? boolFromQuery (query.get ('deprecated'))
|
? boolFromQuery (query.get ('deprecated'))
|
||||||
: null
|
: null
|
||||||
const order = (
|
const order = (query.get ('order') || 'post_count:desc') as FetchTagsOrder
|
||||||
parseOrder (query.get ('order'))
|
|
||||||
?? getClientListOrder<FetchTagsOrder> ('tagList')
|
|
||||||
?? DEFAULT_TAG_LIST_ORDER
|
|
||||||
)
|
|
||||||
|
|
||||||
const [name, setName] = useState ('')
|
const [name, setName] = useState ('')
|
||||||
const [category, setCategory] = useState<Category | null> (null)
|
const [category, setCategory] = useState<Category | null> (null)
|
||||||
@@ -134,10 +88,6 @@ const TagListPage: FC = () => {
|
|||||||
const results = data?.tags ?? []
|
const results = data?.tags ?? []
|
||||||
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
setClientListSettings ('tagList', { limit, order })
|
|
||||||
}, [limit, order])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
setName (qName)
|
setName (qName)
|
||||||
setCategory (qCategory)
|
setCategory (qCategory)
|
||||||
@@ -149,11 +99,9 @@ const TagListPage: FC = () => {
|
|||||||
setUpdatedTo (qUpdatedTo)
|
setUpdatedTo (qUpdatedTo)
|
||||||
setDeprecated (qDeprecated)
|
setDeprecated (qDeprecated)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search, qCategory, qCreatedFrom, qCreatedTo, qName, qPostCountGTE,
|
||||||
}, [animationMode, location.search, qCategory, qCreatedFrom, qCreatedTo,
|
qPostCountLTE, qUpdatedFrom, qUpdatedTo, qDeprecated])
|
||||||
qName, qPostCountGTE, qPostCountLTE, qUpdatedFrom, qUpdatedTo,
|
|
||||||
qDeprecated])
|
|
||||||
|
|
||||||
const handleSearch = (e: FormEvent) => {
|
const handleSearch = (e: FormEvent) => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
@@ -173,49 +121,16 @@ const TagListPage: FC = () => {
|
|||||||
qs.set ('deprecated', deprecated ? '1' : '0')
|
qs.set ('deprecated', deprecated ? '1' : '0')
|
||||||
qs.set ('page', '1')
|
qs.set ('page', '1')
|
||||||
qs.set ('order', order)
|
qs.set ('order', order)
|
||||||
qs.set ('limit', String (limit))
|
|
||||||
|
|
||||||
navigate (`${ location.pathname }?${ qs.toString () }`)
|
navigate (`${ location.pathname }?${ qs.toString () }`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const updateListQuery = (next: { limit?: 20 | 50 | 100
|
|
||||||
order?: FetchTagsOrder }) => {
|
|
||||||
const qs = new URLSearchParams (location.search)
|
|
||||||
qs.set ('limit', String (next.limit ?? limit))
|
|
||||||
qs.set ('order', next.order ?? order)
|
|
||||||
qs.set ('page', '1')
|
|
||||||
navigate (`${ location.pathname }?${ qs.toString () }`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatePage = (nextPage: number) => {
|
|
||||||
const qs = new URLSearchParams (location.search)
|
|
||||||
qs.set ('page', String (Math.max (1, nextPage)))
|
|
||||||
navigate (`${ location.pathname }?${ qs.toString () }`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const defaultDirection = { name: 'asc',
|
const defaultDirection = { name: 'asc',
|
||||||
category: 'asc',
|
category: 'asc',
|
||||||
post_count: 'desc',
|
post_count: 'desc',
|
||||||
created_at: 'desc',
|
created_at: 'desc',
|
||||||
updated_at: 'desc' } as const
|
updated_at: 'desc' } as const
|
||||||
|
|
||||||
useKeyboardShortcuts (useMemo (() => ({
|
|
||||||
...(page > 1
|
|
||||||
? {
|
|
||||||
'pagination.previous': () => {
|
|
||||||
updatePage (page - 1)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { }),
|
|
||||||
...(totalPages > 0 && page < totalPages
|
|
||||||
? {
|
|
||||||
'pagination.next': () => {
|
|
||||||
updatePage (Math.min (page + 1, totalPages))
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: { }),
|
|
||||||
}), [page, totalPages, location.search]))
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MainArea>
|
<MainArea>
|
||||||
<Helmet>
|
<Helmet>
|
||||||
@@ -223,24 +138,7 @@ const TagListPage: FC = () => {
|
|||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="max-w-xl">
|
<div className="max-w-xl">
|
||||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
<PageTitle>タグ</PageTitle>
|
||||||
<PageTitle>タグ</PageTitle>
|
|
||||||
<label className="flex items-center gap-2 text-xs text-muted-foreground">
|
|
||||||
<span>件数</span>
|
|
||||||
<select
|
|
||||||
value={limit}
|
|
||||||
onChange={ev => updateListQuery ({
|
|
||||||
limit: Number (ev.target.value) as 20 | 50 | 100,
|
|
||||||
})}
|
|
||||||
className="rounded border border-border bg-background px-2 py-1 text-sm
|
|
||||||
text-foreground">
|
|
||||||
{LIST_LIMIT_OPTIONS.map (value => (
|
|
||||||
<option key={value} value={value}>
|
|
||||||
{value}
|
|
||||||
</option>))}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form onSubmit={handleSearch} className="space-y-2">
|
<form onSubmit={handleSearch} className="space-y-2">
|
||||||
{/* 名前 */}
|
{/* 名前 */}
|
||||||
@@ -248,7 +146,6 @@ const TagListPage: FC = () => {
|
|||||||
{({ invalid }) => (
|
{({ invalid }) => (
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
data-shortcut-focus-search="true"
|
|
||||||
value={name}
|
value={name}
|
||||||
onChange={e => setName (e.target.value)}
|
onChange={e => setName (e.target.value)}
|
||||||
className={inputClass (invalid)}/>)}
|
className={inputClass (invalid)}/>)}
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ const postEmbed = vi.hoisted (() => ({
|
|||||||
vi.mock ('@/lib/api', () => api)
|
vi.mock ('@/lib/api', () => api)
|
||||||
vi.mock ('@/lib/posts', () => postsApi)
|
vi.mock ('@/lib/posts', () => postsApi)
|
||||||
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
||||||
default: ({ children }: { children: ReactNode }) => <>{children}</>,
|
|
||||||
useDialogue: () => dialogue,
|
useDialogue: () => dialogue,
|
||||||
}))
|
}))
|
||||||
vi.mock ('@/components/PostEmbed', () => ({
|
vi.mock ('@/components/PostEmbed', () => ({
|
||||||
@@ -106,20 +105,6 @@ const tagSection = (): HTMLElement =>
|
|||||||
screen.getAllByRole ('heading', { name: 'タグ' })[0].closest ('section')!
|
screen.getAllByRole ('heading', { name: 'タグ' })[0].closest ('section')!
|
||||||
|
|
||||||
const mockDefaultApi = () => {
|
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) => {
|
api.apiGet.mockImplementation ((path: string) => {
|
||||||
switch (path)
|
switch (path)
|
||||||
{
|
{
|
||||||
@@ -127,17 +112,13 @@ const mockDefaultApi = () => {
|
|||||||
return Promise.resolve (theatre)
|
return Promise.resolve (theatre)
|
||||||
|
|
||||||
case '/theatres/7/comments':
|
case '/theatres/7/comments':
|
||||||
if (commentsFetched)
|
|
||||||
return Promise.resolve ([])
|
|
||||||
|
|
||||||
commentsFetched = true
|
|
||||||
return Promise.resolve ([
|
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':
|
case '/theatres/7/programmes':
|
||||||
@@ -155,22 +136,32 @@ const mockDefaultApi = () => {
|
|||||||
switch (path)
|
switch (path)
|
||||||
{
|
{
|
||||||
case '/theatres/7/watching':
|
case '/theatres/7/watching':
|
||||||
return Promise.resolve (currentTheatreInfo)
|
return Promise.resolve (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,
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
|
||||||
case '/theatres/7/skip_vote':
|
case '/theatres/7/skip_vote':
|
||||||
currentTheatreInfo = buildTheatreInfo ({
|
return Promise.resolve (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:
|
default:
|
||||||
return Promise.reject (new Error (`Unexpected PUT ${ path }`))
|
return Promise.reject (new Error (`Unexpected PUT ${ path }`))
|
||||||
|
|||||||
@@ -10,21 +10,11 @@ import PrefetchLink from '@/components/PrefetchLink'
|
|||||||
import TagLink from '@/components/TagLink'
|
import TagLink from '@/components/TagLink'
|
||||||
import FieldError from '@/components/common/FieldError'
|
import FieldError from '@/components/common/FieldError'
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
||||||
import SidebarComponent from '@/components/layout/SidebarComponent'
|
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
import { apiDelete, apiGet, apiPatch, apiPost, apiPut, isApiError } from '@/lib/api'
|
import { apiDelete, apiGet, apiPatch, apiPost, apiPut, isApiError } from '@/lib/api'
|
||||||
import { clientAnimationTransition,
|
|
||||||
clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchPost } from '@/lib/posts'
|
import { fetchPost } from '@/lib/posts'
|
||||||
import {
|
|
||||||
getClientTheatreLayoutMode,
|
|
||||||
getClientTheatreTagFlow,
|
|
||||||
setClientTheatreLayoutMode,
|
|
||||||
setClientTheatreTagFlow,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { canEditContent } from '@/lib/users'
|
import { canEditContent } from '@/lib/users'
|
||||||
import { cn, dateString, inputClass } from '@/lib/utils'
|
import { cn, dateString, inputClass } from '@/lib/utils'
|
||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||||
@@ -60,8 +50,8 @@ const INITIAL_THEATRE_INFO: TheatreInfo =
|
|||||||
const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
|
const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
|
||||||
{ tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
|
{ tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
|
||||||
|
|
||||||
const MIN_MAIN_WIDTH = 360
|
const LAYOUT_STORAGE_KEY = 'theatre-layout-mode'
|
||||||
const SIDEBAR_GAP_WIDTH = 16
|
const TAG_FLOW_STORAGE_KEY = 'theatre-tag-flow'
|
||||||
|
|
||||||
const LAYOUT_LABELS: Record<TheatreLayoutMode, string> = {
|
const LAYOUT_LABELS: Record<TheatreLayoutMode, string> = {
|
||||||
threeColumns: '3 列',
|
threeColumns: '3 列',
|
||||||
@@ -215,28 +205,17 @@ type Props = { user: User | null }
|
|||||||
|
|
||||||
|
|
||||||
const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
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 { id } = useParams ()
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
|
|
||||||
const commentsRef = useRef<HTMLDivElement> (null)
|
const commentsRef = useRef<HTMLDivElement> (null)
|
||||||
const embedRef = useRef<NiconicoViewerHandle> (null)
|
const embedRef = useRef<NiconicoViewerHandle> (null)
|
||||||
const loadingRef = useRef (false)
|
const loadingRef = useRef (false)
|
||||||
const sidebarContainerRef = useRef<HTMLDivElement> (null)
|
|
||||||
const theatreInfoRef = useRef<TheatreInfo> (INITIAL_THEATRE_INFO)
|
const theatreInfoRef = useRef<TheatreInfo> (INITIAL_THEATRE_INFO)
|
||||||
const theatreInfoReceivedAtRef = useRef (performance.now ())
|
const theatreInfoReceivedAtRef = useRef (performance.now ())
|
||||||
const videoLengthRef = useRef (0)
|
const videoLengthRef = useRef (0)
|
||||||
const lastCommentNoRef = 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 [comments, setComments] = useState<TheatreComment[]> ([])
|
||||||
const [content, setContent] = useState ('')
|
const [content, setContent] = useState ('')
|
||||||
const [editingPost, setEditingPost] = useState<Post | null> (null)
|
const [editingPost, setEditingPost] = useState<Post | null> (null)
|
||||||
@@ -249,25 +228,36 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
const [post, setPost] = useState<Post | null> (null)
|
const [post, setPost] = useState<Post | null> (null)
|
||||||
const [videoLength, setVideoLength] = useState (0)
|
const [videoLength, setVideoLength] = useState (0)
|
||||||
const [weights, setWeights] = useState<TheatrePostSelectionWeights> (INITIAL_WEIGHTS)
|
const [weights, setWeights] = useState<TheatrePostSelectionWeights> (INITIAL_WEIGHTS)
|
||||||
const [layoutMode, setLayoutMode] =
|
const [layoutMode, setLayoutMode] = useState<TheatreLayoutMode> (() => {
|
||||||
useState<TheatreLayoutMode> (() => getClientTheatreLayoutMode ())
|
const stored = localStorage.getItem (LAYOUT_STORAGE_KEY)
|
||||||
const [tagFlow, setTagFlow] = useState<TagFlow> (() => getClientTheatreTagFlow ())
|
return (
|
||||||
|
((['threeColumns', 'tagsBottom', 'commentsBottom'] as TheatreLayoutMode[])
|
||||||
|
.includes (stored as TheatreLayoutMode))
|
||||||
|
? (stored as TheatreLayoutMode)
|
||||||
|
: 'threeColumns')
|
||||||
|
})
|
||||||
|
const [tagFlow, setTagFlow] = useState<TagFlow> (() => {
|
||||||
|
const stored = localStorage.getItem (TAG_FLOW_STORAGE_KEY)
|
||||||
|
return (
|
||||||
|
(['vertical', 'horizontal'] as TagFlow[]).includes (stored as TagFlow)
|
||||||
|
? (stored as TagFlow)
|
||||||
|
: 'vertical')
|
||||||
|
})
|
||||||
const { fieldErrors, clearValidationErrors, applyValidationError } =
|
const { fieldErrors, clearValidationErrors, applyValidationError } =
|
||||||
useValidationErrors<TheatreCommentField> ()
|
useValidationErrors<TheatreCommentField> ()
|
||||||
|
|
||||||
const changeLayoutMode = (mode: TheatreLayoutMode) => {
|
const changeLayoutMode = (mode: TheatreLayoutMode) => {
|
||||||
setLayoutMode (mode)
|
setLayoutMode (mode)
|
||||||
setClientTheatreLayoutMode (mode)
|
localStorage.setItem (LAYOUT_STORAGE_KEY, mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
const changeTagFlow = (flow: TagFlow) => {
|
const changeTagFlow = (flow: TagFlow) => {
|
||||||
setTagFlow (flow)
|
setTagFlow (flow)
|
||||||
setClientTheatreTagFlow (flow)
|
localStorage.setItem (TAG_FLOW_STORAGE_KEY, flow)
|
||||||
}
|
}
|
||||||
|
|
||||||
const applyTheatreInfo = useCallback ((nextInfo: TheatreInfo) => {
|
const applyTheatreInfo = useCallback ((nextInfo: TheatreInfo) => {
|
||||||
theatreInfoReceivedAtRef.current = performance.now ()
|
theatreInfoReceivedAtRef.current = performance.now ()
|
||||||
theatreInfoRef.current = nextInfo
|
|
||||||
setTheatreInfo (nextInfo)
|
setTheatreInfo (nextInfo)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
@@ -334,17 +324,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
lastCommentNoRef.current = comments[0]?.no ?? 0
|
lastCommentNoRef.current = comments[0]?.no ?? 0
|
||||||
}, [comments])
|
}, [comments])
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
const updateSidebarContainerWidth = () => {
|
|
||||||
const nextWidth = sidebarContainerRef.current?.clientWidth ?? window.innerWidth
|
|
||||||
setSidebarContainerWidth (nextWidth)
|
|
||||||
}
|
|
||||||
|
|
||||||
updateSidebarContainerWidth ()
|
|
||||||
window.addEventListener ('resize', updateSidebarContainerWidth)
|
|
||||||
return () => window.removeEventListener ('resize', updateSidebarContainerWidth)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
if (!(id))
|
if (!(id))
|
||||||
return
|
return
|
||||||
@@ -408,9 +387,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
setComments (prev => [...newComments, ...prev])
|
setComments (prev => [...newComments, ...prev])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (loadingRef.current)
|
|
||||||
return
|
|
||||||
|
|
||||||
const currentInfo = theatreInfoRef.current
|
const currentInfo = theatreInfoRef.current
|
||||||
const ended =
|
const ended =
|
||||||
currentInfo.hostFlg
|
currentInfo.hostFlg
|
||||||
@@ -432,9 +408,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const watchingRequestedAt = performance.now ()
|
|
||||||
const nextInfo = await apiPut<TheatreInfo> (`/theatres/${ id }/watching`)
|
const nextInfo = await apiPut<TheatreInfo> (`/theatres/${ id }/watching`)
|
||||||
if (!(cancelled) && watchingRequestedAt >= theatreInfoReceivedAtRef.current)
|
if (!(cancelled))
|
||||||
applyTheatreInfo (nextInfo)
|
applyTheatreInfo (nextInfo)
|
||||||
}
|
}
|
||||||
catch (error)
|
catch (error)
|
||||||
@@ -563,7 +538,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
if (!(id) || !(post))
|
if (!(id) || !(post))
|
||||||
return
|
return
|
||||||
|
|
||||||
loadingRef.current = true
|
|
||||||
setLoading (true)
|
setLoading (true)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -592,7 +566,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
loadingRef.current = false
|
|
||||||
setLoading (false)
|
setLoading (false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -627,9 +600,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
clearValidationErrors ()
|
clearValidationErrors ()
|
||||||
await apiPost (`/theatres/${ id }/comments`, { content })
|
await apiPost (`/theatres/${ id }/comments`, { content })
|
||||||
setContent ('')
|
setContent ('')
|
||||||
commentsRef.current?.scrollTo ({
|
commentsRef.current?.scrollTo ({ top: 0, behavior: 'smooth' })
|
||||||
top: 0,
|
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
|
||||||
}
|
}
|
||||||
catch (error)
|
catch (error)
|
||||||
{
|
{
|
||||||
@@ -668,26 +639,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
if (status >= 400)
|
if (status >= 400)
|
||||||
return <ErrorScreen status={status}/>
|
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 = (
|
const tagPanel = (
|
||||||
<section className="rounded border-zinc-300 p-4 dark:border-zinc-800">
|
<section className="rounded border-zinc-300 p-4 dark:border-zinc-800">
|
||||||
<div className="mb-3 flex items-center justify-between gap-3">
|
<div className="mb-3 flex items-center justify-between gap-3">
|
||||||
@@ -846,8 +797,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<motion.div
|
<motion.div
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout="position"
|
||||||
transition={{ layout: layoutTransition }}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
className="min-h-0 flex-1 overflow-y-auto bg-zinc-50 text-zinc-950
|
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">
|
md:overflow-hidden dark:bg-zinc-950 dark:text-zinc-50">
|
||||||
<Helmet>
|
<Helmet>
|
||||||
@@ -855,26 +806,30 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
{theatre && <title>{`${ theatreTitle } | ${ SITE_TITLE }`}</title>}
|
{theatre && <title>{`${ theatreTitle } | ${ SITE_TITLE }`}</title>}
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div
|
<div className={cn (
|
||||||
ref={sidebarContainerRef}
|
'grid min-h-full gap-4 overflow-visible md:h-full md:overflow-hidden',
|
||||||
data-sidebar-container
|
(layoutMode === 'threeColumns'
|
||||||
className="flex min-h-full flex-col gap-4 overflow-visible md:h-full md:flex-row
|
&& ['md:grid-cols-[16rem_minmax(0,1fr)_22rem]',
|
||||||
md:overflow-hidden">
|
'xl:grid-cols-[18rem_minmax(0,1fr)_24rem]']),
|
||||||
|
(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' && (
|
{layoutMode !== 'tagsBottom' && (
|
||||||
<SidebarComponent
|
<motion.aside
|
||||||
sidebarKey="theatre-tags"
|
layout="position"
|
||||||
side="left"
|
className="hidden min-w-0 space-y-4 md:order-none md:block md:overflow-y-auto
|
||||||
maxWidth={leftSidebarMaxWidth}
|
md:[direction:rtl]">
|
||||||
onWidthChange={setLeftSidebarWidth}
|
<div className="md:[direction:ltr]">
|
||||||
className="hidden md:block">
|
{tagPanel}
|
||||||
{tagPanel}
|
</div>
|
||||||
</SidebarComponent>)}
|
</motion.aside>)}
|
||||||
|
|
||||||
<motion.main
|
<motion.main
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout="position"
|
||||||
className="order-1 min-w-0 flex-1 space-y-4 md:order-none
|
className={cn ('order-1 min-w-0 space-y-4 md:order-none md:overflow-y-auto',
|
||||||
md:min-w-[360px] md:overflow-y-auto">
|
layoutMode === 'tagsBottom' && 'md:[direction:rtl]')}>
|
||||||
<div className="space-y-4">
|
<div className={cn ('space-y-4', layoutMode === 'tagsBottom' && 'md:[direction:ltr]')}>
|
||||||
<section className="overflow-hidden rounded border-zinc-300
|
<section className="overflow-hidden rounded border-zinc-300
|
||||||
dark:border-zinc-800">
|
dark:border-zinc-800">
|
||||||
<div className="flex flex-wrap items-center justify-between gap-3
|
<div className="flex flex-wrap items-center justify-between gap-3
|
||||||
@@ -1010,17 +965,12 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
</motion.main>
|
</motion.main>
|
||||||
|
|
||||||
{layoutMode !== 'commentsBottom' && (
|
{layoutMode !== 'commentsBottom' && (
|
||||||
<SidebarComponent
|
<motion.aside
|
||||||
sidebarKey="theatre-comments"
|
layout="position"
|
||||||
side="right"
|
className="hidden min-w-0 space-y-4 md:order-none md:block md:overflow-y-auto">
|
||||||
maxWidth={rightSidebarMaxWidth}
|
{commentsPanel}
|
||||||
onWidthChange={setRightSidebarWidth}
|
{participantsPanel}
|
||||||
className="hidden md:block">
|
</motion.aside>)}
|
||||||
<div className="space-y-4">
|
|
||||||
{commentsPanel}
|
|
||||||
{participantsPanel}
|
|
||||||
</div>
|
|
||||||
</SidebarComponent>)}
|
|
||||||
</div>
|
</div>
|
||||||
</motion.div>)
|
</motion.div>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { buildUser } from '@/test/factories'
|
|||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
const api = vi.hoisted (() => ({
|
||||||
apiGet: vi.fn (),
|
|
||||||
apiPut: vi.fn (),
|
apiPut: vi.fn (),
|
||||||
isApiError: vi.fn (),
|
isApiError: vi.fn (),
|
||||||
}))
|
}))
|
||||||
@@ -28,23 +27,12 @@ describe ('SettingPage', () => {
|
|||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
api.isApiError.mockReturnValue (false)
|
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', () => {
|
it ('shows loading when user is absent', () => {
|
||||||
renderWithProviders (<SettingPage user={null} setUser={vi.fn ()}/>)
|
renderWithProviders (<SettingPage user={null} setUser={vi.fn ()}/>)
|
||||||
|
|
||||||
expect (screen.getAllByText ('Loading...').length).toBeGreaterThan (0)
|
expect (screen.getByText ('Loading...')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('updates the current user name', async () => {
|
it ('updates the current user name', async () => {
|
||||||
@@ -54,9 +42,8 @@ describe ('SettingPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
|
renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
|
||||||
|
|
||||||
const nameInput = (await screen.findAllByRole ('textbox'))[0]
|
fireEvent.change (screen.getByRole ('textbox'), { target: { value: 'new' } })
|
||||||
fireEvent.change (nameInput, { target: { value: 'new' } })
|
fireEvent.click (screen.getByRole ('button', { name: '更新' }))
|
||||||
fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
|
|
||||||
|
|
||||||
await waitFor (() => {
|
await waitFor (() => {
|
||||||
expect (api.apiPut).toHaveBeenCalledWith (
|
expect (api.apiPut).toHaveBeenCalledWith (
|
||||||
@@ -68,7 +55,7 @@ describe ('SettingPage', () => {
|
|||||||
const formData = api.apiPut.mock.calls[0]?.[1] as FormData
|
const formData = api.apiPut.mock.calls[0]?.[1] as FormData
|
||||||
expect (formData.get ('name')).toBe ('new')
|
expect (formData.get ('name')).toBe ('new')
|
||||||
expect (setUser).toHaveBeenCalled ()
|
expect (setUser).toHaveBeenCalled ()
|
||||||
expect (toastApi.toast).toHaveBeenCalledWith ({ title: '表示名を更新しました.' })
|
expect (toastApi.toast).toHaveBeenCalledWith ({ title: '設定を更新しました.' })
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('shows validation errors returned for the name field', async () => {
|
it ('shows validation errors returned for the name field', async () => {
|
||||||
@@ -88,11 +75,10 @@ describe ('SettingPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
|
renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
|
||||||
|
|
||||||
const nameInput = (await screen.findAllByRole ('textbox'))[0]
|
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '' } })
|
||||||
fireEvent.change (nameInput, { target: { value: '' } })
|
fireEvent.click (screen.getByRole ('button', { name: '更新' }))
|
||||||
fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
|
|
||||||
|
|
||||||
expect ((await screen.findAllByText ('名前は必須です.')).length).toBeGreaterThan (0)
|
expect (await screen.findByText ('名前は必須です.')).toBeInTheDocument ()
|
||||||
expect (nameInput).toHaveAttribute ('aria-invalid', 'true')
|
expect (screen.getByRole ('textbox')).toHaveAttribute ('aria-invalid', 'true')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -24,11 +24,6 @@ import type { FC } from 'react'
|
|||||||
import type { User, WikiPage } from '@/types'
|
import type { User, WikiPage } from '@/types'
|
||||||
|
|
||||||
const mdParser = new MarkdownIt
|
const mdParser = new MarkdownIt
|
||||||
const FIXED_WIKI_EDITOR_VIEW = { menu: true, md: true, html: true } as const
|
|
||||||
|
|
||||||
// `wiki_editor_mode` is still kept in backend settings, but the common
|
|
||||||
// settings screen does not expose it at present. Until that UI returns, the
|
|
||||||
// editor stays on the fixed split view here.
|
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
@@ -119,7 +114,6 @@ const WikiEditPage: FC<Props> = ({ user }) => {
|
|||||||
{() => (
|
{() => (
|
||||||
<MdEditor value={body}
|
<MdEditor value={body}
|
||||||
style={{ height: '500px' }}
|
style={{ height: '500px' }}
|
||||||
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
|
|
||||||
renderHTML={text => mdParser.render (text)}
|
renderHTML={text => mdParser.render (text)}
|
||||||
onChange={({ text }) => setBody (text)}/>)}
|
onChange={({ text }) => setBody (text)}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|||||||
@@ -22,11 +22,6 @@ import 'react-markdown-editor-lite/lib/index.css'
|
|||||||
import type { User, WikiPage } from '@/types'
|
import type { User, WikiPage } from '@/types'
|
||||||
|
|
||||||
const mdParser = new MarkdownIt
|
const mdParser = new MarkdownIt
|
||||||
const FIXED_WIKI_EDITOR_VIEW = { menu: true, md: true, html: true } as const
|
|
||||||
|
|
||||||
// `wiki_editor_mode` is still kept in backend settings, but the common
|
|
||||||
// settings screen does not expose it at present. Until that UI returns, the
|
|
||||||
// editor stays on the fixed split view here.
|
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
@@ -97,7 +92,6 @@ const WikiNewPage: FC<Props> = ({ user }) => {
|
|||||||
{() => (
|
{() => (
|
||||||
<MdEditor value={body}
|
<MdEditor value={body}
|
||||||
style={{ height: '500px' }}
|
style={{ height: '500px' }}
|
||||||
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
|
|
||||||
renderHTML={text => mdParser.render (text)}
|
renderHTML={text => mdParser.render (text)}
|
||||||
onChange={({ text }) => setBody (text)}/>)}
|
onChange={({ text }) => setBody (text)}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|||||||
@@ -3,10 +3,6 @@ import { render } from '@testing-library/react'
|
|||||||
import { HelmetProvider } from 'react-helmet-async'
|
import { HelmetProvider } from 'react-helmet-async'
|
||||||
import { MemoryRouter } from 'react-router-dom'
|
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'
|
import type { ReactElement, ReactNode } from 'react'
|
||||||
|
|
||||||
type Options = {
|
type Options = {
|
||||||
@@ -19,25 +15,21 @@ export const renderWithProviders = (
|
|||||||
) => {
|
) => {
|
||||||
const queryClient = new QueryClient ({
|
const queryClient = new QueryClient ({
|
||||||
defaultOptions: {
|
defaultOptions: {
|
||||||
queries: { retry: false } },
|
queries: { retry: false },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const Wrapper = ({ children }: { children: ReactNode }) => (
|
const Wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<HelmetProvider>
|
<HelmetProvider>
|
||||||
<MemoryRouter initialEntries={[options.route ?? '/']}>
|
<MemoryRouter initialEntries={[options.route ?? '/']}>
|
||||||
<DialogueProvider>
|
{children}
|
||||||
<UnsavedChangesGuardProvider>
|
|
||||||
<KeyboardShortcutsProvider>
|
|
||||||
{children}
|
|
||||||
</KeyboardShortcutsProvider>
|
|
||||||
</UnsavedChangesGuardProvider>
|
|
||||||
</DialogueProvider>
|
|
||||||
</MemoryRouter>
|
</MemoryRouter>
|
||||||
</HelmetProvider>
|
</HelmetProvider>
|
||||||
</QueryClientProvider>)
|
</QueryClientProvider>)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
queryClient,
|
queryClient,
|
||||||
...render (ui, { wrapper: Wrapper }) }
|
...render (ui, { wrapper: Wrapper }),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,3 @@ window.requestAnimationFrame = callback => {
|
|||||||
callback (0)
|
callback (0)
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
Object.defineProperty (window, 'matchMedia', {
|
|
||||||
configurable: true,
|
|
||||||
value: vi.fn ().mockImplementation (() => ({
|
|
||||||
addEventListener: vi.fn (),
|
|
||||||
removeEventListener: vi.fn (),
|
|
||||||
matches: false })) })
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { DARK_COLOUR_SHADE,
|
|||||||
const colours = Object.values (TAG_COLOUR)
|
const colours = Object.values (TAG_COLOUR)
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
darkMode: 'class',
|
|
||||||
content: ['./src/**/*.{html,js,ts,jsx,tsx,mdx}'],
|
content: ['./src/**/*.{html,js,ts,jsx,tsx,mdx}'],
|
||||||
safelist: [...colours.map (c => `text-${ c }-${ LIGHT_COLOUR_SHADE }`),
|
safelist: [...colours.map (c => `text-${ c }-${ LIGHT_COLOUR_SHADE }`),
|
||||||
...colours.map (c => `hover:text-${ c }-${ LIGHT_COLOUR_SHADE - 200 }`),
|
...colours.map (c => `hover:text-${ c }-${ LIGHT_COLOUR_SHADE - 200 }`),
|
||||||
|
|||||||
新しい課題から参照
ユーザをブロックする