コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
753b679b9a |
@@ -177,6 +177,37 @@ const PostEmbed: FC<Props> = (
|
||||
onError={onError}/>)
|
||||
}
|
||||
|
||||
case 'pixiv.net':
|
||||
{
|
||||
if (url.hostname !== 'pixiv.net' && url.hostname !== 'www.pixiv.net')
|
||||
break
|
||||
|
||||
const artworkId =
|
||||
url.pathname === '/member_illust.php'
|
||||
? url.searchParams.get ('illust_id')
|
||||
: url.pathname.match (
|
||||
/^\/(?:[a-z]{2}(?:-[A-Za-z]{2})?\/)?artworks\/(\d+)\/?$/)?.[1]
|
||||
|
||||
if (!(artworkId) || !(/^\d+$/.test (artworkId)))
|
||||
break
|
||||
|
||||
if (embedAutoLoadMode === 'off')
|
||||
return externalLink
|
||||
if (shouldLoadEmbed === false)
|
||||
return manualLoadControl
|
||||
|
||||
const embedUrl =
|
||||
`https://embed.pixiv.net/oembed_iframe.php?type=illust&id=${ artworkId }`
|
||||
|
||||
return (
|
||||
<iframe
|
||||
src={embedUrl}
|
||||
title={post.title || post.url}
|
||||
width={600}
|
||||
height={315}
|
||||
className="max-w-full"/>)
|
||||
}
|
||||
|
||||
case 'twitter.com':
|
||||
case 'x.com':
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -162,13 +162,12 @@ describe ('NicoTagListPage', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it ('saves links after completing the tag at the cursor', async () => {
|
||||
it ('updates links from a tag card', async () => {
|
||||
api.apiGet
|
||||
.mockResolvedValueOnce ({
|
||||
tags: [buildNicoTag ({ id: 7, name: 'nico:source' })],
|
||||
count: 1,
|
||||
})
|
||||
.mockResolvedValueOnce ([buildTag ({ id: 8, name: '連携先', postCount: 3 })])
|
||||
.mockResolvedValueOnce ({
|
||||
tags: [
|
||||
buildNicoTag ({
|
||||
@@ -184,24 +183,8 @@ describe ('NicoTagListPage', () => {
|
||||
renderPage ()
|
||||
|
||||
fireEvent.click (await screen.findByRole ('button', { name: '編集' }))
|
||||
const textarea = screen.getByLabelText ('連携する広場タグ')
|
||||
fireEvent.change (textarea, { target: { value: '既存 連携\n後続' } })
|
||||
fireEvent.focus (textarea)
|
||||
fireEvent.select (textarea, {
|
||||
target: { selectionStart: 4, selectionEnd: 4 } })
|
||||
|
||||
await waitFor (() => {
|
||||
expect (api.apiGet).toHaveBeenCalledWith (
|
||||
'/tags/autocomplete',
|
||||
{ locale: 'ja', params: { q: '連携', nico: '0' },
|
||||
signal: expect.any (AbortSignal) })
|
||||
})
|
||||
fireEvent.mouseDown (await screen.findByText ('連携先'))
|
||||
|
||||
expect (textarea).toHaveValue ('既存 連携先 \n後続')
|
||||
await waitFor (() => {
|
||||
expect ((textarea as HTMLTextAreaElement).selectionStart).toBe (7)
|
||||
expect ((textarea as HTMLTextAreaElement).selectionEnd).toBe (7)
|
||||
fireEvent.change (screen.getByLabelText ('連携する広場タグ'), {
|
||||
target: { value: '連携先' },
|
||||
})
|
||||
fireEvent.click (screen.getByRole ('button', { name: '保存' }))
|
||||
|
||||
@@ -212,8 +195,6 @@ describe ('NicoTagListPage', () => {
|
||||
{ locale: 'ja', headers: { 'Content-Type': 'multipart/form-data' } },
|
||||
)
|
||||
})
|
||||
const payload = api.apiPut.mock.calls[0][1] as FormData
|
||||
expect (payload.get ('tags')).toBe ('既存 連携先 \n後続')
|
||||
expect (await screen.findByText ('1 件')).toBeInTheDocument ()
|
||||
})
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする