Skip to content
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

fix(toast): margin-top on notice variant prevents elements being clicked #6736

Merged
merged 2 commits into from
May 20, 2024
Merged

fix(toast): margin-top on notice variant prevents elements being clicked #6736

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
1732886
fix(toast): margin-top on notice variant prevents elements being clicked
nuria1110 May 16, 2024
6e46fe8
Merge branch 'master' into FE-6576
nuria1110 May 20, 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
14 changes: 13 additions & 1 deletion src/components/toast/toast-test.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,19 @@ Default.args = {
};
Default.argTypes = {
variant: {
options: TOAST_COLORS,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: nice improvement to add the missing props

options: [...TOAST_COLORS, "notice"],
control: {
type: "select",
},
},
align: {
options: ["left", "center", "right"],
control: {
type: "select",
},
},
alignY: {
options: ["top", "center", "bottom"],
control: {
type: "select",
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/toast/toast.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const StyledToast = styled.div<ToastStyleProps>`

box-shadow: ${boxShadow};
line-height: 22px;
margin-top: ${(alignY === "top" && isNotice) || alignY === "center"
margin-top: ${isNotice || alignY === "center" || alignY === "bottom"
? "0"
: "30px"};
margin-bottom: ${alignY === "bottom" && !isNotice ? "30px" : "0"};
Expand Down
66 changes: 38 additions & 28 deletions src/components/toast/toast.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ describe("Toast component", () => {
expect(screen.getByTestId("toast")).toHaveAttribute("id", "exampleId");
});

it("shoud render any child content passed via the `children` prop", () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: nice pick up

it("should render any child content passed via the `children` prop", () => {
render(
<Toast open data-role="toast">
<span>foobar</span>
Expand Down Expand Up @@ -441,7 +441,7 @@ describe("Toast component", () => {
const toast = screen.getByTestId("toast");

expect(toast).toHaveStyle({
"margin-top": "0",
margin: "0px 0px 0px auto",
});
});

Expand All @@ -461,27 +461,7 @@ describe("Toast component", () => {
const toast = screen.getByTestId("toast");

expect(toast).toHaveStyle({
"margin-bottom": "0",
});
});

it("should render with correct styling when `variant` prop is not set to 'notice' and `alignY` prop is set to 'bottom'", () => {
render(
<Toast
open
variant="neutral"
alignY="bottom"
data-role="toast"
onDismiss={() => {}}
>
foobar
</Toast>
);

const toast = screen.getByTestId("toast");

expect(toast).toHaveStyle({
"margin-bottom": "30px",
margin: "0px 0px 0px auto",
});
});

Expand Down Expand Up @@ -566,7 +546,7 @@ describe("Toast component", () => {
expect(ref.current).toBe(screen.getByTestId("toast-wrapper"));
});

it("should have the expected styling when `align` prop is 'right'", () => {
it("should render with expected styling when `align` prop is 'right'", () => {
render(
<Toast open align="right" data-role="toast">
foobar
Expand All @@ -582,7 +562,7 @@ describe("Toast component", () => {
});
});

it("should have the expected styling when `align` prop is 'center'", () => {
it("should render with expected styling when `align` prop is 'center'", () => {
render(
<Toast open align="center" data-role="toast">
foobar
Expand All @@ -598,7 +578,7 @@ describe("Toast component", () => {
});
});

it("should have the expected styling when `align` prop is 'left'", () => {
it("should render with expected styling when `align` prop is 'left'", () => {
render(
<Toast open align="left" data-role="toast">
foobar
Expand All @@ -614,7 +594,37 @@ describe("Toast component", () => {
});
});

it("should have the expected styling when `alignY` prop is 'center' and `align` prop is 'left'", () => {
it("should render with expected styling when `alignY` prop is set to 'top'", () => {
render(
<Toast alignY="top" data-role="toast">
foobar
</Toast>
);

const toast = screen.getByTestId("toast");

expect(toast).toHaveStyle({
"margin-top": "30px",
"margin-bottom": "0",
});
});

it("should render with expected styling when `alignY` prop is set to 'bottom'", () => {
render(
<Toast alignY="bottom" data-role="toast">
foobar
</Toast>
);

const toast = screen.getByTestId("toast");

expect(toast).toHaveStyle({
"margin-top": "0",
"margin-bottom": "30px",
});
});

it("should render with expected styling when `alignY` prop is 'center' and `align` prop is 'left'", () => {
render(
<Toast alignY="center" align="left" data-role="toast">
foobar
Expand All @@ -627,7 +637,7 @@ describe("Toast component", () => {
});
});

it("should have the expected styling when `alignY` prop is 'center' and `align` prop is not 'left'", () => {
it("should render with expected styling when `alignY` prop is 'center' and `align` prop is not 'left'", () => {
render(
<Toast alignY="center" data-role="toast">
foobar
Expand Down
Loading