Skip to content

chore: refactor Pill styles #10004

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 3 commits into from
Oct 3, 2023
Merged

chore: refactor Pill styles #10004

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
4bf1a97
chore: refactor `Pill` styles
aslilac Oct 2, 2023
07c8b85
🧹
aslilac Oct 3, 2023
a7b3e62
boff
aslilac Oct 3, 2023
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
147 changes: 88 additions & 59 deletions site/src/components/Pill/Pill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,104 @@
import { PaletteColor, Theme } from "@mui/material/styles";
import { makeStyles } from "@mui/styles";
import { FC } from "react";
import { PaletteIndex } from "theme/theme";
import { combineClasses } from "utils/combineClasses";
import { type FC, type ReactNode, useMemo } from "react";
import { css, type Interpolation, type Theme, useTheme } from "@emotion/react";
import { colors } from "theme/colors";

export type PillType =
| "primary"
| "secondary"
| "error"
| "warning"
| "info"
| "success"
| "neutral";

export interface PillProps {
className?: string;
icon?: React.ReactNode;
text: string;
type?: PaletteIndex;
icon?: ReactNode;
text: ReactNode;
type?: PillType;
lightBorder?: boolean;
title?: string;
}

const themeOverrides = {
primary: (lightBorder) => ({
backgroundColor: colors.blue[13],
borderColor: lightBorder ? colors.blue[5] : colors.blue[7],
}),
secondary: (lightBorder) => ({
backgroundColor: colors.indigo[13],
borderColor: lightBorder ? colors.indigo[6] : colors.indigo[8],
}),
neutral: (lightBorder) => ({
backgroundColor: colors.gray[13],
borderColor: lightBorder ? colors.gray[6] : colors.gray[8],
}),
} satisfies Record<string, (lightBorder?: boolean) => Interpolation<Theme>>;

const themeStyles =
(type: PillType, lightBorder?: boolean) => (theme: Theme) => {
const palette = theme.palette[type];
return {
backgroundColor: palette.dark,
borderColor: lightBorder ? palette.light : palette.main,
};
};

export const Pill: FC<PillProps> = (props) => {
const { className, icon, text = false, title } = props;
const styles = useStyles(props);
const { lightBorder, icon, text = null, type = "neutral", ...attrs } = props;
const theme = useTheme();

const typeStyles = useMemo(() => {
if (type in themeOverrides) {
return themeOverrides[type as keyof typeof themeOverrides](lightBorder);
}
return themeStyles(type, lightBorder);
}, [type, lightBorder]);

return (
<div
className={combineClasses([styles.wrapper, styles.pillColor, className])}
css={[
{
display: "inline-flex",
alignItems: "center",
borderWidth: 1,
borderStyle: "solid",
borderRadius: 99999,
fontSize: 12,
color: "#FFF",
height: theme.spacing(3),
paddingLeft: icon ? theme.spacing(0.75) : theme.spacing(1.5),
paddingRight: theme.spacing(1.5),
whiteSpace: "nowrap",
fontWeight: 400,
},
typeStyles,
]}
role="status"
title={title}
{...attrs}
>
{icon && <div className={styles.iconWrapper}>{icon}</div>}
{icon && (
<div
css={css`
margin-right: ${theme.spacing(0.5)};
width: ${theme.spacing(1.75)};
height: ${theme.spacing(1.75)};
line-height: 0;
display: flex;
align-items: center;
justify-content: center;

& > img,
& > svg {
width: ${theme.spacing(1.75)};
height: ${theme.spacing(1.75)};
}
`}
>
{icon}
</div>
)}
{text}
</div>
);
};

const useStyles = makeStyles<Theme, PillProps>((theme) => ({
wrapper: {
display: "inline-flex",
alignItems: "center",
borderWidth: 1,
borderStyle: "solid",
borderRadius: 99999,
fontSize: 12,
color: "#FFF",
height: theme.spacing(3),
paddingLeft: ({ icon }) =>
icon ? theme.spacing(0.75) : theme.spacing(1.5),
paddingRight: theme.spacing(1.5),
whiteSpace: "nowrap",
fontWeight: 400,
},

pillColor: {
backgroundColor: ({ type }) =>
type
? (theme.palette[type] as PaletteColor).dark
: theme.palette.text.secondary,
borderColor: ({ type, lightBorder }) =>
type
? lightBorder
? (theme.palette[type] as PaletteColor).light
: (theme.palette[type] as PaletteColor).main
: theme.palette.text.secondary,
},

iconWrapper: {
marginRight: theme.spacing(0.5),
width: theme.spacing(1.75),
height: theme.spacing(1.75),
lineHeight: 0,
display: "flex",
alignItems: "center",
justifyContent: "center",

"& > svg": {
width: theme.spacing(1.75),
height: theme.spacing(1.75),
},
},
}));
5 changes: 2 additions & 3 deletions site/src/pages/AuditPage/AuditLogRow/AuditLogRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ import {
CloseDropdown,
OpenDropdown,
} from "components/DropdownArrows/DropdownArrows";
import { Pill } from "components/Pill/Pill";
import { Pill, type PillType } from "components/Pill/Pill";
import { Stack } from "components/Stack/Stack";
import { TimelineEntry } from "components/Timeline/TimelineEntry";
import { UserAvatar } from "components/UserAvatar/UserAvatar";
import { useState } from "react";
import userAgentParser from "ua-parser-js";
import { AuditLogDiff } from "./AuditLogDiff/AuditLogDiff";
import { AuditLogDescription } from "./AuditLogDescription/AuditLogDescription";
import { PaletteIndex } from "theme/theme";
import { determineGroupDiff } from "./AuditLogDiff/auditUtils";

const httpStatusColor = (httpStatus: number): PaletteIndex => {
const httpStatusColor = (httpStatus: number): PillType => {
// redirects are successful
if (httpStatus === 307) {
return "success";
Expand Down
9 changes: 4 additions & 5 deletions site/src/pages/TemplateVersionEditorPage/TemplateVersionStatusBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { TemplateVersion } from "api/typesGenerated";
import { FC, ReactNode } from "react";
import { type TemplateVersion } from "api/typesGenerated";
import { type FC, type ReactNode } from "react";
import CircularProgress from "@mui/material/CircularProgress";
import ErrorIcon from "@mui/icons-material/ErrorOutline";
import CheckIcon from "@mui/icons-material/CheckOutlined";
import { Pill } from "components/Pill/Pill";
import { PaletteIndex } from "theme/theme";
import { Pill, type PillType } from "components/Pill/Pill";

export const TemplateVersionStatusBadge: FC<{
version: TemplateVersion;
Expand All @@ -27,7 +26,7 @@ const LoadingIcon: FC = () => {
export const getStatus = (
version: TemplateVersion,
): {
type?: PaletteIndex;
type?: PillType;
text: string;
icon: ReactNode;
} => {
Expand Down
16 changes: 13 additions & 3 deletions site/src/theme/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import { colors } from "./colors";
import { ThemeOptions, createTheme, Theme } from "@mui/material/styles";
import { createTheme, type ThemeOptions } from "@mui/material/styles";
import { BODY_FONT_FAMILY, borderRadius } from "./constants";

// MUI does not have aligned heights for buttons and inputs so we have to "hack" it a little bit
export const BUTTON_LG_HEIGHT = 40;
export const BUTTON_MD_HEIGHT = 36;
export const BUTTON_SM_HEIGHT = 32;

export type PaletteIndex = keyof Theme["palette"];
export type PaletteIndex =
| "primary"
| "secondary"
| "background"
| "text"
| "error"
| "warning"
| "info"
| "success"
| "action"
| "neutral";

export let dark = createTheme({
palette: {
Expand Down Expand Up @@ -46,7 +56,7 @@ export let dark = createTheme({
info: {
light: colors.blue[7],
main: colors.blue[9],
dark: colors.blue[15],
dark: colors.blue[14],
contrastText: colors.gray[4],
},
error: {
Expand Down