Skip to content

Commit 1054e1f

Browse files
authored
fix(LoginPageLayout): no longer sets theme to is-paper (#1251)
BREAKING CHANGE: LoginPageLayout no longer sets theme to is-paper
1 parent 42d72a5 commit 1054e1f

File tree

2 files changed

+2
-68
lines changed

2 files changed

+2
-68
lines changed
Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import React, { useLayoutEffect, useState } from "react";
1+
import React from "react";
22
import { render, screen, within } from "@testing-library/react";
33

44
import LoginPageLayout from "./LoginPageLayout";
5-
import userEvent from "@testing-library/user-event";
65

76
it("should display the default logo", () => {
87
render(<LoginPageLayout title="Login page" />);
@@ -33,54 +32,3 @@ it("should display the title", () => {
3332
screen.getByRole("heading", { name: "Login page" }),
3433
).toBeInTheDocument();
3534
});
36-
37-
it("should add and then remove is-paper class to body if initially is-paper wasn't present", async () => {
38-
const NoInitialIsPaperComponent = () => {
39-
const [displayLogin, setDisplayLogin] = useState(false);
40-
return (
41-
<div>
42-
{displayLogin ? (
43-
<>
44-
<LoginPageLayout title="Login page" />
45-
<button onClick={() => setDisplayLogin(false)}>Remove login</button>
46-
</>
47-
) : (
48-
<button onClick={() => setDisplayLogin(true)}>Display login</button>
49-
)}
50-
</div>
51-
);
52-
};
53-
render(<NoInitialIsPaperComponent />);
54-
expect(document.querySelector("body")).not.toHaveClass("is-paper");
55-
await userEvent.click(screen.getByRole("button", { name: "Display login" }));
56-
expect(document.querySelector("body")).toHaveClass("is-paper");
57-
await userEvent.click(screen.getByRole("button", { name: "Remove login" }));
58-
expect(document.querySelector("body")).not.toHaveClass("is-paper");
59-
});
60-
61-
it("shouldn't remove is-paper class to body if initially is-paper was present", async () => {
62-
const InitialIsPaperComponent = () => {
63-
const [displayLogin, setDisplayLogin] = useState(false);
64-
useLayoutEffect(() => {
65-
document.querySelector("body")?.classList.add("is-paper");
66-
}, []);
67-
return (
68-
<div>
69-
{displayLogin ? (
70-
<>
71-
<LoginPageLayout title="Login page" />
72-
<button onClick={() => setDisplayLogin(false)}>Remove login</button>
73-
</>
74-
) : (
75-
<button onClick={() => setDisplayLogin(true)}>Display login</button>
76-
)}
77-
</div>
78-
);
79-
};
80-
render(<InitialIsPaperComponent />);
81-
expect(document.querySelector("body")).toHaveClass("is-paper");
82-
await userEvent.click(screen.getByRole("button", { name: "Display login" }));
83-
expect(document.querySelector("body")).toHaveClass("is-paper");
84-
await userEvent.click(screen.getByRole("button", { name: "Remove login" }));
85-
expect(document.querySelector("body")).toHaveClass("is-paper");
86-
});

src/components/LoginPageLayout/LoginPageLayout.tsx

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { FC, ReactNode, useLayoutEffect } from "react";
1+
import React, { FC, ReactNode } from "react";
22
import Card from "components/Card";
33
import Col from "components/Col";
44
import Navigation from "components/Navigation";
@@ -27,20 +27,6 @@ const LoginPageLayout: FC<Props> = ({
2727
title,
2828
logo = defaultLogo,
2929
}) => {
30-
useLayoutEffect(() => {
31-
const bodyInitiallyContainsIsPaper = document
32-
.querySelector("body")
33-
?.classList.contains("is-paper");
34-
if (!bodyInitiallyContainsIsPaper) {
35-
document.querySelector("body")?.classList.add("is-paper");
36-
}
37-
return () => {
38-
if (!bodyInitiallyContainsIsPaper) {
39-
document.querySelector("body")?.classList.remove("is-paper");
40-
}
41-
};
42-
}, []);
43-
4430
return (
4531
<Row className="p-strip page-row">
4632
<Col emptyLarge={4} size={6}>

0 commit comments

Comments
 (0)