Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -648,4 +648,23 @@ describe('PerpsToastProvider', () => {
screen.queryByText(messages.perpsToastMarginAdjustmentFailed.message),
).not.toBeInTheDocument();
});

it('renders the toast via portal to document.body, not inside the provider subtree', () => {
const { container } = renderWithProvider(
<PerpsToastProvider>
<ToastHarness />
</PerpsToastProvider>,
getStore(),
);

fireEvent.click(screen.getByRole('button', { name: 'Show Info' }));

expect(screen.getByText('Submitting order...')).toBeInTheDocument();
expect(
container.querySelector('[data-testid="perps-toast"]'),
).not.toBeInTheDocument();
expect(
document.body.querySelector('[data-testid="perps-toast"]'),
).toBeInTheDocument();
});
});
36 changes: 20 additions & 16 deletions ui/components/app/perps/perps-toast/perps-toast-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import React, {
useState,
type ReactNode,
} from 'react';
import ReactDOM from 'react-dom';
import { Box } from '@metamask/design-system-react';
import { Toast } from '../../../multichain/toast';
import { useI18nContext } from '../../../../hooks/useI18nContext';
Expand Down Expand Up @@ -170,22 +171,25 @@ export const PerpsToastProvider = ({ children }: PerpsToastProviderProps) => {
return (
<PerpsToastContext.Provider value={contextValue}>
{children}
{activeToast ? (
<Box className="toasts-container bottom-20 w-[calc(100%-32px)] max-w-[408px]">
<Toast
key={activeToast.id}
startAdornment={getPerpsToastIcon(activeToast.presentation)}
text={activeToast.message}
description={activeToast.description}
className="perps-toast"
contentProps={{ className: 'items-center' }}
autoHideTime={activeToast.autoHideTime}
onClose={hidePerpsToast}
onAutoHideToast={hidePerpsToast}
dataTestId={activeToast.dataTestId ?? 'perps-toast'}
/>
</Box>
) : null}
{activeToast
? ReactDOM.createPortal(
<Box className="toasts-container bottom-20 w-[calc(100%-32px)] max-w-[408px]">
<Toast
key={activeToast.id}
startAdornment={getPerpsToastIcon(activeToast.presentation)}
text={activeToast.message}
description={activeToast.description}
className="perps-toast"
contentProps={{ className: 'items-center' }}
autoHideTime={activeToast.autoHideTime}
onClose={hidePerpsToast}
onAutoHideToast={hidePerpsToast}
dataTestId={activeToast.dataTestId ?? 'perps-toast'}
/>
</Box>,
document.body,
)
: null}
</PerpsToastContext.Provider>
);
};
Expand Down
Loading