Skip to content

Use stable event listing dependencies #10606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tomeshwari-02 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use stable event listing dependencies #10606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 36 additions & 15 deletions src/Pages/Events/EventsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,17 @@ const EventsPage = () => {
}

const listing = useEventListing();
const { isLoading } = listing;
const {
isLoading,
setAdvancedFilters,
setCategoryFilter,
setEventsPerPage,
setFilterType,
setSafePage,
setSearchQuery,
setSortType,
setViewMode,
} = listing;
const cardSectionRef = useRef();
const hasHydratedFilters = useRef(false);
const [filtersHydrated, setFiltersHydrated] = useState(false);
Expand All @@ -175,8 +185,8 @@ const EventsPage = () => {
const debouncedSearchQuery = useDebouncedValue(localSearchInput, 300);

useEffect(() => {
listing.setSearchQuery(debouncedSearchQuery);
}, [debouncedSearchQuery]);
setSearchQuery(debouncedSearchQuery);
}, [debouncedSearchQuery, setSearchQuery]);

useEffect(() => {
if (hasHydratedFilters.current) return;
Expand Down Expand Up @@ -210,18 +220,29 @@ const EventsPage = () => {

if (initialSearch) {
setLocalSearchInput(initialSearch);
listing.setSearchQuery(initialSearch);
setSearchQuery(initialSearch);
}
listing.setFilterType(filter);
listing.setCategoryFilter(category);
listing.setSortType(sort);
listing.setViewMode(view);
listing.setEventsPerPage(perPage);
listing.setAdvancedFilters(advancedFilters);
if (page !== 1) listing.setSafePage(page);
setFilterType(filter);
setCategoryFilter(category);
setSortType(sort);
setViewMode(view);
setEventsPerPage(perPage);
setAdvancedFilters(advancedFilters);
if (page !== 1) setSafePage(page);
hasHydratedFilters.current = true;
setFiltersHydrated(true);
}, [searchParams, routeSearchQuery, listing]);
}, [
searchParams,
routeSearchQuery,
setAdvancedFilters,
setCategoryFilter,
setEventsPerPage,
setFilterType,
setSafePage,
setSearchQuery,
setSortType,
setViewMode,
]);

useEffect(() => {
if (!filtersHydrated) return;
Expand Down Expand Up @@ -273,13 +294,13 @@ const EventsPage = () => {
const safeQuery = prepareSafeSearchQuery(routeSearchQuery);
if (safeQuery !== listing.searchQuery) {
setLocalSearchInput(safeQuery);
listing.setSearchQuery(safeQuery);
setSearchQuery(safeQuery);
}
}, [
rawSearchParam,
routeSearchQuery,
listing.searchQuery,
listing.setSearchQuery,
setSearchQuery,
]);

const handleSearch = (query = "") => {
Expand Down Expand Up @@ -437,4 +458,4 @@ const EventsPage = () => {
);
};

export default EventsPage;
export default EventsPage;
6 changes: 3 additions & 3 deletions src/Pages/Events/useEventListing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ const useEventListing = () => {
setCurrentPage(1);
}, [searchQuery, filterType, sortType, advancedFilters, eventsPerPage]);

const setSafePage = (page) => {
const setSafePage = useCallback((page) => {
if (page < 1) {
setCurrentPage(1);
return;
Expand All @@ -188,11 +188,11 @@ const useEventListing = () => {
return;
}
setCurrentPage(page);
};
}, [pagination.totalPages]);

const setAdvancedFilters = useCallback((filters) => {
setAdvancedFiltersState(normalizeAdvancedFilters(filters));
}, [setAdvancedFiltersState, normalizeAdvancedFilters]);
}, [setAdvancedFiltersState]);

const priceStats = useMemo(() => getPriceStats(events), [events]);
const dateRangeStats = useMemo(() => getDateRange(events), [events]);
Expand Down
Loading