Skip to content

Commit 0ca5abc

Browse files
committed
fix(store): fix selector fallback value
Signed-off-by: Innei <tukon479@gmail.com>
1 parent 07b075a commit 0ca5abc

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

apps/renderer/src/store/entry/hooks.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ export const useEntryIdsByFeedId = (feedId: string, filter?: EntryFilter) =>
8282
export const useEntryIdsByView = (view: FeedViewType, filter?: EntryFilter) => {
8383
const feedIds = useFeedIdByView(view)
8484

85-
return useEntryStore(useCallback(() => getFilteredFeedIds(feedIds, filter), [feedIds, filter]))
85+
return useEntryStore(
86+
useCallback(() => getFilteredFeedIds(feedIds, filter) || [], [feedIds, filter]),
87+
)
8688
}
8789

8890
export const useEntryIdsByFeedIds = (feedIds: string[], filter: EntryFilter = {}) =>

apps/renderer/src/store/subscription/hooks.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,29 @@ import { useSubscriptionStore } from "./store"
1818
type FeedId = string
1919

2020
export const useFeedIdByView = (view: FeedViewType) =>
21-
useSubscriptionStore(useCallback((state) => feedIdByViewSelector(view)(state), [view]))
21+
useSubscriptionStore(useCallback((state) => feedIdByViewSelector(view)(state) || [], [view]))
2222

2323
export const useCategoryOpenStateByView = (view: FeedViewType) =>
24-
useSubscriptionStore(useCallback((state) => categoryOpenStateByViewSelector(view)(state), [view]))
24+
useSubscriptionStore(
25+
useCallback((state) => categoryOpenStateByViewSelector(view)(state) || {}, [view]),
26+
)
2527

2628
export const useSubscriptionByView = (view: FeedViewType) =>
27-
useSubscriptionStore(useCallback((state) => subscriptionByViewSelector(view)(state), [view]))
29+
useSubscriptionStore(
30+
useCallback((state) => subscriptionByViewSelector(view)(state) || [], [view]),
31+
)
2832

2933
export const useSubscriptionByFeedId = (feedId: FeedId) =>
3034
useSubscriptionStore(
31-
useCallback((state) => subscriptionByFeedIdSelector(feedId)(state), [feedId]),
35+
useCallback((state) => subscriptionByFeedIdSelector(feedId)(state) || null, [feedId]),
3236
)
3337

3438
export const useFolderFeedsByFeedId = ({ feedId, view }: { feedId?: string; view: FeedViewType }) =>
3539
useSubscriptionStore(
36-
useCallback((state) => folderFeedsByFeedIdSelector({ feedId, view })(state), [feedId, view]),
40+
useCallback(
41+
(state) => folderFeedsByFeedIdSelector({ feedId, view })(state) || [],
42+
[feedId, view],
43+
),
3744
)
3845

3946
export const useListSubscriptionCount = () => useSubscriptionStore(listSubscriptionCountSelector)

0 commit comments

Comments
 (0)