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

[release/1.x] Port #2255 #2257

Merged
merged 2 commits into from
Mar 16, 2018
Merged

[release/1.x] Port #2255 #2257

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
38a704a
Update portal.tsx
adidahiya Mar 16, 2018
31fbeaf
Update portalTests.tsx
adidahiya Mar 16, 2018
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
5 changes: 3 additions & 2 deletions packages/core/src/components/portal/portal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ export class Portal extends React.Component<IPortalProps, {}> {
const targetElement = document.createElement("div");
targetElement.classList.add(Classes.PORTAL);

if (this.context.blueprintPortalClassName != null) {
targetElement.classList.add(this.context.blueprintPortalClassName);
const { blueprintPortalClassName } = this.context;
if (blueprintPortalClassName != null && blueprintPortalClassName !== "") {
targetElement.classList.add(...blueprintPortalClassName.split(" "));
}

document.body.appendChild(targetElement);
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/portal/portalTests.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ describe("<Portal>", () => {
});

it("respects blueprintPortalClassName on context", () => {
const CLASS_TO_TEST = "bp-test-klass";
const CLASS_TO_TEST = "bp-test-klass bp-other-class";
portal = mount(
<Portal>
<p>test</p>
</Portal>,
{ context: { blueprintPortalClassName: CLASS_TO_TEST } },
);

const portalElement = document.querySelector(`.${CLASS_TO_TEST}`);
const portalElement = document.querySelector(`.${CLASS_TO_TEST.replace(" ", ".")}`);
assert.isTrue(portalElement.classList.contains(Classes.PORTAL));
});
});