fix: Stop propagating clicks from nested icon (#2676)

* fix: Stop propagating clicks from nested icon * fix tests
SAP · Jun 17, 2020 · c264ff2 · c264ff2
1 parent 7f25381
commit c264ff2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/libs/core/src/lib/nested-list/nested-item/nested-item.directive.spec.ts b/libs/core/src/lib/nested-list/nested-item/nested-item.directive.spec.ts
@@ -171,7 +171,7 @@ describe('NestedItemDirective', () => {
     it('Should react to events from icon child', () => {
         fixture.detectChanges();
         spyOn(nestedItemListDirective, 'toggle');
-        nestedItemListDirective.contentItem.nestedExpandIcon.onClick();
+        nestedItemListDirective.contentItem.nestedExpandIcon.onClick(new MouseEvent('click'));
         fixture.detectChanges();
         expect(nestedItemListDirective.toggle).toHaveBeenCalledWith();
     });
@@ -180,7 +180,7 @@ describe('NestedItemDirective', () => {
         fixture.detectChanges();
         itemService.popover.handleOpenChange(true);
         spyOn(nestedItemPopoverDirective, 'toggle');
-        nestedItemPopoverDirective.contentItem.nestedExpandIcon.onClick();
+        nestedItemPopoverDirective.contentItem.nestedExpandIcon.onClick(new MouseEvent('click'));
         fixture.detectChanges();
         expect(nestedItemPopoverDirective.toggle).toHaveBeenCalledWith();
     });

diff --git a/libs/core/src/lib/nested-list/nested-list-directives.spec.ts b/libs/core/src/lib/nested-list/nested-list-directives.spec.ts
@@ -55,7 +55,7 @@ describe('NestedListDirectives', () => {
 
         spyOn((<any>expandIconElement)._itemService.toggle, 'next');
 
-        expandIconElement.onClick();
+        expandIconElement.onClick(new MouseEvent('click'));
 
         fixture.detectChanges();
 

diff --git a/libs/core/src/lib/nested-list/nested-list-directives.ts b/libs/core/src/lib/nested-list/nested-list-directives.ts
@@ -111,10 +111,11 @@ export class NestedListExpandIconDirective {
     ) {}
 
     /** Mouse event handler */
-    @HostListener('click')
-    onClick(): void {
+    @HostListener('click', ['$event'])
+    onClick(event: MouseEvent): void {
         this.expanded = !this.expanded;
         this._itemService.toggle.next(this.expanded);
+        event.stopPropagation();
     }
 
     /** Handler for focus events */