diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index fe42a0201..000000000
--- a/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-dist/nhsuk.js
-dist/nhsuk.css
diff --git a/app/_templates/layout.njk b/app/_templates/layout.njk
index cdd63d5ed..841b332e0 100644
--- a/app/_templates/layout.njk
+++ b/app/_templates/layout.njk
@@ -19,7 +19,6 @@
' + resultTruncated + ' ';
+
+ return svgIcon + resultsHref;
+ }
+
+ const defaultConfig = {
+ element: document.querySelector('#autocomplete-container'),
+ id: id,
+ minLength: 2,
+ placeholder: fallbackInputElement.placeholder,
+ confirmOnBlur: false,
+ onConfirm: (SelectedContent) => {
+ window.open('https://www.nhs.uk/search?collection=nhs-meta&query=' + SelectedContent, '_self');
+ },
+ source: getFunnelbackResults,
+ templates: {
+ suggestion: suggestionTemplate,
+ },
+ };
+
+ const accessibleAutocompleteConfig = {
+ ...defaultConfig,
+ ...config,
+ };
+
+ const idToremove = document.getElementById(id);
+ idToremove.parentNode.removeChild(idToremove);
+ accessibleAutocomplete(accessibleAutocompleteConfig);
+
+}
+
+if (document.getElementById('wrap-search')) {
+
+ // only add event listener if 'wrap-search' exists to act on
+ window.addEventListener("load", function(event) {
+
+ positionsAndWidths();
+
+ // To deal with window resizing, need to reset positioning of search results dropdown
+ // Use setTimeout on resize so as not to kill CPU
+ // https://developer.mozilla.org/en-US/docs/Web/Events/resize
+ window.addEventListener("resize", resizeThrottler, false);
+
+ let resizeTimeout;
+ function resizeThrottler() {
+ // ignore resize events as long as an actualResizeHandler execution is in the queue
+ if ( !resizeTimeout ) {
+ resizeTimeout = setTimeout(function() {
+ resizeTimeout = null;
+ actualResizeHandler();
+ // The actualResizeHandler will execute at a rate of 15fps
+ }, 66);
+ }
+ }
+
+ function actualResizeHandler() {
+ positionsAndWidths();
+ }
+
+ });
+
+}
+
+export default autocomplete;
diff --git a/packages/components/header/nhs.typeahead.js b/packages/components/header/nhs.typeahead.js
deleted file mode 100644
index a798ccbac..000000000
--- a/packages/components/header/nhs.typeahead.js
+++ /dev/null
@@ -1,158 +0,0 @@
-window.onload = function() {
- if (window.jQuery) {
-
- var NHSUK = NHSUK || {};
-
- NHSUK.typeahead =
- (function ($) {
- var maxResultCount = 10,
- suggestHost = 'nhs.funnelback.co.uk'
- ? 'nhs.funnelback.co.uk'
- : location.hostname,
- searchHost = 'www.nhs.uk'
- ? 'www.nhs.uk'
- : location.hostname,
- searchUrl = 'https://' + searchHost + '/search?collection=nhs-meta',
- suggestUrl = 'https://' + suggestHost
- + '/s/suggest.json?collection=nhs-meta&partial_query=%QUERY&sort=0&fmt=json++&profile=&show='
- + maxResultCount,
- suggestions = new Bloodhound({
- datumTokenizer: Bloodhound.tokenizers.obj.whitespace('disp'),
- queryTokenizer: Bloodhound.tokenizers.whitespace,
- limit: maxResultCount,
- remote: { url : suggestUrl,wildcard: '%QUERY' }
- }),
- searchField = '#search-field';
-
- function init() {
- suggestions.initialize();
-
- var $suggestionsMenu = 'suggestions-menu',
- $suggestionsList = 'suggestions-list',
- $suggestionsItem = 'suggestions-item',
- $suggestionsWrapper = 'suggestions-wrapper',
- $suggestionsItemSelected = 'suggestions-item--selected',
- $searchInputShadow = 'nhsuk-search__input--shadow',
- $iconSearch = 'Search Search suggestions ',
- notFound: 'No suggestions ',
- suggestion: function(data){
- var displayitem = "";
- switch (data.disp_t) {
- case 'J':
- $.each(data.disp, function(key, value) {
- displayitem += (key, value);
- displayitem += " ";
- });
- break;
-
- default:
-
- if (data.disp.length > 36)
- displayitem = data.disp.substring(0,36)+'...';
- else
- displayitem = data.disp;
- break;
- }
-
- switch (data.action_t) {
- case 'Q':
- displayitem = '' + $iconSearch + '' + displayitem + ' ';
- break;
- case 'E':
- displayitem = '' + $iconSearch + '' + displayitem + ' ';
- break;
- case 'U':
- displayitem = '' + $iconSearch + '' + displayitem + ' ';
- break;
- case 'C':
- displayitem = '' + $iconSearch + '' + displayitem + ' ';
- break;
- default:
- displayitem = '' + $iconSearch + '' + displayitem + ' ';
- break;
- }
-
- return displayitem;
- },
- }
-
- })
- .bind('typeahead:open', function() {
- var val = $(searchField).typeahead('val'),
- value = $(searchField).attr('value');
-
- if (val === value) {
- $(searchField).typeahead('val', value);
- }
- if (val.toLowerCase() === 'enter a search term'){
- $(searchField).typeahead('val', '');
- }
-
- })
- .bind('typeahead:render', function() {
- $('.' + $suggestionsWrapper).wrapInner(''); // add list element around the suggestions
- $('.' + $suggestionsList).css('width', $('.' + $searchForm).width()); // get width of the form and give it to the dropdown list
- $('.' + $searchInput).addClass($searchInputWithDropdown); // add classes to remove border radius on input and submit fields when dropdown appears
- $('.' + $searchSubmit).addClass($searchSubmitWithDropdown);
- $('.' + $suggestionsMenu).insertAfter( $('.' + $searchContainer) ); // move the suggestions in the DOM
-
- // calculate where to position the dropdown from the top and left
- var topoffset = $('.' + $searchForm).offset().top + $('.' + $searchInput).height();
- var position = $('.' + $searchContainer).position();
-
- $('.' + $suggestionsMenu).css({
- 'top' : topoffset + 2, // add 2 for borders?
- 'left' : position.left
- });
-
- })
- .bind('typeahead:close', function() {
- $('.' + $searchInput).removeClass($searchInputWithDropdown);
- $('.' + $searchSubmit).removeClass($searchSubmitWithDropdown);
- })
- .bind('typeahead:idle', function() {
- $('.' + $suggestionsList).hide();
- });
- }
-
- return {
- init: init
- };
- }(jQuery));
-
- $(function(){
- NHSUK.typeahead.init();
- $('.nhsuk-search__input--shadow').attr('aria-hidden', 'true').addClass('nhsuk-u-visually-hidden'); // hide the extra input field created by typeahead to screen readers
- });
-
- }
-}
diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk
index f918753f3..24c8f09e8 100644
--- a/packages/components/header/template.njk
+++ b/packages/components/header/template.njk
@@ -45,6 +45,7 @@