fix(segment): clicking disabled button no longer adds ripple to active button (#20254)

fixes #20253
This commit is contained in:
Liam DeBeasi
2020-01-21 16:36:41 -05:00
committed by GitHub
parent 443cbd9eb2
commit f896821753

View File

@ -112,12 +112,14 @@ export class Segment implements ComponentInterface {
onEnd(detail: GestureDetail) {
this.activated = false;
this.setNextIndex(detail, true);
const checkedValidButton = this.setNextIndex(detail, true);
detail.event.preventDefault();
detail.event.stopImmediatePropagation();
this.addRipple(detail);
if (checkedValidButton) {
this.addRipple(detail);
}
}
private getButtons() {
@ -285,13 +287,24 @@ export class Segment implements ComponentInterface {
current = nextEl;
}
if (!current) {
return;
/* tslint:disable-next-line */
if (current != null) {
/**
* If current element is ion-segment then that means
* user tried to select a disabled ion-segment-button,
* and we should not update the ripple.
*/
if (current.tagName === 'ION-SEGMENT') {
return false;
}
if (previous !== current) {
this.checkButton(previous, current);
}
}
if (previous !== current) {
this.checkButton(previous, current);
}
return true;
}
private emitStyle() {