Skip to content

Commit 68fd5b5

Browse files
teodoranemesjperals
authored andcommitted
fix: Added custom properties for the Alert focus ring (#3749)
1 parent fbd7975 commit 68fd5b5

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

build-tools/utils/custom-css-properties.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,10 @@ const customCssPropertiesList = [
8989
'styleFocusRingBorderRadius',
9090
'styleFocusRingBorderWidth',
9191
'styleFocusRingBoxShadow',
92+
// Alert focus ring properties
93+
'alertFocusRingBorderColor',
94+
'alertFocusRingBorderRadius',
95+
'alertFocusRingBorderWidth',
96+
'alertFocusRingBoxShadow',
9297
];
9398
module.exports = customCssPropertiesList;

src/alert/__tests__/alert.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@ describe('Style API', () => {
313313
expect(getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue('color')).toBe('rgb(0, 0, 0)');
314314
expect(
315315
getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue(
316-
customCssProps.styleFocusRingBorderColor
316+
customCssProps.alertFocusRingBorderColor
317317
)
318318
).toBe('rgb(23, 31, 118)');
319319
expect(
320320
getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue(
321-
customCssProps.styleFocusRingBorderRadius
321+
customCssProps.alertFocusRingBorderRadius
322322
)
323323
).toBe('6px');
324324
expect(
325325
getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue(
326-
customCssProps.styleFocusRingBorderWidth
326+
customCssProps.alertFocusRingBorderWidth
327327
)
328328
).toBe('4px');
329329

src/alert/style.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ export function getAlertStyles(style: AlertProps['style']) {
1616
borderWidth: style.root?.borderWidth,
1717
color: style.root?.color,
1818
...(style.root?.focusRing && {
19-
[customCssProps.styleFocusRingBorderColor]: style.root.focusRing?.borderColor,
20-
[customCssProps.styleFocusRingBorderRadius]: style.root.focusRing?.borderRadius,
21-
[customCssProps.styleFocusRingBorderWidth]: style.root.focusRing?.borderWidth,
19+
[customCssProps.alertFocusRingBorderColor]: style.root.focusRing?.borderColor,
20+
[customCssProps.alertFocusRingBorderRadius]: style.root.focusRing?.borderRadius,
21+
[customCssProps.alertFocusRingBorderWidth]: style.root.focusRing?.borderWidth,
2222
}),
2323
};
2424
}

src/alert/styles.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
padding-inline: awsui.$space-alert-horizontal;
3838
background-color: awsui.$color-background-container-content;
3939

40-
#{custom-props.$styleFocusRingBoxShadow}: 0 0 0
41-
var(#{custom-props.$styleFocusRingBorderWidth}, foundation.$box-shadow-focused-width)
42-
var(#{custom-props.$styleFocusRingBorderColor}, awsui.$color-border-item-focused);
40+
#{custom-props.$alertFocusRingBoxShadow}: 0 0 0
41+
var(#{custom-props.$alertFocusRingBorderWidth}, foundation.$box-shadow-focused-width)
42+
var(#{custom-props.$alertFocusRingBorderColor}, awsui.$color-border-item-focused);
4343
}
4444

4545
.alert-wrapper {
@@ -85,8 +85,8 @@
8585
@include focus-visible.when-visible {
8686
@include styles.focus-highlight(
8787
$gutter: awsui.$space-button-focus-outline-gutter,
88-
$border-radius: var(#{custom-props.$styleFocusRingBorderRadius}, awsui.$border-radius-control-default-focus-ring),
89-
$box-shadow: var(#{custom-props.$styleFocusRingBoxShadow})
88+
$border-radius: var(#{custom-props.$alertFocusRingBorderRadius}, awsui.$border-radius-control-default-focus-ring),
89+
$box-shadow: var(#{custom-props.$alertFocusRingBoxShadow})
9090
);
9191
}
9292
}

0 commit comments

Comments
 (0)