Skip to content

refactor(loader): simplify loader part rendering #9728

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
jcfranco merged 3 commits into from
Jul 16, 2024
Merged

refactor(loader): simplify loader part rendering #9728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
950d9c9
refactor(loader): simplify loader part rendering
jcfranco Jul 3, 2024
90cd1a2
fix class name
jcfranco Jul 3, 2024
68c8f0c
tidy up
jcfranco Jul 3, 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
35 changes: 18 additions & 17 deletions packages/calcite-components/src/components/loader/loader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component, Element, h, Host, Prop, VNode } from "@stencil/core";
import { guid } from "../../utils/guid";
import { Scale } from "../interfaces";
import { CSS } from "./resources";

@Component({
tag: "calcite-loader",
Expand Down Expand Up @@ -71,24 +72,24 @@ export class Loader {
role="progressbar"
{...(isDeterminate ? hostAttributes : {})}
>
<div class="loader__svgs">
<svg aria-hidden="true" class="loader__svg loader__svg--1" viewBox={viewbox}>
<circle {...svgAttributes} />
</svg>
<svg aria-hidden="true" class="loader__svg loader__svg--2" viewBox={viewbox}>
<circle {...svgAttributes} />
</svg>
<svg
aria-hidden="true"
class="loader__svg loader__svg--3"
viewBox={viewbox}
{...(isDeterminate ? { style: determinateStyle } : {})}
>
<circle {...svgAttributes} />
</svg>
<div class={CSS.loaderParts}>
{[1, 2, 3].map((index) => (
<svg
aria-hidden="true"
class={{
[CSS.loaderPart]: true,
[CSS.loaderPartId(index)]: true,
}}
key={index}
viewBox={viewbox}
{...(index === 3 && isDeterminate ? { style: determinateStyle } : {})}
>
<circle {...svgAttributes} />
</svg>
))}
</div>
{text && <div class="loader__text">{text}</div>}
{isDeterminate && <div class="loader__percentage">{value}</div>}
{text && <div class={CSS.loaderText}>{text}</div>}
{isDeterminate && <div class={CSS.loaderPercentage}>{value}</div>}
</Host>
);
}
Expand Down
8 changes: 8 additions & 0 deletions packages/calcite-components/src/components/loader/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export const CSS = {
loader: "loader",
loaderParts: "loader__svgs",
loaderPart: "loader__svg",
loaderPartId: (partId: number) => `${CSS.loaderPart}--${partId}` as const,
loaderText: "loader__text",
loaderPercentage: "loader__percentage",
};