Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion pages/radio-group/style-api-v2.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@ function StyledRadioGroup({ ariaLabel, items, readOnly, direction }: StyledRadio
onChange={({ detail }) => setValue(detail.value)}
{...{
styleClassNames: {
item: { control: clsx(styles['radio-control'], readOnly && styles['radio-control-readonly']) },
item: ({ item, checked }: { item: RadioGroupProps.RadioButtonDefinition; checked: boolean }) => ({
control: clsx(
styles['radio-control'],
checked && styles['radio-control-checked'],
item.disabled && styles['radio-control-disabled'],
readOnly && styles['radio-control-readonly']
),
}),
},
}}
/>
Expand Down
4 changes: 2 additions & 2 deletions pages/radio-group/style-api-v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
$awsui-focus-ring-radius: 50%
);

&:has(:checked) {
&.radio-control-checked {
@include radio-button.control(
$awsui-fill-color: palette.$control-bg-checked,
$awsui-indicator-color: palette.$control-fg
);
}

&:has(:disabled) {
&.radio-control-disabled {
@include radio-button.control(
$awsui-fill-color: palette.$control-bg-disabled,
$awsui-border-color: palette.$border-disabled,
Expand Down
8 changes: 7 additions & 1 deletion pages/segmented-control/style-api-v2.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ function StyledSegmentedControl({ options, label, square }: StyledSegmentedContr
{...{
styleClassNames: {
root: styles.root,
segment: clsx(styles.segment, square && styles['segment-square']),
segment: ({ option, selected }: { option: SegmentedControlProps.Option; selected: boolean }) =>
clsx(
styles.segment,
selected && styles['segment-selected'],
option.disabled && styles['segment-disabled'],
square && styles['segment-square']
),
divider: styles.divider,
select: { trigger: styles['select-trigger'], dropdown: styles['select-dropdown'] },
},
Expand Down
5 changes: 2 additions & 3 deletions pages/segmented-control/style-api-v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@
@include segmented-control.segment($background: palette.$subtle-hover, $color: palette.$text);
}

&[aria-pressed='true'] {
&.segment-selected {
@include segmented-control.segment(
$background: palette.$accent,
$color: palette.$text-on-accent,
$box-shadow: inset 0 0 0 1px palette.$accent-active
);
}

&:disabled,
&[aria-disabled='true'] {
&.segment-disabled {
@include segmented-control.segment($background: palette.$control-bg-disabled, $color: palette.$text-disabled);
}
}
Expand Down
3 changes: 1 addition & 2 deletions pages/table/style-api-v2.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import React, { useContext, useState } from 'react';
import clsx from 'clsx';

import { Checkbox, FormField, Header, Select, SpaceBetween, Table, TableProps } from '~components';
import { StyleClassNames } from '~components/table/style-api';

import AppContext, { AppContextType } from '../app/app-context';
import { SimplePage } from '../app/templates';
Expand Down Expand Up @@ -135,7 +134,7 @@ export default function () {
selectionType !== 'none' && (selectionType === 'single' ? selectedItems[0] === item : selectedItems.includes(item));

// Selected rows keep the selection color: status and nested highlights skip them.
const styleClassNames: StyleClassNames<Instance> = {
const styleClassNames: TableProps.StyleClassNames<Instance> = {
root: styles.table,
headerCell: args => {
if (args.type === 'selection') {
Expand Down
Loading
Loading