Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(chips): event propagation not stopped by remove button #8772

Merged
merged 1 commit into from
Dec 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/lib/chips/chip-remove.spec.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import {Component, DebugElement} from '@angular/core';
import {By} from '@angular/platform-browser';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {fakeAsync, ComponentFixture, TestBed} from '@angular/core/testing';
import {MatChip, MatChipsModule} from './index';
import {dispatchFakeEvent} from '@angular/cdk/testing';

describe('Chip Remove', () => {
let fixture: ComponentFixture<any>;
let testChip: TestChip;
let chipDebugElement: DebugElement;
let chipNativeElement: HTMLElement;

beforeEach(async(() => {
beforeEach(fakeAsync(() => {
TestBed.configureTestingModule({
imports: [MatChipsModule],
declarations: [
Expand All @@ -18,9 +19,6 @@ describe('Chip Remove', () => {
});

TestBed.compileComponents();
}));

beforeEach(async(() => {
fixture = TestBed.createComponent(TestChip);
testChip = fixture.debugElement.componentInstance;
fixture.detectChanges();
Expand All @@ -30,14 +28,14 @@ describe('Chip Remove', () => {
}));

describe('basic behavior', () => {
it('should applies the `mat-chip-remove` CSS class', () => {
let hrefElement = chipNativeElement.querySelector('a')!;
it('should apply the `mat-chip-remove` CSS class', () => {
const hrefElement = chipNativeElement.querySelector('a')!;

expect(hrefElement.classList).toContain('mat-chip-remove');
});

it('should emits (remove) on click', () => {
let hrefElement = chipNativeElement.querySelector('a')!;
it('should emit (remove) on click', () => {
const hrefElement = chipNativeElement.querySelector('a')!;

testChip.removable = true;
fixture.detectChanges();
Expand All @@ -48,6 +46,19 @@ describe('Chip Remove', () => {

expect(testChip.didRemove).toHaveBeenCalled();
});

it('should prevent the default click action', () => {
const hrefElement = chipNativeElement.querySelector('a')!;

testChip.removable = true;
fixture.detectChanges();

const event = dispatchFakeEvent(hrefElement, 'click');
fixture.detectChanges();

expect(event.defaultPrevented).toBe(true);
});

});
});

Expand Down
9 changes: 7 additions & 2 deletions src/lib/chips/chip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,17 +302,22 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
selector: '[matChipRemove]',
host: {
'class': 'mat-chip-remove',
'(click)': '_handleClick()',
'(click)': '_handleClick($event)',
}
})
export class MatChipRemove {
constructor(protected _parentChip: MatChip) {
}

/** Calls the parent chip's public `remove()` method if applicable. */
_handleClick(): void {
_handleClick(event: MouseEvent): void {
if (this._parentChip.removable) {
this._parentChip.remove();

// Note: the parent chip does something similar, however since we're removing it,
// its event handler will be unbound before it has had the chance to fire.
event.preventDefault();
event.stopPropagation();
}
}
}