Revert "Merge upstream changes up to df72a2dbbec8173515568c02427076ebff5c2297"

This commit is contained in:
Claire
2025-09-25 18:29:45 +02:00
committed by GitHub
parent 805a19e288
commit 855c3be3d7
101 changed files with 759 additions and 945 deletions

View File

@@ -3,7 +3,6 @@ import { useIntl } from 'react-intl';
import classNames from 'classnames';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import { IconButton } from '../icon_button';
@@ -11,23 +10,21 @@ import { IconButton } from '../icon_button';
* Snackbar/Toast-style notification component.
*/
export const Alert: React.FC<{
isActive?: boolean;
animateFrom?: 'side' | 'below';
title?: string;
message: string;
action?: string;
onActionClick?: () => void;
onDismiss?: () => void;
isActive?: boolean;
isLoading?: boolean;
animateFrom?: 'side' | 'below';
}> = ({
isActive,
animateFrom = 'side',
title,
message,
action,
onActionClick,
onDismiss,
isActive,
isLoading,
animateFrom = 'side',
}) => {
const intl = useIntl();
@@ -54,13 +51,7 @@ export const Alert: React.FC<{
</button>
)}
{isLoading && (
<span className='notification-bar__loading-indicator'>
<LoadingIndicator />
</span>
)}
{onDismiss && !isLoading && (
{onDismiss && (
<IconButton
title={intl.formatMessage({
id: 'dismissable_banner.dismiss',