diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-02 15:08:57 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-02 15:08:57 +0000 |
| commit | f5b9e2879090d86c41ee6ec2b9e6e14d7cd3fd59 (patch) | |
| tree | 355bef13e92f33bcab040b686f98bad91621b034 | |
| parent | 18296bf1f80ab4fd1f44ee0f4d36595381e411b5 (diff) | |
| parent | 9e5bc599688950e4c1d2c65358fe780b77dff863 (diff) | |
| download | gitlab-ce-f5b9e2879090d86c41ee6ec2b9e6e14d7cd3fd59.tar.gz | |
Merge branch 'ide-row-dropdown-scroll' into 'master'
Fixed Web IDE row dropdowns scrolling list incorrectly
Closes #49892
See merge request gitlab-org/gitlab-ce!20984
| -rw-r--r-- | app/assets/javascripts/ide/components/new_dropdown/index.vue | 4 | ||||
| -rw-r--r-- | spec/javascripts/ide/components/new_dropdown/index_spec.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue index 440e480d596..8eddfa5e455 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/index.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue @@ -35,7 +35,9 @@ export default { watch: { dropdownOpen() { this.$nextTick(() => { - this.$refs.dropdownMenu.scrollIntoView(); + this.$refs.dropdownMenu.scrollIntoView({ + block: 'nearest', + }); }); }, mouseOver() { diff --git a/spec/javascripts/ide/components/new_dropdown/index_spec.js b/spec/javascripts/ide/components/new_dropdown/index_spec.js index 092c405a70b..5cb8b177fc9 100644 --- a/spec/javascripts/ide/components/new_dropdown/index_spec.js +++ b/spec/javascripts/ide/components/new_dropdown/index_spec.js @@ -62,7 +62,9 @@ describe('new dropdown component', () => { vm.dropdownOpen = true; setTimeout(() => { - expect(vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalled(); + expect(vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalledWith({ + block: 'nearest', + }); done(); }); |