Skip to content

fix: Revert "feat: allow multiple lines in alert component" #36643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
albinAppsmith merged 2 commits into from
Oct 2, 2024
Merged

fix: Revert "feat: allow multiple lines in alert component" #36643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17ee5af
Revert "fix: Release blocker: toast with whitespace (#36629)"
albinAppsmith Oct 2, 2024
598a1d3
Revert "feat: allow multiple lines in alert component (#36126)"
albinAppsmith Oct 2, 2024
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
25 changes: 0 additions & 25 deletions ...press/e2e/Regression/ClientSide/Widgets/Button/Button_showAlert_multiline_message_spec.ts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/client/packages/design-system/ads/src/Toast/Toast.styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,3 @@ export const ToastBody = styled(Text)`
export const StyledButton = styled(Button)`
align-self: center;
`;

export const StyledPre = styled.pre`
font: inherit;
`;
9 changes: 2 additions & 7 deletions app/client/packages/design-system/ads/src/Toast/Toast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import { Slide, toast as toastifyToast } from "react-toastify";
import "react-toastify/dist/ReactToastify.min.css";

import type { ToastProps } from "./Toast.types";
import {
StyledButton,
StyledPre,
StyledToast,
ToastBody,
} from "./Toast.styles";
import { StyledButton, StyledToast, ToastBody } from "./Toast.styles";
import { getIconByKind } from "../Icon/getIconByKind";

/**
Expand Down Expand Up @@ -45,7 +40,7 @@ const toast = {

return toastifyToast(
<ToastBody kind="body-m">
<StyledPre>{content}</StyledPre>
{content}
{actionText && (
<StyledButton
kind="tertiary"
Expand Down