File tree Expand file tree Collapse file tree 4 files changed +13
-14
lines changed
web-components/src/components Expand file tree Collapse file tree 4 files changed +13
-14
lines changed Original file line number Diff line number Diff line change 19
19
@use ' ../../utilities/placeholder-colors' as * ;
20
20
@use ' ../../utilities/skeleton' as * ;
21
21
@use ' ../../utilities/layout' ;
22
+ @use ' ../../utilities/visually-hidden' as * ;
22
23
23
24
/// Text area styles
24
25
/// @access public
Original file line number Diff line number Diff line change 25
25
@use ' ../../utilities/layout' ;
26
26
@use ' ../../utilities/focus-outline' as * ;
27
27
@use ' ../../utilities/button-reset' ;
28
+ @use ' ../../utilities/visually-hidden' as * ;
28
29
29
30
/// Text input styles
30
31
/// @access public
Original file line number Diff line number Diff line change @@ -441,13 +441,8 @@ class CDSTextInput extends ValidityMixin(FormMixin(LitElement)) {
441
441
</ label > `
442
442
: null ;
443
443
444
- const labelText =
445
- label && ! hideLabel
446
- ? html `< label class ="${ labelClasses } "> ${ label } </ label > `
447
- : null ;
448
-
449
444
const labelWrapper = html `< div class ="${ prefix } --text-input__label-wrapper ">
450
- ${ labelText } ${ counter }
445
+ < label class =" ${ labelClasses } " > ${ label } </ label > ${ counter }
451
446
</ div > ` ;
452
447
453
448
const helper = helperText
Original file line number Diff line number Diff line change @@ -101,6 +101,12 @@ class CDSTextarea extends CDSTextInput {
101
101
} ) ;
102
102
103
103
const labelClasses = classMap ( {
104
+ [ `${ prefix } --label` ] : true ,
105
+ [ `${ prefix } --visually-hidden` ] : this . hideLabel ,
106
+ [ `${ prefix } --label--disabled` ] : this . disabled ,
107
+ } ) ;
108
+
109
+ const counterClasses = classMap ( {
104
110
[ `${ prefix } --label` ] : true ,
105
111
[ `${ prefix } --label--disabled` ] : this . disabled ,
106
112
} ) ;
@@ -112,7 +118,7 @@ class CDSTextarea extends CDSTextInput {
112
118
113
119
const counter =
114
120
enableCounter && maxCount
115
- ? html ` < label class ="${ labelClasses } ">
121
+ ? html ` < label class ="${ counterClasses } ">
116
122
< slot name ="label-text "> ${ textCount } /${ maxCount } </ slot >
117
123
</ label > `
118
124
: null ;
@@ -128,13 +134,9 @@ class CDSTextarea extends CDSTextInput {
128
134
129
135
return html `
130
136
< div class ="${ prefix } --text-area__label-wrapper ">
131
- ${ this . hideLabel
132
- ? html ``
133
- : html `
134
- < label class ="${ labelClasses } " for ="input ">
135
- < slot name ="label-text "> ${ this . label } </ slot >
136
- </ label >
137
- ` }
137
+ < label class ="${ labelClasses } " for ="input ">
138
+ < slot name ="label-text "> ${ this . label } </ slot >
139
+ </ label >
138
140
${ counter }
139
141
</ div >
140
142
< div class ="${ textareaWrapperClasses } " ?data-invalid ="${ this . invalid } ">
You can’t perform that action at this time.
0 commit comments