Skip to content

Commit 6d1d3f7

Browse files
authored
fix: use spans inside labels for correct html (#2217)
1 parent 4229de7 commit 6d1d3f7

File tree

5 files changed

+21
-20
lines changed

5 files changed

+21
-20
lines changed

packages/components/src/components/checkbox/__snapshots__/checkbox.spec.ts.snap

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ exports[`Checkbox should match snapshot 1`] = `
55
<!---->
66
<input id="input-checkbox-0" part="input" type="checkbox" value="">
77
<label htmlfor="input-checkbox-0" part="container">
8-
<div part="checkbox"></div>
9-
<div part="label"></div>
8+
<span part="checkbox"></span>
9+
<span part="label"></span>
1010
</label>
1111
</scale-checkbox>
1212
`;
@@ -16,8 +16,8 @@ exports[`Checkbox should match snapshot 2`] = `
1616
<!---->
1717
<input aria-describedby="helper-message-2" id="input-checkbox-2" part="input" type="checkbox" value="">
1818
<label htmlfor="input-checkbox-2" part="container">
19-
<div part="checkbox"></div>
20-
<div part="label"></div>
19+
<span part="checkbox"></span>
20+
<span part="label"></span>
2121
</label>
2222
<div aria-live="polite" aria-relevant="additions removals" id="helper-message-2" part="helper-text">
2323
<scale-icon-alert-information size="11"></scale-icon-alert-information>

packages/components/src/components/checkbox/checkbox.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ export class Checkbox {
195195
onChange={this.handleChange}
196196
/>
197197
<label part="container" htmlFor={this.inputId}>
198-
<div part="checkbox">{this.renderIcon()}</div>
198+
<span part="checkbox">{this.renderIcon()}</span>
199199
{/* TODO: discuss deprecation of the slot (move closer so W3C spec) */}
200-
<div part="label">{this.label || <slot></slot>}</div>
200+
<span part="label">{this.label || <slot></slot>}</span>
201201
</label>
202202
{this.renderHelperText(helperText)}
203203
</Host>

packages/components/src/components/switch/__snapshots__/switch.spec.ts.snap

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ exports[`Switch should match snapshot 1`] = `
55
<div class="switch switch--focus-visible-not-supported switch--size-large">
66
<label class="switch__wrapper" id="switch-0-label">
77
<input aria-labelledby="switch-0-label" class="switch__control" id="switch-0" type="checkbox">
8-
<div aria-hidden="true" class="switch__toggle">
9-
<div class="switch__thumb">
8+
<span aria-hidden="true" class="switch__toggle">
9+
<span class="switch__thumb">
1010
<scale-icon-action-checkmark decorative="" selected="" size="12"></scale-icon-action-checkmark>
11-
</div>
12-
<div class="switch__io-text">
11+
</span>
12+
<span class="switch__io-text">
1313
<span>
1414
0
1515
</span>
16-
</div>
17-
</div>
18-
<div aria-hidden="true" class="switch__toggle--overlay"></div>
16+
</span>
17+
</span>
18+
<span aria-hidden="true" class="switch__toggle--overlay"></span>
1919
</label>
2020
</div>
2121
</scale-switch>

packages/components/src/components/switch/switch.css

+1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ scale-switch {
202202
transition-timing-function: var(--transition-easing);
203203
color: transparent;
204204
border: 1px solid rgba(0, 0, 0, 0.04);
205+
display: inline-block;
205206
}
206207

207208
.switch--checked .switch__thumb {

packages/components/src/components/switch/switch.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ export class Switch {
7070
emitEvent(this, 'scaleChange', { value: this.checked });
7171
}}
7272
/>
73-
<div class="switch__toggle" aria-hidden="true">
74-
<div class="switch__thumb">
73+
<span class="switch__toggle" aria-hidden="true">
74+
<span class="switch__thumb">
7575
<scale-icon-action-checkmark size={12} decorative selected />
76-
</div>
77-
<div class="switch__io-text">
76+
</span>
77+
<span class="switch__io-text">
7878
<span>{this.checked ? 'I' : '0'}</span>
79-
</div>
80-
</div>
81-
<div class="switch__toggle--overlay" aria-hidden="true"></div>
79+
</span>
80+
</span>
81+
<span class="switch__toggle--overlay" aria-hidden="true"></span>
8282
{this.label && <span class="switch__label-text">{this.label}</span>}
8383
</label>
8484
</div>

0 commit comments

Comments
 (0)