Commit f9e2925d authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '246530-remove-search_autocomplete-js-from-main-js' into 'master'

Codesplitting for search_autocomplete.js from main.js

Closes #246530

See merge request gitlab-org/gitlab!41777
parents 096577ee 86ed7877
...@@ -31,7 +31,6 @@ import initLogoAnimation from './logo'; ...@@ -31,7 +31,6 @@ import initLogoAnimation from './logo';
import initFrequentItemDropdowns from './frequent_items'; import initFrequentItemDropdowns from './frequent_items';
import initBreadcrumbs from './breadcrumb'; import initBreadcrumbs from './breadcrumb';
import initUsagePingConsent from './usage_ping_consent'; import initUsagePingConsent from './usage_ping_consent';
import initSearchAutocomplete from './search_autocomplete';
import GlFieldErrors from './gl_field_errors'; import GlFieldErrors from './gl_field_errors';
import initUserPopovers from './user_popovers'; import initUserPopovers from './user_popovers';
import initBroadcastNotifications from './broadcast_notification'; import initBroadcastNotifications from './broadcast_notification';
...@@ -112,7 +111,18 @@ function deferredInitialisation() { ...@@ -112,7 +111,18 @@ function deferredInitialisation() {
initPersistentUserCallouts(); initPersistentUserCallouts();
initDefaultTrackers(); initDefaultTrackers();
if (document.querySelector('.search')) initSearchAutocomplete(); document.querySelector('#search').addEventListener(
'focus',
() => {
import(/* webpackChunkName: 'globalSearch' */ './search_autocomplete')
.then(({ default: initSearchAutocomplete }) => {
const searchDropdown = initSearchAutocomplete();
searchDropdown.onSearchInputFocus();
})
.catch(() => {});
},
{ once: true },
);
addSelectOnFocusBehaviour('.js-select-on-focus'); addSelectOnFocusBehaviour('.js-select-on-focus');
......
...@@ -28,7 +28,7 @@ RSpec.describe 'User uses header search field', :js do ...@@ -28,7 +28,7 @@ RSpec.describe 'User uses header search field', :js do
context 'when using the keyboard shortcut' do context 'when using the keyboard shortcut' do
before do before do
find('#search.js-autocomplete-disabled') find('#search')
find('body').native.send_keys('s') find('body').native.send_keys('s')
end end
...@@ -39,7 +39,7 @@ RSpec.describe 'User uses header search field', :js do ...@@ -39,7 +39,7 @@ RSpec.describe 'User uses header search field', :js do
context 'when clicking the search field' do context 'when clicking the search field' do
before do before do
page.find('#search.js-autocomplete-disabled').click page.find('#search').click
end end
it 'shows category search dropdown' do it 'shows category search dropdown' do
......
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