@skyscanner/backpack-web 42.13.1 → 42.13.2

package/bpk-component-autosuggest/src/BpkAutosuggestV2/BpkAutosuggest.js

@@ -101,6 +101,18 @@ const BpkAutosuggest = /*#__PURE__*/forwardRef(({
       changes,
       type
     } = actionAndChanges;
+
+    // Intercept InputBlur before the alwaysRenderSuggestions early-return
+    if (type === useCombobox.stateChangeTypes.InputBlur) {
+      const keepOpen = Boolean(alwaysRenderSuggestions && hasSuggestions);
+      return {
+        ...changes,
+        isOpen: keepOpen,
+        highlightedIndex: -1,
+        selectedItem: state.selectedItem,
+        inputValue: state.inputValue
+      };
+    }
     const shouldForceKeepOpen = alwaysRenderSuggestions && hasSuggestions && changes.isOpen === false;
     if (shouldForceKeepOpen) {
       return {
@@ -205,6 +217,11 @@ const BpkAutosuggest = /*#__PURE__*/forwardRef(({
       onSuggestionHighlighted?.({
         suggestion: currentSuggestion
       });
+
+      // Only arm auto-select-on-blur for non-mouse-driven highlight changes.
+      if (type !== useCombobox.stateChangeTypes.ItemMouseMove && type !== useCombobox.stateChangeTypes.MenuMouseLeave) {
+        savedHighlightedIndexRef.current = newIndex ?? null;
+      }
       const isArrowKey = type === useCombobox.stateChangeTypes.InputKeyDownArrowDown || type === useCombobox.stateChangeTypes.InputKeyDownArrowUp;
       if (isArrowKey) {
         if (currentSuggestion) {
@@ -272,8 +289,6 @@ const BpkAutosuggest = /*#__PURE__*/forwardRef(({
   useEffect(() => {
     if (highlightedIndex === previousHighlightedIndexRef.current) return;
     previousHighlightedIndexRef.current = highlightedIndex;
-    // Save highlighted index to allow auto-selection on blur
-    savedHighlightedIndexRef.current = highlightedIndex;
     const currentSuggestion = highlightedIndex != null && highlightedIndex >= 0 ? flattenedSuggestions?.[highlightedIndex] ?? null : null;
     if (!currentSuggestion && originalInputOnPreviewRef.current !== null) {
       if ((inputValue ?? '') !== originalInputOnPreviewRef.current) {
@@ -463,8 +478,11 @@ const BpkAutosuggest = /*#__PURE__*/forwardRef(({
         highlightedSuggestion = firstSuggestion;
       }
       if (highlightedSuggestion) {
-        // Use setTimeout to ensure selectItem runs after the blur event completes
+        // Use setTimeout to ensure selectItem runs after the blur event completes.
         setTimeout(() => {
+          if (committedSelectionRef.current) {
+            return;
+          }
           selectItem(highlightedSuggestion);
         }, 0);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyscanner/backpack-web",
-  "version": "42.13.1",
+  "version": "42.13.2",
   "description": "Backpack Design System web library",
   "repository": {
     "type": "git",