Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { useEffect, useState } from 'react';
import { useCallback, useEffect, useState } from 'react';
import Header from '@/components/Header';
import SubscriptionList from '@/components/SubscriptionList';
import SubscriptionModal from '@/components/SubscriptionModal';
Expand Down Expand Up @@ -140,6 +140,17 @@ export default function Home() {
);
};

const handleFilteredSubscriptionsChange = useCallback(
(nextFilteredSubscriptions: Subscription[]) => {
setFilteredSubscriptions(nextFilteredSubscriptions);
},
[]
);

const handleTagFilterChange = useCallback((tags: string[]) => {
setSelectedTags(tags);
}, []);

const handleDateClick = (date: Date) => {
setSelectedDate(date);
setSelectedSubscription(undefined);
Expand Down Expand Up @@ -342,8 +353,8 @@ export default function Home() {
onDelete={handleDeleteSubscription}
onToggleInclude={handleToggleInclude}
showCurrencySymbol={userConfig.showCurrencySymbol}
onFilteredSubscriptionsChange={(filteredSubs) => setFilteredSubscriptions(filteredSubs)}
onTagFilterChange={(tags) => setSelectedTags(tags)}
onFilteredSubscriptionsChange={handleFilteredSubscriptionsChange}
onTagFilterChange={handleTagFilterChange}
/>
<Totals
subscriptions={filteredSubscriptions || subscriptions}
Expand Down
13 changes: 8 additions & 5 deletions src/components/SubscriptionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,14 @@ export default function SubscriptionList({
};

// Filter subscriptions by tags
const filteredSubscriptions = tagFilters.length > 0
? subscriptions.filter(sub =>
sub.tags && sub.tags.some(tag => tagFilters.includes(tag))
)
: subscriptions;
const filteredSubscriptions = useMemo(() =>
tagFilters.length > 0
? subscriptions.filter(sub =>
sub.tags && sub.tags.some(tag => tagFilters.includes(tag))
)
: subscriptions,
[subscriptions, tagFilters]
);

// Notify parent about filtered subscriptions
useEffect(() => {
Expand Down
Loading