Skip to content
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.

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

[DO NOT MERGE] Added Status to Text Component #3392

Closed
wants to merge 11 commits into from
75 changes: 75 additions & 0 deletions .changeset/dry-jokes-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---
"@salt-ds/theme": minor
---

## Characteristics

Added decorative and informative status foreground tokens. This ensures contrast requirements are met for both text and non-text elements.

```diff
+ --salt-status-info-foreground-decorative: var(--salt-palette-info-foreground-decorative);
+ --salt-status-error-foreground-decorative: var(--salt-palette-error-foreground-decorative);
+ --salt-status-warning-foreground-decorative: var(--salt-palette-warning-foreground-decorative);
+ --salt-status-success-foreground-decorative: var(--salt-palette-success-foreground-decorative);
+
+ --salt-status-info-foreground-informative: var(--salt-palette-info-foreground-informative);
+ --salt-status-error-foreground-informative: var(--salt-palette-error-foreground-informative);
+ --salt-status-warning-foreground-informative: var(--salt-palette-warning-foreground-informative);
+ --salt-status-success-foreground-informative: var(--salt-palette-success-foreground-informative);
```

Deprecated status foreground tokens.

| Name | Replacement |
| -------------------------------- | ------------------------------------------- |
| --salt-status-info-foreground | --salt-status-info-foreground-decorative |
| --salt-status-error-foreground | --salt-status-error-foreground-decorative |
| --salt-status-warning-foreground | --salt-status-warning-foreground-decorative |
| --salt-status-success-foreground | --salt-status-success-foreground-decorative |

## Palette

Added decorative and informative info, error, warning and success foreground tokens.

### Light

```diff
+ --salt-palette-info-foreground-decorative: var(--salt-color-blue-500);
+ --salt-palette-info-foreground-informative: var(--salt-color-blue-600);
+ --salt-palette-error-foreground-decorative: var(--salt-color-red-500);
+ --salt-palette-error-foreground-informative: var(--salt-color-red-600);
+ --salt-palette-warning-foreground-decorative: var(--salt-color-orange-700);
+ --salt-palette-warning-foreground-informative: var(--salt-color-orange-850);
+ --salt-palette-success-foreground-decorative: var(--salt-color-green-500);
+ --salt-palette-success-foreground-informative: var(--salt-color-green-600);
```

### Dark

```diff
+ --salt-palette-info-foreground-decorative: var(--salt-color-blue-100);
+ --salt-palette-info-foreground-informative: var(--salt-color-blue-200);
+ --salt-palette-error-foreground-decorative: var(--salt-color-red-500);
+ --salt-palette-error-foreground-informative: var(--salt-color-red-200);
+ --salt-palette-warning-foreground-decorative: var(--salt-color-orange-500);
+ --salt-palette-warning-foreground-informative: var(--salt-color-orange-400);
+ --salt-palette-success-foreground-decorative: var(--salt-color-green-400);
+ --salt-palette-success-foreground-informative: var(--salt-color-green-200);
```

Deprecated status foreground tokens.

| Name | Replacement |
| --------------------------------- | -------------------------------------------- |
| --salt-palette-info-foreground | --salt-palette-info-foreground-decorative |
| --salt-palette-error-foreground | --salt-palette-error-foreground-decorative |
| --salt-palette-warning-foreground | --salt-palette-warning-foreground-decorative |
| --salt-palette-success-foreground | --salt-palette-success-foreground-decorative |

## Foundations

Added `--salt-color-orange-850`:

```diff
+ --salt-color-orange-850: rgb(194, 52, 7);
```
19 changes: 19 additions & 0 deletions .changeset/early-feet-complain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
"@salt-ds/core": minor
---

Added status color support to Text.

```tsx
<Text color="info">This is info color of Text</Text>
<Text color="error">This is error color of Text</Text>
<Text color="warning">This is warning color of Text</Text>
<Text color="success">This is success color of Text</Text>
```

- Checkbox will now have the correct border color on focus when it is in an error or warning state.
- Checkbox now uses `--salt-status-error-foreground-decorative` and `--salt-status-warning-foreground-decorative` instead of `--salt-status-error-foreground` and `--salt-status-warning-foreground`.
- RadioButton will now have the correct border color on focus when it is in an error or warning state.
- RadioButton now uses `--salt-status-error-foreground-decorative` and `--salt-status-warning-foreground-decorative` instead of `--salt-status-error-foreground` and `--salt-status-warning-foreground`.
- StatusAdornment now uses `--salt-status-error-foreground-decorative`, `--salt-status-warning-foreground-decorative` and `--salt-status-success-foreground-decorative` instead of `--salt-status-error-foreground`, `--salt-status-warning-foreground` and `--salt-status-success-foreground`.
- StatusIndicator now uses `--salt-status-info-foreground-decorative`, `--salt-status-error-foreground-decorative`, `--salt-status-warning-foreground-decorative` and `--salt-status-success-foreground-decorative` instead of `--salt-status-info-foreground`, `--salt-status-error-foreground`, `--salt-status-warning-foreground`, `--salt-status-success-foreground`.
5 changes: 5 additions & 0 deletions .changeset/nice-singers-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@salt-ds/lab": minor
---

TrackerStep now uses `--salt-status-success-foreground-decorative` and `--salt-status-info-foreground-decorative` instead of `--salt-status-success-foreground` and `--salt-status-info-foreground`.
12 changes: 6 additions & 6 deletions packages/core/src/checkbox/Checkbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
}

.saltCheckbox-error .saltCheckbox-input:focus-visible + .saltCheckboxIcon {
outline-color: var(--salt-status-error-foreground);
border-color: var(--salt-status-error-foreground);
color: var(--salt-status-error-foreground);
outline-color: var(--salt-status-error-foreground-decorative);
border-color: var(--salt-status-error-borderColor);
color: var(--salt-status-error-foreground-decorative);
}

.saltCheckbox-warning .saltCheckbox-input:focus-visible + .saltCheckboxIcon {
outline-color: var(--salt-status-warning-foreground);
border-color: var(--salt-status-warning-foreground);
color: var(--salt-status-warning-foreground);
outline-color: var(--salt-status-warning-foreground-decorative);
border-color: var(--salt-status-warning-borderColor);
color: var(--salt-status-warning-foreground-decorative);
}

/* Styles applied to input element */
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/checkbox/CheckboxIcon.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@

.saltCheckboxIcon-error,
.saltCheckbox:hover .saltCheckboxIcon-error {
color: var(--salt-status-error-foreground);
color: var(--salt-status-error-foreground-decorative);
border-color: var(--salt-status-error-borderColor);
outline-color: var(--salt-status-error-foreground);
outline-color: var(--salt-status-error-foreground-decorative);
}

.saltCheckboxIcon-warning,
.saltCheckbox:hover .saltCheckboxIcon-warning {
color: var(--salt-status-warning-foreground);
color: var(--salt-status-warning-foreground-decorative);
border-color: var(--salt-status-warning-borderColor);
outline-color: var(--salt-status-warning-foreground);
outline-color: var(--salt-status-warning-foreground-decorative);
}

.saltCheckboxIcon-readOnly,
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/radio-button/RadioButton.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
}

.saltRadioButton-error .saltRadioButton-input:focus-visible + .saltRadioButtonIcon {
outline-color: var(--salt-status-error-foreground);
border-color: var(--salt-status-error-foreground);
color: var(--salt-status-error-foreground);
outline-color: var(--salt-status-error-foreground-decorative);
border-color: var(--salt-status-error-borderColor);
color: var(--salt-status-error-foreground-decorative);
}

.saltRadioButton-warning .saltRadioButton-input:focus-visible + .saltRadioButtonIcon {
outline-color: var(--salt-status-warning-foreground);
border-color: var(--salt-status-warning-foreground);
color: var(--salt-status-warning-foreground);
outline-color: var(--salt-status-warning-foreground-decorative);
border-color: var(--salt-status-warning-borderColor);
color: var(--salt-status-warning-foreground-decorative);
}
8 changes: 4 additions & 4 deletions packages/core/src/radio-button/RadioButtonIcon.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@

.saltRadioButtonIcon-error,
.saltRadioButton:hover .saltRadioButtonIcon-error {
color: var(--salt-status-error-foreground);
color: var(--salt-status-error-foreground-decorative);
border-color: var(--salt-status-error-borderColor);
outline-color: var(--salt-status-error-foreground);
outline-color: var(--salt-status-error-foreground-decorative);
}

.saltRadioButtonIcon-warning,
.saltRadioButton:hover .saltRadioButtonIcon-warning {
color: var(--salt-status-warning-foreground);
color: var(--salt-status-warning-foreground-decorative);
border-color: var(--salt-status-warning-borderColor);
outline-color: var(--salt-status-warning-foreground);
outline-color: var(--salt-status-warning-foreground-decorative);
}

.saltRadioButtonIcon-readOnly,
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/status-adornment/StatusAdornment.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
}

.saltStatusAdornment-error {
--statusAdornment-color: var(--salt-status-error-foreground);
--statusAdornment-color: var(--salt-status-error-foreground-decorative);
}

.saltStatusAdornment-warning {
--statusAdornment-color: var(--salt-status-warning-foreground);
--statusAdornment-color: var(--salt-status-warning-foreground-decorative);
}

.saltStatusAdornment-success {
--statusAdornment-color: var(--salt-status-success-foreground);
--statusAdornment-color: var(--salt-status-success-foreground-decorative);
}
8 changes: 4 additions & 4 deletions packages/core/src/status-indicator/StatusIndicator.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.saltStatusIndicator {
--statusIndicator-warning-color: var(--salt-status-warning-foreground);
--statusIndicator-info-color: var(--salt-status-info-foreground);
--statusIndicator-success-color: var(--salt-status-success-foreground);
--statusIndicator-error-color: var(--salt-status-error-foreground);
--statusIndicator-warning-color: var(--salt-status-warning-foreground-decorative);
--statusIndicator-info-color: var(--salt-status-info-foreground-decorative);
--statusIndicator-success-color: var(--salt-status-success-foreground-decorative);
--statusIndicator-error-color: var(--salt-status-error-foreground-decorative);
color: var(--saltStatusIndicator-color, var(--statusIndicator-Color));
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/text/Text.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,26 @@
--text-color: var(--salt-content-secondary-foreground-disabled);
}

/* Success variant */
.saltText-success {
--text-color: var(--salt-status-success-foreground-informative);
}

/* Warning variant */
.saltText-warning {
--text-color: var(--salt-status-warning-foreground-informative);
}

/* Error variant */
.saltText-error {
--text-color: var(--salt-status-error-foreground-informative);
}

/* Info variant */
.saltText-info {
--text-color: var(--salt-status-info-foreground-informative);
}

/* Body emphasis strong */
.saltText strong {
font-weight: var(--salt-text-fontWeight-strong);
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/text/Text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { ElementType, forwardRef, ReactElement } from "react";
import textCss from "./Text.css";
import { useWindow } from "@salt-ds/window";
import { useComponentCssInjection } from "@salt-ds/styles";
import { ValidationStatus } from "../status-indicator";

export type TextProps<T extends ElementType> = PolymorphicComponentPropWithRef<
T,
Expand Down Expand Up @@ -44,7 +45,7 @@ export type TextProps<T extends ElementType> = PolymorphicComponentPropWithRef<
/*
* The color of the text. Defaults to "primary".
*/
color?: "inherit" | "primary" | "secondary";
color?: "inherit" | "primary" | "secondary" | ValidationStatus;
}
>;

Expand Down
Loading
Loading