Skip to content

feat(#3070): v2 badge with emphasis and size #3097

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

Open
wants to merge 1 commit into
base: v2-2998-coded-component-updates
Choose a base branch
from
Open

feat(#3070): v2 badge with emphasis and size #3097

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
1 change: 1 addition & 0 deletions libs/web-components/src/common/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
export type DrawerPosition = "bottom" | "left" | "right" | undefined;
export type DrawerSizeUnit = "px" | "rem" | "ch" | "vh" | "vw";
export type DrawerSize = `${number}${DrawerSizeUnit}` | undefined;
export type Version = "1" | "2";
187 changes: 181 additions & 6 deletions libs/web-components/src/components/badge/Badge.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
import { calculateMargin } from "../../common/styling";
import { typeValidator, toBoolean } from "../../common/utils";
import type { GoAIconType } from "../icon/Icon.svelte";
import type { Version } from "../../common/types";

// Validator
// Validators
const [Types, validateType] = typeValidator(
"Badge type",
[
Expand Down Expand Up @@ -39,12 +40,35 @@
"red-light",
"violet-light",
"yellow-light",
"sky",
"prairie",
"lilac",
"pasture",
"sunset",
"dawn",
"default",
],
true,
);

const [badgeSizes, validateBadgeSize] = typeValidator("Badge size", [
"medium",
"large",
]);

const [versions, validateVersion] = typeValidator("Badge version", [
"1",
"2",
]);

const [emphasisLevels, validateEmphasisLevel] = typeValidator(
"Badge emphasis level",
["subtle", "strong"],
);

//Type
type BadgeType = (typeof Types)[number];
type BadgeSize = (typeof badgeSizes)[number];

export let type: BadgeType;

Expand All @@ -54,6 +78,9 @@
export let icon: string = "";
export let icontype: GoAIconType | null = null;
export let arialabel: string = "";
export let size: BadgeSize = "medium";
export let emphasis: (typeof emphasisLevels)[number] = "strong";
export let version: Version = "1";

// margin
export let mt: Spacing = null;
Expand Down Expand Up @@ -94,10 +121,22 @@
"red-light": "information-circle",
"violet-light": "information-circle",
"yellow-light": "information-circle",
sky: "information-circle",
prairie: "information-circle",
lilac: "information-circle",
pasture: "information-circle",
sunset: "information-circle",
dawn: "information-circle",
default: "information-circle",
}[type];

onMount(() => {
setTimeout(() => validateType(type), 1);
setTimeout(() => {
validateType(type);
validateBadgeSize(size);
validateEmphasisLevel(emphasis);
validateVersion(version);
}, 1);

//wait for property initialization
setTimeout(() => {
Expand All @@ -118,15 +157,16 @@
style={calculateMargin(mt, mr, mb, ml)}
data-testid={testid}
data-type="goa-badge"
class="goa-badge badge-{type}"
class="goa-badge badge-{type} badge-{size} badge-{emphasis}"
class:icon-only={showIconOnly}
class:v2={version === "2"}
>
{#if showIcon}
<goa-icon
arialabel={showIconOnly && arialabel ? arialabel : null}
role={showIconOnly && arialabel ? "presentation" : null}
type={icontype || _defaultIconType}
size="1"
size={size === "large" ? "3" : "1"}
/>
{:else}
<div class="goa-badge-no-icon"></div>
Expand Down Expand Up @@ -210,8 +250,14 @@
}

.goa-badge.badge-archived {
background-color: var(--goa-color-greyscale-700);
color: var(--goa-badge-dark-color-content);
background-color: var(
--goa-badge-archived-color-bg,
var(--goa-color-greyscale-700)
);
color: var(
--goa-badge-archived-color-content,
var(--goa-badge-dark-color-content)
);
}

.goa-badge.badge-aqua {
Expand Down Expand Up @@ -308,4 +354,133 @@
background-color: var(--goa-color-extended-light-yellow);
color: var(--goa-badge-light-color-content);
}

.v2 .goa-badge-content {
padding-bottom: 0;
}

/* Version 2: Default Colours */
.v2.badge-default {
background-color: var(--goa-badge-default-color-bg);
color: var(--goa-badge-default-color-content);
}

.v2.badge-default.badge-subtle {
background-color: var(--goa-badge-default-subtle-color-bg);
box-shadow: var(--goa-badge-default-subtle-border);
color: var(--goa-badge-default-subtle-color-content);
}

.v2.goa-badge.badge-archived.badge-subtle {
background-color: var(--goa-badge-archived-subtle-color-bg);
box-shadow: var(--goa-badge-archived-subtle-border);
color: var(--goa-badge-archived-subtle-color-content);
}

/* Version 2: Extended Colours */

.v2.badge-sky {
background-color: var(--goa-color-extended-sky-default);
color: var(--goa-color-extended-sky-text);
}

.v2.badge-prairie {
background-color: var(--goa-color-extended-prairie-default);
color: var(--goa-color-extended-prairie-text);
}

.v2.badge-lilac {
background-color: var(--goa-color-extended-lilac-default);
color: var(--goa-color-extended-lilac-text);
}

.v2.badge-pasture {
background-color: var(--goa-color-extended-pasture-default);
color: var(--goa-color-extended-pasture-text);
}

.v2.badge-sunset {
background-color: var(--goa-color-extended-sunset-default);
color: var(--goa-color-extended-sunset-text);
}

.v2.badge-dawn {
background-color: var(--goa-color-extended-dawn-default);
color: var(--goa-color-extended-dawn-text);
}

.v2.badge-subtle.badge-sky {
background-color: var(--goa-color-extended-sky-light);
box-shadow: var(--goa-color-extended-sky-subtle-border);
color: var(--goa-color-extended-sky-text);
}

.v2.badge-subtle.badge-prairie {
background-color: var(--goa-color-extended-prairie-light);
box-shadow: var(--goa-color-extended-prairie-subtle-border);
color: var(--goa-color-extended-prairie-text);
}

.v2.badge-subtle.badge-lilac {
background-color: var(--goa-color-extended-lilac-light);
box-shadow: var(--goa-color-extended-lilac-subtle-border);
color: var(--goa-color-extended-lilac-text);
}

.v2.badge-subtle.badge-pasture {
background-color: var(--goa-color-extended-pasture-light);
box-shadow: var(--goa-color-extended-pasture-subtle-border);
color: var(--goa-color-extended-pasture-text);
}

.v2.badge-subtle.badge-sunset {
background-color: var(--goa-color-extended-sunset-light);
box-shadow: var(--goa-color-extended-sunset-subtle-border);
color: var(--goa-color-extended-sunset-text);
}

.v2.badge-subtle.badge-dawn {
background-color: var(--goa-color-extended-dawn-light);
box-shadow: var(--goa-color-extended-dawn-subtle-border);
color: var(--goa-color-extended-dawn-text);
}

/* Version 2: Subtle emphasis for standard colours */

.v2.goa-badge.badge-subtle.badge-information {
background-color: var(--goa-badge-info-subtle-color-bg);
color: var(--goa-badge-info-subtle-color-content);
box-shadow: var(--goa-badge-info-subtle-border);
}

.v2.goa-badge.badge-subtle.badge-success {
background-color: var(--goa-badge-success-subtle-color-bg);
color: var(--goa-badge-success-subtle-color-content);
box-shadow: var(--goa-badge-success-subtle-border);
}

.v2.goa-badge.badge-subtle.badge-important {
background-color: var(--goa-badge-important-subtle-color-bg);
color: var(--goa-badge-important-subtle-color-content);
box-shadow: var(--goa-badge-important-subtle-border);
}

.v2.goa-badge.badge-subtle.badge-emergency {
background-color: var(--goa-badge-emergency-subtle-color-bg);
color: var(--goa-badge-emergency-subtle-color-content);
box-shadow: var(--goa-badge-emergency-subtle-border);
}

/* Version 2: Large size */

.v2.goa-badge.badge-large {
height: var(--goa-badge-height-large);
padding: var(--goa-badge-padding-large);
--goa-icon-size: var(--goa-badge-icon-size-large);
}

.v2.goa-badge.badge-large .goa-badge-content {
font-size: var(--goa-badge-font-size-large);
line-height: var(--goa-badge-line-height-large);
}
</style>