fix(useList): support activeItemId in initialState prop (#1824)

gravity-ui · Aug 27, 2024 · aa308d8 · aa308d8
1 parent b953f18
commit aa308d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/components/useList/hooks/useList.ts b/src/components/useList/hooks/useList.ts
@@ -1,15 +1,18 @@
 /* eslint-disable valid-jsdoc */
 import React from 'react';
 
-import type {ListState, UseListResult} from '../types';
+import type {InitialListParsedState, ListState, UseListResult} from '../types';
 
 import {useFlattenListItems} from './useFlattenListItems';
 import {useListParsedState} from './useListParsedState';
 import type {UseListParsedStateProps} from './useListParsedState';
 import {useListState} from './useListState';
 import type {UseListStateProps} from './useListState';
 
-interface UseListProps<T> extends UseListParsedStateProps<T>, UseListStateProps {
+interface UseListProps<T>
+    extends UseListParsedStateProps<T>,
+        Omit<UseListStateProps, 'initialState'> {
+    initialState?: Partial<InitialListParsedState>;
     controlledState?: Partial<ListState>;
 }
 
@@ -30,16 +33,18 @@ export const useList = <T>({
         defaultExpandedState,
     });
 
-    const initValues = React.useMemo(() => {
+    const initValues: InitialListParsedState = React.useMemo(() => {
         return {
             expandedById: {...initialState.expandedById, ...initialValues?.expandedById},
             selectedById: {...initialState.selectedById, ...initialValues?.selectedById},
             disabledById: {...initialState.disabledById, ...initialValues?.disabledById},
+            activeItemId: initialValues?.activeItemId,
         };
     }, [
         initialState.disabledById,
         initialState.expandedById,
         initialState.selectedById,
+        initialValues?.activeItemId,
         initialValues?.disabledById,
         initialValues?.expandedById,
         initialValues?.selectedById,

diff --git a/src/components/useList/types.ts b/src/components/useList/types.ts
@@ -90,7 +90,7 @@ export type ListState = {
 
 export type InitialListParsedState = Pick<
     ListState,
-    'disabledById' | 'expandedById' | 'selectedById'
+    'disabledById' | 'expandedById' | 'selectedById' | 'activeItemId'
 >;
 
 export type ItemSchema = {