Skip to content

fix(scrim): update loader scale on resize of component. #7419

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
driskull merged 1 commit into from
Aug 2, 2023
+53 −5
Merged

fix(scrim): update loader scale on resize of component. #7419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 41 additions & 1 deletion packages/calcite-components/src/components/scrim/scrim.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ describe("calcite-scrim", () => {
});

describe("Responsive loading spinner", () => {
const testValues: { width: number; height: number; scale: Scale }[] = [
type ScaleSize = { width: number; height: number; scale: Scale };
const testValues: ScaleSize[] = [
{
width: BREAKPOINTS.s - 1,
height: 800,
Expand Down Expand Up @@ -166,6 +167,45 @@ describe("calcite-scrim", () => {
expect(await loader.getProperty("scale")).toBe(scaleSize.scale);
});
});

it("should responsively scale loading spinner on resize", async () => {
const page = await newE2EPage();
await page.setContent(html`<style>
.scrim-container {
display: flex;
flex: 1;
position: relative;
overflow: auto;
}
</style>
<div class="scrim-container">
<calcite-scrim loading><p>I'm a panel that is loading.</p></calcite-scrim>
</div>`);
await page.waitForChanges();

for (let i = 0; i < testValues.length; i++) {
const { width, height, scale } = testValues[i];
const scrimContainer = await page.find(".scrim-container");
expect(scrimContainer).toBeDefined();
await page.$eval(
".scrim-container",
(scrimContainer: HTMLElement, width: number, height: number) => {
scrimContainer.style.width = `${width}px`;
scrimContainer.style.height = `${height}px`;
},
width,
height
);
await page.waitForChanges();
const style = await scrimContainer.getComputedStyle();
expect(style.width).toBe(`${width}px`);
expect(style.height).toBe(`${height}px`);
const loader = await page.find("calcite-scrim >>> calcite-loader");
expect(loader).toBeDefined();
expect(await loader.isVisible()).toBe(true);
expect(await loader.getProperty("scale")).toBe(scale);
}
});
});

describe("CSS properties for light/dark modes", () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/calcite-components/src/components/scrim/scrim.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export class Scrim implements LocalizedComponent, T9nComponent {
connectedCallback(): void {
connectLocalized(this);
connectMessages(this);
this.resizeObserver?.observe(this.el);
}

async componentWillLoad(): Promise<void> {
Expand All @@ -93,6 +94,7 @@ export class Scrim implements LocalizedComponent, T9nComponent {
disconnectedCallback(): void {
disconnectLocalized(this);
disconnectMessages(this);
this.resizeObserver?.disconnect();
}

// --------------------------------------------------------------------------
Expand Down
14 changes: 10 additions & 4 deletions packages/calcite-components/src/demos/scrim.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ <h1 style="margin: 0 auto; text-align: center">Scrim</h1>
<div class="parent">
<div class="child">
Default
<div tabindex="0" style="position: relative; width: 400px; height: 400px; padding: 25px">
<div
tabindex="0"
style="position: relative; width: 400px; height: 400px; padding: 25px; resize: both; overflow: auto"
>
<calcite-scrim></calcite-scrim>
<div style="width: 400px; height: 400px; overflow: auto">
<div style="width: 100%; height: 100%; overflow: auto">
<p>
Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum
tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas
Expand Down Expand Up @@ -72,9 +75,12 @@ <h1 style="margin: 0 auto; text-align: center">Scrim</h1>
<!-- loading scrim panel -->
<div class="child">
Loading
<div tabindex="0" style="position: relative; width: 400px; height: 400px; padding: 25px">
<div
tabindex="0"
style="position: relative; width: 400px; height: 400px; padding: 25px; resize: both; overflow: auto"
>
<calcite-scrim loading></calcite-scrim>
<div style="width: 400px; height: 400px; overflow: auto">
<div style="width: 100%; height: 100%; overflow: auto">
<p>
Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum
tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas
Expand Down