fix(slice): properly memoize loader selectors

neurosnap · Dec 14, 2023 · 7a9702e · 7a9702e
1 parent 4ca821e
commit 7a9702e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/store/slice/loader.ts b/store/slice/loader.ts
@@ -85,10 +85,11 @@ function loaderSelectors<
     { ids }: PropIds,
   ): LoaderState<M>[] =>
     ids.map((id) => defaultLoader<M>(data[id])).filter(excludesFalse);
-  const selectById = (state: S, { id }: PropId): LoaderState<M> => {
-    const data = selectTable(state);
-    return defaultLoader<M>(findById(data, { id })) || empty;
-  };
+  const selectById = createSelector(
+    selectTable,
+    (_: S, p: PropId) => p.id,
+    (loaders, id): LoaderState<M> => findById(loaders, { id }),
+  );
 
   return {
     findById,
@@ -101,8 +102,8 @@ function loaderSelectors<
     selectById,
     selectByIds: createSelector(
       selectTable,
-      (_: S, p: PropIds) => p,
-      findByIds,
+      (_: S, p: PropIds) => p.ids,
+      (loaders, ids) => findByIds(loaders, { ids }),
     ),
   };
 }