Skip to content

Commit cff8a3c

Browse files
asynclizcopybara-github
authored andcommitted
chore(field): replace spans with divs
PiperOrigin-RevId: 511560974
1 parent 7cea773 commit cff8a3c

File tree

4 files changed

+33
-32
lines changed

4 files changed

+33
-32
lines changed

field/lib/field.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,35 +72,35 @@ export class Field extends LitElement {
7272
};
7373

7474
return html`
75-
<span class="field ${classMap(classes)}">
76-
<span class="container">
75+
<div class="field ${classMap(classes)}">
76+
<div class="container">
7777
${this.renderBackground?.()}
7878
${this.renderIndicator?.()}
7979
${outline}
80-
<span class="start">
80+
<div class="start">
8181
<slot name="start"></slot>
82-
</span>
83-
<span class="middle">
82+
</div>
83+
<div class="middle">
8484
${restingLabel}
8585
${outline ? nothing : floatingLabel}
86-
<span class="content">
86+
<div class="content">
8787
<slot></slot>
88-
</span>
89-
</span>
90-
<span class="end">
88+
</div>
89+
</div>
90+
<div class="end">
9191
<slot name="end"></slot>
92-
</span>
93-
</span>
92+
</div>
93+
</div>
9494
95-
<span class="supporting-text">
96-
<span class="supporting-text-start">
95+
<div class="supporting-text">
96+
<div class="supporting-text-start">
9797
<slot name="supporting-text"></slot>
98-
</span>
99-
<span class="supporting-text-end">
98+
</div>
99+
<div class="supporting-text-end">
100100
<slot name="supporting-text-end"></slot>
101-
</span>
102-
</span>
103-
</span>
101+
</div>
102+
</div>
103+
</div>
104104
`;
105105
}
106106

field/lib/filled-field.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ export class FilledField extends Field {
2727

2828
protected override renderBackground() {
2929
return html`
30-
<span class="state-layer"></span>
30+
<div class="state-layer"></div>
3131
`;
3232
}
3333

3434
protected override renderIndicator() {
3535
const strokeStyle = {transformOrigin: this.strokeTransformOrigin};
3636
return html`
37-
<span class="active-indicator" style="${styleMap(strokeStyle)}"></span>
37+
<div class="active-indicator" style="${styleMap(strokeStyle)}"></div>
3838
`;
3939
}
4040

field/lib/filled-field_test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ declare global {
2323
@customElement('md-test-filled-field')
2424
class TestFilledField extends FilledField {
2525
get strokeTransformOriginProp() {
26-
const element = this.renderRoot.querySelector('.active-indicator');
26+
const element =
27+
this.renderRoot.querySelector<HTMLElement>('.active-indicator');
2728
if (!element) {
2829
return '';
2930
}
3031

31-
return getComputedStyle(element).transformOrigin.split(' ')[0];
32+
return element.style.transformOrigin.split(' ')[0];
3233
}
3334
}
3435

@@ -88,7 +89,7 @@ describe('Field', () => {
8889
// Assertion.
8990
expect(instance.strokeTransformOriginProp)
9091
.withContext('should not update stroke transform when disabled')
91-
.toBe('0px');
92+
.toBe('');
9293
});
9394

9495
it('should be reset when unfocused', async () => {
@@ -107,7 +108,7 @@ describe('Field', () => {
107108
// Assertion.
108109
expect(instance.strokeTransformOriginProp)
109110
.withContext('should rest stroke transform when unfocused')
110-
.toBe('0px');
111+
.toBe('');
111112
});
112113
});
113114
});

field/lib/outlined-field.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import {Field} from './field.js';
1414
export class OutlinedField extends Field {
1515
protected override renderOutline(floatingLabel: TemplateResult) {
1616
return html`
17-
<span class="outline">
18-
<span class="outline-start"></span>
19-
<span class="outline-notch">
20-
<span class="outline-panel-inactive"></span>
21-
<span class="outline-panel-active"></span>
17+
<div class="outline">
18+
<div class="outline-start"></div>
19+
<div class="outline-notch">
20+
<div class="outline-panel-inactive"></div>
21+
<div class="outline-panel-active"></div>
2222
${floatingLabel}
23-
</span>
24-
<span class="outline-end"></span>
25-
</span>
23+
</div>
24+
<div class="outline-end"></div>
25+
</div>
2626
`;
2727
}
2828
}

0 commit comments

Comments
 (0)