Merge branch 'master' into FE-6908

Sage · Nov 28, 2024 · df29d1e · df29d1e
2 parents aaed31e + a33247d
commit df29d1e
Show file tree

Hide file tree

Showing 8 changed files with 326 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### [144.9.6](https://github.com/Sage/carbon/compare/v144.9.5...v144.9.6) (2024-11-28)
+
+
+### Bug Fixes
+
+* **select-list:** selected option not scrolled into view ([d842293](https://github.com/Sage/carbon/commit/d8422931196b07d5550899421a2e33842378f340))
+
+### [144.9.5](https://github.com/Sage/carbon/compare/v144.9.4...v144.9.5) (2024-11-27)
+
+
+### Bug Fixes
+
+* **multi-select:** ensure that when the arrow icon is clicked with openOnFocus select list renders ([cf78fed](https://github.com/Sage/carbon/commit/cf78fed27658b6b9eca97c874d2737b702041c82)), closes [#7065](https://github.com/Sage/carbon/issues/7065)
+
 ### [144.9.4](https://github.com/Sage/carbon/compare/v144.9.3...v144.9.4) (2024-11-26)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "144.9.4",
+  "version": "144.9.6",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",

diff --git a/src/components/select/__internal__/select-list/select-list.component.tsx b/src/components/select/__internal__/select-list/select-list.component.tsx
@@ -189,6 +189,12 @@ const SelectList = React.forwardRef(
       rangeExtractor,
     });
 
+    useEffect(() => {
+      if (isOpen && currentOptionsListIndex > -1) {
+        virtualizer.scrollToIndex(currentOptionsListIndex, SCROLL_OPTIONS);
+      }
+    }, [currentOptionsListIndex, isOpen, virtualizer]);
+
     const items = virtualizer.getVirtualItems();
 
     const childrenList = useMemo(