Merge branch 'main' into fix/versioning_dropdown

Author: cotti

.github/updatecli/updatecli.d/versions.yml

@@ -333,7 +333,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-go-version:
     name: Get latest release version for Elasticsearch Go Client
@@ -346,7 +347,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-java-version:
     name: Get latest release version for Elasticsearch Java Client
@@ -359,7 +361,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-javascript-version:
     name: Get latest release version for Elasticsearch JavaScript Client
@@ -372,7 +375,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-php-version:
     name: Get latest release version for Elasticsearch PHP Client
@@ -385,7 +389,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-python-version:
     name: Get latest release version for Elasticsearch Python Client
@@ -398,7 +403,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-ruby-version:
     name: Get latest release version for Elasticsearch Ruby Client
@@ -411,7 +417,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: "^9.0.0"
 
   latest-elasticsearch-client-rust-version:
     name: Get latest release version for Elasticsearch Rust Client
@@ -424,7 +431,8 @@ sources:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       versionfilter:
-        kind: latest
+        kind: semver
+        pattern: ">=9.0.0-0 <10.0.0"
 
 targets:
   update-docs-docset-stack:

src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/InfoBanner.tsx

@@ -22,6 +22,7 @@ export const InfoBanner = () => {
                 `}
             >
                 <EuiBetaBadge
+                    tabIndex={-1}
                     css={css`
                         display: inherit;
                     `}

src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.test.tsx

@@ -318,7 +318,7 @@ describe('Search Component', () => {
             expect(searchStore.getState().selectedIndex).toBe(0)
         })
 
-        it('should move focus to second result on ArrowDown from input (first is already visually selected)', async () => {
+        it('should move selection to second result on ArrowDown from input (focus stays on input)', async () => {
             // Arrange
             const user = userEvent.setup()
 
@@ -337,9 +337,9 @@ describe('Search Component', () => {
 
             await user.keyboard('{ArrowDown}')
 
-            // Assert - focus moved to second result (first is already visually selected)
-            const secondResult = screen.getByText('Test Result 2').closest('a')
-            expect(secondResult).toHaveFocus()
+            // Assert - selection moved to second result, focus stays on input (Pattern B)
+            expect(searchStore.getState().selectedIndex).toBe(1)
+            expect(input).toHaveFocus()
         })
 
         it('should move focus between results with ArrowDown/ArrowUp', async () => {
@@ -372,7 +372,7 @@ describe('Search Component', () => {
             expect(searchStore.getState().selectedIndex).toBe(0)
         })
 
-        it('should clear selection when ArrowUp from first item goes to input', async () => {
+        it('should stay at first item when ArrowUp from first item (no wrap)', async () => {
             // Arrange
             const user = userEvent.setup()
 
@@ -394,12 +394,12 @@ describe('Search Component', () => {
 
             await user.keyboard('{ArrowUp}')
 
-            // Assert - focus goes to input, selection is cleared
-            expect(input).toHaveFocus()
-            expect(searchStore.getState().selectedIndex).toBe(NO_SELECTION)
+            // Assert - stays at first item (no wrap around)
+            expect(firstResult).toHaveFocus()
+            expect(searchStore.getState().selectedIndex).toBe(0)
         })
 
-        it('should clear selection when ArrowDown from last item goes to button', async () => {
+        it('should stay at last item when ArrowDown from last item (no wrap)', async () => {
             // Arrange
             const user = userEvent.setup()
 
@@ -422,12 +422,9 @@ describe('Search Component', () => {
             // Try to go down from last item
             await user.keyboard('{ArrowDown}')
 
-            // Assert - focus moves to button, selection is cleared
-            const button = screen.getByRole('button', {
-                name: /tell me more about/i,
-            })
-            expect(button).toHaveFocus()
-            expect(searchStore.getState().selectedIndex).toBe(NO_SELECTION)
+            // Assert - stays at last item (no wrap around)
+            expect(lastResult).toHaveFocus()
+            expect(searchStore.getState().selectedIndex).toBe(2)
         })
 
         it('should render isSelected prop on the selected item', async () => {

src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.tsx

@@ -46,13 +46,8 @@ export const Search = () => {
         closeModal()
     }
 
-    const {
-        inputRef,
-        buttonRef,
-        itemRefs,
-        handleInputKeyDown,
-        focusLastAvailable,
-    } = useSearchKeyboardNavigation(resultsCount)
+    const { inputRef, buttonRef, itemRefs, filterRefs, handleInputKeyDown } =
+        useSearchKeyboardNavigation(resultsCount)
 
     // Listen for Cmd+K to focus input
     useEffect(() => {
@@ -109,14 +104,11 @@ export const Search = () => {
                     iconType="cross"
                     color="text"
                     onClick={handleCloseModal}
+                    tabIndex={-1}
                 />
             </div>
 
-            <SearchResults
-                inputRef={inputRef}
-                buttonRef={buttonRef}
-                itemRefs={itemRefs}
-            />
+            <SearchResults itemRefs={itemRefs} filterRefs={filterRefs} />
             {!showLoadingSpinner && <EuiHorizontalRule margin="none" />}
             {searchTerm && (
                 <div
@@ -139,7 +131,6 @@ export const Search = () => {
                         ref={buttonRef}
                         term={searchTerm}
                         onAsk={askAi}
-                        onArrowUp={focusLastAvailable}
                     />
                 </div>
             )}