Skip to content

Commit f067420

Browse files
authored
chore: Update StepperField disabled buttons style (#2330)
* chore: Update StepperField disabled buttons * chore: Update StepperField disabled buttons * Update snapshots
1 parent 12de8fa commit f067420

File tree

6 files changed

+32
-16
lines changed

6 files changed

+32
-16
lines changed

.changeset/tall-waves-worry.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@aws-amplify/ui-react': patch
3+
'@aws-amplify/ui': patch
4+
---
5+
6+
ui-react(fix): Update StepperField disabled buttons styles, making them easier to see.

packages/react/src/primitives/StepperField/StepperField.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Input } from '../Input';
1111
import { Label } from '../Label';
1212
import { Primitive } from '../types/view';
1313
import { StepperFieldProps } from '../types/stepperField';
14-
import { classNameModifier } from '../shared/utils';
14+
import { classNameModifier, classNameModifierByFlag } from '../shared/utils';
1515
import { ComponentClassNames, ComponentText } from '../shared/constants';
1616
import { splitPrimitiveProps } from '../shared/styleUtils';
1717
import { useStableId } from '../utils/useStableId';
@@ -124,6 +124,11 @@ const StepperFieldPrimitive: Primitive<StepperFieldProps, 'input'> = (
124124
classNameModifier(
125125
ComponentClassNames.StepperFieldButtonDecrease,
126126
variation
127+
),
128+
classNameModifierByFlag(
129+
ComponentClassNames.StepperFieldButtonDecrease,
130+
'disabled',
131+
shouldDisableDecreaseButton
127132
)
128133
)}
129134
data-invalid={hasError}
@@ -143,6 +148,11 @@ const StepperFieldPrimitive: Primitive<StepperFieldProps, 'input'> = (
143148
classNameModifier(
144149
ComponentClassNames.StepperFieldButtonIncrease,
145150
variation
151+
),
152+
classNameModifierByFlag(
153+
ComponentClassNames.StepperFieldButtonIncrease,
154+
'disabled',
155+
shouldDisableIncreaseButton
146156
)
147157
)}
148158
data-invalid={hasError}

packages/ui/src/theme/__tests__/defaultTheme.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ describe('@aws-amplify/ui', () => {
602602
--amplify-components-stepperfield-button-focus-color: var(--amplify-components-button-focus-color);
603603
--amplify-components-stepperfield-button-focus-background-color: var(--amplify-components-button-focus-background-color);
604604
--amplify-components-stepperfield-button-disabled-color: var(--amplify-components-button-disabled-color);
605-
--amplify-components-stepperfield-button-disabled-background-color: var(--amplify-components-button-disabled-background-color);
605+
--amplify-components-stepperfield-button-disabled-background-color: var(--amplify-components-fieldcontrol-disabled-background-color);
606606
--amplify-components-stepperfield-button-hover-color: var(--amplify-components-button-hover-color);
607607
--amplify-components-stepperfield-button-hover-background-color: var(--amplify-components-button-hover-background-color);
608608
--amplify-components-switchfield-disabled-opacity: var(--amplify-opacities-60);

packages/ui/src/theme/__tests__/overrides.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ describe('@aws-amplify/ui', () => {
636636
--amplify-components-stepperfield-button-focus-color: var(--amplify-components-button-focus-color);
637637
--amplify-components-stepperfield-button-focus-background-color: var(--amplify-components-button-focus-background-color);
638638
--amplify-components-stepperfield-button-disabled-color: var(--amplify-components-button-disabled-color);
639-
--amplify-components-stepperfield-button-disabled-background-color: var(--amplify-components-button-disabled-background-color);
639+
--amplify-components-stepperfield-button-disabled-background-color: var(--amplify-components-fieldcontrol-disabled-background-color);
640640
--amplify-components-stepperfield-button-hover-color: var(--amplify-components-button-hover-color);
641641
--amplify-components-stepperfield-button-hover-background-color: var(--amplify-components-button-hover-background-color);
642642
--amplify-components-switchfield-disabled-opacity: var(--amplify-opacities-60);

packages/ui/src/theme/css/component/stepperField.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@
4242
);
4343
}
4444

45-
.amplify-stepperfield__button--decrease {
45+
.amplify-stepperfield__button--decrease,
46+
.amplify-stepperfield__button--increase {
4647
background-color: var(
4748
--amplify-components-stepperfield-button-background-color
4849
);
49-
&[data-invalid='true'] {
50-
border-inline-end: none;
50+
&--disabled {
51+
background-color: var(
52+
--amplify-components-stepperfield-button-disabled-background-color
53+
);
5154
}
52-
5355
&--quiet {
5456
border-width: 0 0 var(--amplify-components-button-border-width) 0;
5557
border-radius: 0;
5658
}
5759
}
5860

59-
.amplify-stepperfield__button--increase {
60-
background-color: var(
61-
--amplify-components-stepperfield-button-background-color
62-
);
61+
.amplify-stepperfield__button--decrease {
6362
&[data-invalid='true'] {
64-
border-inline-start: none;
63+
border-inline-end: none;
6564
}
65+
}
6666

67-
&--quiet {
68-
border-width: 0 0 var(--amplify-components-button-border-width) 0;
69-
border-radius: 0;
67+
.amplify-stepperfield__button--increase {
68+
&[data-invalid='true'] {
69+
border-inline-start: none;
7070
}
7171
}
7272

packages/ui/src/theme/tokens/components/stepperField.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const stepperfield: StepperFieldTokens = {
5454
_disabled: {
5555
color: { value: '{components.button._disabled.color}' },
5656
backgroundColor: {
57-
value: '{components.button._disabled.backgroundColor}',
57+
value: '{components.fieldcontrol._disabled.backgroundColor}',
5858
},
5959
},
6060
_hover: {

0 commit comments

Comments
 (0)