Commit ac03f30c authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'fix-search-dropdown-blur-close' into 'master'

Fix search dropdown not closing on blur if empty

Closes #53741

See merge request gitlab-org/gitlab-ce!28730
parents 955e06b4 9181e4b1
...@@ -405,7 +405,7 @@ export class SearchAutocomplete { ...@@ -405,7 +405,7 @@ export class SearchAutocomplete {
this.wrap.removeClass('search-active'); this.wrap.removeClass('search-active');
// If input is blank then restore state // If input is blank then restore state
if (this.searchInput.val() === '') { if (this.searchInput.val() === '') {
return this.restoreOriginalState(); this.restoreOriginalState();
} }
this.dropdownMenu.removeClass('show'); this.dropdownMenu.removeClass('show');
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
mr_path: merge_requests_dashboard_path }, mr_path: merge_requests_dashboard_path },
aria: { label: _('Search or jump to…') } aria: { label: _('Search or jump to…') }
%button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } } %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } }
.dropdown-menu.dropdown-select .dropdown-menu.dropdown-select.js-dashboard-search-options
= dropdown_content do = dropdown_content do
%ul %ul
%li.dropdown-menu-empty-item %li.dropdown-menu-empty-item
......
---
title: Fix search dropdown not closing on blur if empty
merge_request: 28730
author:
type: fixed
...@@ -25,4 +25,18 @@ describe 'Global search' do ...@@ -25,4 +25,18 @@ describe 'Global search' do
expect(page).to have_selector('.gl-pagination .next') expect(page).to have_selector('.gl-pagination .next')
end end
end end
it 'closes the dropdown on blur', :js do
visit dashboard_projects_path
fill_in 'search', with: "a"
dropdown = find('.js-dashboard-search-options')
expect(dropdown[:class]).to include 'show'
find('#search').send_keys(:backspace)
find('body').click
expect(dropdown[:class]).not_to include 'show'
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment