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

Merge pull request #1418 from ing-bank/fix/switch-checked-changed

Browse source 
fix(switch): stop checked-changed event from propagating too far
This commit is contained in:
Joren Broekema 2021-06-10 13:50:00 +02:00 committed by GitHub
commit 7e6c91f335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/curvy-waves-nail.md Normal file
View file

@ -0,0 +1,5 @@
---
'@lion/switch': patch
---
Stop checked-changed event from propagating when caught by lion-switch element.

17
packages/switch/src/LionSwitch.js
View file

@ -81,9 +81,7 @@ export class LionSwitch extends ScopedElementsMixin(ChoiceInputMixin(LionField))
connectedCallback() {
super.connectedCallback();
if (this._inputNode) {
this._inputNode.addEventListener('checked-changed', this.__handleButtonSwitchCheckedChanged);
}
this.addEventListener('checked-changed', this.__handleButtonSwitchCheckedChanged);
if (this._labelNode) {
this._labelNode.addEventListener('click', this._toggleChecked);
}
@ -92,10 +90,7 @@ export class LionSwitch extends ScopedElementsMixin(ChoiceInputMixin(LionField))
disconnectedCallback() {
if (this._inputNode) {
this._inputNode.removeEventListener(
'checked-changed',
this.__handleButtonSwitchCheckedChanged,
);
this.removeEventListener('checked-changed', this.__handleButtonSwitchCheckedChanged);
}
if (this._labelNode) {
this._labelNode.removeEventListener('click', this._toggleChecked);
@ -117,8 +112,12 @@ export class LionSwitch extends ScopedElementsMixin(ChoiceInputMixin(LionField))
return false;
}
/** @private */
__handleButtonSwitchCheckedChanged() {
/**
* @private
* @param {Event} ev
*/
__handleButtonSwitchCheckedChanged(ev) {
ev.stopPropagation();
this._isHandlingUserInput = true;
this.checked = this._inputNode.checked;
this._isHandlingUserInput = false;

1
packages/switch/src/LionSwitchButton.js
View file

@ -114,7 +114,6 @@ export class LionSwitchButton extends DisabledWithTabIndexMixin(LitElement) {
__checkedStateChange() {
this.dispatchEvent(
new Event('checked-changed', {
composed: true,
bubbles: true,
}),
);

2
packages/switch/test/lion-switch-button.test.js
View file

@ -76,7 +76,6 @@ describe('lion-switch-button', () => {
const e = call.args[0];
expect(e).to.be.an.instanceof(Event);
expect(e.bubbles).to.be.true;
expect(e.composed).to.be.true;
};
checkCall(handlerSpy.getCall(0));
checkCall(handlerSpy.getCall(1));
@ -93,7 +92,6 @@ describe('lion-switch-button', () => {
const e = call.args[0];
expect(e).to.be.an.instanceof(Event);
expect(e.bubbles).to.be.true;
expect(e.composed).to.be.true;
};
checkCall(handlerSpy.getCall(0));
checkCall(handlerSpy.getCall(1));

18
packages/switch/test/lion-switch.test.js
View file

@ -142,7 +142,6 @@ describe('lion-switch', () => {
const e = call.args[0];
expect(e).to.be.an.instanceof(Event);
expect(e.bubbles).to.be.true;
expect(e.composed).to.be.true;
};
checkCall(handlerSpy.getCall(0));
checkCall(handlerSpy.getCall(1));
@ -157,6 +156,23 @@ describe('lion-switch', () => {
expect(handlerSpy.callCount).to.equal(1);
});
it('should not propagate the "checked-changed" event further up when caught by switch', async () => {
const handlerSpy = sinon.spy();
const parentHandlerSpy = sinon.spy();
const el = await fixture(
html`
<div @checked-changed=${parentHandlerSpy}>
<lion-switch @checked-changed=${handlerSpy} .choiceValue=${'foo'}></lion-switch>
</div>
`,
);
const switchEl = /** @type {LionSwitch} */ (el.firstElementChild);
switchEl.checked = true;
await switchEl.updateComplete;
expect(handlerSpy.callCount).to.equal(1);
expect(parentHandlerSpy.callCount).to.equal(0);
});
it('can be configured to show feedback messages immediately', async () => {
const tagName = 'custom-switch';
if (!customElements.get(tagName)) {