@ministryofjustice/hmpps-connect-dps-shared-items 4.2.1 → 4.3.0

package/dist/assets/dps/components/address-autosuggest/autosuggest-ui.js

@@ -51,7 +51,7 @@ export class AutosuggestUi {
     this.resultOptions = []
     this.data = []
     this.numberOfResults = 0
-    this.highlightedResultIndex = 0
+    this.highlightedResultIndex = null
     this.blurring = false
     this.blurTimeout = null
     this.scrolling = false
@@ -243,6 +243,7 @@ export class AutosuggestUi {
     this.context.classList.remove(`${this.stylingBaseClass}${classSuffixHasResults}`)
     this.input.removeAttribute('aria-activedescendant')
     this.input.setAttribute('aria-expanded', false)
+    this.setHighlightedResult(null)
     this.setAriaStatus()
   }
 
@@ -260,7 +261,7 @@ export class AutosuggestUi {
         return listElement
       }) ?? []
 
-    this.setHighlightedResult(0)
+    this.setHighlightedResult(null)
     this.input.setAttribute('aria-expanded', this.numberOfResults ? 'true' : 'false')
 
     if (!!this.numberOfResults && this.sanitisedQuery.length >= this.minChars) {
@@ -322,9 +323,11 @@ export class AutosuggestUi {
 
     if (this.highlightedResultIndex === null) {
       this.input.removeAttribute('aria-activedescendant')
-    } else if (this.numberOfResults) {
+    }
+
+    if (this.numberOfResults) {
       this.resultOptions.forEach((option, optionIndex) => {
-        if (optionIndex === index) {
+        if (index !== null && optionIndex === index) {
           if (this.isAboveViewport(option)) {
             this.handleScroll(option, true)
           }
@@ -347,7 +350,12 @@ export class AutosuggestUi {
   selectResult(index) {
     if (!this.results.length) return
 
-    const result = this.results[index || this.highlightedResultIndex || 0]
+    const selectedIndex = typeof index === 'number' ? index : this.highlightedResultIndex
+    if (selectedIndex === null || selectedIndex === undefined) return
+
+    const result = this.results[selectedIndex]
+    if (!result) return
+
     this.onSelect(result)
     this.clearListbox()
     this.setAriaStatus(`${this.ariaYouHaveSelected}: ${result.displayText}.`)

package/dist/assets/dps/components/address-autosuggest/macro.njk

@@ -44,7 +44,7 @@
                     class="hmpps-address-autosuggest__instructions hmpps-js-autosuggest-instructions govuk-visually-hidden"
                     id="address-autosuggest-instructions"
                     tabindex="-1">
-                Use up and down keys to navigate suggestions once you have typed more than two characters. Use the enter key to select a
+                Use up and down keys to navigate suggestions once you have typed three or more characters. Use the enter key to select a
                 suggestion. Touch device users, explore by touch or with swipe gestures.
             </div>
             <div

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ministryofjustice/hmpps-connect-dps-shared-items",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "description": "A package to share Connect DPS functionality across applications",
   "main": "./dist/index.cjs",
   "module": "./dist/index.esm.js",
@@ -63,9 +63,9 @@
     "jest-html-reporter": "^4.4.0",
     "jest-junit": "^17.0.0",
     "lint-staged": "^17.2.0",
-    "nock": "14.0.16",
-    "rollup": "4.62.3",
-    "rollup-plugin-dts": "6.4.1",
+    "nock": "14.0.17",
+    "rollup": "4.62.4",
+    "rollup-plugin-dts": "6.5.1",
     "ts-jest": "29.4.12",
     "tslib": "^2.8.1",
     "typescript": "6.0.3"