Skip to content

Commit 5c07e22

Browse files
committed
Split FilterContext into state and actions contexts
Addresses review feedback on the value memoization: separates frequently-changing state (papers, filters, pagination) from stable action functions into two contexts, so a future consumer that only needs actions won't re-render on unrelated state changes. useFilters() still works exactly as before for existing consumers.
1 parent 867798a commit 5c07e22

1 file changed

Lines changed: 55 additions & 30 deletions

File tree

‎src/context/filterContext.tsx‎

Lines changed: 55 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ interface FilterState {
3535
filtersPulled: boolean;
3636
currentPage: number;
3737
papersPerPage: number;
38+
39+
paginatedPapers: IPaper[];
40+
totalPages: number;
3841
}
3942

4043
interface FilterActions {
@@ -68,14 +71,14 @@ interface FilterActions {
6871
filtersNotPulled: () => void;
6972
noAppliedFilters: () => void;
7073
closeFilters: () => void;
71-
72-
paginatedPapers: IPaper[];
73-
totalPages: number;
7474
}
7575

7676
type FilterContextType = FilterState & FilterActions;
7777

78-
const FilterContext = createContext<FilterContextType | undefined>(undefined);
78+
const FilterStateContext = createContext<FilterState | undefined>(undefined);
79+
const FilterActionsContext = createContext<FilterActions | undefined>(
80+
undefined,
81+
);
7982

8083
interface FilterProviderProps {
8184
children: ReactNode;
@@ -162,7 +165,7 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
162165
console.error(`Failed to fetch ${paper.file_url}`, err);
163166
}
164167
}),
165-
);
168+
);
166169

167170
function getDownloadName(
168171
params: ReadonlyURLSearchParams,
@@ -251,7 +254,7 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
251254
[appliedFilters, filteredPapers.length, papers.length, papersPerPage],
252255
);
253256

254-
const value: FilterContextType = useMemo(
257+
const stateValue: FilterState = useMemo(
255258
() => ({
256259
selectedExams,
257260
selectedSlots,
@@ -267,7 +270,31 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
267270
filtersPulled,
268271
currentPage,
269272
papersPerPage,
273+
paginatedPapers,
274+
totalPages,
275+
}),
276+
[
277+
selectedExams,
278+
selectedSlots,
279+
selectedYears,
280+
selectedSemesters,
281+
selectedCampuses,
282+
selectedAnswerKeyIncluded,
283+
papers,
284+
filteredPapers,
285+
selectedPapers,
286+
filterOptions,
287+
appliedFilters,
288+
filtersPulled,
289+
currentPage,
290+
papersPerPage,
291+
paginatedPapers,
292+
totalPages,
293+
],
294+
);
270295

296+
const actionsValue: FilterActions = useMemo(
297+
() => ({
271298
setSelectedExams,
272299
setSelectedSlots,
273300
setSelectedYears,
@@ -280,7 +307,6 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
280307
setFiltersPulled,
281308
setAppliedFilters,
282309
setCurrentPage,
283-
284310
handleApplyFilters,
285311
handleSelectPaper,
286312
handleSelectAll,
@@ -289,25 +315,8 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
289315
filtersNotPulled,
290316
noAppliedFilters,
291317
closeFilters,
292-
293-
paginatedPapers,
294-
totalPages,
295318
}),
296319
[
297-
selectedExams,
298-
selectedSlots,
299-
selectedYears,
300-
selectedSemesters,
301-
selectedCampuses,
302-
selectedAnswerKeyIncluded,
303-
papers,
304-
filteredPapers,
305-
selectedPapers,
306-
filterOptions,
307-
appliedFilters,
308-
filtersPulled,
309-
currentPage,
310-
papersPerPage,
311320
handleApplyFilters,
312321
handleSelectPaper,
313322
handleSelectAll,
@@ -316,20 +325,36 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
316325
filtersNotPulled,
317326
noAppliedFilters,
318327
closeFilters,
319-
paginatedPapers,
320-
totalPages,
321328
],
322329
);
323330

324331
return (
325-
<FilterContext.Provider value={value}>{children}</FilterContext.Provider>
332+
<FilterActionsContext.Provider value={actionsValue}>
333+
<FilterStateContext.Provider value={stateValue}>
334+
{children}
335+
</FilterStateContext.Provider>
336+
</FilterActionsContext.Provider>
326337
);
327338
};
328339

329-
export const useFilters = (): FilterContextType => {
330-
const context = useContext(FilterContext);
340+
export const useFilterState = (): FilterState => {
341+
const context = useContext(FilterStateContext);
342+
if (!context) {
343+
throw new Error("useFilterState must be used within a FilterProvider");
344+
}
345+
return context;
346+
};
347+
348+
export const useFilterActions = (): FilterActions => {
349+
const context = useContext(FilterActionsContext);
331350
if (!context) {
332-
throw new Error("useFilters must be used within a FilterProvider");
351+
throw new Error("useFilterActions must be used within a FilterProvider");
333352
}
334353
return context;
335354
};
355+
356+
export const useFilters = (): FilterContextType => {
357+
const state = useFilterState();
358+
const actions = useFilterActions();
359+
return useMemo(() => ({ ...state, ...actions }), [state, actions]);
360+
};

0 commit comments

Comments
 (0)