Fix: #918 アカウントのアンテナ追加画面、除外アンテナ追加画面のデザインが崩れている問題 (#922)

This commit is contained in:
KMY(雪あすか) 2024-12-03 17:39:27 +09:00 committed by GitHub
parent 18fb6f7faa
commit 549986fce5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -14,6 +14,7 @@ import {
apiAddExcludeAccountToAntenna, apiAddExcludeAccountToAntenna,
apiRemoveAccountFromAntenna, apiRemoveAccountFromAntenna,
apiRemoveExcludeAccountFromAntenna, apiRemoveExcludeAccountFromAntenna,
apiGetExcludeAccountAntennas,
} from 'mastodon/api/antennas'; } from 'mastodon/api/antennas';
import type { ApiAntennaJSON } from 'mastodon/api_types/antennas'; import type { ApiAntennaJSON } from 'mastodon/api_types/antennas';
import { Button } from 'mastodon/components/button'; import { Button } from 'mastodon/components/button';
@ -53,8 +54,8 @@ const AntennaItem: React.FC<{
return ( return (
// eslint-disable-next-line jsx-a11y/label-has-associated-control // eslint-disable-next-line jsx-a11y/label-has-associated-control
<label className='antennas__item'> <label className='lists__item'>
<div className='antennas__item__title'> <div className='lists__item__title'>
<Icon id='antenna-ul' icon={AntennaIcon} /> <Icon id='antenna-ul' icon={AntennaIcon} />
<span>{title}</span> <span>{title}</span>
</div> </div>
@ -94,8 +95,8 @@ const NewAntennaItem: React.FC<{
}, [setTitle, dispatch, onCreate, title]); }, [setTitle, dispatch, onCreate, title]);
return ( return (
<form className='antennas__item' onSubmit={handleSubmit}> <form className='lists__item' onSubmit={handleSubmit}>
<label className='antennas__item__title'> <label className='lists__item__title'>
<Icon id='antenna-ul' icon={AntennaIcon} /> <Icon id='antenna-ul' icon={AntennaIcon} />
<input <input
@ -127,7 +128,11 @@ const AntennaAdder: React.FC<{
useEffect(() => { useEffect(() => {
dispatch(fetchAntennas()); dispatch(fetchAntennas());
apiGetAccountAntennas(accountId) const api = isExclude
? apiGetExcludeAccountAntennas
: apiGetAccountAntennas;
api(accountId)
.then((data) => { .then((data) => {
setAntennaIds(data.map((l) => l.id)); setAntennaIds(data.map((l) => l.id));
return ''; return '';
@ -135,7 +140,7 @@ const AntennaAdder: React.FC<{
.catch(() => { .catch(() => {
// Nothing // Nothing
}); });
}, [dispatch, setAntennaIds, accountId]); }, [dispatch, setAntennaIds, accountId, isExclude]);
const handleToggle = useCallback( const handleToggle = useCallback(
(antennaId: string, checked: boolean) => { (antennaId: string, checked: boolean) => {
@ -205,7 +210,7 @@ const AntennaAdder: React.FC<{
</div> </div>
<div className='dialog-modal__content'> <div className='dialog-modal__content'>
<div className='antennas-scrollable'> <div className='lists-scrollable'>
<NewAntennaItem onCreate={handleCreate} /> <NewAntennaItem onCreate={handleCreate} />
{antennas.map((antenna) => ( {antennas.map((antenna) => (