fix(Select): activate first clickable item (#1228)

gravity-ui · Dec 27, 2023 · 13b921e · 13b921e
1 parent 75778c7
commit 13b921e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/components/Select/__stories__/SelectShowcase.tsx b/src/components/Select/__stories__/SelectShowcase.tsx
@@ -190,8 +190,8 @@ export const SelectShowcase = (props: SelectProps) => {
                 code={[EXAMPLE_DISABLED_OPTIONS]}
                 selectProps={props}
             >
-                <Select.Option value="val1" content="Value1" />
-                <Select.Option value="val2" content="Value2" disabled />
+                <Select.Option value="val1" content="Value1" disabled />
+                <Select.Option value="val2" content="Value2" />
                 <Select.Option value="val3" content="Value3" disabled />
                 <Select.Option value="val4" content="Value4" />
             </ExampleItem>

diff --git a/src/components/Select/utils.tsx b/src/components/Select/utils.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import {KeyCode} from '../../constants';
-import type {List, ListItemData} from '../List';
+import {List} from '../List';
+import type {ListItemData} from '../List';
 
 import {GROUP_ITEM_MARGIN_TOP, MOBILE_ITEM_HEIGHT, SIZE_TO_ITEM_HEIGHT} from './constants';
 import type {Option, OptionGroup} from './tech-components';
@@ -210,8 +211,7 @@ export const getActiveItem = (listRef: React.RefObject<List<FlattenOption>>) =>
 
 export const activateFirstClickableItem = (listRef: React.RefObject<List<FlattenOption>>) => {
     const items = getListItems(listRef);
-    const isGroupTitleFirstItem = items[0] && 'label' in items[0];
-    listRef?.current?.activateItem(isGroupTitleFirstItem ? 1 : 0, false);
+    listRef?.current?.activateItem(List.findNextIndex(items, 0, 1), false);
 };
 
 const isOptionMatchedByFilter = (option: SelectOption, filter: string) => {