Merge branch 'gallery-load-more' into 'develop'

Fix load more button height on account gallery page

See merge request soapbox-pub/soapbox!2318
useentities-spread
marcin mikołajczak 2023-03-10 10:52:00 +00:00
commit 51524118d4
2 zmienionych plików z 5 dodań i 4 usunięć

Wyświetl plik

@ -6,16 +6,17 @@ import { Button } from 'soapbox/components/ui';
interface ILoadMore {
onClick: React.MouseEventHandler
disabled?: boolean
visible?: Boolean
visible?: boolean
className?: string
}
const LoadMore: React.FC<ILoadMore> = ({ onClick, disabled, visible = true }) => {
const LoadMore: React.FC<ILoadMore> = ({ onClick, disabled, visible = true, className }) => {
if (!visible) {
return null;
}
return (
<Button theme='primary' block disabled={disabled || !visible} onClick={onClick}>
<Button className={className} theme='primary' block disabled={disabled || !visible} onClick={onClick}>
<FormattedMessage id='status.load_more' defaultMessage='Load more' />
</Button>
);

Wyświetl plik

@ -121,7 +121,7 @@ const AccountGallery = () => {
let loadOlder = null;
if (hasMore && !(isLoading && attachments.size === 0)) {
loadOlder = <LoadMore visible={!isLoading} onClick={handleLoadOlder} />;
loadOlder = <LoadMore className='my-auto' visible={!isLoading} onClick={handleLoadOlder} />;
}
if (unavailable) {