コミットを比較
9 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| 5cf46406a9 | |||
| 29c385ed9f | |||
| abeee76ddd | |||
| 347a0ebbba | |||
| f8e8d8fbb0 | |||
| 33f9c6602f | |||
| 2d6af0aa5b | |||
| c0879ac117 | |||
| f5b632ed89 |
@@ -266,38 +266,45 @@ const value =
|
|||||||
《当用漢字による書きかえ》; prefer original forms such as `編輯`.
|
《当用漢字による書きかえ》; prefer original forms such as `編輯`.
|
||||||
- For user-facing Japanese ellipses, prefer `……` over ASCII `...`.
|
- For user-facing Japanese ellipses, prefer `……` over ASCII `...`.
|
||||||
|
|
||||||
### Frontend TSX style
|
### Frontend TypeScript and TSX style
|
||||||
|
|
||||||
- Preserve the local TSX formatting style.
|
- 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 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 TSX formatting rules as hard constraints, not preferences. Before
|
- Treat TypeScript and TSX formatting rules as hard constraints, not
|
||||||
finishing a TSX edit, inspect the edited hunks for closing `)`, `]`, and `}`
|
preferences. Before finishing a TypeScript or TSX edit, inspect the edited
|
||||||
placement and fix violations instead of relying on formatter defaults.
|
hunks for closing `)`, `]`, and `}` placement and fix violations instead of
|
||||||
- After every TSX edit, perform a style-only self-review of the edited hunks
|
relying on formatter defaults.
|
||||||
before running verification or reporting completion. The task is not complete
|
- After every TypeScript or TSX edit, perform a style-only self-review of the
|
||||||
while any edited TSX hunk violates these local formatting rules.
|
edited hunks before running verification or reporting completion. The task is
|
||||||
- The TSX self-review must classify every edited leading or trailing `)`, `]`,
|
not complete while any edited TypeScript or TSX hunk violates these local
|
||||||
and `}` by syntax role before deciding whether it is valid. Do not apply a
|
formatting rules.
|
||||||
rule by glyph alone. A closing `)` for a function parameter list is different
|
- The TypeScript/TSX self-review must classify every edited leading or trailing
|
||||||
from a closing `)` for a function call. A closing `}` for a block is different
|
`)`, `]`, and `}` by syntax role before deciding whether it is valid. Do not
|
||||||
from a closing `}` for an object, type literal, import list, or destructuring
|
apply a rule by glyph alone. A closing `)` for a function parameter list is
|
||||||
pattern.
|
different from a closing `)` for a function call. A closing `}` for a block
|
||||||
- The TSX self-review must confirm there are no common Prettier-style React
|
is different from a closing `}` for an object, type literal, import list, or
|
||||||
component declarations with a multi-line destructured parameter.
|
destructuring pattern.
|
||||||
- The TSX self-review must confirm multi-line function declaration parameter
|
- The TSX-specific self-review must confirm there are no common Prettier-style
|
||||||
`)` placement follows the detailed parameter-list rules below.
|
React component declarations with a multi-line destructured parameter.
|
||||||
- The TSX self-review must confirm call-expression `)` is never at the
|
- 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.
|
beginning of a line.
|
||||||
- The TSX self-review must confirm object/type/import/destructuring `}` is not
|
- The TSX-specific self-review must confirm JSX closing markers and closing
|
||||||
at the beginning of a line.
|
parentheses keep the surrounding compact style.
|
||||||
- The TSX self-review must confirm multi-line function/lambda/callback/block
|
- The TypeScript/TSX self-review must confirm leading indentation follows
|
||||||
`}` is on its own line and never at the end of the previous line.
|
4-space logical indentation with tabs only as leading 8-space compression.
|
||||||
- The TSX self-review must confirm array `]` is not at the beginning of a line.
|
|
||||||
- The TSX self-review must confirm JSX closing markers and closing parentheses
|
|
||||||
keep the surrounding compact style.
|
|
||||||
- The 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.
|
||||||
@@ -355,6 +362,37 @@ 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,
|
- Use correct British English spelling for new identifiers, filenames,
|
||||||
component names, helper names, comments, and developer-facing prose unless
|
component names, helper names, comments, and developer-facing prose unless
|
||||||
editing an already established American-English API that must keep its
|
editing an already established American-English API that must keep its
|
||||||
@@ -373,6 +411,168 @@ const value =
|
|||||||
- For this repository, prefer names such as `BehaviourSettingsSection.tsx`, not
|
- For this repository, prefer names such as `BehaviourSettingsSection.tsx`, not
|
||||||
`BehaviorSettingsSection.tsx`.
|
`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
|
### Frontend delimiter decision table
|
||||||
|
|
||||||
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
||||||
@@ -405,6 +605,7 @@ import { Button, Card } from '@/components/ui'
|
|||||||
Rule: named-binding `}` is associative-array-style syntax. It must not be alone
|
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 `}`
|
at the beginning of a line. Prefer keeping `{` with the first binding and `}`
|
||||||
with the final binding when this fits the line limit.
|
with the final binding when this fits the line limit.
|
||||||
|
Penalty: capital offence. This is one of the core associative-brace rules.
|
||||||
|
|
||||||
#### Type literals
|
#### Type literals
|
||||||
|
|
||||||
@@ -427,6 +628,8 @@ type Props = {
|
|||||||
|
|
||||||
Rule: type-literal `}` is not a block close. It must stay on the same line as
|
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.
|
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
|
#### Object literals
|
||||||
|
|
||||||
@@ -467,6 +670,8 @@ const value = useMemo (() => ({
|
|||||||
Rule: object-literal `}` is associative-array-style syntax. It must not be on a
|
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
|
line by itself. Keep it with the final property, and keep call `)` off the
|
||||||
beginning of a line.
|
beginning of a line.
|
||||||
|
Penalty: capital offence. Wrong object-literal `}` placement and wrong call
|
||||||
|
`)` placement are both death-class violations here.
|
||||||
|
|
||||||
#### Destructuring parameters
|
#### Destructuring parameters
|
||||||
|
|
||||||
@@ -497,6 +702,8 @@ that spans multiple lines, do not use the Prettier-style `= ({ ... }) =>`
|
|||||||
shape. Put the function parameter list on its own lines. The destructuring `}`
|
shape. Put the function parameter list on its own lines. The destructuring `}`
|
||||||
stays with the final binding. The parameter-list `)` is then allowed and
|
stays with the final binding. The parameter-list `)` is then allowed and
|
||||||
required at the beginning of its own line.
|
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
|
#### Inline typed destructuring parameter
|
||||||
|
|
||||||
@@ -524,6 +731,8 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
|||||||
Rule: this is not a separately split parameter-list block. The line break is
|
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
|
inside the inline type. Keep the type-literal `}` and parameter-list `)` on the
|
||||||
same line as the final type property.
|
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
|
#### Multi-line normal parameter list
|
||||||
|
|
||||||
@@ -551,6 +760,8 @@ const updateDraft = <Key extends keyof Settings,> (
|
|||||||
Rule: when the parameter list itself is split across multiple parameter lines,
|
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 closing parameter `)` goes at the beginning of its own line before `=>` or
|
||||||
the return type.
|
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
|
#### Function and callback blocks
|
||||||
|
|
||||||
@@ -579,6 +790,8 @@ const handleSave = () => {
|
|||||||
Rule: block `}` closes executable code, not associative data. Multi-line
|
Rule: block `}` closes executable code, not associative data. Multi-line
|
||||||
function, lambda, callback, `if`, `for`, `switch`, and similar block braces
|
function, lambda, callback, `if`, `for`, `switch`, and similar block braces
|
||||||
belong on their own line.
|
belong on their own line.
|
||||||
|
Penalty: capital offence. Confusing block `}` with associative `}` is a
|
||||||
|
death-class delimiter error.
|
||||||
|
|
||||||
#### Function and method calls
|
#### Function and method calls
|
||||||
|
|
||||||
@@ -602,6 +815,8 @@ const value = compute (
|
|||||||
Rule: call-expression `)` must not be at the beginning of a line. The exception
|
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
|
for leading `)` applies only to function declaration parameter lists, never to
|
||||||
calls.
|
calls.
|
||||||
|
Penalty: capital offence. A leading call `)` is one of the clearest death-class
|
||||||
|
violations in this codebase.
|
||||||
|
|
||||||
#### JSX closing markers
|
#### JSX closing markers
|
||||||
|
|
||||||
@@ -646,6 +861,8 @@ Good:
|
|||||||
|
|
||||||
Rule: keep `>` or `/>` with the final prop, and keep JSX closing parentheses in
|
Rule: keep `>` or `/>` with the final prop, and keep JSX closing parentheses in
|
||||||
the local compact form such as `</div>)`.
|
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
|
#### Arrays and tuples
|
||||||
|
|
||||||
@@ -674,6 +891,8 @@ const items = [first, second]
|
|||||||
|
|
||||||
Rule: array and tuple `]` must not be at the beginning of a line. Keep it with
|
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.
|
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
|
#### Single-line braces
|
||||||
|
|
||||||
@@ -698,11 +917,14 @@ Good:
|
|||||||
|
|
||||||
Rule: JavaScript object braces on one line get one inner space. JSX expression
|
Rule: JavaScript object braces on one line get one inner space. JSX expression
|
||||||
braces do not get inner spaces.
|
braces do not get inner spaces.
|
||||||
|
Penalty: minor offence. This is not normally semantic breakage, but it still
|
||||||
|
counts as a style miss.
|
||||||
|
|
||||||
#### Final TSX self-review checklist
|
#### Final TypeScript/TSX self-review checklist
|
||||||
|
|
||||||
Before reporting completion after a TypeScript or TSX edit, check the edited
|
Before reporting completion after a TypeScript or TSX edit, check the edited
|
||||||
hunks line by line:
|
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
|
1. No import/export/type/object/destructuring `}` appears alone at the beginning
|
||||||
of a line.
|
of a line.
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
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
|
||||||
@@ -8,6 +8,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_one :setting, dependent: :destroy
|
||||||
|
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
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
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
|
||||||
@@ -83,6 +83,8 @@ Rails.application.routes.draw do
|
|||||||
|
|
||||||
get 'users/settings', to: 'user_settings#show'
|
get 'users/settings', to: 'user_settings#show'
|
||||||
patch 'users/settings', to: 'user_settings#update'
|
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
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
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
|
||||||
生成ファイル
+30
-16
@@ -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_04_000000) do
|
ActiveRecord::Schema[8.0].define(version: 2026_07_05_000000) 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
|
||||||
@@ -383,6 +383,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_04_000000) do
|
|||||||
t.index ["user_id"], name: "index_settings_on_user_id", unique: true
|
t.index ["user_id"], name: "index_settings_on_user_id", unique: true
|
||||||
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 "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|
|
||||||
t.bigint "tag_id", null: false
|
t.bigint "tag_id", null: false
|
||||||
t.bigint "parent_tag_id", null: false
|
t.bigint "parent_tag_id", null: false
|
||||||
@@ -428,9 +441,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_04_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"
|
||||||
@@ -443,10 +456,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_04_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"
|
||||||
@@ -568,6 +581,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_04_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
|
||||||
@@ -578,19 +604,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_04_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
|
||||||
@@ -740,6 +753,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_04_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"
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Setting, type: :model do
|
||||||
|
it 'accepts the default typed user settings' do
|
||||||
|
setting = described_class.new({ user: create(:user) }.merge(described_class.defaults))
|
||||||
|
|
||||||
|
expect(setting).to be_valid
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'requires one settings row per user' do
|
||||||
|
user = create(:user)
|
||||||
|
described_class.create!({ user: }.merge(described_class.defaults))
|
||||||
|
|
||||||
|
duplicate = described_class.new({ user: }.merge(described_class.defaults))
|
||||||
|
|
||||||
|
expect(duplicate).not_to be_valid
|
||||||
|
expect(duplicate.errors[:user_id]).to be_present
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'validates enum-like settings columns' do
|
||||||
|
setting = described_class.new(
|
||||||
|
{ user: create(:user),
|
||||||
|
theme: 'neon',
|
||||||
|
auto_fetch_title: 'sometimes',
|
||||||
|
auto_fetch_thumbnail: 'sometimes',
|
||||||
|
wiki_editor_mode: 'sideways' })
|
||||||
|
|
||||||
|
expect(setting).not_to be_valid
|
||||||
|
expect(setting.errors[:theme]).to be_present
|
||||||
|
expect(setting.errors[:auto_fetch_title]).to be_present
|
||||||
|
expect(setting.errors[:auto_fetch_thumbnail]).to be_present
|
||||||
|
expect(setting.errors[:wiki_editor_mode]).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe UserThemeSlot, type: :model do
|
||||||
|
it 'accepts a theme slot for one user, base theme, and slot number' do
|
||||||
|
slot = described_class.new(user: create(:user),
|
||||||
|
base_theme: 'light',
|
||||||
|
slot_no: 1,
|
||||||
|
tokens: { 'background' => '0 0% 100%' })
|
||||||
|
|
||||||
|
expect(slot).to be_valid
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'requires unique slot numbers per user and base theme' do
|
||||||
|
user = create(:user)
|
||||||
|
described_class.create!(user:,
|
||||||
|
base_theme: 'dark',
|
||||||
|
slot_no: 2,
|
||||||
|
tokens: { 'background' => '222.2 84% 4.9%' })
|
||||||
|
|
||||||
|
duplicate = described_class.new(user:,
|
||||||
|
base_theme: 'dark',
|
||||||
|
slot_no: 2,
|
||||||
|
tokens: { 'background' => '0 0% 100%' })
|
||||||
|
|
||||||
|
expect(duplicate).not_to be_valid
|
||||||
|
expect(duplicate.errors[:user_id]).to be_present
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'validates base theme, slot number, and token object shape' do
|
||||||
|
slot = described_class.new(user: create(:user),
|
||||||
|
base_theme: 'system',
|
||||||
|
slot_no: 4,
|
||||||
|
tokens: 'not-object')
|
||||||
|
|
||||||
|
expect(slot).not_to be_valid
|
||||||
|
expect(slot.errors[:base_theme]).to be_present
|
||||||
|
expect(slot.errors[:slot_no]).to be_present
|
||||||
|
expect(slot.errors[:tokens]).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'user settings', type: :request do
|
||||||
|
describe 'GET /users/settings' do
|
||||||
|
it 'requires a current user' do
|
||||||
|
sign_out
|
||||||
|
|
||||||
|
get '/users/settings'
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns defaults and creates a missing settings row' do
|
||||||
|
user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
get '/users/settings'
|
||||||
|
}.to change(Setting, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to eq(
|
||||||
|
'theme' => 'system',
|
||||||
|
'auto_fetch_title' => 'manual',
|
||||||
|
'auto_fetch_thumbnail' => 'manual',
|
||||||
|
'wiki_editor_mode' => 'split')
|
||||||
|
expect(user.reload.setting).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'PATCH /users/settings' do
|
||||||
|
it 'requires a current user' do
|
||||||
|
sign_out
|
||||||
|
|
||||||
|
patch '/users/settings', params: { theme: 'dark' }, as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'updates multiple typed settings at once' do
|
||||||
|
user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
|
||||||
|
patch '/users/settings',
|
||||||
|
params: {
|
||||||
|
theme: 'dark',
|
||||||
|
auto_fetch_title: 'auto',
|
||||||
|
auto_fetch_thumbnail: 'off',
|
||||||
|
wiki_editor_mode: 'preview' },
|
||||||
|
as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to include(
|
||||||
|
'theme' => 'dark',
|
||||||
|
'auto_fetch_title' => 'auto',
|
||||||
|
'auto_fetch_thumbnail' => 'off',
|
||||||
|
'wiki_editor_mode' => 'preview')
|
||||||
|
expect(user.reload.setting).to have_attributes(
|
||||||
|
theme: 'dark',
|
||||||
|
auto_fetch_title: 'auto',
|
||||||
|
auto_fetch_thumbnail: 'off',
|
||||||
|
wiki_editor_mode: 'preview')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not treat Rails parameter wrapping as an editable setting' do
|
||||||
|
user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
|
||||||
|
patch '/users/settings',
|
||||||
|
params: { theme: 'light', user_setting: { theme: 'dark' } },
|
||||||
|
as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(user.reload.setting.theme).to eq('light')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns validation_error for type mismatches' do
|
||||||
|
sign_in_as(create(:user))
|
||||||
|
|
||||||
|
patch '/users/settings', params: { theme: 1 }, as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json).to include('type' => 'validation_error')
|
||||||
|
expect(json.fetch('errors')).to include(
|
||||||
|
'theme' => ['値の型が不正です.'])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns validation_error for invalid enum values' do
|
||||||
|
sign_in_as(create(:user))
|
||||||
|
|
||||||
|
patch '/users/settings', params: { theme: 'neon' }, as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json).to include('type' => 'validation_error')
|
||||||
|
expect(json.fetch('errors').fetch('theme')).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'user theme slots', type: :request do
|
||||||
|
describe 'GET /users/theme_slots' do
|
||||||
|
it 'requires a current user' do
|
||||||
|
sign_out
|
||||||
|
|
||||||
|
get '/users/theme_slots'
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns only the current user slots in stable order' do
|
||||||
|
user = create(:user)
|
||||||
|
other_user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
UserThemeSlot.create!(user:, base_theme: 'light', slot_no: 2, tokens: { 'a' => 1 })
|
||||||
|
UserThemeSlot.create!(user:, base_theme: 'dark', slot_no: 1, tokens: { 'b' => 2 })
|
||||||
|
UserThemeSlot.create!(user: other_user,
|
||||||
|
base_theme: 'dark',
|
||||||
|
slot_no: 3,
|
||||||
|
tokens: { 'c' => 3 })
|
||||||
|
|
||||||
|
get '/users/theme_slots'
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.map { |slot| [slot.fetch('base_theme'), slot.fetch('slot_no')] }).to eq(
|
||||||
|
[['dark', 1], ['light', 2]])
|
||||||
|
expect(json.map { |slot| slot.fetch('tokens') }).to eq(
|
||||||
|
[{ 'b' => 2 }, { 'a' => 1 }])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'PUT /users/theme_slots/:base_theme/:slot_no' do
|
||||||
|
it 'requires a current user' do
|
||||||
|
sign_out
|
||||||
|
|
||||||
|
put '/users/theme_slots/light/1',
|
||||||
|
params: { tokens: { background: '0 0% 100%' } },
|
||||||
|
as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates a theme slot' do
|
||||||
|
user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put '/users/theme_slots/light/1',
|
||||||
|
params: { tokens: { background: '0 0% 100%', tagColours: { nico: '#ffffff' } } },
|
||||||
|
as: :json
|
||||||
|
}.to change(UserThemeSlot, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to include('base_theme' => 'light', 'slot_no' => 1)
|
||||||
|
expect(json.fetch('tokens')).to include(
|
||||||
|
'background' => '0 0% 100%',
|
||||||
|
'tagColours' => { 'nico' => '#ffffff' })
|
||||||
|
expect(user.theme_slots.find_by!(base_theme: 'light', slot_no: 1).tokens).to include(
|
||||||
|
'background' => '0 0% 100%')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'updates an existing theme slot instead of creating a duplicate' do
|
||||||
|
user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
UserThemeSlot.create!(user:, base_theme: 'dark', slot_no: 2, tokens: { 'old' => true })
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put '/users/theme_slots/dark/2',
|
||||||
|
params: { tokens: { background: '222.2 84% 4.9%' } },
|
||||||
|
as: :json
|
||||||
|
}.not_to change(UserThemeSlot, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(user.theme_slots.find_by!(base_theme: 'dark', slot_no: 2).tokens).to eq(
|
||||||
|
'background' => '222.2 84% 4.9%')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'rejects invalid path parameters and token shapes' do
|
||||||
|
sign_in_as(create(:user))
|
||||||
|
|
||||||
|
put '/users/theme_slots/system/4',
|
||||||
|
params: { tokens: 'not-object' },
|
||||||
|
as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to include(
|
||||||
|
'base_theme' => ['値が不正です.'])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'rejects non-object tokens for valid slots' do
|
||||||
|
sign_in_as(create(:user))
|
||||||
|
|
||||||
|
put '/users/theme_slots/light/1',
|
||||||
|
params: { tokens: 'not-object' },
|
||||||
|
as: :json
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to include(
|
||||||
|
'tokens' => ['JSON object で指定してください.'])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
+36
-28
@@ -122,37 +122,44 @@ pass or the remaining failure is clearly blocked.
|
|||||||
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.
|
||||||
|
|
||||||
## TSX formatting
|
## TypeScript and 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 TSX formatting rules as hard constraints, not preferences. Before
|
- Treat TypeScript and TSX formatting rules as hard constraints, not
|
||||||
finishing a TSX edit, inspect the edited hunks for closing `)`, `]`, and `}`
|
preferences. Before finishing a TypeScript or TSX edit, inspect the edited
|
||||||
placement and fix violations instead of relying on formatter defaults.
|
hunks for closing `)`, `]`, and `}` placement and fix violations instead of
|
||||||
- After every TSX edit, perform a style-only self-review of the edited hunks
|
relying on formatter defaults.
|
||||||
before running verification or reporting completion. The task is not complete
|
- After every TypeScript or TSX edit, perform a style-only self-review of the
|
||||||
while any edited TSX hunk violates these local formatting rules.
|
edited hunks before running verification or reporting completion. The task is
|
||||||
- The TSX self-review must classify every edited leading or trailing `)`, `]`,
|
not complete while any edited TypeScript or TSX hunk violates these local
|
||||||
and `}` by syntax role before deciding whether it is valid. Do not apply a
|
formatting rules.
|
||||||
rule by glyph alone. A closing `)` for a function parameter list is different
|
- The TypeScript/TSX self-review must classify every edited leading or trailing
|
||||||
from a closing `)` for a function call. A closing `}` for a block is different
|
`)`, `]`, and `}` by syntax role before deciding whether it is valid. Do not
|
||||||
from a closing `}` for an object, type literal, import list, or destructuring
|
apply a rule by glyph alone. A closing `)` for a function parameter list is
|
||||||
pattern.
|
different from a closing `)` for a function call. A closing `}` for a block
|
||||||
- The TSX self-review must confirm there are no common Prettier-style React
|
is different from a closing `}` for an object, type literal, import list, or
|
||||||
component declarations with a multi-line destructured parameter.
|
destructuring pattern.
|
||||||
- The TSX self-review must confirm multi-line function declaration parameter
|
- The TSX-specific self-review must confirm there are no common Prettier-style
|
||||||
`)` placement follows the detailed parameter-list rules below.
|
React component declarations with a multi-line destructured parameter.
|
||||||
- The TSX self-review must confirm call-expression `)` is never at the
|
- 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.
|
beginning of a line.
|
||||||
- The TSX self-review must confirm object/type/import/destructuring `}` is not
|
- The TSX-specific self-review must confirm JSX closing markers and closing
|
||||||
at the beginning of a line.
|
parentheses keep the surrounding compact style.
|
||||||
- The TSX self-review must confirm multi-line function/lambda/callback/block
|
- The TypeScript/TSX self-review must confirm leading indentation follows
|
||||||
`}` is on its own line and never at the end of the previous line.
|
4-space logical indentation with tabs only as leading 8-space compression.
|
||||||
- The TSX self-review must confirm array `]` is not at the beginning of a line.
|
|
||||||
- The TSX self-review must confirm JSX closing markers and closing parentheses
|
|
||||||
keep the surrounding compact style.
|
|
||||||
- The 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.
|
||||||
@@ -215,7 +222,8 @@ pass or the remaining failure is clearly blocked.
|
|||||||
### Delimiter decision table
|
### Delimiter decision table
|
||||||
|
|
||||||
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
||||||
more authoritative than formatter habit.
|
more authoritative than formatter habit. Unless a subsection explicitly
|
||||||
|
mentions JSX, it applies equally to `.ts` and `.tsx`.
|
||||||
|
|
||||||
#### Import and export named bindings
|
#### Import and export named bindings
|
||||||
|
|
||||||
|
|||||||
+80
-29
@@ -1,5 +1,5 @@
|
|||||||
import { AnimatePresence, LayoutGroup, MotionConfig, motion } from 'framer-motion'
|
import { AnimatePresence, LayoutGroup, MotionConfig, motion } from 'framer-motion'
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
import { Fragment, useEffect, useMemo, useState } from 'react'
|
||||||
import { BrowserRouter,
|
import { BrowserRouter,
|
||||||
Navigate,
|
Navigate,
|
||||||
Route,
|
Route,
|
||||||
@@ -12,14 +12,19 @@ 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 { applyClientAppearance,
|
import { applyClientAnimationMode,
|
||||||
CLIENT_SETTINGS_EVENT,
|
applyClientAppearance,
|
||||||
|
type ClientAnimationMode,
|
||||||
|
fetchUserThemeSlots,
|
||||||
fetchUserSettings,
|
fetchUserSettings,
|
||||||
getClientAnimationMode,
|
|
||||||
getClientThemeMode,
|
getClientThemeMode,
|
||||||
|
hasStoredClientThemeSelection,
|
||||||
|
normaliseUserThemeSlots,
|
||||||
|
setCachedUserThemeSlots,
|
||||||
seedClientThemeMode } from '@/lib/settings'
|
seedClientThemeMode } from '@/lib/settings'
|
||||||
|
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
|
import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
|
||||||
|
|
||||||
import type { ClientAnimationMode } from '@/lib/settings'
|
|
||||||
import { KeyboardShortcutsProvider } from '@/lib/useKeyboardShortcuts'
|
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'
|
||||||
@@ -57,11 +62,51 @@ import type { Dispatch, FC, SetStateAction } from 'react'
|
|||||||
import type { User } from '@/types'
|
import type { User } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
const RouteTransitionWrapper = ({ user, setUser }: {
|
const RouteTransitionWrapper = ({ animationMode, 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}>
|
||||||
@@ -112,8 +157,9 @@ 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 [animationMode, setAnimationMode] =
|
const behaviourSettings = useClientBehaviourSettings ()
|
||||||
useState<ClientAnimationMode> (() => getClientAnimationMode ())
|
const animationMode = behaviourSettings.animation ?? 'normal'
|
||||||
|
const LayoutWrapper = animationMode === 'off' ? Fragment : LayoutGroup
|
||||||
|
|
||||||
const appLayoutTransition = useMemo (
|
const appLayoutTransition = useMemo (
|
||||||
() => (
|
() => (
|
||||||
@@ -140,14 +186,8 @@ const App: FC = () => {
|
|||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
const handleClientSettingsChange = () => {
|
applyClientAnimationMode (animationMode)
|
||||||
setAnimationMode (getClientAnimationMode ())
|
}, [animationMode])
|
||||||
}
|
|
||||||
|
|
||||||
window.addEventListener (CLIENT_SETTINGS_EVENT, handleClientSettingsChange)
|
|
||||||
return () =>
|
|
||||||
window.removeEventListener (CLIENT_SETTINGS_EVENT, handleClientSettingsChange)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
const createUser = async () => {
|
const createUser = async () => {
|
||||||
@@ -187,12 +227,18 @@ const App: FC = () => {
|
|||||||
return
|
return
|
||||||
|
|
||||||
void (async () => {
|
void (async () => {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
const settings = await fetchUserSettings ()
|
const [settings, themeSlots] = await Promise.all ([
|
||||||
seedClientThemeMode (settings.theme)
|
fetchUserSettings (),
|
||||||
applyClientAppearance ()
|
fetchUserThemeSlots (),
|
||||||
}
|
])
|
||||||
|
const storedThemeSlots = normaliseUserThemeSlots (themeSlots)
|
||||||
|
setCachedUserThemeSlots (storedThemeSlots)
|
||||||
|
if (!(hasStoredClientThemeSelection ()))
|
||||||
|
seedClientThemeMode (settings.theme)
|
||||||
|
applyClientAppearance ()
|
||||||
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
return
|
return
|
||||||
@@ -212,8 +258,9 @@ const App: FC = () => {
|
|||||||
{import.meta.env.DEV && <DevModeWatermark/>}
|
{import.meta.env.DEV && <DevModeWatermark/>}
|
||||||
|
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<KeyboardShortcutsProvider>
|
<DialogueProvider>
|
||||||
<DialogueProvider>
|
<UnsavedChangesGuardProvider>
|
||||||
|
<KeyboardShortcutsProvider>
|
||||||
<MotionConfig
|
<MotionConfig
|
||||||
reducedMotion={
|
reducedMotion={
|
||||||
animationMode === 'normal'
|
animationMode === 'normal'
|
||||||
@@ -222,20 +269,24 @@ const App: FC = () => {
|
|||||||
? 'user'
|
? 'user'
|
||||||
: 'always'
|
: 'always'
|
||||||
}>
|
}>
|
||||||
<LayoutGroup>
|
<LayoutWrapper>
|
||||||
<motion.div
|
<motion.div
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout={animationMode === 'off' ? false : 'position'}
|
||||||
transition={{ layout: appLayoutTransition }}
|
transition={{ layout: appLayoutTransition }}
|
||||||
className="relative flex flex-col h-dvh w-full overflow-y-hidden">
|
className="relative flex flex-col h-dvh w-full overflow-y-hidden">
|
||||||
<TopNav user={user}/>
|
<TopNav user={user}/>
|
||||||
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
<RouteTransitionWrapper
|
||||||
|
animationMode={animationMode}
|
||||||
|
user={user}
|
||||||
|
setUser={setUser}/>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</LayoutGroup>
|
</LayoutWrapper>
|
||||||
</MotionConfig>
|
</MotionConfig>
|
||||||
|
|
||||||
<Toaster/>
|
<Toaster/>
|
||||||
</DialogueProvider>
|
</KeyboardShortcutsProvider>
|
||||||
</KeyboardShortcutsProvider>
|
</UnsavedChangesGuardProvider>
|
||||||
|
</DialogueProvider>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</>)
|
</>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
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,6 +4,8 @@ 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'
|
||||||
@@ -11,6 +13,7 @@ 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
|
||||||
@@ -19,7 +22,21 @@ type Props = {
|
|||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
|
|
||||||
const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }) => {
|
const DraggableDroppableTagRow: FC<Props> = ({
|
||||||
|
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)
|
||||||
@@ -45,18 +62,23 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
|
|||||||
const { attributes,
|
const { attributes,
|
||||||
listeners,
|
listeners,
|
||||||
setNodeRef: setDragRef,
|
setNodeRef: setDragRef,
|
||||||
transform,
|
transform } = useDraggable ({ id: dndId,
|
||||||
isDragging: dragging } = useDraggable ({ id: dndId,
|
data: { kind: 'tag',
|
||||||
data: { kind: 'tag',
|
dndId,
|
||||||
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: dragging ? 'hidden' : 'visible' }
|
visibility: activeDragging ? '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
|
||||||
@@ -69,12 +91,16 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
|
|||||||
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)
|
||||||
{
|
{
|
||||||
@@ -82,22 +108,35 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
|
|||||||
e.stopPropagation ()
|
e.stopPropagation ()
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
ref={node => {
|
ref={setDropRef}
|
||||||
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}
|
>
|
||||||
{...listeners}>
|
{activeDragging
|
||||||
<motion.div
|
? (
|
||||||
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
<div
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
ref={setDragRef}
|
||||||
layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
style={style}
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
className={innerClassName}
|
||||||
</motion.div>
|
{...attributes}
|
||||||
|
{...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>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ 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 { Button } from '@/components/ui/button'
|
||||||
import { getClientEmbedAutoLoadMode } from '@/lib/settings'
|
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
|
|
||||||
import type { FC, RefObject } from 'react'
|
import type { FC, RefObject } from 'react'
|
||||||
|
|
||||||
@@ -36,7 +36,8 @@ const PostEmbed: FC<Props> = (
|
|||||||
onError },
|
onError },
|
||||||
) => {
|
) => {
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
const embedAutoLoadMode = getClientEmbedAutoLoadMode ()
|
const behaviourSettings = useClientBehaviourSettings ()
|
||||||
|
const embedAutoLoadMode = behaviourSettings.embedAutoLoad ?? 'auto'
|
||||||
const [manualLoadRequested, setManualLoadRequested] = useState (false)
|
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)
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ 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 { getClientThumbnailMode } from '@/lib/settings'
|
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,7 +17,15 @@ type Props = { posts: Post[]
|
|||||||
|
|
||||||
const PostList: FC<Props> = ({ posts, onClick }) => {
|
const PostList: FC<Props> = ({ posts, onClick }) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const thumbnailMode = getClientThumbnailMode ()
|
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)
|
||||||
|
|
||||||
@@ -41,7 +49,8 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
}}>
|
}}>
|
||||||
<motion.div
|
<motion.div
|
||||||
ref={cardRef}
|
ref={cardRef}
|
||||||
layoutId={layoutId}
|
layout={animationMode === 'off' ? false : true}
|
||||||
|
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',
|
||||||
@@ -61,7 +70,7 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
cardRef.current.style.zIndex = ''
|
cardRef.current.style.zIndex = ''
|
||||||
cardRef.current.style.position = ''
|
cardRef.current.style.position = ''
|
||||||
}}
|
}}
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
transition={{ layout: cardLayoutTransition }}>
|
||||||
{thumbnailMode === 'off'
|
{thumbnailMode === 'off'
|
||||||
? (
|
? (
|
||||||
<div className="flex h-full w-full items-center justify-center
|
<div className="flex h-full w-full items-center justify-center
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ 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'
|
||||||
@@ -33,10 +35,20 @@ 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 (() => {
|
||||||
const path = (typeof to === 'string') ? to : createPath (to)
|
return (new URL (path, window.location.origin)).toString ()
|
||||||
return (new URL (path, location.origin)).toString ()
|
}, [path])
|
||||||
}, [to])
|
const nextPathname = useMemo (
|
||||||
|
() => (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 () => {
|
||||||
@@ -54,11 +66,15 @@ 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 ()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,6 +93,13 @@ 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)
|
||||||
})
|
})
|
||||||
@@ -99,7 +122,7 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<a ref={ref}
|
<a ref={ref}
|
||||||
href={typeof to === 'string' ? to : createPath (to)}
|
href={path}
|
||||||
onMouseEnter={handleMouseEnter}
|
onMouseEnter={handleMouseEnter}
|
||||||
onTouchStart={handleTouchStart}
|
onTouchStart={handleTouchStart}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
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'
|
||||||
|
|
||||||
@@ -20,6 +21,8 @@ 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)
|
||||||
@@ -98,6 +101,7 @@ 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)
|
||||||
@@ -207,7 +211,7 @@ const ResponsiveMarqueeText: FC<Props> = (
|
|||||||
resetAnimated ()
|
resetAnimated ()
|
||||||
setMarqueeVisible (false)
|
setMarqueeVisible (false)
|
||||||
}
|
}
|
||||||
}, [active, desktopMarqueeEnabled, overflowPx, text])
|
}, [active, animationMode, desktopMarqueeEnabled, overflowPx, text])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
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 } from '@dnd-kit/modifiers'
|
import { restrictToWindowEdges, snapCenterToCursor } 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'
|
||||||
@@ -20,18 +22,28 @@ 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 { DragEndEvent } from '@dnd-kit/core'
|
import type { CollisionDetection, 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,
|
||||||
@@ -43,6 +55,7 @@ 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}
|
||||||
@@ -56,11 +69,17 @@ 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 (child, nestLevel + 1, key, suppressClickRef, tag.id, sp)))
|
renderTagTree (
|
||||||
|
activeDndId,
|
||||||
|
child,
|
||||||
|
nestLevel + 1,
|
||||||
|
key,
|
||||||
|
suppressClickRef,
|
||||||
|
tag.id,
|
||||||
|
sp)))
|
||||||
?? [])]
|
?? [])]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const isDescendant = (
|
const isDescendant = (
|
||||||
root: TagWithSections,
|
root: TagWithSections,
|
||||||
targetId: number,
|
targetId: number,
|
||||||
@@ -127,6 +146,37 @@ const buildTagByCategory = (post: Post): TagByCategory => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const buildFlatTagByCategory = (
|
||||||
|
byCategory: TagByCategory,
|
||||||
|
): TagByCategory => {
|
||||||
|
const tagsTmp = { } as TagByCategory
|
||||||
|
const seen = new Set<number> ()
|
||||||
|
|
||||||
|
for (const category of CATEGORIES)
|
||||||
|
tagsTmp[category] = []
|
||||||
|
|
||||||
|
const visit = (tag: TagWithSections) => {
|
||||||
|
if (seen.has (tag.id))
|
||||||
|
return
|
||||||
|
|
||||||
|
seen.add (tag.id)
|
||||||
|
tagsTmp[tag.category].push ({ ...tag, children: [] })
|
||||||
|
|
||||||
|
for (const child of tag.children ?? [])
|
||||||
|
visit (child)
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const category of CATEGORIES)
|
||||||
|
for (const tag of byCategory[category] ?? [])
|
||||||
|
visit (tag)
|
||||||
|
|
||||||
|
for (const category of CATEGORIES)
|
||||||
|
tagsTmp[category].sort ((tagA, tagB) => tagA.name < tagB.name ? -1 : 1)
|
||||||
|
|
||||||
|
return tagsTmp
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const changeCategory = async (
|
const changeCategory = async (
|
||||||
tagId: number,
|
tagId: number,
|
||||||
category: Category): Promise<void> => {
|
category: Category): Promise<void> => {
|
||||||
@@ -145,17 +195,47 @@ 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 (
|
||||||
|
<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 = {
|
type Props = {
|
||||||
className?: string
|
className?: string
|
||||||
post: Post
|
post: Post
|
||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
|
type ActiveTagDrag = {
|
||||||
|
dndId: string
|
||||||
|
tagId: number
|
||||||
|
nestLevel: number }
|
||||||
|
|
||||||
|
|
||||||
const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
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
|
||||||
@@ -173,10 +253,15 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
return tagsTmp
|
return tagsTmp
|
||||||
}, [post])
|
}, [post])
|
||||||
|
|
||||||
const [activeTagId, setActiveTagId] = useState<number | null> (null)
|
const [activeTagDrag, setActiveTagDrag] = useState<ActiveTagDrag | 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)
|
||||||
|
|
||||||
@@ -285,9 +370,19 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
<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'
|
||||||
@@ -298,38 +393,80 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
suppressClickRef.current = false}, { capture: true, once: true })
|
suppressClickRef.current = false}, { capture: true, once: true })
|
||||||
}}
|
}}
|
||||||
onDragCancel={() => {
|
onDragCancel={() => {
|
||||||
setActiveTagId (null)
|
setActiveTagDrag (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 => {
|
||||||
setActiveTagId (null)
|
setActiveTagDrag (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) => ((tags[cat] ?? []).length > 0 || dragging) && (
|
{CATEGORIES.map ((cat: Category) => {
|
||||||
<div className="my-3" key={cat}>
|
const categoryTags =
|
||||||
|
tagRelationDisplay === 'grouped'
|
||||||
|
? (tags[cat] ?? [])
|
||||||
|
: (flatTagsByCategory[cat] ?? [])
|
||||||
|
|
||||||
|
if (!(categoryTags.length > 0 || dragging))
|
||||||
|
return null
|
||||||
|
|
||||||
|
const sectionTitle = (
|
||||||
<SubsectionTitle>
|
<SubsectionTitle>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}
|
layoutId={animationMode === 'off'
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
? undefined
|
||||||
|
: `tag-${ sp ? 'sp-' : '' }${ cat }`}
|
||||||
|
transition={{ layout: layoutTransition }}>
|
||||||
{CATEGORY_NAMES[cat]}
|
{CATEGORY_NAMES[cat]}
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</SubsectionTitle>
|
</SubsectionTitle>)
|
||||||
|
|
||||||
<ul>
|
if (!(categoryTags.length > 0))
|
||||||
{(tags[cat] ?? []).flatMap (tag => (
|
return (
|
||||||
renderTagTree (tag, 0, `cat-${ cat }`, suppressClickRef, undefined, sp)))}
|
<EmptyCategoryDropSection cat={cat} key={cat}>
|
||||||
<DropSlot cat={cat}/>
|
{sectionTitle}
|
||||||
</ul>
|
</EmptyCategoryDropSection>)
|
||||||
</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={`post-info-${ sp }`}
|
layoutId={animationMode === 'off'
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
? undefined
|
||||||
|
: `post-info-${ sp }`}
|
||||||
|
transition={{ layout: layoutTransition }}>
|
||||||
<SectionTitle>情報</SectionTitle>
|
<SectionTitle>情報</SectionTitle>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Id.: {post.id}</li>
|
<li>Id.: {post.id}</li>
|
||||||
@@ -366,11 +503,14 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
</ul>
|
</ul>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
|
|
||||||
<DragOverlay adjustScale={false}>
|
<DragOverlay
|
||||||
|
adjustScale={false}
|
||||||
|
modifiers={[snapCenterToCursor]}
|
||||||
|
dropAnimation={animationMode === 'off' ? null : undefined}>
|
||||||
<div className="pointer-events-none">
|
<div className="pointer-events-none">
|
||||||
{activeTagId != null && (() => {
|
{activeTagDrag != null && (() => {
|
||||||
const tag = findTag (tags, activeTagId)
|
const tag = findTag (tags, activeTagDrag.tagId)
|
||||||
return tag && <TagLink tag={tag}/>
|
return tag && <TagLink tag={tag} nestLevel={activeTagDrag.nestLevel}/>
|
||||||
}) ()}
|
}) ()}
|
||||||
</div>
|
</div>
|
||||||
</DragOverlay>
|
</DragOverlay>
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ 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'
|
||||||
|
|
||||||
@@ -21,6 +23,13 @@ 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> ({ })
|
||||||
@@ -65,12 +74,18 @@ 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">
|
||||||
<motion.div
|
{animationsOff
|
||||||
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
? (
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
<div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
|
||||||
layoutId={`tag-${ tag.id }`}>
|
<TagLink tag={tag} onClick={onClick}/>
|
||||||
<TagLink tag={tag} onClick={onClick}/>
|
</div>)
|
||||||
</motion.div>
|
: (
|
||||||
|
<motion.div
|
||||||
|
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
||||||
|
transition={{ layout: layoutTransition }}
|
||||||
|
layoutId={`tag-${ tag.id }`}>
|
||||||
|
<TagLink tag={tag} onClick={onClick}/>
|
||||||
|
</motion.div>)}
|
||||||
</li>))) : [])}
|
</li>))) : [])}
|
||||||
</ul>
|
</ul>
|
||||||
<SectionTitle>関聯</SectionTitle>
|
<SectionTitle>関聯</SectionTitle>
|
||||||
@@ -103,18 +118,25 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
|||||||
{posts.length > 0 && TagBlock}
|
{posts.length > 0 && TagBlock}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<AnimatePresence initial={false}>
|
{animationsOff
|
||||||
{tagsVsbl && (
|
? (
|
||||||
<motion.div
|
tagsVsbl && (
|
||||||
key="sptags"
|
<div className="md:hidden overflow-hidden">
|
||||||
className="md:hidden overflow-hidden"
|
{posts.length > 0 && TagBlock}
|
||||||
initial={{ height: 0 }}
|
</div>))
|
||||||
animate={{ height: 'auto' }}
|
: (
|
||||||
exit={{ height: 0 }}
|
<AnimatePresence initial={false}>
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
{tagsVsbl && (
|
||||||
{posts.length > 0 && TagBlock}
|
<motion.div
|
||||||
</motion.div>)}
|
key="sptags"
|
||||||
</AnimatePresence>
|
className="md:hidden overflow-hidden"
|
||||||
|
initial={{ height: 0 }}
|
||||||
|
animate={{ height: 'auto' }}
|
||||||
|
exit={{ height: 0 }}
|
||||||
|
transition={layoutTransition}>
|
||||||
|
{posts.length > 0 && TagBlock}
|
||||||
|
</motion.div>)}
|
||||||
|
</AnimatePresence>)}
|
||||||
|
|
||||||
<a href="#"
|
<a href="#"
|
||||||
className="md:hidden block my-2 text-center text-sm
|
className="md:hidden block my-2 text-center text-sm
|
||||||
|
|||||||
+259
-146
@@ -8,6 +8,7 @@ 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'
|
||||||
@@ -91,6 +92,10 @@ 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)[]> ([])
|
||||||
@@ -155,6 +160,24 @@ 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)
|
||||||
|
|
||||||
@@ -189,13 +212,11 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<nav className="px-3 flex justify-between items-center w-full
|
<nav className="top-nav-root 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="mx-4 text-xl font-bold text-pink-600 hover:text-pink-400
|
className="top-nav-brand-link mx-4 text-xl font-bold"
|
||||||
dark:text-pink-300 dark:hover:text-pink-100"
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
scroll (0, 0)
|
scroll (0, 0)
|
||||||
}}>
|
}}>
|
||||||
@@ -205,8 +226,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',
|
||||||
'bg-yellow-200 dark:bg-red-950',
|
'top-nav-highlight',
|
||||||
'transition-[transform,width] duration-200 ease-out')}
|
highlightTransitionClass)}
|
||||||
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 }}/>
|
||||||
@@ -214,10 +235,12 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
{visibleMenu.map ((item, i) => (
|
{visibleMenu.map ((item, i) => (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={item.to}
|
key={item.to}
|
||||||
layoutId={`menu-${ item.name }`}
|
{...(animationsOff
|
||||||
|
? { }
|
||||||
|
: { layoutId: `menu-${ item.name }` })}
|
||||||
animate={{ opacity: moreVsbl ? 0 : 1 }}
|
animate={{ opacity: moreVsbl ? 0 : 1 }}
|
||||||
transition={{ opacity: { duration: .12 },
|
transition={{ opacity: opacityTransition,
|
||||||
layout: { duration: .2, ease: 'easeOut' } }}
|
layout: topNavTransition }}
|
||||||
style={{ pointerEvents: moreVsbl ? 'none' : 'auto' }}
|
style={{ pointerEvents: moreVsbl ? 'none' : 'auto' }}
|
||||||
onMouseEnter={() => setMoreVsbl (false)}>
|
onMouseEnter={() => setMoreVsbl (false)}>
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
@@ -225,7 +248,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
itemsRef.current[i] = el
|
itemsRef.current[i] = el
|
||||||
}}
|
}}
|
||||||
className={cn ('relative z-10 flex h-full items-center px-5',
|
className={cn ('top-nav-menu-link relative z-10 flex h-full items-center px-5',
|
||||||
(i === openItemIdx) && 'font-bold')}>
|
(i === openItemIdx) && 'font-bold')}>
|
||||||
{item.name}
|
{item.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
@@ -240,7 +263,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
setMoreVsbl (true)
|
setMoreVsbl (true)
|
||||||
measure (-1)
|
measure (-1)
|
||||||
}}
|
}}
|
||||||
className={cn ('relative z-10 flex h-full items-center px-5',
|
className={cn ('top-nav-menu-link relative z-10 flex h-full items-center px-5',
|
||||||
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
||||||
その他 »
|
その他 »
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
@@ -251,9 +274,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="md:hidden ml-auto border-0 bg-transparent pr-4
|
className="top-nav-mobile-toggle md:hidden ml-auto border-0 bg-transparent pr-4"
|
||||||
text-pink-600 hover:text-pink-400
|
|
||||||
dark:text-pink-300 dark:hover:text-pink-100"
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setMenuOpen (!(menuOpen))
|
setMenuOpen (!(menuOpen))
|
||||||
}}>
|
}}>
|
||||||
@@ -264,15 +285,15 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
<AnimatePresence initial={false}>
|
<AnimatePresence initial={false}>
|
||||||
<motion.div
|
<motion.div
|
||||||
key="submenu-shell"
|
key="submenu-shell"
|
||||||
layout
|
{...(animationsOff ? { }
|
||||||
className="relative z-20 hidden md:block overflow-hidden
|
: { layout: true })}
|
||||||
bg-yellow-200 dark:bg-red-950"
|
className="relative z-20 hidden md:block overflow-hidden top-nav-submenu"
|
||||||
animate={{ height: submenuHeight }}
|
animate={{ height: submenuHeight }}
|
||||||
onMouseLeave={() => {
|
onMouseLeave={() => {
|
||||||
if (moreVsbl)
|
if (moreVsbl)
|
||||||
setMoreVsbl (false)
|
setMoreVsbl (false)
|
||||||
}}
|
}}
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
transition={{ layout: topNavTransition }}
|
||||||
onAnimationComplete={() => {
|
onAnimationComplete={() => {
|
||||||
measure (moreVsbl ? -1 : activeIdx)
|
measure (moreVsbl ? -1 : activeIdx)
|
||||||
}}>
|
}}>
|
||||||
@@ -282,12 +303,14 @@ 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={{ duration: .2, ease: 'easeOut' }}
|
transition={topNavTransition}
|
||||||
{...((item.visible ?? true)
|
{...(animationsOff
|
||||||
|
? { }
|
||||||
|
: ((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>
|
||||||
@@ -298,30 +321,34 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
? (
|
? (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={`c-${ i }-${ j }`}
|
key={`c-${ i }-${ j }`}
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}
|
transition={topNavTransition}
|
||||||
{...((visibleMenu[activeIdx]?.name
|
{...(animationsOff
|
||||||
|
? { }
|
||||||
|
: ((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={{ duration: .2, ease: 'easeOut' }}
|
transition={topNavTransition}
|
||||||
{...((visibleMenu[activeIdx]?.name
|
{...(animationsOff
|
||||||
|
? { }
|
||||||
|
: ((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="h-full flex items-center px-3">
|
className="top-nav-menu-link h-full flex items-center px-3">
|
||||||
{subItem.name}
|
{subItem.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</motion.div>)))}
|
</motion.div>)))}
|
||||||
@@ -330,129 +357,215 @@ 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]">
|
||||||
<AnimatePresence initial={false} custom={dir}>
|
{animationsOff
|
||||||
<motion.div
|
? (
|
||||||
key={activeIdx}
|
<div className="absolute inset-0 flex items-center px-3">
|
||||||
custom={dir}
|
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
||||||
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
|
.filter (item => item.visible ?? true)
|
||||||
centre: { y: 0, opacity: 1 },
|
.map ((item, i) => (
|
||||||
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
|
'component' in item
|
||||||
className="absolute inset-0 flex items-center px-3"
|
? (
|
||||||
initial="enter"
|
<div key={`c-${ i }`}>
|
||||||
animate="centre"
|
{item.component}
|
||||||
exit="exit"
|
</div>)
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
: (
|
||||||
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
<div key={`l-${ i }`}>
|
||||||
.filter (item => item.visible ?? true)
|
<PrefetchLink
|
||||||
.map ((item, i) => (
|
to={item.to}
|
||||||
'component' in item
|
target={item.to.slice (0, 2) === '//'
|
||||||
? (
|
? '_blank'
|
||||||
<motion.div
|
: undefined}
|
||||||
key={`c-${ i }`}
|
className="top-nav-menu-link h-full flex items-center px-3">
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
{item.name}
|
||||||
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
</PrefetchLink>
|
||||||
{item.component}
|
</div>)))}
|
||||||
</motion.div>)
|
</div>)
|
||||||
: (
|
: (
|
||||||
<motion.div
|
<AnimatePresence initial={false} custom={dir}>
|
||||||
key={`l-${ i }`}
|
<motion.div
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
key={activeIdx}
|
||||||
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
custom={dir}
|
||||||
<PrefetchLink
|
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
|
||||||
to={item.to}
|
centre: { y: 0, opacity: 1 },
|
||||||
target={item.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
|
||||||
className="h-full flex items-center px-3">
|
className="absolute inset-0 flex items-center px-3"
|
||||||
{item.name}
|
initial="enter"
|
||||||
</PrefetchLink>
|
animate="centre"
|
||||||
</motion.div>)))}
|
exit="exit"
|
||||||
</motion.div>
|
transition={topNavTransition}>
|
||||||
</AnimatePresence>
|
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
||||||
|
.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>
|
||||||
|
|
||||||
<AnimatePresence initial={false}>
|
{animationsOff
|
||||||
{menuOpen && (
|
? (
|
||||||
<motion.div
|
menuOpen && (
|
||||||
key="spmenu"
|
<div
|
||||||
className={cn ('flex flex-col md:hidden',
|
className={cn ('top-nav-root top-nav-mobile-menu flex flex-col md:hidden',
|
||||||
'bg-yellow-200 dark:bg-red-975 items-start')}
|
'items-start')}>
|
||||||
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
<Separator/>
|
||||||
height: 0 },
|
{visibleMenu.map ((item, i) => (
|
||||||
open: { clipPath: 'inset(0 0 0% 0)',
|
<Fragment key={i}>
|
||||||
height: 'auto' } }}
|
<PrefetchLink
|
||||||
initial="closed"
|
to={i === openItemIdx ? item.to : '#'}
|
||||||
animate="open"
|
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
||||||
exit="closed"
|
((i === openItemIdx)
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
&& 'top-nav-mobile-active font-bold'))}
|
||||||
<Separator/>
|
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
||||||
{visibleMenu.map ((item, i) => (
|
if (i !== openItemIdx)
|
||||||
<Fragment key={i}>
|
{
|
||||||
<PrefetchLink
|
ev.preventDefault ()
|
||||||
to={i === openItemIdx ? item.to : '#'}
|
setOpenItemIdx (i)
|
||||||
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
}
|
||||||
((i === openItemIdx)
|
}}>
|
||||||
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}
|
{item.name}
|
||||||
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
</PrefetchLink>
|
||||||
if (i !== openItemIdx)
|
|
||||||
{
|
|
||||||
ev.preventDefault ()
|
|
||||||
setOpenItemIdx (i)
|
|
||||||
}
|
|
||||||
}}>
|
|
||||||
{item.name}
|
|
||||||
</PrefetchLink>
|
|
||||||
|
|
||||||
<AnimatePresence initial={false}>
|
{i === openItemIdx && (
|
||||||
{i === openItemIdx && (
|
<div className="top-nav-submenu w-full">
|
||||||
<motion.div
|
{item.subMenu
|
||||||
key={`sp-sub-${ i }`}
|
.filter (subItem => subItem.visible ?? true)
|
||||||
className="w-full bg-yellow-50 dark:bg-red-950"
|
.map ((subItem, j) => (
|
||||||
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
'component' in subItem
|
||||||
height: 0,
|
? (
|
||||||
opacity: 0 },
|
<Fragment key={`sp-c-${ i }-${ j }`}>
|
||||||
open: { clipPath: 'inset(0 0 0% 0)',
|
{subItem.component}
|
||||||
height: 'auto',
|
</Fragment>)
|
||||||
opacity: 1 } }}
|
: (
|
||||||
initial="closed"
|
<PrefetchLink
|
||||||
animate="open"
|
key={`sp-l-${ i }-${ j }`}
|
||||||
exit="closed"
|
to={subItem.to}
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
target={subItem.to.slice (0, 2) === '//'
|
||||||
{item.subMenu
|
? '_blank'
|
||||||
.filter (subItem => subItem.visible ?? true)
|
: undefined}
|
||||||
.map ((subItem, j) => (
|
className="top-nav-mobile-row w-full min-h-[36px] flex items-center pl-12">
|
||||||
'component' in subItem
|
{subItem.name}
|
||||||
? (
|
</PrefetchLink>)))}
|
||||||
<Fragment key={`sp-c-${ i }-${ j }`}>
|
</div>)}
|
||||||
{subItem.component}
|
</Fragment>))}
|
||||||
</Fragment>)
|
<PrefetchLink
|
||||||
: (
|
to="/more"
|
||||||
<PrefetchLink
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
key={`sp-l-${ i }-${ j }`}
|
itemsRef.current[visibleMenu.length] = el
|
||||||
to={subItem.to}
|
}}
|
||||||
target={subItem.to.slice (0, 2) === '//'
|
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
||||||
? '_blank'
|
((openItemIdx < 0)
|
||||||
: undefined}
|
&& 'top-nav-mobile-active font-bold'))}>
|
||||||
className="w-full min-h-[36px] flex items-center pl-12">
|
その他 »
|
||||||
{subItem.name}
|
</PrefetchLink>
|
||||||
</PrefetchLink>)))}
|
<TopNavUser user={user} sp/>
|
||||||
</motion.div>)}
|
<Separator/>
|
||||||
</AnimatePresence>
|
</div>))
|
||||||
</Fragment>))}
|
: (
|
||||||
<PrefetchLink
|
<AnimatePresence initial={false}>
|
||||||
to="/more"
|
{menuOpen && (
|
||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
<motion.div
|
||||||
itemsRef.current[visibleMenu.length] = el
|
key="spmenu"
|
||||||
}}
|
className={cn ('top-nav-root top-nav-mobile-menu flex flex-col md:hidden',
|
||||||
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
'items-start')}
|
||||||
((openItemIdx < 0)
|
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
||||||
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}>
|
height: 0 },
|
||||||
その他 »
|
open: { clipPath: 'inset(0 0 0% 0)',
|
||||||
</PrefetchLink>
|
height: 'auto' } }}
|
||||||
<TopNavUser user={user} sp/>
|
initial="closed"
|
||||||
<Separator/>
|
animate="open"
|
||||||
</motion.div>)}
|
exit="closed"
|
||||||
</AnimatePresence>
|
transition={topNavTransition}>
|
||||||
|
<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,4 +20,16 @@ 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 ()
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
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'
|
||||||
@@ -9,12 +11,21 @@ type Props = {
|
|||||||
className?: string }
|
className?: string }
|
||||||
|
|
||||||
|
|
||||||
const MainArea: FC<Props> = ({ children, className }) => (
|
const MainArea: FC<Props> = ({ children, className }) => {
|
||||||
<motion.main
|
const behaviourSettings = useClientBehaviourSettings ()
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
const animationMode = behaviourSettings.animation ?? 'normal'
|
||||||
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
const layoutTransition = clientAnimationTransition (
|
||||||
layout="position">
|
animationMode,
|
||||||
{children}
|
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
||||||
</motion.main>)
|
)
|
||||||
|
|
||||||
export default MainArea
|
return (
|
||||||
|
<motion.main
|
||||||
|
transition={{ layout: layoutTransition }}
|
||||||
|
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
||||||
|
layout={animationMode === 'off' ? false : 'position'}>
|
||||||
|
{children}
|
||||||
|
</motion.main>)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default MainArea
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
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 { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
|
import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
|
||||||
@@ -68,6 +70,12 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
sidebarKey,
|
sidebarKey,
|
||||||
side = 'left',
|
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 rootRef = useRef<HTMLDivElement | null> (null)
|
||||||
const maxWidthRef = useRef (maxWidth)
|
const maxWidthRef = useRef (maxWidth)
|
||||||
const getContainerWidth = useCallback (() => {
|
const getContainerWidth = useCallback (() => {
|
||||||
@@ -305,8 +313,8 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
return (
|
return (
|
||||||
<motion.div
|
<motion.div
|
||||||
ref={rootRef}
|
ref={rootRef}
|
||||||
layout="position"
|
layout={animationMode === 'off' ? false : 'position'}
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
transition={{ layout: layoutTransition }}
|
||||||
style={style}
|
style={style}
|
||||||
className={cn (
|
className={cn (
|
||||||
'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
|
'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
|
||||||
|
|||||||
@@ -2,19 +2,23 @@ import { useEffect, useMemo, useState } from 'react'
|
|||||||
|
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { getClientBehaviorSettings,
|
import { getClientBehaviorSettings, setClientBehaviorSettings } from '@/lib/settings'
|
||||||
setClientBehaviorSettings } from '@/lib/settings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type {
|
|
||||||
ClientAnimationMode,
|
|
||||||
ClientBehaviorSettings,
|
|
||||||
ClientEmbedAutoLoadMode,
|
|
||||||
ClientThumbnailMode } from '@/lib/settings'
|
|
||||||
import type { FC, ReactNode } from 'react'
|
import type { FC, ReactNode } from 'react'
|
||||||
|
|
||||||
|
import type { ClientAnimationMode,
|
||||||
|
ClientBehaviorSettings,
|
||||||
|
ClientEmbedAutoLoadMode,
|
||||||
|
ClientLinkPreloadMode,
|
||||||
|
ClientTagRelationDisplayMode } from '@/lib/settings'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
sectionClassName: string }
|
sectionClassName: string
|
||||||
|
onDirtyStateChange?: (
|
||||||
|
dirty: boolean,
|
||||||
|
discard: () => void,
|
||||||
|
) => void }
|
||||||
|
|
||||||
type SegmentedOption<T extends string> = {
|
type SegmentedOption<T extends string> = {
|
||||||
value: T
|
value: T
|
||||||
@@ -26,30 +30,29 @@ type SegmentedControlProps<T extends string> = {
|
|||||||
onChange: (value: T) => void }
|
onChange: (value: T) => void }
|
||||||
|
|
||||||
type SettingBlockProps = {
|
type SettingBlockProps = {
|
||||||
title: string
|
title: string
|
||||||
description: string
|
description?: string
|
||||||
children: ReactNode }
|
children: ReactNode }
|
||||||
|
|
||||||
const animationOptions: SegmentedOption<ClientAnimationMode>[] = [
|
const animationOptions: SegmentedOption<ClientAnimationMode>[] = [
|
||||||
{ value: 'normal', label: '通常' },
|
|
||||||
{ value: 'reduced', label: '控えめ' },
|
|
||||||
{ value: 'off', label: 'なし' },
|
{ value: 'off', label: 'なし' },
|
||||||
]
|
{ value: 'reduced', label: '控えめ' },
|
||||||
|
{ value: 'normal', label: '通常' }]
|
||||||
|
|
||||||
const embedAutoLoadOptions: SegmentedOption<ClientEmbedAutoLoadMode>[] = [
|
const embedAutoLoadOptions: SegmentedOption<ClientEmbedAutoLoadMode>[] = [
|
||||||
{ value: 'auto', label: '自動' },
|
|
||||||
{ value: 'manual', label: 'クリック時' },
|
|
||||||
{ value: 'off', label: '読み込まない' },
|
{ value: 'off', label: '読み込まない' },
|
||||||
]
|
{ value: 'manual', label: 'クリック時' },
|
||||||
|
{ value: 'auto', label: '自動' }]
|
||||||
|
|
||||||
const thumbnailModeOptions: SegmentedOption<ClientThumbnailMode>[] = [
|
const linkPreloadOptions: SegmentedOption<ClientLinkPreloadMode>[] = [
|
||||||
{ value: 'normal', label: '通常' },
|
{ value: 'off', label: 'しない' },
|
||||||
{ value: 'light', label: '軽量' },
|
{ value: 'intent', label: 'する' }]
|
||||||
{ value: 'off', label: '非表示' },
|
|
||||||
]
|
|
||||||
|
|
||||||
|
const tagRelationDisplayOptions: SegmentedOption<ClientTagRelationDisplayMode>[] = [
|
||||||
|
{ value: 'flat', label: 'まとめない' },
|
||||||
|
{ value: 'grouped', label: 'まとめる' }]
|
||||||
|
|
||||||
const SegmentedControl = <T extends string,>(
|
const SegmentedControl = <T extends string,> (
|
||||||
{ value, options, onChange }: SegmentedControlProps<T>,
|
{ value, options, onChange }: SegmentedControlProps<T>,
|
||||||
) => {
|
) => {
|
||||||
return (
|
return (
|
||||||
@@ -67,8 +70,8 @@ const SegmentedControl = <T extends string,>(
|
|||||||
'transition-colors focus-visible:outline-none focus-visible:ring-2',
|
'transition-colors focus-visible:outline-none focus-visible:ring-2',
|
||||||
'focus-visible:ring-ring focus-visible:ring-offset-2',
|
'focus-visible:ring-ring focus-visible:ring-offset-2',
|
||||||
value === option.value
|
value === option.value
|
||||||
? 'bg-background text-foreground shadow-sm'
|
? 'bg-primary text-primary-foreground shadow-sm ring-1 ring-primary/40'
|
||||||
: 'text-muted-foreground hover:bg-background/70 hover:text-foreground',
|
: 'bg-transparent text-muted-foreground hover:bg-background/70 hover:text-foreground',
|
||||||
)}
|
)}
|
||||||
onClick={() => onChange (option.value)}>
|
onClick={() => onChange (option.value)}>
|
||||||
{option.label}
|
{option.label}
|
||||||
@@ -80,7 +83,7 @@ const SegmentedControl = <T extends string,>(
|
|||||||
const SettingBlock: FC<SettingBlockProps> = (
|
const SettingBlock: FC<SettingBlockProps> = (
|
||||||
{ title, description, children },
|
{ title, description, children },
|
||||||
) => (
|
) => (
|
||||||
<div className="space-y-3 rounded-xl border border-border/70 bg-background/70 p-4">
|
<div className="space-y-3 rounded-xl px-4">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<h3 className="text-sm font-semibold">{title}</h3>
|
<h3 className="text-sm font-semibold">{title}</h3>
|
||||||
<p className="text-sm text-muted-foreground">{description}</p>
|
<p className="text-sm text-muted-foreground">{description}</p>
|
||||||
@@ -89,7 +92,10 @@ const SettingBlock: FC<SettingBlockProps> = (
|
|||||||
</div>)
|
</div>)
|
||||||
|
|
||||||
|
|
||||||
const BehaviourSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
const BehaviourSettingsSection: FC<Props> = (
|
||||||
|
{ sectionClassName,
|
||||||
|
onDirtyStateChange },
|
||||||
|
) => {
|
||||||
const [savedSettings, setSavedSettings] =
|
const [savedSettings, setSavedSettings] =
|
||||||
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
||||||
const [draftSettings, setDraftSettings] =
|
const [draftSettings, setDraftSettings] =
|
||||||
@@ -103,8 +109,7 @@ const BehaviourSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
|
|
||||||
const hasUnsavedChanges = useMemo (
|
const hasUnsavedChanges = useMemo (
|
||||||
() => JSON.stringify (draftSettings) !== JSON.stringify (savedSettings),
|
() => JSON.stringify (draftSettings) !== JSON.stringify (savedSettings),
|
||||||
[draftSettings, savedSettings],
|
[draftSettings, savedSettings])
|
||||||
)
|
|
||||||
|
|
||||||
const updateDraft = <Key extends keyof ClientBehaviorSettings,> (
|
const updateDraft = <Key extends keyof ClientBehaviorSettings,> (
|
||||||
key: Key,
|
key: Key,
|
||||||
@@ -124,27 +129,25 @@ const BehaviourSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
setDraftSettings (savedSettings)
|
setDraftSettings (savedSettings)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
onDirtyStateChange?.(hasUnsavedChanges, handleDiscard)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
onDirtyStateChange?.(false, () => { })
|
||||||
|
}
|
||||||
|
}, [handleDiscard, hasUnsavedChanges, onDirtyStateChange])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className={sectionClassName}>
|
<section className={sectionClassName}>
|
||||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
<div className="flex flex-wrap items-start justify-between gap-3">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<h2 className="text-xl font-bold">動作</h2>
|
<h2 className="text-xl font-bold">動作</h2>
|
||||||
<p className="text-sm text-muted-foreground">
|
|
||||||
この設定は現在のブラウザに保存されます。
|
|
||||||
</p>
|
|
||||||
<p className="text-sm text-muted-foreground">
|
|
||||||
重い端末や通信量を抑えたい場合に調整します。
|
|
||||||
</p>
|
|
||||||
{hasUnsavedChanges && (
|
|
||||||
<p className="text-sm text-amber-700 dark:text-amber-300">
|
|
||||||
未保存の変更があります
|
|
||||||
</p>)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="outline"
|
variant="destructive"
|
||||||
disabled={hasUnsavedChanges === false}
|
disabled={hasUnsavedChanges === false}
|
||||||
onClick={handleDiscard}>
|
onClick={handleDiscard}>
|
||||||
変更を破棄
|
変更を破棄
|
||||||
@@ -159,9 +162,7 @@ const BehaviourSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<SettingBlock
|
<SettingBlock title="アニメーション">
|
||||||
title="アニメーション"
|
|
||||||
description="画面遷移やレイアウト移動の動きを調整します。">
|
|
||||||
<SegmentedControl
|
<SegmentedControl
|
||||||
value={draftSettings.animation ?? 'normal'}
|
value={draftSettings.animation ?? 'normal'}
|
||||||
options={animationOptions}
|
options={animationOptions}
|
||||||
@@ -169,22 +170,27 @@ const BehaviourSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
</SettingBlock>
|
</SettingBlock>
|
||||||
|
|
||||||
<SettingBlock
|
<SettingBlock
|
||||||
title="埋め込み自動読込"
|
title="リンク先の先読み"
|
||||||
description="外部埋め込みを自動で読み込むかを切り替えます。">
|
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
|
<SegmentedControl
|
||||||
value={draftSettings.embedAutoLoad ?? 'auto'}
|
value={draftSettings.embedAutoLoad ?? 'auto'}
|
||||||
options={embedAutoLoadOptions}
|
options={embedAutoLoadOptions}
|
||||||
onChange={value => updateDraft ('embedAutoLoad', value)}/>
|
onChange={value => updateDraft ('embedAutoLoad', value)}/>
|
||||||
</SettingBlock>
|
</SettingBlock>
|
||||||
|
|
||||||
<SettingBlock
|
|
||||||
title="サムネイル表示"
|
|
||||||
description="投稿一覧や詳細の画像表示を軽量化します。">
|
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.thumbnailMode ?? 'normal'}
|
|
||||||
options={thumbnailModeOptions}
|
|
||||||
onChange={value => updateDraft ('thumbnailMode', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
</div>
|
</div>
|
||||||
</section>)
|
</section>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,10 +19,17 @@ import type { FC } from 'react'
|
|||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
sectionClassName: string
|
sectionClassName: string
|
||||||
|
onDirtyStateChange?: (
|
||||||
|
dirty: boolean,
|
||||||
|
discard: () => void,
|
||||||
|
) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const KeyboardSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
const KeyboardSettingsSection: FC<Props> = (
|
||||||
|
{ sectionClassName,
|
||||||
|
onDirtyStateChange },
|
||||||
|
) => {
|
||||||
const {
|
const {
|
||||||
keyboardSettings,
|
keyboardSettings,
|
||||||
saveKeyboardSettings,
|
saveKeyboardSettings,
|
||||||
@@ -127,15 +134,19 @@ const KeyboardSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
setCapturingActionId (null)
|
setCapturingActionId (null)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
onDirtyStateChange?.(hasUnsavedChanges, handleDiscard)
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
onDirtyStateChange?.(false, () => { })
|
||||||
|
}
|
||||||
|
}, [handleDiscard, hasUnsavedChanges, onDirtyStateChange])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className={sectionClassName}>
|
<section className={sectionClassName}>
|
||||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
<div className="flex flex-wrap items-start justify-between gap-3">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<h2 className="text-xl font-bold">キーボード</h2>
|
<h2 className="text-xl font-bold">キーボード</h2>
|
||||||
{hasUnsavedChanges && (
|
|
||||||
<p className="text-sm text-amber-700 dark:text-amber-300">
|
|
||||||
未保存の変更があります
|
|
||||||
</p>)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
@@ -152,7 +163,7 @@ const KeyboardSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="outline"
|
variant="destructive"
|
||||||
disabled={!(hasUnsavedChanges)}
|
disabled={!(hasUnsavedChanges)}
|
||||||
onClick={handleDiscard}>
|
onClick={handleDiscard}>
|
||||||
変更を破棄
|
変更を破棄
|
||||||
@@ -191,8 +202,8 @@ const KeyboardSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
|||||||
<th className="p-2 text-left">操作</th>
|
<th className="p-2 text-left">操作</th>
|
||||||
<th className="p-2 text-left">適用範囲</th>
|
<th className="p-2 text-left">適用範囲</th>
|
||||||
<th className="p-2 text-left">現在のキー</th>
|
<th className="p-2 text-left">現在のキー</th>
|
||||||
<th className="p-2 text-left">変更</th>
|
<th className="p-2 text-left"></th>
|
||||||
<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>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@@ -1,97 +0,0 @@
|
|||||||
import { createContext, useContext, useEffect, useMemo, useState } from 'react'
|
|
||||||
|
|
||||||
import {
|
|
||||||
applyClientAppearance,
|
|
||||||
DEFAULT_USER_SETTINGS,
|
|
||||||
fetchUserSettings,
|
|
||||||
} from '@/lib/settings'
|
|
||||||
|
|
||||||
import type { Dispatch, FC, ReactNode, SetStateAction } from 'react'
|
|
||||||
|
|
||||||
import type { User } from '@/types'
|
|
||||||
import type { UserSettings } from '@/lib/settings'
|
|
||||||
|
|
||||||
type ContextValue = {
|
|
||||||
loaded: boolean
|
|
||||||
error: string | null
|
|
||||||
settings: UserSettings
|
|
||||||
setSettings: Dispatch<SetStateAction<UserSettings>> }
|
|
||||||
|
|
||||||
const UserSettingsContext = createContext<ContextValue | null> (null)
|
|
||||||
|
|
||||||
|
|
||||||
export const UserSettingsProvider: FC<{
|
|
||||||
children: ReactNode
|
|
||||||
user: User | null }> = ({ children, user }) => {
|
|
||||||
const [error, setError] = useState<string | null> (null)
|
|
||||||
const [loaded, setLoaded] = useState (false)
|
|
||||||
const [settings, setSettings] = useState<UserSettings> (DEFAULT_USER_SETTINGS)
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
let cancelled = false
|
|
||||||
|
|
||||||
if (!(user))
|
|
||||||
{
|
|
||||||
setError (null)
|
|
||||||
setSettings (DEFAULT_USER_SETTINGS)
|
|
||||||
setLoaded (true)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
setLoaded (false)
|
|
||||||
setError (null)
|
|
||||||
|
|
||||||
void (async () => {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
const next = await fetchUserSettings ()
|
|
||||||
if (!(cancelled))
|
|
||||||
{
|
|
||||||
setError (null)
|
|
||||||
setSettings (next)
|
|
||||||
setLoaded (true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
if (!(cancelled))
|
|
||||||
{
|
|
||||||
setError ('設定を読み込めませんでした.既定値で表示しています.')
|
|
||||||
setSettings (DEFAULT_USER_SETTINGS)
|
|
||||||
setLoaded (true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}) ()
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
cancelled = true
|
|
||||||
}
|
|
||||||
}, [user])
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
void settings.theme
|
|
||||||
applyClientAppearance ()
|
|
||||||
}, [settings.theme])
|
|
||||||
|
|
||||||
const value = useMemo<ContextValue> (() => ({
|
|
||||||
error,
|
|
||||||
loaded,
|
|
||||||
settings,
|
|
||||||
setSettings,
|
|
||||||
}), [error, loaded, settings])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<UserSettingsContext.Provider value={value}>
|
|
||||||
{children}
|
|
||||||
</UserSettingsContext.Provider>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const useUserSettings = (): ContextValue => {
|
|
||||||
const value = useContext (UserSettingsContext)
|
|
||||||
|
|
||||||
if (value == null)
|
|
||||||
throw new Error ('UserSettingsProvider is missing')
|
|
||||||
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
+78
-26
@@ -34,6 +34,14 @@
|
|||||||
--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%;
|
--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: #9f1239;
|
||||||
--tag-colour-deerjikist-hover: #b62a51;
|
--tag-colour-deerjikist-hover: #b62a51;
|
||||||
@@ -78,6 +86,14 @@
|
|||||||
--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
|
||||||
@@ -91,7 +107,7 @@
|
|||||||
}
|
}
|
||||||
a:hover
|
a:hover
|
||||||
{
|
{
|
||||||
opacity: .85;
|
color: color-mix(in oklab, hsl(var(--theme-link)), white 18%);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,29 +127,6 @@
|
|||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
:root[data-font-size='small']
|
|
||||||
{
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
:root[data-font-size='normal']
|
|
||||||
{
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
:root[data-font-size='large']
|
|
||||||
{
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
:root[data-display-density='compact'] input,
|
|
||||||
:root[data-display-density='compact'] textarea,
|
|
||||||
:root[data-display-density='compact'] select,
|
|
||||||
:root[data-display-density='compact'] button
|
|
||||||
{
|
|
||||||
line-height: 1.25;
|
|
||||||
}
|
|
||||||
|
|
||||||
:root[data-animation='reduced'] *,
|
:root[data-animation='reduced'] *,
|
||||||
:root[data-animation='off'] *
|
:root[data-animation='off'] *
|
||||||
{
|
{
|
||||||
@@ -144,9 +137,11 @@
|
|||||||
:root[data-animation='off'] *::before,
|
:root[data-animation='off'] *::before,
|
||||||
:root[data-animation='off'] *::after
|
:root[data-animation='off'] *::after
|
||||||
{
|
{
|
||||||
animation-duration: 0.001ms !important;
|
animation-duration: 0ms !important;
|
||||||
|
animation-delay: 0ms !important;
|
||||||
animation-iteration-count: 1 !important;
|
animation-iteration-count: 1 !important;
|
||||||
transition-duration: 0.001ms !important;
|
transition-duration: 0ms !important;
|
||||||
|
transition-delay: 0ms !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
a
|
a
|
||||||
@@ -197,6 +192,63 @@ body
|
|||||||
color: var(--tag-link-hover-colour) !important;
|
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;
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import type { Transition } from 'framer-motion'
|
||||||
|
|
||||||
|
import type { ClientAnimationMode } from '@/lib/settings'
|
||||||
|
|
||||||
|
type ClientAnimationTransitionOptions = {
|
||||||
|
normal: Transition
|
||||||
|
reduced?: Transition
|
||||||
|
off?: Transition }
|
||||||
|
|
||||||
|
|
||||||
|
export const clientAnimationsOff = (
|
||||||
|
animationMode: ClientAnimationMode,
|
||||||
|
): boolean =>
|
||||||
|
animationMode === 'off'
|
||||||
|
|
||||||
|
|
||||||
|
export const clientAnimationTransition = (
|
||||||
|
animationMode: ClientAnimationMode,
|
||||||
|
{ normal, reduced, off }: ClientAnimationTransitionOptions,
|
||||||
|
): Transition => {
|
||||||
|
if (animationMode === 'off')
|
||||||
|
return off ?? { duration: 0 }
|
||||||
|
|
||||||
|
if (animationMode === 'reduced')
|
||||||
|
return reduced ?? { duration: .08, ease: 'linear' as const }
|
||||||
|
|
||||||
|
return normal
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const clientScrollBehaviour = (
|
||||||
|
animationMode: ClientAnimationMode,
|
||||||
|
): ScrollBehavior =>
|
||||||
|
animationMode === 'off' ? 'auto' : 'smooth'
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import { describe, expect, it } from 'vitest'
|
||||||
|
|
||||||
|
import { DEFAULT_KEY_BINDINGS,
|
||||||
|
formatKeyBinding,
|
||||||
|
getConflictingShortcutActionIds,
|
||||||
|
isEditableEventTarget,
|
||||||
|
keyBindingFromKeyboardEvent,
|
||||||
|
resolveShortcutScope,
|
||||||
|
SHORTCUT_DEFINITIONS_BY_ID } from '@/lib/keyboardShortcuts'
|
||||||
|
|
||||||
|
describe ('keyboardShortcuts', () => {
|
||||||
|
it ('defines the default key bindings used by the settings screen', () => {
|
||||||
|
expect (SHORTCUT_DEFINITIONS_BY_ID['global.openShortcutHelp']).toMatchObject ({
|
||||||
|
label: 'ショートカット一覧を開く',
|
||||||
|
scope: 'global',
|
||||||
|
defaultBinding: { key: '?', shift: true } })
|
||||||
|
expect (DEFAULT_KEY_BINDINGS['global.focusSearch']).toEqual ({ key: '/' })
|
||||||
|
expect (DEFAULT_KEY_BINDINGS['navigation.posts']).toEqual ({ key: 'p' })
|
||||||
|
expect (DEFAULT_KEY_BINDINGS['pagination.next']).toEqual ({ key: 'ArrowRight' })
|
||||||
|
expect (DEFAULT_KEY_BINDINGS['settings.theme']).toEqual ({ key: '3' })
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('formats key bindings for display', () => {
|
||||||
|
expect (formatKeyBinding ({ key: '?', shift: true })).toBe ('Shift + ?')
|
||||||
|
expect (formatKeyBinding ({ key: '/' })).toBe ('/')
|
||||||
|
expect (formatKeyBinding ({ key: 'p' })).toBe ('P')
|
||||||
|
expect (formatKeyBinding ({ key: 'ArrowRight' })).toBe ('ArrowRight')
|
||||||
|
expect (formatKeyBinding (null)).toBe ('未割当')
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('normalises keyboard events without assigning space by default', () => {
|
||||||
|
const event = { key: 'P',
|
||||||
|
ctrlKey: false,
|
||||||
|
shiftKey: false,
|
||||||
|
altKey: false,
|
||||||
|
metaKey: false } as KeyboardEvent
|
||||||
|
|
||||||
|
expect (keyBindingFromKeyboardEvent (event)).toEqual ({ key: 'p' })
|
||||||
|
expect (DEFAULT_KEY_BINDINGS['pagination.next']).not.toEqual ({ key: ' ' })
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('detects conflicting action bindings', () => {
|
||||||
|
const conflicts = getConflictingShortcutActionIds ({
|
||||||
|
...DEFAULT_KEY_BINDINGS,
|
||||||
|
'navigation.posts': { key: 'p' },
|
||||||
|
'navigation.tags': { key: 'p' } })
|
||||||
|
|
||||||
|
expect (conflicts.has ('navigation.posts')).toBe (true)
|
||||||
|
expect (conflicts.has ('navigation.tags')).toBe (true)
|
||||||
|
expect (conflicts.has ('navigation.wiki')).toBe (false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('resolves route scopes and editable event targets', () => {
|
||||||
|
const input = document.createElement ('input')
|
||||||
|
const div = document.createElement ('div')
|
||||||
|
div.setAttribute ('role', 'textbox')
|
||||||
|
|
||||||
|
expect (resolveShortcutScope ('/posts/search')).toBe ('postSearch')
|
||||||
|
expect (resolveShortcutScope ('/users/settings')).toBe ('settings')
|
||||||
|
expect (resolveShortcutScope ('/materials/1')).toBe ('materials')
|
||||||
|
expect (isEditableEventTarget (input)).toBe (true)
|
||||||
|
expect (isEditableEventTarget (div)).toBe (true)
|
||||||
|
expect (isEditableEventTarget (document.createElement ('button'))).toBe (false)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -17,9 +17,9 @@ export type ShortcutActionId =
|
|||||||
| 'pagination.next'
|
| 'pagination.next'
|
||||||
| 'pagination.previous'
|
| 'pagination.previous'
|
||||||
| 'settings.account'
|
| 'settings.account'
|
||||||
|
| 'settings.behavior'
|
||||||
| 'settings.theme'
|
| 'settings.theme'
|
||||||
| 'settings.keyboard'
|
| 'settings.keyboard'
|
||||||
| 'settings.behavior'
|
|
||||||
|
|
||||||
export type KeyBinding = {
|
export type KeyBinding = {
|
||||||
key: string
|
key: string
|
||||||
@@ -102,20 +102,20 @@ export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
|
|||||||
defaultBinding: { key: '1' },
|
defaultBinding: { key: '1' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'settings.theme',
|
id: 'settings.behavior',
|
||||||
label: '設定: テーマ',
|
label: '設定: 動作',
|
||||||
scope: 'settings',
|
scope: 'settings',
|
||||||
defaultBinding: { key: '2' },
|
defaultBinding: { key: '2' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'settings.keyboard',
|
id: 'settings.theme',
|
||||||
label: '設定: キーボード',
|
label: '設定: テーマ',
|
||||||
scope: 'settings',
|
scope: 'settings',
|
||||||
defaultBinding: { key: '3' },
|
defaultBinding: { key: '3' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'settings.behavior',
|
id: 'settings.keyboard',
|
||||||
label: '設定: 動作',
|
label: '設定: キーボード',
|
||||||
scope: 'settings',
|
scope: 'settings',
|
||||||
defaultBinding: { key: '4' },
|
defaultBinding: { key: '4' },
|
||||||
},
|
},
|
||||||
@@ -137,9 +137,9 @@ export const SHORTCUT_DEFINITIONS_BY_ID =
|
|||||||
'pagination.next': SHORTCUT_DEFINITIONS[6],
|
'pagination.next': SHORTCUT_DEFINITIONS[6],
|
||||||
'pagination.previous': SHORTCUT_DEFINITIONS[7],
|
'pagination.previous': SHORTCUT_DEFINITIONS[7],
|
||||||
'settings.account': SHORTCUT_DEFINITIONS[8],
|
'settings.account': SHORTCUT_DEFINITIONS[8],
|
||||||
'settings.theme': SHORTCUT_DEFINITIONS[9],
|
'settings.behavior': SHORTCUT_DEFINITIONS[9],
|
||||||
'settings.keyboard': SHORTCUT_DEFINITIONS[10],
|
'settings.theme': SHORTCUT_DEFINITIONS[10],
|
||||||
'settings.behavior': SHORTCUT_DEFINITIONS[11],
|
'settings.keyboard': SHORTCUT_DEFINITIONS[11],
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -159,9 +159,9 @@ export const DEFAULT_KEY_BINDINGS =
|
|||||||
'pagination.next': null,
|
'pagination.next': null,
|
||||||
'pagination.previous': null,
|
'pagination.previous': null,
|
||||||
'settings.account': null,
|
'settings.account': null,
|
||||||
|
'settings.behavior': null,
|
||||||
'settings.theme': null,
|
'settings.theme': null,
|
||||||
'settings.keyboard': null,
|
'settings.keyboard': null,
|
||||||
'settings.behavior': null,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
|
import { applyClientAnimationMode,
|
||||||
|
applyThemeTokens,
|
||||||
|
buildThemeTokens,
|
||||||
|
CLIENT_SETTINGS_STORAGE_KEY,
|
||||||
|
DARK_THEME_TOKENS,
|
||||||
|
DEFAULT_POST_LIST_ORDER,
|
||||||
|
getClientListLimit,
|
||||||
|
getClientListOrder,
|
||||||
|
getClientThemeMode,
|
||||||
|
LIGHT_THEME_TOKENS,
|
||||||
|
loadClientSettings,
|
||||||
|
setClientListSettings,
|
||||||
|
setClientThemeAppearance } from '@/lib/settings'
|
||||||
|
|
||||||
|
import type { FetchPostsOrder } from '@/types'
|
||||||
|
|
||||||
|
const installMatchMedia = (matches: boolean) => {
|
||||||
|
Object.defineProperty (window, 'matchMedia', {
|
||||||
|
configurable: true,
|
||||||
|
value: vi.fn ().mockImplementation (() => ({
|
||||||
|
matches,
|
||||||
|
addEventListener: vi.fn (),
|
||||||
|
removeEventListener: vi.fn () })) })
|
||||||
|
}
|
||||||
|
|
||||||
|
describe ('settings', () => {
|
||||||
|
beforeEach (() => {
|
||||||
|
localStorage.clear ()
|
||||||
|
document.documentElement.removeAttribute ('data-animation')
|
||||||
|
document.documentElement.removeAttribute ('style')
|
||||||
|
document.documentElement.className = ''
|
||||||
|
installMatchMedia (false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('stores list settings under the shared client settings key', () => {
|
||||||
|
setClientListSettings ('postSearch', {
|
||||||
|
limit: 50,
|
||||||
|
order: 'title:asc' })
|
||||||
|
|
||||||
|
expect (getClientListLimit ('postSearch')).toBe (50)
|
||||||
|
expect (getClientListOrder<FetchPostsOrder> ('postSearch')).toBe ('title:asc')
|
||||||
|
expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
|
||||||
|
.toMatchObject ({ lists: { postSearch: { limit: 50, order: 'title:asc' } } })
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('ignores invalid list limits and keeps stored order strings', () => {
|
||||||
|
localStorage.setItem (
|
||||||
|
CLIENT_SETTINGS_STORAGE_KEY,
|
||||||
|
JSON.stringify ({ lists: { postList: { limit: 30, order: DEFAULT_POST_LIST_ORDER } } }))
|
||||||
|
|
||||||
|
expect (getClientListLimit ('postList')).toBeNull ()
|
||||||
|
expect (getClientListOrder<FetchPostsOrder> ('postList')).toBe (
|
||||||
|
DEFAULT_POST_LIST_ORDER)
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('stores theme mode and light/dark slot selections in client settings', () => {
|
||||||
|
setClientThemeAppearance ({
|
||||||
|
themeMode: 'dark',
|
||||||
|
activeLightThemeSlotNo: 2,
|
||||||
|
activeDarkThemeSlotNo: 3 })
|
||||||
|
|
||||||
|
expect (getClientThemeMode ()).toBe ('dark')
|
||||||
|
expect (loadClientSettings ().appearance).toMatchObject ({
|
||||||
|
themeMode: 'dark',
|
||||||
|
activeLightThemeSlotNo: 2,
|
||||||
|
activeDarkThemeSlotNo: 3 })
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('applies animation mode to the document dataset', () => {
|
||||||
|
applyClientAnimationMode ('off')
|
||||||
|
expect (document.documentElement.dataset.animation).toBe ('off')
|
||||||
|
|
||||||
|
applyClientAnimationMode ('reduced')
|
||||||
|
expect (document.documentElement.dataset.animation).toBe ('reduced')
|
||||||
|
|
||||||
|
applyClientAnimationMode ('normal')
|
||||||
|
expect (document.documentElement.dataset.animation).toBeUndefined ()
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('normalises TopNav menu link tokens to complete CSS colours', () => {
|
||||||
|
const tokens = buildThemeTokens ('light', {
|
||||||
|
link: '221.2 83.2% 53.3%',
|
||||||
|
topNavMenuLink: '221.2 83.2% 53.3%' })
|
||||||
|
|
||||||
|
expect (tokens.link).toBe ('221.2 83.2% 53.3%')
|
||||||
|
expect (tokens.topNavMenuLink).toBe ('hsl(221.2 83.2% 53.3%)')
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('derives TopNav colours without mixing mobile active backgrounds', () => {
|
||||||
|
expect (buildThemeTokens ('light', { }).topNavMobileActiveBackground).toBe (
|
||||||
|
LIGHT_THEME_TOKENS.topNavRootBackgroundDesktop)
|
||||||
|
expect (buildThemeTokens ('dark', { }).topNavMobileActiveBackground).toBe (
|
||||||
|
DARK_THEME_TOKENS.topNavActiveBackground)
|
||||||
|
})
|
||||||
|
|
||||||
|
it ('sets shadcn tokens and TopNav tokens with their different value formats', () => {
|
||||||
|
const tokens = buildThemeTokens ('dark', { link: '213.1 93.9% 67.8%' })
|
||||||
|
|
||||||
|
applyThemeTokens (tokens)
|
||||||
|
|
||||||
|
expect (document.documentElement.style.getPropertyValue ('--theme-link')).toBe (
|
||||||
|
'213.1 93.9% 67.8%')
|
||||||
|
expect (document.documentElement.style.getPropertyValue ('--top-nav-menu-link')).toBe (
|
||||||
|
'hsl(213.1 93.9% 67.8%)')
|
||||||
|
})
|
||||||
|
})
|
||||||
+884
-277
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -0,0 +1,26 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -25,6 +25,7 @@ import {
|
|||||||
getEffectiveKeyBindings,
|
getEffectiveKeyBindings,
|
||||||
setClientKeyboardSettings,
|
setClientKeyboardSettings,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
|
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
KeyBinding,
|
KeyBinding,
|
||||||
@@ -96,6 +97,7 @@ const focusSearchTarget = (): void => {
|
|||||||
export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
|
const { confirmDiscardNavigation } = useUnsavedChangesGuard ()
|
||||||
|
|
||||||
const [keyboardSettings, setKeyboardSettingsState] =
|
const [keyboardSettings, setKeyboardSettingsState] =
|
||||||
useState<ClientKeyboardSettings> (() => getClientKeyboardSettings ())
|
useState<ClientKeyboardSettings> (() => getClientKeyboardSettings ())
|
||||||
@@ -146,6 +148,13 @@ export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
const guardedNavigate = useCallback ((path: string) => {
|
||||||
|
confirmDiscardNavigation ().then (confirmed => {
|
||||||
|
if (confirmed)
|
||||||
|
navigate (path)
|
||||||
|
})
|
||||||
|
}, [confirmDiscardNavigation, navigate])
|
||||||
|
|
||||||
const builtinHandlers = useMemo<ShortcutHandlers> (
|
const builtinHandlers = useMemo<ShortcutHandlers> (
|
||||||
() => ({
|
() => ({
|
||||||
'global.openShortcutHelp': () => {
|
'global.openShortcutHelp': () => {
|
||||||
@@ -154,16 +163,16 @@ export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
'global.focusSearch': () => {
|
'global.focusSearch': () => {
|
||||||
focusSearchTarget ()
|
focusSearchTarget ()
|
||||||
},
|
},
|
||||||
'navigation.posts': () => navigate ('/posts'),
|
'navigation.posts': () => guardedNavigate ('/posts'),
|
||||||
'navigation.tags': () => navigate ('/tags'),
|
'navigation.tags': () => guardedNavigate ('/tags'),
|
||||||
'navigation.materials': () => navigate ('/materials'),
|
'navigation.materials': () => guardedNavigate ('/materials'),
|
||||||
'navigation.wiki': () => navigate ('/wiki'),
|
'navigation.wiki': () => guardedNavigate ('/wiki'),
|
||||||
'settings.account': () => navigate ('/users/settings?tab=account'),
|
'settings.account': () => guardedNavigate ('/users/settings?tab=account'),
|
||||||
'settings.theme': () => navigate ('/users/settings?tab=theme'),
|
'settings.theme': () => guardedNavigate ('/users/settings?tab=theme'),
|
||||||
'settings.keyboard': () => navigate ('/users/settings?tab=keyboard'),
|
'settings.keyboard': () => guardedNavigate ('/users/settings?tab=keyboard'),
|
||||||
'settings.behavior': () => navigate ('/users/settings?tab=behavior'),
|
'settings.behavior': () => guardedNavigate ('/users/settings?tab=behavior'),
|
||||||
}),
|
}),
|
||||||
[navigate],
|
[guardedNavigate],
|
||||||
)
|
)
|
||||||
|
|
||||||
const availableActionIds = useMemo<Set<ShortcutActionId>> (
|
const availableActionIds = useMemo<Set<ShortcutActionId>> (
|
||||||
@@ -219,7 +228,7 @@ export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
return
|
return
|
||||||
|
|
||||||
const actionId = candidates[0].id
|
const actionId = candidates[0].id
|
||||||
const handler = builtinHandlers[actionId] ?? mergedRegisteredHandlers[actionId]
|
const handler = mergedRegisteredHandlers[actionId] ?? builtinHandlers[actionId]
|
||||||
|
|
||||||
if (handler == null)
|
if (handler == null)
|
||||||
return
|
return
|
||||||
@@ -282,10 +291,27 @@ export const useKeyboardShortcutSettings = (): KeyboardShortcutsContextValue =>
|
|||||||
|
|
||||||
export const useKeyboardShortcuts = (handlers: ShortcutHandlers): void => {
|
export const useKeyboardShortcuts = (handlers: ShortcutHandlers): void => {
|
||||||
const { registerHandlers } = useKeyboardShortcutSettings ()
|
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 (
|
useEffect (
|
||||||
() => registerHandlers (handlers),
|
() => registerHandlers (stableHandlers),
|
||||||
[handlers, registerHandlers],
|
[registerHandlers, stableHandlers],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -28,6 +28,7 @@ import {
|
|||||||
getClientGekanatorBackgroundMotion,
|
getClientGekanatorBackgroundMotion,
|
||||||
setClientGekanatorBackgroundMotion,
|
setClientGekanatorBackgroundMotion,
|
||||||
} from '@/lib/settings'
|
} 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'
|
||||||
@@ -3677,6 +3678,8 @@ 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 ()
|
||||||
@@ -4069,9 +4072,12 @@ 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 (prefersReducedMotion)
|
if (animationMode === 'reduced' || prefersReducedMotion)
|
||||||
return 'calm'
|
return 'calm'
|
||||||
|
|
||||||
return backgroundMotionMode
|
return backgroundMotionMode
|
||||||
|
|||||||
@@ -9,14 +9,18 @@ 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)
|
||||||
@@ -55,8 +59,9 @@ 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 ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({
|
||||||
}, [location.search])
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
|
}, [animationMode, location.search])
|
||||||
|
|
||||||
const handleSearch = (event: FormEvent) => {
|
const handleSearch = (event: FormEvent) => {
|
||||||
event.preventDefault ()
|
event.preventDefault ()
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ 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 { getClientThumbnailMode } from '@/lib/settings'
|
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,8 +30,17 @@ type Props = { user: User | null }
|
|||||||
|
|
||||||
const PostDetailPage: FC<Props> = ({ user }) => {
|
const PostDetailPage: FC<Props> = ({ user }) => {
|
||||||
const editable = canEditContent (user)
|
const editable = canEditContent (user)
|
||||||
const thumbnailMode = getClientThumbnailMode ()
|
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)
|
||||||
|
|
||||||
@@ -138,12 +147,12 @@ const PostDetailPage: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
{thumbnailMode !== 'off' && (post.thumbnail || post.thumbnailBase) && (
|
{thumbnailMode !== 'off' && (post.thumbnail || post.thumbnailBase) && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={`page-${ id }`}
|
layoutId={heroLayoutId}
|
||||||
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={{ duration: .2, ease: 'easeOut' }}>
|
transition={heroTransition}>
|
||||||
<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}
|
||||||
|
|||||||
@@ -12,9 +12,12 @@ 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'
|
||||||
@@ -37,6 +40,12 @@ 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)
|
||||||
@@ -113,8 +122,9 @@ const PostHistoryPage: FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({
|
||||||
}, [location.search])
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
|
}, [animationMode, location.search])
|
||||||
|
|
||||||
const layoutIds: string[] = []
|
const layoutIds: string[] = []
|
||||||
|
|
||||||
@@ -198,8 +208,8 @@ const PostHistoryPage: FC = () => {
|
|||||||
rowSpan={rowsCnt}>
|
rowSpan={rowsCnt}>
|
||||||
<PrefetchLink to={`/posts/${ change.postId }`}>
|
<PrefetchLink to={`/posts/${ change.postId }`}>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={layoutId}
|
layoutId={animationMode === 'off' ? undefined : layoutId}
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
transition={{ layout: layoutTransition }}>
|
||||||
<img src={change.thumbnail.current
|
<img src={change.thumbnail.current
|
||||||
|| change.thumbnailBase.current
|
|| change.thumbnailBase.current
|
||||||
|| undefined}
|
|| undefined}
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import PostListPage from '@/pages/posts/PostListPage'
|
import 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 (),
|
||||||
@@ -18,6 +19,11 @@ 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 ({
|
||||||
@@ -36,6 +42,7 @@ describe ('PostListPage', () => {
|
|||||||
match: 'all',
|
match: 'all',
|
||||||
page: 2,
|
page: 2,
|
||||||
limit: 20,
|
limit: 20,
|
||||||
|
order: 'original_created_at:desc',
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -71,4 +78,36 @@ 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 }),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -30,16 +30,12 @@ describe ('PostNewPage', () => {
|
|||||||
expect (screen.getByText ('403')).toBeInTheDocument ()
|
expect (screen.getByText ('403')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('submits a new post with manual title and thumbnail settings', async () => {
|
it ('submits a new post with manual title and thumbnail fetch UI', async () => {
|
||||||
api.apiPost.mockResolvedValueOnce ({})
|
api.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: '投稿タイトル' } })
|
||||||
@@ -97,10 +93,6 @@ 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: '投稿タイトル' } })
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ 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 (),
|
||||||
@@ -18,6 +19,7 @@ vi.mock ('@/lib/api', () => api)
|
|||||||
|
|
||||||
describe ('PostSearchPage', () => {
|
describe ('PostSearchPage', () => {
|
||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
|
localStorage.clear ()
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
api.apiGet.mockResolvedValue ([])
|
api.apiGet.mockResolvedValue ([])
|
||||||
})
|
})
|
||||||
@@ -40,6 +42,7 @@ describe ('PostSearchPage', () => {
|
|||||||
tags: 'x',
|
tags: 'x',
|
||||||
match: 'any',
|
match: 'any',
|
||||||
page: 2,
|
page: 2,
|
||||||
|
limit: 20,
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -81,4 +84,41 @@ 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,6 +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 {
|
import {
|
||||||
@@ -24,6 +26,7 @@ import {
|
|||||||
LIST_LIMIT_OPTIONS,
|
LIST_LIMIT_OPTIONS,
|
||||||
setClientListSettings,
|
setClientListSettings,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
|
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
||||||
import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
|
import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
@@ -67,6 +70,13 @@ const parseOrder = (value: string | null): FetchPostsOrder | 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 ()
|
||||||
@@ -141,9 +151,11 @@ const PostSearchPage: FC = () => {
|
|||||||
setUpdatedFrom (qUpdatedFrom)
|
setUpdatedFrom (qUpdatedFrom)
|
||||||
setUpdatedTo (qUpdatedTo)
|
setUpdatedTo (qUpdatedTo)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({
|
||||||
}, [location.search, qCreatedFrom, qCreatedTo, qMatch, qOriginalCreatedFrom,
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom, qUpdatedTo, qURL])
|
}, [animationMode, location.search, qCreatedFrom, qCreatedTo, qMatch,
|
||||||
|
qOriginalCreatedFrom, qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom,
|
||||||
|
qUpdatedTo, qURL])
|
||||||
|
|
||||||
const search = async () => {
|
const search = async () => {
|
||||||
const qs = new URLSearchParams ()
|
const qs = new URLSearchParams ()
|
||||||
@@ -400,11 +412,10 @@ const PostSearchPage: FC = () => {
|
|||||||
<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={`page-${ row.id }`}
|
layoutId={animationMode === 'off'
|
||||||
transition={{ type: 'spring',
|
? undefined
|
||||||
stiffness: 500,
|
: `page-${ row.id }`}
|
||||||
damping: 40,
|
transition={thumbnailTransition}>
|
||||||
mass: .5 }}>
|
|
||||||
<img src={row.thumbnail || row.thumbnailBase || undefined}
|
<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,6 +6,7 @@ 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 (() => ({
|
||||||
@@ -27,6 +28,7 @@ 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,8 +17,10 @@ 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'
|
||||||
|
|
||||||
@@ -38,6 +40,8 @@ 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 ()
|
||||||
@@ -152,8 +156,9 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
|||||||
setLinkStatus (qLinkStatus)
|
setLinkStatus (qLinkStatus)
|
||||||
setEditingId (null)
|
setEditingId (null)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({
|
||||||
}, [location.search, qLinkedTag, qLinkStatus, qName])
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
|
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
if (!(data))
|
if (!(data))
|
||||||
|
|||||||
@@ -11,8 +11,10 @@ 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'
|
||||||
@@ -43,6 +45,8 @@ 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')
|
||||||
@@ -58,8 +62,9 @@ const TagHistoryPage: FC = () => {
|
|||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({
|
||||||
}, [location.search])
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
|
}, [animationMode, location.search])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MainArea>
|
<MainArea>
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import TagListPage from '@/pages/tags/TagListPage'
|
import 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 (),
|
||||||
@@ -12,6 +13,11 @@ 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 ({
|
||||||
@@ -38,6 +44,8 @@ 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,
|
||||||
}),
|
}),
|
||||||
@@ -48,7 +56,7 @@ describe ('TagListPage', () => {
|
|||||||
'/tags/7',
|
'/tags/7',
|
||||||
)
|
)
|
||||||
expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
|
expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
|
||||||
expect (screen.getAllByRole ('combobox')[1]).toHaveValue ('1')
|
expect (screen.getAllByRole ('combobox')[2]).toHaveValue ('1')
|
||||||
expect (screen.getAllByText ('廃止')).toHaveLength (2)
|
expect (screen.getAllByText ('廃止')).toHaveLength (2)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -58,7 +66,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')[0], {
|
fireEvent.change (screen.getAllByRole ('combobox')[1], {
|
||||||
target: { value: 'character' },
|
target: { value: 'character' },
|
||||||
})
|
})
|
||||||
fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
|
fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
|
||||||
@@ -82,4 +90,41 @@ 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,6 +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 {
|
import {
|
||||||
DEFAULT_POST_LIST_LIMIT,
|
DEFAULT_POST_LIST_LIMIT,
|
||||||
@@ -22,6 +23,7 @@ import {
|
|||||||
LIST_LIMIT_OPTIONS,
|
LIST_LIMIT_OPTIONS,
|
||||||
setClientListSettings,
|
setClientListSettings,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
|
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
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'
|
||||||
@@ -71,6 +73,8 @@ const parseOrder = (value: string | null): FetchTagsOrder | 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 ()
|
||||||
@@ -145,9 +149,11 @@ const TagListPage: FC = () => {
|
|||||||
setUpdatedTo (qUpdatedTo)
|
setUpdatedTo (qUpdatedTo)
|
||||||
setDeprecated (qDeprecated)
|
setDeprecated (qDeprecated)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({
|
||||||
}, [location.search, qCategory, qCreatedFrom, qCreatedTo, qName, qPostCountGTE,
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
qPostCountLTE, qUpdatedFrom, qUpdatedTo, qDeprecated])
|
}, [animationMode, location.search, qCategory, qCreatedFrom, qCreatedTo,
|
||||||
|
qName, qPostCountGTE, qPostCountLTE, qUpdatedFrom, qUpdatedTo,
|
||||||
|
qDeprecated])
|
||||||
|
|
||||||
const handleSearch = (e: FormEvent) => {
|
const handleSearch = (e: FormEvent) => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ 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', () => ({
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ 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 {
|
import {
|
||||||
getClientTheatreLayoutMode,
|
getClientTheatreLayoutMode,
|
||||||
@@ -22,6 +24,7 @@ import {
|
|||||||
setClientTheatreLayoutMode,
|
setClientTheatreLayoutMode,
|
||||||
setClientTheatreTagFlow,
|
setClientTheatreTagFlow,
|
||||||
} from '@/lib/settings'
|
} 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'
|
||||||
@@ -57,8 +60,6 @@ const INITIAL_THEATRE_INFO: TheatreInfo =
|
|||||||
const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
|
const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
|
||||||
{ tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
|
{ tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
|
||||||
|
|
||||||
const LAYOUT_STORAGE_KEY = 'theatre-layout-mode'
|
|
||||||
const TAG_FLOW_STORAGE_KEY = 'theatre-tag-flow'
|
|
||||||
const MIN_MAIN_WIDTH = 360
|
const MIN_MAIN_WIDTH = 360
|
||||||
const SIDEBAR_GAP_WIDTH = 16
|
const SIDEBAR_GAP_WIDTH = 16
|
||||||
|
|
||||||
@@ -214,6 +215,12 @@ 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 ()
|
||||||
|
|
||||||
@@ -620,7 +627,9 @@ 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 ({ top: 0, behavior: 'smooth' })
|
commentsRef.current?.scrollTo ({
|
||||||
|
top: 0,
|
||||||
|
behavior: clientScrollBehaviour (animationMode) })
|
||||||
}
|
}
|
||||||
catch (error)
|
catch (error)
|
||||||
{
|
{
|
||||||
@@ -837,8 +846,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<motion.div
|
<motion.div
|
||||||
layout="position"
|
layout={animationMode === 'off' ? false : 'position'}
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
transition={{ layout: layoutTransition }}
|
||||||
className="min-h-0 flex-1 overflow-y-auto bg-zinc-50 text-zinc-950
|
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>
|
||||||
@@ -862,7 +871,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
</SidebarComponent>)}
|
</SidebarComponent>)}
|
||||||
|
|
||||||
<motion.main
|
<motion.main
|
||||||
layout="position"
|
layout={animationMode === 'off' ? false : 'position'}
|
||||||
className="order-1 min-w-0 flex-1 space-y-4 md:order-none
|
className="order-1 min-w-0 flex-1 space-y-4 md:order-none
|
||||||
md:min-w-[360px] md:overflow-y-auto">
|
md:min-w-[360px] md:overflow-y-auto">
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ 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 (),
|
||||||
}))
|
}))
|
||||||
@@ -27,12 +28,23 @@ 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.getByText ('Loading...')).toBeInTheDocument ()
|
expect (screen.getAllByText ('Loading...').length).toBeGreaterThan (0)
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('updates the current user name', async () => {
|
it ('updates the current user name', async () => {
|
||||||
@@ -42,8 +54,9 @@ describe ('SettingPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
|
renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: 'new' } })
|
const nameInput = (await screen.findAllByRole ('textbox'))[0]
|
||||||
fireEvent.click (screen.getByRole ('button', { name: '更新' }))
|
fireEvent.change (nameInput, { target: { value: 'new' } })
|
||||||
|
fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
|
||||||
|
|
||||||
await waitFor (() => {
|
await waitFor (() => {
|
||||||
expect (api.apiPut).toHaveBeenCalledWith (
|
expect (api.apiPut).toHaveBeenCalledWith (
|
||||||
@@ -55,7 +68,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 () => {
|
||||||
@@ -75,10 +88,11 @@ describe ('SettingPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
|
renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '' } })
|
const nameInput = (await screen.findAllByRole ('textbox'))[0]
|
||||||
fireEvent.click (screen.getByRole ('button', { name: '更新' }))
|
fireEvent.change (nameInput, { target: { value: '' } })
|
||||||
|
fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
|
||||||
|
|
||||||
expect (await screen.findByText ('名前は必須です.')).toBeInTheDocument ()
|
expect ((await screen.findAllByText ('名前は必須です.')).length).toBeGreaterThan (0)
|
||||||
expect (screen.getByRole ('textbox')).toHaveAttribute ('aria-invalid', 'true')
|
expect (nameInput).toHaveAttribute ('aria-invalid', 'true')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -3,6 +3,10 @@ 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 = {
|
||||||
@@ -15,21 +19,25 @@ 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 ?? '/']}>
|
||||||
{children}
|
<DialogueProvider>
|
||||||
|
<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,3 +20,10 @@ 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 })) })
|
||||||
|
|||||||
新しい課題から参照
ユーザをブロックする