Skip to content

Commit 993e7a9

Browse files
authored
refactor!: remove parts from elements in global scope (#4889)
1 parent 5d8c783 commit 993e7a9

5 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎packages/login/src/vaadin-login-form.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,19 @@ class LoginForm extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)))
5252
static get template() {
5353
return html`
5454
<style>
55-
[part='vaadin-login-native-form'] * {
55+
vaadin-login-form-wrapper > form > * {
5656
width: 100%;
5757
}
5858
</style>
5959
<vaadin-login-form-wrapper
6060
theme$="[[_theme]]"
61-
part="vaadin-login-native-form-wrapper"
6261
error="[[error]]"
6362
no-forgot-password="[[noForgotPassword]]"
6463
i18n="[[i18n]]"
6564
on-login="_retargetEvent"
6665
on-forgot-password="_retargetEvent"
6766
>
68-
<form part="vaadin-login-native-form" method="POST" action$="[[action]]" slot="form">
67+
<form method="POST" action$="[[action]]" slot="form">
6968
<input id="csrf" type="hidden" />
7069
<vaadin-text-field
7170
name="username"
@@ -92,9 +91,9 @@ class LoginForm extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)))
9291
<input type="password" slot="input" on-keyup="_handleInputKeyup" />
9392
</vaadin-password-field>
9493
95-
<vaadin-button part="vaadin-login-submit" theme="primary contained" on-click="submit" disabled$="[[disabled]]"
96-
>[[i18n.form.submit]]</vaadin-button
97-
>
94+
<vaadin-button theme="primary contained submit" on-click="submit" disabled$="[[disabled]]">
95+
[[i18n.form.submit]]
96+
</vaadin-button>
9897
</form>
9998
</vaadin-login-form-wrapper>
10099
`;
@@ -161,7 +160,7 @@ class LoginForm extends LoginMixin(ElementMixin(ThemableMixin(PolymerElement)))
161160
this.$.csrf.name = csrfMetaName.content;
162161
this.$.csrf.value = csrfMetaValue.content;
163162
}
164-
this.querySelector('[part="vaadin-login-native-form"]').submit();
163+
this.querySelector('form').submit();
165164
}
166165
}
167166

‎packages/login/test/login-form.test.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('login form', () => {
6161

6262
beforeEach(() => {
6363
login = fixtureSync('<vaadin-login-form action="login-action"></vaadin-login-form>');
64-
formWrapper = login.querySelector('[part="vaadin-login-native-form-wrapper"]');
64+
formWrapper = login.querySelector('vaadin-login-form-wrapper');
6565
});
6666

6767
afterEach(() => {
@@ -75,7 +75,7 @@ describe('login form', () => {
7575

7676
const usernameElement = login.querySelector('#vaadinLoginUsername');
7777
const passwordElement = login.querySelector('#vaadinLoginPassword');
78-
const submitElement = login.querySelector('vaadin-button[part="vaadin-login-submit"]');
78+
const submitElement = login.querySelector('vaadin-button');
7979
const forgotElement = formWrapper.shadowRoot.querySelector('#forgotPasswordButton');
8080

8181
const footerElement = formWrapper.shadowRoot.querySelector('[part="footer"] p');
@@ -86,7 +86,7 @@ describe('login form', () => {
8686

8787
expect(usernameElement.label).to.be.equal(login.i18n.form.username);
8888
expect(passwordElement.label).to.be.equal(login.i18n.form.password);
89-
expect(submitElement.textContent).to.be.equal(login.i18n.form.submit);
89+
expect(submitElement.textContent.trim()).to.be.equal(login.i18n.form.submit);
9090
expect(forgotElement.textContent).to.be.equal(login.i18n.form.forgotPassword);
9191

9292
expect(footerElement.textContent).to.be.equal('');
@@ -169,14 +169,14 @@ describe('login form', () => {
169169
});
170170

171171
it('should disable button after submitting form', () => {
172-
const submit = login.querySelector('vaadin-button[part="vaadin-login-submit"]');
172+
const submit = login.querySelector('vaadin-button');
173173
const { vaadinLoginPassword } = fillUsernameAndPassword(login);
174174
enter(vaadinLoginPassword);
175175
expect(submit.disabled).to.be.true;
176176
});
177177

178178
it('should prevent submit call when login is disabled', () => {
179-
const submit = login.querySelector('vaadin-button[part="vaadin-login-submit"]');
179+
const submit = login.querySelector('vaadin-button');
180180
const { vaadinLoginPassword } = fillUsernameAndPassword(login);
181181

182182
login.setAttribute('disabled', 'disabled');
@@ -188,14 +188,14 @@ describe('login form', () => {
188188
});
189189

190190
it('should not disable button on button click if form is invalid', () => {
191-
const submit = login.querySelector('vaadin-button[part="vaadin-login-submit"]');
191+
const submit = login.querySelector('vaadin-button');
192192
expect(submit.disabled).to.not.be.true;
193193
tap(submit);
194194
expect(submit.disabled).to.not.be.true;
195195
});
196196

197197
it('should disable button on button click if form is valid', () => {
198-
const submit = login.querySelector('vaadin-button[part="vaadin-login-submit"]');
198+
const submit = login.querySelector('vaadin-button');
199199
fillUsernameAndPassword(login);
200200
tap(submit);
201201
expect(submit.disabled).to.be.true;
@@ -273,7 +273,7 @@ describe('no forgot password', () => {
273273
});
274274

275275
it('should hide forgot password button', () => {
276-
const formWrapper = login.querySelector('[part="vaadin-login-native-form-wrapper"]');
276+
const formWrapper = login.querySelector('vaadin-login-form-wrapper');
277277
expect(formWrapper.$.forgotPasswordButton.hidden).to.be.true;
278278
});
279279
});
@@ -296,7 +296,7 @@ describe('error message', () => {
296296

297297
beforeEach(() => {
298298
login = fixtureSync('<vaadin-login-form error></vaadin-login-form>');
299-
formWrapper = login.querySelector('[part="vaadin-login-native-form-wrapper"]');
299+
formWrapper = login.querySelector('vaadin-login-form-wrapper');
300300
});
301301

302302
it('should show error message if the error attribute is set', () => {
@@ -321,7 +321,7 @@ describe('stylable parts', () => {
321321

322322
beforeEach(() => {
323323
login = fixtureSync('<vaadin-login-form theme="green"></vaadin-login-form>');
324-
formWrapper = login.querySelector('[part="vaadin-login-native-form-wrapper"]');
324+
formWrapper = login.querySelector('vaadin-login-form-wrapper');
325325
});
326326

327327
it('should be possible to style parts', () => {

‎packages/login/test/login-submit.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('login form submit', () => {
1111
function testFormSubmitValues(preventDefault, expectation, done) {
1212
fillUsernameAndPassword(login);
1313

14-
const loginForm = login.querySelector('[part="vaadin-login-native-form"]');
14+
const loginForm = login.querySelector('form');
1515
loginForm.setAttribute('method', 'GET');
1616
loginForm.setAttribute('target', iframe.getAttribute('name'));
1717

@@ -23,7 +23,7 @@ describe('login form submit', () => {
2323
done();
2424
};
2525

26-
login.querySelector('vaadin-button[part="vaadin-login-submit"]').click();
26+
login.querySelector('vaadin-button').click();
2727
expect(submitSpy.called).to.equal(expectation);
2828

2929
if (preventDefault) {

‎packages/login/theme/lumo/vaadin-login-form-styles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themab
44
registerStyles(
55
'vaadin-login-form',
66
css`
7-
vaadin-button[part='vaadin-login-submit'] {
7+
form > vaadin-button[theme~='submit'] {
88
margin-top: var(--lumo-space-l);
99
margin-bottom: var(--lumo-space-s);
1010
}

‎packages/login/theme/material/vaadin-login-form-styles.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themab
33
registerStyles(
44
'vaadin-login-form',
55
css`
6-
vaadin-button[part='vaadin-login-submit'] {
6+
form > vaadin-button[theme~='submit'] {
77
margin-top: 3em;
88
margin-bottom: 2em;
99
flex-grow: 0;
1010
}
1111
1212
/* Small screen */
1313
@media only screen and (max-width: 1023px) {
14-
vaadin-button[part='vaadin-login-submit'] {
14+
form > vaadin-button[theme~='submit'] {
1515
margin-top: 2.5em;
1616
margin-bottom: 1em;
1717
}

0 commit comments

Comments
 (0)