Skip to content

Commit 4353e95

Browse files
pan-kotpan-kot
committed
chore: Styling v2 for slider and progress bar
1 parent 1f35242 commit 4353e95

13 files changed

Lines changed: 503 additions & 143 deletions

File tree

‎pages/progress-bar/style-api-v2.page.tsx‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
import React from 'react';
4+
5+
import { ProgressBar } from '~components';
6+
7+
import { SimplePage } from '../app/templates';
8+
9+
import styles from './style-api-v2.scss';
10+
11+
const brand = { styleClassNames: { root: styles['bar-brand'], percentage: styles['percentage-brand'] } };
12+
const genai = { styleClassNames: { root: styles['bar-genai'], percentage: styles['percentage-genai'] } };
13+
14+
export default function () {
15+
return (
16+
<SimplePage title="Progress bar - Style API v2" screenshotArea={{}}>
17+
<ProgressBar value={45} label="Attachments" description="Files are uploading" {...brand} />
18+
<ProgressBar value={72} label="Attachments" additionalInfo="You can add more files at any time" {...genai} />
19+
</SimplePage>
20+
);
21+
}

‎pages/progress-bar/style-api-v2.scss‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
@use '~components/styling/progress-bar';
7+
@use '../style-api/palette' as palette;
8+
9+
.bar-brand {
10+
@include progress-bar.root(
11+
$track-color: palette.$subtle,
12+
$value-color: palette.$accent,
13+
$bar-border-radius: 2px,
14+
$bar-block-size: 8px
15+
);
16+
}
17+
18+
.bar-genai {
19+
@include progress-bar.root(
20+
$track-color: palette.$genai-surface,
21+
$value-color: palette.$genai,
22+
$bar-border-radius: 0,
23+
$bar-block-size: 12px
24+
);
25+
}
26+
27+
.percentage-brand {
28+
@include progress-bar.percentage($color: palette.$accent, $font-size: 14px, $font-weight: 700);
29+
}
30+
31+
.percentage-genai {
32+
@include progress-bar.percentage($color: palette.$genai-text, $font-size: 16px, $font-weight: 600);
33+
}

‎pages/slider/style-api-v2.page.tsx‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
import React, { useState } from 'react';
4+
5+
import { KeyValuePairs, Slider } from '~components';
6+
7+
import { SimplePage } from '../app/templates';
8+
9+
import styles from './style-api-v2.scss';
10+
11+
const styleClassNames = { root: styles.slider, handle: styles.handle };
12+
13+
export default function () {
14+
const [value, setValue] = useState(40);
15+
return (
16+
<SimplePage title="Slider - Style API v2" screenshotArea={{}}>
17+
<KeyValuePairs
18+
items={[
19+
{
20+
type: 'pair',
21+
label: 'With tick marks',
22+
value: (
23+
<Slider
24+
value={value}
25+
onChange={({ detail }) => setValue(detail.value)}
26+
min={0}
27+
max={100}
28+
step={20}
29+
tickMarks={true}
30+
ariaLabel="With tick marks"
31+
{...{ styleClassNames }}
32+
/>
33+
),
34+
},
35+
{
36+
type: 'pair',
37+
label: 'Disabled',
38+
value: (
39+
<Slider
40+
value={value}
41+
onChange={({ detail }) => setValue(detail.value)}
42+
min={0}
43+
max={100}
44+
disabled={true}
45+
ariaLabel="Disabled"
46+
{...{ styleClassNames }}
47+
/>
48+
),
49+
},
50+
{
51+
type: 'pair',
52+
label: 'Read-only',
53+
value: (
54+
<Slider
55+
value={value}
56+
onChange={({ detail }) => setValue(detail.value)}
57+
min={0}
58+
max={100}
59+
readOnly={true}
60+
ariaLabel="Read-only"
61+
{...{ styleClassNames }}
62+
/>
63+
),
64+
},
65+
]}
66+
/>
67+
</SimplePage>
68+
);
69+
}

‎pages/slider/style-api-v2.scss‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
/* stylelint-disable selector-combinator-disallowed-list */
7+
8+
@use '~components/styling/slider';
9+
@use '../style-api/palette' as palette;
10+
11+
.slider {
12+
@include slider.root($track-color: palette.$surface-alt, $value-color: palette.$accent);
13+
}
14+
15+
// The handle is the native <input type="range">, so its states are regular selectors.
16+
.handle {
17+
@include slider.handle($fill-color: palette.$accent, $halo-color: palette.$genai, $border-radius: 4px);
18+
19+
&:hover {
20+
@include slider.handle($fill-color: palette.$accent-hover);
21+
}
22+
23+
&:is(:focus, :active) {
24+
@include slider.handle($fill-color: palette.$accent-active);
25+
}
26+
27+
&:disabled,
28+
&[aria-disabled='true'] {
29+
@include slider.handle($fill-color: palette.$control-bg-disabled, $halo-color: palette.$control-bg-disabled);
30+
}
31+
}
32+
33+
// The value fill follows the handle state through :has() on the root slot.
34+
.slider:has(.handle:is(:focus, :active)) {
35+
@include slider.root($value-color: palette.$accent-active);
36+
}
37+
38+
// After the focus rule: a read-only slider stays focusable, and both rules have the same specificity.
39+
.slider:has(.handle:disabled, .handle[aria-disabled='true']) {
40+
@include slider.root($value-color: palette.$control-bg-disabled);
41+
}

‎src/progress-bar/__tests__/style-api.test.tsx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
import React from 'react';
4+
import { render } from '@testing-library/react';
5+
6+
import ProgressBar, { ProgressBarProps } from '../../../lib/components/progress-bar';
7+
import createWrapper from '../../../lib/components/test-utils/dom';
8+
9+
function renderProgressBar(props: Partial<ProgressBarProps> & Record<string, unknown> = {}) {
10+
const { container } = render(<ProgressBar value={40} label="Label" {...props} />);
11+
return { container, wrapper: createWrapper(container).findProgressBar()! };
12+
}
13+
14+
describe('ProgressBar Style API v2', () => {
15+
test.each<ProgressBarProps.Variant>(['standalone', 'flash', 'key-value'])(
16+
'applies styleClassNames (variant=%s)',
17+
variant => {
18+
const { wrapper } = renderProgressBar({
19+
variant,
20+
styleClassNames: { root: 'a', percentage: 'b', unknown: 'c' },
21+
});
22+
expect(wrapper.getElement()).toHaveClass('a');
23+
expect(wrapper.getElement()).not.toHaveClass('c');
24+
25+
const percentage = wrapper.findPercentageText()!.getElement();
26+
expect(percentage).not.toHaveClass('a');
27+
expect(percentage).toHaveClass('b');
28+
expect(percentage).not.toHaveClass('c');
29+
}
30+
);
31+
32+
test('does not leak the styleClassNames prop to the DOM', () => {
33+
const { container } = renderProgressBar({ styleClassNames: { root: 'a', percentage: 'b' } });
34+
expect(container.querySelector('[styleClassNames]')).toBeNull();
35+
});
36+
});

‎src/progress-bar/index.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { applyDisplayName } from '../internal/utils/apply-display-name';
1414
import { joinStrings } from '../internal/utils/strings';
1515
import InternalLiveRegion from '../live-region/internal';
1616
import { ProgressBarProps } from './interfaces';
17-
import { Progress, ResultState, SmallText } from './internal';
17+
import { Progress, ResultState, SmallText, StyleClassNames } from './internal';
1818

1919
import styles from './styles.css.js';
2020

@@ -41,7 +41,8 @@ export default function ProgressBar({
4141
const { __internalRootRef } = useBaseComponent('ProgressBar', {
4242
props: { variant },
4343
});
44-
const baseProps = getBaseProps(rest);
44+
const { styleClassNames, ...restProps } = rest as typeof rest & { styleClassNames?: StyleClassNames };
45+
const baseProps = getBaseProps(restProps);
4546
const generatedName = useUniqueId('awsui-progress-bar-');
4647

4748
const labelId = `${generatedName}-label`;
@@ -75,7 +76,7 @@ export default function ProgressBar({
7576
return (
7677
<div
7778
{...baseProps}
78-
className={clsx(baseProps.className, styles.root, variant && styles[variant])}
79+
className={clsx(baseProps.className, styleClassNames?.root, styles.root, variant && styles[variant])}
7980
ref={__internalRootRef}
8081
>
8182
<div className={isInFlash ? styles['flash-container'] : undefined}>
@@ -101,6 +102,7 @@ export default function ProgressBar({
101102
)}
102103
isInFlash={isInFlash}
103104
style={style}
105+
styleClassNames={styleClassNames}
104106
/>
105107
<InternalLiveRegion hidden={true} tagName="span" delay={0}>
106108
{label}

‎src/progress-bar/internal.tsx‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,24 @@ interface ProgressProps {
2626
ariaLabelledby?: string;
2727
ariaDescribedby?: string;
2828
style?: ProgressBarProps.Style;
29+
styleClassNames?: StyleClassNames;
2930
}
3031

31-
export const Progress = ({ value, isInFlash, ariaLabel, ariaLabelledby, ariaDescribedby, style }: ProgressProps) => {
32+
// Style API v2
33+
export interface StyleClassNames {
34+
root?: string;
35+
percentage?: string;
36+
}
37+
38+
export const Progress = ({
39+
value,
40+
isInFlash,
41+
ariaLabel,
42+
ariaLabelledby,
43+
ariaDescribedby,
44+
style,
45+
styleClassNames,
46+
}: ProgressProps) => {
3247
const roundedValue = Math.round(value);
3348
const progressValue = clamp(roundedValue, 0, MAX_VALUE);
3449

@@ -56,14 +71,12 @@ export const Progress = ({ value, isInFlash, ariaLabel, ariaLabelledby, ariaDesc
5671
}}
5772
/>
5873
<span aria-hidden="true" className={styles['percentage-container']}>
59-
<InternalBox
60-
className={styles.percentage}
61-
variant="small"
62-
color={isInFlash ? 'inherit' : undefined}
63-
nativeAttributes={progressPercentageStyles ? { style: progressPercentageStyles } : undefined}
74+
<small
75+
className={clsx(styleClassNames?.percentage, styles.percentage, isInFlash && styles['percentage-flash'])}
76+
style={progressPercentageStyles}
6477
>
6578
{`${progressValue}%`}
66-
</InternalBox>
79+
</small>
6780
</span>
6881
</div>
6982
);

‎src/progress-bar/styles.scss‎

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,47 @@
66
@use '../internal/styles/tokens' as awsui;
77
@use '../internal/styles' as styles;
88
@use '../internal/generated/custom-css-properties/index.scss' as custom-props;
9+
@use '../internal/styles/style-api' as style-api;
910
@use './motion';
1011

11-
$progress-height: var(#{custom-props.$progressBarHeight}, 0.4 * styles.$base-size);
12-
$progress-border-radius: var(#{custom-props.$progressBarBorderRadius}, 10px);
13-
$progress-background-color: var(
14-
#{custom-props.$progressBarBackgroundColor},
15-
awsui.$color-background-progress-bar-default
12+
$progress-bar-tokens: style-api.resolve((track-color, value-color, bar-block-size, bar-border-radius), carrier);
13+
@include style-api.register($progress-bar-tokens);
14+
@include style-api.docs('root', $progress-bar-tokens);
15+
@include style-api.docs('percentage', $properties: (color, font-family, font-size, font-weight));
16+
17+
$progress-height: style-api.value(
18+
$progress-bar-tokens,
19+
bar-block-size,
20+
var(#{custom-props.$progressBarHeight}, 0.4 * styles.$base-size)
21+
);
22+
$progress-border-radius: style-api.value(
23+
$progress-bar-tokens,
24+
bar-border-radius,
25+
var(#{custom-props.$progressBarBorderRadius}, 10px)
26+
);
27+
$progress-background-color: style-api.value(
28+
$progress-bar-tokens,
29+
track-color,
30+
var(#{custom-props.$progressBarBackgroundColor}, awsui.$color-background-progress-bar-default)
31+
);
32+
$progress-value-background-color: style-api.value(
33+
$progress-bar-tokens,
34+
value-color,
35+
var(#{custom-props.$progressValueBackgroundColor}, awsui.$color-background-progress-bar-value-default)
1636
);
17-
$progress-value-background-color: var(
18-
#{custom-props.$progressValueBackgroundColor},
19-
awsui.$color-background-progress-bar-value-default
37+
$progress-flash-background-color: style-api.value(
38+
$progress-bar-tokens,
39+
track-color,
40+
var(#{custom-props.$progressBarBackgroundColor}, awsui.$color-background-progress-bar-flash)
41+
);
42+
$progress-flash-value-background-color: style-api.value(
43+
$progress-bar-tokens,
44+
value-color,
45+
var(#{custom-props.$progressValueBackgroundColor}, awsui.$color-background-progress-bar-value-flash)
2046
);
2147

2248
.root {
49+
@include style-api.carriers($progress-bar-tokens);
2350
@include styles.styles-reset;
2451
}
2552

@@ -79,7 +106,19 @@ $progress-value-background-color: var(
79106
}
80107

81108
.percentage {
82-
/* used in test-utils */
109+
display: inline-block;
110+
font-family: awsui.$font-family-base;
111+
-webkit-font-smoothing: auto;
112+
-moz-osx-font-smoothing: auto;
113+
line-height: awsui.$line-height-body-s;
114+
letter-spacing: awsui.$letter-spacing-body-s;
115+
color: awsui.$color-text-small;
116+
font-size: awsui.$font-size-body-s;
117+
font-weight: styles.$font-weight-normal;
118+
119+
&.percentage-flash {
120+
color: currentColor;
121+
}
83122
}
84123

85124
@mixin general-progress-background-style {
@@ -131,22 +170,16 @@ $progress-value-background-color: var(
131170
}
132171

133172
&.progress-flash {
134-
background-color: var(#{custom-props.$progressBarBackgroundColor}, awsui.$color-background-progress-bar-flash);
173+
background-color: $progress-flash-background-color;
135174

136175
&::-webkit-progress-bar {
137-
background-color: var(#{custom-props.$progressBarBackgroundColor}, awsui.$color-background-progress-bar-flash);
176+
background-color: $progress-flash-background-color;
138177
}
139178
&::-webkit-progress-value {
140-
background-color: var(
141-
#{custom-props.$progressValueBackgroundColor},
142-
awsui.$color-background-progress-bar-value-flash
143-
);
179+
background-color: $progress-flash-value-background-color;
144180
}
145181
&::-moz-progress-bar {
146-
background-color: var(
147-
#{custom-props.$progressValueBackgroundColor},
148-
awsui.$color-background-progress-bar-value-flash
149-
);
182+
background-color: $progress-flash-value-background-color;
150183
}
151184
}
152185
}

0 commit comments

Comments
 (0)