Skip to content

Commit f73ebe0

Browse files
committed
fix(list/tree): option doesn't receive focus if has focused elements in (#UIM-772) (#706)
1 parent 2e5548c commit f73ebe0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

packages/mosaic/list/list-selection.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('McListSelection without forms', () => {
5858

5959
expect(listItem.classList).not.toContain('mc-focused');
6060

61-
dispatchFakeEvent(listItem, 'focus');
61+
dispatchFakeEvent(listItem, 'focusin');
6262
flush();
6363
fixture.detectChanges();
6464
expect(listItem.className).toContain('mc-focused');
@@ -466,7 +466,7 @@ describe('McListSelection without forms', () => {
466466
}));
467467

468468
it('should be focused when focus on nativeElements', fakeAsync(() => {
469-
dispatchFakeEvent(listOption.nativeElement, 'focus');
469+
dispatchFakeEvent(listOption.nativeElement, 'focusin');
470470
flush();
471471
fixture.detectChanges();
472472

packages/mosaic/list/list-selection.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export interface McOptionEvent {
7474
'[attr.tabindex]': 'tabIndex',
7575
'[attr.disabled]': 'disabled || null',
7676

77-
'(focus)': 'focus()',
77+
'(focusin)': 'focus()',
7878
'(blur)': 'blur()',
7979
'(click)': 'handleClick($event)'
8080
},

packages/mosaic/tree/tree-option.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ let uniqueIdCounter: number = 0;
5151
'[class.mc-selected]': 'selected',
5252
'[class.mc-focused]': 'hasFocus',
5353

54-
'(focus)': 'focus()',
54+
'(focusin)': 'focus()',
5555
'(blur)': 'blur()',
5656

5757
'(click)': 'selectViaInteraction($event)'

0 commit comments

Comments
 (0)