fix(SortList): union useMemo calls

taskany-inc · Jul 31, 2024 · 2fe1968 · 2fe1968
1 parent d8a4075
commit 2fe1968
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/components/SortList/SortList.tsx b/src/components/SortList/SortList.tsx
@@ -19,8 +19,8 @@ interface SingleSortItem {
 }
 
 export const SortList: React.FC<SortListProps> = ({ value, onChange }) => {
-    const sortItems: { [K in SortableProps]: string } = useMemo(
-        () => ({
+    const { itemsToRender, sortItems } = useMemo(() => {
+        const sortItems = {
             title: tr('Title'),
             state: tr('State'),
             priority: tr('Priority'),
@@ -29,17 +29,17 @@ export const SortList: React.FC<SortListProps> = ({ value, onChange }) => {
             owner: tr('Owner'),
             updatedAt: tr('UpdatedAt'),
             createdAt: tr('CreatedAt'),
-        }),
-        [],
-    );
+        };
 
-    const itemsToRender: SingleSortItem[] = useMemo(() => {
-        return (Object.entries(sortItems) as Array<[SortableProps, string]>).map(([id, title]) => ({
-            id,
-            title,
-            dir: null,
-        }));
-    }, [sortItems]);
+        return {
+            sortItems,
+            itemsToRender: (Object.entries(sortItems) as Array<[SortableProps, string]>).map(([id, title]) => ({
+                id,
+                title,
+                dir: null,
+            })),
+        };
+    }, []);
 
     const selected: SingleSortItem[] | undefined = useMemo(() => {
         return value?.map(({ key, dir }) => ({ id: key, title: sortItems[key], dir }));

diff --git a/src/hooks/useUrlFilterParams.ts b/src/hooks/useUrlFilterParams.ts
@@ -31,7 +31,7 @@ export interface FilterQueryState {
     participant: string[];
     project: string[];
     query: string;
-    sort: Array<{ key: SortableProps; dir: Exclude<SortDirection, null> }>;
+    sort: Array<{ key: SortableProps; dir: SortDirection }>;
 }
 
 const groupByValue = {