Skip to content

Commit c99509e

Browse files
authored
fix: override invalid / warning styles with style api (#4055)
1 parent 1e40736 commit c99509e

File tree

4 files changed

+38
-14
lines changed

4 files changed

+38
-14
lines changed

src/input/styles.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@
126126
}
127127

128128
&.input-invalid {
129-
@include styles.form-invalid-control();
129+
@include styles.form-invalid-control(
130+
$color: var(#{custom-props.$styleColorDefault}, awsui.$color-text-status-error),
131+
$border-color: var(#{custom-props.$styleBorderColorDefault}, awsui.$color-text-status-error)
132+
);
130133
&.input-has-icon-left {
131134
padding-inline-start: calc(
132135
#{styles.$control-icon-horizontal-padding} -
@@ -136,7 +139,10 @@
136139
}
137140

138141
&.input-warning {
139-
@include styles.form-warning-control();
142+
@include styles.form-warning-control(
143+
$color: var(#{custom-props.$styleColorDefault}, awsui.$color-text-status-warning),
144+
$border-color: var(#{custom-props.$styleBorderColorDefault}, awsui.$color-text-status-warning)
145+
);
140146
&.input-has-icon-left {
141147
padding-inline-start: calc(
142148
#{styles.$control-icon-horizontal-padding} -

src/internal/styles/forms/mixins.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@
193193
@include typography.font-body-s;
194194
}
195195

196-
@mixin form-invalid-control {
197-
color: awsui.$color-text-status-error;
198-
border-color: awsui.$color-text-status-error;
196+
@mixin form-invalid-control($color: awsui.$color-text-status-error, $border-color: awsui.$color-text-status-error) {
197+
color: $color;
198+
border-color: $border-color;
199199
padding-inline-start: constants.$invalid-control-left-padding;
200200
border-inline-start-width: constants.$invalid-control-left-border;
201201
&:focus {
@@ -204,9 +204,9 @@
204204
@content;
205205
}
206206

207-
@mixin form-warning-control {
208-
color: awsui.$color-text-status-warning;
209-
border-color: awsui.$color-text-status-warning;
207+
@mixin form-warning-control($color: awsui.$color-text-status-warning, $border-color: awsui.$color-text-status-warning) {
208+
color: $color;
209+
border-color: $border-color;
210210
padding-inline-start: constants.$invalid-control-left-padding;
211211
border-inline-start-width: constants.$invalid-control-left-border;
212212
&:focus {

src/prompt-input/styles.scss

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,20 @@ $invalid-border-offset: constants.$invalid-control-left-padding;
7171
}
7272

7373
&.textarea-invalid {
74-
@include styles.form-invalid-control();
74+
@include styles.form-invalid-control(
75+
$color: var(#{custom-props.$promptInputStyleColorDefault}, awsui.$color-text-status-error),
76+
$border-color: var(#{custom-props.$promptInputStyleBorderColorDefault}, awsui.$color-text-status-error)
77+
);
7578
& {
7679
padding-inline-start: 0;
7780
}
7881

7982
&:focus-within,
8083
&:focus {
81-
@include styles.form-invalid-control();
84+
@include styles.form-invalid-control(
85+
$color: var(#{custom-props.$promptInputStyleColorDefault}, awsui.$color-text-status-error),
86+
$border-color: var(#{custom-props.$promptInputStyleBorderColorDefault}, awsui.$color-text-status-error)
87+
);
8288
& {
8389
padding-inline-start: 0;
8490
box-shadow: foundation.$box-shadow-focused-light-invalid;
@@ -87,14 +93,20 @@ $invalid-border-offset: constants.$invalid-control-left-padding;
8793
}
8894

8995
&.textarea-warning {
90-
@include styles.form-warning-control();
96+
@include styles.form-warning-control(
97+
$color: var(#{custom-props.$promptInputStyleColorDefault}, awsui.$color-text-status-warning),
98+
$border-color: var(#{custom-props.$promptInputStyleBorderColorDefault}, awsui.$color-text-status-warning)
99+
);
91100
& {
92101
padding-inline-start: 0;
93102
}
94103

95104
&:focus-within,
96105
&:focus {
97-
@include styles.form-warning-control();
106+
@include styles.form-warning-control(
107+
$color: var(#{custom-props.$promptInputStyleColorDefault}, awsui.$color-text-status-warning),
108+
$border-color: var(#{custom-props.$promptInputStyleBorderColorDefault}, awsui.$color-text-status-warning)
109+
);
98110
& {
99111
padding-inline-start: 0;
100112
box-shadow: foundation.$box-shadow-focused-light-invalid;

src/textarea/styles.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,16 @@
117117
}
118118

119119
&.textarea-invalid {
120-
@include styles.form-invalid-control();
120+
@include styles.form-invalid-control(
121+
$color: var(#{custom-props.$styleColorDefault}, awsui.$color-text-status-error),
122+
$border-color: var(#{custom-props.$styleBorderColorDefault}, awsui.$color-text-status-error)
123+
);
121124
}
122125

123126
&.textarea-warning {
124-
@include styles.form-warning-control();
127+
@include styles.form-warning-control(
128+
$color: var(#{custom-props.$styleColorDefault}, awsui.$color-text-status-warning),
129+
$border-color: var(#{custom-props.$styleBorderColorDefault}, awsui.$color-text-status-warning)
130+
);
125131
}
126132
}

0 commit comments

Comments
 (0)