コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
1881b8b384 | ||
|
|
936886a9bc |
@@ -36,13 +36,10 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
|
||||
type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
|
||||
tags: string
|
||||
setTags: (tags: string) => void
|
||||
label?: ReactNode
|
||||
errors?: ReactNode[] }
|
||||
|
||||
|
||||
const PostFormTagsArea: FC<Props> = (
|
||||
{ tags, setTags, label: fieldLabel, errors, ...rest },
|
||||
) => {
|
||||
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
|
||||
const { label } = useUITranslation ('navigation')
|
||||
const locale = useLocale ()
|
||||
const ref = useRef<HTMLTextAreaElement> (null)
|
||||
@@ -120,10 +117,7 @@ const PostFormTagsArea: FC<Props> = (
|
||||
}, [locale])
|
||||
|
||||
return (
|
||||
<FormField
|
||||
className="relative w-full"
|
||||
label={fieldLabel ?? label ('tags')}
|
||||
messages={errors}>
|
||||
<FormField className="relative w-full" label={label ('tags')} messages={errors}>
|
||||
{({ describedBy, invalid }) => (
|
||||
<>
|
||||
<TextArea
|
||||
|
||||
@@ -39,6 +39,18 @@ describe ('TagDetailSidebar', () => {
|
||||
vi.clearAllMocks ()
|
||||
})
|
||||
|
||||
it ('inherits the sidebar width saved by the post list', () => {
|
||||
localStorage.setItem ('sidebar:posts-index-tags:left:width', '320')
|
||||
|
||||
const { container } = renderWithProviders (
|
||||
<TagDetailSidebar post={buildPost ()}/>)
|
||||
const sidebar = container.querySelector<HTMLElement> (
|
||||
'[style*="--sidebar-width"]')
|
||||
|
||||
expect (sidebar).toBeInTheDocument ()
|
||||
expect (sidebar?.style.getPropertyValue ('--sidebar-width')).toBe ('320px')
|
||||
})
|
||||
|
||||
it ('keeps internal and external tags with the same numeric id in flat mode', () => {
|
||||
setClientTagRelationDisplayMode ('flat')
|
||||
|
||||
|
||||
@@ -378,7 +378,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
||||
}, [baseTags])
|
||||
|
||||
return (
|
||||
<SidebarComponent sidebarKey="post-detail-tags" className={className}>
|
||||
<SidebarComponent sidebarKey="posts-index-tags" className={className}>
|
||||
<TagSearch/>
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
|
||||
@@ -6,10 +6,11 @@ import { useLocation } from 'react-router-dom'
|
||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||
import TagLink from '@/components/TagLink'
|
||||
import SortHeader from '@/components/SortHeader'
|
||||
import PostFormTagsArea from '@/components/PostFormTagsArea'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
import FormField from '@/components/common/FormField'
|
||||
import PageTitle from '@/components/common/PageTitle'
|
||||
import Pagination from '@/components/common/Pagination'
|
||||
import TextArea from '@/components/common/TextArea'
|
||||
import useDialogue from '@/lib/dialogues/useDialogue'
|
||||
import MainArea from '@/components/layout/MainArea'
|
||||
import { toast } from '@/components/ui/use-toast'
|
||||
@@ -356,18 +357,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||
dark:bg-rose-950/30">
|
||||
<td colSpan={editable ? 5 : 4} className="p-3">
|
||||
<div className="space-y-2">
|
||||
<PostFormTagsArea
|
||||
<label htmlFor={`nico-links-${ tag.id }`}
|
||||
className="block text-sm font-semibold">
|
||||
{label ('nico.tagsToLink')}
|
||||
</label>
|
||||
<TextArea
|
||||
id={`nico-links-${ tag.id }`}
|
||||
label={label ('nico.tagsToLink')}
|
||||
aria-label={message ('nico.tagsToLink').text}
|
||||
tags={rawTags[tag.id] ?? ''}
|
||||
errors={errors}
|
||||
value={rawTags[tag.id] ?? ''}
|
||||
invalid={(errorsByTagId[tag.id] ?? []).length > 0}
|
||||
className="min-h-24 resize-y"
|
||||
placeholder={message ('nico.tagsPlaceholder').text}
|
||||
lang={message ('nico.tagsPlaceholder').language}
|
||||
setTags={value => setRawTags (rawTags => ({
|
||||
onChange={e => setRawTags (rawTags => ({
|
||||
...rawTags,
|
||||
[tag.id]: value}))}/>
|
||||
[tag.id]: e.target.value}))}/>
|
||||
<FieldError messages={errors}/>
|
||||
<div className="flex justify-end gap-2">
|
||||
<button
|
||||
type="button"
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする