feat: add types for buildSelector

sashtje · Oct 6, 2023 · ca19262 · ca19262
1 parent 2137d81
commit ca19262
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/pages/ArticlesPage/model/selectors/articlesPageSelectors.ts b/src/pages/ArticlesPage/model/selectors/articlesPageSelectors.ts
@@ -1,5 +1,6 @@
 import { StateSchema } from '@/app/providers/StoreProvider';
 import { ArticleSortField, ArticleType, ArticleView } from '@/entities/Article';
+import { buildSelector } from '@/shared/lib/store';
 
 export const getArticlesPageIsLoading = (state: StateSchema) =>
   state.articlesPage?.isLoading || false;
@@ -23,3 +24,7 @@ export const getArticlesPageSearch = (state: StateSchema) =>
   state.articlesPage?.search ?? '';
 export const getArticlesPageType = (state: StateSchema) =>
   state.articlesPage?.type ?? ArticleType.ALL;
+
+export const [useArticleItemById] = buildSelector(
+  (state, id: string) => state.articlesPage?.entities[id],
+);
diff --git a/src/shared/lib/store/buildSelector.ts b/src/shared/lib/store/buildSelector.ts
@@ -2,11 +2,15 @@ import { useSelector } from 'react-redux';
 
 import { StateSchema } from '@/app/providers/StoreProvider';
 
-type Selector<T> = (state: StateSchema) => T;
-type Result<T> = [() => T, Selector<T>];
+type Selector<T, Args extends any[]> = (state: StateSchema, ...args: Args) => T;
+type Hook<T, Args extends any[]> = (...args: Args) => T;
+type Result<T, Args extends any[]> = [Hook<T, Args>, Selector<T, Args>];
 
-export function buildSelector<T>(selector: Selector<T>): Result<T> {
-  const useSelectorHook = () => useSelector(selector);
+export function buildSelector<T, Args extends any[]>(
+  selector: Selector<T, Args>,
+): Result<T, Args> {
+  const useSelectorHook: Hook<T, Args> = (...args: Args) =>
+    useSelector((state: StateSchema) => selector(state, ...args));
 
   return [useSelectorHook, selector];
 }