Skip to content

fix(site): fix pill spinner size #11368

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
merged 2 commits into from
Jan 2, 2024
Merged

fix(site): fix pill spinner size #11368

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
442a5f6
fix(site): fix pill spinner size
BrunoQuaresma Jan 2, 2024
de79ae8
add story for loading
BrunoQuaresma Jan 2, 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
20 changes: 14 additions & 6 deletions site/src/components/Pill/Pill.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import { Pill } from "./Pill";
import { Pill, PillSpinner } from "./Pill";
import type { Meta, StoryObj } from "@storybook/react";
import InfoOutlined from "@mui/icons-material/InfoOutlined";

const meta: Meta<typeof Pill> = {
title: "components/Pill",
component: Pill,
args: {
children: "Default",
},
};

export default meta;
type Story = StoryObj<typeof Pill>;

export const Default: Story = {
args: {
children: "Default",
},
};
export const Default: Story = {};

export const Danger: Story = {
args: {
Expand Down Expand Up @@ -72,3 +71,12 @@ export const WithIcon: Story = {
icon: <InfoOutlined />,
},
};

export const WithSpinner: Story = {
args: {
icon: <PillSpinner />,
},
parameters: {
chromatic: { delay: 700 },
},
};
19 changes: 19 additions & 0 deletions site/src/components/Pill/Pill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import {
} from "react";
import { useTheme, type Interpolation, type Theme } from "@emotion/react";
import type { ThemeRole } from "theme/experimental";
import CircularProgress, {
CircularProgressProps,
} from "@mui/material/CircularProgress";

export type PillType = ThemeRole | keyof typeof themeOverrides;

Expand Down Expand Up @@ -81,3 +84,19 @@ export const Pill: FC<PillProps> = forwardRef<HTMLDivElement, PillProps>(
);
},
);

export const PillSpinner = (props: CircularProgressProps) => {
return (
<CircularProgress
size={PILL_ICON_SIZE}
css={(theme) => ({
color: theme.experimental.l1.text,
// It is necessary to align it with the MUI Icons internal padding
"& svg": {
transform: "scale(.75)",
},
})}
{...props}
/>
);
};
22 changes: 6 additions & 16 deletions site/src/utils/workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import CircularProgress from "@mui/material/CircularProgress";
import ErrorIcon from "@mui/icons-material/ErrorOutline";
import StopIcon from "@mui/icons-material/StopOutlined";
import PlayIcon from "@mui/icons-material/PlayArrowOutlined";
Expand All @@ -8,9 +7,9 @@ import duration from "dayjs/plugin/duration";
import minMax from "dayjs/plugin/minMax";
import utc from "dayjs/plugin/utc";
import { type Theme } from "@emotion/react";
import { type FC } from "react";
import semver from "semver";
import type * as TypesGen from "api/typesGenerated";
import { PillSpinner } from "components/Pill/Pill";

dayjs.extend(duration);
dayjs.extend(utc);
Expand All @@ -29,15 +28,6 @@ const DisplayAgentVersionLanguage = {
unknown: "Unknown",
};

const LoadingIcon: FC = () => {
return (
<CircularProgress
size={10}
css={(theme) => ({ color: theme.experimental.l1.text })}
/>
);
};

export const getDisplayWorkspaceBuildStatus = (
theme: Theme,
build: TypesGen.WorkspaceBuild,
Expand Down Expand Up @@ -185,7 +175,7 @@ export const getDisplayWorkspaceStatus = (
case undefined:
return {
text: "Loading",
icon: <LoadingIcon />,
icon: <PillSpinner />,
} as const;
case "running":
return {
Expand All @@ -197,13 +187,13 @@ export const getDisplayWorkspaceStatus = (
return {
type: "active",
text: "Starting",
icon: <LoadingIcon />,
icon: <PillSpinner />,
} as const;
case "stopping":
return {
type: "notice",
text: "Stopping",
icon: <LoadingIcon />,
icon: <PillSpinner />,
} as const;
case "stopped":
return {
Expand All @@ -215,7 +205,7 @@ export const getDisplayWorkspaceStatus = (
return {
type: "danger",
text: "Deleting",
icon: <LoadingIcon />,
icon: <PillSpinner />,
} as const;
case "deleted":
return {
Expand All @@ -227,7 +217,7 @@ export const getDisplayWorkspaceStatus = (
return {
type: "notice",
text: "Canceling",
icon: <LoadingIcon />,
icon: <PillSpinner />,
} as const;
case "canceled":
return {
Expand Down