Skip to content

Commit 229cdb7

Browse files
authored
fix: fixed hideLabel to properly implement visually-hidden (#19399)
1 parent bd8dc56 commit 229cdb7

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

packages/styles/scss/components/text-area/_text-area.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
@use '../../utilities/placeholder-colors' as *;
2020
@use '../../utilities/skeleton' as *;
2121
@use '../../utilities/layout';
22+
@use '../../utilities/visually-hidden' as *;
2223

2324
/// Text area styles
2425
/// @access public

packages/styles/scss/components/text-input/_text-input.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@use '../../utilities/layout';
2626
@use '../../utilities/focus-outline' as *;
2727
@use '../../utilities/button-reset';
28+
@use '../../utilities/visually-hidden' as *;
2829

2930
/// Text input styles
3031
/// @access public

packages/web-components/src/components/text-input/text-input.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,8 @@ class CDSTextInput extends ValidityMixin(FormMixin(LitElement)) {
441441
</label>`
442442
: null;
443443

444-
const labelText =
445-
label && !hideLabel
446-
? html`<label class="${labelClasses}"> ${label} </label>`
447-
: null;
448-
449444
const labelWrapper = html`<div class="${prefix}--text-input__label-wrapper">
450-
${labelText} ${counter}
445+
<label class="${labelClasses}"> ${label} </label> ${counter}
451446
</div>`;
452447

453448
const helper = helperText

packages/web-components/src/components/textarea/textarea.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ class CDSTextarea extends CDSTextInput {
101101
});
102102

103103
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({
104110
[`${prefix}--label`]: true,
105111
[`${prefix}--label--disabled`]: this.disabled,
106112
});
@@ -112,7 +118,7 @@ class CDSTextarea extends CDSTextInput {
112118

113119
const counter =
114120
enableCounter && maxCount
115-
? html` <label class="${labelClasses}">
121+
? html` <label class="${counterClasses}">
116122
<slot name="label-text">${textCount}/${maxCount}</slot>
117123
</label>`
118124
: null;
@@ -128,13 +134,9 @@ class CDSTextarea extends CDSTextInput {
128134

129135
return html`
130136
<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>
138140
${counter}
139141
</div>
140142
<div class="${textareaWrapperClasses}" ?data-invalid="${this.invalid}">

0 commit comments

Comments
 (0)