Skip to content

Commit ce55f60

Browse files
authored
Merge branch 'master' into treeview
2 parents c12d93a + 96a9bf3 commit ce55f60

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

src/combobox/combobox.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ export class ComboBox implements OnChanges, AfterViewInit, AfterContentInit, OnD
567567
this.closeDropdown();
568568
} else if ((ev.key === "ArrowDown")
569569
&& (!this.dropdownMenu || !this.dropdownMenu.nativeElement.contains(ev.target))) {
570-
ev.stopPropagation();
570+
ev.preventDefault();
571571
this.openDropdown();
572572
setTimeout(() => { this.view.initFocus(); }, 0);
573573
}

src/dropdown/dropdown.stories.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,24 @@ export default {
4040
},
4141
{
4242
content: "four"
43+
},
44+
{
45+
content: "five"
46+
},
47+
{
48+
content: "six"
49+
},
50+
{
51+
content: "seven"
52+
},
53+
{
54+
content: "eight"
55+
},
56+
{
57+
content: "nine"
58+
},
59+
{
60+
content: "ten"
4361
}
4462
],
4563
appendInline: false,

src/dropdown/list/dropdown-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ export class DropdownList implements AbstractDropdownView, AfterViewInit, OnDest
519519
}
520520
} else if (event.key === "ArrowUp") {
521521
if (this.hasPrevElement()) {
522-
this.getPrevElement().scrollIntoView();
522+
this.getPrevElement().scrollIntoView({ block: "nearest" });
523523
} else {
524524
this.blurIntent.emit("top");
525525
}

0 commit comments

Comments
 (0)