fix(useList): fixed expanded controlled state behaviour (#1749)

gravity-ui · Aug 14, 2024 · 82db00e · 82db00e
1 parent 067db98
commit 82db00e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/components/useList/hooks/useList.ts b/src/components/useList/hooks/useList.ts
@@ -50,15 +50,6 @@ export const useList = <T>({
         withExpandedState,
     });
 
-    const {visibleFlattenIds, idToFlattenIndex, rootIds} = useFlattenListItems({
-        items,
-        /**
-         * By default controlled from list items declaration state
-         */
-        expandedById: innerState.expandedById,
-        getItemId,
-    });
-
     const realState = React.useMemo(() => {
         if (controlledState) {
             return {
@@ -70,6 +61,15 @@ export const useList = <T>({
         return innerState;
     }, [controlledState, innerState]);
 
+    const {visibleFlattenIds, idToFlattenIndex, rootIds} = useFlattenListItems({
+        items,
+        /**
+         * By default controlled from list items declaration state
+         */
+        expandedById: realState.expandedById,
+        getItemId,
+    });
+
     return {
         state: realState,
         structure: {