Skip to content

fix: Added custom properties for the Alert focus ring #3749

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

Merged
merged 6 commits into from
Aug 18, 2025
Merged

fix: Added custom properties for the Alert focus ring #3749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1263ba8
fix: Remove validateProps from components package
teodoranemes Aug 8, 2025
67b824d
Merge branch 'main' into remove-validate-props
teodoranemes Aug 8, 2025
02010d8
Merge branch 'main' of github.com:cloudscape-design/components
teodoranemes Aug 12, 2025
7e45e82
fix: Added custom properties for the Alert focus ring
teodoranemes Aug 12, 2025
de9c288
fix: Added the custom props for the focus-ring of Alert in the test
teodoranemes Aug 12, 2025
983d25a
Merge branch 'main' into fix-alert-focus-ring
teodoranemes Aug 12, 2025
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
5 changes: 5 additions & 0 deletions build-tools/utils/custom-css-properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,10 @@ const customCssPropertiesList = [
'styleFocusRingBorderRadius',
'styleFocusRingBorderWidth',
'styleFocusRingBoxShadow',
// Alert focus ring properties
'alertFocusRingBorderColor',
'alertFocusRingBorderRadius',
'alertFocusRingBorderWidth',
'alertFocusRingBoxShadow',
];
module.exports = customCssPropertiesList;
6 changes: 3 additions & 3 deletions src/alert/__tests__/alert.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,17 +313,17 @@ describe('Style API', () => {
expect(getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue('color')).toBe('rgb(0, 0, 0)');
expect(
getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue(
customCssProps.styleFocusRingBorderColor
customCssProps.alertFocusRingBorderColor
)
).toBe('rgb(23, 31, 118)');
expect(
getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue(
customCssProps.styleFocusRingBorderRadius
customCssProps.alertFocusRingBorderRadius
)
).toBe('6px');
expect(
getComputedStyle(wrapper.findRootElement().getElement()).getPropertyValue(
customCssProps.styleFocusRingBorderWidth
customCssProps.alertFocusRingBorderWidth
)
).toBe('4px');

Expand Down
6 changes: 3 additions & 3 deletions src/alert/style.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ export function getAlertStyles(style: AlertProps['style']) {
borderWidth: style.root?.borderWidth,
color: style.root?.color,
...(style.root?.focusRing && {
[customCssProps.styleFocusRingBorderColor]: style.root.focusRing?.borderColor,
[customCssProps.styleFocusRingBorderRadius]: style.root.focusRing?.borderRadius,
[customCssProps.styleFocusRingBorderWidth]: style.root.focusRing?.borderWidth,
[customCssProps.alertFocusRingBorderColor]: style.root.focusRing?.borderColor,
[customCssProps.alertFocusRingBorderRadius]: style.root.focusRing?.borderRadius,
[customCssProps.alertFocusRingBorderWidth]: style.root.focusRing?.borderWidth,
}),
};
}
Expand Down
10 changes: 5 additions & 5 deletions src/alert/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
padding-inline: awsui.$space-alert-horizontal;
background-color: awsui.$color-background-container-content;

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

.alert-wrapper {
Expand Down Expand Up @@ -85,8 +85,8 @@
@include focus-visible.when-visible {
@include styles.focus-highlight(
$gutter: awsui.$space-button-focus-outline-gutter,
$border-radius: var(#{custom-props.$styleFocusRingBorderRadius}, awsui.$border-radius-control-default-focus-ring),
$box-shadow: var(#{custom-props.$styleFocusRingBoxShadow})
$border-radius: var(#{custom-props.$alertFocusRingBorderRadius}, awsui.$border-radius-control-default-focus-ring),
$box-shadow: var(#{custom-props.$alertFocusRingBoxShadow})
);
}
}
Expand Down
Loading