ayo/lion
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(form): remove disconnected elements from Form Registrar Manager

Browse source
This commit is contained in:
Tom Herni 2019-08-01 20:45:06 +02:00 committed by Thijs Louisse
parent 635b09743d
commit a4f9465e58
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/field/src/FormRegistrarMixin.js
View file

@ -34,6 +34,13 @@ export const FormRegistrarMixin = dedupeMixin(
this.addEventListener('form-element-register', this._onRequestToAddFormElement); this.addEventListener('form-element-register', this._onRequestToAddFormElement);
} }
disconnectedCallback() {
if (super.disconnectedCallback) {
super.disconnectedCallback();
}
formRegistrarManager.remove(this);
}
isRegisteredFormElement(el) { isRegisteredFormElement(el) {
return this.formElementsArray.some(exitingEl => exitingEl === el); return this.formElementsArray.some(exitingEl => exitingEl === el);
} }

4
packages/field/src/formRegistrarManager.js
View file

@ -16,6 +16,10 @@ class FormRegistrarManager {
this.ready = false; this.ready = false;
} }
remove(registrar) {
this.__elements.splice(this.__elements.indexOf(registrar));
}
becomesReady() { becomesReady() {
if (this.__elements.every(el => el.__readyForRegistration === true)) { if (this.__elements.every(el => el.__readyForRegistration === true)) {
this.dispatchEvent(new Event('all-forms-open-for-registration')); this.dispatchEvent(new Event('all-forms-open-for-registration'));

19
packages/field/test/FormRegistrationMixins.test.js
View file

@ -2,6 +2,7 @@ import { expect, fixture, html, defineCE, unsafeStatic } from '@open-wc/testing'
import sinon from 'sinon'; import sinon from 'sinon';
import { LitElement, UpdatingElement } from '@lion/core'; import { LitElement, UpdatingElement } from '@lion/core';
import { formRegistrarManager } from '../src/formRegistrarManager.js';
import { FormRegisteringMixin } from '../src/FormRegisteringMixin.js'; import { FormRegisteringMixin } from '../src/FormRegisteringMixin.js';
import { FormRegistrarMixin } from '../src/FormRegistrarMixin.js'; import { FormRegistrarMixin } from '../src/FormRegistrarMixin.js';
@ -36,6 +37,24 @@ describe('FormRegistrationMixins', () => {
expect(el.querySelector('form-registrar').formElements.length).to.equal(1); expect(el.querySelector('form-registrar').formElements.length).to.equal(1);
}); });
it('forgets disconnected registrars', async () => {
const el = await fixture(html`
<form-registrar>
<form-registrar>
<form-registering></form-registering>
</form-registrar>
<form-registrar id="remove">
<form-registering></form-registering>
</form-registrar>
</form-registrar>
`);
await el.registrationReady;
expect(formRegistrarManager.__elements.length).to.equal(3);
el.querySelector('#remove').remove();
expect(formRegistrarManager.__elements.length).to.equal(2);
});
it('works for component that have a delayed render', async () => { it('works for component that have a delayed render', async () => {
const tagWrapperString = defineCE( const tagWrapperString = defineCE(
class extends FormRegistrarMixin(LitElement) { class extends FormRegistrarMixin(LitElement) {