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.

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(notice): ensure closed notice does not affect layout #10518

Merged
merged 3 commits into from
Oct 10, 2024
Merged
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 @@ -36,7 +36,9 @@ describe("calcite-notice", () => {
});

describe("openClose", () => {
openClose("calcite-notice");
openClose("calcite-notice", {
collapsedOnClose: "vertical",
});
});

describe("slots", () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/calcite-components/src/components/notice/notice.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
flex
w-full
opacity-0;
overflow: hidden;
max-block-size: 0;
transition-property: opacity, max-block-size;
transition-duration: var(--calcite-animation-timing);
Expand All @@ -104,6 +105,7 @@
max-h-full
items-center
opacity-100;
overflow: visible;
}

@include slotted("title", "*", ".container") {
Expand Down
34 changes: 30 additions & 4 deletions packages/calcite-components/src/tests/commonTests/openClose.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import { E2EPage } from "@stencil/core/testing";
import { toHaveNoViolations } from "jest-axe";
import { GlobalTestProps, newProgrammaticE2EPage } from "../utils";
import { GlobalTestProps, newProgrammaticE2EPage, toElementHandle } from "../utils";
import { getBeforeContent, getTagAndPage, noopBeforeContent } from "./utils";
import { ComponentTag, ComponentTestSetup, WithBeforeContent } from "./interfaces";

expect.extend(toHaveNoViolations);

type CollapseAxis = "horizontal" | "vertical";

interface OpenCloseOptions {
/**
* When specified, testing will assert that the component is collapsed (does not affect layout) along the specified axis when closed.
*/
collapsedOnClose?: CollapseAxis;

/**
* Toggle property to test. Currently, either "open" or "expanded".
*/
Expand Down Expand Up @@ -54,10 +61,11 @@ export function openClose(componentTestSetup: ComponentTestSetup, options?: Open

await setUpEventListeners(tag, page);
await testOpenCloseEvents({
tag,
page,
openPropName: effectiveOptions.openPropName,
animationsEnabled: !effectiveOptions.willUseFallback,
collapsedOnClose: effectiveOptions.collapsedOnClose,
openPropName: effectiveOptions.openPropName,
page,
tag,
});
});

Expand All @@ -69,6 +77,7 @@ export function openClose(componentTestSetup: ComponentTestSetup, options?: Open
await setUpEventListeners(tag, page);
await testOpenCloseEvents({
animationsEnabled: false,
collapsedOnClose: effectiveOptions.collapsedOnClose,
openPropName: effectiveOptions.openPropName,
page,
tag,
Expand Down Expand Up @@ -149,6 +158,11 @@ interface TestOpenCloseEventsParams {
*/
startOpen?: boolean;

/**
* Whether the component should be collapsed (does not affect layout) along the specified axis when closed.
*/
collapsedOnClose?: CollapseAxis;

/**
* Whether animations are enabled.
*/
Expand All @@ -159,6 +173,7 @@ async function testOpenCloseEvents({
animationsEnabled,
openPropName,
page,
collapsedOnClose,
startOpen = false,
tag,
}: TestOpenCloseEventsParams): Promise<void> {
Expand Down Expand Up @@ -222,6 +237,17 @@ async function testOpenCloseEvents({

assertEventSequence([1, 1, 1, 1]);

if (collapsedOnClose !== undefined) {
const elementHandle = await toElementHandle(element);
const boundingBox = await elementHandle.boundingBox();
const horizontalCollapse = collapsedOnClose === "horizontal";
const dimension = horizontalCollapse ? "width" : "height";
const scrollDimension = horizontalCollapse ? "scrollWidth" : "scrollHeight";

expect(boundingBox[dimension]).toBe(0);
expect(await elementHandle.evaluate((el, scrollDimension) => el[scrollDimension], scrollDimension)).toBe(0);
}

expect(await page.evaluate(() => (window as EventOrderWindow).events)).toEqual(eventSequence);

const delayDeltaThreshold = 100; // smallest internal animation timing used
Expand Down
8 changes: 3 additions & 5 deletions packages/calcite-components/src/tests/commonTests/themed.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { E2EElement, E2EPage } from "@stencil/core/testing";
import { toHaveNoViolations } from "jest-axe";
import { ElementHandle } from "puppeteer";
import type { RequireExactlyOne } from "type-fest";
import { getTokenValue } from "../utils/cssTokenValues";
import { toElementHandle } from "../utils";
import type { ComponentTestSetup } from "./interfaces";
import { getTagAndPage } from "./utils";

Expand Down Expand Up @@ -266,11 +266,9 @@ async function getComputedStylePropertyValue(
property: string,
pseudoElement?: string,
): Promise<string> {
type E2EElementInternal = E2EElement & {
_elmHandle: ElementHandle;
};
const elementHandle = await toElementHandle(element);

return await (element as E2EElementInternal)._elmHandle.evaluate(
return await elementHandle.evaluate(
(el, targetProp, pseudoElement): string => window.getComputedStyle(el, pseudoElement).getPropertyValue(targetProp),
property,
pseudoElement,
Expand Down
16 changes: 15 additions & 1 deletion packages/calcite-components/src/tests/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { E2EElement, E2EPage, newE2EPage } from "@stencil/core/testing";
import { BoundingBox } from "puppeteer";
import { BoundingBox, ElementHandle } from "puppeteer";
import type { JSX } from "../components";
import { ComponentTag } from "./commonTests/interfaces";

Expand Down Expand Up @@ -527,3 +527,17 @@ export async function assertCaretPosition({
),
).toBeTruthy();
}

/**
* This utils helps to get the element handle from an E2EElement.
*
* @param element - the E2E element
* @returns {Promise<ElementHandle>} - the element handle
*/
export async function toElementHandle(element: E2EElement): Promise<ElementHandle> {
type E2EElementInternal = E2EElement & {
_elmHandle: ElementHandle;
};

return (element as E2EElementInternal)._elmHandle;
}
Loading