Skip to content

chore: Alternative style api for alert #5122

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

Draft
pan-kot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: Alternative style api for alert #5122

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
2 changes: 1 addition & 1 deletion pages/alert/style-api-v2.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function () {
<Alert
type="success"
dismissible={true}
action={<Button {...{ styleClassNames: { button: styles['alert-genai-action'] } }}>Generate again</Button>}
action={<Button {...{ styleClassNames: { root: styles['alert-genai-action'] } }}>Generate again</Button>}
{...{
styleClassNames: {
root: styles['alert-genai'],
Expand Down
23 changes: 16 additions & 7 deletions pages/alert/style-api-v2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,29 @@
SPDX-License-Identifier: Apache-2.0
*/

@use '@cloudscape-design/component-toolkit/styling' as styling;
@use '../style-api/palette' as palette;

.alert-genai {
--awsui-style-background-color: #{palette.$genai-surface};
--awsui-style-color: #{palette.$genai-text};
--awsui-style-border-color: #{palette.$genai};
--awsui-style-border-radius: 4px;
--awsui-style-padding-block: 12px;
--awsui-style-padding-inline: 24px;
--awsui-style-focus-ring-color: #{palette.$genai};

@include styling.override {
background-color: palette.$genai-surface;
color: palette.$genai-text;
border-color: palette.$genai;
border-start-start-radius: 4px;
border-start-end-radius: 4px;
border-end-start-radius: 4px;
border-end-end-radius: 4px;
padding-block: 12px;
padding-inline: 24px;
}
}

.alert-genai-icon {
--awsui-style-color: #{palette.$genai};
@include styling.override {
color: palette.$genai;
}
}

.alert-genai-action {
Expand Down
23 changes: 11 additions & 12 deletions src/__tests__/snapshot-tests/__snapshots__/style-docs.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ exports[`Style API docs definition for alert matches the snapshot: alert 1`] = `
"slots": [
{
"name": "root",
"properties": [],
"propertyDescriptions": {},
"tokenDescriptions": {},
"tokens": [
"properties": [
"color",
"background-color",
"border-color",
"border-width",
"border",
"border-radius",
"padding-block",
"padding-inline",
"padding",
],
"propertyDescriptions": {},
"tokenDescriptions": {},
"tokens": [
"focus-ring-color",
"focus-ring-width",
"focus-ring-radius",
Expand All @@ -25,12 +24,12 @@ exports[`Style API docs definition for alert matches the snapshot: alert 1`] = `
},
{
"name": "icon",
"properties": [],
"propertyDescriptions": {},
"tokenDescriptions": {},
"tokens": [
"properties": [
"color",
],
"propertyDescriptions": {},
"tokenDescriptions": {},
"tokens": [],
},
{
"forwardsTo": {
Expand Down
39 changes: 14 additions & 25 deletions src/alert/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@

@use './motion';

$props: style-api.combine(style-api.$surface, (padding-block, padding-inline), style-api.$focus-ring);
$tokens: style-api.resolve($props, carrier);
$tokens: style-api.resolve(style-api.$focus-ring, carrier);
@include style-api.register($tokens);
@include style-api.docs('root', $tokens);
@include style-api.docs('root', $tokens, $properties: (color, background-color, border, border-radius, padding));

.root {
@include styles.styles-reset;
Expand All @@ -31,21 +30,21 @@ $tokens: style-api.resolve($props, carrier);
.alert {
@include style-api.carriers($tokens);
@include styles.styles-reset;
color: style-api.value($tokens, color, awsui.$color-text-alert-default);
color: awsui.$color-text-alert-default;
position: relative;
display: flex;
flex-direction: row;
border-block-start: awsui.$border-width-alert-block-start solid;
border-block-end: awsui.$border-width-alert-block-end solid;
border-inline-start: awsui.$border-width-alert-inline-start solid;
border-inline-end: awsui.$border-width-alert-inline-end solid;
border-start-start-radius: style-api.value($tokens, border-radius, awsui.$border-radius-alert);
border-start-end-radius: style-api.value($tokens, border-radius, awsui.$border-radius-alert);
border-end-start-radius: style-api.value($tokens, border-radius, awsui.$border-radius-alert);
border-end-end-radius: style-api.value($tokens, border-radius, awsui.$border-radius-alert);
padding-block: style-api.value($tokens, padding-block, awsui.$space-alert-vertical);
padding-inline: style-api.value($tokens, padding-inline, awsui.$space-alert-horizontal);
background-color: style-api.value($tokens, background-color, awsui.$color-background-container-content);
border-start-start-radius: awsui.$border-radius-alert;
border-start-end-radius: awsui.$border-radius-alert;
border-end-start-radius: awsui.$border-radius-alert;
border-end-end-radius: awsui.$border-radius-alert;
padding-block: awsui.$space-alert-vertical;
padding-inline: awsui.$space-alert-horizontal;
background-color: awsui.$color-background-container-content;
}

.alert-wrapper {
Expand Down Expand Up @@ -97,13 +96,7 @@ $tokens: style-api.resolve($props, carrier);
}
}

$icon-props: (color);
$icon-tokens: style-api.resolve($icon-props, carrier);
@include style-api.docs('icon', $icon-tokens);

.icon {
@include style-api.carriers($icon-tokens);
}
@include style-api.docs('icon', $properties: (color));

.text {
min-inline-size: 0;
Expand Down Expand Up @@ -173,14 +166,10 @@ $_text-colors: (

@each $type in map.keys($_text-colors) {
.type-#{$type} {
border-color: style-api.value($tokens, border-color, map.get($_border-colors, $type));
background-color: style-api.value($tokens, background-color, map.get($_background-colors, $type));
border-color: map.get($_border-colors, $type);
background-color: map.get($_background-colors, $type);
> .alert-wrapper > .alert-focus-wrapper > .icon {
color: style-api.value(
$icon-tokens,
color,
var(#{custom-props.$alertIconColor}, #{map.get($_text-colors, $type)})
);
color: var(#{custom-props.$alertIconColor}, #{map.get($_text-colors, $type)});
}
}
}
4 changes: 2 additions & 2 deletions src/internal/styles/style-api.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ $_focus-ring-carriers: toolkit.resolve($focus-ring, carrier);
}
}

@mixin docs($name, $map) {
@mixin docs($name, $tokens: null, $properties: null, $descriptions: null) {
@if enabled() {
@include toolkit.docs($name, $map);
@include toolkit.docs($name, $tokens, $properties, $descriptions);
}
}

Expand Down
Loading